[Telepathy-commits] [telepathy-qt4/master] Use full namespace on Channel and ConnectionManager signals.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Thu Feb 26 15:19:11 PST 2009
---
TelepathyQt4/Client/channel.h | 12 ++++++------
TelepathyQt4/Client/contact-manager.cpp | 30 +++++++++++++++---------------
TelepathyQt4/Client/contact-manager.h | 22 +++++++++++-----------
tests/dbus/chan-group.cpp | 30 +++++++++++++++---------------
4 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/TelepathyQt4/Client/channel.h b/TelepathyQt4/Client/channel.h
index 5d5fff0..bdd0859 100644
--- a/TelepathyQt4/Client/channel.h
+++ b/TelepathyQt4/Client/channel.h
@@ -151,13 +151,13 @@ Q_SIGNALS:
void groupCanRescindContactsChanged(bool canRescindContacts);
void groupMembersChanged(
- const QSet<QSharedPointer<Contact> > &groupMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupLocalPendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupRemotePendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupMembersRemoved,
- const Channel::GroupMemberChangeDetails &details);
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupLocalPendingMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupRemotePendingMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupMembersRemoved,
+ const Telepathy::Client::Channel::GroupMemberChangeDetails &details);
- void groupHandleOwnersChanged(const HandleOwnerMap &owners,
+ void groupHandleOwnersChanged(const Telepathy::HandleOwnerMap &owners,
const Telepathy::UIntList &added, const Telepathy::UIntList &removed);
void groupSelfContactChanged();
diff --git a/TelepathyQt4/Client/contact-manager.cpp b/TelepathyQt4/Client/contact-manager.cpp
index 2bfd451..fa9379d 100644
--- a/TelepathyQt4/Client/contact-manager.cpp
+++ b/TelepathyQt4/Client/contact-manager.cpp
@@ -444,29 +444,29 @@ void ContactManager::setContactListChannels(
if (type == ContactListChannel::TypeSubscribe) {
method = SLOT(onSubscribeChannelMembersChanged(
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const Channel::GroupMemberChangeDetails &));
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const Telepathy::Client::Channel::GroupMemberChangeDetails &));
} else if (type == ContactListChannel::TypePublish) {
method = SLOT(onPublishChannelMembersChanged(
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const Channel::GroupMemberChangeDetails &));
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const Telepathy::Client::Channel::GroupMemberChangeDetails &));
} else {
continue;
}
connect(channel.data(),
SIGNAL(groupMembersChanged(
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const Channel::GroupMemberChangeDetails &)),
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const Telepathy::Client::Channel::GroupMemberChangeDetails &)),
method);
}
}
diff --git a/TelepathyQt4/Client/contact-manager.h b/TelepathyQt4/Client/contact-manager.h
index e3892ca..211d1cd 100644
--- a/TelepathyQt4/Client/contact-manager.h
+++ b/TelepathyQt4/Client/contact-manager.h
@@ -81,7 +81,7 @@ class ContactManager : public QObject
const QSet<Contact::Feature> &features);
Q_SIGNALS:
- void presencePublicationRequested(const QSet<QSharedPointer<Contact> > &contacts);
+ void presencePublicationRequested(const QSet<QSharedPointer<Telepathy::Client::Contact> > &contacts);
private Q_SLOTS:
void onAliasesChanged(const Telepathy::AliasPairList &);
@@ -89,17 +89,17 @@ class ContactManager : public QObject
void onPresencesChanged(const Telepathy::SimpleContactPresences &);
void onSubscribeChannelMembersChanged(
- const QSet<QSharedPointer<Contact> > &groupMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupLocalPendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupRemotePendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupMembersRemoved,
- const Channel::GroupMemberChangeDetails &details);
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupLocalPendingMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupRemotePendingMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupMembersRemoved,
+ const Telepathy::Client::Channel::GroupMemberChangeDetails &details);
void onPublishChannelMembersChanged(
- const QSet<QSharedPointer<Contact> > &groupMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupLocalPendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupRemotePendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupMembersRemoved,
- const Channel::GroupMemberChangeDetails &details);
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupLocalPendingMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupRemotePendingMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupMembersRemoved,
+ const Telepathy::Client::Channel::GroupMemberChangeDetails &details);
private:
struct ContactListChannel
diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp
index 0474ac8..8cea1c5 100644
--- a/tests/dbus/chan-group.cpp
+++ b/tests/dbus/chan-group.cpp
@@ -42,11 +42,11 @@ protected Q_SLOTS:
void expectPendingContactsFinished(Telepathy::Client::PendingOperation *);
void onChannelGroupFlagsChanged(uint, uint, uint);
void onGroupMembersChanged(
- const QSet<QSharedPointer<Contact> > &groupMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupLocalPendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupRemotePendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupMembersRemoved,
- const Channel::GroupMemberChangeDetails &details);
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupLocalPendingMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupRemotePendingMembersAdded,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &groupMembersRemoved,
+ const Telepathy::Client::Channel::GroupMemberChangeDetails &details);
private Q_SLOTS:
void initTestCase();
@@ -437,17 +437,17 @@ void TestChanGroup::doTestCreateChannel()
QVERIFY(connect(mChan.data(),
SIGNAL(groupMembersChanged(
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const Channel::GroupMemberChangeDetails &)),
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const Telepathy::Client::Channel::GroupMemberChangeDetails &)),
SLOT(onGroupMembersChanged(
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const QSet<QSharedPointer<Contact> > &,
- const Channel::GroupMemberChangeDetails &))));
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const QSet<QSharedPointer<Telepathy::Client::Contact> > &,
+ const Telepathy::Client::Channel::GroupMemberChangeDetails &))));
if (mChan->groupContacts().count() != 5) {
// wait the initial contacts to be added to the group
--
1.5.6.5
More information about the telepathy-commits
mailing list