AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QFactoryInterface from bearer plugins

Browse Source 
Change-Id: I8d6736e56f34f49041fff409d040634475eb0bf5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2012-05-27 05:04:48 +02:00 committed by Qt by Nokia
parent 0b69385e42
commit cf9264bb6b
8 changed files with 1 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/bearer/qbearerplugin_p.h
View File

@ -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;
};

6
src/plugins/bearer/blackberry/main.cpp
View File

@ -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"))

6
src/plugins/bearer/connman/main.cpp
View File

@ -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")) {

6
src/plugins/bearer/corewlan/main.cpp
View File

@ -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"))

6
src/plugins/bearer/generic/main.cpp
View File

@ -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"))

6
src/plugins/bearer/nativewifi/main.cpp
View File

@ -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"))

6
src/plugins/bearer/networkmanager/main.cpp
View File

@ -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")) {

6
src/plugins/bearer/nla/main.cpp
View File

@ -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"))