[Telepathy-commits] [telepathy-qt4/master] PendingHandles: Renamed Private::requests to requestsFinished.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Tue Mar 24 10:47:00 PDT 2009
---
TelepathyQt4/Client/pending-handles.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/TelepathyQt4/Client/pending-handles.cpp b/TelepathyQt4/Client/pending-handles.cpp
index 3ed04ed..dbcf681 100644
--- a/TelepathyQt4/Client/pending-handles.cpp
+++ b/TelepathyQt4/Client/pending-handles.cpp
@@ -60,7 +60,7 @@ struct PendingHandles::Private
// one to one requests (ids)
QHash<QDBusPendingCallWatcher *, QString> idsForWatchers;
QHash<QString, uint> handlesForIds;
- int requests;
+ int requestsFinished;
};
/**
@@ -85,7 +85,7 @@ PendingHandles::PendingHandles(Connection *connection, uint handleType,
mPriv->handleType = handleType;
mPriv->isRequest = true;
mPriv->namesRequested = names;
- mPriv->requests = 0;
+ mPriv->requestsFinished = 0;
// try to request all handles at once
QDBusPendingCallWatcher *watcher =
@@ -110,7 +110,7 @@ PendingHandles::PendingHandles(Connection *connection, uint handleType,
mPriv->isRequest = false;
mPriv->handlesToReference = handles;
mPriv->alreadyHeld = ReferencedHandles(connection, handleType, alreadyHeld);
- mPriv->requests = 0;
+ mPriv->requestsFinished = 0;
if (notYetHeld.isEmpty()) {
debug() << " All handles already held, finishing up instantly";
@@ -340,7 +340,7 @@ void PendingHandles::onRequestHandlesFallbackFinished(QDBusPendingCallWatcher *w
mPriv->handlesForIds.insert(id, handle);
}
- if (++mPriv->requests == mPriv->namesRequested.size()) {
+ if (++mPriv->requestsFinished == mPriv->namesRequested.size()) {
if (mPriv->handlesForIds.size() == 0) {
// all requests failed
setFinishedWithError(reply.error());
--
1.5.6.5
More information about the telepathy-commits
mailing list