diff options
| author | Xizhi Zhu <xizhi.zhu@gmail.com> | 2012-01-17 15:57:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-18 12:53:13 +0100 |
| commit | 8ecc2da31d00a3d4ae5379f1acffe295a31d891b (patch) | |
| tree | 58b4b14010129a2da1edb88a1d5ebb9118459bac /src | |
| parent | 44cf5592acf97ecb2c83e9d7451de08b97498036 (diff) | |
Remove QNetworkConfiguration::bearerName().
It was added only to maintain source compatibility with Qt Mobility.
Change-Id: Iea8d40e401bd1f8d5115268e09b256eacca69ea0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/bearer/qnetworkconfiguration.cpp | 8 | ||||
| -rw-r--r-- | src/network/bearer/qnetworkconfiguration.h | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp index 150e1cf715..87edc94efe 100644 --- a/src/network/bearer/qnetworkconfiguration.cpp +++ b/src/network/bearer/qnetworkconfiguration.cpp @@ -397,14 +397,6 @@ QList<QNetworkConfiguration> QNetworkConfiguration::children() const } /*! - \fn QString QNetworkConfiguration::bearerName() const - \deprecated - - This function is deprecated. It is equivalent to calling bearerTypeName(), however - bearerType() should be used in preference. -*/ - -/*! Returns the type of bearer used by this network configuration. If the bearer type is \l {QNetworkConfiguration::BearerUnknown}{unknown} the bearerTypeName() diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index 5b650d0303..9a4d78020c 100644 --- a/src/network/bearer/qnetworkconfiguration.h +++ b/src/network/bearer/qnetworkconfiguration.h @@ -108,10 +108,6 @@ public: Type type() const; Purpose purpose() const; -#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; |