[telepathy-qt4/master] ContactManager: Renamed groupAdd/RemoveContacts to addContactsToGroup/removeContactsFromGroup.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/contact-manager.cpp  |    8 ++++----
 TelepathyQt4/contact-manager.h    |    4 ++--
 TelepathyQt4/contact.cpp          |    4 ++--
 tests/dbus/conn-roster-groups.cpp |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/TelepathyQt4/contact-manager.cpp b/TelepathyQt4/contact-manager.cpp
index 6f30936..c18724e 100644
--- a/TelepathyQt4/contact-manager.cpp
+++ b/TelepathyQt4/contact-manager.cpp
@@ -215,7 +215,7 @@ QStringList ContactManager::allKnownGroups() const
  * \param group Group name.
  * \return A pending operation which will return when an attempt has been made
  *         to add an user-defined contact list group.
- * \sa groupAdded(), groupAddContacts()
+ * \sa groupAdded(), addContactsToGroup()
  */
 PendingOperation *ContactManager::addGroup(const QString &group)
 {
@@ -237,7 +237,7 @@ PendingOperation *ContactManager::addGroup(const QString &group)
  * \param group Group name.
  * \return A pending operation which will return when an attempt has been made
  *         to remove an user-defined contact list group.
- * \sa groupRemoved(), groupRemoveContacts()
+ * \sa groupRemoved(), removeContactsFromGroup()
  */
 PendingOperation *ContactManager::removeGroup(const QString &group)
 {
@@ -284,7 +284,7 @@ Contacts ContactManager::groupContacts(const QString &group) const
  * \return A pending operation which will return when an attempt has been made
  *         to add the contacts to the user-defined contact list group.
  */
-PendingOperation *ContactManager::groupAddContacts(const QString &group,
+PendingOperation *ContactManager::addContactsToGroup(const QString &group,
         const QList<ContactPtr> &contacts)
 {
     if (!mPriv->contactListGroupChannels.contains(group)) {
@@ -307,7 +307,7 @@ PendingOperation *ContactManager::groupAddContacts(const QString &group,
  * \return A pending operation which will return when an attempt has been made
  *         to remove the contacts from the user-defined contact list group.
  */
-PendingOperation *ContactManager::groupRemoveContacts(const QString &group,
+PendingOperation *ContactManager::removeContactsFromGroup(const QString &group,
         const QList<ContactPtr> &contacts)
 {
     if (!mPriv->contactListGroupChannels.contains(group)) {
diff --git a/TelepathyQt4/contact-manager.h b/TelepathyQt4/contact-manager.h
index 56555b0..87c02ba 100644
--- a/TelepathyQt4/contact-manager.h
+++ b/TelepathyQt4/contact-manager.h
@@ -60,9 +60,9 @@ public:
     PendingOperation *removeGroup(const QString &group);
 
     Contacts groupContacts(const QString &group) const;
-    PendingOperation *groupAddContacts(const QString &group,
+    PendingOperation *addContactsToGroup(const QString &group,
             const QList<ContactPtr> &contacts);
-    PendingOperation *groupRemoveContacts(const QString &group,
+    PendingOperation *removeContactsFromGroup(const QString &group,
             const QList<ContactPtr> &contacts);
 
     bool canRequestPresenceSubscription() const;
diff --git a/TelepathyQt4/contact.cpp b/TelepathyQt4/contact.cpp
index 31ea78e..78dd367 100644
--- a/TelepathyQt4/contact.cpp
+++ b/TelepathyQt4/contact.cpp
@@ -243,7 +243,7 @@ PendingOperation *Contact::addToGroup(const QString &group)
 {
     ContactPtr self =
         mPriv->manager->lookupContactByHandle(mPriv->handle[0]);
-    return mPriv->manager->groupAddContacts(
+    return mPriv->manager->addContactsToGroup(
             group, QList<ContactPtr>() << self);
 }
 
@@ -261,7 +261,7 @@ PendingOperation *Contact::removeFromGroup(const QString &group)
 {
     ContactPtr self =
         mPriv->manager->lookupContactByHandle(mPriv->handle[0]);
-    return mPriv->manager->groupRemoveContacts(
+    return mPriv->manager->removeContactsFromGroup(
             group, QList<ContactPtr>() << self);
 }
 
diff --git a/tests/dbus/conn-roster-groups.cpp b/tests/dbus/conn-roster-groups.cpp
index 102e60f..06c4a24 100644
--- a/tests/dbus/conn-roster-groups.cpp
+++ b/tests/dbus/conn-roster-groups.cpp
@@ -221,7 +221,7 @@ void TestConnRosterGroups::testRosterGroups()
                         SIGNAL(addedToGroup(const QString&)),
                         SLOT(onContactAddedToGroup(const QString&))));
     }
-    QVERIFY(connect(contactManager->groupAddContacts(group, contacts.toList()),
+    QVERIFY(connect(contactManager->addContactsToGroup(group, contacts.toList()),
                     SIGNAL(finished(Tp::PendingOperation*)),
                     SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 0);
@@ -239,7 +239,7 @@ void TestConnRosterGroups::testRosterGroups()
                         SIGNAL(removedFromGroup(const QString&)),
                         SLOT(onContactRemovedFromGroup(const QString&))));
     }
-    QVERIFY(connect(contactManager->groupRemoveContacts(group, contacts.toList()),
+    QVERIFY(connect(contactManager->removeContactsFromGroup(group, contacts.toList()),
                     SIGNAL(finished(Tp::PendingOperation*)),
                     SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 0);
-- 
1.5.6.5