Remove unused global statics.

7 files changed, 0 insertions, 32 deletions

diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.h b/src/plugins/bearer/corewlan/qcorewlanengine.h
index 7ccfeea..2be81d1 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.h
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.h
@@ -70,7 +70,6 @@ public:
 
     void requestUpdate();
 
-    static QCoreWlanEngine *instance();
     static bool getAllScInterfaces();
 
 private:
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index 9dea217..c6ea56a 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -66,8 +66,6 @@ QMap <QString, QString> networkInterfaces;
 
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC(QCoreWlanEngine, coreWlanEngine)
-
 inline QString cfstringRefToQstring(CFStringRef cfStringRef) {
 //    return QString([cfStringRef UTF8String]);
     QString retVal;
@@ -310,11 +308,6 @@ void QCoreWlanEngine::requestUpdate()
     emit configurationsChanged();
 }
 
-QCoreWlanEngine *QCoreWlanEngine::instance()
-{
-    return coreWlanEngine();
-}
-
 QList<QNetworkConfigurationPrivate *> QCoreWlanEngine::scanForSsids(const QString &interfaceName)
 {
     QList<QNetworkConfigurationPrivate *> foundConfigs;
diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp
index 339ef9c..0d9a958 100644
--- a/src/plugins/bearer/generic/qgenericengine.cpp
+++ b/src/plugins/bearer/generic/qgenericengine.cpp
@@ -56,8 +56,6 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC(QGenericEngine, genericEngine)
-
 static QString qGetInterfaceType(const QString &interface)
 {
 #ifdef Q_OS_WIN32
@@ -170,11 +168,6 @@ void QGenericEngine::requestUpdate()
     QTimer::singleShot(0, this, SLOT(doRequestUpdate()));
 }
 
-QGenericEngine *QGenericEngine::instance()
-{
-    return genericEngine();
-}
-
 void QGenericEngine::doRequestUpdate()
 {
     // Immediately after connecting with a wireless access point
diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h
index 9359d7f..a671ceb 100644
--- a/src/plugins/bearer/generic/qgenericengine.h
+++ b/src/plugins/bearer/generic/qgenericengine.h
@@ -71,8 +71,6 @@ public:
 
     QNetworkSession::State sessionStateForId(const QString &id);
 
-    static QGenericEngine *instance();
-
 private Q_SLOTS:
     void doRequestUpdate();
 
diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
index 5ca49a9..93fc9ca 100644
--- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
@@ -50,8 +50,6 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC(QNativeWifiEngine, nativeWifiEngine)
-
 WlanOpenHandleProto local_WlanOpenHandle = 0;
 WlanRegisterNotificationProto local_WlanRegisterNotification = 0;
 WlanEnumInterfacesProto local_WlanEnumInterfaces = 0;
@@ -63,8 +61,6 @@ WlanScanProto local_WlanScan = 0;
 WlanFreeMemoryProto local_WlanFreeMemory = 0;
 WlanCloseHandleProto local_WlanCloseHandle = 0;
 
-
-
 void qNotificationCallback(WLAN_NOTIFICATION_DATA *data, QNativeWifiEngine *d)
 {
     Q_UNUSED(d);
diff --git a/src/plugins/bearer/nla/qnlaengine.cpp b/src/plugins/bearer/nla/qnlaengine.cpp
index 2ad9cac..47bd8d5 100644
--- a/src/plugins/bearer/nla/qnlaengine.cpp
+++ b/src/plugins/bearer/nla/qnlaengine.cpp
@@ -53,8 +53,6 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC(QNlaEngine, nlaEngine)
-
 QWindowsSockInit2::QWindowsSockInit2()
 :   version(0)
 {
@@ -579,13 +577,6 @@ void QNlaEngine::requestUpdate()
     nlaThread->forceUpdate();
 }
 
-QNlaEngine *QNlaEngine::instance()
-{
-    return nlaEngine();
-}
-
 #include "qnlaengine.moc"
 QT_END_NAMESPACE
 
-
-
diff --git a/src/plugins/bearer/nla/qnlaengine.h b/src/plugins/bearer/nla/qnlaengine.h
index 1e66c83..464275d 100644
--- a/src/plugins/bearer/nla/qnlaengine.h
+++ b/src/plugins/bearer/nla/qnlaengine.h
@@ -92,8 +92,6 @@ public:
 
     void requestUpdate();
 
-    static QNlaEngine *instance();
-
 private:
     QWindowsSockInit2 winSock;
     QNlaThread *nlaThread;