clang: fixing warnings

src/app/main.cpp

@@ -45,13 +45,13 @@ int main(int argc, char *argv[])
 
     // Initialize database and colnod API
     if (!syncManager.databaseInitialization()) {
-        qCritical("Not possible to initialize sync application");
+        qCritical() << "Not possible to initialize sync application";
         return -1;
     }
 
     // Synchronizaiton
     if (!syncManager.startSynchronization()) {
-        qCritical("Not possible to start synchronization");
+        qCritical() << "Not possible to start synchronization";
         return -1;
     }
 

src/colnod/colnodapi.cpp

@@ -1,10 +1,12 @@
 #include "colnodapi.h"
 
+#include <utility>
+
 Q_LOGGING_CATEGORY(colnod, "colnod.api");
 
 
-ColnodAPI::ColnodAPI(serversdk::RequestManager* reqMan, const bool &dryMode, const QString &userName, const QString &password)
+ColnodAPI::ColnodAPI(serversdk::RequestManager* reqMan, const bool &dryMode, QString userName, QString password)
-    :mReqMan(reqMan), mUserName(userName), mPassword(password), mDryMode(dryMode)
+    :mReqMan(reqMan), mUserName(std::move(userName)), mPassword(std::move(password)), mDryMode(dryMode)
 {
     // -----------------------------------
     mReqMan->setIgnoreSsl(true);
@@ -35,7 +37,7 @@ void ColnodAPI::downloadData(const Timestamp &time)
 
         auto data = std::make_shared<Data>();
 
-        auto errorHandler = [=](std::shared_ptr<serversdk::Request> request){
+        auto errorHandler = [=](const std::shared_ptr<serversdk::Request>& request){
             if (!checkRequest(request)) {
                 qWarning(colnod) << "ERROR during calling" << request->url() << ", request unsuccessful";
                 mValid = false;
@@ -215,10 +217,7 @@ std::shared_ptr<serversdk::Request> ColnodAPI::composeRequest(const QString &end
 
 bool ColnodAPI::checkRequest(const std::shared_ptr<serversdk::Request> &request)
 {
-    if (request->status() == 200) {
+    return request->status() == 200;
-        return true;
-    }
-    return false;
 }
 
 bool ColnodAPI::isValid()
@@ -257,7 +256,7 @@ void ColnodAPI::setUserName(const QString &userName)
     mUserName = userName;
 }
 
-void ColnodAPI::areDataReady(std::shared_ptr<Data> data)
+void ColnodAPI::areDataReady(const std::shared_ptr<Data>& data)
 {
     if (++amountData == 4) {
 
@@ -280,12 +279,12 @@ void ColnodAPI::isDataProcessFinished()
     }
 }
 
-void ColnodAPI::saveUpdatedTokens(std::shared_ptr<Data> data, const QByteArray &responseData)
+void ColnodAPI::saveUpdatedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData)
 {
     data->loadTokensFromJson(responseData);
 }
 
-void ColnodAPI::saveDeletedTokens(std::shared_ptr<Data> data, const QByteArray &responseData)
+void ColnodAPI::saveDeletedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData)
 {
     QJsonDocument doc = QJsonDocument::fromJson(responseData);
     QJsonArray items = doc.object()["items"].toArray();
@@ -294,12 +293,12 @@ void ColnodAPI::saveDeletedTokens(std::shared_ptr<Data> data, const QByteArray &
     }
 }
 
-void ColnodAPI::saveUpdatedSubjects(std::shared_ptr<Data> data, const QByteArray &responseData)
+void ColnodAPI::saveUpdatedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData)
 {
     data->loadSubjectsFormJson(responseData);
 }
 
-void ColnodAPI::saveDeletedSubjects(std::shared_ptr<Data> data, const QByteArray &responseData)
+void ColnodAPI::saveDeletedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData)
 {
     QJsonDocument doc = QJsonDocument::fromJson(responseData);
     QJsonArray items = doc.object()["items"].toArray();

src/colnod/colnodapi.h

@@ -48,7 +48,7 @@ class ColnodAPI: public QObject
     Q_OBJECT
 public:
     ColnodAPI() = default;
-    ColnodAPI(serversdk::RequestManager* reqManconst, const bool &dryMode = false, const QString &userName = "spaceti", const QString &password = "spaceti1");
+    ColnodAPI(serversdk::RequestManager* reqManconst, const bool &dryMode = false, QString userName = "spaceti", QString password = "spaceti1");
 
     void downloadData(const Timestamp &time);
     void processData(const std::shared_ptr<Data> &data);
@@ -76,14 +76,14 @@ public:
     bool isValid();
 
 private:
-    Q_SLOT void areDataReady(std::shared_ptr<Data> data);
+    Q_SLOT void areDataReady(const std::shared_ptr<Data>& data);
     Q_SLOT void isDataProcessFinished();
 
 private:
-    void saveUpdatedTokens(std::shared_ptr<Data> data, const QByteArray &responseData);
+    void saveUpdatedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData);
-    void saveUpdatedSubjects(std::shared_ptr<Data> data, const QByteArray &responseData);
+    void saveUpdatedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData);
-    void saveDeletedTokens(std::shared_ptr<Data> data, const QByteArray &responseData);
+    void saveDeletedTokens(const std::shared_ptr<Data>& data, const QByteArray &responseData);
-    void saveDeletedSubjects(std::shared_ptr<Data> data, const QByteArray &responseData);
+    void saveDeletedSubjects(const std::shared_ptr<Data>& data, const QByteArray &responseData);
 
     void newData();
 

