michalks/colnod-connector
1
0
Fork 0
forked from ondra/colnod-connector
Code Issues Pull Requests Projects Releases Wiki Activity

updated sever-sdk + fixed unused warnings + added explicit to TimeStamp constructor

Browse Source
This commit is contained in:
Filip Bucek 2019-11-28 14:31:24 +01:00
parent 7225ebe2ce
commit 3fbeb3130c
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server-sdk

@ -1 +1 @@
Subproject commit 2041fed9fab14658ceb574edaf5e4d31ed81e23a Subproject commit a818055b75dc0de97e26be44cbbfd2e94516c09e

2
src/colnod/colnodapi.h
View File

@ -24,7 +24,7 @@ class Timestamp : public serversdk::DatabaseTable {
TABLE_PROPERTY(qint64, timestamp, set_timestamp, 0) TABLE_PROPERTY(qint64, timestamp, set_timestamp, 0)
public: public:
Timestamp() = default; Timestamp() = default;
Timestamp(const Timestamp &time) explicit Timestamp(const Timestamp &time)
{ {
this->set_timestamp(time.timestamp()); this->set_timestamp(time.timestamp());
} }

2
src/colnod/data.h
View File

@ -37,7 +37,7 @@ public:
QList<QString> deletedSubjects; QList<QString> deletedSubjects;
}; };
class PreparedData struct PreparedData
{ {
// TODO: make unique_ptr ( neeed because of ColnodAPI ) // TODO: make unique_ptr ( neeed because of ColnodAPI )
std::shared_ptr<Data> databaseData; std::shared_ptr<Data> databaseData;

7
src/colnod/syncmanager.cpp
View File

@ -82,15 +82,14 @@ bool SyncManager::startSynchronization()
return; return;
} }
colnod->processData(preparedData->colnodData); // NOT FINISHED scolnod->processData(preparedData->colnodData);
}); });
return true; return true;
//downloadData(); //downloadData();
auto colnodDataFinished = [=](std::shared_ptr<Data> data) { auto colnodDataFinished = [=](std::shared_ptr<Data> data) {
Q_UNUSED(data)
qDebug() << "Now I can check that I have all data I need"; qDebug() << "Now I can check that I have all data I need";
}; };
@ -132,6 +131,8 @@ bool SyncManager::startSynchronization()
std::unique_ptr<PreparedData> SyncManager::prepareDataNew(const std::shared_ptr<Data> &databaseData, const std::shared_ptr<Data> &colnodData) std::unique_ptr<PreparedData> SyncManager::prepareDataNew(const std::shared_ptr<Data> &databaseData, const std::shared_ptr<Data> &colnodData)
{ {
Q_UNUSED(databaseData);
Q_UNUSED(colnodData);
return nullptr; return nullptr;
} }