aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsuneRal <Kitsune-Ral@users.sf.net>2016-09-17 17:35:55 +0900
committerGitHub <noreply@github.com>2016-09-17 17:35:55 +0900
commitac5ae85ed43d1f92cfc99bf1ea687d33f56ccd13 (patch)
treee411ba6dd1cf4181ca83f796f39ff41e27e0b6cf
parent53a941afe548be49585aadda336c0e4c05ff3ff1 (diff)
parente4dd38fe63eb3035b2df0db859c65d31db9c1ea8 (diff)
downloadlibquotient-ac5ae85ed43d1f92cfc99bf1ea687d33f56ccd13.tar.gz
libquotient-ac5ae85ed43d1f92cfc99bf1ea687d33f56ccd13.zip
Merge pull request #29 from Fxrh/dont-expose-syncjob
Connection: Don't return SyncJob* from sync()
-rw-r--r--connection.cpp5
-rw-r--r--connection.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/connection.cpp b/connection.cpp
index aebe7631..9f56ec96 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -163,10 +163,10 @@ void Connection::logout()
job->start();
}
-SyncJob* Connection::sync(int timeout)
+void Connection::sync(int timeout)
{
if (d->syncJob)
- return d->syncJob;
+ return;
const QString filter = "{\"room\": { \"timeline\": { \"limit\": 100 } } }";
auto job = d->startSyncJob(filter, timeout);
@@ -187,7 +187,6 @@ SyncJob* Connection::sync(int timeout)
else
emit connectionError(job->errorString());
});
- return job;
}
SyncJob* Connection::Private::startSyncJob(const QString& filter, int timeout)
diff --git a/connection.h b/connection.h
index d5cf4883..fed0b1c4 100644
--- a/connection.h
+++ b/connection.h
@@ -52,7 +52,7 @@ namespace QMatrixClient
Q_INVOKABLE virtual void disconnectFromServer();
Q_INVOKABLE virtual void logout();
- Q_INVOKABLE virtual SyncJob* sync(int timeout=-1);
+ Q_INVOKABLE virtual void sync(int timeout=-1);
Q_INVOKABLE virtual void postMessage( Room* room, QString type, QString message );
Q_INVOKABLE virtual PostReceiptJob* postReceipt( Room* room, Event* event );
Q_INVOKABLE virtual void joinRoom( QString roomAlias );