[Telepathy-commits] [telepathy-qt4/master] Tests: Fixed build.

[Andre Moreira Magalhaes (andrunko)]

---
 tests/dbus/account-basics.cpp   |   10 +++++-----
 tests/dbus/chan-basics.cpp      |    2 +-
 tests/dbus/conn-basics.cpp      |    2 +-
 tests/dbus/conn-roster.cpp      |    2 +-
 tests/dbus/contacts.cpp         |    2 +-
 tests/pinocchio/conn-basics.cpp |    3 ++-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/tests/dbus/account-basics.cpp b/tests/dbus/account-basics.cpp
index bd10c26..6a02b80 100644
--- a/tests/dbus/account-basics.cpp
+++ b/tests/dbus/account-basics.cpp
@@ -98,7 +98,7 @@ void TestAccountBasics::testBasics()
 
     QCOMPARE(acc->displayName(), QString("foobar (account 0)"));
 
-    QSet<uint> features = QSet<uint>() << Account::FeatureAvatar;
+    Features features = Features() << Account::FeatureAvatar;
     QVERIFY(connect(acc->becomeReady(features),
                     SIGNAL(finished(Telepathy::Client::PendingOperation *)),
                     SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation *))));
@@ -117,7 +117,7 @@ void TestAccountBasics::testBasics()
                     SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation *))));
     QCOMPARE(mLoop->exec(), 0);
 
-    features = QSet<uint>() << Account::FeatureAvatar;
+    features = Features() << Account::FeatureAvatar;
     QVERIFY(connect(acc->becomeReady(features),
                     SIGNAL(finished(Telepathy::Client::PendingOperation *)),
                     SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation *))));
@@ -143,7 +143,7 @@ void TestAccountBasics::testBasics()
 
     acc = mAM->accountForPath(
             "/org/freedesktop/Telepathy/Account/spurious/normal/Account0");
-    features = QSet<uint>() << Account::FeatureProtocolInfo;
+    features = Features() << Account::FeatureProtocolInfo;
     QVERIFY(connect(acc->becomeReady(features),
                     SIGNAL(finished(Telepathy::Client::PendingOperation *)),
                     SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation *))));
@@ -156,7 +156,7 @@ void TestAccountBasics::testBasics()
     QCOMPARE(protocolInfo->hasParameter("password"), true);
     QCOMPARE(protocolInfo->hasParameter("register"), true);
 
-    features = QSet<uint>() << Account::FeatureAvatar;
+    features = Features() << Account::FeatureAvatar;
     QVERIFY(connect(acc->becomeReady(features),
                     SIGNAL(finished(Telepathy::Client::PendingOperation *)),
                     SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation *))));
@@ -165,7 +165,7 @@ void TestAccountBasics::testBasics()
 
     QCOMPARE(acc->avatar().MIMEType, QString("image/png"));
 
-    features = QSet<uint>() << Account::FeatureAvatar << Account::FeatureProtocolInfo;
+    features = Features() << Account::FeatureAvatar << Account::FeatureProtocolInfo;
     QVERIFY(connect(acc->becomeReady(features),
                     SIGNAL(finished(Telepathy::Client::PendingOperation *)),
                     SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation *))));
diff --git a/tests/dbus/chan-basics.cpp b/tests/dbus/chan-basics.cpp
index 36b0fd3..670bbd0 100644
--- a/tests/dbus/chan-basics.cpp
+++ b/tests/dbus/chan-basics.cpp
@@ -204,7 +204,7 @@ void TestChanBasics::initTestCase()
 
     mConn->requestConnect();
 
-    QSet<uint> features = QSet<uint>() << Connection::FeatureSelfContact;
+    Features features = Features() << Connection::FeatureSelfContact;
     QVERIFY(connect(mConn->becomeReady(features),
                     SIGNAL(finished(Telepathy::Client::PendingOperation*)),
                     SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation*))));
diff --git a/tests/dbus/conn-basics.cpp b/tests/dbus/conn-basics.cpp
index 39910b6..b81d091 100644
--- a/tests/dbus/conn-basics.cpp
+++ b/tests/dbus/conn-basics.cpp
@@ -148,7 +148,7 @@ void TestConnBasics::init()
 
 void TestConnBasics::testSimplePresence()
 {
-    QSet<uint> features = QSet<uint>() << Connection::FeatureSimplePresence;
+    Features features = Features() << Connection::FeatureSimplePresence;
     QCOMPARE(mConn->isReady(features), false);
     QVERIFY(connect(mConn->becomeReady(features),
                     SIGNAL(finished(Telepathy::Client::PendingOperation*)),
diff --git a/tests/dbus/conn-roster.cpp b/tests/dbus/conn-roster.cpp
index 65332e4..1e2e73a 100644
--- a/tests/dbus/conn-roster.cpp
+++ b/tests/dbus/conn-roster.cpp
@@ -137,7 +137,7 @@ void TestConnRoster::init()
 
 void TestConnRoster::testRoster()
 {
-    QSet<uint> features = QSet<uint>() << Connection::FeatureRoster;
+    Features features = Features() << Connection::FeatureRoster;
     QVERIFY(connect(mConn->becomeReady(features),
             SIGNAL(finished(Telepathy::Client::PendingOperation*)),
             this,
diff --git a/tests/dbus/contacts.cpp b/tests/dbus/contacts.cpp
index b41dc61..58d7301 100644
--- a/tests/dbus/contacts.cpp
+++ b/tests/dbus/contacts.cpp
@@ -157,7 +157,7 @@ void TestContacts::initTestCase()
 
     mConn->requestConnect();
 
-    QSet<uint> features = QSet<uint>() << Connection::FeatureSelfContact;
+    Features features = Features() << Connection::FeatureSelfContact;
     QVERIFY(connect(mConn->becomeReady(features),
                 SIGNAL(finished(Telepathy::Client::PendingOperation*)),
                 SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation*))));
diff --git a/tests/pinocchio/conn-basics.cpp b/tests/pinocchio/conn-basics.cpp
index df07746..1a778c1 100644
--- a/tests/pinocchio/conn-basics.cpp
+++ b/tests/pinocchio/conn-basics.cpp
@@ -15,6 +15,7 @@ using Telepathy::Client::Connection;
 using Telepathy::Client::ConnectionManagerInterface;
 using Telepathy::Client::DBus::PeerInterface;
 using Telepathy::Client::DBus::PropertiesInterface;
+using Telepathy::Client::Features;
 
 class TestConnBasics : public PinocchioTest
 {
@@ -166,7 +167,7 @@ void TestConnBasics::testConnect()
         QCOMPARE(mConn->status(), (uint) Connection::StatusConnected);
     }
 
-    QSet<uint> features = QSet<uint>() << Connection::FeatureSimplePresence;
+    Features features = Features() << Connection::FeatureSimplePresence;
     QVERIFY(connect(mConn->becomeReady(features),
             SIGNAL(finished(Telepathy::Client::PendingOperation*)),
             this,
-- 
1.5.6.5