qt 5.15 compatibility (#4027)

servatrice/src/isl_interface.cpp

@@ -110,7 +110,11 @@ void IslInterface::initServer()
 
     socket->startServerEncryption();
     if (!socket->waitForEncrypted(5000)) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+        QList<QSslError> sslErrors(socket->sslHandshakeErrors());
+#else
         QList<QSslError> sslErrors(socket->sslErrors());
+#endif
         if (sslErrors.isEmpty())
             qDebug() << "[ISL] SSL handshake timeout, terminating connection";
         else
@@ -187,7 +191,11 @@ void IslInterface::initClient()
         return;
     }
     if (!socket->waitForEncrypted(5000)) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+        QList<QSslError> sslErrors(socket->sslHandshakeErrors());
+#else
         QList<QSslError> sslErrors(socket->sslErrors());
+#endif
         if (sslErrors.isEmpty())
             qDebug() << "[ISL] SSL handshake timeout, terminating connection";
         else

servatrice/src/servatrice.cpp

@@ -265,7 +265,11 @@ bool Servatrice::initServer()
     qDebug() << "Accept registered users only: " << getRegOnlyServerEnabled();
     qDebug() << "Registration enabled: " << getRegistrationEnabled();
     if (getRegistrationEnabled()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+        QStringList emailBlackListFilters = getEmailBlackList().split(",", Qt::SkipEmptyParts);
+#else
         QStringList emailBlackListFilters = getEmailBlackList().split(",", QString::SkipEmptyParts);
+#endif
         qDebug() << "Email blacklist: " << emailBlackListFilters;
         qDebug() << "Require email address to register: " << getRequireEmailForRegistrationEnabled();
         qDebug() << "Require email activation via token: " << getRequireEmailActivationEnabled();
@@ -568,7 +572,11 @@ void Servatrice::setRequiredFeatures(const QString featureList)
     FeatureSet features;
     serverRequiredFeatureList.clear();
     features.initalizeFeatureList(serverRequiredFeatureList);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+    QStringList listReqFeatures = featureList.split(",", Qt::SkipEmptyParts);
+#else
     QStringList listReqFeatures = featureList.split(",", QString::SkipEmptyParts);
+#endif
     if (!listReqFeatures.isEmpty())
         foreach (QString reqFeature, listReqFeatures)
             features.enableRequiredFeature(serverRequiredFeatureList, reqFeature);

servatrice/src/servatrice_database_interface.cpp

@@ -146,7 +146,11 @@ bool Servatrice_DatabaseInterface::usernameIsValid(const QString &user, QString
     bool allowPunctuationPrefix = settingsCache->value("users/allowpunctuationprefix", false).toBool();
     QString allowedPunctuation = settingsCache->value("users/allowedpunctuation", "_").toString();
     QString disallowedWordsStr = settingsCache->value("users/disallowedwords", "").toString();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+    QStringList disallowedWords = disallowedWordsStr.split(",", Qt::SkipEmptyParts);
+#else
     QStringList disallowedWords = disallowedWordsStr.split(",", QString::SkipEmptyParts);
+#endif
     disallowedWords.removeDuplicates();
     QString disallowedRegExpStr = settingsCache->value("users/disallowedregexp", "").toString();
 

servatrice/src/server_logger.cpp

@@ -57,7 +57,11 @@ void ServerLogger::logMessage(QString message, void *caller)
     // filter out all log entries based on values in configuration file
     bool shouldWeWriteLog = settingsCache->value("server/writelog", 1).toBool();
     QString logFilters = settingsCache->value("server/logfilters").toString();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+    QStringList listlogFilters = logFilters.split(",", Qt::SkipEmptyParts);
+#else
     QStringList listlogFilters = logFilters.split(",", QString::SkipEmptyParts);
+#endif
     bool shouldWeSkipLine = false;
 
     if (!shouldWeWriteLog)

servatrice/src/serversocketinterface.cpp

@@ -808,7 +808,11 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetWarnList(const Comma
     Response_WarnList *re = new Response_WarnList;
 
     QString officialWarnings = settingsCache->value("server/officialwarnings").toString();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+    QStringList warningsList = officialWarnings.split(",", Qt::SkipEmptyParts);
+#else
     QStringList warningsList = officialWarnings.split(",", QString::SkipEmptyParts);
+#endif
     foreach (QString warning, warningsList) {
         re->add_warning(warning.toStdString());
     }
@@ -986,7 +990,11 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
 
     QString emailBlackList = servatrice->getEmailBlackList();
     QString emailAddress = QString::fromStdString(cmd.email());
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+    QStringList emailBlackListFilters = emailBlackList.split(",", Qt::SkipEmptyParts);
+#else
     QStringList emailBlackListFilters = emailBlackList.split(",", QString::SkipEmptyParts);
+#endif
 
     // verify that users email/provider is not blacklisted
     if (!emailBlackList.trimmed().isEmpty()) {

servatrice/src/settingscache.cpp

@@ -12,7 +12,11 @@ SettingsCache::SettingsCache(const QString &fileName, QSettings::Format format,
     isPortableBuild = QFile::exists(qApp->applicationDirPath() + "/portable.dat");
 
     QStringList disallowedRegExpStr =
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+        value("users/disallowedregexp", "").toString().split(",", Qt::SkipEmptyParts);
+#else
         value("users/disallowedregexp", "").toString().split(",", QString::SkipEmptyParts);
+#endif
     disallowedRegExpStr.removeDuplicates();
     for (const QString &regExpStr : disallowedRegExpStr) {
         disallowedRegExp.append(QRegExp(regExpStr));

servatrice/src/smtp/qxtsmtp.cpp

@@ -362,7 +362,11 @@ void QxtSmtpPrivate::authenticate()
     }
     else
     {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+        QStringList auth = extensions["AUTH"].toUpper().split(' ', Qt::SkipEmptyParts);
+#else
         QStringList auth = extensions["AUTH"].toUpper().split(' ', QString::SkipEmptyParts);
+#endif
         if (auth.contains("CRAM-MD5"))
         {
             authCramMD5();