[connectionagent] Remove unused Qt 4/5 ifdefs

Support for Qt 4 was removed, remove left over ifdefs.
sailfishos · Jan 7, 2015 · 3b3178b · 3b3178b
1 parent 8c042c6
commit 3b3178b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 27 deletions.
diff --git a/connd/qconnectionagent.cpp b/connd/qconnectionagent.cpp
@@ -18,7 +18,6 @@
 #include "connectiond_adaptor.h"
 #include "wakeupwatcher.h"
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <connman-qt5/useragent.h>
 #include <connman-qt5/networkmanager.h>
 #include <connman-qt5/networktechnology.h>
@@ -29,17 +28,6 @@
 #include <qofono-qt5/qofononetworkregistration.h>
 #include <qofono-qt5/qofonomanager.h>
 
-#else
-#include <connman-qt/useragent.h>
-#include <connman-qt/networkmanager.h>
-#include <connman-qt/networktechnology.h>
-#include <connman-qt/networkservice.h>
-#include <connman-qt/sessionagent.h>
-#include <qofono-qt/qofonoconnectioncontext.h>
-#include <qofono-qt/qofonoconnectionmanager.h>
-#include <qofono-qt/qofonomanager.h>
-#endif
-
 #include <QtDBus/QDBusConnection>
 
 #include <QObject>

diff --git a/connectionagentplugin/connectionagentplugin_plugin.cpp b/connectionagentplugin/connectionagentplugin_plugin.cpp
@@ -57,7 +57,3 @@ void ConnectionagentpluginPlugin::registerTypes(const char *uri)
     // @uri com.jolla.connection
     qmlRegisterType<ConnectionAgentPlugin>(uri, 1, 0, "ConnectionAgent");
 }
-
-#if QT_VERSION < 0x050000
-Q_EXPORT_PLUGIN2(Connectionagentplugin, ConnectionagentpluginPlugin)
-#endif
diff --git a/connectionagentplugin/connectionagentplugin_plugin.h b/connectionagentplugin/connectionagentplugin_plugin.h
@@ -18,24 +18,14 @@
 #define CONNECTIONAGENTPLUGIN_PLUGIN_H
 #include <QtPlugin>
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QtQml>
 #include <QQmlEngine>
 #include <QQmlExtensionPlugin>
-# define QDeclarativeEngine QQmlEngine
-# define QDeclarativeExtensionPlugin QQmlExtensionPlugin
-#else
-# include <QtDeclarative>
-# include <QDeclarativeEngine>
-# include <QDeclarativeExtensionPlugin>
-#endif
 
-class ConnectionagentpluginPlugin : public QDeclarativeExtensionPlugin
+class ConnectionagentpluginPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-#if QT_VERSION >= 0x050000
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-#endif
 
 public:
     void registerTypes(const char *uri);