refactor: merge qrcode directories

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e9c3da3c82db302b7d0c31a2973d7911a6b7bc9a..fd20683cf21942c32b38a8426e84be406a6e745a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -65,8 +65,6 @@ file(GLOB SOURCE_FILES
         "polyseed/*.h"
         "polyseed/*.cpp"
         "polyseed/*.c"
-        "qrcode_utils/QrCodeUtils.cpp"
-        "qrcode_utils/QrCodeUtils.h"
         "monero_seed/argon2/blake2/*.c"
         "monero_seed/argon2/*.c"
         "monero_seed/*.cpp"
@@ -78,14 +76,14 @@ file(GLOB SOURCE_FILES
 
 if (WITH_SCANNER AND NOT Qt6_FOUND)
     file(GLOB SCANNER_FILES
-            "qrcode_scanner/*.h"
-            "qrcode_scanner/*.cpp")
+            "qrcode/scanner/*.h"
+            "qrcode/scanner/*.cpp")
 endif()
 
 if (WITH_SCANNER AND Qt6_FOUND)
     file(GLOB SCANNER_FILES
-            "qrcode_scanner_qt6/*.h"
-            "qrcode_scanner_qt6/*.cpp")
+            "qrcode/scanner_qt6/*.h"
+            "qrcode/scanner_qt6/*.cpp")
 endif()
 
 list(APPEND SOURCE_FILES

diff --git a/src/SendWidget.cpp b/src/SendWidget.cpp
index 6554e51bde0e0991e65f0dbba71c4b189bd36035..08bb5334ab2f5d3699cb9d252415c42a1d167ab8 100644 (file)
--- a/src/SendWidget.cpp
+++ b/src/SendWidget.cpp
@@ -14,10 +14,10 @@
 #include "libwalletqt/WalletManager.h"
 
 #if defined(WITH_SCANNER) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include "qrcode_scanner/QrCodeScanDialog.h"
+#include "qrcode/scanner/QrCodeScanDialog.h"
 #include <QtMultimedia/QCameraInfo>
 #elif defined(WITH_SCANNER)
-#include "qrcode_scanner_qt6/QrCodeScanDialog.h"
+#include "qrcode/scanner_qt6//QrCodeScanDialog.h"
 #include <QMediaDevices>
 #endif
 

diff --git a/src/qrcode_utils/QrCodeUtils.cpp b/src/qrcode/QrCodeUtils.cpp
similarity index 100%
rename from src/qrcode_utils/QrCodeUtils.cpp
rename to src/qrcode/QrCodeUtils.cpp

diff --git a/src/qrcode_utils/QrCodeUtils.h b/src/qrcode/QrCodeUtils.h
similarity index 100%
rename from src/qrcode_utils/QrCodeUtils.h
rename to src/qrcode/QrCodeUtils.h

diff --git a/src/qrcode_scanner/QrCodeScanDialog.cpp b/src/qrcode/scanner/QrCodeScanDialog.cpp
similarity index 100%
rename from src/qrcode_scanner/QrCodeScanDialog.cpp
rename to src/qrcode/scanner/QrCodeScanDialog.cpp

diff --git a/src/qrcode_scanner/QrCodeScanDialog.h b/src/qrcode/scanner/QrCodeScanDialog.h
similarity index 100%
rename from src/qrcode_scanner/QrCodeScanDialog.h
rename to src/qrcode/scanner/QrCodeScanDialog.h

diff --git a/src/qrcode_scanner/QrCodeScanDialog.ui b/src/qrcode/scanner/QrCodeScanDialog.ui
similarity index 100%
rename from src/qrcode_scanner/QrCodeScanDialog.ui
rename to src/qrcode/scanner/QrCodeScanDialog.ui

diff --git a/src/qrcode_scanner/QrScanThread.cpp b/src/qrcode/scanner/QrScanThread.cpp
similarity index 100%
rename from src/qrcode_scanner/QrScanThread.cpp
rename to src/qrcode/scanner/QrScanThread.cpp

diff --git a/src/qrcode_scanner/QrScanThread.h b/src/qrcode/scanner/QrScanThread.h
similarity index 100%
rename from src/qrcode_scanner/QrScanThread.h
rename to src/qrcode/scanner/QrScanThread.h

diff --git a/src/qrcode_scanner_qt6/QrCodeScanDialog.cpp b/src/qrcode/scanner_qt6/QrCodeScanDialog.cpp
similarity index 100%
rename from src/qrcode_scanner_qt6/QrCodeScanDialog.cpp
rename to src/qrcode/scanner_qt6/QrCodeScanDialog.cpp

diff --git a/src/qrcode_scanner_qt6/QrCodeScanDialog.h b/src/qrcode/scanner_qt6/QrCodeScanDialog.h
similarity index 100%
rename from src/qrcode_scanner_qt6/QrCodeScanDialog.h
rename to src/qrcode/scanner_qt6/QrCodeScanDialog.h

diff --git a/src/qrcode_scanner_qt6/QrCodeScanDialog.ui b/src/qrcode/scanner_qt6/QrCodeScanDialog.ui
similarity index 100%
rename from src/qrcode_scanner_qt6/QrCodeScanDialog.ui
rename to src/qrcode/scanner_qt6/QrCodeScanDialog.ui

diff --git a/src/qrcode_scanner_qt6/QrScanThread.cpp b/src/qrcode/scanner_qt6/QrScanThread.cpp
similarity index 100%
rename from src/qrcode_scanner_qt6/QrScanThread.cpp
rename to src/qrcode/scanner_qt6/QrScanThread.cpp

diff --git a/src/qrcode_scanner_qt6/QrScanThread.h b/src/qrcode/scanner_qt6/QrScanThread.h
similarity index 100%
rename from src/qrcode_scanner_qt6/QrScanThread.h
rename to src/qrcode/scanner_qt6/QrScanThread.h

diff --git a/src/widgets/PayToEdit.cpp b/src/widgets/PayToEdit.cpp
index a03492bf0a0b3991830c3cb5ba8fff498ee41e99..3fa24dd6e5cc68f6796dd01652eeb02344b518fd 100644 (file)
--- a/src/widgets/PayToEdit.cpp
+++ b/src/widgets/PayToEdit.cpp
@@ -11,7 +11,7 @@
 #include <QtGlobal>
 
 #include "libwalletqt/WalletManager.h"
-#include "qrcode_utils/QrCodeUtils.h"
+#include "qrcode/QrCodeUtils.h"
 #include "utils/Utils.h"
 
 PayToEdit::PayToEdit(QWidget *parent) : QPlainTextEdit(parent)