Change ifndef to pragma once

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();

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();

src/colnod/colnodapi.h

@@ -1,12 +1,8 @@
-#ifndef COLNODAPI_H
+#pragma once
-#define COLNODAPI_H
 
 #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

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);
 }
 

src/colnod/databasemanager.h

@@ -1,5 +1,5 @@
-#ifndef DATABASEMANAGER_H
+#pragma once
-#define DATABASEMANAGER_H
+
 #include <QSql>
 #include <QSqlDatabase>
 #include <QSqlQuery>
@@ -43,5 +43,3 @@ private:
     QSqlDatabase db;
     QSqlQuery query;
 };
-
-#endif // DATABASEMANAGER_H

src/colnod/datamanager.h

@@ -1,5 +1,4 @@
-#ifndef DATAMANAGER_H
+#pragma once
-#define DATAMANAGER_H
 
 #include "token.h"
 #include "subject.h"
@@ -48,7 +47,7 @@ public:
     QList<QString> 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<QString> tokensFromDBToDeleteFromColnod;
 
 };
-
-#endif // DATAMANAGER_H

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) {

src/colnod/entity.h

@@ -1,5 +1,4 @@
-#ifndef COLNOD_CONNECTOR_ENTITY_H
+#pragma once
-#define COLNOD_CONNECTOR_ENTITY_H
 
 #include <QtCore/QObject>
 #include <QtCore/QUuid>
@@ -33,7 +32,3 @@ private:
     QString description;
     qint64 lastUpdate{};
 };
-
-
-
-#endif //COLNOD_CONNECTOR_ENTITY_H

src/colnod/requestmanager.h

@@ -1,5 +1,4 @@
-#ifndef REQUESTMANAGER_H
+#pragma once
-#define REQUESTMANAGER_H
 
 #include <QObject>
 #include <QNetworkReply>
@@ -93,5 +92,3 @@ private:
     bool loginStatus;
 
 };
-
-#endif // REQUESTMANAGER_H

src/colnod/response.h

@@ -1,5 +1,4 @@
-#ifndef RESPONSE_H
+#pragma once
-#define RESPONSE_H
 
 #include <QObject>
 #include <qnetworkreply.h>
@@ -31,5 +30,3 @@ private:
     QString json;
     QNetworkReply *reply = nullptr;
 };
-
-#endif // RESPONSE_H

src/colnod/subject.h

@@ -1,5 +1,4 @@
-#ifndef COLNOD_CONNECTOR_SUBJECT_H
+#pragma once
-#define COLNOD_CONNECTOR_SUBJECT_H
 
 #include <QSet>
 
@@ -43,6 +42,3 @@ private:
     const std::array<QString, 6> attributeTypes = {"Jmeno", "Prijmeni", "ProfilParking", "Spolecnost", "Profil", "spz"};
 
 };
-
-
-#endif //COLNOD_CONNECTOR_SUBJECT_H

src/colnod/token.h

@@ -1,13 +1,10 @@
-#ifndef COLNOD_CONNECTOR_TOKEN_H
+#pragma once
-#define COLNOD_CONNECTOR_TOKEN_H
 
 #include "entity.h"
-
 #include <QSet>
 #include <qsqlquery.h>
 #include <QVariant>
 
-
 class Token : public Entity {
 public:
    // using Entity::Entity;
@@ -65,6 +62,3 @@ private:
     quint64 lastModified{};
     bool deleted{};
 };
-
-
-#endif //COLNOD_CONNECTOR_TOKEN_H

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()