Remove QFactoryInterface from bearer plugins

Change-Id: I8d6736e56f34f49041fff409d040634475eb0bf5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/network/bearer/qbearerplugin_p.h b/src/network/bearer/qbearerplugin_p.h
index b89d17d..97379ec 100644 (file)
--- a/src/network/bearer/qbearerplugin_p.h
+++ b/src/network/bearer/qbearerplugin_p.h
@@ -65,24 +65,15 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
-struct Q_NETWORK_EXPORT QBearerEngineFactoryInterface : public QFactoryInterface
-{
-    virtual QBearerEngine *create(const QString &key) const = 0;
-};
-
 #define QBearerEngineFactoryInterface_iid "org.qt-project.Qt.QBearerEngineFactoryInterface"
-Q_DECLARE_INTERFACE(QBearerEngineFactoryInterface, QBearerEngineFactoryInterface_iid)
 
-class Q_NETWORK_EXPORT QBearerEnginePlugin : public QObject, public QBearerEngineFactoryInterface
+class Q_NETWORK_EXPORT QBearerEnginePlugin : public QObject
 {
     Q_OBJECT
-    Q_INTERFACES(QBearerEngineFactoryInterface:QFactoryInterface)
-
 public:
     explicit QBearerEnginePlugin(QObject *parent = 0);
     virtual ~QBearerEnginePlugin();
 
-    virtual QStringList keys() const = 0;
     virtual QBearerEngine *create(const QString &key) const = 0;
 };
 

diff --git a/src/plugins/bearer/blackberry/main.cpp b/src/plugins/bearer/blackberry/main.cpp
index d293e31..87f86f0 100644 (file)
--- a/src/plugins/bearer/blackberry/main.cpp
+++ b/src/plugins/bearer/blackberry/main.cpp
@@ -53,15 +53,9 @@ class QBBEnginePlugin : public QBearerEnginePlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "blackberry.json")
 
 public:
-    QStringList keys() const;
     QBearerEngine *create(const QString &key) const;
 };
 
-QStringList QBBEnginePlugin::keys() const
-{
-    return QStringList() << QStringLiteral("blackberry");
-}
-
 QBearerEngine *QBBEnginePlugin::create(const QString &key) const
 {
     if (key == QStringLiteral("blackberry"))

diff --git a/src/plugins/bearer/connman/main.cpp b/src/plugins/bearer/connman/main.cpp
index be934c7..8021b22 100644 (file)
--- a/src/plugins/bearer/connman/main.cpp
+++ b/src/plugins/bearer/connman/main.cpp
@@ -58,7 +58,6 @@ public:
     QConnmanEnginePlugin();
     ~QConnmanEnginePlugin();
 
-    QStringList keys() const;
     QBearerEngine *create(const QString &key) const;
 };
 
@@ -70,11 +69,6 @@ QConnmanEnginePlugin::~QConnmanEnginePlugin()
 {
 }
 
