diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2012-07-12 22:33:33 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-13 12:09:42 +0200 |
commit | d7d9364c9c6e2b30bf2b6933f36060d078e903ef (patch) | |
tree | da8d2b07c7481a79369a4d015015a0fea1260ed1 /src/plugins/bearer/connman | |
parent | 8c148a2eec9059f2ab4104fb19352699f2d1b3d0 (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/connman')
-rw-r--r-- | src/plugins/bearer/connman/qconnmanengine.cpp | 4 | ||||
-rw-r--r-- | src/plugins/bearer/connman/qconnmanservice_linux.cpp | 18 | ||||
-rw-r--r-- | src/plugins/bearer/connman/qofonoservice_linux.cpp | 50 |
3 files changed, 36 insertions, 36 deletions
diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp index 453ebc7c45..9a09c3feb8 100644 --- a/src/plugins/bearer/connman/qconnmanengine.cpp +++ b/src/plugins/bearer/connman/qconnmanengine.cpp @@ -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(); diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp index cd10f181f9..96582d8c81 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp +++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp @@ -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&))); // } } diff --git a/src/plugins/bearer/connman/qofonoservice_linux.cpp b/src/plugins/bearer/connman/qofonoservice_linux.cpp index 54074a8393..57ad32974a 100644 --- a/src/plugins/bearer/connman/qofonoservice_linux.cpp +++ b/src/plugins/bearer/connman/qofonoservice_linux.cpp @@ -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"; } } |