diff options
Diffstat (limited to 'src/network/bearer/qnetworkconfiguration.h')
| -rw-r--r-- | src/network/bearer/qnetworkconfiguration.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index 86de72b2df..4839b7b809 100644 --- 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 |