From 0d7a0b1bf2ab50621ed662a3e178d2ad5add4114 Mon Sep 17 00:00:00 2001
From: Wolfgang Beck <wolfgang.beck@nokia.com>
Date: Tue, 30 Mar 2010 11:53:42 +1000
Subject: MONILITY-645 Merging bearer header.

---
 src/network/bearer/qnetworkconfigmanager.h   | 23 ++++++++++++++++-----
 src/network/bearer/qnetworkconfiguration.h   | 30 ++++++++++++++++++++++------
 src/network/bearer/qnetworksession.h         | 28 +++++++++++++++++++-------
 src/plugins/bearer/nativewifi/platformdefs.h |  4 ++++
 src/plugins/bearer/platformdefs_win.h        |  4 ++++
 5 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h
index bb4d8a0..19951f8 100644
--- a/src/network/bearer/qnetworkconfigmanager.h
+++ b/src/network/bearer/qnetworkconfigmanager.h
@@ -42,17 +42,26 @@
 #ifndef QNETWORKCONFIGURATIONMANAGER_H
 #define QNETWORKCONFIGURATIONMANAGER_H
 
+#ifdef QT_MOBILITY_BEARER
+# include "qmobilityglobal.h"
+#endif
+
 #include <QtCore/qobject.h>
 #include <QtNetwork/qnetworkconfiguration.h>
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Network)
+#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 Q_NETWORK_EXPORT QNetworkConfigurationManager : public QObject
+class QNetworkConfigurationManagerExport QNetworkConfigurationManager : public QObject
 {
     Q_OBJECT
 
@@ -94,7 +103,11 @@ Q_SIGNALS:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QNetworkConfigurationManager::Capabilities)
 
-QT_END_NAMESPACE
+#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 dad6198..3b49d0a 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -42,19 +42,33 @@
 #ifndef QNETWORKCONFIGURATION_H
 #define QNETWORKCONFIGURATION_H
 
-#include <QtCore/qglobal.h>
+#ifndef QT_MOBILITY_BEARER
+# include <QtCore/qglobal.h>
+#else
+# include "qmobilityglobal.h"
+#endif
+
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qlist.h>
 
-QT_BEGIN_HEADER
+#if defined(Q_OS_WIN) && defined(interface)
+#undef interface
+#endif
 
-QT_BEGIN_NAMESPACE
+QT_BEGIN_HEADER
 
-QT_MODULE(Network)
+#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 Q_NETWORK_EXPORT QNetworkConfiguration
+class QNetworkConfigurationExport QNetworkConfiguration
 {
 public:
     QNetworkConfiguration();
@@ -108,7 +122,11 @@ private:
     QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> d;
 };
 
-QT_END_NAMESPACE
+#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 596f527..2681d1f 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -54,12 +54,19 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Network)
+#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 Q_NETWORK_EXPORT QNetworkSession : public QObject
+class QNetworkSessionExport QNetworkSession : public QObject
 {
     Q_OBJECT
 public:
@@ -80,8 +87,11 @@ public:
         OperationNotSupportedError,
         InvalidConfigurationError
     };
-
-    explicit QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0);
+#ifndef QT_MOBILITY_BEARER
+    QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0);
+#else
+	explicit QNetworkSession(const QNetworkConfiguration& connConfig, QObject* parent =0);
+#endif
     virtual ~QNetworkSession();
 
     bool isOpen() const;
@@ -131,7 +141,11 @@ private:
     friend class QNetworkSessionPrivate;
     };
 
-QT_END_NAMESPACE
+#ifndef QT_MOBILITY_BEARER
+ QT_END_NAMESPACE
+#else
+ QTM_END_NAMESPACE
+#endif
 
 QT_END_HEADER
 
diff --git a/src/plugins/bearer/nativewifi/platformdefs.h b/src/plugins/bearer/nativewifi/platformdefs.h
index 57ae852..d67525a 100644
--- a/src/plugins/bearer/nativewifi/platformdefs.h
+++ b/src/plugins/bearer/nativewifi/platformdefs.h
@@ -52,6 +52,8 @@
 #define WLAN_AVAILABLE_NETWORK_HAS_PROFILE 2
 #define DOT11_SSID_MAX_LENGTH 32
 
+QT_BEGIN_NAMESPACE
+
 struct WLAN_NOTIFICATION_DATA {
     DWORD NotificationSource;
     DWORD NotificationCode;
@@ -319,4 +321,6 @@ extern WlanScanProto local_WlanScan;
 extern WlanFreeMemoryProto local_WlanFreeMemory;
 extern WlanCloseHandleProto local_WlanCloseHandle;
 
+QT_END_NAMESPACE
+
 #endif // PLATFORMDEFS_H
diff --git a/src/plugins/bearer/platformdefs_win.h b/src/plugins/bearer/platformdefs_win.h
index 37d099c..1a10ba7 100644
--- a/src/plugins/bearer/platformdefs_win.h
+++ b/src/plugins/bearer/platformdefs_win.h
@@ -47,6 +47,8 @@
 #undef interface
 #include <winioctl.h>
 
+QT_BEGIN_NAMESPACE
+
 #ifndef NS_NLA
 
 #define NS_NLA 15
@@ -131,4 +133,6 @@ enum NDIS_PHYSICAL_MEDIUM {
 #define IOCTL_NDIS_QUERY_GLOBAL_STATS \
     CTL_CODE(FILE_DEVICE_PHYSICAL_NETCARD, 0, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
 
+QT_END_NAMESPACE
+
 #endif
-- 
cgit v0.12