diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2014-10-08 11:35:24 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2014-10-09 09:42:00 +0200 |
commit | 1a5c0b26d062a380fef1bb038a9d96cde7556dc6 (patch) | |
tree | 10f36942a89365b0bea350dab8041801514a2495 /src/plugins/bearer | |
parent | bf1df558461f21827eaad9d5d9541def784980a2 (diff) |
Don't use QStringLiteral in comparisons
For QLatin1String, operator== is overloaded, so comparing to a latin-1
(C) string literal is efficient, since strlen() is comparatively fast.
OTOH, QStringLiteral, when not using RVO, litters the code with
QString dtor calls, which are not inline. Worse, absent lambdas,
it even allocates memory.
So, just compare using QLatin1String instead.
Change-Id: I7af3bf3a67c55dae33ffaf9922d004fa168a3f9c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r-- | src/plugins/bearer/android/src/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bearer/blackberry/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bearer/connman/qconnmanengine.cpp | 4 | ||||
-rw-r--r-- | src/plugins/bearer/connman/qconnmanservice_linux.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bearer/connman/qofonoservice_linux.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/bearer/android/src/main.cpp b/src/plugins/bearer/android/src/main.cpp index 777d262d6b..7b24f5b2ce 100644 --- a/src/plugins/bearer/android/src/main.cpp +++ b/src/plugins/bearer/android/src/main.cpp @@ -46,7 +46,7 @@ class QAndroidBearerEnginePlugin : public QBearerEnginePlugin public: QBearerEngine *create(const QString &key) const Q_DECL_OVERRIDE { - return (key == QStringLiteral("android")) ? new QAndroidBearerEngine() : 0; + return (key == QLatin1String("android")) ? new QAndroidBearerEngine() : 0; } }; diff --git a/src/plugins/bearer/blackberry/main.cpp b/src/plugins/bearer/blackberry/main.cpp index a8177ff192..bc25647f8a 100644 --- a/src/plugins/bearer/blackberry/main.cpp +++ b/src/plugins/bearer/blackberry/main.cpp @@ -50,7 +50,7 @@ public: QBearerEngine *QBBEnginePlugin::create(const QString &key) const { - if (key == QStringLiteral("blackberry")) + if (key == QLatin1String("blackberry")) return new QBBEngine; return 0; diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp index bbff154ff5..733b6f131f 100644 --- a/src/plugins/bearer/connman/qconnmanengine.cpp +++ b/src/plugins/bearer/connman/qconnmanengine.cpp @@ -332,7 +332,7 @@ void QConnmanEngine::serviceStateChanged(const QString &state) QConnmanServiceInterface *service = qobject_cast<QConnmanServiceInterface *>(sender()); configurationChange(service); - if (state == QStringLiteral("failure")) { + if (state == QLatin1String("failure")) { emit connectionError(service->path(), ConnectError); } } @@ -516,7 +516,7 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath) cpPriv->id = servicePath; cpPriv->type = QNetworkConfiguration::InternetAccessPoint; - if (service->security() == QStringLiteral("none")) { + if (service->security() == QLatin1String("none")) { cpPriv->purpose = QNetworkConfiguration::PublicPurpose; } else { cpPriv->purpose = QNetworkConfiguration::PrivatePurpose; diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp index 23860077d7..65c4ac307a 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp +++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp @@ -338,7 +338,7 @@ void QConnmanServiceInterface::connectNotify(const QMetaMethod &signal) void QConnmanServiceInterface::changedProperty(const QString &name, const QDBusVariant &value) { propertiesCacheMap[name] = value.variant(); - if (name == QStringLiteral("State")) + if (name == QLatin1String("State")) Q_EMIT stateChanged(value.variant().toString()); } diff --git a/src/plugins/bearer/connman/qofonoservice_linux.cpp b/src/plugins/bearer/connman/qofonoservice_linux.cpp index ecf79101f0..2ce2bd40e4 100644 --- a/src/plugins/bearer/connman/qofonoservice_linux.cpp +++ b/src/plugins/bearer/connman/qofonoservice_linux.cpp @@ -293,7 +293,7 @@ QVariantMap QOfonoDataConnectionManagerInterface::getProperties() void QOfonoDataConnectionManagerInterface::propertyChanged(const QString &name, const QDBusVariant &value) { propertiesMap[name] = value.variant(); - if (name == QStringLiteral("RoamingAllowed")) + if (name == QLatin1String("RoamingAllowed")) Q_EMIT roamingAllowedChanged(value.variant().toBool()); } |