Merge pull request #967 from deXol/developPortQt6

Fix Qt6 port build issues

Author: limpkin

daemon.pro

@@ -130,7 +130,8 @@ HEADERS  += \
     src/Settings/DeviceSettings.h \
     src/Settings/DeviceSettingsMini.h \
     src/Settings/DeviceSettingsBLE.h \
-    src/Mooltipass/MPBLEFreeAddressProvider.h
+    src/Mooltipass/MPBLEFreeAddressProvider.h \
+    src/utils/qurltlds_p.h
 
 DISTFILES += \
     src/http-parser/CONTRIBUTIONS \

gui.pro

@@ -92,6 +92,7 @@ HEADERS  += src/MainWindow.h \
     src/WSClient.h \
     src/RotateSpinner.h \
     src/utils/GridLayoutUtil.h \
+    src/utils/qurltlds_p.h \
     src/version.h \
     src/AppGui.h \
     src/DaemonMenuAction.h \

src/ParseDomain.cpp

@@ -1,5 +1,7 @@
 #include "ParseDomain.h"
-
+#if QT_VERSION >= 0x051000
+#include "utils/qurltlds_p.h"
+#endif
 
 ParseDomain::ParseDomain(const QString &url) :
     _url(QUrl::fromUserInput(url))
@@ -60,6 +62,51 @@ ParseDomain::ParseDomain(const QString &url) :
     }
 }
 
+#if QT_VERSION >= 0x051000
+bool ParseDomain::containsTLDEntry(QStringView entry, TLDMatchType match)
+{
+    const QStringView matchSymbols[] = {
+            u"",
+            u"*",
+            u"!",
+        };
+        const auto symbol = matchSymbols[match];
+        int index = qt_hash(entry, qt_hash(symbol)) % tldCount;
+        // select the right chunk from the big table
+        short chunk = 0;
+        uint chunkIndex = tldIndices[index], offset = 0;
+        while (chunk < tldChunkCount && tldIndices[index] >= tldChunks[chunk]) {
+            chunkIndex -= tldChunks[chunk];
+            offset += tldChunks[chunk];
+            chunk++;
+        }
+        // check all the entries from the given index
+        while (chunkIndex < tldIndices[index+1] - offset) {
+            const auto utf8 = tldData[chunk] + chunkIndex;
+            if ((symbol.isEmpty() || QLatin1Char(*utf8) == symbol) && entry == QString::fromUtf8(utf8 + symbol.size()))
+                return true;
+            chunkIndex += qstrlen(utf8) + 1; // +1 for the ending \0
+        }
+        return false;
+}
+
+bool ParseDomain::qIsEffectiveTLD(const QString &domain)
+{
+    // for domain 'foo.bar.com':
+    // 1. return if TLD table contains 'foo.bar.com'
+    // 2. else if table contains '*.bar.com',
+    // 3. test that table does not contain '!foo.bar.com'
+    if (containsTLDEntry(domain, ExactMatch)) // 1
+        return true;
+    const int dot = domain.indexOf(QLatin1Char('.'));
+    if (dot >= 0) {
+        if (containsTLDEntry(domain.mid(dot), SuffixMatch))   // 2
+            return !containsTLDEntry(domain, ExceptionMatch); // 3
+    }
+    return false;
+}
+#endif
+
 QString ParseDomain::getManuallyEnteredDomainName(const QString &service)
 {
     if (!isWebsite())
@@ -83,11 +130,20 @@ QString ParseDomain::getManuallyEnteredDomainName(const QString &service)
  */
 QString ParseDomain::getTopLevel() const
 {
-    QString host = _url.host();
-    int pos = host.lastIndexOf('.');
-    if (-1 != pos)
-    {
-        return host.right(host.size() - pos);
-    }
-    return "";
+#if QT_VERSION >= 0x051000
+    QString domain = _url.host();
+    const QString domainLower = domain.toLower();
+        QStringList sections = domainLower.split(QLatin1Char('.'));
+        if (sections.isEmpty())
+            return QString();
+        QString level, tld;
+        for (int j = sections.count() - 1; j >= 0; --j) {
+            level.prepend(QLatin1Char('.') + sections.at(j));
+            if (qIsEffectiveTLD(level.right(level.size() - 1)))
+                tld = level;
+        }
+        return tld;
+#else
+    return _url.topLevelDomain();
+#endif
 }

src/ParseDomain.h

@@ -66,6 +66,20 @@ class ParseDomain
 private:
     ParseDomain();
 
+#if QT_VERSION >= 0x051000
+    enum TLDMatchType {
+        ExactMatch,
+        SuffixMatch,
+        ExceptionMatch,
+    };
+
+    /**
+     * Functions from qtldurl.cpp
+     */
+    static bool containsTLDEntry(QStringView entry, TLDMatchType match);
+    static bool qIsEffectiveTLD(const QString &domain);
+#endif
+
     QUrl _url;
     bool _isWebsite;
     QString _tld;

src/QSimpleUpdater/src/Downloader.cpp

@@ -114,7 +114,11 @@ void Downloader::startDownload (const QUrl& url)
     m_ui->timeLabel->setText (tr ("Time remaining") + ": " + tr ("unknown"));
 
     /* Start download */
+#if QT_VERSION >= 0x050800
     m_startTime = QDateTime::currentDateTime().toSecsSinceEpoch();
+#else
+    m_startTime = QDateTime::currentDateTime().toTime_t();
+#endif
     m_reply = m_manager->get (QNetworkRequest (url));
 
     /* Ensure that downloads directory exists */
@@ -355,7 +359,11 @@ void Downloader::updateProgress (qint64 received, qint64 total)
  */
 void Downloader::calculateTimeRemaining (qint64 received, qint64 total)
 {
+#if QT_VERSION >= 0x050800
     quint64 difference = QDateTime::currentDateTime().toSecsSinceEpoch() - m_startTime;
+#else
+    quint64 difference = QDateTime::currentDateTime().toTime_t() - m_startTime;
+#endif
 
     if (difference > 0) {
         QString timeString;