MERGE THIS WITH MAIN RENAME rename moar types

7 files changed, 25 insertions, 25 deletions

diff --git a/TelepathyQt/call-channel.cpp b/TelepathyQt/call-channel.cpp
index 2f9998b0..752bea66 100644
--- a/TelepathyQt/call-channel.cpp
+++ b/TelepathyQt/call-channel.cpp
@@ -234,8 +234,8 @@ void CallChannel::Private::introspectCallState(CallChannel::Private *self)
     CallChannel *parent = self->parent;
 
     parent->connect(self->callInterface,
-            SIGNAL(CallStateChanged(uint,uint,Tp::CallStateReason,QVariantMap)),
-            SLOT(onCallStateChanged(uint,uint,Tp::CallStateReason,QVariantMap)));
+            SIGNAL(CallStateChanged(uint,uint,TpDBus::CallStateReason,QVariantMap)),
+            SLOT(onCallStateChanged(uint,uint,TpDBus::CallStateReason,QVariantMap)));
 
     parent->connect(self->callInterface->requestAllProperties(),
             SIGNAL(finished(Tp::PendingOperation*)),
@@ -247,8 +247,8 @@ void CallChannel::Private::introspectCallMembers(CallChannel::Private *self)
     CallChannel *parent = self->parent;
 
     parent->connect(self->callInterface,
-            SIGNAL(CallMembersChanged(TpDBus::CallMemberMap,Tp::HandleIdentifierMap,Tp::UIntList,Tp::CallStateReason)),
-            SLOT(onCallMembersChanged(TpDBus::CallMemberMap,Tp::HandleIdentifierMap,Tp::UIntList,Tp::CallStateReason)));
+            SIGNAL(CallMembersChanged(TpDBus::CallMemberMap,TpDBus::HandleIdentifierMap,TpDBus::UIntList,TpDBus::CallStateReason)),
+            SLOT(onCallMembersChanged(TpDBus::CallMemberMap,TpDBus::HandleIdentifierMap,TpDBus::UIntList,TpDBus::CallStateReason)));
 
     parent->connect(self->callInterface->requestAllProperties(),
             SIGNAL(finished(Tp::PendingOperation*)),
@@ -263,8 +263,8 @@ void CallChannel::Private::introspectContents(CallChannel::Private *self)
             SIGNAL(ContentAdded(QDBusObjectPath)),
             SLOT(onContentAdded(QDBusObjectPath)));
     parent->connect(self->callInterface,
-            SIGNAL(ContentRemoved(QDBusObjectPath,Tp::CallStateReason)),
-            SLOT(onContentRemoved(QDBusObjectPath,Tp::CallStateReason)));
+            SIGNAL(ContentRemoved(QDBusObjectPath,TpDBus::CallStateReason)),
+            SLOT(onContentRemoved(QDBusObjectPath,TpDBus::CallStateReason)));
 
     parent->connect(self->callInterface->requestPropertyContents(),
             SIGNAL(finished(Tp::PendingOperation*)),
diff --git a/TelepathyQt/call-content.cpp b/TelepathyQt/call-content.cpp
index 481d7223..78621522 100644
--- a/TelepathyQt/call-content.cpp
+++ b/TelepathyQt/call-content.cpp
@@ -97,8 +97,8 @@ void CallContent::Private::introspectMainProperties(CallContent::Private *self)
             SIGNAL(StreamsAdded(TpDBus::ObjectPathList)),
             SLOT(onStreamsAdded(TpDBus::ObjectPathList)));
     parent->connect(self->contentInterface,
-            SIGNAL(StreamsRemoved(TpDBus::ObjectPathList,Tp::CallStateReason)),
-            SLOT(onStreamsRemoved(TpDBus::ObjectPathList,Tp::CallStateReason)));
+            SIGNAL(StreamsRemoved(TpDBus::ObjectPathList,TpDBus::CallStateReason)),
+            SLOT(onStreamsRemoved(TpDBus::ObjectPathList,TpDBus::CallStateReason)));
 
     parent->connect(self->contentInterface->requestAllProperties(),
             SIGNAL(finished(Tp::PendingOperation*)),
@@ -503,7 +503,7 @@ void PendingCallContent::gotContent(QDBusPendingCallWatcher *watcher)
             SIGNAL(finished(Tp::PendingOperation*)),
             SLOT(onContentReady(Tp::PendingOperation*)));
     connect(channel.data(),
-            SIGNAL(contentRemoved(Tp::CallContentPtr,Tp::CallStateReason)),
+            SIGNAL(contentRemoved(Tp::CallContentPtr,TpDBus::CallStateReason)),
             SLOT(onContentRemoved(Tp::CallContentPtr)));
 
     mPriv->content = content;
