remove dependency on deprecated qt5 libraries for qt6 (#4692)

* remove dependency on deprecated qt5 libraries for qt6

removes the use of qt6-5compat for builds
replaces use of QRegExp with QRegularExpression
fixes incorrect usage of QRegExp
removes use of QTextCodec
fixes incorrect usage of QTextCodec
sets qtlinguist as a required component for qt6

* fix anchoredPattern not existing in qt 5.11

servatrice/src/main.cpp

@@ -32,7 +32,6 @@
 #include <QDateTime>
 #include <QFile>
 #include <QMetaType>
-#include <QTextCodec>
 #include <QtGlobal>
 #include <iostream>
 

servatrice/src/servatrice_database_interface.cpp

@@ -177,23 +177,23 @@ bool Servatrice_DatabaseInterface::usernameIsValid(const QString &user, QString
             return false;
     }
 
-    for (const QRegExp &regExp : settingsCache->disallowedRegExp) {
-        if (regExp.exactMatch(user))
+    for (const QRegularExpression &regExp : settingsCache->disallowedRegExp) {
+        if (regExp.match(user).hasMatch())
             return false;
     }
 
-    QString regEx("[");
+    QString regEx("\\A[");
     if (allowLowercase)
         regEx.append("a-z");
     if (allowUppercase)
         regEx.append("A-Z");
     if (allowNumerics)
         regEx.append("0-9");
-    regEx.append(QRegExp::escape(allowedPunctuation));
-    regEx.append("]+");
+    regEx.append(QRegularExpression::escape(allowedPunctuation));
+    regEx.append("]+\\z");
 
-    static QRegExp re = QRegExp(regEx);
-    return re.exactMatch(user);
+    QRegularExpression re = QRegularExpression(regEx);
+    return re.match(user).hasMatch();
 }
 
 bool Servatrice_DatabaseInterface::registerUser(const QString &userName,

servatrice/src/settingscache.cpp

@@ -19,7 +19,7 @@ SettingsCache::SettingsCache(const QString &fileName, QSettings::Format format,
 #endif
     disallowedRegExpStr.removeDuplicates();
     for (const QString &regExpStr : disallowedRegExpStr) {
-        disallowedRegExp.append(QRegExp(regExpStr));
+        disallowedRegExp.append(QRegularExpression(QString("\\A%1\\z").arg(regExpStr)));
     }
 }
 

servatrice/src/settingscache.h

@@ -2,7 +2,7 @@
 #define SERVATRICE_SETTINGSCACHE_H
 
 #include <QList>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QSettings>
 #include <QString>
 
@@ -17,7 +17,7 @@ public:
                   QSettings::Format format = QSettings::IniFormat,
                   QObject *parent = 0);
     static QString guessConfigurationPath();
-    QList<QRegExp> disallowedRegExp;
+    QList<QRegularExpression> disallowedRegExp;
     bool getIsPortableBuild() const
     {
         return isPortableBuild;

servatrice/src/smtp/qxtmail_p.h

@@ -26,12 +26,10 @@
 #define QXTMAIL_P_H
 
 #include <QByteArray>
-#include <QTextCodec>
 
 #define QXT_MUST_QP(x) (x < char(32) || x > char(126) || x == '=' || x == '?')
 QByteArray qxt_fold_mime_header(const QString &key,
                                 const QString &value,
-                                QTextCodec *latin1,
                                 const QByteArray &prefix = QByteArray());
 
 #endif // QXTMAIL_P_H

servatrice/src/smtp/qxtmailattachment.cpp

@@ -34,7 +34,6 @@
 
 #include "qxtmailattachment.h"
 #include "qxtmail_p.h"
-#include <QTextCodec>
 #include <QBuffer>
 #include <QPointer>
 #include <QFile>
@@ -187,11 +186,10 @@ QByteArray QxtMailAttachment::mimeData()
         return QByteArray();
     }
 
-    QTextCodec* latin1 = QTextCodec::codecForName("latin1");
     QByteArray rv = "Content-Type: " + qxt_d->contentType.toLatin1() + "\r\nContent-Transfer-Encoding: base64\r\n";
     foreach(const QString& r, qxt_d->extraHeaders.keys())
     {
-        rv += qxt_fold_mime_header(r.toLatin1(), extraHeader(r), latin1);
+        rv += qxt_fold_mime_header(r.toLatin1(), extraHeader(r));
     }
     rv += "\r\n";
 

servatrice/src/smtp/qxtmailmessage.cpp

@@ -35,10 +35,17 @@
 #include "qxtmail_p.h"
 
 #include <QDir>
-#include <QTextCodec>
 #include <QUuid>
 #include <QtDebug>
 
+static bool isASCII(const QString &string) {
+  for(const QChar &chr : string){
+    if(chr.unicode() > 0x7f)
+      return false;
+  }
+  return true;
+}
+
 struct QxtMailMessagePrivate : public QSharedData
 {
     QxtMailMessagePrivate()
@@ -204,13 +211,13 @@ void QxtMailMessage::removeAttachment(const QString &filename)
     qxt_d->attachments.remove(filename);
 }
 
-QByteArray qxt_fold_mime_header(const QString &key, const QString &value, QTextCodec *latin1, const QByteArray &prefix)
+QByteArray qxt_fold_mime_header(const QString &key, const QString &value, const QByteArray &prefix)
 {
     QByteArray rv = "";
     QByteArray line = key.toLatin1() + ": ";
     if (!prefix.isEmpty())
         line += prefix;
-    if (!value.contains("=?") && latin1->canEncode(value)) {
+    if (!value.contains("=?") && isASCII(value)) {
         bool firstWord = true;
         foreach (const QByteArray &word, value.toLatin1().split(' ')) {
             if (line.size() > 78) {
@@ -274,26 +281,25 @@ QByteArray QxtMailMessage::rfc2822() const
     // Use base64 if requested
     bool useBase64 = (extraHeader("Content-Transfer-Encoding").toLower() == "base64");
     // Check to see if plain text is ASCII-clean; assume it isn't if QP or base64 was requested
-    QTextCodec *latin1 = QTextCodec::codecForName("latin1");
-    bool bodyIsAscii = latin1->canEncode(body()) && !useQuotedPrintable && !useBase64;
+    bool bodyIsAscii = !useQuotedPrintable && !useBase64 && isASCII(body());
 
     QHash<QString, QxtMailAttachment> attach = attachments();
     QByteArray rv;
 
     if (!sender().isEmpty() && !hasExtraHeader("From")) {
-        rv += qxt_fold_mime_header("From", sender(), latin1);
+        rv += qxt_fold_mime_header("From", sender());
     }
 
     if (!qxt_d->rcptTo.isEmpty()) {
-        rv += qxt_fold_mime_header("To", qxt_d->rcptTo.join(", "), latin1);
+        rv += qxt_fold_mime_header("To", qxt_d->rcptTo.join(", "));
     }
 
     if (!qxt_d->rcptCc.isEmpty()) {
-        rv += qxt_fold_mime_header("Cc", qxt_d->rcptCc.join(", "), latin1);
+        rv += qxt_fold_mime_header("Cc", qxt_d->rcptCc.join(", "));
     }
 
     if (!subject().isEmpty()) {
-        rv += qxt_fold_mime_header("Subject", subject(), latin1);
+        rv += qxt_fold_mime_header("Subject", subject());
     }
 
     if (!bodyIsAscii) {
@@ -338,7 +344,7 @@ QByteArray QxtMailMessage::rfc2822() const
             // Since we're in multipart mode, we'll be outputting this later
             continue;
         }
-        rv += qxt_fold_mime_header(r.toLatin1(), extraHeader(r), latin1);
+        rv += qxt_fold_mime_header(r.toLatin1(), extraHeader(r));
     }
 
     rv += "\r\n";
@@ -366,7 +372,7 @@ QByteArray QxtMailMessage::rfc2822() const
     }
 
     if (bodyIsAscii) {
-        QByteArray b = latin1->fromUnicode(body());
+        QByteArray b = body().toLatin1();
         int len = b.length();
         QByteArray line = "";
         QByteArray word = "";
@@ -460,7 +466,7 @@ QByteArray QxtMailMessage::rfc2822() const
         foreach (const QString &filename, attach.keys()) {
             rv += "--" + qxt_d->boundary + "\r\n";
             rv +=
-                qxt_fold_mime_header("Content-Disposition", QDir(filename).dirName(), latin1, "attachment; filename=");
+                qxt_fold_mime_header("Content-Disposition", QDir(filename).dirName(), "attachment; filename=");
             rv += attach[filename].mimeData();
         }
         rv += "--" + qxt_d->boundary + "--\r\n";