[Telepathy-commits] [telepathy-qt4/master] Connection: Added enum Status and changed initial status to StatusUnknown.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Mon Jan 26 09:26:41 PST 2009
---
TelepathyQt4/Client/connection.cpp | 6 +++---
TelepathyQt4/Client/connection.h | 8 ++++++++
tests/dbus/handles.cpp | 6 +++---
tests/pinocchio/chan-basics.cpp | 6 +++---
tests/pinocchio/conn-basics.cpp | 18 +++++++++---------
tests/pinocchio/handles.cpp | 8 ++++----
6 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/TelepathyQt4/Client/connection.cpp b/TelepathyQt4/Client/connection.cpp
index 5f5cb6b..0df3e56 100644
--- a/TelepathyQt4/Client/connection.cpp
+++ b/TelepathyQt4/Client/connection.cpp
@@ -217,9 +217,9 @@ Connection::Private::Private(Connection *parent)
simplePresence(0),
initialIntrospection(false),
readiness(ReadinessJustCreated),
- pendingStatus(ConnectionStatusDisconnected),
+ pendingStatus(Connection::StatusUnknown),
pendingStatusReason(ConnectionStatusReasonNoneSpecified),
- status(ConnectionStatusDisconnected),
+ status(Connection::StatusUnknown),
statusReason(ConnectionStatusReasonNoneSpecified),
haveInitialStatus(false),
selfHandle(0),
@@ -512,7 +512,7 @@ Connection::~Connection()
/**
* Return the connection's status.
*
- * The returned value may have changed whenever statusChaned() is
+ * The returned value may have changed whenever statusChanged() is
* emitted.
*
* \return The status, as defined in #ConnectionStatus.
diff --git a/TelepathyQt4/Client/connection.h b/TelepathyQt4/Client/connection.h
index 640ea98..e134767 100644
--- a/TelepathyQt4/Client/connection.h
+++ b/TelepathyQt4/Client/connection.h
@@ -54,6 +54,7 @@ class Connection : public StatefulDBusProxy,
{
Q_OBJECT
Q_DISABLE_COPY(Connection)
+ Q_ENUMS(Status)
public:
enum Feature {
@@ -62,6 +63,13 @@ public:
};
Q_DECLARE_FLAGS(Features, Feature)
+ enum Status {
+ StatusDisconnected = Telepathy::ConnectionStatusDisconnected,
+ StatusConnecting = Telepathy::ConnectionStatusConnecting,
+ StatusConnected = Telepathy::ConnectionStatusConnected,
+ StatusUnknown = 0xFFFFFFFF
+ };
+
Connection(const QString &serviceName,
const QString &objectPath,
QObject *parent = 0);
diff --git a/tests/dbus/handles.cpp b/tests/dbus/handles.cpp
index 0d7e852..e17735d 100644
--- a/tests/dbus/handles.cpp
+++ b/tests/dbus/handles.cpp
@@ -47,14 +47,14 @@ private Q_SLOTS:
void TestHandles::expectConnReady(uint newStatus, uint newStatusReason)
{
switch (newStatus) {
- case Telepathy::ConnectionStatusDisconnected:
+ case Connection::StatusDisconnected:
qWarning() << "Disconnected";
mLoop->exit(1);
break;
- case Telepathy::ConnectionStatusConnecting:
+ case Connection::StatusConnecting:
/* do nothing */
break;
- case Telepathy::ConnectionStatusConnected:
+ case Connection::StatusConnected:
qDebug() << "Ready";
mLoop->exit(0);
break;
diff --git a/tests/pinocchio/chan-basics.cpp b/tests/pinocchio/chan-basics.cpp
index 91be815..516ef0c 100644
--- a/tests/pinocchio/chan-basics.cpp
+++ b/tests/pinocchio/chan-basics.cpp
@@ -56,14 +56,14 @@ private Q_SLOTS:
void TestChanBasics::expectConnReady(uint newStatus, uint newStatusReason)
{
switch (newStatus) {
- case Telepathy::ConnectionStatusDisconnected:
+ case Connection::StatusDisconnected:
qWarning() << "Disconnected";
mLoop->exit(1);
break;
- case Telepathy::ConnectionStatusConnecting:
+ case Connection::StatusConnecting:
/* do nothing */
break;
- case Telepathy::ConnectionStatusConnected:
+ case Connection::StatusConnected:
qDebug() << "Ready";
mLoop->exit(0);
break;
diff --git a/tests/pinocchio/conn-basics.cpp b/tests/pinocchio/conn-basics.cpp
index f315774..a064183 100644
--- a/tests/pinocchio/conn-basics.cpp
+++ b/tests/pinocchio/conn-basics.cpp
@@ -101,7 +101,7 @@ void TestConnBasics::testInitialIntrospection()
mConn = new Connection(mConnBusName, mConnObjectPath);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Telepathy::ConnectionStatusDisconnected));
+ static_cast<uint>(Connection::StatusUnknown));
delete mConn;
mConn = NULL;
@@ -111,14 +111,14 @@ void TestConnBasics::testInitialIntrospection()
void TestConnBasics::expectReady(uint newStatus, uint newStatusReason)
{
switch (newStatus) {
- case Telepathy::ConnectionStatusDisconnected:
+ case Connection::StatusDisconnected:
qWarning() << "Disconnected";
mLoop->exit(1);
break;
- case Telepathy::ConnectionStatusConnecting:
+ case Connection::StatusConnecting:
/* do nothing */
break;
- case Telepathy::ConnectionStatusConnected:
+ case Connection::StatusConnected:
qDebug() << "Ready";
mLoop->exit(0);
break;
@@ -136,7 +136,7 @@ void TestConnBasics::testConnect()
mConn = new Connection(mConnBusName, mConnObjectPath);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Telepathy::ConnectionStatusDisconnected));
+ static_cast<uint>(Connection::StatusUnknown));
QVERIFY(connect(mConn->becomeReady(),
SIGNAL(finished(Telepathy::Client::PendingOperation*)),
@@ -175,7 +175,7 @@ void TestConnBasics::testConnect()
QCOMPARE(mConn->isReady(Connection::FeatureSelfPresence), false);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Telepathy::ConnectionStatusConnected));
+ static_cast<uint>(Connection::StatusConnected));
QCOMPARE(static_cast<uint>(mConn->statusReason()),
static_cast<uint>(Telepathy::ConnectionStatusReasonRequested));
@@ -194,7 +194,7 @@ void TestConnBasics::testConnect()
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Telepathy::ConnectionStatusDisconnected));
+ static_cast<uint>(Connection::StatusDisconnected));
QCOMPARE(static_cast<uint>(mConn->statusReason()),
static_cast<uint>(Telepathy::ConnectionStatusReasonRequested));
@@ -258,7 +258,7 @@ void TestConnBasics::testInterfaceFactory()
mConnBusName, mConnObjectPath);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Telepathy::ConnectionStatusDisconnected));
+ static_cast<uint>(Connection::StatusUnknown));
PropertiesInterface* props = mConn->propertiesInterface();
QVERIFY(props != NULL);
@@ -289,7 +289,7 @@ void TestConnBasics::testSpecifiedBus()
mConnBusName, mConnObjectPath);
QCOMPARE(static_cast<uint>(mConn->status()),
- static_cast<uint>(Telepathy::ConnectionStatusDisconnected));
+ static_cast<uint>(Connection::StatusUnknown));
delete mConn;
mConn = NULL;
diff --git a/tests/pinocchio/handles.cpp b/tests/pinocchio/handles.cpp
index e86b2e0..ed06a6b 100644
--- a/tests/pinocchio/handles.cpp
+++ b/tests/pinocchio/handles.cpp
@@ -56,14 +56,14 @@ private Q_SLOTS:
void TestHandles::expectConnReady(uint newStatus, uint newStatusReason)
{
switch (newStatus) {
- case Telepathy::ConnectionStatusDisconnected:
+ case Connection::StatusDisconnected:
qWarning() << "Disconnected";
mLoop->exit(1);
break;
- case Telepathy::ConnectionStatusConnecting:
+ case Connection::StatusConnecting:
/* do nothing */
break;
- case Telepathy::ConnectionStatusConnected:
+ case Connection::StatusConnected:
qDebug() << "Ready";
mLoop->exit(0);
break;
@@ -124,7 +124,7 @@ void TestHandles::initTestCase()
for (int i = 0; i < 3; ++i) {
Connection *conn = connections[i];
- if (conn->status() == Telepathy::ConnectionStatusConnected) {
+ if (conn->status() == Connection::StatusConnected) {
qDebug() << conn << "Already ready";
continue;
}
--
1.5.6.5
More information about the Telepathy-commits
mailing list