AccountManager: Rename accountForPath and accountsForPaths to accountForObjectPath and accountsForObjectPaths respectively.

It turns out that the accountForPath name is not very intuitive,
when the path is accessed from the objectPath() method.

Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>

4 files changed, 27 insertions, 9 deletions

diff --git a/TelepathyQt/account-manager.cpp b/TelepathyQt/account-manager.cpp
index 93f40340..6d946065 100644
--- a/TelepathyQt/account-manager.cpp
+++ b/TelepathyQt/account-manager.cpp
@@ -889,9 +889,9 @@ AccountSetPtr AccountManager::filterAccounts(const QVariantMap &filter) const
  *
  * \param path The account object path.
  * \return A pointer to an AccountSet object containing the matching accounts.
- * \sa allAccounts(), accountsForPaths()
+ * \sa allAccounts(), accountsForObjectPaths()
  */
-AccountPtr AccountManager::accountForPath(const QString &path) const
+AccountPtr AccountManager::accountForObjectPath(const QString &path) const
 {
     if (!isReady(FeatureCore)) {
         return AccountPtr();
@@ -901,6 +901,14 @@ AccountPtr AccountManager::accountForPath(const QString &path) const
 }
 
 /**
+ * \deprecated See accountForObjectPath()
+ */
+AccountPtr AccountManager::accountForPath(const QString &path) const
+{
+    return accountForObjectPath(path);
+}
+
+/**
  * Return a list of accounts for the given \a paths.
  *
  * The returned list will have one AccountPtr object for each given path. If
@@ -912,9 +920,9 @@ AccountPtr AccountManager::accountForPath(const QString &path) const
  * \param paths List of accounts object paths.
  * \return A list of pointers to Account objects for the given
  *         \a paths. Null AccountPtr objects will be used as list elements for each invalid path.
- * \sa allAccounts(), accountForPath()
+ * \sa allAccounts(), accountForObjectPath()
  */
-QList<AccountPtr> AccountManager::accountsForPaths(const QStringList &paths) const
+QList<AccountPtr> AccountManager::accountsForObjectPaths(const QStringList &paths) const
 {
     if (!isReady(FeatureCore)) {
         return QList<AccountPtr>();
@@ -922,12 +930,20 @@ QList<AccountPtr> AccountManager::accountsForPaths(const QStringList &paths) con
 
     QList<AccountPtr> result;
     foreach (const QString &path, paths) {
-        result << accountForPath(path);
+        result << accountForObjectPath(path);
     }
     return result;
 }
 
 /**
+ * \deprecated See accountsForObjectPaths()
+ */
+QList<AccountPtr> AccountManager::accountsForPaths(const QStringList &paths) const
+{
+    return accountsForObjectPaths(paths);
+}
+
+/**
  * Return a list of the fully qualified names of properties that can be set
  * when calling createAccount().
  *
diff --git a/TelepathyQt/account-manager.h b/TelepathyQt/account-manager.h
index 53ab2cd7..f665a726 100644
--- a/TelepathyQt/account-manager.h
+++ b/TelepathyQt/account-manager.h
@@ -109,8 +109,10 @@ public:
     AccountSetPtr filterAccounts(const AccountFilterConstPtr &filter) const;
     AccountSetPtr filterAccounts(const QVariantMap &filter) const;
 
-    AccountPtr accountForPath(const QString &path) const;
-    QList<AccountPtr> accountsForPaths(const QStringList &paths) const;
+    AccountPtr accountForObjectPath(const QString &path) const;
+    TP_QT_DEPRECATED AccountPtr accountForPath(const QString &path) const;
+    QList<AccountPtr> accountsForObjectPaths(const QStringList &paths) const;
+    TP_QT_DEPRECATED QList<AccountPtr> accountsForPaths(const QStringList &paths) const;
 
     QStringList supportedAccountProperties() const;
     PendingAccount *createAccount(const QString &connectionManager,
diff --git a/examples/file-transfer/file-sender.cpp b/examples/file-transfer/file-sender.cpp
index f8a8b3d1..a747af18 100644
--- a/examples/file-transfer/file-sender.cpp
+++ b/examples/file-transfer/file-sender.cpp
@@ -93,7 +93,7 @@ void FileSender::onAMReady(PendingOperation *op)
     Q_ASSERT(pr != NULL);
     qDebug() << "AccountManager ready";
 
-    mAccount = mAM->accountForPath(
+    mAccount = mAM->accountForObjectPath(
             TP_QT_ACCOUNT_OBJECT_PATH_BASE + QLatin1Char('/') + mAccountName);
     if (!mAccount) {
         qWarning() << "The account given does not exist";
diff --git a/tests/dbus/account-basics.cpp b/tests/dbus/account-basics.cpp
index cf236b80..98f02854 100644
--- a/tests/dbus/account-basics.cpp
+++ b/tests/dbus/account-basics.cpp
@@ -205,7 +205,7 @@ void TestAccountBasics::testBasics()
     QStringList paths;
     QString accPath(QLatin1String("/org/freedesktop/Telepathy/Account/foo/bar/Account0"));
     QCOMPARE(pathsForAccounts(mAM->allAccounts()), QStringList() << accPath);
-    QList<AccountPtr> accs = mAM->accountsForPaths(
+    QList<AccountPtr> accs = mAM->accountsForObjectPaths(
             QStringList() << accPath << QLatin1String("/invalid/path"));
     QCOMPARE(accs.size(), 2);
     QCOMPARE(accs[0]->objectPath(), accPath);