whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Lorn Potter 2014-09-24 08:48:49 +10:00 committed by Giuseppe D'Angelo
parent d41368b4e9
commit 8c242fd65d
2 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/plugins/bearer/connman/qconnmanservice_linux.cpp
View File

@ -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)));
}
}

28
src/plugins/bearer/linux_common/qofonoservice_linux.cpp
View File

@ -67,23 +67,23 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, ObjectPathPropert
QT_BEGIN_NAMESPACE
QOfonoManagerInterface::QOfonoManagerInterface( QObject *parent)
: QDBusAbstractInterface(QStringLiteral(OFONO_SERVICE),
QStringLiteral(OFONO_MANAGER_PATH),
: QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
QLatin1String(OFONO_MANAGER_PATH),
OFONO_MANAGER_INTERFACE,
QDBusConnection::systemBus(), parent)
{
qDBusRegisterMetaType<ObjectPathProperties>();
qDBusRegisterMetaType<PathPropertiesList>();
QDBusConnection::systemBus().connect(QStringLiteral(OFONO_SERVICE),
QStringLiteral(OFONO_MANAGER_PATH),
QStringLiteral(OFONO_MANAGER_INTERFACE),
QStringLiteral("ModemAdded"),
QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
QLatin1String(OFONO_MANAGER_PATH),
QLatin1String(OFONO_MANAGER_INTERFACE),
QLatin1String("ModemAdded"),
this,SLOT(modemAdded(QDBusObjectPath, QVariantMap)));
QDBusConnection::systemBus().connect(QStringLiteral(OFONO_SERVICE),
QStringLiteral(OFONO_MANAGER_PATH),
QStringLiteral(OFONO_MANAGER_INTERFACE),
QStringLiteral("ModemRemoved"),
QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
QLatin1String(OFONO_MANAGER_PATH),
QLatin1String(OFONO_MANAGER_INTERFACE),
QLatin1String("ModemRemoved"),
this,SLOT(modemRemoved(QDBusObjectPath)));
}
@ -137,15 +137,15 @@ void QOfonoManagerInterface::modemRemoved(const QDBusObjectPath &path)
QOfonoModemInterface::QOfonoModemInterface(const QString &dbusPathName, QObject *parent)
: QDBusAbstractInterface(QStringLiteral(OFONO_SERVICE),
: QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
dbusPathName,
OFONO_MODEM_INTERFACE,
QDBusConnection::systemBus(), parent)
{
QDBusConnection::systemBus().connect(QStringLiteral(OFONO_SERVICE),
QDBusConnection::systemBus().connect(QLatin1String(OFONO_SERVICE),
path(),
OFONO_MODEM_INTERFACE,
QStringLiteral("PropertyChanged"),
QLatin1String("PropertyChanged"),
this,SLOT(propertyChanged(QString,QDBusVariant)));
}
@ -199,7 +199,7 @@ QVariant QOfonoModemInterface::getProperty(const QString &property)
QOfonoNetworkRegistrationInterface::QOfonoNetworkRegistrationInterface(const QString &dbusPathName, QObject *parent)
: QDBusAbstractInterface(QStringLiteral(OFONO_SERVICE),
: QDBusAbstractInterface(QLatin1String(OFONO_SERVICE),
dbusPathName,
OFONO_NETWORK_REGISTRATION_INTERFACE,
QDBusConnection::systemBus(), parent)