[Telepathy-commits] [telepathy-qt4/master] PendingHandles: Make slots names more clear.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Tue Mar 24 10:44:23 PDT 2009


---
 TelepathyQt4/Client/pending-handles.cpp |   10 +++++-----
 TelepathyQt4/Client/pending-handles.h   |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/TelepathyQt4/Client/pending-handles.cpp b/TelepathyQt4/Client/pending-handles.cpp
index 9c6ad3c..3ed04ed 100644
--- a/TelepathyQt4/Client/pending-handles.cpp
+++ b/TelepathyQt4/Client/pending-handles.cpp
@@ -94,7 +94,7 @@ PendingHandles::PendingHandles(Connection *connection, uint handleType,
                 this);
     connect(watcher,
             SIGNAL(finished(QDBusPendingCallWatcher *)),
-            SLOT(onCallFinished(QDBusPendingCallWatcher *)));
+            SLOT(onFastPathFinished(QDBusPendingCallWatcher *)));
 }
 
 PendingHandles::PendingHandles(Connection *connection, uint handleType,
@@ -125,7 +125,7 @@ PendingHandles::PendingHandles(Connection *connection, uint handleType,
                     this);
         connect(watcher,
                 SIGNAL(finished(QDBusPendingCallWatcher *)),
-                SLOT(onCallFinished(QDBusPendingCallWatcher *)));
+                SLOT(onFastPathFinished(QDBusPendingCallWatcher *)));
     }
 }
 
@@ -258,7 +258,7 @@ ReferencedHandles PendingHandles::handles() const
     return mPriv->handles;
 }
 
-void PendingHandles::onCallFinished(QDBusPendingCallWatcher *watcher)
+void PendingHandles::onFastPathFinished(QDBusPendingCallWatcher *watcher)
 {
     // Thanks QDBus for this the need for this error-handling code duplication
     if (mPriv->isRequest) {
@@ -288,7 +288,7 @@ void PendingHandles::onCallFinished(QDBusPendingCallWatcher *watcher)
                             this);
                 connect(watcher,
                         SIGNAL(finished(QDBusPendingCallWatcher *)),
-                        SLOT(onRequestHandlesFinished(QDBusPendingCallWatcher *)));
+                        SLOT(onRequestHandlesFallbackFinished(QDBusPendingCallWatcher *)));
                 mPriv->idsForWatchers.insert(watcher, name);
             }
         } else {
@@ -319,7 +319,7 @@ void PendingHandles::onCallFinished(QDBusPendingCallWatcher *watcher)
     watcher->deleteLater();
 }
 
-void PendingHandles::onRequestHandlesFinished(QDBusPendingCallWatcher *watcher)
+void PendingHandles::onRequestHandlesFallbackFinished(QDBusPendingCallWatcher *watcher)
 {
     QDBusPendingReply<UIntList> reply = *watcher;
 
diff --git a/TelepathyQt4/Client/pending-handles.h b/TelepathyQt4/Client/pending-handles.h
index 12f3ed5..7aa0a56 100644
--- a/TelepathyQt4/Client/pending-handles.h
+++ b/TelepathyQt4/Client/pending-handles.h
@@ -71,8 +71,8 @@ public:
     ReferencedHandles handles() const;
 
 private Q_SLOTS:
-    void onCallFinished(QDBusPendingCallWatcher *watcher);
-    void onRequestHandlesFinished(QDBusPendingCallWatcher *watcher);
+    void onFastPathFinished(QDBusPendingCallWatcher *watcher);
+    void onRequestHandlesFallbackFinished(QDBusPendingCallWatcher *watcher);
 
 private:
     friend class Connection;
-- 
1.5.6.5




More information about the telepathy-commits mailing list