diff options
| -rw-r--r-- | connection.cpp | 7 | ||||
| -rw-r--r-- | jobs/syncjob.cpp | 3 | ||||
| -rw-r--r-- | jobs/syncjob.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/connection.cpp b/connection.cpp index 97594e7d..fe0cb251 100644 --- a/connection.cpp +++ b/connection.cpp @@ -32,10 +32,9 @@ #include "jobs/mediathumbnailjob.h" #include <QtNetwork/QDnsLookup> -#include <QStandardPaths> -#include <QFile> -#include <QDir> -#include <QFileInfo> +#include <QtCore/QFile> +#include <QtCore/QDir> +#include <QtCore/QFileInfo> using namespace QMatrixClient; diff --git a/jobs/syncjob.cpp b/jobs/syncjob.cpp index 3adf6b0c..1e71e215 100644 --- a/jobs/syncjob.cpp +++ b/jobs/syncjob.cpp @@ -66,7 +66,7 @@ BaseJob::Status SyncJob::parseJson(const QJsonDocument& data) return Success; } -void SyncData::parseJson(const QJsonDocument &data) { +BaseJob::Status SyncData::parseJson(const QJsonDocument &data) { QElapsedTimer et; et.start(); QJsonObject json = data.object(); nextBatch_ = json.value("next_batch").toString(); @@ -89,6 +89,7 @@ void SyncData::parseJson(const QJsonDocument &data) { roomData.emplace_back(rkey, roomState.enumVal, rs[rkey].toObject()); } qCDebug(PROFILER) << "*** SyncData::parseJson():" << et.elapsed() << "ms"; + return Success; } SyncRoomData::SyncRoomData(const QString& roomId_, JoinState joinState_, diff --git a/jobs/syncjob.h b/jobs/syncjob.h index 9dc221b5..16ac5895 100644 --- a/jobs/syncjob.h +++ b/jobs/syncjob.h @@ -71,7 +71,7 @@ namespace QMatrixClient class SyncData { public: - void parseJson(const QJsonDocument &data); + BaseJob::Status parseJson(const QJsonDocument &data); SyncDataList&& takeRoomData(); QString nextBatch() const; |