Drop Qt 4 support

src/base/net/dnsupdater.cpp

@@ -31,9 +31,7 @@
 #include <QDebug>
 #include <QRegExp>
 #include <QStringList>
-#ifdef QBT_USES_QT5
 #include <QUrlQuery>
-#endif
 
 #include "base/logger.h"
 #include "base/net/downloadmanager.h"
@@ -158,15 +156,10 @@ QString DNSUpdater::getUpdateUrl() const
     }
     url.setPath("/nic/update");
 
-#ifndef QBT_USES_QT5
-    url.addQueryItem("hostname", m_domain);
-    url.addQueryItem("myip", m_lastIP.toString());
-#else
     QUrlQuery urlQuery(url);
     urlQuery.addQueryItem("hostname", m_domain);
     urlQuery.addQueryItem("myip", m_lastIP.toString());
     url.setQuery(urlQuery);
-#endif
     Q_ASSERT(url.isValid());
 
     qDebug() << Q_FUNC_INFO << url.toString();

src/base/net/downloadmanager.cpp

@@ -79,26 +79,6 @@ namespace
         using QNetworkCookieJar::allCookies;
         using QNetworkCookieJar::setAllCookies;
 
-#ifndef QBT_USES_QT5
-        virtual bool deleteCookie(const QNetworkCookie &cookie)
-        {
-            auto myCookies = allCookies();
-
-            QList<QNetworkCookie>::Iterator it;
-            for (it = myCookies.begin(); it != myCookies.end(); ++it) {
-                if ((it->name() == cookie.name())
-                        && (it->domain() == cookie.domain())
-                        && (it->path() == cookie.path())) {
-                    myCookies.erase(it);
-                    setAllCookies(myCookies);
-                    return true;
-                }
-            }
-
-            return false;
-        }
-#endif
-
         QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const override
         {
             QDateTime now = QDateTime::currentDateTime();

src/base/net/private/geoipdatabase.cpp

@@ -65,10 +65,6 @@ namespace
         Boolean = 14,
         Float = 15
     };
-
-#ifndef QBT_USES_QT5
-    Q_IPV6ADDR createMappedAddress(quint32 ip4);
-#endif
 }
 
 struct DataFieldDescriptor
@@ -166,13 +162,7 @@ QDateTime GeoIPDatabase::buildEpoch() const
 
 QString GeoIPDatabase::lookup(const QHostAddress &hostAddr) const
 {
-#ifndef QBT_USES_QT5
-    Q_IPV6ADDR addr = hostAddr.protocol() == QAbstractSocket::IPv4Protocol
-            ? createMappedAddress(hostAddr.toIPv4Address())
-            : hostAddr.toIPv6Address();
-#else
     Q_IPV6ADDR addr = hostAddr.toIPv6Address();
-#endif
 
     const uchar *ptr = m_data;
 
@@ -496,25 +486,3 @@ QVariant GeoIPDatabase::readArrayValue(quint32 &offset, quint32 count) const
 
     return array;
 }
-
-namespace
-{
-#ifndef QBT_USES_QT5
-    Q_IPV6ADDR createMappedAddress(quint32 ip4)
-    {
-        Q_IPV6ADDR ip6;
-        memset(&ip6, 0, sizeof(ip6));
-
-        int i;
-        for (i = 15; ip4 != 0; i--) {
-            ip6[i] = ip4 & 0xFF;
-            ip4 >>= 8;
-        }
-
-        ip6[11] = 0xFF;
-        ip6[10] = 0xFF;
-
-        return ip6;
-    }
-#endif
-}

src/base/net/smtp.h

@@ -126,8 +126,4 @@ namespace Net
     };
 }
 
-#ifndef QBT_USES_QT5
-Q_DECLARE_METATYPE(QAbstractSocket::SocketError)
-#endif
-
 #endif