Improve options to enable/disable our backends

Author: emericg

CMakeLists.txt

@@ -13,7 +13,7 @@ set(APP_VERSION ${CMAKE_PROJECT_VERSION})
 
 option(USE_QZXING "Build with QZXing support (decoder&encoder)" OFF)
 option(USE_ZXINGCPP "Build with zxing-cpp support (decoder&encoder)" ON)
-option(USE_ZINT "Build with zint support (encoder)" ON)
+option(USE_ZINT "Build with zint support (encoder)" OFF)
 
 ################################################################################
 
@@ -56,12 +56,15 @@ set(SOURCES
     thirdparty/IconLibrary/IconLibrary_material.qrc
 )
 
-if(IOS OR ANDROID)
-    # Mobile
+if(IOS OR ANDROID) # Mobile
+
     set(QAPPLICATION_CLASS QGuiApplication)
-else()
-    # Desktop
+    set(USE_ZINT OFF)
+
+else() # Desktop
+
     set(QAPPLICATION_CLASS QApplication)
+    set(USE_ZINT ON)
 
     # Set app icons
     #if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
@@ -162,16 +165,12 @@ if(USE_ZXINGCPP)
     # build zxing-cpp Qt wrapper
     add_subdirectory(thirdparty/zxing-cpp/wrappers/qt)
     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ZXingQt)
-
-    set(zxingcpp true)
-    add_definitions(-Dzxingcpp)
+    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QMS_USE_ZXINGCPP)
 elseif(USE_QZXING)
     # build QZxing
     add_subdirectory(thirdparty/QZXing)
     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE QZXing)
-
-    set(qzxing true)
-    add_definitions(-Dqzxing)
+    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QMS_USE_QZXING)
 else()
 endif()
 
@@ -183,9 +182,7 @@ if(USE_ZINT)
     # build ZintQml
     add_subdirectory(thirdparty/zint-qml/wrappers/qml)
     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ZintQml)
-
-    set(zint true)
-    add_definitions(-Dzint)
+    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QMS_USE_ZINT)
 endif()
 
 # Qt libraries

src/BarcodeManager.cpp

@@ -38,7 +38,7 @@
 #include <QJsonObject>
 #include <QJsonDocument>
 
-#if defined(zxingcpp)
+#if defined(QMS_USE_ZXINGCPP)
 #include <ZXingQt>
 #endif
 
@@ -114,6 +114,7 @@ bool BarcodeManager::loadImage(const QUrl &fileUrl)
     bool status = false;
 
 #if defined(zxingcpp)
