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

normalise signal/slot signatures [QtDBus tests] 

Change-Id: I4a0441d37e455dce28072ee3650b2062bec65759
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Marc Mutz 2012-10-16 11:09:03 +02:00 committed by The Qt Project
parent bb73c085a6
commit b5b165ffb3
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver.cpp
View File

@ -63,7 +63,7 @@ public:
m_conn("none"),
obj(NULL)
{
connect(this, SIGNAL(newConnection(const QDBusConnection&)), SLOT(handleConnection(const QDBusConnection&)));
connect(this, SIGNAL(newConnection(QDBusConnection)), SLOT(handleConnection(QDBusConnection)));
}
~MyServer()
@ -164,4 +164,4 @@ int main(int argc, char *argv[])
return app.exec();
}
#include "qmyserver.moc"
#include "qmyserver.moc"

2
tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp
View File

@ -55,7 +55,7 @@ public:
: QDBusServer(addr, parent),
m_conn("none")
{
connect(this, SIGNAL(newConnection(const QDBusConnection&)), SLOT(handleConnection(const QDBusConnection&)));
connect(this, SIGNAL(newConnection(QDBusConnection)), SLOT(handleConnection(QDBusConnection)));
reset();
}

4
tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
View File

@ -393,7 +393,7 @@ public:
m_path(path),
m_connections()
{
connect(this, SIGNAL(newConnection(const QDBusConnection&)), SLOT(handleConnection(const QDBusConnection&)));
connect(this, SIGNAL(newConnection(QDBusConnection)), SLOT(handleConnection(QDBusConnection)));
}
bool registerObject(const QDBusConnection& c)
@ -605,7 +605,7 @@ public:
MyServer2(QString addr, QObject* parent) : QDBusServer(addr, parent),
m_conn("none")
{
connect(this, SIGNAL(newConnection(const QDBusConnection&)), SLOT(handleConnection(const QDBusConnection&)));
connect(this, SIGNAL(newConnection(QDBusConnection)), SLOT(handleConnection(QDBusConnection)));
}
QDBusConnection connection()

4
tests/auto/dbus/qdbusinterface/qmyserver/qmyserver.cpp
View File

@ -60,7 +60,7 @@ public:
: QDBusServer(addr, parent),
m_conn("none")
{
connect(this, SIGNAL(newConnection(const QDBusConnection&)), SLOT(handleConnection(const QDBusConnection&)));
connect(this, SIGNAL(newConnection(QDBusConnection)), SLOT(handleConnection(QDBusConnection)));
}
public slots:
@ -152,4 +152,4 @@ int main(int argc, char *argv[])
return app.exec();
}
#include "qmyserver.moc"
#include "qmyserver.moc"

2
tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
View File

@ -350,7 +350,7 @@ void tst_QDBusInterface::invalidAfterServiceOwnerChanged()
QDBusInterface invalidInterface("com.example.Test", "/");
QVERIFY(!invalidInterface.isValid());
QTestEventLoop::instance().connect(connIface, SIGNAL(serviceOwnerChanged(QString, QString, QString)),
QTestEventLoop::instance().connect(connIface, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
SLOT(exitLoop()));
QVERIFY(connIface->registerService("com.example.Test") == QDBusConnectionInterface::ServiceRegistered);