[telepathy-qt4/master] Connection: Changed status/statusReason/statusChanged to use enums Tp::Connection::Status and ConnectionStatusReason.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Mon Nov 9 13:23:50 PST 2009
---
TelepathyQt4/connection.cpp | 15 ++++++++-------
TelepathyQt4/connection.h | 7 ++++---
tests/dbus/chan-basics.cpp | 15 ++++++++-------
tests/dbus/chan-group.cpp | 15 ++++++++-------
tests/dbus/conn-basics.cpp | 15 ++++++++-------
tests/dbus/conn-capabilities.cpp | 2 +-
tests/dbus/conn-requests.cpp | 2 +-
tests/dbus/conn-roster-groups.cpp | 3 +--
tests/dbus/conn-roster.cpp | 2 +-
tests/dbus/contacts-capabilities.cpp | 2 +-
tests/dbus/contacts.cpp | 15 ++++++++-------
tests/dbus/handles.cpp | 15 ++++++++-------
12 files changed, 57 insertions(+), 51 deletions(-)
diff --git a/TelepathyQt4/connection.cpp b/TelepathyQt4/connection.cpp
index dd65564..56ce11d 100644
--- a/TelepathyQt4/connection.cpp
+++ b/TelepathyQt4/connection.cpp
@@ -591,22 +591,22 @@ Connection::~Connection()
* The returned value may have changed whenever statusChanged() is
* emitted.
*
- * \return The status, as defined in Status.
+ * \return The status, as defined in Connection::Status.
*/
-uint Connection::status() const
+Connection::Status Connection::status() const
{
- return mPriv->status;
+ return (Connection::Status) mPriv->status;
}
/**
* Return the reason for the connection's status (which is returned by
* status()). The validity and change rules are the same as for status().
*
- * \return The reason, as defined in Status.
+ * \return The reason, as defined in ConnectionStatusReason.
*/
-uint Connection::statusReason() const
+ConnectionStatusReason Connection::statusReason() const
{
- return mPriv->statusReason;
+ return (ConnectionStatusReason) mPriv->statusReason;
}
/**
@@ -803,7 +803,8 @@ void Connection::onStatusReady(uint status)
mPriv->status = status;
mPriv->statusReason = mPriv->pendingStatusReason;
- emit statusChanged(mPriv->status, mPriv->statusReason);
+ emit statusChanged((Connection::Status) mPriv->status,
+ (ConnectionStatusReason) mPriv->statusReason);
}
void Connection::onStatusChanged(uint status, uint reason)
diff --git a/TelepathyQt4/connection.h b/TelepathyQt4/connection.h
index d2e0618..4ec4ce8 100644
--- a/TelepathyQt4/connection.h
+++ b/TelepathyQt4/connection.h
@@ -87,8 +87,8 @@ public:
virtual ~Connection();
- uint status() const;
- uint statusReason() const;
+ Status status() const;
+ ConnectionStatusReason statusReason() const;
uint selfHandle() const;
ContactPtr selfContact() const;
@@ -160,7 +160,8 @@ public:
}
Q_SIGNALS:
- void statusChanged(uint newStatus, uint newStatusReason);
+ void statusChanged(Tp::Connection::Status newStatus,
+ Tp::ConnectionStatusReason newStatusReason);
void selfHandleChanged(uint newHandle);
// FIXME: might not need this when Renaming is fixed and mapped to Contacts
void selfContactChanged();
diff --git a/tests/dbus/chan-basics.cpp b/tests/dbus/chan-basics.cpp
index 879e06f..6f36c95 100644
--- a/tests/dbus/chan-basics.cpp
+++ b/tests/dbus/chan-basics.cpp
@@ -30,7 +30,7 @@ public:
{ }
protected Q_SLOTS:
- void expectConnReady(uint, uint);
+ void expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason);
void expectConnInvalidated();
void expectPendingHandleFinished(Tp::PendingOperation*);
void expectCreateChannelFinished(Tp::PendingOperation *);
@@ -56,7 +56,8 @@ private:
uint mHandle;
};
-void TestChanBasics::expectConnReady(uint newStatus, uint newStatusReason)
+void TestChanBasics::expectConnReady(Tp::Connection::Status newStatus,
+ Tp::ConnectionStatusReason newStatusReason)
{
qDebug() << "connection changed to status" << newStatus;
switch (newStatus) {
@@ -212,14 +213,14 @@ void TestChanBasics::initTestCase()
if (mConn->status() != Connection::StatusConnected) {
QVERIFY(connect(mConn.data(),
- SIGNAL(statusChanged(uint, uint)),
- SLOT(expectConnReady(uint, uint))));
+ SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
+ SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(mConn.data(),
- SIGNAL(statusChanged(uint, uint)),
+ SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
this,
- SLOT(expectConnReady(uint, uint))));
- QCOMPARE(mConn->status(), (uint) Connection::StatusConnected);
+ SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
+ QCOMPARE(mConn->status(), Connection::StatusConnected);
}
QVERIFY(mConn->requestsInterface() != 0);
diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp
index d8505ff..097c661 100644
--- a/tests/dbus/chan-group.cpp
+++ b/tests/dbus/chan-group.cpp
@@ -33,7 +33,7 @@ public:
{ }
protected Q_SLOTS:
- void expectConnReady(uint, uint);
+ void expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason);
void expectConnInvalidated();
void expectChanInvalidated(Tp::DBusProxy*,const QString &, const QString &);
void expectPendingRoomHandlesFinished(Tp::PendingOperation*);
@@ -87,7 +87,8 @@ private:
QString mChanInvalidatedErrorMessage;
};
-void TestChanGroup::expectConnReady(uint newStatus, uint newStatusReason)
+void TestChanGroup::expectConnReady(Tp::Connection::Status newStatus,
+ Tp::ConnectionStatusReason newStatusReason)
{
qDebug() << "connection changed to status" << newStatus;
switch (newStatus) {
@@ -331,14 +332,14 @@ void TestChanGroup::initTestCase()
if (mConn->status() != Connection::StatusConnected) {
QVERIFY(connect(mConn.data(),
- SIGNAL(statusChanged(uint, uint)),
- SLOT(expectConnReady(uint, uint))));
+ SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
+ SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(mConn.data(),
- SIGNAL(statusChanged(uint, uint)),
+ SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
this,
- SLOT(expectConnReady(uint, uint))));
- QCOMPARE(mConn->status(), (uint) Connection::StatusConnected);
+ SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
+ QCOMPARE(mConn->status(), Connection::StatusConnected);
}
QVERIFY(mConn->requestsInterface() != 0);
diff --git a/tests/dbus/conn-basics.cpp b/tests/dbus/conn-basics.cpp
index 947b82a..f2c32f1 100644
--- a/tests/dbus/conn-basics.cpp
+++ b/tests/dbus/conn-basics.cpp
@@ -27,7 +27,7 @@ public:
{ }
protected Q_SLOTS:
- void expectConnReady(uint, uint);
+ void expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason);
void expectConnInvalidated();
void expectPresenceAvailable(const Tp::SimplePresence &);
@@ -46,7 +46,8 @@ private:
ConnectionPtr mConn;
};
-void TestConnBasics::expectConnReady(uint newStatus, uint newStatusReason)
+void TestConnBasics::expectConnReady(Tp::Connection::Status newStatus,
+ Tp::ConnectionStatusReason newStatusReason)
{
qDebug() << "connection changed to status" << newStatus;
switch (newStatus) {
@@ -135,14 +136,14 @@ void TestConnBasics::init()
if (mConn->status() != Connection::StatusConnected) {
QVERIFY(connect(mConn.data(),
- SIGNAL(statusChanged(uint, uint)),
- SLOT(expectConnReady(uint, uint))));
+ SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
+ SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(mConn.data(),
- SIGNAL(statusChanged(uint, uint)),
+ SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
this,
- SLOT(expectConnReady(uint, uint))));
- QCOMPARE(mConn->status(), (uint) Connection::StatusConnected);
+ SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
+ QCOMPARE(mConn->status(), Connection::StatusConnected);
}
}
diff --git a/tests/dbus/conn-capabilities.cpp b/tests/dbus/conn-capabilities.cpp
index b222784..21374f2 100644
--- a/tests/dbus/conn-capabilities.cpp
+++ b/tests/dbus/conn-capabilities.cpp
@@ -89,7 +89,7 @@ void TestConnCapabilities::testCapabilities()
SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), static_cast<uint>(Connection::StatusConnected));
+ QCOMPARE(mConn->status(), Connection::StatusConnected);
QVERIFY(mConn->requestsInterface() != 0);
QVERIFY(mConn->capabilities() != 0);
QCOMPARE(mConn->capabilities()->supportsTextChats(), true);
diff --git a/tests/dbus/conn-requests.cpp b/tests/dbus/conn-requests.cpp
index 71f9ce2..a5ac7fd 100644
--- a/tests/dbus/conn-requests.cpp
+++ b/tests/dbus/conn-requests.cpp
@@ -182,7 +182,7 @@ void TestConnRequests::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), static_cast<uint>(Connection::StatusConnected));
+ QCOMPARE(mConn->status(), Connection::StatusConnected);
QVERIFY(mConn->requestsInterface() != 0);
}
diff --git a/tests/dbus/conn-roster-groups.cpp b/tests/dbus/conn-roster-groups.cpp
index 06c4a24..fb53dd6 100644
--- a/tests/dbus/conn-roster-groups.cpp
+++ b/tests/dbus/conn-roster-groups.cpp
@@ -129,8 +129,7 @@ void TestConnRosterGroups::init()
SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), static_cast<uint>(Connection::StatusConnected));
-
+ QCOMPARE(mConn->status(), Connection::StatusConnected);
}
void TestConnRosterGroups::testRosterGroups()
diff --git a/tests/dbus/conn-roster.cpp b/tests/dbus/conn-roster.cpp
index 43433a5..830b906 100644
--- a/tests/dbus/conn-roster.cpp
+++ b/tests/dbus/conn-roster.cpp
@@ -132,7 +132,7 @@ void TestConnRoster::init()
SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), static_cast<uint>(Connection::StatusConnected));
+ QCOMPARE(mConn->status(), Connection::StatusConnected);
}
void TestConnRoster::testRoster()
diff --git a/tests/dbus/contacts-capabilities.cpp b/tests/dbus/contacts-capabilities.cpp
index 11f042a..f4f4355 100644
--- a/tests/dbus/contacts-capabilities.cpp
+++ b/tests/dbus/contacts-capabilities.cpp
@@ -114,7 +114,7 @@ void TestContactsCapabilities::initTestCase()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
- QCOMPARE(mConn->status(), static_cast<uint>(Connection::StatusConnected));
+ QCOMPARE(mConn->status(), Connection::StatusConnected);
QVERIFY(mConn->contactManager()->supportedFeatures().contains(Contact::FeatureCapabilities));
}
diff --git a/tests/dbus/contacts.cpp b/tests/dbus/contacts.cpp
index 40f99e4..dcb8e44 100644
--- a/tests/dbus/contacts.cpp
+++ b/tests/dbus/contacts.cpp
@@ -34,7 +34,7 @@ public:
}
protected Q_SLOTS:
- void expectConnReady(uint newStatus, uint newStatusReason);
+ void expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason);
void expectConnInvalidated();
void expectPendingContactsFinished(Tp::PendingOperation *);
@@ -62,7 +62,8 @@ private:
Tp::UIntList mInvalidHandles;
};
-void TestContacts::expectConnReady(uint newStatus, uint newStatusReason)
+void TestContacts::expectConnReady(Tp::Connection::Status newStatus,
+ Tp::ConnectionStatusReason newStatusReason)
{
switch (newStatus) {
case Connection::StatusDisconnected:
@@ -167,14 +168,14 @@ void TestContacts::initTestCase()
if (mConn->status() != Connection::StatusConnected) {
QVERIFY(connect(mConn.data(),
- SIGNAL(statusChanged(uint, uint)),
- SLOT(expectConnReady(uint, uint))));
+ SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
+ SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(mConn.data(),
- SIGNAL(statusChanged(uint, uint)),
+ SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
this,
- SLOT(expectConnReady(uint, uint))));
- QCOMPARE(mConn->status(), static_cast<uint>(Connection::StatusConnected));
+ SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
+ QCOMPARE(mConn->status(), Connection::StatusConnected);
}
}
diff --git a/tests/dbus/handles.cpp b/tests/dbus/handles.cpp
index 8c88523..a5cd9ef 100644
--- a/tests/dbus/handles.cpp
+++ b/tests/dbus/handles.cpp
@@ -29,7 +29,7 @@ public:
{ }
protected Q_SLOTS:
- void expectConnReady(uint newStatus, uint newStatusReason);
+ void expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason);
void expectConnInvalidated();
void expectPendingHandlesFinished(Tp::PendingOperation*);
@@ -49,7 +49,8 @@ private:
ReferencedHandles mHandles;
};
-void TestHandles::expectConnReady(uint newStatus, uint newStatusReason)
+void TestHandles::expectConnReady(Tp::Connection::Status newStatus,
+ Tp::ConnectionStatusReason newStatusReason)
{
switch (newStatus) {
case Connection::StatusDisconnected:
@@ -148,14 +149,14 @@ void TestHandles::initTestCase()
if (mConn->status() != Connection::StatusConnected) {
QVERIFY(connect(mConn.data(),
- SIGNAL(statusChanged(uint, uint)),
- SLOT(expectConnReady(uint, uint))));
+ SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
+ SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(mConn.data(),
- SIGNAL(statusChanged(uint, uint)),
+ SIGNAL(statusChanged(Tp::Connection::Status, Tp::ConnectionStatusReason)),
this,
- SLOT(expectConnReady(uint, uint))));
- QCOMPARE(mConn->status(), (uint) Connection::StatusConnected);
+ SLOT(expectConnReady(Tp::Connection::Status, Tp::ConnectionStatusReason))));
+ QCOMPARE(mConn->status(), Connection::StatusConnected);
}
}
--
1.5.6.5
More information about the telepathy-commits
mailing list