summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer/connman
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@jollamobile.com>2014-09-24 08:48:49 +1000
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2015-03-22 16:38:15 +0000
commit8c242fd65d7f38aaf2ffa62993d70df7d317ec44 (patch)
treeb45e9f481ee281256536e8d09646444b04201f2d /src/plugins/bearer/connman
parentd41368b4e9e8d3abc0ced08392cd1be2e37c9d37 (diff)
Fix a crash in connman bearer backend on d'tor when using QStringLiteral
Task-number: QTBUG-41507 Change-Id: I7711eb34bf9ca738fb25031acff3371a6126ae23 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Diffstat (limited to 'src/plugins/bearer/connman')
-rw-r--r--src/plugins/bearer/connman/qconnmanservice_linux.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
index 65c4ac307a..b690b97ddd 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp
+++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
@@ -67,8 +67,8 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, ConnmanMap &map)
}
QConnmanManagerInterface::QConnmanManagerInterface( QObject *parent)
- : QDBusAbstractInterface(QStringLiteral(CONNMAN_SERVICE),
- QStringLiteral(CONNMAN_MANAGER_PATH),
+ : QDBusAbstractInterface(QLatin1String(CONNMAN_SERVICE),
+ QLatin1String(CONNMAN_MANAGER_PATH),
CONNMAN_MANAGER_INTERFACE,
QDBusConnection::systemBus(), parent)
{
@@ -82,23 +82,23 @@ QConnmanManagerInterface::QConnmanManagerInterface( QObject *parent)
QObject::connect(watcher,SIGNAL(finished(QDBusPendingCallWatcher*)),
this, SLOT(propertiesReply(QDBusPendingCallWatcher*)));
- QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE),
- QStringLiteral(CONNMAN_MANAGER_PATH),
- QStringLiteral(CONNMAN_SERVICE_INTERFACE),
- QStringLiteral("PropertyChanged"),
+ QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE),
+ QLatin1String(CONNMAN_MANAGER_PATH),
+ QLatin1String(CONNMAN_SERVICE_INTERFACE),
+ QLatin1String("PropertyChanged"),
this,SLOT(changedProperty(QString,QDBusVariant)));
- QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE),
- QStringLiteral(CONNMAN_MANAGER_PATH),
- QStringLiteral(CONNMAN_SERVICE_INTERFACE),
- QStringLiteral("TechnologyAdded"),
+ QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE),
+ QLatin1String(CONNMAN_MANAGER_PATH),
+ QLatin1String(CONNMAN_SERVICE_INTERFACE),
+ QLatin1String("TechnologyAdded"),
this,SLOT(technologyAdded(QDBusObjectPath,QVariantMap)));
- QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE),
- QStringLiteral(CONNMAN_MANAGER_PATH),
- QStringLiteral(CONNMAN_SERVICE_INTERFACE),
- QStringLiteral("TechnologyRemoved"),
+ QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE),
+ QLatin1String(CONNMAN_MANAGER_PATH),
+ QLatin1String(CONNMAN_SERVICE_INTERFACE),
+ QLatin1String("TechnologyRemoved"),
this,SLOT(technologyRemoved(QDBusObjectPath)));
QList<QVariant> argumentList2;
@@ -152,10 +152,10 @@ void QConnmanManagerInterface::connectNotify(const QMetaMethod &signal)
{
static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QConnmanManagerInterface::propertyChanged);
if (signal == propertyChangedSignal) {
- if (!connection().connect(QStringLiteral(CONNMAN_SERVICE),
- QStringLiteral(CONNMAN_MANAGER_PATH),
- QStringLiteral(CONNMAN_MANAGER_INTERFACE),
- QStringLiteral("PropertyChanged"),
+ if (!connection().connect(QLatin1String(CONNMAN_SERVICE),
+ QLatin1String(CONNMAN_MANAGER_PATH),
+ QLatin1String(CONNMAN_MANAGER_INTERFACE),
+ QLatin1String("PropertyChanged"),
this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
qWarning() << "PropertyChanged not connected";
}
@@ -163,10 +163,10 @@ void QConnmanManagerInterface::connectNotify(const QMetaMethod &signal)
static const QMetaMethod servicesChangedSignal = QMetaMethod::fromSignal(&QConnmanManagerInterface::servicesChanged);
if (signal == servicesChangedSignal) {
- if (!connection().connect(QStringLiteral(CONNMAN_SERVICE),
- QStringLiteral(CONNMAN_MANAGER_PATH),
- QStringLiteral(CONNMAN_MANAGER_INTERFACE),
- QStringLiteral("ServicesChanged"),
+ if (!connection().connect(QLatin1String(CONNMAN_SERVICE),
+ QLatin1String(CONNMAN_MANAGER_PATH),
+ QLatin1String(CONNMAN_MANAGER_INTERFACE),
+ QLatin1String("ServicesChanged"),
this,SLOT(onServicesChanged(ConnmanMapList, QList<QDBusObjectPath>)))) {
qWarning() << "servicesChanged not connected";
}
@@ -275,7 +275,7 @@ void QConnmanManagerInterface::technologyRemoved(const QDBusObjectPath &path)
}
QConnmanServiceInterface::QConnmanServiceInterface(const QString &dbusPathName,QObject *parent)
- : QDBusAbstractInterface(QStringLiteral(CONNMAN_SERVICE),
+ : QDBusAbstractInterface(QLatin1String(CONNMAN_SERVICE),
dbusPathName,
CONNMAN_SERVICE_INTERFACE,
QDBusConnection::systemBus(), parent)
@@ -288,10 +288,10 @@ QConnmanServiceInterface::QConnmanServiceInterface(const QString &dbusPathName,Q
QObject::connect(watcher,SIGNAL(finished(QDBusPendingCallWatcher*)),
this, SLOT(propertiesReply(QDBusPendingCallWatcher*)));
- QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE),
+ QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE),
path(),
- QStringLiteral(CONNMAN_SERVICE_INTERFACE),
- QStringLiteral("PropertyChanged"),
+ QLatin1String(CONNMAN_SERVICE_INTERFACE),
+ QLatin1String("PropertyChanged"),
this,SLOT(changedProperty(QString,QDBusVariant)));
}
@@ -327,10 +327,10 @@ void QConnmanServiceInterface::connectNotify(const QMetaMethod &signal)
{
static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QConnmanServiceInterface::propertyChanged);
if (signal == propertyChangedSignal) {
- QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE),
+ QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE),
path(),
- QStringLiteral(CONNMAN_SERVICE_INTERFACE),
- QStringLiteral("PropertyChanged"),
+ QLatin1String(CONNMAN_SERVICE_INTERFACE),
+ QLatin1String("PropertyChanged"),
this,SIGNAL(propertyChanged(QString,QDBusVariant)));
}
}
@@ -440,7 +440,7 @@ QStringList QConnmanServiceInterface::services()
//////////////////////////
QConnmanTechnologyInterface::QConnmanTechnologyInterface(const QString &dbusPathName,QObject *parent)
- : QDBusAbstractInterface(QStringLiteral(CONNMAN_SERVICE),
+ : QDBusAbstractInterface(QLatin1String(CONNMAN_SERVICE),
dbusPathName,
CONNMAN_TECHNOLOGY_INTERFACE,
QDBusConnection::systemBus(), parent)
@@ -455,10 +455,10 @@ void QConnmanTechnologyInterface::connectNotify(const QMetaMethod &signal)
{
static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QConnmanTechnologyInterface::propertyChanged);
if (signal == propertyChangedSignal) {
- QDBusConnection::systemBus().connect(QStringLiteral(CONNMAN_SERVICE),
+ QDBusConnection::systemBus().connect(QLatin1String(CONNMAN_SERVICE),
path(),
- QStringLiteral(CONNMAN_TECHNOLOGY_INTERFACE),
- QStringLiteral("PropertyChanged"),
+ QLatin1String(CONNMAN_TECHNOLOGY_INTERFACE),
+ QLatin1String("PropertyChanged"),
this,SIGNAL(propertyChanged(QString,QDBusVariant)));
}
}