summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2009-12-22 04:01:30 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2009-12-22 04:35:53 (GMT)
commitf9d1d43e714c467d4101c6bd8eca072fdf9fbdec (patch)
tree404e58eba56016069356e763b13fc98c53be63d3
parentce2439e97af96f6a704522b1aefebd888efd4fff (diff)
downloadQt-f9d1d43e714c467d4101c6bd8eca072fdf9fbdec.zip
Qt-f9d1d43e714c467d4101c6bd8eca072fdf9fbdec.tar.gz
Qt-f9d1d43e714c467d4101c6bd8eca072fdf9fbdec.tar.bz2
Fix compile warnings.
-rw-r--r--src/network/bearer/qgenericengine.cpp2
-rw-r--r--src/network/bearer/qnetworksession.cpp9
2 files changed, 6 insertions, 5 deletions
diff --git a/src/network/bearer/qgenericengine.cpp b/src/network/bearer/qgenericengine.cpp
index 14fa886..d14f0fa 100644
--- a/src/network/bearer/qgenericengine.cpp
+++ b/src/network/bearer/qgenericengine.cpp
@@ -159,7 +159,7 @@ QList<QNetworkConfigurationPrivate *> QGenericEngine::getConfigurations(bool *ok
continue;
// ignore WLAN interface handled in seperate engine
- if (qGetInterfaceType(interface.name()) == "WLAN")
+ if (qGetInterfaceType(interface.name()) == QLatin1String("WLAN"))
continue;
QNetworkConfigurationPrivate *cpPriv = new QNetworkConfigurationPrivate;
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 8ebe1c2..dbea087 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -509,14 +509,14 @@ QVariant QNetworkSession::sessionProperty(const QString& key) const
if (!d->publicConfig.isValid())
return QVariant();
- if (key == "ActiveConfigurationIdentifier") {
+ if (key == QLatin1String("ActiveConfigurationIdentifier")) {
if (!d->isActive)
return QString();
else
return d->activeConfig.identifier();
}
- if (key == "UserChoiceConfigurationIdentifier") {
+ if (key == QLatin1String("UserChoiceConfigurationIdentifier")) {
if (!d->isActive || d->publicConfig.type() != QNetworkConfiguration::UserChoice)
return QString();
@@ -539,9 +539,10 @@ QVariant QNetworkSession::sessionProperty(const QString& key) const
*/
void QNetworkSession::setSessionProperty(const QString& key, const QVariant& value)
{
- if (key == "ActiveConfigurationIdentifier"
- || key == "UserChoiceConfigurationIdentifier")
+ if (key == QLatin1String("ActiveConfigurationIdentifier") ||
+ key == QLatin1String("UserChoiceConfigurationIdentifier")) {
return;
+ }
d->setSessionProperty(key, value);
}