From 8ecc2da31d00a3d4ae5379f1acffe295a31d891b Mon Sep 17 00:00:00 2001 From: Xizhi Zhu Date: Tue, 17 Jan 2012 15:57:55 +0200 Subject: Remove QNetworkConfiguration::bearerName(). It was added only to maintain source compatibility with Qt Mobility. Change-Id: Iea8d40e401bd1f8d5115268e09b256eacca69ea0 Reviewed-by: Lars Knoll Reviewed-by: Jonas Gastal Reviewed-by: Peter Hartmann --- dist/changes-5.0.0 | 2 ++ src/network/bearer/qnetworkconfiguration.cpp | 8 -------- src/network/bearer/qnetworkconfiguration.h | 4 ---- .../bearer/qnetworksession/test/tst_qnetworksession.cpp | 16 ++++++++-------- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index e8709430d6..31d5a81b7f 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -157,6 +157,8 @@ information about a particular change. - QTcpServer::incomingConnection() now takes a qintptr instead of an int. +- QNetworkConfiguration::bearerName() removed, and bearerTypeName() should be used. + **************************************************************************** * General * 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 @@ -396,14 +396,6 @@ QList QNetworkConfiguration::children() const return results; } -/*! - \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. 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; diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp index 26bdec5c9b..f60dfa620a 100644 --- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp +++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp @@ -273,17 +273,17 @@ void tst_QNetworkSession::sessionProperties() << QLatin1String("WiMAX"); if (!configuration.isValid()) { - QVERIFY(configuration.bearerName().isEmpty()); + QVERIFY(configuration.bearerTypeName().isEmpty()); } else { switch (configuration.type()) { case QNetworkConfiguration::ServiceNetwork: case QNetworkConfiguration::UserChoice: default: - QVERIFY(configuration.bearerName().isEmpty()); + QVERIFY(configuration.bearerTypeName().isEmpty()); break; case QNetworkConfiguration::InternetAccessPoint: - QVERIFY(validBearerNames.contains(configuration.bearerName())); + QVERIFY(validBearerNames.contains(configuration.bearerTypeName())); break; } } @@ -1016,15 +1016,15 @@ QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfigur discoveredConfigs.removeOne(config); } else if ((config.type() == QNetworkConfiguration::InternetAccessPoint) && bearerType == "cellular") { // 'cellular' bearertype is for convenience - if (config.bearerName() != "2G" && - config.bearerName() != "CDMA2000" && - config.bearerName() != "WCDMA" && - config.bearerName() != "HSPA") { + if (config.bearerTypeName() != "2G" && + config.bearerTypeName() != "CDMA2000" && + config.bearerTypeName() != "WCDMA" && + config.bearerTypeName() != "HSPA") { // qDebug() << "Dumping config because bearer mismatches (cellular): " << config.name(); discoveredConfigs.removeOne(config); } } else if ((config.type() == QNetworkConfiguration::InternetAccessPoint) && - bearerType != config.bearerName()) { + bearerType != config.bearerTypeName()) { // qDebug() << "Dumping config because bearer mismatches (WLAN): " << config.name(); discoveredConfigs.removeOne(config); } -- cgit v1.2.3