summaryrefslogtreecommitdiffstats
path: root/examples/network/bearermonitor
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-07-29 06:35:30 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-08-02 00:08:26 (GMT)
commit613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf (patch)
tree78abfb5b571e6d1584f342a42806aad7c7b83d73 /examples/network/bearermonitor
parente93d11c733bb44208089a7488c6e7a176468d407 (diff)
downloadQt-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 'examples/network/bearermonitor')
-rw-r--r--examples/network/bearermonitor/sessionwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp
index 8b5693a..ecc2a93 100644
--- a/examples/network/bearermonitor/sessionwidget.cpp
+++ b/examples/network/bearermonitor/sessionwidget.cpp
@@ -111,11 +111,11 @@ void SessionWidget::updateSession()
killTimer(statsTimer);
if (session->configuration().type() == QNetworkConfiguration::InternetAccessPoint)
- bearer->setText(session->configuration().bearerName());
+ bearer->setText(session->configuration().bearerTypeName());
else {
QNetworkConfigurationManager mgr;
QNetworkConfiguration c = mgr.configurationFromIdentifier(session->sessionProperty("ActiveConfiguration").toString());
- bearer->setText(c.bearerName());
+ bearer->setText(c.bearerTypeName());
}
#ifndef QT_NO_NETWORKINTERFACE