From 79c1fc36fe0d5c4bf6ac44cd7c8b11e06a5bdce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Thu, 14 Nov 2019 15:49:29 +0100 Subject: [PATCH] fix --- src/colnod/colnod.pri | 64 +++++++++++++++++++------------------- src/colnod/data.cpp | 28 ++++++++--------- src/colnod/data.h | 38 +++++++++++----------- src/colnod/databaseapi.h | 2 +- src/colnod/syncmanager.cpp | 4 +-- 5 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/colnod/colnod.pri b/src/colnod/colnod.pri index 749c655..9118df7 100644 --- a/src/colnod/colnod.pri +++ b/src/colnod/colnod.pri @@ -1,32 +1,32 @@ -INCLUDEPATH += $$PWD - -CONFIG += c++14 - - -SOURCES += \ - $$PWD/colnodapi.cpp \ - $$PWD/data.cpp \ - $$PWD/databaseapi.cpp \ - $$PWD/datamanager.cpp \ - $$PWD/entity.cpp \ - $$PWD/logger.cpp \ - $$PWD/requestmanager.cpp \ - $$PWD/response.cpp \ - $$PWD/subject.cpp \ - $$PWD/syncmanager.cpp \ - $$PWD/token.cpp - -HEADERS += \ - $$PWD/colnodapi.h \ - $$PWD/data.h \ - $$PWD/databaseapi.h \ - $$PWD/datamanager.h \ - $$PWD/entity.h \ - $$PWD/logger.h \ - $$PWD/requestmanager.h \ - $$PWD/response.h \ - $$PWD/subject.h \ - $$PWD/syncmanager.h \ - $$PWD/token.h - -include(../../server-sdk/serversdk.pri) +INCLUDEPATH += $$PWD + +CONFIG += c++14 + + +SOURCES += \ + $$PWD/colnodapi.cpp \ + $$PWD/data.cpp \ + $$PWD/databaseapi.cpp \ + $$PWD/datamanager.cpp \ + $$PWD/entity.cpp \ + $$PWD/logger.cpp \ + $$PWD/requestmanager.cpp \ + $$PWD/response.cpp \ + $$PWD/subject.cpp \ + $$PWD/syncmanager.cpp \ + $$PWD/token.cpp + +HEADERS += \ + $$PWD/colnodapi.h \ + $$PWD/data.h \ + $$PWD/databaseapi.h \ + $$PWD/datamanager.h \ + $$PWD/entity.h \ + $$PWD/logger.h \ + $$PWD/requestmanager.h \ + $$PWD/response.h \ + $$PWD/subject.h \ + $$PWD/syncmanager.h \ + $$PWD/token.h + +include(../../server-sdk/serversdk.pri) diff --git a/src/colnod/data.cpp b/src/colnod/data.cpp index f9b5be6..38b1c1c 100644 --- a/src/colnod/data.cpp +++ b/src/colnod/data.cpp @@ -1,14 +1,14 @@ -#include "data.h" - -Data::Data() -{ - -} - -void Data::clear() -{ - updatedTokens.clear(); - updatedSubjects.clear(); - deletedTokens.clear(); - deletedSubjects.clear(); -} +#include "data.h" + +Data::Data() +{ + +} + +void Data::clear() +{ + updatedTokens.clear(); + updatedSubjects.clear(); + deletedTokens.clear(); + deletedSubjects.clear(); +} diff --git a/src/colnod/data.h b/src/colnod/data.h index fe13202..dbc35b0 100644 --- a/src/colnod/data.h +++ b/src/colnod/data.h @@ -1,19 +1,19 @@ -#pragma once - -#include "token.h" -#include "subject.h" - - -class Data -{ -public: - Data(); - - void clear(); - - QHash> updatedTokens; - QList deletedTokens; - QHash> updatedSubjects; - QList deletedSubjects; -}; - +#pragma once + +#include "token.h" +#include "subject.h" + + +class Data +{ +public: + Data(); + + void clear(); + + QHash> updatedTokens; + QList deletedTokens; + QHash> updatedSubjects; + QList deletedSubjects; +}; + diff --git a/src/colnod/databaseapi.h b/src/colnod/databaseapi.h index 3e2da81..31b5828 100644 --- a/src/colnod/databaseapi.h +++ b/src/colnod/databaseapi.h @@ -15,7 +15,7 @@ #include "serversdk/databasetable.h" - +// TODO: move to token class class TokenTable : public serversdk::DatabaseTable { Q_OBJECT TABLE_PROPERTY(QUuid, id, setId, QUuid()) diff --git a/src/colnod/syncmanager.cpp b/src/colnod/syncmanager.cpp index 085f7f5..98ec724 100644 --- a/src/colnod/syncmanager.cpp +++ b/src/colnod/syncmanager.cpp @@ -99,12 +99,12 @@ void SyncManager::areDataReady() } -void SyncManager::saveColnodData(std::shared_ptr data) +void SyncManager::saveColnodData(const std::shared_ptr &data) { colnodData = data; } -void SyncManager::saveDatabaseData(std::shared_ptr data) +void SyncManager::saveDatabaseData(const std::shared_ptr &data) { databaseData = data; }