From 49299af7611dc52750dd2bbf511f0423cb6d8a18 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Thu, 14 Sep 2017 23:21:44 +0300 Subject: [PATCH] code cleanup --- sources/CMakeLists.txt | 26 +----------- sources/compiler.cmake | 29 +++++++++++++ .../queued-daemon/src/QueuedApplication.cpp | 23 ++--------- sources/queued-daemon/src/QueuedApplication.h | 2 - sources/queued-daemon/src/main.cpp | 4 +- sources/queued-server/src/QueuedServer.cpp | 21 +++------- sources/queued-server/src/QueuedServer.h | 1 - sources/queued-server/src/QueuedTcpServer.cpp | 17 ++------ sources/queued-server/src/QueuedTcpServer.h | 5 +-- .../src/QueuedTcpServerResponseHelperApi1.cpp | 1 - ...euedTcpServerResponseHelperPermissions.cpp | 9 ++-- .../src/QueuedTcpServerResponseHelperTask.cpp | 6 +-- .../src/QueuedTcpServerThread.cpp | 9 ++-- sources/queued-server/src/main.cpp | 4 +- sources/queued/doxygen.conf.in | 2 +- .../queued/include/queued/QueuedCoreAdaptor.h | 2 +- .../queued/include/queued/QueuedExceptions.h | 20 +++++---- sources/queued/include/queued/QueuedLimits.h | 3 +- .../include/queued/QueuedPluginInterface.h | 2 +- .../queued/QueuedPluginManagerInterface.h | 3 +- sources/queued/src/QueuedAdvancedSettings.cpp | 6 +-- sources/queued/src/QueuedCore.cpp | 41 ++++++++----------- sources/queued/src/QueuedDatabase.cpp | 16 ++++---- sources/queued/src/QueuedDatabaseManager.cpp | 2 - sources/queued/src/QueuedLimits.cpp | 4 +- sources/queued/src/QueuedProcess.cpp | 9 ++-- sources/queued/src/QueuedProcessManager.cpp | 2 +- sources/queued/src/QueuedTokenManager.cpp | 5 +-- sources/queued/src/QueuedUser.cpp | 10 ++--- sources/queued/src/QueuedUserManager.cpp | 2 - sources/queuedctl/src/QueuedctlCommon.cpp | 14 +++---- .../queuedctl/src/QueuedctlPermissions.cpp | 15 +++---- sources/queuedctl/src/QueuedctlTask.cpp | 2 - sources/queuedctl/src/QueuedctlUser.cpp | 2 +- sources/queuedctl/src/main.cpp | 1 - 35 files changed, 131 insertions(+), 189 deletions(-) create mode 100644 sources/compiler.cmake diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index c44558d..14ef30d 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 2.8.12) # some fucking magic -cmake_policy(SET CMP0003 OLD) -cmake_policy(SET CMP0002 OLD) cmake_policy(SET CMP0011 NEW) cmake_policy(SET CMP0015 NEW) if (POLICY CMP0063) @@ -37,35 +35,13 @@ option(BUILD_FUTURE "Build with the features which will be marked as stable late option(BUILD_LOAD "Build with additional load" OFF) option(BUILD_TESTING "Build with additional test abilities" OFF) -# flags -if (CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_CXX_FLAGS "-Wall -Wno-cpp -std=c++11") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") - set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG") - # avoid newer gcc warnings - add_definitions(-D_DEFAULT_SOURCE) -elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_FLAGS "-Wall -std=c++11 -stdlib=libc++") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") - set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG") - # linker flags - set(CMAKE_EXE_LINKER_FLAGS "-lc++abi") - set(CMAKE_MODULE_LINKER_FLAGS "-lc++abi") - set(CMAKE_SHARED_LINKER_FLAGS "-lc++abi") -else () - message(FATAL_ERROR "Unknown compiler") -endif () -if (CMAKE_BUILD_TYPE MATCHES Debug) - set(CMAKE_VERBOSE_MAKEFILE ON) -endif () set(PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) set(PROJECT_LIBRARY "queued") set(PROJECT_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_LIBRARY}") +include(compiler.cmake) include(libraries.cmake) include(clang-format.cmake) include(cppcheck.cmake) diff --git a/sources/compiler.cmake b/sources/compiler.cmake new file mode 100644 index 0000000..9e6a05c --- /dev/null +++ b/sources/compiler.cmake @@ -0,0 +1,29 @@ +# flags +if (CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "-Wall") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG") + # avoid newer gcc warnings + add_definitions(-D_DEFAULT_SOURCE) +elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(CMAKE_CXX_FLAGS "-Wall") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O0") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG") + # linker flags +else () + message(FATAL_ERROR "Unknown compiler") +endif () + +# some flags +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +# verbose output for debug builds +if (CMAKE_BUILD_TYPE MATCHES Debug) + set(CMAKE_VERBOSE_MAKEFILE ON) +endif () + +# required by successfully coverity and cppcheck build +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) diff --git a/sources/queued-daemon/src/QueuedApplication.cpp b/sources/queued-daemon/src/QueuedApplication.cpp index eddcbc6..978f212 100644 --- a/sources/queued-daemon/src/QueuedApplication.cpp +++ b/sources/queued-daemon/src/QueuedApplication.cpp @@ -30,6 +30,8 @@ QueuedApplication::QueuedApplication(QObject *parent, const QVariantHash &args) { qCDebug(LOG_APP) << __PRETTY_FUNCTION__; + m_core = new QueuedCore(this); + init(); initDBus(); } @@ -41,30 +43,13 @@ QueuedApplication::~QueuedApplication() QDBusConnection::sessionBus().unregisterObject( QueuedConfig::DBUS_APPLICATION_PATH); - deinit(); -} - - -void QueuedApplication::deinit() -{ - if (m_core) - delete m_core; + m_core->deleteLater(); } void QueuedApplication::init() { - deinit(); - - initCore(); -} - - -void QueuedApplication::initCore() -{ - m_core = new QueuedCore(this); - // init objects - m_core->init(m_configuration[QString("config")].toString()); + m_core->init(m_configuration["config"].toString()); } diff --git a/sources/queued-daemon/src/QueuedApplication.h b/sources/queued-daemon/src/QueuedApplication.h index 487f110..28d3ab0 100644 --- a/sources/queued-daemon/src/QueuedApplication.h +++ b/sources/queued-daemon/src/QueuedApplication.h @@ -30,13 +30,11 @@ class QueuedApplication : public QObject public: explicit QueuedApplication(QObject *parent, const QVariantHash &args); virtual ~QueuedApplication(); - void deinit(); void init(); private: // backend void initDBus(); - void initCore(); // library QueuedCore *m_core = nullptr; // configuration diff --git a/sources/queued-daemon/src/main.cpp b/sources/queued-daemon/src/main.cpp index 1145dd3..e9ae4e3 100644 --- a/sources/queued-daemon/src/main.cpp +++ b/sources/queued-daemon/src/main.cpp @@ -15,19 +15,17 @@ #include -#include #include -#include #include +#include #include #include "QueuedApplication.h" #include "version.h" extern "C" { -#include #include } diff --git a/sources/queued-server/src/QueuedServer.cpp b/sources/queued-server/src/QueuedServer.cpp index 8e4597a..9902d9d 100644 --- a/sources/queued-server/src/QueuedServer.cpp +++ b/sources/queued-server/src/QueuedServer.cpp @@ -27,6 +27,8 @@ QueuedServer::QueuedServer(QObject *parent, const QVariantHash &args) { qCDebug(LOG_SERV) << __PRETTY_FUNCTION__; + m_server = new QueuedTcpServer(this); + init(); } @@ -35,26 +37,15 @@ QueuedServer::~QueuedServer() { qCDebug(LOG_SERV) << __PRETTY_FUNCTION__; - deinit(); -} - - -void QueuedServer::deinit() -{ - if (m_server) - delete m_server; + m_server->deleteLater(); } void QueuedServer::init() { - deinit(); - - m_server - = new QueuedTcpServer(QueuedCoreAdaptor::getOption( - QueuedConfig::QueuedSettings::ServerTimeout) - .toInt(), - this); + m_server->init(QueuedCoreAdaptor::getOption( + QueuedConfig::QueuedSettings::ServerTimeout) + .toInt()); QString address = QueuedCoreAdaptor::getOption( QueuedConfig::QueuedSettings::ServerAddress) .toString(); diff --git a/sources/queued-server/src/QueuedServer.h b/sources/queued-server/src/QueuedServer.h index cd1930c..6069ecc 100644 --- a/sources/queued-server/src/QueuedServer.h +++ b/sources/queued-server/src/QueuedServer.h @@ -30,7 +30,6 @@ class QueuedServer : public QObject public: explicit QueuedServer(QObject *parent, const QVariantHash &args); virtual ~QueuedServer(); - void deinit(); void init(); private: diff --git a/sources/queued-server/src/QueuedTcpServer.cpp b/sources/queued-server/src/QueuedTcpServer.cpp index 2e1400e..ebc844f 100644 --- a/sources/queued-server/src/QueuedTcpServer.cpp +++ b/sources/queued-server/src/QueuedTcpServer.cpp @@ -21,9 +21,8 @@ #include "QueuedTcpServerThread.h" -QueuedTcpServer::QueuedTcpServer(const int timeout, QObject *parent) +QueuedTcpServer::QueuedTcpServer(QObject *parent) : QTcpServer(parent) - , m_timeout(timeout) { qCDebug(LOG_SERV) << __PRETTY_FUNCTION__; } @@ -32,26 +31,18 @@ QueuedTcpServer::QueuedTcpServer(const int timeout, QObject *parent) QueuedTcpServer::~QueuedTcpServer() { qCDebug(LOG_SERV) << __PRETTY_FUNCTION__; - - deinit(); } -void QueuedTcpServer::deinit() +void QueuedTcpServer::init(const int timeout) { -} - - -void QueuedTcpServer::init() -{ - deinit(); + m_timeout = timeout; } void QueuedTcpServer::incomingConnection(qintptr socketDescriptor) { - QueuedTcpServerThread *thread - = new QueuedTcpServerThread(socketDescriptor, m_timeout, this); + auto thread = new QueuedTcpServerThread(socketDescriptor, m_timeout, this); connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); thread->start(); } diff --git a/sources/queued-server/src/QueuedTcpServer.h b/sources/queued-server/src/QueuedTcpServer.h index 270f835..abee90b 100644 --- a/sources/queued-server/src/QueuedTcpServer.h +++ b/sources/queued-server/src/QueuedTcpServer.h @@ -25,10 +25,9 @@ class QueuedTcpServer : public QTcpServer Q_OBJECT public: - explicit QueuedTcpServer(const int timeout, QObject *parent); + explicit QueuedTcpServer(QObject *parent); virtual ~QueuedTcpServer(); - void deinit(); - void init(); + void init(const int timeout); protected: void incomingConnection(qintptr socketDescriptor) override; diff --git a/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp b/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp index e7964b0..275d123 100644 --- a/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp +++ b/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp @@ -111,7 +111,6 @@ QVariantHash QueuedTcpServerResponseHelperApi1::getData( else output = {{"code", 405}}; break; - break; case QueuedTcpServerResponseHelper::RequestPath::User: if (_type == "GET") output = QueuedTcpServerResponseHelperUser::getUser(_arg, _data); diff --git a/sources/queued-server/src/QueuedTcpServerResponseHelperPermissions.cpp b/sources/queued-server/src/QueuedTcpServerResponseHelperPermissions.cpp index 9a1c907..a5a854c 100644 --- a/sources/queued-server/src/QueuedTcpServerResponseHelperPermissions.cpp +++ b/sources/queued-server/src/QueuedTcpServerResponseHelperPermissions.cpp @@ -52,8 +52,9 @@ QVariantHash QueuedTcpServerResponseHelperPermissions::removePermission( if (permission == QueuedEnums::Permission::Invalid) return {{"code", 400}, {"message", "Invalid permission"}}; - return {{"code", QueuedCoreAdaptor::sendUserPermissionRemove( - _id, permission, _token) - ? 200 - : 400}}; + return { + {"code", + QueuedCoreAdaptor::sendUserPermissionRemove(_id, permission, _token) + ? 200 + : 400}}; } diff --git a/sources/queued-server/src/QueuedTcpServerResponseHelperTask.cpp b/sources/queued-server/src/QueuedTcpServerResponseHelperTask.cpp index adf53c5..f7f60ce 100644 --- a/sources/queued-server/src/QueuedTcpServerResponseHelperTask.cpp +++ b/sources/queued-server/src/QueuedTcpServerResponseHelperTask.cpp @@ -42,7 +42,7 @@ QueuedTcpServerResponseHelperTask::getDefinitions(const QVariantHash &_data) { qCDebug(LOG_SERV) << "Get definitions from" << _data; - QueuedProcess::QueuedProcessDefinitions defs; + auto defs = QueuedProcess::QueuedProcessDefinitions(); auto args = _data["arguments"].toList(); for (auto &arg : args) defs.arguments.append(arg.toString()); @@ -94,7 +94,7 @@ QueuedTcpServerResponseHelperTask::getTasks(const QVariantHash &_data, { qCDebug(LOG_SERV) << "Get tasks" << _data; - long long user = _data.value("userId").toLongLong(); + long long userId = _data.value("userId").toLongLong(); QDateTime start = QDateTime::fromString(_data["start"].toString(), Qt::ISODateWithMs); QDateTime stop @@ -103,7 +103,7 @@ QueuedTcpServerResponseHelperTask::getTasks(const QVariantHash &_data, QVariantHash output = {{"code", 200}}; // some conversion magic QVariantList outputReport; - auto report = QueuedCoreAdaptor::getTasks(user, start, stop, _token); + auto report = QueuedCoreAdaptor::getTasks(userId, start, stop, _token); for (auto &user : report) outputReport.append(user); output["report"] = outputReport; diff --git a/sources/queued-server/src/QueuedTcpServerThread.cpp b/sources/queued-server/src/QueuedTcpServerThread.cpp index 6a2394e..b5516a3 100644 --- a/sources/queued-server/src/QueuedTcpServerThread.cpp +++ b/sources/queued-server/src/QueuedTcpServerThread.cpp @@ -82,7 +82,7 @@ QueuedTcpServerThread::getHeaders(const QStringList &headers) { qCDebug(LOG_SERV) << "Get headers object from" << headers; - QueuedTcpServerThread::QueuedTcpServerHeaders headersObj; + auto headersObj = QueuedTcpServerThread::QueuedTcpServerHeaders(); // metadata auto protocolData = headers.first().split(' '); @@ -96,8 +96,9 @@ QueuedTcpServerThread::getHeaders(const QStringList &headers) auto parsed = header.split(": "); if (parsed.count() < 2) continue; - headersObj.headers += {parsed.first().toUtf8().toLower(), - parsed.mid(1).join(": ").toUtf8()}; + headersObj.headers += QPair( + {parsed.first().toUtf8().toLower(), + parsed.mid(1).join(": ").toUtf8()}); } return headersObj; @@ -114,7 +115,7 @@ QueuedTcpServerThread::QueuedTcpServerRequest QueuedTcpServerThread::getRequest( request.headers = headers; // body - QJsonParseError error; + auto error = QJsonParseError(); auto jsonDoc = QJsonDocument::fromJson(body, &error); if (error.error == QJsonParseError::NoError) request.data = jsonDoc.object().toVariantHash(); diff --git a/sources/queued-server/src/main.cpp b/sources/queued-server/src/main.cpp index f33cd8a..c9af063 100644 --- a/sources/queued-server/src/main.cpp +++ b/sources/queued-server/src/main.cpp @@ -15,19 +15,17 @@ #include -#include #include -#include #include +#include #include #include "QueuedServer.h" #include "version.h" extern "C" { -#include #include } diff --git a/sources/queued/doxygen.conf.in b/sources/queued/doxygen.conf.in index 5926087..226443f 100644 --- a/sources/queued/doxygen.conf.in +++ b/sources/queued/doxygen.conf.in @@ -2122,7 +2122,7 @@ HIDE_UNDOC_RELATIONS = YES # set to NO # The default value is: NO. -HAVE_DOT = NO +HAVE_DOT = YES # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed # to run in parallel. When set to 0 doxygen will base this on the number of diff --git a/sources/queued/include/queued/QueuedCoreAdaptor.h b/sources/queued/include/queued/QueuedCoreAdaptor.h index df1e187..55fc362 100644 --- a/sources/queued/include/queued/QueuedCoreAdaptor.h +++ b/sources/queued/include/queued/QueuedCoreAdaptor.h @@ -216,7 +216,7 @@ QHash> getStatus(); */ QVariantHash getTask(const long long _id); /** - * @return server status inforamtion + * @return server status information */ QHash> getStatus(); /** diff --git a/sources/queued/include/queued/QueuedExceptions.h b/sources/queued/include/queued/QueuedExceptions.h index d3ff123..5b8f0d4 100644 --- a/sources/queued/include/queued/QueuedExceptions.h +++ b/sources/queued/include/queued/QueuedExceptions.h @@ -38,12 +38,18 @@ public: * @param message * exception message */ - QueuedException(const QString &message) - : m_message(message){}; + explicit QueuedException(QString message) + : QException() + { + m_message = std::move(message); + }; /** * @brief clone QueuedException */ - QueuedException *clone() const { return new QueuedException(*this); }; + QueuedException *clone() const override + { + return new QueuedException(*this); + }; /** * @brief message of this exception * @return message for logging, etc @@ -52,7 +58,7 @@ public: /** * @brief raise QueuedException */ - void raise() const { throw * this; } + void raise() const override { throw * this; } private: /** @@ -73,7 +79,7 @@ public: * @param message * exception message */ - QueuedConfigurationException(const QString &message) + explicit QueuedConfigurationException(const QString &message) : QueuedException(message){}; }; @@ -89,7 +95,7 @@ public: * @param message * exception message */ - QueuedDatabaseException(const QString &message) + explicit QueuedDatabaseException(const QString &message) : QueuedException(message){}; }; @@ -105,7 +111,7 @@ public: * @param message * exception message */ - QueuedDBusException(const QString &message) + explicit QueuedDBusException(const QString &message) : QueuedException(message){}; }; diff --git a/sources/queued/include/queued/QueuedLimits.h b/sources/queued/include/queued/QueuedLimits.h index b9f9be4..53a5082 100644 --- a/sources/queued/include/queued/QueuedLimits.h +++ b/sources/queued/include/queued/QueuedLimits.h @@ -84,7 +84,8 @@ struct Limits { * @param _stringLimits * limits string representation */ - Limits(const QString &_stringLimits) + explicit Limits(const QString &_stringLimits) + : Limits() { QStringList limits = _stringLimits.split(QChar('\n')); while (limits.count() < 5) diff --git a/sources/queued/include/queued/QueuedPluginInterface.h b/sources/queued/include/queued/QueuedPluginInterface.h index ea81362..3366d06 100644 --- a/sources/queued/include/queued/QueuedPluginInterface.h +++ b/sources/queued/include/queued/QueuedPluginInterface.h @@ -40,7 +40,7 @@ public: /** * @brief QueuedPluginInterface class destructor */ - virtual ~QueuedPluginInterface(){}; + virtual ~QueuedPluginInterface() = default; /** * @brief will be emitted to map interface signals to plugin slots * @param _manager diff --git a/sources/queued/include/queued/QueuedPluginManagerInterface.h b/sources/queued/include/queued/QueuedPluginManagerInterface.h index cdef7ac..092b39e 100644 --- a/sources/queued/include/queued/QueuedPluginManagerInterface.h +++ b/sources/queued/include/queued/QueuedPluginManagerInterface.h @@ -43,7 +43,8 @@ public: /** * @brief QueuedPluginManagerInterface class destructor */ - virtual ~QueuedPluginManagerInterface(){}; + virtual ~QueuedPluginManagerInterface() = default; + ; signals: /** diff --git a/sources/queued/src/QueuedAdvancedSettings.cpp b/sources/queued/src/QueuedAdvancedSettings.cpp index e40d761..bcb60c6 100644 --- a/sources/queued/src/QueuedAdvancedSettings.cpp +++ b/sources/queued/src/QueuedAdvancedSettings.cpp @@ -53,10 +53,8 @@ bool QueuedAdvancedSettings::checkDatabaseVersion() const { QString key = internalId(QueuedConfig::QueuedSettings::DatabaseVersion); - if (m_values.contains(key.toLower())) - return get(key).toInt() == QueuedConfig::DATABASE_VERSION; - else - return false; + return m_values.contains(key.toLower()) + && (get(key).toInt() == QueuedConfig::DATABASE_VERSION); } diff --git a/sources/queued/src/QueuedCore.cpp b/sources/queued/src/QueuedCore.cpp index f8b93d9..4702ca3 100644 --- a/sources/queued/src/QueuedCore.cpp +++ b/sources/queued/src/QueuedCore.cpp @@ -27,7 +27,6 @@ #include #include -#include /** @@ -233,8 +232,8 @@ bool QueuedCore::editTask(const long long _id, const QVariantHash &_taskData, // only admin can edit run/stopped task if (!task->startTime().isNull()) { if (!isAdmin) { - qCInfo(LOG_LIB) << "User" << _token - << "not allowed to edit run/exited task"; + qCInfo(LOG_LIB) + << "User" << _token << "not allowed to edit run/exited task"; return false; } } @@ -306,8 +305,8 @@ bool QueuedCore::editUserPermission(const long long _id, bool isAdmin = m_users->authorize(_token, QueuedEnums::Permission::Admin); if (userAuthId != _id) { if (!isAdmin) { - qCInfo(LOG_LIB) << "User" << _token - << "not allowed to edit permissions"; + qCInfo(LOG_LIB) + << "User" << _token << "not allowed to edit permissions"; return false; } } @@ -501,8 +500,8 @@ QList QueuedCore::taskReport(const long long _user, effectiveUserId = userAuthId; } else if (userAuthId != _user) { if (!isAdmin) { - qCInfo(LOG_LIB) << "User" << _token - << "not allowed to get task report"; + qCInfo(LOG_LIB) + << "User" << _token << "not allowed to get task report"; return QList(); } } @@ -575,22 +574,14 @@ void QueuedCore::deinit() QDBusConnection::sessionBus().unregisterService(QueuedConfig::DBUS_SERVICE); // delete objects now - if (m_databaseManager) - delete m_databaseManager; - if (m_reports) - delete m_reports; - if (m_plugins) - delete m_plugins; - if (m_processes) - delete m_processes; - if (m_users) - delete m_users; - if (m_database) - delete m_database; - if (m_settings) - delete m_settings; - if (m_advancedSettings) - delete m_advancedSettings; + delete m_databaseManager; + delete m_reports; + delete m_plugins; + delete m_processes; + delete m_users; + delete m_database; + delete m_settings; + delete m_advancedSettings; } @@ -991,7 +982,7 @@ bool QueuedCore::editOptionPrivate(const QString &_key, const QVariant &_value) long long id = m_advancedSettings->id(_key); QVariantHash payload = {{"key", _key}, {"value", _value}}; - bool status = false; + bool status; if (id == -1) { id = m_database->add(QueuedDB::SETTINGS_TABLE, payload); qCInfo(LOG_LIB) << "Added new key with ID" << id; @@ -1146,7 +1137,7 @@ bool QueuedCore::editUserPermissionPrivate( // edit runtime permissions to get value auto perms = _add ? userObj->addPermission(_permission) : userObj->removePermission(_permission); - uint permissions = static_cast(perms); + auto permissions = static_cast(perms); qCInfo(LOG_LIB) << "New user permissions" << perms << permissions; // modify in database now diff --git a/sources/queued/src/QueuedDatabase.cpp b/sources/queued/src/QueuedDatabase.cpp index 8cea51d..4377704 100644 --- a/sources/queued/src/QueuedDatabase.cpp +++ b/sources/queued/src/QueuedDatabase.cpp @@ -351,9 +351,9 @@ void QueuedDatabase::createSchema(const QString &_table) .arg(field.sqlDescription)); QSqlError error = query.lastError(); if (error.isValid()) - qCCritical(LOG_LIB) << "Could not insert column" << column - << "to table" << _table - << "error:" << error.text(); + qCCritical(LOG_LIB) + << "Could not insert column" << column << "to table" << _table + << "error:" << error.text(); } } @@ -370,8 +370,8 @@ void QueuedDatabase::createTable(const QString &_table) .arg(_table)); QSqlError error = query.lastError(); if (error.isValid()) - qCCritical(LOG_LIB) << "Could not create table" << _table - << "error:" << error.text(); + qCCritical(LOG_LIB) + << "Could not create table" << _table << "error:" << error.text(); } @@ -408,7 +408,7 @@ long long QueuedDatabase::lastInsertionId(const QString &_table) const return -1; } - long long id; + long long id = -1; while (query.next()) id = query.value(0).toLongLong(); @@ -430,8 +430,8 @@ QueuedDatabase::getQueryPayload(const QString &_table, QStringList schemaColumns = QueuedDB::DBSchema[_table].keys(); for (auto &key : _value.keys()) { if (!schemaColumns.contains(key)) { - qCWarning(LOG_LIB) << "No key" << key << "found in schema of" - << _table; + qCWarning(LOG_LIB) + << "No key" << key << "found in schema of" << _table; continue; } if (key == QString("_id")) { diff --git a/sources/queued/src/QueuedDatabaseManager.cpp b/sources/queued/src/QueuedDatabaseManager.cpp index 671b1d1..666d0eb 100644 --- a/sources/queued/src/QueuedDatabaseManager.cpp +++ b/sources/queued/src/QueuedDatabaseManager.cpp @@ -23,8 +23,6 @@ #include -#include - /** * @class QueuedDatabaseManager diff --git a/sources/queued/src/QueuedLimits.cpp b/sources/queued/src/QueuedLimits.cpp index 506dccf..8ae1ec6 100644 --- a/sources/queued/src/QueuedLimits.cpp +++ b/sources/queued/src/QueuedLimits.cpp @@ -52,10 +52,8 @@ bool QueuedLimits::limitCompare(const long long _first, const long long _second) { if (_first == 0) return false; - else if (_second == 0) - return true; else - return _first < _second; + return (_second == 0) || (_first < _second); } diff --git a/sources/queued/src/QueuedProcess.cpp b/sources/queued/src/QueuedProcess.cpp index b86098e..0279eef 100644 --- a/sources/queued/src/QueuedProcess.cpp +++ b/sources/queued/src/QueuedProcess.cpp @@ -26,8 +26,6 @@ #include #include -#include - /** * @class QueuedProcess @@ -82,9 +80,10 @@ void QueuedProcess::updateArguments() // replace limits now application.replace( - "{cpu}", QString("%1").arg( - QueuedSystemInfo::cpuWeight(nativeLimits().cpu) * 100.0, 0, - 'f', 0)); + "{cpu}", + QString("%1").arg(QueuedSystemInfo::cpuWeight(nativeLimits().cpu) + * 100.0, + 0, 'f', 0)); application.replace( "{memory}", QString("%1").arg(QueuedSystemInfo::memoryWeight(nativeLimits().memory) diff --git a/sources/queued/src/QueuedProcessManager.cpp b/sources/queued/src/QueuedProcessManager.cpp index 17a3e2a..b2507f9 100644 --- a/sources/queued/src/QueuedProcessManager.cpp +++ b/sources/queued/src/QueuedProcessManager.cpp @@ -102,7 +102,7 @@ QueuedProcess *QueuedProcessManager::add( if (processes().contains(_index)) return process(_index); - QueuedProcess *process = new QueuedProcess(this, _definitions, _index); + auto *process = new QueuedProcess(this, _definitions, _index); process->setProcessLine(processLine()); m_processes[_index] = process; // connect to signal diff --git a/sources/queued/src/QueuedTokenManager.cpp b/sources/queued/src/QueuedTokenManager.cpp index f83cba8..3008ad6 100644 --- a/sources/queued/src/QueuedTokenManager.cpp +++ b/sources/queued/src/QueuedTokenManager.cpp @@ -23,9 +23,7 @@ #include -#include #include -#include /** @@ -111,8 +109,7 @@ QString QueuedTokenManager::registerToken(const QString &_user, const QDateTime &_validUntil) { // generate from uuid - QString token - = QUuid::createUuid().toString().remove(QChar('{')).remove(QChar('}')); + QString &token = QUuid::createUuid().toString().remove('{').remove('}'); qCInfo(LOG_LIB) << "Registered token" << token << "valid until" << _validUntil; diff --git a/sources/queued/src/QueuedUser.cpp b/sources/queued/src/QueuedUser.cpp index afb55ba..8a38197 100644 --- a/sources/queued/src/QueuedUser.cpp +++ b/sources/queued/src/QueuedUser.cpp @@ -92,12 +92,10 @@ bool QueuedUser::hasPermission(const QueuedEnums::Permission _permission) { qCDebug(LOG_LIB) << "Check permissions" << static_cast(_permission); - if (static_cast(m_definitions.permissions) - .testFlag(QueuedEnums::Permission::SuperAdmin)) - return true; - else - return static_cast(m_definitions.permissions) - .testFlag(_permission); + return static_cast(m_definitions.permissions) + .testFlag(QueuedEnums::Permission::SuperAdmin) + || static_cast(m_definitions.permissions) + .testFlag(_permission); } diff --git a/sources/queued/src/QueuedUserManager.cpp b/sources/queued/src/QueuedUserManager.cpp index 34c7650..67a17eb 100644 --- a/sources/queued/src/QueuedUserManager.cpp +++ b/sources/queued/src/QueuedUserManager.cpp @@ -23,8 +23,6 @@ #include -#include - /** * @class QueuedUserManager diff --git a/sources/queuedctl/src/QueuedctlCommon.cpp b/sources/queuedctl/src/QueuedctlCommon.cpp index 3bb8166..edec6bd 100644 --- a/sources/queuedctl/src/QueuedctlCommon.cpp +++ b/sources/queuedctl/src/QueuedctlCommon.cpp @@ -210,7 +210,7 @@ QueuedctlCommon::process(QCommandLineParser &_parser, const QString &_cache, qCDebug(LOG_APP) << "Process command with args" << "using auth" << _cache << _user; - QueuedctlResult result; + auto result = QueuedctlResult(); QStringList args = _parser.positionalArguments(); QString command = args.isEmpty() ? QString() : args.first(); @@ -316,10 +316,10 @@ QueuedctlCommon::process(QCommandLineParser &_parser, const QString &_cache, case QueuedctlArgument::TaskAdd: { QString token = QueuedctlAuth::getToken(_cache, _user); auto definitions = QueuedctlTask::getDefinitions(_parser, false); - long long id = QueuedctlTask::addTask(definitions, token); - result.status = (id > 0); + long long taskId = QueuedctlTask::addTask(definitions, token); + result.status = (taskId > 0); if (result.status) - result.output = QString("Task %1 added").arg(id); + result.output = QString("Task %1 added").arg(taskId); else result.output = QString("Could not add task"); break; @@ -360,10 +360,10 @@ QueuedctlCommon::process(QCommandLineParser &_parser, const QString &_cache, case QueuedctlArgument::UserAdd: { QString token = QueuedctlAuth::getToken(_cache, _user); auto definitions = QueuedctlUser::getDefinitions(_parser, false); - long long id = QueuedctlUser::addUser(definitions, token); - result.status = (id > 0); + long long userId = QueuedctlUser::addUser(definitions, token); + result.status = (userId > 0); if (result.status) - result.output = QString("User %1 added").arg(id); + result.output = QString("User %1 added").arg(userId); else result.output = QString("Could not add user"); break; diff --git a/sources/queuedctl/src/QueuedctlPermissions.cpp b/sources/queuedctl/src/QueuedctlPermissions.cpp index 918eabe..9a0ff42 100644 --- a/sources/queuedctl/src/QueuedctlPermissions.cpp +++ b/sources/queuedctl/src/QueuedctlPermissions.cpp @@ -27,11 +27,8 @@ bool QueuedctlPermissions::addPermission(const long long _id, auto permission = QueuedEnums::stringToPermission(_permission); - if (permission != QueuedEnums::Permission::Invalid) - return QueuedCoreAdaptor::sendUserPermissionAdd(_id, permission, - _token); - else - return false; + return (permission != QueuedEnums::Permission::Invalid) + && QueuedCoreAdaptor::sendUserPermissionAdd(_id, permission, _token); } @@ -43,11 +40,9 @@ bool QueuedctlPermissions::removePermission(const long long _id, auto permission = QueuedEnums::stringToPermission(_permission); - if (permission != QueuedEnums::Permission::Invalid) - return QueuedCoreAdaptor::sendUserPermissionRemove(_id, permission, - _token); - else - return false; + return (permission != QueuedEnums::Permission::Invalid) + && QueuedCoreAdaptor::sendUserPermissionRemove(_id, permission, + _token); } diff --git a/sources/queuedctl/src/QueuedctlTask.cpp b/sources/queuedctl/src/QueuedctlTask.cpp index 762a0fb..b85aa0b 100644 --- a/sources/queuedctl/src/QueuedctlTask.cpp +++ b/sources/queuedctl/src/QueuedctlTask.cpp @@ -20,8 +20,6 @@ #include -#include "QueuedctlUser.h" - extern "C" { #include } diff --git a/sources/queuedctl/src/QueuedctlUser.cpp b/sources/queuedctl/src/QueuedctlUser.cpp index 2c5fe61..52b1827 100644 --- a/sources/queuedctl/src/QueuedctlUser.cpp +++ b/sources/queuedctl/src/QueuedctlUser.cpp @@ -93,7 +93,7 @@ QueuedctlUser::getDefinitions(const QCommandLineParser &_parser, QString QueuedctlUser::getPassword() { // do not show input characters - struct termios tty; + auto tty = termios(); ::tcgetattr(STDIN_FILENO, &tty); tty.c_lflag &= ~ECHO; tcsetattr(STDIN_FILENO, TCSANOW, &tty); diff --git a/sources/queuedctl/src/main.cpp b/sources/queuedctl/src/main.cpp index b2bf5e6..284984f 100644 --- a/sources/queuedctl/src/main.cpp +++ b/sources/queuedctl/src/main.cpp @@ -15,7 +15,6 @@ #include -#include #include