diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-07-29 06:35:30 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-08-02 00:08:26 (GMT) |
| commit | 613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf (patch) | |
| tree | 78abfb5b571e6d1584f342a42806aad7c7b83d73 /src/network/bearer/qnetworkconfiguration.h | |
| parent | e93d11c733bb44208089a7488c6e7a176468d407 (diff) | |
| download | Qt-613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf.zip Qt-613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf.tar.gz Qt-613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf.tar.bz2 | |
Rename QNetworkConfiguration::bearerName() function.
bearerName() -> bearerTypeName().
bearerName() is deprecated and converted into an inline function which
calls bearerTypeName(). This is required to keep existing code source
compatible between Qt Mobility 1.0.x and Qt 4.7.
Task-number: QTBUG-12378
Reviewed-by: Alex
Diffstat (limited to 'src/network/bearer/qnetworkconfiguration.h')
| -rw-r--r-- | src/network/bearer/qnetworkconfiguration.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index dce39eb..42e8b6a 100644 --- a/src/network/bearer/qnetworkconfiguration.h +++ b/src/network/bearer/qnetworkconfiguration.h @@ -106,7 +106,11 @@ public: StateFlags state() const; Type type() const; Purpose purpose() const; - QString bearerName() const; + + // Required to maintain source compatibility with Qt Mobility. + QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); } + QString bearerTypeName() const; + QString identifier() const; bool isRoamingAvailable() const; QList<QNetworkConfiguration> children() const; |