diff options
author | Xizhi Zhu <xizhi.zhu@gmail.com> | 2012-01-17 18:56:47 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 06:22:16 +0100 |
commit | f4d2acdb8ed83fbec7c7236f91dc4af517c09563 (patch) | |
tree | 5374b92248ac12fb51d6d13b7be1721f5a3c0730 /src | |
parent | b12d27ecb01accf1b57cdd0314cd7b53c2e7199d (diff) |
Remove QNetworkConfigurationPrivate::bearerTypeName().
Also, use QStringLiteral instead of QLatin1String.
Change-Id: I232fc02a56261929864c2ea66993ef1c74bc1237
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Diffstat (limited to 'src')
-rw-r--r-- | src/network/bearer/qnetworkconfiguration.cpp | 20 | ||||
-rw-r--r-- | src/network/bearer/qnetworkconfiguration_p.h | 5 |
2 files changed, 9 insertions, 16 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp index 87edc94efe..a2ed38bb35 100644 --- a/src/network/bearer/qnetworkconfiguration.cpp +++ b/src/network/bearer/qnetworkconfiguration.cpp @@ -476,26 +476,24 @@ QString QNetworkConfiguration::bearerTypeName() const switch (d->bearerType) { case BearerUnknown: - return d->bearerTypeName(); + return QStringLiteral("Unknown"); case BearerEthernet: - return QLatin1String("Ethernet"); + return QStringLiteral("Ethernet"); case BearerWLAN: - return QLatin1String("WLAN"); + return QStringLiteral("WLAN"); case Bearer2G: - return QLatin1String("2G"); + return QStringLiteral("2G"); case BearerCDMA2000: - return QLatin1String("CDMA2000"); + return QStringLiteral("CDMA2000"); case BearerWCDMA: - return QLatin1String("WCDMA"); + return QStringLiteral("WCDMA"); case BearerHSPA: - return QLatin1String("HSPA"); + return QStringLiteral("HSPA"); case BearerBluetooth: - return QLatin1String("Bluetooth"); + return QStringLiteral("Bluetooth"); case BearerWiMAX: - return QLatin1String("WiMAX"); + return QStringLiteral("WiMAX"); } - - return QLatin1String("Unknown"); } QT_END_NAMESPACE diff --git a/src/network/bearer/qnetworkconfiguration_p.h b/src/network/bearer/qnetworkconfiguration_p.h index 9acda9210b..559a552157 100644 --- a/src/network/bearer/qnetworkconfiguration_p.h +++ b/src/network/bearer/qnetworkconfiguration_p.h @@ -78,11 +78,6 @@ public: serviceNetworkMembers.clear(); } - virtual QString bearerTypeName() const - { - return QLatin1String("Unknown"); - } - QMap<unsigned int, QNetworkConfigurationPrivatePointer> serviceNetworkMembers; mutable QMutex mutex; |