From d7b9c15dd64ef855f5fc8edb91830c9be8bbd32f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Thu, 12 Dec 2019 10:54:09 +0100 Subject: [PATCH] delete unnecessary --- src/app/main.cpp | 2 +- src/colnod/colnodapi.cpp | 20 -------------------- src/colnod/colnodapi.h | 6 ------ src/colnod/data.cpp | 9 --------- src/colnod/data.h | 3 --- src/colnod/token.h | 2 -- 6 files changed, 1 insertion(+), 41 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index 3b35c33..a39418a 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) // Logger initializiaton - serversdk::initAppLogger(); // <-- then Logger::outputMessage will handle all messages + serversdk::initAppLogger(); // Log messge Filtering QStringList filters; diff --git a/src/colnod/colnodapi.cpp b/src/colnod/colnodapi.cpp index 4d32e6d..4b33290 100644 --- a/src/colnod/colnodapi.cpp +++ b/src/colnod/colnodapi.cpp @@ -292,26 +292,6 @@ void ColnodAPI::setUserName(const QString &userName) mUserName = userName; } -void ColnodAPI::areDataReady(const std::shared_ptr &data) -{ - if (++amountData == 4) { - - // new - qInfo(colnod) << "- src colnod: tokens [" << data->updatedTokens.size() << ":" << data->deletedTokens.size() << - "] subjects [" << data->updatedSubjects.size() << ":" << data->deletedSubjects.size() << "] [ added/updated : deleted ]"; - //OLD -// qInfo(colnod) << tab << "-> COLNOD DATA:"; -// qInfo(colnod) << tab << tab << data->updatedTokens.size() << "TOKENS WERE ADDED/UPDATED"; -// qInfo(colnod) << tab << tab << data->deletedTokens.size() << "TOKENS DELETED"; -// qInfo(colnod) << tab << tab << data->updatedSubjects.size() << "SUBJECTS WERE ADDED/UPDATED"; -// qInfo(colnod) << tab << tab << data->deletedSubjects.size() << "SUBJECTS DELETED"; -// qInfo(colnod) << dash; - - amountData = 0; - emit downloadDataFinished(data); - } -} - void ColnodAPI::isDataProcessFinished(bool success) { if (!success) { diff --git a/src/colnod/colnodapi.h b/src/colnod/colnodapi.h index dd46a6e..b849204 100644 --- a/src/colnod/colnodapi.h +++ b/src/colnod/colnodapi.h @@ -65,7 +65,6 @@ public: bool isValid(); private: - Q_SLOT void areDataReady(const std::shared_ptr& data); Q_SLOT void isDataProcessFinished(bool success); private: @@ -83,24 +82,19 @@ private: signals: void downloadDataFinished(std::shared_ptr = std::shared_ptr()); - void partOfDataReady(std::shared_ptr = std::shared_ptr()); void partOfDataProcessFinished(bool success = true); void dataProcessFinished(bool success = true); - void error(); - private: serversdk::RequestManager* mReqMan = nullptr; QString mHost = "https://192.168.1.3:8443"; QString mUserName; QString mPassword; - Timestamp mLastSync; bool mDryMode = false; bool mValid = true; bool mSuccess = true; QString authToken; - qint16 amountData = 0; qint16 amountProccessesFinished = 0; }; diff --git a/src/colnod/data.cpp b/src/colnod/data.cpp index 2917618..8fc603f 100644 --- a/src/colnod/data.cpp +++ b/src/colnod/data.cpp @@ -1,14 +1,5 @@ #include "data.h" - -void Data::clear() -{ - updatedTokens.clear(); - updatedSubjects.clear(); - deletedTokens.clear(); - deletedSubjects.clear(); -} - bool Data::loadTokensFromJson(const QByteArray &data) { if (data.isEmpty()) diff --git a/src/colnod/data.h b/src/colnod/data.h index e2dbc91..8ff8b7e 100644 --- a/src/colnod/data.h +++ b/src/colnod/data.h @@ -28,8 +28,6 @@ class Data public: Data() = default; - void clear(); - bool loadTokensFromJson(const QByteArray &data); bool loadSubjectsFormJson(const QByteArray &data); @@ -40,7 +38,6 @@ public: int incrementCounter(); - private: int counter = 0; }; diff --git a/src/colnod/token.h b/src/colnod/token.h index 8de916d..38b1807 100644 --- a/src/colnod/token.h +++ b/src/colnod/token.h @@ -24,8 +24,6 @@ class Token : public serversdk::DatabaseTable { TABLE_PROPERTY(QDateTime, lastModified, setLastModified, QDateTime()) TABLE_PROPERTY(bool, deleted, setDeleted, false) - - public: /** * # Needed values to proper sync