diff options
author | Liang Qi <liang.qi@nokia.com> | 2011-06-20 16:40:58 +0200 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-20 19:24:47 +0200 |
commit | fa2bb6ab6412dd360ff9dfb890ace2f51e0eef86 (patch) | |
tree | 84e43b13d198271da090e23fc657678ae7f40f1c /src/network/bearer/qnetworkconfigmanager.h | |
parent | 8c680aceaa0e1f132501ad15c48bc549fd3fd39d (diff) |
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>
Diffstat (limited to 'src/network/bearer/qnetworkconfigmanager.h')
-rw-r--r-- | src/network/bearer/qnetworkconfigmanager.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h index 0323892923..e317cdfb44 100644 --- 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 |