Compilation on MacOS with Qt v6.1.2

Author: Matthieu Bruel

src/NgPost.cpp

@@ -240,7 +240,7 @@ const QMap<NgPost::GROUP_POLICY, QString> NgPost::sGroupPolicies = {
     {GROUP_POLICY::EACH_FILE, "each_file"}
 };
 
-#ifdef __DEBUG__
+#if __DEBUG__ && QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 #include <QNetworkConfigurationManager>
 #endif
 NgPost::NgPost(int &argc, char *argv[]):
@@ -1818,22 +1818,22 @@ void NgPost::setNzbName(const QFileInfo &fileInfo)
     _nzbName = fileInfo.isDir() ? QDir(fileInfo.absoluteFilePath()).dirName() : fileInfo.completeBaseName();
     if (_removeAccentsOnNzbFileName)
     {
-        _nzbName.replace(QRegExp("[ÀÁÂÃÄÅ]"), "A");
-        _nzbName.replace(QRegExp("[àáâãäå]"), "a");
+        _nzbName.replace(QRegularExpression("[ÀÁÂÃÄÅ]"), "A");
+        _nzbName.replace(QRegularExpression("[àáâãäå]"), "a");
         _nzbName.replace("Ç","C");
         _nzbName.replace("ç","c");
-        _nzbName.replace(QRegExp("[ÈÉÊË]"),   "E");
-        _nzbName.replace(QRegExp("[èéêë]"),   "e");
-        _nzbName.replace(QRegExp("[ÌÍÎÏ]"),   "I");
-        _nzbName.replace(QRegExp("[ìíîï]"),   "i");
+        _nzbName.replace(QRegularExpression("[ÈÉÊË]"),   "E");
+        _nzbName.replace(QRegularExpression("[èéêë]"),   "e");
+        _nzbName.replace(QRegularExpression("[ÌÍÎÏ]"),   "I");
+        _nzbName.replace(QRegularExpression("[ìíîï]"),   "i");
         _nzbName.replace("Ñ","N");
         _nzbName.replace("ñ","n");
-        _nzbName.replace(QRegExp("[ÒÓÔÕÖØ]"), "O");
-        _nzbName.replace(QRegExp("[òóôõöø]"), "o");
-        _nzbName.replace(QRegExp("[ÙÚÛÜ]"),   "U");
-        _nzbName.replace(QRegExp("[ùúûü]"),   "u");
-        _nzbName.replace(QRegExp("[ÿý]"),     "y");
-        _nzbName.replace(QRegExp("[^A-Za-z0-9\\.,_\\-\\(\\)\\[\\]\\{\\}!#&'\\+ ]"), "");
+        _nzbName.replace(QRegularExpression("[ÒÓÔÕÖØ]"), "O");
+        _nzbName.replace(QRegularExpression("[òóôõöø]"), "o");
+        _nzbName.replace(QRegularExpression("[ÙÚÛÜ]"),   "U");
+        _nzbName.replace(QRegularExpression("[ùúûü]"),   "u");
+        _nzbName.replace(QRegularExpression("[ÿý]"),     "y");
+        _nzbName.replace(QRegularExpression("[^A-Za-z0-9\\.,_\\-\\(\\)\\[\\]\\{\\}!#&'\\+ ]"), "");
     }
 }
 

src/NgPost.h

@@ -37,7 +37,7 @@
 #include <QNetworkProxy>
 class QTranslator;
 class NntpConnection;
-class NntpServerParams;
+struct NntpServerParams;
 class NntpFile;
 class NntpArticle;
 class QCoreApplication;

src/NntpCheckCon.h

@@ -24,8 +24,8 @@ class NzbCheck;
 
 #include <QObject>
 #include <QTcpSocket>
+#include <QSslError>
 class QSslSocket;
-class QSslError;
 class QByteArray;
 
 class NntpCheckCon : public QObject

src/NntpConnection.h

@@ -21,14 +21,14 @@
 #define NNTPCONNECTION_H
 
 #include <QTcpSocket>
+#include <QSslError>
 
-class NntpServerParams;
+struct NntpServerParams;
 class NntpArticle;
 class NgPost;
 class Poster;
 
 class QSslSocket;
-class QSslError;
 class QByteArray;
 #ifdef __USE_CONNECTION_TIMEOUT__
 class QTimer;

src/NzbCheck.cpp

@@ -105,7 +105,7 @@ int NzbCheck::parseNzb()
         {
             QXmlStreamReader::TokenType type = xmlReader.readNext();
             if (type == QXmlStreamReader::TokenType::StartElement
-                    && xmlReader.name() == "file")
+                    && xmlReader.name().compare(QLatin1String("file")))
             {
                 QString subject = xmlReader.attributes().value("subject").toString();
                 QRegularExpressionMatch match = sNntpArticleYencSubjectRegExp.match(subject);
@@ -116,7 +116,7 @@ int NzbCheck::parseNzb()
                 {
                     QXmlStreamReader::TokenType type = xmlReader.readNext();
                     if (type == QXmlStreamReader::TokenType::EndElement
-                            && xmlReader.name() == "file")
+                            && xmlReader.name().compare(QLatin1String("file")))
                     {
                         if (debugMode())
                             _cout << tr("The file '%1' has %2 articles in the nzb (expected: %3)").arg(
@@ -133,7 +133,7 @@ int NzbCheck::parseNzb()
                         break;
                     }
                     else if (type == QXmlStreamReader::TokenType::StartElement
-                            && xmlReader.name() == "segment")
+                            && xmlReader.name().compare(QLatin1String("segment")))
                     {
                         ++nbArticles;
                         xmlReader.readNext();

src/NzbCheck.h

@@ -27,7 +27,7 @@
 #include <QTimer>
 #include <QCommandLineOption>
 #include <QElapsedTimer>
-class NntpServerParams;
+struct NntpServerParams;
 class NntpCheckCon;
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)

src/hmi/MainWindow.cpp

@@ -28,7 +28,7 @@
 #include <QDebug>
 #include <QProgressBar>
 #include <QLabel>
-#include <QDesktopWidget>
+#include <QScreen>
 #include <QMessageBox>
 
 
@@ -87,7 +87,7 @@ MainWindow::MainWindow(QWidget *parent) :
     _ui->progressBar->setRange(0, 100);
     updateProgressBar(0, 0, "");
 
-    QSize screenSize = QDesktopWidget().availableGeometry(this).size();
+    QSize screenSize = qApp->screens()[0]->size();
     resize(screenSize * 0.8);
     setWindowIcon(QIcon(":/icons/ngPost.png"));
     setGeometry((screenSize.width() - width())/2,  (screenSize.height() - height())/2, width(), height());

src/hmi/MainWindow.h

@@ -23,7 +23,7 @@
 #include <QMainWindow>
 #include <QFileInfoList>
 class NgPost;
-class NntpServerParams;
+struct NntpServerParams;
 class NntpFile;
 class PostingWidget;
 class AutoPostWidget;