From 7b21c1f9a7d299b3ce7f094a992c6630c5f04624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Wed, 23 Oct 2019 15:43:03 +0200 Subject: [PATCH] Change ifndef to pragma once --- src/app/main.cpp | 30 +++++++++--------------------- src/colnod/colnodapi.cpp | 4 ++-- src/colnod/colnodapi.h | 9 ++------- src/colnod/databasemanager.cpp | 20 ++++++++++---------- src/colnod/databasemanager.h | 6 ++---- src/colnod/datamanager.h | 7 ++----- src/colnod/entity.cpp | 3 ++- src/colnod/entity.h | 7 +------ src/colnod/requestmanager.h | 5 +---- src/colnod/response.h | 5 +---- src/colnod/subject.h | 6 +----- src/colnod/token.h | 8 +------- test/unitTests/complextest.cpp | 5 ++--- 13 files changed, 36 insertions(+), 79 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index 41eeeab..8ea2fbd 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -7,28 +7,16 @@ int main(int argc, char *argv[]) { QCoreApplication a(argc, argv); auto *api = new ColnodAPI(); - - - /*api->downloadData(); // this will start downloading data - QObject::connect(api, &ColnodAPI::dataDownloaded, [=](){ - qDebug() << "now I have all data"; - api->syncDataToColnod(); - QCoreApplication::quit(); - });*/ -// bool syncChanged = false; -// api->downloadChangedDataFromColnod(); -// QObject::connect(api, &ColnodAPI::downloadData, [&](){ -// qDebug() << "Data ready."; -// api->syncChangedDataFromColnod(); -// if (!syncChanged) -// { -// api->syncChangedDataToColnod(); -// syncChanged = true; -// } -// }); - - api->loadDataFromColnod(); api->loadDataFromDB(); + api->loadDataFromColnod(); + QObject::connect(api, &ColnodAPI::dataDownloaded, [=](){ + qDebug() << "All items are loaded to data manager."; + api->syncDataFromColnodToDB(); + api->syncDataFromDBToColnod(); + QObject::connect(api, &ColnodAPI::syncFinished, [=](){ + QCoreApplication::exit(); + }); + }); return QCoreApplication::exec(); diff --git a/src/colnod/colnodapi.cpp b/src/colnod/colnodapi.cpp index 739f925..b788b49 100644 --- a/src/colnod/colnodapi.cpp +++ b/src/colnod/colnodapi.cpp @@ -70,7 +70,7 @@ void ColnodAPI::loadDataFromDB() dataMan->fillTokensToUpdateDB(); } -void ColnodAPI::syncDataFromColnod() +void ColnodAPI::syncDataFromColnodToDB() { dataMan->filterTokensColnod(); syncUpdatedDataFromColnodToDB(); @@ -105,7 +105,7 @@ void ColnodAPI::syncDataFromDBToColnod() connect(this, &ColnodAPI::dataUpdatedToColnod, dataMan, &DataManager::clear); connect(this, &ColnodAPI::dataUpdatedToColnod, dataMan, &DataManager::setLastSync); connect(this, &ColnodAPI::dataUpdatedToColnod, [=](){ - auto resp = reqMan->getTokensUpdated(dataMan->getActualSync()); + auto resp = reqMan->getTokensUpdated(dataMan->getCurrentSync()); connect(resp, &Response::ready, [=](){ dataMan->fillTokensToUpdateColnod(resp->getJson()); dataMan->setLastUpdate(); diff --git a/src/colnod/colnodapi.h b/src/colnod/colnodapi.h index b5353d8..ba7a19a 100644 --- a/src/colnod/colnodapi.h +++ b/src/colnod/colnodapi.h @@ -1,12 +1,8 @@ -#ifndef COLNODAPI_H -#define COLNODAPI_H +#pragma once #include "requestmanager.h" #include "datamanager.h" - - - class ColnodAPI : public QObject { Q_OBJECT @@ -15,7 +11,7 @@ public: ColnodAPI(bool debugMode = false); - void syncDataFromColnod(); + void syncDataFromColnodToDB(); void syncDataFromDBToColnod(); void prepareDatabase(); @@ -56,4 +52,3 @@ private: bool deleteFinished = false; }; -#endif // COLNODAPI_H diff --git a/src/colnod/databasemanager.cpp b/src/colnod/databasemanager.cpp index 00b962e..b724328 100644 --- a/src/colnod/databasemanager.cpp +++ b/src/colnod/databasemanager.cpp @@ -33,7 +33,7 @@ void DatabaseManager::saveSubject(Subject* subject, const QString& table) query.bindValue(":name", subject->getName()); query.bindValue(":last_update", QDateTime::fromMSecsSinceEpoch(subject->getLastUpdate()).toString("yyyy-MM-dd hh:mm:ss.zzz")); query.bindValue(":pin", subject->getPin()); - query.exec(); + executeQuery(query); } else { @@ -44,7 +44,7 @@ void DatabaseManager::saveSubject(Subject* subject, const QString& table) query.bindValue(":last_update", QDateTime::fromMSecsSinceEpoch(subject->getLastUpdate()).toString("yyyy-MM-dd hh:mm:ss.zzz")); query.bindValue(":name", subject->getName()); query.bindValue(":pin", subject->getPin()); - query.exec(); + executeQuery(query); } } @@ -69,7 +69,7 @@ void DatabaseManager::saveToken(Token* token, const QString& table) query.bindValue(":subject_id", token->subjectIdToStringWithoutBraces()); query.bindValue(":last_modified", QDateTime::fromMSecsSinceEpoch(token->getLastUpdate()).toString("yyyy-MM-dd hh:mm:ss.zzz")); query.bindValue(":deleted", token->getDeleted()); - query.exec(); + executeQuery(query); } else { @@ -89,7 +89,7 @@ void DatabaseManager::saveToken(Token* token, const QString& table) query.bindValue(":subject_id", token->subjectIdToStringWithoutBraces()); query.bindValue(":last_modified", QDateTime::fromMSecsSinceEpoch(token->getLastUpdate()).toString("yyyy-MM-dd hh:mm:ss.zzz")); query.bindValue(":deleted", token->getDeleted()); - query.exec(); + executeQuery(query); } } @@ -106,7 +106,7 @@ void DatabaseManager::saveSubjectAttributes(Subject *subject, const QString& tab query.bindValue(":key", attribute.first); query.bindValue(":value", attribute.second); query.bindValue(":subject_id", subject->idToStringWithoutBraces()); - query.exec(); + executeQuery(query); } else{ query.prepare(QString("INSERT INTO %1 (id, attribute_key, attribute_value, subject_id)" @@ -115,7 +115,7 @@ void DatabaseManager::saveSubjectAttributes(Subject *subject, const QString& tab query.bindValue(":key", attribute.first); query.bindValue(":value", attribute.second); query.bindValue(":subject_id", subject->idToStringWithoutBraces()); - query.exec(); + executeQuery(query); } } } @@ -128,14 +128,14 @@ void DatabaseManager::setDeleted(const QString& id, const QString& table) query.prepare(QString("UPDATE %1 SET deleted = true, last_update = :now, last_modified = :now WHERE id = :id").arg(table)); query.bindValue(":id", id); query.bindValue(":now", nowString); - query.exec(); + executeQuery(query); } bool DatabaseManager::checkIfExists(const QString& id, const QString& table) { query.prepare(QString("SELECT EXISTS(SELECT 1 FROM %1 WHERE id = :id)").arg(table)); query.bindValue(":id", id); - query.exec(); + executeQuery(query); query.first(); return query.value(0).toBool(); } @@ -199,7 +199,7 @@ void DatabaseManager::updateLastSync(quint64 lastSync) { query.prepare("UPDATE config SET last_sync = :last_sync"); query.bindValue(":last_sync", lastSync); - query.exec(); + executeQuery(query); } @@ -238,6 +238,6 @@ void DatabaseManager::setLastUpdate(const QString& id, quint64 lastUpdate) query.prepare("UPDATE colnod_token SET last_update = :lastUpdate WHERE id = :id"); query.bindValue(":id", id); query.bindValue(":lastUpdate", lastUpdate); - query.exec(); + executeQuery(query); } diff --git a/src/colnod/databasemanager.h b/src/colnod/databasemanager.h index 971f1ca..2ad7faf 100644 --- a/src/colnod/databasemanager.h +++ b/src/colnod/databasemanager.h @@ -1,5 +1,5 @@ -#ifndef DATABASEMANAGER_H -#define DATABASEMANAGER_H +#pragma once + #include #include #include @@ -43,5 +43,3 @@ private: QSqlDatabase db; QSqlQuery query; }; - -#endif // DATABASEMANAGER_H diff --git a/src/colnod/datamanager.h b/src/colnod/datamanager.h index ebe5eff..3420b07 100644 --- a/src/colnod/datamanager.h +++ b/src/colnod/datamanager.h @@ -1,5 +1,4 @@ -#ifndef DATAMANAGER_H -#define DATAMANAGER_H +#pragma once #include "token.h" #include "subject.h" @@ -48,7 +47,7 @@ public: QList getTokensToDeleteDB() {return tokensFromDBToDeleteFromColnod;} const quint64 &getLastSync() {return lastSync;} - const quint64 &getActualSync() {return nextLastSync;} + const quint64 &getCurrentSync() {return nextLastSync;} public slots: void clear(); @@ -73,5 +72,3 @@ private: QList tokensFromDBToDeleteFromColnod; }; - -#endif // DATAMANAGER_H diff --git a/src/colnod/entity.cpp b/src/colnod/entity.cpp index 932e3ca..f18bb48 100644 --- a/src/colnod/entity.cpp +++ b/src/colnod/entity.cpp @@ -35,7 +35,8 @@ void Entity::setLastUpdate(quint64 lastUpdate) { QString Entity::idToStringWithoutBraces() { - return id.toString().mid(1,36); + const qint8 lengthOfUuid = 36; + return id.toString().mid(1, lengthOfUuid); } void Entity::fromJSON(const QJsonObject &json) { diff --git a/src/colnod/entity.h b/src/colnod/entity.h index 97925c2..d5fa1dc 100644 --- a/src/colnod/entity.h +++ b/src/colnod/entity.h @@ -1,5 +1,4 @@ -#ifndef COLNOD_CONNECTOR_ENTITY_H -#define COLNOD_CONNECTOR_ENTITY_H +#pragma once #include #include @@ -33,7 +32,3 @@ private: QString description; qint64 lastUpdate{}; }; - - - -#endif //COLNOD_CONNECTOR_ENTITY_H diff --git a/src/colnod/requestmanager.h b/src/colnod/requestmanager.h index 375499e..17b1bba 100644 --- a/src/colnod/requestmanager.h +++ b/src/colnod/requestmanager.h @@ -1,5 +1,4 @@ -#ifndef REQUESTMANAGER_H -#define REQUESTMANAGER_H +#pragma once #include #include @@ -93,5 +92,3 @@ private: bool loginStatus; }; - -#endif // REQUESTMANAGER_H diff --git a/src/colnod/response.h b/src/colnod/response.h index 4416f88..7c75c65 100644 --- a/src/colnod/response.h +++ b/src/colnod/response.h @@ -1,5 +1,4 @@ -#ifndef RESPONSE_H -#define RESPONSE_H +#pragma once #include #include @@ -31,5 +30,3 @@ private: QString json; QNetworkReply *reply = nullptr; }; - -#endif // RESPONSE_H diff --git a/src/colnod/subject.h b/src/colnod/subject.h index dd587eb..0046e1a 100644 --- a/src/colnod/subject.h +++ b/src/colnod/subject.h @@ -1,5 +1,4 @@ -#ifndef COLNOD_CONNECTOR_SUBJECT_H -#define COLNOD_CONNECTOR_SUBJECT_H +#pragma once #include @@ -43,6 +42,3 @@ private: const std::array attributeTypes = {"Jmeno", "Prijmeni", "ProfilParking", "Spolecnost", "Profil", "spz"}; }; - - -#endif //COLNOD_CONNECTOR_SUBJECT_H diff --git a/src/colnod/token.h b/src/colnod/token.h index 5d58eff..287aadb 100644 --- a/src/colnod/token.h +++ b/src/colnod/token.h @@ -1,13 +1,10 @@ -#ifndef COLNOD_CONNECTOR_TOKEN_H -#define COLNOD_CONNECTOR_TOKEN_H +#pragma once #include "entity.h" - #include #include #include - class Token : public Entity { public: // using Entity::Entity; @@ -65,6 +62,3 @@ private: quint64 lastModified{}; bool deleted{}; }; - - -#endif //COLNOD_CONNECTOR_TOKEN_H diff --git a/test/unitTests/complextest.cpp b/test/unitTests/complextest.cpp index a2ea479..04c2e70 100644 --- a/test/unitTests/complextest.cpp +++ b/test/unitTests/complextest.cpp @@ -120,7 +120,7 @@ void ComplexTest::fullSync() api->loadDataFromColnod(); QSignalSpy spy(api, &ColnodAPI::dataDownloaded); spy.wait(timeout); - api->syncDataFromColnod(); + api->syncDataFromColnodToDB(); // api->syncDataToColnod(); } @@ -130,14 +130,13 @@ void ComplexTest::syncLastUpdated() QSignalSpy spy(api, &ColnodAPI::dataDownloaded); spy.wait(timeout); api->loadDataFromDB(); - api->syncDataFromColnod(); + api->syncDataFromColnodToDB(); api->syncDataFromDBToColnod(); QSignalSpy processSpy(api, &ColnodAPI::dataUpdatedToColnod); processSpy.wait(timeout); QSignalSpy finish(api, &ColnodAPI::syncFinished); finish.wait(timeout); qDebug() << "All right, at least should be."; - } void ComplexTest::testingStuff()