Use stricter definitions for Qt macros and usage

This allows usage in codebases that have other use
for signals and emit keywords, also do proper
string creation.

Author: dantti

example/CMakeLists.txt

@@ -35,11 +35,37 @@ if (ZXING_READERS)
     if (TARGET Qt::Gui)
         add_executable (ZXingQtReader ZXingQtReader.cpp ZXingQtReader.h)
         target_link_libraries(ZXingQtReader ZXing::ZXing Qt::Gui)
+        target_compile_definitions(ZXingQtReader
+            PRIVATE
+                QT_NO_KEYWORDS
+                QT_NO_CAST_TO_ASCII
+                QT_NO_CAST_FROM_ASCII
+                QT_STRICT_ITERATORS
+                QT_NO_URL_CAST_FROM_STRING
+                QT_NO_CAST_FROM_BYTEARRAY
+                QT_USE_QSTRINGBUILDER
+                QT_NO_SIGNALS_SLOTS_KEYWORDS
+                QT_USE_FAST_OPERATOR_PLUS
+                QT_DISABLE_DEPRECATED_BEFORE=0x060400
+        )
     endif()
 
     if (TARGET Qt::Multimedia AND TARGET Qt::Quick)
         add_executable(ZXingQtCamReader ZXingQtCamReader.cpp ZXingQtCamReader.qrc ZXingQtReader.h)
         target_link_libraries(ZXingQtCamReader ZXing::ZXing Qt::Gui Qt::Multimedia Qt::Quick)
+        target_compile_definitions(ZXingQtCamReader
+            PRIVATE
+                QT_NO_KEYWORDS
+                QT_NO_CAST_TO_ASCII
+                QT_NO_CAST_FROM_ASCII
+                QT_STRICT_ITERATORS
+                QT_NO_URL_CAST_FROM_STRING
+                QT_NO_CAST_FROM_BYTEARRAY
+                QT_USE_QSTRINGBUILDER
+                QT_NO_SIGNALS_SLOTS_KEYWORDS
+                QT_USE_FAST_OPERATOR_PLUS
+                QT_DISABLE_DEPRECATED_BEFORE=0x060400
+        )
     endif()
 
     find_package(OpenCV QUIET)

example/ZXingQtCamReader.cpp

@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
 	ZXingQt::registerQmlAndMetaTypes();
 
 	QGuiApplication app(argc, argv);
-	app.setApplicationName("ZXingQtCamReader");
+	app.setApplicationName(QStringLiteral("ZXingQtCamReader"));
 	QQmlApplicationEngine engine;
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	engine.load(QUrl(QStringLiteral("qrc:/ZXingQt5CamReader.qml")));

example/ZXingQtReader.cpp

@@ -16,7 +16,7 @@ int main(int argc, char* argv[])
 		return 1;
 	}
 
-	QString filePath = argv[1];
+	QString filePath = QString::fromUtf8(argv[1]);
 
 	QImage image = QImage(filePath);
 

example/ZXingQtReader.h

@@ -316,7 +316,7 @@ public: \
 	{ \
 		if (name() != newVal) { \
 			ReaderOptions::setter(newVal); \
-			emit name##Changed(); \
+			Q_EMIT name##Changed(); \
 		} \
 	} \
 	Q_SIGNAL void name##Changed();
@@ -359,7 +359,7 @@ class BarcodeReader : public QObject, private ReaderOptions
 	{
 		if (formats() != newVal) {
 			ReaderOptions::setFormats(static_cast<ZXing::BarcodeFormat>(newVal));
-			emit formatsChanged();
+			Q_EMIT formatsChanged();
 			qDebug() << ReaderOptions::formats();
 		}
 	}
@@ -371,7 +371,7 @@ class BarcodeReader : public QObject, private ReaderOptions
 	{
 		if (textMode() != newVal) {
 			ReaderOptions::setTextMode(static_cast<ZXing::TextMode>(newVal));
-			emit textModeChanged();
+			Q_EMIT textModeChanged();
 		}
 	}
 	Q_SIGNAL void textModeChanged();
@@ -386,7 +386,7 @@ class BarcodeReader : public QObject, private ReaderOptions
 	QAtomicInt runTime = 0;
 	Q_PROPERTY(int runTime MEMBER runTime)
 
-public slots:
+public Q_SLOTS:
 	// Function should be thread safe, as it may be called from a separate thread.
 	ZXingQt::Barcode process(const QVideoFrame& image)
 	{
@@ -398,13 +398,13 @@ public slots:
 		runTime = t.elapsed();
 
 		if (res.isValid())
-			emit foundBarcode(res);
+			Q_EMIT foundBarcode(res);
 		else
-			emit failedRead();
+			Q_EMIT failedRead();
 		return res;
 	}
 
-signals:
+Q_SIGNALS:
 	void failedRead();
 	void foundBarcode(ZXingQt::Barcode barcode);
 
@@ -444,7 +444,7 @@ public slots:
 	{
 		if (_pool.maxThreadCount() != maxThreadCount) {
 			_pool.setMaxThreadCount(maxThreadCount);
-			emit maxThreadCountChanged();
+			Q_EMIT maxThreadCountChanged();
 		}
 	}
 	Q_SIGNAL void maxThreadCountChanged();
@@ -501,7 +501,7 @@ inline void registerQmlAndMetaTypes()
 	qRegisterMetaType<ZXingQt::Barcode>("Barcode");
 
 	qmlRegisterUncreatableMetaObject(
-		ZXingQt::staticMetaObject, "ZXing", 1, 0, "ZXing", "Access to enums & flags only");
+		ZXingQt::staticMetaObject, "ZXing", 1, 0, "ZXing", QStringLiteral("Access to enums & flags only"));
 	qmlRegisterType<ZXingQt::BarcodeReader>("ZXing", 1, 0, "BarcodeReader");
 }