diff --git a/src/colnod/datamanager.cpp b/src/colnod/datamanager.cpp index c74fa82..3789169 100644 --- a/src/colnod/datamanager.cpp +++ b/src/colnod/datamanager.cpp @@ -1,10 +1,11 @@ #include "datamanager.h" -DataManager::DataManager(const bool &dryMode) - :dryMode(dryMode) +DataManager::DataManager(const bool &dryMode) : + db(std::make_shared("192.168.1.94", "deloitte", "postgres", "34rjkciea12", dryMode)), + dryMode(dryMode) { - db = std::make_shared("192.168.1.94", "deloitte", "postgres", "34rjkciea12", dryMode); - //db = std::make_shared("localhost", "deloitte", "postgres", "34rjkciea12"); + // db = std::make_shared("192.168.1.94", "deloitte", "postgres", "34rjkciea12", dryMode); + // db = std::make_shared("localhost", "deloitte", "postgres", "34rjkciea12"); Logger::setDBMan(db); nextLastSync = db->getNow(); lastSync = db->getLastSync(); diff --git a/src/colnod/datamanager.h b/src/colnod/datamanager.h index 0c365d2..fbff739 100644 --- a/src/colnod/datamanager.h +++ b/src/colnod/datamanager.h @@ -15,7 +15,7 @@ class DataManager : public QObject Q_OBJECT public: - DataManager(const bool& dryMode = false); + explicit DataManager(const bool& dryMode = false); void fillFullTokensColnod(const QString& jsonResponse); diff --git a/src/colnod/entity.h b/src/colnod/entity.h index 131439a..b3f3f29 100644 --- a/src/colnod/entity.h +++ b/src/colnod/entity.h @@ -10,6 +10,7 @@ class Entity : public QObject { Q_OBJECT public: + Entity() = default; using QObject::QObject; const QUuid &getId() const; diff --git a/src/colnod/requestmanager.cpp b/src/colnod/requestmanager.cpp index 5d0e79c..0fa0ac6 100644 --- a/src/colnod/requestmanager.cpp +++ b/src/colnod/requestmanager.cpp @@ -1,8 +1,8 @@ #include "requestmanager.h" RequestManager::RequestManager() + : manager(std::make_unique()) { - manager = std::make_unique(); connect(manager.get(), &QNetworkAccessManager::sslErrors, this, &RequestManager::onSSLError); } diff --git a/src/colnod/subject.h b/src/colnod/subject.h index 83cf489..1bbdcde 100644 --- a/src/colnod/subject.h +++ b/src/colnod/subject.h @@ -12,7 +12,7 @@ class Subject : public Entity { public: using Entity::Entity; Subject() = default; - Subject(const QString& name); + explicit Subject(const QString& name); QString getEmail() const; diff --git a/src/colnod/syncmanager.cpp b/src/colnod/syncmanager.cpp index 8db22d9..444ee15 100644 --- a/src/colnod/syncmanager.cpp +++ b/src/colnod/syncmanager.cpp @@ -1,9 +1,9 @@ #include "syncmanager.h" -SyncManager::SyncManager(bool dryMode) +SyncManager::SyncManager(bool dryMode) : + reqMan(std::make_unique()), + dataMan( std::make_unique(dryMode)) { - reqMan = std::make_unique(); - dataMan = std::make_unique(dryMode); this->dryMode = dryMode; connect(reqMan.get(), &RequestManager::error, this, &SyncManager::error); diff --git a/src/colnod/syncmanager.h b/src/colnod/syncmanager.h index b7fbf58..7e74ea7 100644 --- a/src/colnod/syncmanager.h +++ b/src/colnod/syncmanager.h @@ -9,8 +9,7 @@ class SyncManager : public QObject Q_OBJECT public: - - SyncManager(bool dryMode = false); + explicit SyncManager(bool dryMode = false); void syncDataFromColnodToDB(); void syncDataFromDBToColnod(); diff --git a/src/colnod/token.h b/src/colnod/token.h index abc7ff5..880dda0 100644 --- a/src/colnod/token.h +++ b/src/colnod/token.h @@ -13,7 +13,7 @@ public: Token() = default; Token(const QString& name, QString tokenData, const QString& decription = "mobile"); - Token(const QString& name); + explicit Token(const QString& name); ~Token() override; friend bool operator<(const Token &lToken, const Token &rToken){