+#if defined(QMS_USE_ZXINGCPP)
     QImage img;
     if (img.load(fileUrl.toLocalFile()))
     {

src/SettingsManager.cpp

@@ -252,9 +252,9 @@ void SettingsManager::setAppThemeAuto(const bool value)
 
 QString SettingsManager::getBackendReader() const
 {
-#if defined(zxingcpp)
+#if defined(QMS_USE_ZXINGCPP)
     return "zxingcpp";
-#elif defined(qzxing)
+#elif defined(QMS_USE_QZXING)
     return "qzxing";
 #endif
 
@@ -293,22 +293,22 @@ void SettingsManager::setBackendWriter(const QString &value)
 
 bool SettingsManager::getBackendQZXing() const
 {
-#if defined(qzxing)
+#if defined(QMS_USE_QZXING)
     return true;
 #endif
     return false;
 }
 
 bool SettingsManager::getBackendZXingCpp() const
 {
-#if defined(zxingcpp)
+#if defined(QMS_USE_ZXINGCPP)
     return true;
 #endif
     return false;
 }
 bool SettingsManager::getBackendZint() const
 {
-#if defined(zint)
+#if defined(QMS_USE_ZINT)
     return true;
 #endif
     return false;
@@ -327,25 +327,25 @@ void SettingsManager::setDefaultTab(const QString &value)
 
 unsigned SettingsManager::getFormatsEnabled() const
 {
-#if defined(zxingcpp)
+#if defined(QMS_USE_ZXINGCPP)
     return m_formatsEnabled_zxingcpp;
-#elif defined(qzxing)
+#elif defined(QMS_USE_QZXING)
     return m_formatsEnabled_qzxing;
 #endif
     return 0;
 }
 
 void SettingsManager::setFormatsEnabled(const unsigned value)
 {
-#if defined(zxingcpp)
+#if defined(QMS_USE_ZXINGCPP)
     if (m_formatsEnabled_zxingcpp != value)
     {
         m_formatsEnabled_zxingcpp = value;
         Q_EMIT formatsEnabledChanged();
 
         writeSettings();
     }
-#elif defined(qzxing)
+#elif defined(QMS_USE_QZXING)
     if (m_formatsEnabled_qzxing != value)
     {
         m_formatsEnabled_qzxing = value;

src/main.cpp

@@ -32,15 +32,15 @@
 #include <MobileUI>
 #include <MobileSharing>
 
-#if defined(qzxing)
+#if defined(QMS_USE_QZXING)
 #include <QZXing>
 #endif
 
-#if defined(zxingcpp)
+#if defined(QMS_USE_ZXINGCPP)
 #include <ZXingQt>
 #endif
 
-#if defined(zint)
+#if defined(QMS_USE_ZINT)
 #include <ZintQml>
 #endif
 
@@ -140,19 +140,19 @@ int main(int argc, char *argv[])
     }
 #endif
 
-#if defined(qzxing)
+#if defined(QMS_USE_QZXING)
     // Barcode (QZXing)
     QZXing::registerQMLTypes();
     QZXing::registerQMLImageProvider(engine);
 #endif
 
-#if defined(zxingcpp)
+#if defined(QMS_USE_ZXINGCPP)
     // Barcode (zxing-cpp)
     ZXingQt::registerQMLTypes();
     ZXingQt::registerQMLImageProvider(engine);
 #endif
 
-#if defined(zint)
+#if defined(QMS_USE_ZINT)
     // Barcode generator (zint-qml)
     ZintQml::registerQMLTypes();
     ZintQml::registerQMLImageProvider(engine);

thirdparty/zxing-cpp/wrappers/qt/CMakeLists.txt

@@ -4,26 +4,26 @@ set(SOURCES
     ZXingQt.h
 )
 
-if (ZXING_READERS)
+if(ZXING_READERS)
     set(SOURCES ${SOURCES}
         ZXingQtVideoFilter.cpp
         ZXingQtVideoFilter.h
     )
 endif()
 
-if (ZXING_WRITERS)
+if(ZXING_WRITERS)
     set(SOURCES ${SOURCES}
         ZXingQtImageProvider.cpp
         ZXingQtImageProvider.h
     )
 endif()
 
-add_library (ZXingQt ${SOURCES})
+add_library(ZXingQt ${SOURCES})
 
-target_link_libraries (ZXingQt PRIVATE ZXing::ZXing)
-target_include_directories (ZXingQt PRIVATE ZXing::ZXing)
+target_link_libraries(ZXingQt PRIVATE ZXing::ZXing)
+target_include_directories(ZXingQt PRIVATE ZXing::ZXing)
 
-find_package (Qt6 REQUIRED COMPONENTS Core Concurrent Quick Multimedia)
-target_link_libraries (ZXingQt PRIVATE Qt6::Core Qt6::Concurrent Qt6::Quick Qt6::Multimedia)
+find_package(Qt6 REQUIRED COMPONENTS Core Concurrent Quick Multimedia)
+target_link_libraries(ZXingQt PRIVATE Qt6::Core Qt6::Concurrent Qt6::Quick Qt6::Multimedia)
 
-target_include_directories (ZXingQt PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(ZXingQt PUBLIC ${CMAKE_CURRENT_LIST_DIR})

thirdparty/zxing-cpp/wrappers/qt/ZXingQt.h

@@ -7,6 +7,8 @@
 #ifndef ZXING_QT_H
 #define ZXING_QT_H
 
+#include "ZXingCpp.h"
+
 #include <QObject>
 #include <QQmlEngine>
 
@@ -18,9 +20,6 @@
 #include <QImage>
 #include <QVideoFrame>
 
-#include "Result.h" // Cannot use "Barcode.h" ???
-#include "Quadrilateral.h"
-#include "ReaderOptions.h"
 
 class Position : public ZXing::Quadrilateral<QPoint>
 {