[telepathy-qt4/master] StreamedMediaChannel: Renamed requestLocalHold method to requestHold.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/streamed-media-channel.cpp |    8 ++++----
 TelepathyQt4/streamed-media-channel.h   |    2 +-
 tests/dbus/streamed-media-chan.cpp      |   12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/TelepathyQt4/streamed-media-channel.cpp b/TelepathyQt4/streamed-media-channel.cpp
index af73106..73f3c07 100644
--- a/TelepathyQt4/streamed-media-channel.cpp
+++ b/TelepathyQt4/streamed-media-channel.cpp
@@ -705,7 +705,7 @@ bool StreamedMediaChannel::handlerStreamingRequired() const
  * This method requires StreamedMediaChannel::FeatureHoldState to be enabled.
  *
  * \return The channel local hold state.
- * \sa requestLocalHold()
+ * \sa requestHold()
  */
 LocalHoldState StreamedMediaChannel::localHoldState() const
 {
@@ -724,7 +724,7 @@ LocalHoldState StreamedMediaChannel::localHoldState() const
  * This method requires StreamedMediaChannel::FeatureLocalHoldState to be enabled.
  *
  * \return The channel local hold state reason.
- * \sa requestLocalHold()
+ * \sa requestHold()
  */
 LocalHoldStateReason StreamedMediaChannel::localHoldStateReason() const
 {
@@ -769,10 +769,10 @@ LocalHoldStateReason StreamedMediaChannel::localHoldStateReason() const
  *         when the request finishes.
  * \sa localHoldState(), localHoldStateReason()
  */
-PendingOperation *StreamedMediaChannel::requestLocalHold(bool hold)
+PendingOperation *StreamedMediaChannel::requestHold(bool hold)
 {
     if (!interfaces().contains(TELEPATHY_INTERFACE_CHANNEL_INTERFACE_HOLD)) {
-        warning() << "StreamedMediaChannel::requestLocalHold() used with no hold interface";
+        warning() << "StreamedMediaChannel::requestHold() used with no hold interface";
         return new PendingFailure(this, TELEPATHY_ERROR_NOT_IMPLEMENTED,
                 "StreamedMediaChannel does not support hold interface");
     }
diff --git a/TelepathyQt4/streamed-media-channel.h b/TelepathyQt4/streamed-media-channel.h
index 2ed099c..580069f 100644
--- a/TelepathyQt4/streamed-media-channel.h
+++ b/TelepathyQt4/streamed-media-channel.h
@@ -155,7 +155,7 @@ public:
 
     LocalHoldState localHoldState() const;
     LocalHoldStateReason localHoldStateReason() const;
-    PendingOperation *requestLocalHold(bool hold);
+    PendingOperation *requestHold(bool hold);
 
 Q_SIGNALS:
     void streamAdded(const Tp::MediaStreamPtr &stream);
diff --git a/tests/dbus/streamed-media-chan.cpp b/tests/dbus/streamed-media-chan.cpp
index 21e722f..28725fc 100644
--- a/tests/dbus/streamed-media-chan.cpp
+++ b/tests/dbus/streamed-media-chan.cpp
@@ -848,7 +848,7 @@ void TestStreamedMediaChan::testHold()
                     SIGNAL(localHoldStateChanged(Tp::LocalHoldState, Tp::LocalHoldStateReason)),
                     SLOT(onLocalHoldStateChanged(Tp::LocalHoldState, Tp::LocalHoldStateReason))));
     // Request hold
-    QVERIFY(connect(mChan->requestLocalHold(true),
+    QVERIFY(connect(mChan->requestHold(true),
                     SIGNAL(finished(Tp::PendingOperation*)),
                     SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 0);
@@ -866,7 +866,7 @@ void TestStreamedMediaChan::testHold()
     mLocalHoldStateReasons.clear();
 
     // Request unhold
-    QVERIFY(connect(mChan->requestLocalHold(false),
+    QVERIFY(connect(mChan->requestHold(false),
                     SIGNAL(finished(Tp::PendingOperation*)),
                     SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 0);
@@ -917,7 +917,7 @@ void TestStreamedMediaChan::testHoldNoUnhold()
                     SIGNAL(localHoldStateChanged(Tp::LocalHoldState, Tp::LocalHoldStateReason)),
                     SLOT(onLocalHoldStateChanged(Tp::LocalHoldState, Tp::LocalHoldStateReason))));
     // Request hold
-    QVERIFY(connect(mChan->requestLocalHold(true),
+    QVERIFY(connect(mChan->requestHold(true),
                     SIGNAL(finished(Tp::PendingOperation*)),
                     SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 0);
@@ -935,7 +935,7 @@ void TestStreamedMediaChan::testHoldNoUnhold()
     mLocalHoldStateReasons.clear();
 
     // Request unhold (fail)
-    QVERIFY(connect(mChan->requestLocalHold(false),
+    QVERIFY(connect(mChan->requestHold(false),
                     SIGNAL(finished(Tp::PendingOperation*)),
                     SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 1);
@@ -981,7 +981,7 @@ void TestStreamedMediaChan::testHoldInabilityUnhold()
                     SIGNAL(localHoldStateChanged(Tp::LocalHoldState, Tp::LocalHoldStateReason)),
                     SLOT(onLocalHoldStateChanged(Tp::LocalHoldState, Tp::LocalHoldStateReason))));
     // Request hold
-    QVERIFY(connect(mChan->requestLocalHold(true),
+    QVERIFY(connect(mChan->requestHold(true),
                     SIGNAL(finished(Tp::PendingOperation*)),
                     SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 0);
@@ -999,7 +999,7 @@ void TestStreamedMediaChan::testHoldInabilityUnhold()
     mLocalHoldStateReasons.clear();
 
     // Request unhold (fail - back to hold)
-    QVERIFY(connect(mChan->requestLocalHold(false),
+    QVERIFY(connect(mChan->requestHold(false),
                     SIGNAL(finished(Tp::PendingOperation*)),
                     SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
     QCOMPARE(mLoop->exec(), 0);
-- 
1.5.6.5