refactor: merge qrcode directories

This commit is contained in:
tobtoht 2023-03-29 09:39:03 +02:00
parent 2c5583c398
commit ba826c7705
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
15 changed files with 7 additions and 9 deletions

View file

@ -65,8 +65,6 @@ file(GLOB SOURCE_FILES
"polyseed/*.h" "polyseed/*.h"
"polyseed/*.cpp" "polyseed/*.cpp"
"polyseed/*.c" "polyseed/*.c"
"qrcode_utils/QrCodeUtils.cpp"
"qrcode_utils/QrCodeUtils.h"
"monero_seed/argon2/blake2/*.c" "monero_seed/argon2/blake2/*.c"
"monero_seed/argon2/*.c" "monero_seed/argon2/*.c"
"monero_seed/*.cpp" "monero_seed/*.cpp"
@ -78,14 +76,14 @@ file(GLOB SOURCE_FILES
if (WITH_SCANNER AND NOT Qt6_FOUND) if (WITH_SCANNER AND NOT Qt6_FOUND)
file(GLOB SCANNER_FILES file(GLOB SCANNER_FILES
"qrcode_scanner/*.h" "qrcode/scanner/*.h"
"qrcode_scanner/*.cpp") "qrcode/scanner/*.cpp")
endif() endif()
if (WITH_SCANNER AND Qt6_FOUND) if (WITH_SCANNER AND Qt6_FOUND)
file(GLOB SCANNER_FILES file(GLOB SCANNER_FILES
"qrcode_scanner_qt6/*.h" "qrcode/scanner_qt6/*.h"
"qrcode_scanner_qt6/*.cpp") "qrcode/scanner_qt6/*.cpp")
endif() endif()
list(APPEND SOURCE_FILES list(APPEND SOURCE_FILES

View file

@ -14,10 +14,10 @@
#include "libwalletqt/WalletManager.h" #include "libwalletqt/WalletManager.h"
#if defined(WITH_SCANNER) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #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> #include <QtMultimedia/QCameraInfo>
#elif defined(WITH_SCANNER) #elif defined(WITH_SCANNER)
#include "qrcode_scanner_qt6/QrCodeScanDialog.h" #include "qrcode/scanner_qt6//QrCodeScanDialog.h"
#include <QMediaDevices> #include <QMediaDevices>
#endif #endif

View file

@ -11,7 +11,7 @@
#include <QtGlobal> #include <QtGlobal>
#include "libwalletqt/WalletManager.h" #include "libwalletqt/WalletManager.h"
#include "qrcode_utils/QrCodeUtils.h" #include "qrcode/QrCodeUtils.h"
#include "utils/Utils.h" #include "utils/Utils.h"
PayToEdit::PayToEdit(QWidget *parent) : QPlainTextEdit(parent) PayToEdit::PayToEdit(QWidget *parent) : QPlainTextEdit(parent)