diff --git a/TelepathyQt/call-stream.cpp b/TelepathyQt/call-stream.cpp
index 84533a4c..abca2684 100644
--- a/TelepathyQt/call-stream.cpp
+++ b/TelepathyQt/call-stream.cpp
@@ -128,11 +128,11 @@ void CallStream::Private::introspectMainProperties(CallStream::Private *self)
     CallStream *parent = self->parent;
 
     parent->connect(self->streamInterface,
-            SIGNAL(LocalSendingStateChanged(uint,Tp::CallStateReason)),
-            SLOT(onLocalSendingStateChanged(uint,Tp::CallStateReason)));
+            SIGNAL(LocalSendingStateChanged(uint,TpDBus::CallStateReason)),
+            SLOT(onLocalSendingStateChanged(uint,TpDBus::CallStateReason)));
     parent->connect(self->streamInterface,
-            SIGNAL(RemoteMembersChanged(TpDBus::ContactSendingStateMap,Tp::HandleIdentifierMap,Tp::UIntList,Tp::CallStateReason)),
-            SLOT(onRemoteMembersChanged(TpDBus::ContactSendingStateMap,Tp::HandleIdentifierMap,Tp::UIntList,Tp::CallStateReason)));
+            SIGNAL(RemoteMembersChanged(TpDBus::ContactSendingStateMap,TpDBus::HandleIdentifierMap,TpDBus::UIntList,TpDBus::CallStateReason)),
+            SLOT(onRemoteMembersChanged(TpDBus::ContactSendingStateMap,TpDBus::HandleIdentifierMap,TpDBus::UIntList,TpDBus::CallStateReason)));
 
     parent->connect(self->streamInterface->requestAllProperties(),
             SIGNAL(finished(Tp::PendingOperation*)),
diff --git a/TelepathyQt/channel.cpp b/TelepathyQt/channel.cpp
index b502c27f..2af3bee2 100644
--- a/TelepathyQt/channel.cpp
+++ b/TelepathyQt/channel.cpp
@@ -415,10 +415,10 @@ void Channel::Private::introspectGroup()
 
     parent->connect(group,
                     SIGNAL(MembersChanged(TpDBus::UIntList,
-                            TpDBus::UIntList,Tp::UIntList,
+                            TpDBus::UIntList,TpDBus::UIntList,
                             TpDBus::UIntList,QVariantMap)),
                     SLOT(onMembersChanged(TpDBus::UIntList,
-                            TpDBus::UIntList,Tp::UIntList,
+                            TpDBus::UIntList,TpDBus::UIntList,
                             TpDBus::UIntList,QVariantMap)));
 
     parent->connect(group,
diff --git a/TelepathyQt/contact-manager-roster.cpp b/TelepathyQt/contact-manager-roster.cpp
index 6c563712..d6db5f41 100644
--- a/TelepathyQt/contact-manager-roster.cpp
+++ b/TelepathyQt/contact-manager-roster.cpp
@@ -969,8 +969,8 @@ void ContactManager::Roster::introspectContactBlockingBlockedContacts()
             SLOT(gotContactBlockingBlockedContacts(QDBusPendingCallWatcher*)));
 
     connect(iface,
-            SIGNAL(BlockedContactsChanged(TpDBus::HandleIdentifierMap,Tp::HandleIdentifierMap)),
-            SLOT(onContactBlockingBlockedContactsChanged(TpDBus::HandleIdentifierMap,Tp::HandleIdentifierMap)));
+            SIGNAL(BlockedContactsChanged(TpDBus::HandleIdentifierMap,TpDBus::HandleIdentifierMap)),
+            SLOT(onContactBlockingBlockedContactsChanged(TpDBus::HandleIdentifierMap,TpDBus::HandleIdentifierMap)));
 }
 
 void ContactManager::Roster::introspectContactList()
