From 69ca87c72877ddfd7ef17997291d40b4452befb1 Mon Sep 17 00:00:00 2001 From: silverqx Date: Thu, 11 Apr 2024 13:44:13 +0200 Subject: [PATCH] analyzers fixed Clang Tidy warnings --- src/orm/concerns/managestransactions.cpp | 10 +++++----- src/orm/utils/thread.cpp | 2 +- tests/TinyUtils/src/databases.cpp | 8 ++++---- .../orm/databasemanager/tst_databasemanager.cpp | 14 -------------- tom/src/tom/commands/completecommand.cpp | 13 ++++++++----- tom/src/tom/commands/integratecommand.cpp | 8 ++++---- tom/src/tom/terminal.cpp | 2 +- 7 files changed, 23 insertions(+), 34 deletions(-) diff --git a/src/orm/concerns/managestransactions.cpp b/src/orm/concerns/managestransactions.cpp index a02cd5abe..34b22c02b 100644 --- a/src/orm/concerns/managestransactions.cpp +++ b/src/orm/concerns/managestransactions.cpp @@ -35,19 +35,19 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, Commit, ("COMMIT")) // NOLINT Q_GLOBAL_STATIC_WITH_ARGS(const QString, RollBack, ("ROLLBACK")) // NOLINT(misc-use-anonymous-namespace, cppcoreguidelines-avoid-non-const-global-variables) #ifdef TINYORM_USING_QTSQLDRIVERS /*! QString constant for the "ManagesTransactions::beginTransaction" function name. */ -Q_GLOBAL_STATIC_WITH_ARGS(const QString, BeginTransactionFunction, // NOLINT(misc-use-anonymous-namespace) +Q_GLOBAL_STATIC_WITH_ARGS(const QString, BeginTransactionFunction, // NOLINT(misc-use-anonymous-namespace, cppcoreguidelines-avoid-non-const-global-variables) ("ManagesTransactions::beginTransaction")) /*! QString constant for the "ManagesTransactions::commit" function name. */ -Q_GLOBAL_STATIC_WITH_ARGS(const QString, CommitFunction, // NOLINT(misc-use-anonymous-namespace) +Q_GLOBAL_STATIC_WITH_ARGS(const QString, CommitFunction, // NOLINT(misc-use-anonymous-namespace, cppcoreguidelines-avoid-non-const-global-variables) ("ManagesTransactions::commit")) /*! QString constant for the "ManagesTransactions::rollBack" function name. */ -Q_GLOBAL_STATIC_WITH_ARGS(const QString, RollBackFunction, // NOLINT(misc-use-anonymous-namespace) +Q_GLOBAL_STATIC_WITH_ARGS(const QString, RollBackFunction, // NOLINT(misc-use-anonymous-namespace, cppcoreguidelines-avoid-non-const-global-variables) ("ManagesTransactions::rollBack")) /*! QString constant for the "ManagesTransactions::savepoint" function name. */ -Q_GLOBAL_STATIC_WITH_ARGS(const QString, SavepointFunction, // NOLINT(misc-use-anonymous-namespace) +Q_GLOBAL_STATIC_WITH_ARGS(const QString, SavepointFunction, // NOLINT(misc-use-anonymous-namespace, cppcoreguidelines-avoid-non-const-global-variables) ("ManagesTransactions::savepoint")) /*! QString constant for the "ManagesTransactions::rollbackToSavepoint" function name. */ -Q_GLOBAL_STATIC_WITH_ARGS(const QString, RollbackToSavepointFunction, // NOLINT(misc-use-anonymous-namespace) +Q_GLOBAL_STATIC_WITH_ARGS(const QString, RollbackToSavepointFunction, // NOLINT(misc-use-anonymous-namespace, cppcoreguidelines-avoid-non-const-global-variables) ("ManagesTransactions::rollbackToSavepoint")) #endif diff --git a/src/orm/utils/thread.cpp b/src/orm/utils/thread.cpp index 93a8c0fa8..e062c5804 100644 --- a/src/orm/utils/thread.cpp +++ b/src/orm/utils/thread.cpp @@ -60,7 +60,7 @@ namespace void setCurrentThreadName(const char *name) { # if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) - prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); + prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); // NOLINT(cppcoreguidelines-pro-type-vararg, cppcoreguidelines-pro-type-reinterpret-cast) # elif defined(Q_OS_MAC) pthread_setname_np(name); # elif defined(Q_OS_QNX) diff --git a/tests/TinyUtils/src/databases.cpp b/tests/TinyUtils/src/databases.cpp index e7a8c54af..c54e9a166 100644 --- a/tests/TinyUtils/src/databases.cpp +++ b/tests/TinyUtils/src/databases.cpp @@ -24,10 +24,6 @@ using Orm::Constants::PUBLIC; using Orm::Constants::QMYSQL; using Orm::Constants::QPSQL; using Orm::Constants::QSQLITE; -using Orm::Constants::SEMICOLON; -using Orm::Constants::SSL_CA; -using Orm::Constants::SSL_CERT; -using Orm::Constants::SSL_KEY; using Orm::Constants::ROOT; using Orm::Constants::TZ00; using Orm::Constants::UTC; @@ -62,6 +58,10 @@ using Orm::Constants::username_; #ifdef TINYORM_USING_TINYDRIVERS using Orm::Constants::EQ_C; +using Orm::Constants::SEMICOLON; +using Orm::Constants::SSL_CA; +using Orm::Constants::SSL_CERT; +using Orm::Constants::SSL_KEY; using Orm::Constants::SSL_MODE; #endif diff --git a/tests/auto/functional/orm/databasemanager/tst_databasemanager.cpp b/tests/auto/functional/orm/databasemanager/tst_databasemanager.cpp index 0c54a8fa5..682313ffe 100644 --- a/tests/auto/functional/orm/databasemanager/tst_databasemanager.cpp +++ b/tests/auto/functional/orm/databasemanager/tst_databasemanager.cpp @@ -9,11 +9,8 @@ #include "databases.hpp" using Orm::Constants::EMPTY; -using Orm::Constants::H127001; using Orm::Constants::NAME; using Orm::Constants::NOSPACE; -using Orm::Constants::P5432; -using Orm::Constants::PUBLIC; using Orm::Constants::QMYSQL; using Orm::Constants::QPSQL; using Orm::Constants::QSQLITE; @@ -21,29 +18,19 @@ using Orm::Constants::SSL_CA; using Orm::Constants::SSL_CERT; using Orm::Constants::SSL_KEY; using Orm::Constants::SSL_MODE; -using Orm::Constants::UTF8; -using Orm::Constants::UTF8MB4; -using Orm::Constants::UTF8MB40900aici; using Orm::Constants::VerifyCA; using Orm::Constants::Version; -using Orm::Constants::application_name; -using Orm::Constants::charset_; using Orm::Constants::check_database_exists; -using Orm::Constants::collation_; using Orm::Constants::database_; using Orm::Constants::dont_drop; using Orm::Constants::driver_; using Orm::Constants::host_; using Orm::Constants::in_memory; using Orm::Constants::options_; -using Orm::Constants::password_; -using Orm::Constants::port_; -using Orm::Constants::postgres_; using Orm::Constants::prefix_; using Orm::Constants::prefix_indexes; using Orm::Constants::qt_timezone; using Orm::Constants::return_qdatetime; -using Orm::Constants::search_path; using Orm::Constants::spatial_ref_sys; using Orm::Constants::ssl_ca; using Orm::Constants::ssl_cert; @@ -53,7 +40,6 @@ using Orm::Constants::sslcert; using Orm::Constants::sslkey; using Orm::Constants::sslmode_; using Orm::Constants::sslrootcert; -using Orm::Constants::username_; using Orm::Constants::verify_full; using Orm::DatabaseManager; diff --git a/tom/src/tom/commands/completecommand.cpp b/tom/src/tom/commands/completecommand.cpp index 32aac9e8d..966a20b16 100644 --- a/tom/src/tom/commands/completecommand.cpp +++ b/tom/src/tom/commands/completecommand.cpp @@ -27,18 +27,19 @@ namespace fs = std::filesystem; using Orm::Constants::COMMA_C; using Orm::Constants::DASH; -using Orm::Constants::EMPTY; using Orm::Constants::EQ_C; using Orm::Constants::NEWLINE; -using Orm::Constants::NOSPACE; using Orm::Constants::SPACE; + +#ifdef _MSC_VER +using Orm::Constants::EMPTY; +using Orm::Constants::NOSPACE; using Orm::Constants::database_; +#endif using StringUtils = Orm::Utils::String; -using Tom::Constants::About; using Tom::Constants::DoubleDash; -using Tom::Constants::Env; using Tom::Constants::Help; using Tom::Constants::Integrate; using Tom::Constants::List; @@ -46,12 +47,14 @@ using Tom::Constants::LongOption; using Tom::Constants::ShPwsh; using Tom::Constants::commandline; using Tom::Constants::commandline_up; -using Tom::Constants::only_; using Tom::Constants::word_; using Tom::Constants::word_up; #ifdef _MSC_VER +using Tom::Constants::About; +using Tom::Constants::Env; using Tom::Constants::LongOptionValue; +using Tom::Constants::only_; using Tom::Constants::position_; using Tom::Constants::position_up; #else diff --git a/tom/src/tom/commands/integratecommand.cpp b/tom/src/tom/commands/integratecommand.cpp index 6d56dcc84..13da35d74 100644 --- a/tom/src/tom/commands/integratecommand.cpp +++ b/tom/src/tom/commands/integratecommand.cpp @@ -288,11 +288,11 @@ int IntegrateCommand::integrateBash() const } /*! Bash completions directory path. */ -Q_GLOBAL_STATIC_WITH_ARGS(const QString, BashCompletionsDirPath, // NOLINT(misc-use-anonymous-namespace) +Q_GLOBAL_STATIC_WITH_ARGS(const QString, BashCompletionsDirPath, // NOLINT(misc-use-anonymous-namespace, cppcoreguidelines-avoid-non-const-global-variables) ("/usr/share/bash-completion/completions")) /*! Path to the TinyORM tom bash completion file. */ -Q_GLOBAL_STATIC_WITH_ARGS(const QString, TomBashCompletionFilepath, // NOLINT(misc-use-anonymous-namespace) +Q_GLOBAL_STATIC_WITH_ARGS(const QString, TomBashCompletionFilepath, // NOLINT(misc-use-anonymous-namespace, cppcoreguidelines-avoid-non-const-global-variables) (QString("%1/tom").arg(*BashCompletionsDirPath))) void IntegrateCommand::throwIfBashCompletionDirNotExists() @@ -362,7 +362,7 @@ int IntegrateCommand::integrateZsh() const } /*! Zsh completions directory path. */ -Q_GLOBAL_STATIC_WITH_ARGS(const QStringList, ZshCompletionsDirPaths, // NOLINT(misc-use-anonymous-namespace) +Q_GLOBAL_STATIC_WITH_ARGS(const QStringList, ZshCompletionsDirPaths, // NOLINT(misc-use-anonymous-namespace, cppcoreguidelines-avoid-non-const-global-variables) ({"/usr/local/share/zsh/site-functions", "/usr/share/zsh/site-functions"})) @@ -377,7 +377,7 @@ struct ZshCompletionPathsItem /*! Paths to the TinyORM tom zsh completion files. */ Q_GLOBAL_STATIC_WITH_ARGS( - QVector, TomZshCompletionPaths, // NOLINT(misc-use-anonymous-namespace) + QVector, TomZshCompletionPaths, // NOLINT(misc-use-anonymous-namespace, cppcoreguidelines-avoid-non-const-global-variables) ({{ZshCompletionsDirPaths->constFirst(), QString("%1/_tom").arg(ZshCompletionsDirPaths->constFirst())}, {ZshCompletionsDirPaths->at(1), diff --git a/tom/src/tom/terminal.cpp b/tom/src/tom/terminal.cpp index 2b8f9570c..cf53b4847 100644 --- a/tom/src/tom/terminal.cpp +++ b/tom/src/tom/terminal.cpp @@ -62,7 +62,7 @@ Terminal::TerminalSize Terminal::terminalSize() noexcept height = (csbi.srWindow.Bottom - csbi.srWindow.Top) + 1; #elif defined(__linux__) winsize w {}; - ioctl(fileno(stdout), TIOCGWINSZ, &w); + ioctl(fileno(stdout), TIOCGWINSZ, &w); // NOLINT(cppcoreguidelines-pro-type-vararg) width = w.ws_col; height = w.ws_row;