[Telepathy-commits] [telepathy-qt4/master] typedef QSet<QSharedPointer<Contact> > as Contacts to make code clearer
Simon McVittie
simon.mcvittie at collabora.co.uk
Thu Mar 5 08:09:24 PST 2009
---
TelepathyQt4/Client/channel.cpp | 24 +++++-----
TelepathyQt4/Client/channel.h | 14 +++---
TelepathyQt4/Client/contact-manager.cpp | 76 +++++++++++++++---------------
TelepathyQt4/Client/contact-manager.h | 28 ++++++------
TelepathyQt4/Client/contact.h | 2 +
examples/roster/roster-window.cpp | 6 +-
examples/roster/roster-window.h | 2 +-
tests/dbus/chan-group.cpp | 46 +++++++++---------
8 files changed, 99 insertions(+), 99 deletions(-)
diff --git a/TelepathyQt4/Client/channel.cpp b/TelepathyQt4/Client/channel.cpp
index 71a86c9..f65aba3 100644
--- a/TelepathyQt4/Client/channel.cpp
+++ b/TelepathyQt4/Client/channel.cpp
@@ -725,9 +725,9 @@ void Channel::Private::processMembersChanged()
void Channel::Private::updateContacts(const QList<QSharedPointer<Contact> > &contacts)
{
- QSet<QSharedPointer<Contact> > groupContactsAdded;
- QSet<QSharedPointer<Contact> > groupLocalPendingContactsAdded;
- QSet<QSharedPointer<Contact> > groupRemotePendingContactsAdded;
+ Contacts groupContactsAdded;
+ Contacts groupLocalPendingContactsAdded;
+ Contacts groupRemotePendingContactsAdded;
QSharedPointer<Contact> actorContact;
bool selfContactUpdated = false;
@@ -785,9 +785,7 @@ void Channel::Private::updateContacts(const QList<QSharedPointer<Contact> > &con
}
}
- // FIXME: use QSet to make the code somewhat easier to comprehend and change
-
- QSet<QSharedPointer<Contact> > groupContactsRemoved;
+ Contacts groupContactsRemoved;
QSharedPointer<Contact> contactToRemove;
foreach (uint handle, groupMembersToRemove) {
if (groupContacts.contains(handle)) {
@@ -1411,7 +1409,7 @@ PendingOperation *Channel::groupRemoveContacts(const QList<QSharedPointer<Contac
*
* \return List of contact objects.
*/
-QSet<QSharedPointer<Contact> > Channel::groupContacts() const
+Contacts Channel::groupContacts() const
{
if (!isReady()) {
warning() << "Channel::groupMembers() used channel not ready";
@@ -1426,7 +1424,7 @@ QSet<QSharedPointer<Contact> > Channel::groupContacts() const
*
* \return List of contacts.
*/
-QSet<QSharedPointer<Contact> > Channel::groupLocalPendingContacts() const
+Contacts Channel::groupLocalPendingContacts() const
{
if (!isReady()) {
warning() << "Channel::groupLocalPending() used channel not ready";
@@ -1444,7 +1442,7 @@ QSet<QSharedPointer<Contact> > Channel::groupLocalPendingContacts() const
*
* \return List of contacts.
*/
-QSet<QSharedPointer<Contact> > Channel::groupRemotePendingContacts() const
+Contacts Channel::groupRemotePendingContacts() const
{
if (!isReady()) {
warning() << "Channel::groupRemotePending() used channel not ready";
@@ -1626,10 +1624,10 @@ QSharedPointer<Contact> Channel::groupSelfContact() const
/**
* \fn void Channel::groupMembersChanged(
- * const QSet<QSharedPointer<Contact> > &groupMembersAdded,
- * const QSet<QSharedPointer<Contact> > &groupLocalPendingMembersAdded,
- * const QSet<QSharedPointer<Contact> > &groupRemotePendingMembersAdded,
- * const QSet<QSharedPointer<Contact> > &groupMembersRemoved,
+ * const Telepathy::Client::Contacts &groupMembersAdded,
+ * const Telepathy::Client::Contacts &groupLocalPendingMembersAdded,
+ * const Telepathy::Client::Contacts &groupRemotePendingMembersAdded,
+ * const Telepathy::Client::Contacts &groupMembersRemoved,
* const Channel::GroupMemberChangeDetails &details);
*
* Emitted when the value returned by groupContacts(), groupLocalPendingContacts() or
diff --git a/TelepathyQt4/Client/channel.h b/TelepathyQt4/Client/channel.h
index bdd0859..c7ef61f 100644
--- a/TelepathyQt4/Client/channel.h
+++ b/TelepathyQt4/Client/channel.h
@@ -94,9 +94,9 @@ public:
const QString &message = QString(),
uint reason = Telepathy::ChannelGroupChangeReasonNone);
- QSet<QSharedPointer<Contact> > groupContacts() const;
- QSet<QSharedPointer<Contact> > groupLocalPendingContacts() const;
- QSet<QSharedPointer<Contact> > groupRemotePendingContacts() const;
+ Contacts groupContacts() const;
+ Contacts groupLocalPendingContacts() const;
+ Contacts groupRemotePendingContacts() const;
class GroupMemberChangeDetails
{
@@ -151,10 +151,10 @@ Q_SIGNALS:
void groupCanRescindContactsChanged(bool canRescindContacts);
void groupMembersChanged(
- 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::Contacts &groupMembersAdded,
+ const Telepathy::Client::Contacts &groupLocalPendingMembersAdded,
+ const Telepathy::Client::Contacts &groupRemotePendingMembersAdded,
+ const Telepathy::Client::Contacts &groupMembersRemoved,
const Telepathy::Client::Channel::GroupMemberChangeDetails &details);
void groupHandleOwnersChanged(const Telepathy::HandleOwnerMap &owners,
diff --git a/TelepathyQt4/Client/contact-manager.cpp b/TelepathyQt4/Client/contact-manager.cpp
index dd47bec..04d6394 100644
--- a/TelepathyQt4/Client/contact-manager.cpp
+++ b/TelepathyQt4/Client/contact-manager.cpp
@@ -76,7 +76,7 @@ struct ContactManager::Private
QSet<Contact::Feature> supportedFeatures;
QMap<uint, ContactListChannel> contactListsChannels;
- QSet<QSharedPointer<Contact> > allKnownContacts() const;
+ Contacts allKnownContacts() const;
void updateContactsPresenceState();
};
@@ -144,7 +144,7 @@ QSet<Contact::Feature> ContactManager::supportedFeatures() const
return mPriv->supportedFeatures;
}
-QSet<QSharedPointer<Contact> > ContactManager::allKnownContacts() const
+Contacts ContactManager::allKnownContacts() const
{
return mPriv->allKnownContacts();
}
@@ -408,10 +408,10 @@ void ContactManager::onPresencesChanged(const Telepathy::SimpleContactPresences
}
void ContactManager::onSubscribeChannelMembersChanged(
- const QSet<QSharedPointer<Contact> > &groupMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupLocalPendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupRemotePendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupMembersRemoved,
+ const Contacts &groupMembersAdded,
+ const Contacts &groupLocalPendingMembersAdded,
+ const Contacts &groupRemotePendingMembersAdded,
+ const Contacts &groupMembersRemoved,
const Channel::GroupMemberChangeDetails &details)
{
Q_UNUSED(details);
@@ -437,10 +437,10 @@ void ContactManager::onSubscribeChannelMembersChanged(
}
void ContactManager::onPublishChannelMembersChanged(
- const QSet<QSharedPointer<Contact> > &groupMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupLocalPendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupRemotePendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupMembersRemoved,
+ const Contacts &groupMembersAdded,
+ const Contacts &groupLocalPendingMembersAdded,
+ const Contacts &groupRemotePendingMembersAdded,
+ const Contacts &groupMembersRemoved,
const Channel::GroupMemberChangeDetails &details)
{
Q_UNUSED(details);
@@ -470,10 +470,10 @@ void ContactManager::onPublishChannelMembersChanged(
}
void ContactManager::onDenyChannelMembersChanged(
- const QSet<QSharedPointer<Contact> > &groupMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupLocalPendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupRemotePendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupMembersRemoved,
+ const Contacts &groupMembersAdded,
+ const Contacts &groupLocalPendingMembersAdded,
+ const Contacts &groupRemotePendingMembersAdded,
+ const Contacts &groupMembersRemoved,
const Channel::GroupMemberChangeDetails &details)
{
Q_UNUSED(details);
@@ -546,24 +546,24 @@ void ContactManager::setContactListChannels(
if (type == ContactListChannel::TypeSubscribe) {
method = SLOT(onSubscribeChannelMembersChanged(
- 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::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
const Telepathy::Client::Channel::GroupMemberChangeDetails &));
} else if (type == ContactListChannel::TypePublish) {
method = SLOT(onPublishChannelMembersChanged(
- 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::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
const Telepathy::Client::Channel::GroupMemberChangeDetails &));
} else if (type == ContactListChannel::TypeDeny) {
method = SLOT(onDenyChannelMembersChanged(
- 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::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
const Telepathy::Client::Channel::GroupMemberChangeDetails &));
} else {
continue;
@@ -571,10 +571,10 @@ void ContactManager::setContactListChannels(
connect(channel.data(),
SIGNAL(groupMembersChanged(
- 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::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
const Telepathy::Client::Channel::GroupMemberChangeDetails &)),
method);
}
@@ -634,9 +634,9 @@ void ContactManager::Private::ensureTracking(Contact::Feature feature)
tracking[feature] = true;
}
-QSet<QSharedPointer<Contact> > ContactManager::Private::allKnownContacts() const
+Contacts ContactManager::Private::allKnownContacts() const
{
- QSet<QSharedPointer<Contact> > contacts;
+ Contacts contacts;
foreach (const ContactListChannel &contactListChannel, contactListsChannels) {
QSharedPointer<Channel> channel = contactListChannel.channel;
if (!channel) {
@@ -652,8 +652,8 @@ QSet<QSharedPointer<Contact> > ContactManager::Private::allKnownContacts() const
void ContactManager::Private::updateContactsPresenceState()
{
QSharedPointer<Channel> subscribeChannel;
- QSet<QSharedPointer<Contact> > subscribeContacts;
- QSet<QSharedPointer<Contact> > subscribeContactsRP;
+ Contacts subscribeContacts;
+ Contacts subscribeContactsRP;
if (contactListsChannels.contains(ContactListChannel::TypeSubscribe)) {
subscribeChannel = contactListsChannels[ContactListChannel::TypeSubscribe].channel;
if (subscribeChannel) {
@@ -663,8 +663,8 @@ void ContactManager::Private::updateContactsPresenceState()
}
QSharedPointer<Channel> publishChannel;
- QSet<QSharedPointer<Contact> > publishContacts;
- QSet<QSharedPointer<Contact> > publishContactsLP;
+ Contacts publishContacts;
+ Contacts publishContactsLP;
if (contactListsChannels.contains(ContactListChannel::TypePublish)) {
publishChannel = contactListsChannels[ContactListChannel::TypePublish].channel;
if (publishChannel) {
@@ -674,7 +674,7 @@ void ContactManager::Private::updateContactsPresenceState()
}
QSharedPointer<Channel> denyChannel;
- QSet<QSharedPointer<Contact> > denyContacts;
+ Contacts denyContacts;
if (contactListsChannels.contains(ContactListChannel::TypeDeny)) {
denyChannel = contactListsChannels[ContactListChannel::TypeDeny].channel;
if (denyChannel) {
@@ -686,7 +686,7 @@ void ContactManager::Private::updateContactsPresenceState()
return;
}
- QSet<QSharedPointer<Contact> > contacts = allKnownContacts();
+ Contacts contacts = allKnownContacts();
foreach (QSharedPointer<Contact> contact, contacts) {
if (subscribeChannel) {
// not in "subscribe" -> No, in "subscribe" lp -> Ask, in "subscribe" current -> Yes
diff --git a/TelepathyQt4/Client/contact-manager.h b/TelepathyQt4/Client/contact-manager.h
index b09e4e4..f7a1d73 100644
--- a/TelepathyQt4/Client/contact-manager.h
+++ b/TelepathyQt4/Client/contact-manager.h
@@ -57,7 +57,7 @@ class ContactManager : public QObject
bool isSupported() const;
QSet<Contact::Feature> supportedFeatures() const;
- QSet<QSharedPointer<Contact> > allKnownContacts() const;
+ Contacts allKnownContacts() const;
bool canRequestContactsPresenceSubscription() const;
PendingOperation *requestContactsPresenceSubscription(
@@ -88,7 +88,7 @@ class ContactManager : public QObject
const QSet<Contact::Feature> &features);
Q_SIGNALS:
- void presencePublicationRequested(const QSet<QSharedPointer<Telepathy::Client::Contact> > &contacts);
+ void presencePublicationRequested(const Telepathy::Client::Contacts &contacts);
private Q_SLOTS:
void onAliasesChanged(const Telepathy::AliasPairList &);
@@ -96,22 +96,22 @@ class ContactManager : public QObject
void onPresencesChanged(const Telepathy::SimpleContactPresences &);
void onSubscribeChannelMembersChanged(
- 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::Contacts &groupMembersAdded,
+ const Telepathy::Client::Contacts &groupLocalPendingMembersAdded,
+ const Telepathy::Client::Contacts &groupRemotePendingMembersAdded,
+ const Telepathy::Client::Contacts &groupMembersRemoved,
const Telepathy::Client::Channel::GroupMemberChangeDetails &details);
void onPublishChannelMembersChanged(
- 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::Contacts &groupMembersAdded,
+ const Telepathy::Client::Contacts &groupLocalPendingMembersAdded,
+ const Telepathy::Client::Contacts &groupRemotePendingMembersAdded,
+ const Telepathy::Client::Contacts &groupMembersRemoved,
const Telepathy::Client::Channel::GroupMemberChangeDetails &details);
void onDenyChannelMembersChanged(
- 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::Contacts &groupMembersAdded,
+ const Telepathy::Client::Contacts &groupLocalPendingMembersAdded,
+ const Telepathy::Client::Contacts &groupRemotePendingMembersAdded,
+ const Telepathy::Client::Contacts &groupMembersRemoved,
const Telepathy::Client::Channel::GroupMemberChangeDetails &details);
private:
diff --git a/TelepathyQt4/Client/contact.h b/TelepathyQt4/Client/contact.h
index e8aa0ec..bb71882 100644
--- a/TelepathyQt4/Client/contact.h
+++ b/TelepathyQt4/Client/contact.h
@@ -127,6 +127,8 @@ private:
Private *mPriv;
};
+typedef QSet<QSharedPointer<Contact> > Contacts;
+
inline uint qHash(const QSharedPointer<Contact> &contact)
{
return qHash(contact.data());
diff --git a/examples/roster/roster-window.cpp b/examples/roster/roster-window.cpp
index 96bdbdb..ba5622e 100644
--- a/examples/roster/roster-window.cpp
+++ b/examples/roster/roster-window.cpp
@@ -211,8 +211,8 @@ void RosterWindow::onConnectionReady(Telepathy::Client::PendingOperation *op)
}
connect(mConn->contactManager(),
- SIGNAL(presencePublicationRequested(const QSet<QSharedPointer<Telepathy::Client::Contact> > &)),
- SLOT(onPresencePublicationRequested(const QSet<QSharedPointer<Telepathy::Client::Contact> > &)));
+ SIGNAL(presencePublicationRequested(const Telepathy::Client::Contacts &)),
+ SLOT(onPresencePublicationRequested(const Telepathy::Client::Contacts &)));
qDebug() << "Connection ready";
foreach (const QSharedPointer<Contact> &contact, mConn->contactManager()->allKnownContacts()) {
@@ -222,7 +222,7 @@ void RosterWindow::onConnectionReady(Telepathy::Client::PendingOperation *op)
mAddBtn->setEnabled(true);
}
-void RosterWindow::onPresencePublicationRequested(const QSet<QSharedPointer<Contact> > &contacts)
+void RosterWindow::onPresencePublicationRequested(const Contacts &contacts)
{
qDebug() << "Presence publication requested";
foreach (const QSharedPointer<Contact> &contact, contacts) {
diff --git a/examples/roster/roster-window.h b/examples/roster/roster-window.h
index a57e4d6..c6c645e 100644
--- a/examples/roster/roster-window.h
+++ b/examples/roster/roster-window.h
@@ -53,7 +53,7 @@ private Q_SLOTS:
void onCMReady(Telepathy::Client::PendingOperation *);
void onConnectionCreated(Telepathy::Client::PendingOperation *);
void onConnectionReady(Telepathy::Client::PendingOperation *);
- void onPresencePublicationRequested(const QSet<QSharedPointer<Telepathy::Client::Contact> > &);
+ void onPresencePublicationRequested(const Telepathy::Client::Contacts &);
void onItemSelectionChanged();
void onAddButtonClicked();
void onAuthActionTriggered(bool);
diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp
index 8cea1c5..f9c9d93 100644
--- a/tests/dbus/chan-group.cpp
+++ b/tests/dbus/chan-group.cpp
@@ -42,10 +42,10 @@ protected Q_SLOTS:
void expectPendingContactsFinished(Telepathy::Client::PendingOperation *);
void onChannelGroupFlagsChanged(uint, uint, uint);
void onGroupMembersChanged(
- 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::Contacts &groupMembersAdded,
+ const Telepathy::Client::Contacts &groupLocalPendingMembersAdded,
+ const Telepathy::Client::Contacts &groupRemotePendingMembersAdded,
+ const Telepathy::Client::Contacts &groupMembersRemoved,
const Telepathy::Client::Channel::GroupMemberChangeDetails &details);
private Q_SLOTS:
@@ -62,7 +62,7 @@ private Q_SLOTS:
void cleanupTestCase();
private:
- void checkExpectedIds(const QSet<QSharedPointer<Contact> > &contacts,
+ void checkExpectedIds(const Contacts &contacts,
const QStringList &expectedIds);
void debugContacts();
void doTestCreateChannel();
@@ -77,10 +77,10 @@ private:
ReferencedHandles mRoomHandles;
ReferencedHandles mContactHandles;
QList<QSharedPointer<Contact> > mContacts;
- QSet<QSharedPointer<Contact> > mChangedCurrent;
- QSet<QSharedPointer<Contact> > mChangedLP;
- QSet<QSharedPointer<Contact> > mChangedRP;
- QSet<QSharedPointer<Contact> > mChangedRemoved;
+ Contacts mChangedCurrent;
+ Contacts mChangedLP;
+ Contacts mChangedRP;
+ Contacts mChangedRemoved;
Channel::GroupMemberChangeDetails mDetails;
bool mRequested;
};
@@ -229,10 +229,10 @@ void TestChanGroup::onChannelGroupFlagsChanged(uint flags, uint added, uint remo
}
void TestChanGroup::onGroupMembersChanged(
- const QSet<QSharedPointer<Contact> > &groupMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupLocalPendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupRemotePendingMembersAdded,
- const QSet<QSharedPointer<Contact> > &groupMembersRemoved,
+ const Contacts &groupMembersAdded,
+ const Contacts &groupLocalPendingMembersAdded,
+ const Contacts &groupRemotePendingMembersAdded,
+ const Contacts &groupMembersRemoved,
const Channel::GroupMemberChangeDetails &details)
{
qDebug() << "group members changed";
@@ -245,7 +245,7 @@ void TestChanGroup::onGroupMembersChanged(
mLoop->exit(0);
}
-void TestChanGroup::checkExpectedIds(const QSet<QSharedPointer<Contact> > &contacts,
+void TestChanGroup::checkExpectedIds(const Contacts &contacts,
const QStringList &expectedIds)
{
QStringList ids;
@@ -437,16 +437,16 @@ void TestChanGroup::doTestCreateChannel()
QVERIFY(connect(mChan.data(),
SIGNAL(groupMembersChanged(
- 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::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
const Telepathy::Client::Channel::GroupMemberChangeDetails &)),
SLOT(onGroupMembersChanged(
- 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::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
+ const Telepathy::Client::Contacts &,
const Telepathy::Client::Channel::GroupMemberChangeDetails &))));
if (mChan->groupContacts().count() != 5) {
@@ -484,7 +484,7 @@ void TestChanGroup::doTestCreateChannel()
QCOMPARE(mContacts.size(), 3);
ids.sort();
- checkExpectedIds(QSet<QSharedPointer<Contact> >::fromList(mContacts), ids);
+ checkExpectedIds(Contacts::fromList(mContacts), ids);
QString message("I want to add them");
mChan->groupAddContacts(mContacts, message);
--
1.5.6.5
More information about the telepathy-commits
mailing list