diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-07-29 06:39:05 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-08-02 00:09:06 (GMT) |
commit | d12f39e50e4144f3272424bb0bff18c857105654 (patch) | |
tree | ffde9a7863c78af2adabcb9c7e85c79d9f79cfc6 /examples | |
parent | 613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf (diff) | |
download | Qt-d12f39e50e4144f3272424bb0bff18c857105654.zip Qt-d12f39e50e4144f3272424bb0bff18c857105654.tar.gz Qt-d12f39e50e4144f3272424bb0bff18c857105654.tar.bz2 |
Use an enum to return the bearer type of a network configuration.
Task-number: QTBUG-12378
Reviewed-by: Alex
Diffstat (limited to 'examples')
-rw-r--r-- | examples/network/bearercloud/cloud.cpp | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/examples/network/bearercloud/cloud.cpp b/examples/network/bearercloud/cloud.cpp index f45ae0d..8deaab3 100644 --- a/examples/network/bearercloud/cloud.cpp +++ b/examples/network/bearercloud/cloud.cpp @@ -53,7 +53,7 @@ #include <math.h> -static QMap<QString, QSvgRenderer *> svgCache; +static QMap<QNetworkConfiguration::BearerType, QSvgRenderer *> svgCache; //! [0] Cloud::Cloud(const QNetworkConfiguration &config, QGraphicsItem *parent) @@ -313,17 +313,25 @@ void Cloud::stateChanged(QNetworkSession::State state) //! [1] void Cloud::newConfigurationActivated() { - const QString bearerTypeName = configuration.bearerTypeName(); - if (!svgCache.contains(bearerTypeName)) { - if (bearerTypeName == QLatin1String("WLAN")) - svgCache.insert(bearerTypeName, new QSvgRenderer(QLatin1String(":wlan.svg"))); - else if (bearerTypeName == QLatin1String("Ethernet")) - svgCache.insert(bearerTypeName, new QSvgRenderer(QLatin1String(":lan.svg"))); - else - svgCache.insert(bearerTypeName, new QSvgRenderer(QLatin1String(":unknown.svg"))); + QNetworkConfiguration::BearerType bearerType = configuration.bearerType(); + if (!svgCache.contains(bearerType)) { + QSvgRenderer *renderer = 0; + switch (bearerType) { + case QNetworkConfiguration::BearerWLAN: + renderer = new QSvgRenderer(QLatin1String(":wlan.svg")); + break; + case QNetworkConfiguration::BearerEthernet: + renderer = new QSvgRenderer(QLatin1String(":lan.svg")); + break; + default: + renderer = new QSvgRenderer(QLatin1String(":unknown.svg")); + } + + if (renderer) + svgCache.insert(bearerType, renderer); } - icon->setSharedRenderer(svgCache[bearerTypeName]); + icon->setSharedRenderer(svgCache[bearerType]); if (configuration.name().isEmpty()) { text->setPlainText(tr("HIDDEN NETWORK")); |