From dd0f8fe26736172a4d28e385c9680467fb700674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Thu, 28 Nov 2019 16:02:35 +0100 Subject: [PATCH] fix cpp check, and unsaved stuff from previous commit --- src/colnod/data.h | 2 +- src/colnod/databaseapi.h | 5 +++-- src/colnod/syncmanager.h | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/colnod/data.h b/src/colnod/data.h index cd6d512..a0f607a 100644 --- a/src/colnod/data.h +++ b/src/colnod/data.h @@ -41,7 +41,7 @@ struct PreparedData { public: PreparedData() = default; - PreparedData(std::shared_ptr database, std::shared_ptr colnod) + PreparedData(const std::shared_ptr &database, const std::shared_ptr &colnod) :databaseData(database), colnodData(colnod) { } diff --git a/src/colnod/databaseapi.h b/src/colnod/databaseapi.h index 34b125d..8668b2f 100644 --- a/src/colnod/databaseapi.h +++ b/src/colnod/databaseapi.h @@ -48,13 +48,14 @@ public: bool isValid(); + qint16 getNumOfTokensOfSubject(const QString &id); + QString getSubjectNameByTokenId(const QString &tokenId); + private: int exists(const QString &id, const QString &tableName); QSqlQuery getUpdatedTokens(); std::shared_ptr composeData(const QSqlQuery &updatedQuery, QSqlQuery &deletedQuery); - qint16 getNumOfTokensOfSubject(const QString &id); - QString getSubjectNameByTokenId(const QString &tokenId); signals: void downloadDataFinished(std::shared_ptr = std::shared_ptr()); diff --git a/src/colnod/syncmanager.h b/src/colnod/syncmanager.h index 5fbfa31..0d2719b 100644 --- a/src/colnod/syncmanager.h +++ b/src/colnod/syncmanager.h @@ -28,6 +28,8 @@ private: std::unique_ptr prepareDataNew(const std::shared_ptr &databaseData, const std::shared_ptr &colnodData); private: + void initNewToken(std::shared_ptr token); + bool downloadData(); bool prepareData(); bool processData();