[Telepathy-commits] [telepathy-qt4/master] Rename Account::isValid to isValidAccount to avoid clash with DBusProxy

[Simon McVittie]

---
 TelepathyQt4/Client/account.cpp |    2 +-
 TelepathyQt4/Client/account.h   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TelepathyQt4/Client/account.cpp b/TelepathyQt4/Client/account.cpp
index f60ae46..b2ca198 100644
--- a/TelepathyQt4/Client/account.cpp
+++ b/TelepathyQt4/Client/account.cpp
@@ -220,7 +220,7 @@ AccountManager *Account::manager() const
  *
  * \return \c true if the account is valid, \c false otherwise.
  */
-bool Account::isValid() const
+bool Account::isValidAccount() const
 {
     return mPriv->valid;
 }
diff --git a/TelepathyQt4/Client/account.h b/TelepathyQt4/Client/account.h
index f5e5037..dc441c7 100644
--- a/TelepathyQt4/Client/account.h
+++ b/TelepathyQt4/Client/account.h
@@ -78,7 +78,7 @@ public:
 
     AccountManager *manager() const;
 
-    bool isValid() const;
+    bool isValidAccount() const;
 
     bool isEnabled() const;
     PendingOperation *setEnabled(bool value);
-- 
1.5.6.5