From 3fbeb3130cb0909f99292d7c2f2308cdcfe16889 Mon Sep 17 00:00:00 2001 From: Filip Bucek Date: Thu, 28 Nov 2019 14:31:24 +0100 Subject: [PATCH] updated sever-sdk + fixed unused warnings + added explicit to TimeStamp constructor --- server-sdk | 2 +- src/colnod/colnodapi.h | 2 +- src/colnod/data.h | 2 +- src/colnod/syncmanager.cpp | 7 ++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server-sdk b/server-sdk index 2041fed..a818055 160000 --- a/server-sdk +++ b/server-sdk @@ -1 +1 @@ -Subproject commit 2041fed9fab14658ceb574edaf5e4d31ed81e23a +Subproject commit a818055b75dc0de97e26be44cbbfd2e94516c09e diff --git a/src/colnod/colnodapi.h b/src/colnod/colnodapi.h index af79297..a8e799c 100644 --- a/src/colnod/colnodapi.h +++ b/src/colnod/colnodapi.h @@ -24,7 +24,7 @@ class Timestamp : public serversdk::DatabaseTable { TABLE_PROPERTY(qint64, timestamp, set_timestamp, 0) public: Timestamp() = default; - Timestamp(const Timestamp &time) + explicit Timestamp(const Timestamp &time) { this->set_timestamp(time.timestamp()); } diff --git a/src/colnod/data.h b/src/colnod/data.h index 41a2491..5ef4827 100644 --- a/src/colnod/data.h +++ b/src/colnod/data.h @@ -37,7 +37,7 @@ public: QList deletedSubjects; }; -class PreparedData +struct PreparedData { // TODO: make unique_ptr ( neeed because of ColnodAPI ) std::shared_ptr databaseData; diff --git a/src/colnod/syncmanager.cpp b/src/colnod/syncmanager.cpp index 5244796..cccecec 100644 --- a/src/colnod/syncmanager.cpp +++ b/src/colnod/syncmanager.cpp @@ -82,15 +82,14 @@ bool SyncManager::startSynchronization() return; } - colnod->processData(preparedData->colnodData); - - + // NOT FINISHED scolnod->processData(preparedData->colnodData); }); return true; //downloadData(); auto colnodDataFinished = [=](std::shared_ptr data) { + Q_UNUSED(data) qDebug() << "Now I can check that I have all data I need"; }; @@ -132,6 +131,8 @@ bool SyncManager::startSynchronization() std::unique_ptr SyncManager::prepareDataNew(const std::shared_ptr &databaseData, const std::shared_ptr &colnodData) { + Q_UNUSED(databaseData); + Q_UNUSED(colnodData); return nullptr; }