[Telepathy-commits] [telepathy-qt4/master] DBusProxy: Changed signal invalidated to use const QString & instead of QString.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Tue Jan 27 11:37:44 PST 2009
---
TelepathyQt4/Client/abstract-interface.cpp | 6 +++---
TelepathyQt4/Client/abstract-interface.h | 4 ++--
TelepathyQt4/Client/channel.cpp | 4 ++--
TelepathyQt4/Client/dbus-proxy.h | 2 +-
tests/dbus/conn-basics.cpp | 4 ++--
tests/dbus/conn-requests.cpp | 4 ++--
tests/dbus/handles.cpp | 2 +-
tests/dbus/stateful-proxy.cpp | 20 ++++++++++----------
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/TelepathyQt4/Client/abstract-interface.cpp b/TelepathyQt4/Client/abstract-interface.cpp
index bd4b398..c4fcbcf 100644
--- a/TelepathyQt4/Client/abstract-interface.cpp
+++ b/TelepathyQt4/Client/abstract-interface.cpp
@@ -55,8 +55,8 @@ AbstractInterface::AbstractInterface(DBusProxy *parent, const char *interface)
interface, parent->dbusConnection(), parent),
mPriv(new Private())
{
- connect(parent, SIGNAL(invalidated(Telepathy::Client::DBusProxy *, QString, QString)),
- this, SLOT(invalidate(Telepathy::Client::DBusProxy *, QString, QString)));
+ connect(parent, SIGNAL(invalidated(Telepathy::Client::DBusProxy *, const QString &, const QString &)),
+ this, SLOT(invalidate(Telepathy::Client::DBusProxy *, const QString &, const QString &)));
}
AbstractInterface::~AbstractInterface()
@@ -80,7 +80,7 @@ QString AbstractInterface::invalidationMessage() const
}
void AbstractInterface::invalidate(Telepathy::Client::DBusProxy *proxy,
- QString error, QString message)
+ const QString &error, const QString &message)
{
Q_ASSERT(!error.isEmpty());
diff --git a/TelepathyQt4/Client/abstract-interface.h b/TelepathyQt4/Client/abstract-interface.h
index 3eba805..781a3ae 100644
--- a/TelepathyQt4/Client/abstract-interface.h
+++ b/TelepathyQt4/Client/abstract-interface.h
@@ -47,8 +47,8 @@ public:
QString invalidationMessage() const;
protected Q_SLOTS:
- virtual void invalidate(Telepathy::Client::DBusProxy *proxy, QString error,
- QString message);
+ virtual void invalidate(Telepathy::Client::DBusProxy *proxy,
+ const QString &error, const QString &message);
protected:
AbstractInterface(DBusProxy *parent, const char *interface);
diff --git a/TelepathyQt4/Client/channel.cpp b/TelepathyQt4/Client/channel.cpp
index d0e41b2..0c51947 100644
--- a/TelepathyQt4/Client/channel.cpp
+++ b/TelepathyQt4/Client/channel.cpp
@@ -108,8 +108,8 @@ struct Channel::Private
debug() << " Connection to owning connection's lifetime signals";
parent.connect(connection,
- SIGNAL(invalidated(Telepathy::Client::DBusProxy *proxy,
- QString errorName, QString errorMessage)),
+ SIGNAL(invalidated(Telepathy::Client::DBusProxy *,
+ const QString &, const QString &)),
SLOT(onConnectionInvalidated()));
parent.connect(connection,
diff --git a/TelepathyQt4/Client/dbus-proxy.h b/TelepathyQt4/Client/dbus-proxy.h
index 285b5dc..bb2294a 100644
--- a/TelepathyQt4/Client/dbus-proxy.h
+++ b/TelepathyQt4/Client/dbus-proxy.h
@@ -66,7 +66,7 @@ protected:
Q_SIGNALS:
void invalidated(Telepathy::Client::DBusProxy *proxy,
- QString errorName, QString errorMessage);
+ const QString &errorName, const QString &errorMessage);
private Q_SLOTS:
void emitInvalidated();
diff --git a/tests/dbus/conn-basics.cpp b/tests/dbus/conn-basics.cpp
index 9362b60..3d88546 100644
--- a/tests/dbus/conn-basics.cpp
+++ b/tests/dbus/conn-basics.cpp
@@ -178,8 +178,8 @@ void TestConnBasics::cleanup()
if (mConn->isValid()) {
QVERIFY(connect(mConn,
- SIGNAL(invalidated(Telepathy::Client::DBusProxy *proxy,
- QString errorName, QString errorMessage)),
+ SIGNAL(invalidated(Telepathy::Client::DBusProxy *,
+ const QString &, const QString &)),
SLOT(expectConnInvalidated())));
QCOMPARE(mLoop->exec(), 0);
}
diff --git a/tests/dbus/conn-requests.cpp b/tests/dbus/conn-requests.cpp
index ccbb1a7..e9a2352 100644
--- a/tests/dbus/conn-requests.cpp
+++ b/tests/dbus/conn-requests.cpp
@@ -289,8 +289,8 @@ void TestConnRequests::cleanupTestCase()
if (mConn->isValid()) {
QVERIFY(connect(mConn,
- SIGNAL(invalidated(Telepathy::Client::DBusProxy *proxy,
- QString errorName, QString errorMessage)),
+ SIGNAL(invalidated(Telepathy::Client::DBusProxy *,
+ const QString &, const QString &)),
SLOT(expectConnInvalidated())));
QCOMPARE(mLoop->exec(), 0);
}
diff --git a/tests/dbus/handles.cpp b/tests/dbus/handles.cpp
index 272872c..385bf96 100644
--- a/tests/dbus/handles.cpp
+++ b/tests/dbus/handles.cpp
@@ -227,7 +227,7 @@ void TestHandles::cleanupTestCase()
if (mConn->isValid()) {
QVERIFY(connect(mConn,
- SIGNAL(invalidated(Telepathy::Client::DBusProxy *, QString, QString)),
+ SIGNAL(invalidated(Telepathy::Client::DBusProxy *, const QString &, const QString &)),
SLOT(expectConnInvalidated())));
QCOMPARE(mLoop->exec(), 0);
}
diff --git a/tests/dbus/stateful-proxy.cpp b/tests/dbus/stateful-proxy.cpp
index f7ca595..460576f 100644
--- a/tests/dbus/stateful-proxy.cpp
+++ b/tests/dbus/stateful-proxy.cpp
@@ -80,7 +80,7 @@ private Q_SLOTS:
protected Q_SLOTS:
// these would be public, but then QtTest would think they were tests
void expectInvalidated(Telepathy::Client::DBusProxy *,
- QString, QString);
+ const QString &, const QString &);
// anything other than 0 or 1 is OK
# define EXPECT_INVALIDATED_SUCCESS 111
@@ -184,10 +184,10 @@ void TestStatefulProxy::testBasics()
QVERIFY(connect(mProxy, SIGNAL(invalidated(
Telepathy::Client::DBusProxy *,
- QString, QString)),
+ const QString &, const QString &)),
this, SLOT(expectInvalidated(
Telepathy::Client::DBusProxy *,
- QString, QString))));
+ const QString &, const QString &))));
mProxy->invalidate("com.example.DomainSpecificError",
"Because I said so");
@@ -213,10 +213,10 @@ void TestStatefulProxy::testBasics()
QCOMPARE(mLoop->exec(), EXPECT_INVALIDATED_SUCCESS);
QVERIFY(disconnect(mProxy, SIGNAL(invalidated(
Telepathy::Client::DBusProxy *,
- QString, QString)),
+ const QString &, const QString &)),
this, SLOT(expectInvalidated(
Telepathy::Client::DBusProxy *,
- QString, QString))));
+ const QString &, const QString &))));
QCOMPARE(mInvalidated, 1);
QCOMPARE(mSignalledInvalidationReason,
@@ -252,7 +252,7 @@ void TestStatefulProxy::testBasics()
}
void TestStatefulProxy::expectInvalidated(DBusProxy *proxy,
- QString reason, QString message)
+ const QString &reason, const QString &message)
{
mInvalidated++;
mSignalledInvalidationReason = reason;
@@ -275,18 +275,18 @@ void TestStatefulProxy::testNameOwnerChanged()
QVERIFY(connect(mProxy, SIGNAL(invalidated(
Telepathy::Client::DBusProxy *,
- QString, QString)),
+ const QString &, const QString &)),
this, SLOT(expectInvalidated(
Telepathy::Client::DBusProxy *,
- QString, QString))));
+ const QString &, const QString &))));
QDBusConnection::disconnectFromBus("another unique name");
QCOMPARE(mLoop->exec(), EXPECT_INVALIDATED_SUCCESS);
QVERIFY(disconnect(mProxy, SIGNAL(invalidated(
Telepathy::Client::DBusProxy *,
- QString, QString)),
+ const QString &, const QString &)),
this, SLOT(expectInvalidated(
Telepathy::Client::DBusProxy *,
- QString, QString))));
+ const QString &, const QString &))));
QCOMPARE(mInvalidated, 1);
QVERIFY(!mProxy->isValid());
--
1.5.6.5
More information about the telepathy-commits
mailing list