Drop obsolete QT_VERSION_CHECK ifdefs from code

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

core/backends/lan/lanlinkprovider.h

@@ -7,17 +7,12 @@
 #ifndef LANLINKPROVIDER_H
 #define LANLINKPROVIDER_H
 
+#include <QNetworkInformation>
 #include <QObject>
 #include <QSslSocket>
 #include <QTcpServer>
 #include <QTimer>
 #include <QUdpSocket>
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <QNetworkConfigurationManager>
-#include <QNetworkSession>
-#else
-#include <QNetworkInformation>
-#endif
 
 #include "backends/linkprovider.h"
 #include "kdeconnectcore_export.h"

kcm/kcm.h

@@ -26,13 +26,6 @@ public:
     KdeConnectKcm(QObject *parent, const QVariantList &);
     ~KdeConnectKcm() override;
 
-#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 105, 0)
-    QWidget *widget()
-    {
-        return this;
-    }
-#endif
-
 private:
     void save() override;
 

kcmplugin/kdeconnectpluginkcm.h

@@ -40,13 +40,6 @@ public:
         return m_config;
     }
 
-#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 105, 0)
-    QWidget *widget()
-    {
-        return this;
-    }
-#endif
-
 private:
     const QString m_deviceId;
     const QString m_pluginName;

plugins/mousepad/x11remoteinput.cpp

@@ -9,11 +9,7 @@
 
 #include <QCursor>
 #include <QDebug>
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <QX11Info>
-#else
 #include <private/qtx11extras_p.h>
-#endif
 
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>

plugins/notifications/notificationsplugin.cpp

@@ -13,12 +13,8 @@
 #include <KPluginFactory>
 #if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
 #include <KStartupInfo>
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <QX11Info>
-#else
 #include <private/qtx11extras_p.h>
 #endif
-#endif
 
 K_PLUGIN_CLASS_WITH_JSON(NotificationsPlugin, "kdeconnect_notifications.json")
 

plugins/sendnotifications/notificationslistener.cpp

@@ -22,10 +22,6 @@ NotificationsListener::NotificationsListener(KdeConnectPlugin *aPlugin)
     : QObject(aPlugin)
     , m_plugin(aPlugin)
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    qRegisterMetaTypeStreamOperators<NotifyingApplication>("NotifyingApplication");
-#endif
-
     setTranslatedAppName();
     loadApplications();
 

plugins/sendnotifications/sendnotifications_config.cpp

@@ -16,10 +16,6 @@ SendNotificationsConfig::SendNotificationsConfig(QObject *parent, const KPluginM
     : KdeConnectPluginKcm(parent, data, args)
     , appModel(new NotifyingApplicationModel)
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    qRegisterMetaTypeStreamOperators<NotifyingApplication>("NotifyingApplication");
-#endif
-
     m_ui.setupUi(widget());
     m_ui.appList->setIconSize(QSize(32, 32));