diff options
Diffstat (limited to 'tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp')
-rw-r--r-- | tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp index c8d1184226..7e6e742e28 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp @@ -296,7 +296,7 @@ void tst_QDBusConnection::connectToPeer() QVERIFY(con.lastError().isValid()); } - QDBusServer server("unix:tmpdir=/tmp", 0); + QDBusServer server; { QDBusConnection con = QDBusConnection::connectToPeer( @@ -381,9 +381,7 @@ class MyServer : public QDBusServer { Q_OBJECT public: - MyServer(QString path, QString addr, QObject* parent) : QDBusServer(addr, parent), - m_path(path), - m_connections() + MyServer(QString path) : m_path(path), m_connections() { connect(this, SIGNAL(newConnection(QDBusConnection)), SLOT(handleConnection(QDBusConnection))); } @@ -446,7 +444,7 @@ void tst_QDBusConnection::registerObjectPeer() { QFETCH(QString, path); - MyServer server(path, "unix:tmpdir=/tmp", 0); + MyServer server(path); QDBusConnection::connectToPeer(server.address(), "beforeFoo"); @@ -594,8 +592,7 @@ class MyServer2 : public QDBusServer { Q_OBJECT public: - MyServer2(QString addr, QObject* parent) : QDBusServer(addr, parent), - m_conn("none") + MyServer2() : m_conn("none") { connect(this, SIGNAL(newConnection(QDBusConnection)), SLOT(handleConnection(QDBusConnection))); } @@ -620,7 +617,7 @@ private: void tst_QDBusConnection::registerObjectPeer2() { - MyServer2 server("unix:tmpdir=/tmp", 0); + MyServer2 server; QDBusConnection con = QDBusConnection::connectToPeer(server.address(), "foo"); QCoreApplication::processEvents(); QVERIFY(con.isConnected()); @@ -775,7 +772,7 @@ void tst_QDBusConnection::registerQObjectChildren() void tst_QDBusConnection::registerQObjectChildrenPeer() { - MyServer2 server("unix:tmpdir=/tmp", 0); + MyServer2 server; QDBusConnection con = QDBusConnection::connectToPeer(server.address(), "foo"); QCoreApplication::processEvents(); QVERIFY(con.isConnected()); |