src/colnod/data.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <utility>
+
 #include "token.h"
 #include "subject.h"
 
@@ -13,7 +15,7 @@ constexpr auto tab = "\t";
 class Message
 {
 public:
-    static QString massageTemplate(QString action, QString item, QString source, QString itemInfo)
+    static QString massageTemplate(const QString& action, const QString& item, const QString& source, const QString& itemInfo)
     {
         return action + " " + item + " in " + source + ", " + item + ": '" + itemInfo + "'";
     }
@@ -41,8 +43,8 @@ struct PreparedData
 {
 public:
     PreparedData() = default;
-    PreparedData(const std::shared_ptr<Data> &database, const std::shared_ptr<Data> &colnod)
+    PreparedData(std::shared_ptr<Data> database, std::shared_ptr<Data> colnod)
-        :databaseData(database), colnodData(colnod)
+        :databaseData(std::move(database)), colnodData(std::move(colnod))
     {
     }
 

src/colnod/databaseapi.cpp

@@ -12,7 +12,7 @@ DatabaseAPI::DatabaseAPI(serversdk::DatabaseManager *dbMan, bool dryMode)
     mDbMan->setDryMode(dryMode);
 }
 
-bool DatabaseAPI::open(QString host, QString name, QString user, QString password)
+bool DatabaseAPI::open(const QString& host, const QString& name, const QString& user, const QString& password)
 {
     return mDbMan->openPostgres(host, name, user, password);
 }
@@ -135,7 +135,7 @@ void DatabaseAPI::setLastUpdate(const QHash<QString, std::shared_ptr<Token>> &to
     qInfo(database) << equals;
 }
 
-void DatabaseAPI::setLastUpdate(const QList<QString> ids)
+void DatabaseAPI::setLastUpdate(const QList<QString>& ids)
 {
     auto query = mDbMan->createQuery();
     for (const auto &id : ids){
@@ -299,10 +299,7 @@ bool DatabaseAPI::isAlreadyDeleted(const QString &id)
         qWarning(database) << "Token deleted in colnod doesn't exists in db, will be noted as already deleted in stats";
         return true;
     }
-    if (token->deleted())
+    return token->deleted();
-        return true;
-    return false;
-
 }
 
 bool DatabaseAPI::isValid()

src/colnod/databaseapi.h

@@ -20,10 +20,10 @@ class DatabaseAPI : public QObject
 public:
     explicit DatabaseAPI(serversdk::DatabaseManager *dbMan, bool dryMode);
 
-    bool open(QString host = "192.168.1.94",
+    bool open(const QString& host = "192.168.1.94",
-              QString name = "deloitte",
+              const QString& name = "deloitte",
-              QString user = "postgres",
+              const QString& user = "postgres",
-              QString password = "34rjkciea12");
+              const QString& password = "34rjkciea12");
 
     bool executeQuery(QSqlQuery &query, const QString &statement = QString());
 
@@ -32,7 +32,7 @@ public:
     qint64 getLastSync();
     void setLastSync(qint64 timestamp);
     void setLastUpdate(const QHash<QString, std::shared_ptr<Token> > &tokens);
-    void setLastUpdate(const QList<QString> ids);
+    void setLastUpdate(const QList<QString>& ids);
     qint64 getNow();
 
     void initNewTokens();

src/colnod/syncmanager.cpp

@@ -63,7 +63,7 @@ bool SyncManager::startSynchronization()
 
 
     colnod->downloadData(Timestamp(syncBegin));
-    connect(colnod.get(), &ColnodAPI::downloadDataFinished, [=](std::shared_ptr<Data> colnodData) {
+    connect(colnod.get(), &ColnodAPI::downloadDataFinished, [=](const std::shared_ptr<Data>& colnodData) {
         if (!colnodData) {
             qCritical(syncmanager) << "Not possible to get correct data from colnod";
             QCoreApplication::exit(-1);
@@ -202,7 +202,7 @@ std::unique_ptr<PreparedData> SyncManager::prepareDataNew(const std::shared_ptr<
     return preparedData;
 }
 
-void SyncManager::initNewToken(std::shared_ptr<Token> token)
+void SyncManager::initNewToken(const std::shared_ptr<Token>& token)
 {
     qint16 num = database->getNumOfTokensOfSubject(token->subjectId());
     token->setName(database->getSubjectNameByTokenId(token->id()) + "_mobile_" + QString::number(num + 1));

src/colnod/syncmanager.h

@@ -29,7 +29,7 @@ private:
     std::unique_ptr<PreparedData> prepareDataUsindOld(const std::shared_ptr<Data> &databaseData, const std::shared_ptr<Data> &colnodData);
 
 private:
-    void initNewToken(std::shared_ptr<Token> token);
+    void initNewToken(const std::shared_ptr<Token>& token);
 
     bool downloadData();
     bool prepareData();

test/auto/colnod/tst_colnodapi.cpp

@@ -68,7 +68,7 @@ void ColnodTest::download_data_test()
         auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0));
         QVERIFY(data);
 
-        QVERIFY(data->updatedTokens.size() > 0);
+        QVERIFY(! data->updatedTokens.isEmpty());
         QVERIFY(data->updatedTokens.contains("5e2f1260-da1c-441f-9644-24dfe3b97b2a"));
     }
     {
@@ -79,7 +79,7 @@ void ColnodTest::download_data_test()
         auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0));
         QVERIFY(data);
 
-        QVERIFY(data->updatedTokens.size() == 0);
+        QVERIFY(! data->updatedTokens.isEmpty());
     }
 }
 

test/auto/syncmanager/tst_syncmanager.cpp

@@ -24,7 +24,13 @@ void SyncManagerTest::prepareData_test()
     SyncManager sync(true);
     auto dbData = std::make_shared<Data>();
     auto colnodData = std::make_shared<Data>();
-    QVERIFY2(sync.prepareDataUsindOld(dbData, colnodData), "finish unitest");
+
+    auto oldPreparedData = sync.prepareDataUsindOld(dbData, colnodData);
+    auto newPreparedData = sync.prepareDataNew(dbData, colnodData);
+
+    QCOMPARE(newPreparedData, oldPreparedData);
+
+
 }
 
 QTEST_MAIN(SyncManagerTest)