[Telepathy-commits] [telepathy-qt4/master] Changed PendingReadyAccount features method to requestedFeatures.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/account.cpp               |   10 +++++-----
 TelepathyQt4/Client/pending-ready-account.cpp |   14 +++++++-------
 TelepathyQt4/Client/pending-ready-account.h   |    4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/TelepathyQt4/Client/account.cpp b/TelepathyQt4/Client/account.cpp
index c8f7732..ef7a3f9 100644
--- a/TelepathyQt4/Client/account.cpp
+++ b/TelepathyQt4/Client/account.cpp
@@ -622,7 +622,7 @@ bool Account::isReady(Features features) const
  * initial setup.
  *
  * \param features Which features should be tested.
- * \return A PendingReadyAccount which will emit PendingOperation::finished
+ * \return A PendingReadyAccount object which will emit finished
  *         when this object has finished or failed its initial setup.
  */
 PendingReadyAccount *Account::becomeReady(Features requestedFeatures)
@@ -645,7 +645,7 @@ PendingReadyAccount *Account::becomeReady(Features requestedFeatures)
     debug() << "calling becomeReady with requested features:"
             << requestedFeatures;
     foreach (PendingReadyAccount *operation, mPriv->pendingOperations) {
-        if (operation->features() == requestedFeatures) {
+        if (operation->requestedFeatures() == requestedFeatures) {
             debug() << "returning cached pending operation";
             return operation;
         }
@@ -1050,7 +1050,7 @@ void Account::onConnectionManagerReady(PendingOperation *operation)
         // signal all pending operations that cares about protocol info that
         // it failed, as FeatureProtocolInfo is mandatory
         foreach (PendingReadyAccount *operation, mPriv->pendingOperations) {
-            if (operation->features() & FeatureProtocolInfo) {
+            if (operation->requestedFeatures() & FeatureProtocolInfo) {
                 operation->setFinishedWithError(operation->errorName(),
                         operation->errorMessage());
                 mPriv->pendingOperations.removeOne(operation);
@@ -1081,8 +1081,8 @@ void Account::continueIntrospection()
     if (mPriv->introspectQueue.isEmpty()) {
         foreach (PendingReadyAccount *operation, mPriv->pendingOperations) {
             if (mPriv->ready &&
-                ((operation->features() &
-                    (mPriv->features | mPriv->missingFeatures)) == operation->features())) {
+                ((operation->requestedFeatures() &
+                    (mPriv->features | mPriv->missingFeatures)) == operation->requestedFeatures())) {
                 operation->setFinished();
             }
             if (operation->isFinished()) {
diff --git a/TelepathyQt4/Client/pending-ready-account.cpp b/TelepathyQt4/Client/pending-ready-account.cpp
index 03e551f..3ab8a46 100644
--- a/TelepathyQt4/Client/pending-ready-account.cpp
+++ b/TelepathyQt4/Client/pending-ready-account.cpp
@@ -46,13 +46,13 @@ namespace Client
 
 struct PendingReadyAccount::Private
 {
-    Private(Account::Features features, Account *account) :
-        features(features),
+    Private(Account::Features requestedFeatures, Account *account) :
+        requestedFeatures(requestedFeatures),
         account(account)
     {
     }
 
-    Account::Features features;
+    Account::Features requestedFeatures;
     Account *account;
 };
 
@@ -71,9 +71,9 @@ struct PendingReadyAccount::Private
  *
  * \param account The Account that will become ready.
  */
-PendingReadyAccount::PendingReadyAccount(Account::Features features, Account *account)
+PendingReadyAccount::PendingReadyAccount(Account::Features requestedFeatures, Account *account)
     : PendingOperation(account),
-      mPriv(new Private(features, account))
+      mPriv(new Private(requestedFeatures, account))
 {
 }
 
@@ -101,9 +101,9 @@ Account *PendingReadyAccount::account() const
  *
  * \return Features.
  */
-Account::Features PendingReadyAccount::features() const
+Account::Features PendingReadyAccount::requestedFeatures() const
 {
-    return mPriv->features;
+    return mPriv->requestedFeatures;
 }
 
 } // Telepathy::Client
diff --git a/TelepathyQt4/Client/pending-ready-account.h b/TelepathyQt4/Client/pending-ready-account.h
index 837675c..ba61038 100644
--- a/TelepathyQt4/Client/pending-ready-account.h
+++ b/TelepathyQt4/Client/pending-ready-account.h
@@ -44,11 +44,11 @@ public:
     ~PendingReadyAccount();
 
     Account *account() const;
-    Account::Features features() const;
+    Account::Features requestedFeatures() const;
 
 private:
     Q_DISABLE_COPY(PendingReadyAccount);
-    PendingReadyAccount(Account::Features features, Account *account);
+    PendingReadyAccount(Account::Features requestedFeatures, Account *account);
 
     struct Private;
     friend struct Private;
-- 
1.5.6.5