@@ -986,11 +986,11 @@ void ContactManager::Roster::introspectContactList()
             SIGNAL(ContactListStateChanged(uint)),
             SLOT(onContactListStateChanged(uint)));
     connect(iface,
-            SIGNAL(ContactsChangedWithID(TpDBus::ContactSubscriptionMap,Tp::HandleIdentifierMap,Tp::HandleIdentifierMap)),
-            SLOT(onContactListContactsChangedWithId(TpDBus::ContactSubscriptionMap,Tp::HandleIdentifierMap,Tp::HandleIdentifierMap)));
+            SIGNAL(ContactsChangedWithID(TpDBus::ContactSubscriptionMap,TpDBus::HandleIdentifierMap,TpDBus::HandleIdentifierMap)),
+            SLOT(onContactListContactsChangedWithId(TpDBus::ContactSubscriptionMap,TpDBus::HandleIdentifierMap,TpDBus::HandleIdentifierMap)));
     connect(iface,
-            SIGNAL(ContactsChanged(TpDBus::ContactSubscriptionMap,Tp::UIntList)),
-            SLOT(onContactListContactsChanged(TpDBus::ContactSubscriptionMap,Tp::UIntList)));
+            SIGNAL(ContactsChanged(TpDBus::ContactSubscriptionMap,TpDBus::UIntList)),
+            SLOT(onContactListContactsChanged(TpDBus::ContactSubscriptionMap,TpDBus::UIntList)));
 
     PendingVariantMap *pvm = iface->requestAllProperties();
     connect(pvm,
diff --git a/TelepathyQt/contact-manager.cpp b/TelepathyQt/contact-manager.cpp
index be246534..e6f22e66 100644
--- a/TelepathyQt/contact-manager.cpp
+++ b/TelepathyQt/contact-manager.cpp
@@ -1533,8 +1533,8 @@ void ContactManager::ensureTracking(const Feature &feature)
             conn->interface<Client::ConnectionInterfaceContactInfo1Interface>();
 
         connect(contactInfo1Interface,
-                SIGNAL(ContactInfoChanged(uint,Tp::ContactInfoFieldList)),
-                SLOT(onContactInfoChanged(uint,Tp::ContactInfoFieldList)));
+                SIGNAL(ContactInfoChanged(uint,TpDBus::ContactInfoFieldList)),
+                SLOT(onContactInfoChanged(uint,TpDBus::ContactInfoFieldList)));
     } else if (feature == Contact::FeatureLocation) {
         Client::ConnectionInterfaceLocation1Interface *location1Interface =
             conn->interface<Client::ConnectionInterfaceLocation1Interface>();
diff --git a/TelepathyQt/dbus-tube-channel.cpp b/TelepathyQt/dbus-tube-channel.cpp
index 3cd35c41..766cdc27 100644
--- a/TelepathyQt/dbus-tube-channel.cpp
+++ b/TelepathyQt/dbus-tube-channel.cpp
@@ -122,8 +122,8 @@ void DBusTubeChannel::Private::introspectBusNamesMonitoring(DBusTubeChannel::Pri
 
     // It makes sense only if this is a room, if that's not the case just spit a warning
     if (parent->targetHandleType() == static_cast<uint>(Tp::HandleTypeRoom)) {
-        parent->connect(dbusTubeInterface, SIGNAL(DBusNamesChanged(TpDBus::DBusTubeParticipants,Tp::UIntList)),
-                        parent, SLOT(onDBusNamesChanged(TpDBus::DBusTubeParticipants,Tp::UIntList)));
+        parent->connect(dbusTubeInterface, SIGNAL(DBusNamesChanged(TpDBus::DBusTubeParticipants,TpDBus::UIntList)),
+                        parent, SLOT(onDBusNamesChanged(TpDBus::DBusTubeParticipants,TpDBus::UIntList)));
 
         // Request the current DBusNames property
         connect(dbusTubeInterface->requestPropertyDBusNames(), SIGNAL(finished(Tp::PendingOperation*)),