Remove unused BEARER_ENGINE preprocessor define.

9 files changed, 5 insertions, 33 deletions

diff --git a/src/network/bearer/bearer.pri b/src/network/bearer/bearer.pri
index 5bae333..4f6c549 100644
--- a/src/network/bearer/bearer.pri
+++ b/src/network/bearer/bearer.pri
@@ -69,8 +69,6 @@ symbian {
 
     INSTALLS += pkgconfig documentation
 } else {
-    DEFINES += BEARER_ENGINE
-
     HEADERS += bearer/qnetworkconfigmanager_p.h \
                bearer/qnetworkconfiguration_p.h \
                bearer/qnetworksession_p.h \
diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h
index 37e88d3..a45d534 100644
--- a/src/network/bearer/qnetworkconfigmanager_p.h
+++ b/src/network/bearer/qnetworkconfigmanager_p.h
@@ -93,13 +93,10 @@ Q_SIGNALS:
     void onlineStateChanged(bool isOnline);
 
 private:
-#ifdef BEARER_ENGINE
     void updateInternetServiceConfiguration();
 
     void abort();
-#endif
 
-#ifdef BEARER_ENGINE
 public:
     QList<QNetworkSessionEngine *> sessionEngines;
 
@@ -108,14 +105,11 @@ private:
 
     bool updating;
     QSet<int> updatingEngines;
-#endif
 
 private Q_SLOTS:
-#ifdef BEARER_ENGINE
     void configurationAdded(QNetworkConfigurationPrivatePointer ptr);
     void configurationRemoved(QNetworkConfigurationPrivatePointer ptr);
     void configurationChanged(QNetworkConfigurationPrivatePointer ptr);
-#endif
 };
 
 QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate();
diff --git a/src/network/bearer/qnetworkconfiguration_p.h b/src/network/bearer/qnetworkconfiguration_p.h
index 8e69248..365ec95 100644
--- a/src/network/bearer/qnetworkconfiguration_p.h
+++ b/src/network/bearer/qnetworkconfiguration_p.h
@@ -64,12 +64,9 @@ class QNetworkConfigurationPrivate : public QSharedData
 {
 public:
     QNetworkConfigurationPrivate ()
-        : isValid(false), type(QNetworkConfiguration::Invalid), 
-          roamingSupported(false), purpose(QNetworkConfiguration::UnknownPurpose)
+    :   isValid(false), type(QNetworkConfiguration::Invalid),
+        roamingSupported(false), purpose(QNetworkConfiguration::UnknownPurpose), internet(false)
     {
-#ifdef BEARER_ENGINE
-        internet = false;
-#endif
     }
 
     ~QNetworkConfigurationPrivate()
@@ -86,9 +83,7 @@ public:
     bool roamingSupported;
     QNetworkConfiguration::Purpose purpose;
 
-#ifdef BEARER_ENGINE
     bool internet;
-#endif
 
     QList<QNetworkConfigurationPrivatePointer> serviceNetworkMembers;
     QNetworkInterface serviceInterface;
diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h
index 0e11b3d..0a45c92 100644
--- a/src/network/bearer/qnetworksession_p.h
+++ b/src/network/bearer/qnetworksession_p.h
@@ -55,9 +55,7 @@
 
 #include "qnetworkconfigmanager_p.h"
 #include "qnetworksession.h"
-#ifdef BEARER_ENGINE
 #include "qnetworksessionengine_p.h"
-#endif
 
 #include "qnetworksession.h"
 #include <QNetworkInterface>
@@ -65,9 +63,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifdef BEARER_ENGINE
 class QNetworkSessionEngine;
-#endif
 
 class QNetworkSessionPrivate : public QObject
 {
@@ -117,12 +113,10 @@ Q_SIGNALS:
     void quitPendingWaitsForOpened();
 
 private Q_SLOTS:
-#ifdef BEARER_ENGINE
     void networkConfigurationsChanged();
     void configurationChanged(const QNetworkConfiguration &config);
     void forcedSessionClose(const QNetworkConfiguration &config);
     void connectionError(const QString &id, QNetworkSessionEngine::ConnectionError error);
-#endif
 
 private:
     QNetworkConfigurationManager manager;
@@ -146,17 +140,16 @@ private:
     QNetworkSession::State state;
     bool isActive;
 
-#ifdef BEARER_ENGINE
     bool opened;
 
     QNetworkSessionEngine *engine;
-#endif
+
     QNetworkSession::SessionError lastError;
 
     QNetworkSession* q;
     friend class QNetworkSession;
 
-#if defined(BEARER_ENGINE) && defined(BACKEND_NM)
+#if defined(BACKEND_NM)
     QDateTime startTime;
     void setActiveTimeStamp();
 #endif
diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro
index ffac6df..ac04e95 100644
--- a/src/plugins/bearer/corewlan/corewlan.pro
+++ b/src/plugins/bearer/corewlan/corewlan.pro
@@ -11,8 +11,6 @@ contains(QT_CONFIG, corewlan) {
     }
 }
 
-DEFINES += BEARER_ENGINE
-
 HEADERS += qcorewlanengine.h
 SOURCES += qcorewlanengine.mm main.cpp
 
diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro
index 506417c..0015041 100644
--- a/src/plugins/bearer/generic/generic.pro
+++ b/src/plugins/bearer/generic/generic.pro
@@ -3,8 +3,6 @@ include(../../qpluginbase.pri)
 
 QT += network
 
-DEFINES += BEARER_ENGINE
-
 HEADERS += qgenericengine.h \
            ../platformdefs_win.h
 SOURCES += qgenericengine.cpp main.cpp
diff --git a/src/plugins/bearer/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro
index 3aab552..583edd4 100644
--- a/src/plugins/bearer/nativewifi/nativewifi.pro
+++ b/src/plugins/bearer/nativewifi/nativewifi.pro
@@ -3,8 +3,6 @@ include(../../qpluginbase.pri)
 
 QT += network
 
-DEFINES += BEARER_ENGINE
-
 HEADERS += qnativewifiengine.h platformdefs.h
 SOURCES += qnativewifiengine.cpp main.cpp
 
diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro
index 79c68ea..57f7ca7 100644
--- a/src/plugins/bearer/networkmanager/networkmanager.pro
+++ b/src/plugins/bearer/networkmanager/networkmanager.pro
@@ -3,7 +3,7 @@ include(../../qpluginbase.pri)
 
 QT += network dbus
 
-DEFINES += BEARER_ENGINE BACKEND_NM
+DEFINES += BACKEND_NM
 
 HEADERS += qnmdbushelper.h \
            qnetworkmanagerservice.h \
diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro
index 78f3271..62a920a 100644
--- a/src/plugins/bearer/nla/nla.pro
+++ b/src/plugins/bearer/nla/nla.pro
@@ -9,8 +9,6 @@ QT += network
     LIBS += -lWs2
 }
 
-DEFINES += BEARER_ENGINE
-
 HEADERS += qnlaengine.h \
            ../platformdefs_win.h
 SOURCES += qnlaengine.cpp main.cpp