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/qnetworksession.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/qnetworksession.h')
| -rw-r--r-- | src/network/bearer/qnetworksession.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index 4bc06eef2b..1eeea02ae1 100644 --- 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 |