Clean-up the macros about Qt Mobility in bearer

Remove the usages of QT_MOBILITY_BEARER, QTM_BEGIN_NAMESPACE and etc.

Change-Id: I68e335c5caa65aa0aebe1a0db82d9633f1724556
Reviewed-on: http://codereview.qt.nokia.com/513
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>

diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h
index 0323892..e317cdf 100644 (file)
--- a/src/network/bearer/qnetworkconfigmanager.h
+++ b/src/network/bearer/qnetworkconfigmanager.h
@@ -42,10 +42,6 @@
 #ifndef QNETWORKCONFIGURATIONMANAGER_H
 #define QNETWORKCONFIGURATIONMANAGER_H
 
-#ifdef QT_MOBILITY_BEARER
-# include "qmobilityglobal.h"
-#endif
-
 #include <QtCore/qobject.h>
 #include <QtNetwork/qnetworkconfiguration.h>
 
@@ -53,17 +49,11 @@
 
 QT_BEGIN_HEADER
 
-#ifndef QT_MOBILITY_BEARER
 QT_BEGIN_NAMESPACE
-#define QNetworkConfigurationManagerExport Q_NETWORK_EXPORT
 QT_MODULE(Network)
-#else
-QTM_BEGIN_NAMESPACE
-#define QNetworkConfigurationManagerExport Q_BEARER_EXPORT
-#endif
 
 class QNetworkConfigurationManagerPrivate;
-class QNetworkConfigurationManagerExport QNetworkConfigurationManager : public QObject
+class Q_NETWORK_EXPORT QNetworkConfigurationManager : public QObject
 {
     Q_OBJECT
 
@@ -104,11 +94,7 @@ Q_SIGNALS:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QNetworkConfigurationManager::Capabilities)
 
-#ifndef QT_MOBILITY_BEARER
 QT_END_NAMESPACE
-#else
-QTM_END_NAMESPACE
-#endif
 
 QT_END_HEADER
 

diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index 86de72b..4839b7b 100644 (file)
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -42,11 +42,7 @@
 #ifndef QNETWORKCONFIGURATION_H
 #define QNETWORKCONFIGURATION_H
 
-#ifndef QT_MOBILITY_BEARER
 # include <QtCore/qglobal.h>
-#else
-# include "qmobilityglobal.h"
-#endif
 
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
@@ -58,17 +54,11 @@
 
 QT_BEGIN_HEADER
 
-#ifndef QT_MOBILITY_BEARER
 QT_BEGIN_NAMESPACE
 QT_MODULE(Network)
-#define QNetworkConfigurationExport Q_NETWORK_EXPORT
-#else
-QTM_BEGIN_NAMESPACE
-#define QNetworkConfigurationExport Q_BEARER_EXPORT
-#endif
 
 class QNetworkConfigurationPrivate;
-class QNetworkConfigurationExport QNetworkConfiguration
+class Q_NETWORK_EXPORT QNetworkConfiguration
 {
 public:
     QNetworkConfiguration();
@@ -102,7 +92,6 @@ public:
     };
     Q_DECLARE_FLAGS(StateFlags, StateFlag)
 
-#ifndef QT_MOBILITY_BEARER
     enum BearerType {
         BearerUnknown,
         BearerEthernet,
@@ -114,22 +103,17 @@ public:
         BearerBluetooth,
         BearerWiMAX
     };
-#endif
 
     StateFlags state() const;
     Type type() const;
     Purpose purpose() const;
 
-#ifndef QT_MOBILITY_BEARER
 #ifdef QT_DEPRECATED
     // Required to maintain source compatibility with Qt Mobility.
     QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); }
 #endif
     BearerType bearerType() const;
     QString bearerTypeName() const;
-#else
-    QString bearerName() const;
-#endif
 
     QString identifier() const;
     bool isRoamingAvailable() const;
@@ -146,11 +130,7 @@ private:
     QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> d;
 };
 
-#ifndef QT_MOBILITY_BEARER
 QT_END_NAMESPACE
-#else
-QTM_END_NAMESPACE
-#endif
 
 QT_END_HEADER
 

diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index 4bc06ee..1eeea02 100644 (file)
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -56,19 +56,12 @@
 
 QT_BEGIN_HEADER
 
-#ifndef QT_MOBILITY_BEARER
 #include <QtCore/qshareddata.h>
 QT_BEGIN_NAMESPACE
 QT_MODULE(Network)
-#define QNetworkSessionExport Q_NETWORK_EXPORT
-#else
-#include "qmobilityglobal.h"
-QTM_BEGIN_NAMESPACE
-#define QNetworkSessionExport Q_BEARER_EXPORT
-#endif
 
 class QNetworkSessionPrivate;
-class QNetworkSessionExport QNetworkSession : public QObject
+class Q_NETWORK_EXPORT QNetworkSession : public QObject
 {
     Q_OBJECT
 
@@ -140,13 +133,9 @@ private:
     QNetworkSessionPrivate *d;
 };
 
-#ifndef QT_MOBILITY_BEARER
 QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QNetworkSession::State)
 Q_DECLARE_METATYPE(QNetworkSession::SessionError)
-#else
-QTM_END_NAMESPACE
-#endif
 
 QT_END_HEADER