-QStringList QConnmanEnginePlugin::keys() const
-{
-    return QStringList() << QLatin1String("connman");
-}
-
 QBearerEngine *QConnmanEnginePlugin::create(const QString &key) const
 {
     if (key == QLatin1String("connman")) {

diff --git a/src/plugins/bearer/corewlan/main.cpp b/src/plugins/bearer/corewlan/main.cpp
index f2ba8bd..174449f 100644 (file)
--- a/src/plugins/bearer/corewlan/main.cpp
+++ b/src/plugins/bearer/corewlan/main.cpp
@@ -58,7 +58,6 @@ public:
     QCoreWlanEnginePlugin();
     ~QCoreWlanEnginePlugin();
 
-    QStringList keys() const;
     QBearerEngine *create(const QString &key) const;
 };
 
@@ -70,11 +69,6 @@ QCoreWlanEnginePlugin::~QCoreWlanEnginePlugin()
 {
 }
 
-QStringList QCoreWlanEnginePlugin::keys() const
-{
-    return QStringList() << QLatin1String("corewlan");
-}
-
 QBearerEngine *QCoreWlanEnginePlugin::create(const QString &key) const
 {
     if (key == QLatin1String("corewlan"))

diff --git a/src/plugins/bearer/generic/main.cpp b/src/plugins/bearer/generic/main.cpp
index 5f5ad7c..ddf0302 100644 (file)
--- a/src/plugins/bearer/generic/main.cpp
+++ b/src/plugins/bearer/generic/main.cpp
@@ -58,7 +58,6 @@ public:
     QGenericEnginePlugin();
     ~QGenericEnginePlugin();
 
-    QStringList keys() const;
     QBearerEngine *create(const QString &key) const;
 };
 
@@ -70,11 +69,6 @@ QGenericEnginePlugin::~QGenericEnginePlugin()
 {
 }
 
-QStringList QGenericEnginePlugin::keys() const
-{
-    return QStringList() << QLatin1String("generic");
-}
-
 QBearerEngine *QGenericEnginePlugin::create(const QString &key) const
 {
     if (key == QLatin1String("generic"))

diff --git a/src/plugins/bearer/nativewifi/main.cpp b/src/plugins/bearer/nativewifi/main.cpp
index 8baa977..a1ecd22 100644 (file)
--- a/src/plugins/bearer/nativewifi/main.cpp
+++ b/src/plugins/bearer/nativewifi/main.cpp
@@ -99,7 +99,6 @@ public:
     QNativeWifiEnginePlugin();
     ~QNativeWifiEnginePlugin();
 
-    QStringList keys() const;
     QBearerEngine *create(const QString &key) const;
 };
 
@@ -111,11 +110,6 @@ QNativeWifiEnginePlugin::~QNativeWifiEnginePlugin()
 {
 }
 
-QStringList QNativeWifiEnginePlugin::keys() const
-{
-    return QStringList() << QLatin1String("nativewifi");
-}
-
 QBearerEngine *QNativeWifiEnginePlugin::create(const QString &key) const
 {
     if (key != QLatin1String("nativewifi"))

diff --git a/src/plugins/bearer/networkmanager/main.cpp b/src/plugins/bearer/networkmanager/main.cpp
index c8a8a74..ae6cae1 100644 (file)
--- a/src/plugins/bearer/networkmanager/main.cpp
+++ b/src/plugins/bearer/networkmanager/main.cpp
@@ -59,7 +59,6 @@ public:
     QNetworkManagerEnginePlugin();
     ~QNetworkManagerEnginePlugin();
 
-    QStringList keys() const;
     QBearerEngine *create(const QString &key) const;
 };
 
@@ -71,11 +70,6 @@ QNetworkManagerEnginePlugin::~QNetworkManagerEnginePlugin()
 {
 }
 
-QStringList QNetworkManagerEnginePlugin::keys() const
-{
-    return QStringList() << QLatin1String("networkmanager");
-}
-
 QBearerEngine *QNetworkManagerEnginePlugin::create(const QString &key) const
 {
     if (key == QLatin1String("networkmanager")) {

diff --git a/src/plugins/bearer/nla/main.cpp b/src/plugins/bearer/nla/main.cpp
index 4a2c915..0150fa7 100644 (file)
--- a/src/plugins/bearer/nla/main.cpp
+++ b/src/plugins/bearer/nla/main.cpp
@@ -56,7 +56,6 @@ public:
     QNlaEnginePlugin();
     ~QNlaEnginePlugin();
 
-    QStringList keys() const;
     QBearerEngine *create(const QString &key) const;
 };
 
@@ -68,11 +67,6 @@ QNlaEnginePlugin::~QNlaEnginePlugin()
 {
 }
 
-QStringList QNlaEnginePlugin::keys() const
-{
-    return QStringList() << QLatin1String("nla");
-}
-
 QBearerEngine *QNlaEnginePlugin::create(const QString &key) const
 {
     if (key == QLatin1String("nla"))