[telepathy-qt4/master] PendingChannelRequest: Renamed PendingChannelRequestCancelOperation proceed method to go.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Thu Jun 11 10:13:01 PDT 2009


---
 TelepathyQt4/pending-channel-request-internal.h |    2 +-
 TelepathyQt4/pending-channel-request.cpp        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TelepathyQt4/pending-channel-request-internal.h b/TelepathyQt4/pending-channel-request-internal.h
index 3228662..e5ddaa7 100644
--- a/TelepathyQt4/pending-channel-request-internal.h
+++ b/TelepathyQt4/pending-channel-request-internal.h
@@ -44,7 +44,7 @@ public:
     {
     }
 
-    void proceed(const ChannelRequestPtr &channelRequest)
+    void go(const ChannelRequestPtr &channelRequest)
     {
         Q_ASSERT(mChannelRequest.isNull());
         mChannelRequest = channelRequest;
diff --git a/TelepathyQt4/pending-channel-request.cpp b/TelepathyQt4/pending-channel-request.cpp
index b4beebd..53c7aa3 100644
--- a/TelepathyQt4/pending-channel-request.cpp
+++ b/TelepathyQt4/pending-channel-request.cpp
@@ -152,7 +152,7 @@ PendingOperation *PendingChannelRequest::cancel()
                 SLOT(onCancelOperationFinished(Tp::PendingOperation*)));
 
         if (mPriv->channelRequest) {
-            mPriv->cancelOperation->proceed(mPriv->channelRequest);
+            mPriv->cancelOperation->go(mPriv->channelRequest);
         }
     }
 
@@ -172,7 +172,7 @@ void PendingChannelRequest::onWatcherFinished(QDBusPendingCallWatcher *watcher)
                 objectPath.path(), QVariantMap());
 
         if (mPriv->cancelOperation) {
-            mPriv->cancelOperation->proceed(mPriv->channelRequest);
+            mPriv->cancelOperation->go(mPriv->channelRequest);
             setFinishedWithError(TELEPATHY_ERROR_CANCELLED,
                     "ChannelRequest cancelled");
         } else {
-- 
1.5.6.5




More information about the telepathy-commits mailing list