From b93dd8cb9b49f76472fbb0da461a8b898546c140 Mon Sep 17 00:00:00 2001 From: pokamest Date: Wed, 27 Jul 2022 03:22:46 +0300 Subject: [PATCH] Build fix --- client/client.pro | 6 +++--- client/main.cpp | 2 +- .../ios/{QRCodeReader.cpp => QRCodeReaderBase.cpp} | 4 ++-- client/platforms/ios/{QRCodeReader.h => QRCodeReaderBase.h} | 6 +++--- .../platforms/ios/{QRCodeReader.mm => QRCodeReaderBase.mm} | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename client/platforms/ios/{QRCodeReader.cpp => QRCodeReaderBase.cpp} (69%) rename client/platforms/ios/{QRCodeReader.h => QRCodeReaderBase.h} (81%) rename client/platforms/ios/{QRCodeReader.mm => QRCodeReaderBase.mm} (99%) diff --git a/client/client.pro b/client/client.pro index 316730f9..a809362b 100644 --- a/client/client.pro +++ b/client/client.pro @@ -77,7 +77,7 @@ HEADERS += \ loghandler.h \ loglevel.h \ constants.h \ - platforms/ios/QRCodeReader.h + platforms/ios/QRCodeReaderBase.h SOURCES += \ configurators/cloak_configurator.cpp \ @@ -130,7 +130,7 @@ SOURCES += \ protocols/vpnprotocol.cpp \ logger.cpp \ loghandler.cpp \ - platforms/ios/QRCodeReader.cpp + platforms/ios/QRCodeReaderBase.cpp RESOURCES += \ resources.qrc @@ -312,7 +312,7 @@ ios { platforms/ios/iosglue.mm \ platforms/ios/ipaddress.cpp \ platforms/ios/ipaddressrange.cpp \ - platforms/ios/QRCodeReader.mm + platforms/ios/QRCodeReaderBase.mm Q_ENABLE_BITCODE.value = NO Q_ENABLE_BITCODE.name = ENABLE_BITCODE diff --git a/client/main.cpp b/client/main.cpp index b1419f18..00f25743 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -37,7 +37,7 @@ #include "QZXing.h" -#include "platforms/ios/QRCodeReader.h" +#include "platforms/ios/QRCodeReaderBase.h" #include "debug.h" #include "defines.h" diff --git a/client/platforms/ios/QRCodeReader.cpp b/client/platforms/ios/QRCodeReaderBase.cpp similarity index 69% rename from client/platforms/ios/QRCodeReader.cpp rename to client/platforms/ios/QRCodeReaderBase.cpp index c422a0e7..c3148a85 100644 --- a/client/platforms/ios/QRCodeReader.cpp +++ b/client/platforms/ios/QRCodeReaderBase.cpp @@ -1,4 +1,4 @@ -#include "QRCodeReader.h" +#include "QRCodeReaderBase.h" QRCodeReader::QRCodeReader() { @@ -11,4 +11,4 @@ QRect QRCodeReader::cameraSize() { void QRCodeReader::startReading() {} void QRCodeReader::stopReading() {} -void QRCodeReader::setCameraSize(QRect) {}; +void QRCodeReader::setCameraSize(QRect) {} diff --git a/client/platforms/ios/QRCodeReader.h b/client/platforms/ios/QRCodeReaderBase.h similarity index 81% rename from client/platforms/ios/QRCodeReader.h rename to client/platforms/ios/QRCodeReaderBase.h index bc8c9925..29a4946d 100644 --- a/client/platforms/ios/QRCodeReader.h +++ b/client/platforms/ios/QRCodeReaderBase.h @@ -1,5 +1,5 @@ -#ifndef QRCODEREADER_H -#define QRCODEREADER_H +#ifndef QRCODEREADERBASE_H +#define QRCODEREADERBASE_H #include #include @@ -25,4 +25,4 @@ private: QRect m_cameraSize; }; -#endif // QRCODEREADER_H +#endif // QRCODEREADERBASE_H diff --git a/client/platforms/ios/QRCodeReader.mm b/client/platforms/ios/QRCodeReaderBase.mm similarity index 99% rename from client/platforms/ios/QRCodeReader.mm rename to client/platforms/ios/QRCodeReaderBase.mm index 85f71ba6..bd0dbac3 100644 --- a/client/platforms/ios/QRCodeReader.mm +++ b/client/platforms/ios/QRCodeReaderBase.mm @@ -1,4 +1,4 @@ -#include "QRCodeReader.h" +#include "QRCodeReaderBase.h" #import #import