From d5b9deac9744834be3d775ad786189608b8a404c Mon Sep 17 00:00:00 2001 From: silverqx Date: Sun, 17 Mar 2024 10:22:53 +0100 Subject: [PATCH] drivers fixed new Clang Tidy v18 warnings - clang-analyzer-core.StackAddressEscape - performance-enum-size - readability-avoid-return-with-void-value - readability-redundant-inline-specifier - readability-redundant-member-init - readability-static-accessed-through-instance --- .../include/orm/drivers/driverstypes.hpp | 8 +++--- .../include/orm/drivers/dummysqlerror.hpp | 18 ++++++------- .../orm/drivers/exceptions/sqlerror.hpp | 4 +-- .../include/orm/drivers/sqldatabase.hpp | 8 +++--- .../orm/drivers/sqldatabasemanager.hpp | 12 ++++----- .../common/include/orm/drivers/sqldriver.hpp | 6 ++--- .../common/include/orm/drivers/sqlfield.hpp | 18 ++++++------- .../common/include/orm/drivers/sqlrecord.hpp | 14 +++++----- .../common/include/orm/drivers/sqlresult.hpp | 2 +- .../include/orm/drivers/utils/notnull.hpp | 17 +++++------- .../orm/drivers/sqldatabase_p.hpp | 14 +++++----- .../orm/drivers/sqldriver_p.hpp | 2 +- .../orm/drivers/sqlresult_p.hpp | 8 +++--- .../orm/drivers/support/connectionshash_p.hpp | 8 +++--- .../drivers/support/sqldriverfactory_p.hpp | 2 +- .../drivers/support/sqldriverfactory_p.cpp | 27 ++++++++++--------- .../include/orm/drivers/mysql/mysqldriver.hpp | 2 +- .../orm/drivers/mysql/mysqldriver_p.hpp | 4 +-- .../orm/drivers/mysql/mysqlresult_p.hpp | 4 +-- .../src/orm/drivers/mysql/mysqldriver_p.cpp | 2 +- 20 files changed, 90 insertions(+), 90 deletions(-) diff --git a/drivers/common/include/orm/drivers/driverstypes.hpp b/drivers/common/include/orm/drivers/driverstypes.hpp index 7e44dc57f..a6bba2021 100644 --- a/drivers/common/include/orm/drivers/driverstypes.hpp +++ b/drivers/common/include/orm/drivers/driverstypes.hpp @@ -5,6 +5,8 @@ #include TINY_SYSTEM_HEADER +#include + #include TINYORM_BEGIN_COMMON_NAMESPACE @@ -13,7 +15,7 @@ namespace Orm::Drivers { /*! Result set cursor position type. */ - enum CursorPosition + enum CursorPosition : qint8 { /*! Cursor position before the first row. */ BeforeFirstRow = -1, @@ -22,7 +24,7 @@ namespace Orm::Drivers }; /*! Numerical precision policies for floating point numbers. */ - enum struct NumericalPrecisionPolicy + enum struct NumericalPrecisionPolicy : qint8 { /*! Force 32bit integer values. The fractional part is silently discarded. */ LowPrecisionInt32 = 0x01, @@ -35,7 +37,7 @@ namespace Orm::Drivers }; /*! Type of a bind parameter (dummy type for API compatibility). */ - enum struct ParamType + enum struct ParamType : qint8 { /*! The bind parameter to put data into the database. */ In = 0, diff --git a/drivers/common/include/orm/drivers/dummysqlerror.hpp b/drivers/common/include/orm/drivers/dummysqlerror.hpp index 81768a8c8..32e2a4695 100644 --- a/drivers/common/include/orm/drivers/dummysqlerror.hpp +++ b/drivers/common/include/orm/drivers/dummysqlerror.hpp @@ -24,7 +24,7 @@ namespace Orm::Drivers { public: /*! An error type type. */ - enum ErrorType + enum ErrorType : qint8 { NoError, ConnectionError, @@ -38,17 +38,17 @@ namespace Orm::Drivers const QString &driverText = {}, const QString &databaseText = {}, // NOLINT(google-explicit-constructor) ErrorType errorType = NoError, const QString &errorCode = {}) noexcept; /*! Default destructor. */ - inline ~DummySqlError() = default; + ~DummySqlError() = default; /*! Copy constructor. */ - inline DummySqlError(const DummySqlError &) = default; + DummySqlError(const DummySqlError &) = default; /*! Copy assignment operator. */ - inline DummySqlError &operator=(const DummySqlError &) = default; + DummySqlError &operator=(const DummySqlError &) = default; /*! Move constructor. */ - inline DummySqlError(DummySqlError &&) noexcept = default; + DummySqlError(DummySqlError &&) noexcept = default; /*! Move assignment operator. */ - inline DummySqlError &operator=(DummySqlError &&) noexcept = default; + DummySqlError &operator=(DummySqlError &&) noexcept = default; /*! Equality comparison operator for the SqlError. */ inline bool operator==(const DummySqlError &other) const noexcept; @@ -73,14 +73,14 @@ namespace Orm::Drivers private: /*! Driver-specific error text. */ - QString m_driverText {}; + QString m_driverText; /*! Database-specific error text. */ - QString m_databaseText {}; + QString m_databaseText; /*! An error type. */ [[maybe_unused]] DummySqlError::ErrorType m_errorType = NoError; /*! Database-specific error code. */ - QString m_errorCode {}; + QString m_errorCode; }; /* public */ diff --git a/drivers/common/include/orm/drivers/exceptions/sqlerror.hpp b/drivers/common/include/orm/drivers/exceptions/sqlerror.hpp index 82924b602..6aedd9ba7 100644 --- a/drivers/common/include/orm/drivers/exceptions/sqlerror.hpp +++ b/drivers/common/include/orm/drivers/exceptions/sqlerror.hpp @@ -17,9 +17,9 @@ namespace Orm::Drivers::Exceptions struct MySqlErrorType { /*! Prepared database-specific error code. */ - QString errNo {}; + QString errNo; /*! Prepared database-specific error message. */ - QString errorMessage {}; + QString errorMessage; }; #endif // TINYDRIVERS_MYSQL_DRIVER diff --git a/drivers/common/include/orm/drivers/sqldatabase.hpp b/drivers/common/include/orm/drivers/sqldatabase.hpp index 1be49e351..b2605eea0 100644 --- a/drivers/common/include/orm/drivers/sqldatabase.hpp +++ b/drivers/common/include/orm/drivers/sqldatabase.hpp @@ -40,14 +40,14 @@ namespace Orm::Drivers ~SqlDatabase() noexcept; /*! Copy constructor. */ - inline SqlDatabase(const SqlDatabase &) = default; + SqlDatabase(const SqlDatabase &) = default; /*! Copy assignment operator. */ - inline SqlDatabase &operator=(const SqlDatabase &) = default; + SqlDatabase &operator=(const SqlDatabase &) = default; /*! Move constructor. */ - inline SqlDatabase(SqlDatabase &&) noexcept = default; + SqlDatabase(SqlDatabase &&) noexcept = default; /*! Move assignment operator. */ - inline SqlDatabase &operator=(SqlDatabase &&) noexcept = default; + SqlDatabase &operator=(SqlDatabase &&) noexcept = default; /* Database connection */ /*! Open the database connection using the current connection values. */ diff --git a/drivers/common/include/orm/drivers/sqldatabasemanager.hpp b/drivers/common/include/orm/drivers/sqldatabasemanager.hpp index 838d10072..354b5473c 100644 --- a/drivers/common/include/orm/drivers/sqldatabasemanager.hpp +++ b/drivers/common/include/orm/drivers/sqldatabasemanager.hpp @@ -24,21 +24,21 @@ namespace Orm::Drivers { protected: /*! Default constructor. */ - inline SqlDatabaseManager() = default; + SqlDatabaseManager() = default; public: /*! Copy constructor. */ - inline SqlDatabaseManager(const SqlDatabaseManager &) = default; + SqlDatabaseManager(const SqlDatabaseManager &) = default; /*! Copy assignment operator. */ - inline SqlDatabaseManager &operator=(const SqlDatabaseManager &) = default; // clazy:exclude=function-args-by-value + SqlDatabaseManager &operator=(const SqlDatabaseManager &) = default; // clazy:exclude=function-args-by-value /*! Move constructor. */ - inline SqlDatabaseManager(SqlDatabaseManager &&) noexcept = default; + SqlDatabaseManager(SqlDatabaseManager &&) noexcept = default; /*! Move assignment operator. */ - inline SqlDatabaseManager &operator=(SqlDatabaseManager &&) noexcept = default; + SqlDatabaseManager &operator=(SqlDatabaseManager &&) noexcept = default; /*! Default destructor. */ - inline ~SqlDatabaseManager() = default; + ~SqlDatabaseManager() = default; /*! Default Database Connection Name. */ static const QString defaultConnection; diff --git a/drivers/common/include/orm/drivers/sqldriver.hpp b/drivers/common/include/orm/drivers/sqldriver.hpp index cfdb5e5d1..fe58eec6a 100644 --- a/drivers/common/include/orm/drivers/sqldriver.hpp +++ b/drivers/common/include/orm/drivers/sqldriver.hpp @@ -41,7 +41,7 @@ namespace Orm::Drivers but were added back to be API compatible with QSqlDriver::DriverFeature. */ /*! Supported driver features enum. */ - enum DriverFeature + enum DriverFeature : qint8 { /*! Supports batched operations (unused, for API compatibility). */ BatchOperations, @@ -80,7 +80,7 @@ namespace Orm::Drivers }; /*! Identifier type enum. */ - enum IdentifierType + enum IdentifierType : qint8 { /*! Field/column name. */ FieldName, @@ -89,7 +89,7 @@ namespace Orm::Drivers }; /*! Database driver type enum. */ - enum DbmsType + enum DbmsType : qint8 { /*! MySQL database driver. */ MySqlServer, diff --git a/drivers/common/include/orm/drivers/sqlfield.hpp b/drivers/common/include/orm/drivers/sqlfield.hpp index c5d2acbda..9ae44926b 100644 --- a/drivers/common/include/orm/drivers/sqlfield.hpp +++ b/drivers/common/include/orm/drivers/sqlfield.hpp @@ -24,7 +24,7 @@ namespace Orm::Drivers using size_type = qint64; /*! Determine whether a field is required during INSERT statements. */ - enum struct RequiredStatus + enum struct RequiredStatus : qint8 { /*! Unknown required field status. */ Unknown = -1, @@ -41,20 +41,20 @@ namespace Orm::Drivers explicit SqlField(QString fieldName = {}, QMetaType metaType = {}, QString tableName = {}); /*! Default destructor. */ - inline ~SqlField() = default; + ~SqlField() = default; /*! Copy constructor. */ - inline SqlField(const SqlField &) = default; + SqlField(const SqlField &) = default; /*! Copy assignment operator. */ - inline SqlField &operator=(const SqlField &) = default; + SqlField &operator=(const SqlField &) = default; /*! Move constructor. */ - inline SqlField(SqlField &&) noexcept = default; + SqlField(SqlField &&) noexcept = default; /*! Move assignment operator. */ - inline SqlField &operator=(SqlField &&) noexcept = default; + SqlField &operator=(SqlField &&) noexcept = default; /*! Equality comparison operator for the SqlField. */ - inline bool operator==(const SqlField &) const = default; + bool operator==(const SqlField &) const = default; /*! Swap the SqlField. */ void swap(SqlField &other) noexcept; @@ -155,9 +155,9 @@ namespace Orm::Drivers /*! Table name a field belongs to. */ QString m_table; /*! Underlying database field type name (DB dependent). */ - QString m_sqlTypeName {}; // Moved up here for a better memory layout/padding + QString m_sqlTypeName; // Moved up here for a better memory layout/padding /*! Field default value. */ - QVariant m_defaultValue {}; + QVariant m_defaultValue; /*! Qt metatype. */ QMetaType m_metaType; /*! Determine whether a field is required during INSERT statements. */ diff --git a/drivers/common/include/orm/drivers/sqlrecord.hpp b/drivers/common/include/orm/drivers/sqlrecord.hpp index d760eaa03..6951b9370 100644 --- a/drivers/common/include/orm/drivers/sqlrecord.hpp +++ b/drivers/common/include/orm/drivers/sqlrecord.hpp @@ -21,22 +21,22 @@ namespace Orm::Drivers using size_type = int; /*! Default constructor. */ - inline SqlRecord() = default; + SqlRecord() = default; /*! Default destructor. */ - inline ~SqlRecord() = default; + ~SqlRecord() = default; /*! Copy constructor. */ - inline SqlRecord(const SqlRecord &) = default; + SqlRecord(const SqlRecord &) = default; /*! Copy assignment operator. */ - inline SqlRecord &operator=(const SqlRecord &) = default; + SqlRecord &operator=(const SqlRecord &) = default; /*! Move constructor. */ - inline SqlRecord(SqlRecord &&) noexcept = default; + SqlRecord(SqlRecord &&) noexcept = default; /*! Move assignment operator. */ - inline SqlRecord &operator=(SqlRecord &&) noexcept = default; + SqlRecord &operator=(SqlRecord &&) noexcept = default; /*! Equality comparison operator for the SqlRecord. */ - inline bool operator==(const SqlRecord &) const = default; + bool operator==(const SqlRecord &) const = default; /*! Swap the SqlRecord. */ inline void swap(SqlRecord &other) noexcept; diff --git a/drivers/common/include/orm/drivers/sqlresult.hpp b/drivers/common/include/orm/drivers/sqlresult.hpp index 9f779add5..76d900397 100644 --- a/drivers/common/include/orm/drivers/sqlresult.hpp +++ b/drivers/common/include/orm/drivers/sqlresult.hpp @@ -46,7 +46,7 @@ namespace Orm::Drivers protected: /*! Query placeholders syntax enum. */ - enum BindingSyntax + enum BindingSyntax : qint8 { /*! Positional placeholders using the ? character. */ PositionalBinding, diff --git a/drivers/common/include/orm/drivers/utils/notnull.hpp b/drivers/common/include/orm/drivers/utils/notnull.hpp index e442d3a63..66f3adf39 100644 --- a/drivers/common/include/orm/drivers/utils/notnull.hpp +++ b/drivers/common/include/orm/drivers/utils/notnull.hpp @@ -58,8 +58,7 @@ namespace Private static_assert (Private::is_comparable_to_nullptr::value, "The NotNull T template argument cannot be the nullptr."); - template>> + template U> constexpr NotNull(U &&u) // NOLINT(google-explicit-constructor) : m_ptr(std::forward(u)) { @@ -67,25 +66,23 @@ namespace Private std::terminate(); } - template>> - constexpr NotNull(T u) // NOLINT(google-explicit-constructor) + constexpr NotNull(T u) requires (!std::is_same_v) // NOLINT(google-explicit-constructor) : m_ptr(std::move(u)) { if (m_ptr == nullptr) std::terminate(); } - template>> + template U> constexpr NotNull(const NotNull &other) // NOLINT(google-explicit-constructor) : NotNull(other.get()) {} - inline NotNull(const NotNull &) = default; - inline NotNull &operator=(const NotNull &) = default; + NotNull(const NotNull &) = default; + NotNull &operator=(const NotNull &) = default; - inline NotNull(NotNull &&) = default; - inline NotNull &operator=(NotNull &&) = default; + NotNull(NotNull &&) = default; + NotNull &operator=(NotNull &&) = default; /*! Return the managed pointer (allows access to the smart pointer). */ constexpr Private::value_or_reference_return_t get() const // NOLINT(readability-const-return-type) diff --git a/drivers/common/include_private/orm/drivers/sqldatabase_p.hpp b/drivers/common/include_private/orm/drivers/sqldatabase_p.hpp index 5e3a35859..0d3896d9f 100644 --- a/drivers/common/include_private/orm/drivers/sqldatabase_p.hpp +++ b/drivers/common/include_private/orm/drivers/sqldatabase_p.hpp @@ -35,7 +35,7 @@ namespace Support /*! Constructor. */ inline explicit SqlDatabasePrivate(std::shared_ptr &&driver) noexcept; /*! Default destructor. */ - inline ~SqlDatabasePrivate() = default; + ~SqlDatabasePrivate() = default; /* Database connection */ /*! Clone the SqlDatabasePrivate. */ @@ -98,18 +98,18 @@ namespace Support /*! Connection driver name. */ QString driverName; /*! Connection name. */ - QString connectionName {}; + QString connectionName; /*! Connection hostname. */ - QString hostName {}; + QString hostName; /*! Connection database name. */ - QString databaseName {}; + QString databaseName; /*! Connection username. */ - QString username {}; + QString username; /*! Connection password. */ - QString password {}; + QString password; /*! Connection extra options. */ - QString connectionOptions {}; + QString connectionOptions; /*! Connection port. */ int port = -1; diff --git a/drivers/common/include_private/orm/drivers/sqldriver_p.hpp b/drivers/common/include_private/orm/drivers/sqldriver_p.hpp index 4744761e9..3e19b0eca 100644 --- a/drivers/common/include_private/orm/drivers/sqldriver_p.hpp +++ b/drivers/common/include_private/orm/drivers/sqldriver_p.hpp @@ -37,7 +37,7 @@ namespace Orm::Drivers /*! Is the connection currently open? */ bool isOpen = false; /*! The current database connection name (used in exceptions and logs). */ - QString connectionName {}; + QString connectionName; }; /* public */ diff --git a/drivers/common/include_private/orm/drivers/sqlresult_p.hpp b/drivers/common/include_private/orm/drivers/sqlresult_p.hpp index b844abf80..9a21c0c7f 100644 --- a/drivers/common/include_private/orm/drivers/sqlresult_p.hpp +++ b/drivers/common/include_private/orm/drivers/sqlresult_p.hpp @@ -36,7 +36,7 @@ namespace Orm::Drivers /*! Constructor. */ explicit SqlResultPrivate(const std::weak_ptr &driver) noexcept; /*! Default destructor. */ - inline ~SqlResultPrivate() = default; + ~SqlResultPrivate() = default; /* Prepared queries */ /*! Determine whether a value stored in the given QVariant isNull(). */ @@ -47,12 +47,12 @@ namespace Orm::Drivers std::weak_ptr sqldriver; /*! The current database connection name (used in exceptions and logs). */ - QString connectionName {}; + QString connectionName; /*! The current SQL query text. */ - QString query {}; + QString query; /*! Bound values for a prepared statement. */ - QList boundValues {}; + QList boundValues; /*! Connection numerical precision policy. */ NumericalPrecisionPolicy precisionPolicy = LowPrecisionDouble; diff --git a/drivers/common/include_private/orm/drivers/support/connectionshash_p.hpp b/drivers/common/include_private/orm/drivers/support/connectionshash_p.hpp index 039adf5f0..eb2c9e691 100644 --- a/drivers/common/include_private/orm/drivers/support/connectionshash_p.hpp +++ b/drivers/common/include_private/orm/drivers/support/connectionshash_p.hpp @@ -35,9 +35,9 @@ namespace Orm::Drivers::Support using size_type = typename ContainerType::size_type; /*! Default constructor. */ - inline ConnectionsHashPrivate() = default; + ConnectionsHashPrivate() = default; /*! Default destructor. */ - inline ~ConnectionsHashPrivate() = default; + ~ConnectionsHashPrivate() = default; /* Lookup */ /*! Get a connection by the given connection name. */ @@ -71,9 +71,9 @@ namespace Orm::Drivers::Support private: /*! Database connections hash. */ - ContainerType m_data {}; + ContainerType m_data; /*! Shared mutex. */ - mutable std::shared_mutex m_mutex {}; + mutable std::shared_mutex m_mutex; }; /* public */ diff --git a/drivers/common/include_private/orm/drivers/support/sqldriverfactory_p.hpp b/drivers/common/include_private/orm/drivers/support/sqldriverfactory_p.hpp index 6342df149..ee6d61021 100644 --- a/drivers/common/include_private/orm/drivers/support/sqldriverfactory_p.hpp +++ b/drivers/common/include_private/orm/drivers/support/sqldriverfactory_p.hpp @@ -29,7 +29,7 @@ namespace Support /*! Constructor. */ inline SqlDriverFactoryPrivate(QString &&driver, const QString &connection); /*! Deleted destructor. */ - inline ~SqlDriverFactoryPrivate() = default; + ~SqlDriverFactoryPrivate() = default; /*! Create a SqlDriver instance based on the driverName data member. */ std::shared_ptr make() const; diff --git a/drivers/common/src/orm/drivers/support/sqldriverfactory_p.cpp b/drivers/common/src/orm/drivers/support/sqldriverfactory_p.cpp index 5417f5567..917a0601a 100644 --- a/drivers/common/src/orm/drivers/support/sqldriverfactory_p.cpp +++ b/drivers/common/src/orm/drivers/support/sqldriverfactory_p.cpp @@ -121,13 +121,13 @@ namespace /*! Get the MySQL driver shared library basename for MSVC. */ inline QStringList getDriverBasenameMsvc(const QString &driverBasenameRaw) { - static auto versionMajor = QString::number(TINYDRIVERS_VERSION_MAJOR); - static const auto driverBasenameVersion = driverBasenameRaw % versionMajor; + static const auto versionMajor = QString::number(TINYDRIVERS_VERSION_MAJOR); + static const auto driverBasenameVersion = driverBasenameRaw + versionMajor; return { // qmake build doesn't support appending d after the basename for Debug builds #if defined(TINYDRIVERS_DEBUG) && !defined(TINY_QMAKE_BUILD) - driverBasenameVersion % 'd'_L1, // TinyMySql0d.dll + driverBasenameVersion + 'd'_L1, // TinyMySql0d.dll #endif driverBasenameVersion, // TinyMySql0.dll /* As the last, try to load from the raw basename without any postfixes, @@ -141,16 +141,16 @@ namespace /*! Get the MySQL driver shared library basename on Linux. */ inline QStringList getDriverBasenameLinux(const QString &driverBasenameRaw) { - static const auto driverBasenameLib = u"lib"_s % driverBasenameRaw; + static const auto driverBasenameLib = u"lib"_s + driverBasenameRaw; return { // qmake build doesn't support appending d after the basename for Debug builds #if defined(TINYDRIVERS_DEBUG) && !defined(TINY_QMAKE_BUILD) - driverBasenameLib % 'd'_L1, // libTinyMySqld.so + driverBasenameLib + 'd'_L1, // libTinyMySqld.so #endif driverBasenameLib, // libTinyMySql.so #if defined(TINYDRIVERS_DEBUG) && !defined(TINY_QMAKE_BUILD) - driverBasenameRaw % 'd'_L1, // TinyMySqld.so + driverBasenameRaw + 'd'_L1, // TinyMySqld.so #endif /* As the last, try to load from the raw basename without any postfixes, we don't use this but it can be helpful in some situations. */ @@ -163,22 +163,22 @@ namespace /*! Get the MySQL driver shared library basename on MSYS2/MinGW. */ inline QStringList getDriverBasenameMinGW(const QString &driverBasenameRaw) { - static auto versionMajor = QString::number(TINYDRIVERS_VERSION_MAJOR); + static const auto versionMajor = QString::number(TINYDRIVERS_VERSION_MAJOR); // qmake build doesn't prepend lib for shared libraries on MSYS2 #ifdef TINY_QMAKE_BUILD static const auto driverBasename = driverBasenameRaw; #else - static const auto driverBasename = u"lib"_s % driverBasenameRaw; - static const auto driverBasenameVersion = driverBasename % versionMajor; + static const auto driverBasename = u"lib"_s + driverBasenameRaw; + static const auto driverBasenameVersion = driverBasename + versionMajor; #endif - static const auto driverBasenameRawVersion = driverBasenameRaw % versionMajor; + static const auto driverBasenameRawVersion = driverBasenameRaw + versionMajor; return { // CMake builds only (or any other build system that prepends lib prefix) #ifndef TINY_QMAKE_BUILD # ifdef TINYDRIVERS_DEBUG - driverBasenameVersion % 'd'_L1, // libTinyMySql0d.dll + driverBasenameVersion + 'd'_L1, // libTinyMySql0d.dll # endif driverBasenameVersion, // libTinyMySql0.dll driverBasename, // libTinyMySql.dll @@ -186,7 +186,7 @@ namespace // Also, try all other combinations without the lib prefix // qmake build doesn't support appending d after the basename for Debug builds #if defined(TINYDRIVERS_DEBUG) && !defined(TINY_QMAKE_BUILD) - driverBasenameRawVersion % 'd'_L1, + driverBasenameRawVersion + 'd'_L1, #endif driverBasenameRawVersion, /* As the last, try to load from the raw basename without any postfixes, @@ -321,7 +321,8 @@ QStringList SqlDriverFactoryPrivate::sqlDriverPaths() const const auto envTinyPluginPath = qEnvironmentVariable("TINY_PLUGIN_PATH"); const auto hasTinyPluginPaths = !envTinyPluginPath.isEmpty(); - const auto isTinyDriversInBuildTree = this->isTinyDriversInBuildTree(); + const auto isTinyDriversInBuildTree = SqlDriverFactoryPrivate:: + isTinyDriversInBuildTree(); constexpr static auto listSeparator = QDir::listSeparator(); diff --git a/drivers/mysql/include/orm/drivers/mysql/mysqldriver.hpp b/drivers/mysql/include/orm/drivers/mysql/mysqldriver.hpp index 2c7ebabec..35d1ced61 100644 --- a/drivers/mysql/include/orm/drivers/mysql/mysqldriver.hpp +++ b/drivers/mysql/include/orm/drivers/mysql/mysqldriver.hpp @@ -29,7 +29,7 @@ namespace Orm::Drivers::MySql /*! Default constructor. */ MySqlDriver(); /*! Virtual destructor. */ - inline ~MySqlDriver() final = default; + ~MySqlDriver() final = default; /*! Open the database connection using the given values. */ bool open(const QString &database, const QString &username, diff --git a/drivers/mysql/include_private/orm/drivers/mysql/mysqldriver_p.hpp b/drivers/mysql/include_private/orm/drivers/mysql/mysqldriver_p.hpp index 61c570a56..ef2067d7b 100644 --- a/drivers/mysql/include_private/orm/drivers/mysql/mysqldriver_p.hpp +++ b/drivers/mysql/include_private/orm/drivers/mysql/mysqldriver_p.hpp @@ -20,7 +20,7 @@ namespace Orm::Drivers::MySql /*! Default constructor. */ inline MySqlDriverPrivate() noexcept; /*! Virtual destructor. */ - inline ~MySqlDriverPrivate() final = default; + ~MySqlDriverPrivate() final = default; /* open() */ struct SetConnectionOptionsResult; @@ -59,7 +59,7 @@ namespace Orm::Drivers::MySql /*! MYSQL handler. */ MYSQL *mysql = nullptr; /*! The currently selected default database name. */ - QString databaseName {}; + QString databaseName; private: /* open() */ diff --git a/drivers/mysql/include_private/orm/drivers/mysql/mysqlresult_p.hpp b/drivers/mysql/include_private/orm/drivers/mysql/mysqlresult_p.hpp index 84faf29b4..8cb52308c 100644 --- a/drivers/mysql/include_private/orm/drivers/mysql/mysqlresult_p.hpp +++ b/drivers/mysql/include_private/orm/drivers/mysql/mysqlresult_p.hpp @@ -37,7 +37,7 @@ namespace Orm::Drivers::MySql { /* Common for both */ /*! Field metatype. */ - QMetaType metaType {}; + QMetaType metaType; /*! Field metadata. */ const MYSQL_FIELD *myField = nullptr; // Returned by mysql_fetch_field() @@ -91,7 +91,7 @@ namespace Orm::Drivers::MySql /* Data members */ /* Common for both */ /*! Fields for the currently obtained record/row. */ - ResultFieldsType resultFields {}; + ResultFieldsType resultFields; /* Normal queries */ /*! Result set handle (from the mysql_store_result()). */ diff --git a/drivers/mysql/src/orm/drivers/mysql/mysqldriver_p.cpp b/drivers/mysql/src/orm/drivers/mysql/mysqldriver_p.cpp index 22729bd22..996131183 100644 --- a/drivers/mysql/src/orm/drivers/mysql/mysqldriver_p.cpp +++ b/drivers/mysql/src/orm/drivers/mysql/mysqldriver_p.cpp @@ -158,7 +158,7 @@ void MySqlDriverPrivate::mysqlSelectDb(const QString &database) { // Nothing to do if (database.isEmpty()) - return databaseName.clear(); // clazy:exclude=returning-void-expression + return databaseName.clear(); // NOLINT(readability-avoid-return-with-void-value) clazy:exclude=returning-void-expression if (mysql_select_db(mysql, database.toUtf8().constData()) == 0) { databaseName = database;