summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer/networkmanager
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2012-07-12 22:33:33 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-13 12:09:42 +0200
commitd7d9364c9c6e2b30bf2b6933f36060d078e903ef (patch)
treeda8d2b07c7481a79369a4d015015a0fea1260ed1 /src/plugins/bearer/networkmanager
parent8c148a2eec9059f2ab4104fb19352699f2d1b3d0 (diff)
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>
Diffstat (limited to 'src/plugins/bearer/networkmanager')
-rw-r--r--src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp6
-rw-r--r--src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp54
2 files changed, 30 insertions, 30 deletions
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
index 7979e5d2d8..09a3d1b41c 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@@ -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();
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
index f5d12f7623..dd98fadba5 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.cpp
@@ -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;
}