[telepathy-qt4/master] Explicitly use uint for TargetHandleType.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Fri Sep 11 06:07:49 PDT 2009
---
TelepathyQt4/account.cpp | 10 +++++-----
TelepathyQt4/connection.cpp | 2 +-
TelepathyQt4/contact-manager.cpp | 2 +-
examples/call/call-handler.cpp | 2 +-
tests/dbus/account-channel-dispatcher.cpp | 2 +-
tests/dbus/chan-basics.cpp | 4 ++--
tests/dbus/chan-group.cpp | 2 +-
tests/dbus/client.cpp | 4 ++--
tests/dbus/conn-requests.cpp | 4 ++--
tests/dbus/streamed-media-chan.cpp | 18 +++++++++---------
10 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/TelepathyQt4/account.cpp b/TelepathyQt4/account.cpp
index 9f1fa2f..236ef32 100644
--- a/TelepathyQt4/account.cpp
+++ b/TelepathyQt4/account.cpp
@@ -724,7 +724,7 @@ PendingChannelRequest *Account::ensureTextChat(
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetID"),
contactIdentifier);
return new PendingChannelRequest(dbusConnection(), objectPath(),
@@ -756,7 +756,7 @@ PendingChannelRequest *Account::ensureTextChat(
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
contact ? contact->handle().at(0) : 0);
return new PendingChannelRequest(dbusConnection(), objectPath(),
@@ -788,7 +788,7 @@ PendingChannelRequest *Account::ensureTextChatroom(
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeRoom);
+ (uint) Tp::HandleTypeRoom);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetID"),
roomName);
return new PendingChannelRequest(dbusConnection(), objectPath(),
@@ -820,7 +820,7 @@ PendingChannelRequest *Account::ensureMediaCall(
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetID"),
contactIdentifier);
return new PendingChannelRequest(dbusConnection(), objectPath(),
@@ -852,7 +852,7 @@ PendingChannelRequest *Account::ensureMediaCall(
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
contact ? contact->handle().at(0) : 0);
return new PendingChannelRequest(dbusConnection(), objectPath(),
diff --git a/TelepathyQt4/connection.cpp b/TelepathyQt4/connection.cpp
index 902b8b0..a0a14ef 100644
--- a/TelepathyQt4/connection.cpp
+++ b/TelepathyQt4/connection.cpp
@@ -1004,7 +1004,7 @@ void Connection::gotContactListsHandles(PendingOperation *op)
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_CONTACT_LIST);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- HandleTypeList);
+ (uint) HandleTypeList);
Q_ASSERT(pending->handles().size() == 1);
Q_ASSERT(pending->namesRequested().size() == 1);
diff --git a/TelepathyQt4/contact-manager.cpp b/TelepathyQt4/contact-manager.cpp
index 9b45471..7c248ba 100644
--- a/TelepathyQt4/contact-manager.cpp
+++ b/TelepathyQt4/contact-manager.cpp
@@ -226,7 +226,7 @@ PendingOperation *ContactManager::addGroup(const QString &group)
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_CONTACT_LIST);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeGroup);
+ (uint) Tp::HandleTypeGroup);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetID"),
group);
return connection()->ensureChannel(request);
diff --git a/examples/call/call-handler.cpp b/examples/call/call-handler.cpp
index 2e8c0fb..8cab548 100644
--- a/examples/call/call-handler.cpp
+++ b/examples/call/call-handler.cpp
@@ -56,7 +56,7 @@ void CallHandler::addOutgoingCall(const ContactPtr &contact)
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- HandleTypeContact);
+ (uint) HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
contact->handle()[0]);
diff --git a/tests/dbus/account-channel-dispatcher.cpp b/tests/dbus/account-channel-dispatcher.cpp
index fb97658..f036cf5 100644
--- a/tests/dbus/account-channel-dispatcher.cpp
+++ b/tests/dbus/account-channel-dispatcher.cpp
@@ -373,7 +373,7 @@ void TestAccountChannelDispatcher::testPCR(PendingChannelRequest *pcr)
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"), \
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT); \
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"), \
- Tp::HandleTypeContact); \
+ (uint) Tp::HandleTypeContact); \
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetID"), \
"foo at bar"); \
mChannelDispatcherAdaptor->mChannelRequestShouldFail = shouldFail; \
diff --git a/tests/dbus/chan-basics.cpp b/tests/dbus/chan-basics.cpp
index a524b26..879e06f 100644
--- a/tests/dbus/chan-basics.cpp
+++ b/tests/dbus/chan-basics.cpp
@@ -254,7 +254,7 @@ void TestChanBasics::testCreateChannel()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
mHandle);
QVERIFY(connect(mConn->createChannel(request),
@@ -294,7 +294,7 @@ void TestChanBasics::testEnsureChannel()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
mHandle);
QVERIFY(connect(mConn->ensureChannel(request),
diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp
index 843ba8f..d8505ff 100644
--- a/tests/dbus/chan-group.cpp
+++ b/tests/dbus/chan-group.cpp
@@ -412,7 +412,7 @@ void TestChanGroup::doTestCreateChannel()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeRoom);
+ (uint) Tp::HandleTypeRoom);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
mRoomHandles[mRoomNumber]);
diff --git a/tests/dbus/client.cpp b/tests/dbus/client.cpp
index cf5e6a9..e4da6dd 100644
--- a/tests/dbus/client.cpp
+++ b/tests/dbus/client.cpp
@@ -454,7 +454,7 @@ void TestClient::testRegister()
filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT));
filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- QDBusVariant(Tp::HandleTypeContact));
+ QDBusVariant((uint) Tp::HandleTypeContact));
filters.append(filter);
mClientObject1 = MyClient::create(filters, false, true);
QVERIFY(mClientRegistrar->registerClient(mClientObject1, "foo"));
@@ -468,7 +468,7 @@ void TestClient::testRegister()
filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA));
filter.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- QDBusVariant(Tp::HandleTypeContact));
+ QDBusVariant((uint) Tp::HandleTypeContact));
filters.append(filter);
mClientObject2 = MyClient::create(filters, true, true);
QVERIFY(mClientRegistrar->registerClient(mClientObject2, "foo", true));
diff --git a/tests/dbus/conn-requests.cpp b/tests/dbus/conn-requests.cpp
index 11ab493..71f9ce2 100644
--- a/tests/dbus/conn-requests.cpp
+++ b/tests/dbus/conn-requests.cpp
@@ -216,7 +216,7 @@ void TestConnRequests::testCreateChannel()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
mHandle);
QVERIFY(connect(mConn->createChannel(request),
@@ -231,7 +231,7 @@ void TestConnRequests::testEnsureChannel()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
mHandle);
QVERIFY(connect(mConn->ensureChannel(request),
diff --git a/tests/dbus/streamed-media-chan.cpp b/tests/dbus/streamed-media-chan.cpp
index 4a2e2ef..a1e9eb2 100644
--- a/tests/dbus/streamed-media-chan.cpp
+++ b/tests/dbus/streamed-media-chan.cpp
@@ -321,7 +321,7 @@ void TestStreamedMediaChan::testOutgoingCall()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
@@ -483,7 +483,7 @@ void TestStreamedMediaChan::testOutgoingCallBusy()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
@@ -540,7 +540,7 @@ void TestStreamedMediaChan::testOutgoingCallNoAnswer()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
@@ -624,7 +624,7 @@ void TestStreamedMediaChan::testOutgoingCallTerminate()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
@@ -828,7 +828,7 @@ void TestStreamedMediaChan::testHold()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
@@ -897,7 +897,7 @@ void TestStreamedMediaChan::testHoldNoUnhold()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
@@ -961,7 +961,7 @@ void TestStreamedMediaChan::testHoldInabilityUnhold()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
@@ -1043,7 +1043,7 @@ void TestStreamedMediaChan::testDTMF()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
@@ -1130,7 +1130,7 @@ void TestStreamedMediaChan::testDTMFNoContinuousTone()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Tp::HandleTypeContact);
+ (uint) Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
--
1.5.6.5
More information about the telepathy-commits
mailing list