plugins/bearer: normalize signals/slots
This is the result of running util/normalize --modify from Qt 4.7 with manual review. Change-Id: I7c9539056a4434ed10a0255152eac1781f7833be Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>bb10
parent
8c148a2eec
commit
d7d9364c9c
|
|
@ -510,7 +510,7 @@ void QConnmanEngine::removeConfiguration(const QString &id)
|
|||
QConnmanServiceInterface serv(service);
|
||||
|
||||
disconnect(&serv,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
this,SLOT(servicePropertyChangedContext(QString,QString, QDBusVariant)));
|
||||
this,SLOT(servicePropertyChangedContext(QString,QString,QDBusVariant)));
|
||||
|
||||
serviceNetworks.removeOne(service);
|
||||
|
||||
|
|
@ -533,7 +533,7 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath)
|
|||
serviceNetworks.append(servicePath);
|
||||
|
||||
connect(serv,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
this,SLOT(servicePropertyChangedContext(QString,QString, QDBusVariant)));
|
||||
this,SLOT(servicePropertyChangedContext(QString,QString,QDBusVariant)));
|
||||
QNetworkConfigurationPrivate* cpPriv = new QNetworkConfigurationPrivate();
|
||||
|
||||
QString networkName = serv->getName();
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ void QConnmanManagerInterface::connectNotify(const QMetaMethod &signal)
|
|||
QLatin1String(CONNMAN_MANAGER_PATH),
|
||||
QLatin1String(CONNMAN_MANAGER_INTERFACE),
|
||||
QLatin1String("PropertyChanged"),
|
||||
this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
|
||||
this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
|
||||
qWarning() << "PropertyCHanged not connected";
|
||||
}
|
||||
}
|
||||
|
|
@ -91,7 +91,7 @@ void QConnmanManagerInterface::connectNotify(const QMetaMethod &signal)
|
|||
QLatin1String(CONNMAN_MANAGER_PATH),
|
||||
QLatin1String(CONNMAN_MANAGER_INTERFACE),
|
||||
QLatin1String("StateChanged"),
|
||||
this,SIGNAL(stateChanged(const QString&)))) {
|
||||
this,SIGNAL(stateChanged(QString)))) {
|
||||
qWarning() << "StateChanged not connected";
|
||||
|
||||
}
|
||||
|
|
@ -108,8 +108,8 @@ void QConnmanManagerInterface::connectNotify(const QMetaMethod &signal)
|
|||
helper,SLOT(propertyChanged(QString,QDBusVariant)));
|
||||
|
||||
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
|
||||
this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), Qt::UniqueConnection);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -426,8 +426,8 @@ void QConnmanServiceInterface::connectNotify(const QMetaMethod &signal)
|
|||
QLatin1String("PropertyChanged"),
|
||||
helper,SLOT(propertyChanged(QString,QDBusVariant)));
|
||||
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
|
||||
this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), Qt::UniqueConnection);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -756,8 +756,8 @@ void QConnmanTechnologyInterface::connectNotify(const QMetaMethod &signal)
|
|||
QLatin1String("PropertyChanged"),
|
||||
helper,SLOT(propertyChanged(QString,QDBusVariant)));
|
||||
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
|
||||
this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), Qt::UniqueConnection);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -827,7 +827,7 @@ void QConnmanAgentInterface::connectNotify(const QMetaMethod &signal)
|
|||
// this->path(),
|
||||
// QLatin1String(CONNMAN_NETWORK_INTERFACE),
|
||||
// QLatin1String("PropertyChanged"),
|
||||
// this,SIGNAL(propertyChanged(const QString &, QVariant &)));
|
||||
// this,SIGNAL(propertyChanged(QString,QVariant&)));
|
||||
// }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ void QOfonoManagerInterface::connectNotify(const QMetaMethod &signal)
|
|||
QLatin1String(OFONO_MANAGER_PATH),
|
||||
QLatin1String(OFONO_MANAGER_INTERFACE),
|
||||
QLatin1String("PropertyChanged"),
|
||||
this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
|
||||
this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
|
||||
qWarning() << "PropertyCHanged not connected";
|
||||
}
|
||||
}
|
||||
|
|
@ -113,8 +113,8 @@ void QOfonoManagerInterface::connectNotify(const QMetaMethod &signal)
|
|||
helper,SLOT(propertyChanged(QString,QDBusVariant)));
|
||||
|
||||
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
|
||||
this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -249,7 +249,7 @@ void QOfonoModemInterface::connectNotify(const QMetaMethod &signal)
|
|||
this->path(),
|
||||
QLatin1String(OFONO_MODEM_INTERFACE),
|
||||
QLatin1String("PropertyChanged"),
|
||||
this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
|
||||
this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
|
||||
qWarning() << "PropertyCHanged not connected";
|
||||
}
|
||||
}
|
||||
|
|
@ -266,8 +266,8 @@ void QOfonoModemInterface::connectNotify(const QMetaMethod &signal)
|
|||
helper,SLOT(propertyChanged(QString,QDBusVariant)));
|
||||
|
||||
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
|
||||
this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), Qt::UniqueConnection);
|
||||
}}
|
||||
|
||||
void QOfonoModemInterface::disconnectNotify(const QMetaMethod &signal)
|
||||
|
|
@ -375,7 +375,7 @@ void QOfonoNetworkRegistrationInterface::connectNotify(const QMetaMethod &signal
|
|||
this->path(),
|
||||
QLatin1String(OFONO_NETWORK_REGISTRATION_INTERFACE),
|
||||
QLatin1String("PropertyChanged"),
|
||||
this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
|
||||
this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
|
||||
qWarning() << "PropertyCHanged not connected";
|
||||
}
|
||||
}
|
||||
|
|
@ -392,8 +392,8 @@ void QOfonoNetworkRegistrationInterface::connectNotify(const QMetaMethod &signal
|
|||
helper,SLOT(propertyChanged(QString,QDBusVariant)));
|
||||
|
||||
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
|
||||
this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), Qt::UniqueConnection);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -477,7 +477,7 @@ void QOfonoNetworkOperatorInterface::connectNotify(const QMetaMethod &signal)
|
|||
// this->path(),
|
||||
// QLatin1String(OFONO_NETWORK_OPERATOR_INTERFACE),
|
||||
// QLatin1String("PropertyChanged"),
|
||||
// this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
|
||||
// this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
|
||||
// qWarning() << "PropertyCHanged not connected";
|
||||
// }
|
||||
// }
|
||||
|
|
@ -494,8 +494,8 @@ void QOfonoNetworkOperatorInterface::connectNotify(const QMetaMethod &signal)
|
|||
// helper,SLOT(propertyChanged(QString,QDBusVariant)));
|
||||
|
||||
|
||||
// QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
|
||||
// this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
|
||||
// QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
// this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), Qt::UniqueConnection);
|
||||
// }
|
||||
}
|
||||
|
||||
|
|
@ -585,7 +585,7 @@ void QOfonoSimInterface::connectNotify(const QMetaMethod &signal)
|
|||
// this->path(),
|
||||
// QLatin1String(OFONO_SIM_MANAGER_INTERFACE),
|
||||
// QLatin1String("PropertyChanged"),
|
||||
// this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
|
||||
// this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
|
||||
// qWarning() << "PropertyCHanged not connected";
|
||||
// }
|
||||
// }
|
||||
|
|
@ -602,8 +602,8 @@ void QOfonoSimInterface::connectNotify(const QMetaMethod &signal)
|
|||
// helper,SLOT(propertyChanged(QString,QDBusVariant)));
|
||||
|
||||
|
||||
// QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
|
||||
// this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
|
||||
// QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
// this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), Qt::UniqueConnection);
|
||||
// }
|
||||
}
|
||||
|
||||
|
|
@ -679,7 +679,7 @@ void QOfonoDataConnectionManagerInterface::connectNotify(const QMetaMethod &sign
|
|||
// this->path(),
|
||||
// QLatin1String(OFONO_DATA_CONNECTION_MANAGER_INTERFACE),
|
||||
// QLatin1String("PropertyChanged"),
|
||||
// this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
|
||||
// this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
|
||||
// qWarning() << "PropertyCHanged not connected";
|
||||
// }
|
||||
// }
|
||||
|
|
@ -696,8 +696,8 @@ void QOfonoDataConnectionManagerInterface::connectNotify(const QMetaMethod &sign
|
|||
// helper,SLOT(propertyChanged(QString,QDBusVariant)));
|
||||
|
||||
|
||||
// QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
|
||||
// this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
|
||||
// QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
// this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), Qt::UniqueConnection);
|
||||
// }
|
||||
}
|
||||
|
||||
|
|
@ -803,7 +803,7 @@ void QOfonoPrimaryDataContextInterface::connectNotify(const QMetaMethod &signal)
|
|||
// this->path(),
|
||||
// QLatin1String(OFONO_DATA_CONTEXT_INTERFACE),
|
||||
// QLatin1String("PropertyChanged"),
|
||||
// this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
|
||||
// this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
|
||||
// qWarning() << "PropertyCHanged not connected";
|
||||
// }
|
||||
// }
|
||||
|
|
@ -820,8 +820,8 @@ void QOfonoPrimaryDataContextInterface::connectNotify(const QMetaMethod &signal)
|
|||
// helper,SLOT(propertyChanged(QString,QDBusVariant)));
|
||||
|
||||
|
||||
// QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
|
||||
// this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)), Qt::UniqueConnection);
|
||||
// QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
// this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)), Qt::UniqueConnection);
|
||||
// }
|
||||
}
|
||||
|
||||
|
|
@ -889,7 +889,7 @@ void QOfonoSmsInterface::connectNotify(const QMetaMethod &signal)
|
|||
this->path(),
|
||||
QLatin1String(OFONO_SMS_MANAGER_INTERFACE),
|
||||
QLatin1String("PropertyChanged"),
|
||||
this,SIGNAL(propertyChanged(const QString &, const QDBusVariant & )))) {
|
||||
this,SIGNAL(propertyChanged(QString,QDBusVariant)))) {
|
||||
qWarning() << "PropertyCHanged not connected";
|
||||
}
|
||||
}
|
||||
|
|
@ -906,8 +906,8 @@ void QOfonoSmsInterface::connectNotify(const QMetaMethod &signal)
|
|||
helper,SLOT(propertyChanged(QString,QDBusVariant)));
|
||||
|
||||
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)),
|
||||
this,SIGNAL(propertyChangedContext(const QString &,const QString &,const QDBusVariant &)));
|
||||
QObject::connect(helper,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)),
|
||||
this,SIGNAL(propertyChangedContext(QString,QString,QDBusVariant)));
|
||||
}
|
||||
|
||||
static const QMetaMethod immediateMessageSignal = QMetaMethod::fromSignal(&QOfonoSmsInterface::immediateMessage);
|
||||
|
|
@ -916,7 +916,7 @@ void QOfonoSmsInterface::connectNotify(const QMetaMethod &signal)
|
|||
this->path(),
|
||||
QLatin1String(OFONO_SMS_MANAGER_INTERFACE),
|
||||
QLatin1String("ImmediateMessage"),
|
||||
this,SIGNAL(immediateMessage(QString,QVariantMap )))) {
|
||||
this,SIGNAL(immediateMessage(QString,QVariantMap)))) {
|
||||
qWarning() << "PropertyCHanged not connected";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ QNetworkManagerEngine::QNetworkManagerEngine(QObject *parent)
|
|||
connect(interface, SIGNAL(deviceRemoved(QDBusObjectPath)),
|
||||
this, SLOT(deviceRemoved(QDBusObjectPath)));
|
||||
#if 0
|
||||
connect(interface, SIGNAL(stateChanged(const QString,quint32)),
|
||||
connect(interface, SIGNAL(stateChanged(QString,quint32)),
|
||||
this, SIGNAL(configurationsChanged()));
|
||||
#endif
|
||||
connect(interface, SIGNAL(activationFinished(QDBusPendingCallWatcher*)),
|
||||
|
|
@ -418,8 +418,8 @@ void QNetworkManagerEngine::newConnection(const QDBusObjectPath &path,
|
|||
connections.append(connection);
|
||||
|
||||
connect(connection, SIGNAL(removed(QString)), this, SLOT(removeConnection(QString)));
|
||||
connect(connection, SIGNAL(updated(const QNmSettingsMap&)),
|
||||
this, SLOT(updateConnection(const QNmSettingsMap&)));
|
||||
connect(connection, SIGNAL(updated(QNmSettingsMap)),
|
||||
this, SLOT(updateConnection(QNmSettingsMap)));
|
||||
|
||||
const QString service = connection->connectionInterface()->service();
|
||||
const QString settingsPath = connection->connectionInterface()->path();
|
||||
|
|
|
|||
|
|
@ -81,10 +81,10 @@ QNetworkManagerInterface::QNetworkManagerInterface(QObject *parent)
|
|||
}
|
||||
d->valid = true;
|
||||
nmDBusHelper = new QNmDBusHelper(this);
|
||||
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(const QString &,QMap<QString,QVariant>)),
|
||||
this,SIGNAL(propertiesChanged( const QString &, QMap<QString,QVariant>)));
|
||||
connect(nmDBusHelper,SIGNAL(pathForStateChanged(const QString &, quint32)),
|
||||
this, SIGNAL(stateChanged(const QString&, quint32)));
|
||||
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(QString,QMap<QString,QVariant>)),
|
||||
this,SIGNAL(propertiesChanged(QString,QMap<QString,QVariant>)));
|
||||
connect(nmDBusHelper,SIGNAL(pathForStateChanged(QString,quint32)),
|
||||
this, SIGNAL(stateChanged(QString,quint32)));
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -108,7 +108,7 @@ bool QNetworkManagerInterface::setConnections()
|
|||
QLatin1String(NM_DBUS_PATH),
|
||||
QLatin1String(NM_DBUS_INTERFACE),
|
||||
QLatin1String("PropertiesChanged"),
|
||||
nmDBusHelper,SLOT(slotPropertiesChanged( QMap<QString,QVariant>)))) {
|
||||
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>)))) {
|
||||
allOk = true;
|
||||
}
|
||||
if (!dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
|
||||
|
|
@ -226,14 +226,14 @@ bool QNetworkManagerInterfaceAccessPoint::setConnections()
|
|||
bool allOk = false;
|
||||
delete nmDBusHelper;
|
||||
nmDBusHelper = new QNmDBusHelper(this);
|
||||
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(const QString &,QMap<QString,QVariant>)),
|
||||
this,SIGNAL(propertiesChanged( const QString &, QMap<QString,QVariant>)));
|
||||
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(QString,QMap<QString,QVariant>)),
|
||||
this,SIGNAL(propertiesChanged(QString,QMap<QString,QVariant>)));
|
||||
|
||||
if(dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
|
||||
d->path,
|
||||
QLatin1String(NM_DBUS_INTERFACE_ACCESS_POINT),
|
||||
QLatin1String("PropertiesChanged"),
|
||||
nmDBusHelper,SLOT(slotPropertiesChanged( QMap<QString,QVariant>))) ) {
|
||||
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>))) ) {
|
||||
allOk = true;
|
||||
|
||||
}
|
||||
|
|
@ -333,8 +333,8 @@ bool QNetworkManagerInterfaceDevice::setConnections()
|
|||
bool allOk = false;
|
||||
delete nmDBusHelper;
|
||||
nmDBusHelper = new QNmDBusHelper(this);
|
||||
connect(nmDBusHelper,SIGNAL(pathForStateChanged(const QString &, quint32)),
|
||||
this, SIGNAL(stateChanged(const QString&, quint32)));
|
||||
connect(nmDBusHelper,SIGNAL(pathForStateChanged(QString,quint32)),
|
||||
this, SIGNAL(stateChanged(QString,quint32)));
|
||||
if(dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
|
||||
d->path,
|
||||
QLatin1String(NM_DBUS_INTERFACE_DEVICE),
|
||||
|
|
@ -426,13 +426,13 @@ bool QNetworkManagerInterfaceDeviceWired::setConnections()
|
|||
|
||||
delete nmDBusHelper;
|
||||
nmDBusHelper = new QNmDBusHelper(this);
|
||||
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(const QString &,QMap<QString,QVariant>)),
|
||||
this,SIGNAL(propertiesChanged( const QString &, QMap<QString,QVariant>)));
|
||||
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(QString,QMap<QString,QVariant>)),
|
||||
this,SIGNAL(propertiesChanged(QString,QMap<QString,QVariant>)));
|
||||
if(dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
|
||||
d->path,
|
||||
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRED),
|
||||
QLatin1String("PropertiesChanged"),
|
||||
nmDBusHelper,SLOT(slotPropertiesChanged( QMap<QString,QVariant>))) ) {
|
||||
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>))) ) {
|
||||
allOk = true;
|
||||
}
|
||||
return allOk;
|
||||
|
|
@ -501,20 +501,20 @@ bool QNetworkManagerInterfaceDeviceWireless::setConnections()
|
|||
bool allOk = false;
|
||||
delete nmDBusHelper;
|
||||
nmDBusHelper = new QNmDBusHelper(this);
|
||||
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(const QString &,QMap<QString,QVariant>)),
|
||||
this,SIGNAL(propertiesChanged( const QString &, QMap<QString,QVariant>)));
|
||||
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(QString,QMap<QString,QVariant>)),
|
||||
this,SIGNAL(propertiesChanged(QString,QMap<QString,QVariant>)));
|
||||
|
||||
connect(nmDBusHelper, SIGNAL(pathForAccessPointAdded(const QString &,QDBusObjectPath)),
|
||||
this,SIGNAL(accessPointAdded(const QString &,QDBusObjectPath)));
|
||||
connect(nmDBusHelper, SIGNAL(pathForAccessPointAdded(QString,QDBusObjectPath)),
|
||||
this,SIGNAL(accessPointAdded(QString,QDBusObjectPath)));
|
||||
|
||||
connect(nmDBusHelper, SIGNAL(pathForAccessPointRemoved(const QString &,QDBusObjectPath)),
|
||||
this,SIGNAL(accessPointRemoved(const QString &,QDBusObjectPath)));
|
||||
connect(nmDBusHelper, SIGNAL(pathForAccessPointRemoved(QString,QDBusObjectPath)),
|
||||
this,SIGNAL(accessPointRemoved(QString,QDBusObjectPath)));
|
||||
|
||||
if(!dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
|
||||
d->path,
|
||||
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
|
||||
QLatin1String("AccessPointAdded"),
|
||||
nmDBusHelper, SLOT(slotAccessPointAdded( QDBusObjectPath )))) {
|
||||
nmDBusHelper, SLOT(slotAccessPointAdded(QDBusObjectPath)))) {
|
||||
allOk = true;
|
||||
}
|
||||
|
||||
|
|
@ -523,7 +523,7 @@ bool QNetworkManagerInterfaceDeviceWireless::setConnections()
|
|||
d->path,
|
||||
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
|
||||
QLatin1String("AccessPointRemoved"),
|
||||
nmDBusHelper, SLOT(slotAccessPointRemoved( QDBusObjectPath )))) {
|
||||
nmDBusHelper, SLOT(slotAccessPointRemoved(QDBusObjectPath)))) {
|
||||
allOk = true;
|
||||
}
|
||||
|
||||
|
|
@ -532,7 +532,7 @@ bool QNetworkManagerInterfaceDeviceWireless::setConnections()
|
|||
d->path,
|
||||
QLatin1String(NM_DBUS_INTERFACE_DEVICE_WIRELESS),
|
||||
QLatin1String("PropertiesChanged"),
|
||||
nmDBusHelper,SLOT(slotPropertiesChanged( QMap<QString,QVariant>)))) {
|
||||
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>)))) {
|
||||
allOk = true;
|
||||
}
|
||||
|
||||
|
|
@ -692,8 +692,8 @@ bool QNetworkManagerSettingsConnection::setConnections()
|
|||
|
||||
delete nmDBusHelper;
|
||||
nmDBusHelper = new QNmDBusHelper(this);
|
||||
connect(nmDBusHelper, SIGNAL(pathForSettingsRemoved(const QString &)),
|
||||
this,SIGNAL(removed( const QString &)));
|
||||
connect(nmDBusHelper, SIGNAL(pathForSettingsRemoved(QString)),
|
||||
this,SIGNAL(removed(QString)));
|
||||
|
||||
if (!dbusConnection.connect(d->service, d->path,
|
||||
QLatin1String(NM_DBUS_IFACE_SETTINGS_CONNECTION), QLatin1String("Removed"),
|
||||
|
|
@ -835,13 +835,13 @@ bool QNetworkManagerConnectionActive::setConnections()
|
|||
bool allOk = false;
|
||||
delete nmDBusHelper;
|
||||
nmDBusHelper = new QNmDBusHelper(this);
|
||||
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(const QString &,QMap<QString,QVariant>)),
|
||||
this,SIGNAL(propertiesChanged( const QString &, QMap<QString,QVariant>)));
|
||||
connect(nmDBusHelper, SIGNAL(pathForPropertiesChanged(QString,QMap<QString,QVariant>)),
|
||||
this,SIGNAL(propertiesChanged(QString,QMap<QString,QVariant>)));
|
||||
if(dbusConnection.connect(QLatin1String(NM_DBUS_SERVICE),
|
||||
d->path,
|
||||
QLatin1String(NM_DBUS_INTERFACE_ACTIVE_CONNECTION),
|
||||
QLatin1String("PropertiesChanged"),
|
||||
nmDBusHelper,SLOT(slotPropertiesChanged( QMap<QString,QVariant>))) ) {
|
||||
nmDBusHelper,SLOT(slotPropertiesChanged(QMap<QString,QVariant>))) ) {
|
||||
allOk = true;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue