[Telepathy-commits] [telepathy-qt4/master] StreamedMediaChannel: Renamed MediaStream::requestStreamDirection to requestDirection.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/streamed-media-channel.cpp |    8 ++++----
 TelepathyQt4/Client/streamed-media-channel.h   |    4 ++--
 examples/call/call-widget.cpp                  |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/TelepathyQt4/Client/streamed-media-channel.cpp b/TelepathyQt4/Client/streamed-media-channel.cpp
index b3b30a1..e0f8dab 100644
--- a/TelepathyQt4/Client/streamed-media-channel.cpp
+++ b/TelepathyQt4/Client/streamed-media-channel.cpp
@@ -362,7 +362,7 @@ PendingOperation *MediaStream::remove()
  * \return A PendingOperation which will emit PendingOperation::finished
  *         when the call has finished.
  */
-PendingOperation *MediaStream::requestStreamDirection(
+PendingOperation *MediaStream::requestDirection(
         Telepathy::MediaStreamDirection direction)
 {
     return new PendingVoidMethodCall(this,
@@ -376,9 +376,9 @@ PendingOperation *MediaStream::requestStreamDirection(
  *
  * \return A PendingOperation which will emit PendingOperation::finished
  *         when the call has finished.
- * \sa requestStreamDirection(Telepathy::MediaStreamDirection direction)
+ * \sa requestDirection(Telepathy::MediaStreamDirection direction)
  */
-PendingOperation *MediaStream::requestStreamDirection(bool send, bool receive)
+PendingOperation *MediaStream::requestDirection(bool send, bool receive)
 {
     uint dir = Telepathy::MediaStreamDirectionNone;
     if (send) {
@@ -387,7 +387,7 @@ PendingOperation *MediaStream::requestStreamDirection(bool send, bool receive)
     if (receive) {
         dir |= Telepathy::MediaStreamDirectionReceive;
     }
-    return requestStreamDirection((Telepathy::MediaStreamDirection) dir);
+    return requestDirection((Telepathy::MediaStreamDirection) dir);
 }
 
 uint MediaStream::contactHandle() const
diff --git a/TelepathyQt4/Client/streamed-media-channel.h b/TelepathyQt4/Client/streamed-media-channel.h
index 38eebbc..a1f9e04 100644
--- a/TelepathyQt4/Client/streamed-media-channel.h
+++ b/TelepathyQt4/Client/streamed-media-channel.h
@@ -96,9 +96,9 @@ public:
     Telepathy::MediaStreamPendingSend pendingSend() const;
 
     PendingOperation *remove();
-    PendingOperation *requestStreamDirection(
+    PendingOperation *requestDirection(
             Telepathy::MediaStreamDirection direction);
-    PendingOperation *requestStreamDirection(
+    PendingOperation *requestDirection(
             bool send, bool receive);
 
 private Q_SLOTS:
diff --git a/examples/call/call-widget.cpp b/examples/call/call-widget.cpp
index c12b6e3..fc5c846 100644
--- a/examples/call/call-widget.cpp
+++ b/examples/call/call-widget.cpp
@@ -438,7 +438,7 @@ void CallWidget::updateStreamDirection(const MediaStreamPtr &stream)
     if (checked) {
         if (!(stream->direction() & Telepathy::MediaStreamDirectionSend)) {
             int dir = stream->direction() | Telepathy::MediaStreamDirectionSend;
-            stream->requestStreamDirection((Telepathy::MediaStreamDirection) dir);
+            stream->requestDirection((Telepathy::MediaStreamDirection) dir);
             qDebug() << "CallWidget::updateStreamDirection: start sending" <<
                 (stream->type() == Telepathy::MediaStreamTypeAudio ? "audio" : "video");
         } else {
@@ -451,7 +451,7 @@ void CallWidget::updateStreamDirection(const MediaStreamPtr &stream)
             int dir = stream->direction() & ~Telepathy::MediaStreamDirectionSend;
             qDebug() << "CallWidget::updateStreamDirection: stop sending " <<
                 (stream->type() == Telepathy::MediaStreamTypeAudio ? "audio" : "video");
-            stream->requestStreamDirection((Telepathy::MediaStreamDirection) dir);
+            stream->requestDirection((Telepathy::MediaStreamDirection) dir);
         } else {
             qDebug() << "CallWidget::updateStreamDirection:" <<
                 (stream->type() == Telepathy::MediaStreamTypeAudio ? "audio" : "video") <<
-- 
1.5.6.5