tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop obsolete QT_VERSION_CHECK ifdefs from code

Browse source 
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner 2023-12-28 18:01:29 +01:00
parent 7ca32817f3
commit 6e99c00d76
No known key found for this signature in database
GPG key ID: C5D682DFAEFD8888
7 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/backends/lan/lanlinkprovider.h
View file

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

7
kcm/kcm.h
View file

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

7
kcmplugin/kdeconnectpluginkcm.h
View file

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

4
plugins/mousepad/x11remoteinput.cpp
View file

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

4
plugins/notifications/notificationsplugin.cpp
View file

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

4
plugins/sendnotifications/notificationslistener.cpp
View file

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

4
plugins/sendnotifications/sendnotifications_config.cpp
View file

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