[Telepathy-commits] [telepathy-qt4/master] Channel: Changed requested to isRequested.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/channel.cpp |    4 ++--
 TelepathyQt4/Client/channel.h   |    2 +-
 tests/dbus/chan-basics.cpp      |    4 ++--
 tests/dbus/chan-group.cpp       |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/TelepathyQt4/Client/channel.cpp b/TelepathyQt4/Client/channel.cpp
index 56da199..6c15a68 100644
--- a/TelepathyQt4/Client/channel.cpp
+++ b/TelepathyQt4/Client/channel.cpp
@@ -983,10 +983,10 @@ uint Channel::targetHandle() const
  * \return \c true if this channel was created in response to a local request,
  *         \c false otherwise.
  */
-bool Channel::requested() const
+bool Channel::isRequested() const
 {
     if (!isReady()) {
-        warning() << "Channel::requested() used channel not ready";
+        warning() << "Channel::isRequested() used channel not ready";
     }
 
     return mPriv->requested;
diff --git a/TelepathyQt4/Client/channel.h b/TelepathyQt4/Client/channel.h
index 55e8559..88567cf 100644
--- a/TelepathyQt4/Client/channel.h
+++ b/TelepathyQt4/Client/channel.h
@@ -73,7 +73,7 @@ public:
 
     uint targetHandle() const;
 
-    bool requested() const;
+    bool isRequested() const;
 
     QSharedPointer<Contact> initiatorContact() const;
 
diff --git a/tests/dbus/chan-basics.cpp b/tests/dbus/chan-basics.cpp
index 4b7ddcb..ef37b08 100644
--- a/tests/dbus/chan-basics.cpp
+++ b/tests/dbus/chan-basics.cpp
@@ -265,7 +265,7 @@ void TestChanBasics::testCreateChannel()
                         SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation*))));
         QCOMPARE(mLoop->exec(), 0);
         QCOMPARE(mChan->isReady(), true);
-        QCOMPARE(mChan->requested(), true);
+        QCOMPARE(mChan->isRequested(), true);
         QCOMPARE(mChan->groupCanAddContacts(), false);
         QCOMPARE(mChan->groupCanRemoveContacts(), false);
         QCOMPARE(mChan->initiatorContact()->id(), QString("me at example.com"));
@@ -304,7 +304,7 @@ void TestChanBasics::testEnsureChannel()
                         SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation*))));
         QCOMPARE(mLoop->exec(), 0);
         QCOMPARE(mChan->isReady(), true);
-        QCOMPARE(mChan->requested(), true);
+        QCOMPARE(mChan->isRequested(), true);
         QCOMPARE(mChan->groupCanAddContacts(), false);
         QCOMPARE(mChan->groupCanRemoveContacts(), false);
         QCOMPARE(mChan->initiatorContact()->id(), QString("me at example.com"));
diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp
index e1a1769..52ec771 100644
--- a/tests/dbus/chan-group.cpp
+++ b/tests/dbus/chan-group.cpp
@@ -383,7 +383,7 @@ void TestChanGroup::testCreateChannel()
         QCOMPARE(mLoop->exec(), 0);
         QCOMPARE(mChan->isReady(), true);
 
-        QCOMPARE(mChan->requested(), true);
+        QCOMPARE(mChan->isRequested(), true);
         QCOMPARE(mChan->initiatorContact().isNull(), true);
         QCOMPARE(mChan->groupSelfContact()->id(), QString("me@#room"));
 
-- 
1.5.6.5