fixed pedantic warning, double ;;

silverqx · Feb 4, 2023 · 0f2b6d8 · 0f2b6d8
1 parent ccef0e5
commit 0f2b6d8
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 33 deletions.
diff --git a/src/orm/databaseconnection.cpp b/src/orm/databaseconnection.cpp
@@ -491,7 +491,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(DriverNameMapType, DRIVER_NAME_MAP, ({
                               {QMYSQL,  MYSQL_},
                               {QPSQL,   POSTGRESQL},
                               {QSQLITE, SQLITE}
-                          }));
+                          }))
 
 const QString &DatabaseConnection::driverNamePrintable()
 {

diff --git a/src/orm/utils/string.cpp b/src/orm/utils/string.cpp
@@ -77,7 +77,7 @@ bool String::isNumber(const QStringView string, const bool allowFloating,
 using SnakeCache = std::unordered_map<QString, QString>;
 
 /*! Snake cache for already computed strings. */
-Q_GLOBAL_STATIC(SnakeCache, snakeCache);
+Q_GLOBAL_STATIC(SnakeCache, snakeCache)
 
 QString String::snake(QString string, const QChar delimiter)
 {
@@ -121,9 +121,9 @@ using StudlyCache = std::unordered_map<QString, QString>;
 using CamelCache  = std::unordered_map<QString, QString>;
 
 /*! Studly cache for already computed strings. */
-Q_GLOBAL_STATIC(StudlyCache, studlyCache);
+Q_GLOBAL_STATIC(StudlyCache, studlyCache)
 /*! Camel cache for already computed strings. */
-Q_GLOBAL_STATIC(CamelCache, camelCache);
+Q_GLOBAL_STATIC(CamelCache, camelCache)
 
 QString String::camel(QString string)
 {

diff --git a/tests/TinyUtils/src/databases.cpp b/tests/TinyUtils/src/databases.cpp
@@ -65,7 +65,7 @@ namespace TestUtils
    Tests don't fail but are skipped when a connection is not available. */
 
 /*! DatabaseManager instance. */
-Q_GLOBAL_STATIC_WITH_ARGS(std::shared_ptr<Orm::DatabaseManager>, db, {nullptr});
+Q_GLOBAL_STATIC_WITH_ARGS(std::shared_ptr<Orm::DatabaseManager>, db, {nullptr})
 
 /* public */
 

diff --git a/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp b/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp
@@ -140,16 +140,16 @@ private Q_SLOTS:
 };
 
 /*! Time zone +02:00. */
-Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZone0200, (QByteArray("UTC+02:00")));
+Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZone0200, (QByteArray("UTC+02:00")))
 
 /*! QString constant "datetimes" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, datetimes, ("datetimes"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, datetimes, ("datetimes"))
 /*! QString constant "datetime" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime, ("datetime"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime, ("datetime"))
 /*! QString constant "timestamp" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp"))
 /*! QString constant "date" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date"))
 
 /* private slots */
 

diff --git a/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp b/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp
@@ -134,16 +134,16 @@ private Q_SLOTS:
 
 /*! Time zone Europe/Bratislava. */
 Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZoneEUBratislava,
-                          (QByteArray("Europe/Bratislava")));
+                          (QByteArray("Europe/Bratislava")))
 
 /*! QString constant "datetimes" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, datetimes, ("datetimes"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, datetimes, ("datetimes"))
 /*! QString constant "datetime" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime, ("datetime"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime, ("datetime"))
 /*! QString constant "timestamp" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp"))
 /*! QString constant "date" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date"))
 
 /* private slots */
 

diff --git a/tests/auto/functional/orm/query/sqlite_qdatetime/tst_sqlite_qdatetime.cpp b/tests/auto/functional/orm/query/sqlite_qdatetime/tst_sqlite_qdatetime.cpp
@@ -128,18 +128,18 @@ private Q_SLOTS:
    the QVariant(QString).value<QDateTime>() and
    QTimeZone(UTC+02) != QTimeZone(UTC+02:00). */
 /*! Time zone +02 (reason for this is QTimeZone(UTC+02) != QTimeZone(UTC+02:00)). */
-Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZone02, (QByteArray("UTC+02")));
+Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZone02, (QByteArray("UTC+02")))
 /*! Time zone +02:00. */
-Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZone0200, (QByteArray("UTC+02")));
+Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZone0200, (QByteArray("UTC+02")))
 
 /*! QString constant "datetimes" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, datetimes, ("datetimes"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, datetimes, ("datetimes"))
 /*! QString constant "datetime" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime, ("datetime"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime, ("datetime"))
 /*! QString constant "timestamp" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp"))
 /*! QString constant "date" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date"))
 
 /* private slots */
 

diff --git a/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp b/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp
@@ -107,11 +107,11 @@ private Q_SLOTS:
 };
 
 /*! QString constant "datetime" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime_, ("datetime"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime_, ("datetime"))
 /*! QString constant "timestamp" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp"))
 /*! QString constant "date" (perf. reason, one time initialization). */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date"))
 
 /* private slots */
 
@@ -1371,11 +1371,11 @@ void tst_Model_QDateTime::set0200Timezone(const QString &connection)
 }
 
 /*! Time zone +02:00 for MySQL. */
-Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZone0200, (QByteArray("UTC+02:00")));
+Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZone0200, (QByteArray("UTC+02:00")))
 
 /*! Time zone Europe/Bratislava for PostgreSQL. */
 Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZoneEUBratislava,
-                          (QByteArray("Europe/Bratislava")));
+                          (QByteArray("Europe/Bratislava")))
 
 void tst_Model_QDateTime::set0200TimezoneForMySQL(const QString &connection)
 {

diff --git a/tests/auto/functional/others/version/tst_version.cpp b/tests/auto/functional/others/version/tst_version.cpp
@@ -76,7 +76,7 @@ private Q_SLOTS:
 
 #if defined(_WIN32) && defined(TINYTEST_VERSION_IS_SHARED_BUILD)
 /*! Executables copyright, all executables have the same LegalCopyright. */
-Q_GLOBAL_STATIC_WITH_ARGS(QString, CopyRight, ("Copyright (©) 2022 Crystal Studio"));
+Q_GLOBAL_STATIC_WITH_ARGS(QString, CopyRight, ("Copyright (©) 2022 Crystal Studio"))
 #endif
 
 // NOLINTBEGIN(readability-convert-member-functions-to-static)

diff --git a/tom/src/tom/commands/integratecommand.cpp b/tom/src/tom/commands/integratecommand.cpp
@@ -150,11 +150,11 @@ namespace
 /*! Template string for tab-completion installed successfully. */
 Q_GLOBAL_STATIC_WITH_ARGS(
         QString, IntegrateSuccessTmpl,
-        ("Tab-completion for the %1 shell was successfully registered. 🎉"));
+        ("Tab-completion for the %1 shell was successfully registered. 🎉"))
 /*! Template string for tab-completion already registered. */
 Q_GLOBAL_STATIC_WITH_ARGS(
         QString, IntegrateAlreadyRegisteredTmpl,
-        ("Tab-completion for the %1 shell is already registered. 🙌"));
+        ("Tab-completion for the %1 shell is already registered. 🙌"))
 
 int IntegrateCommand::integratePwsh() const
 {
@@ -284,11 +284,11 @@ int IntegrateCommand::integrateBash() const
 
 /*! Bash completions directory path. */
 Q_GLOBAL_STATIC_WITH_ARGS(QString, BashCompletionsDirPath,
-                          ("/usr/share/bash-completion/completions"));
+                          ("/usr/share/bash-completion/completions"))
 
 /*! Path to the TinyORM tom bash completion file. */
 Q_GLOBAL_STATIC_WITH_ARGS(QString, TomBashCompletionFilepath,
-                          (QString("%1/tom").arg(*BashCompletionsDirPath)));
+                          (QString("%1/tom").arg(*BashCompletionsDirPath)))
 
 void IntegrateCommand::throwIfBashCompletionDirNotExists()
 {
@@ -359,7 +359,7 @@ int IntegrateCommand::integrateZsh() const
 /*! Zsh completions directory path. */
 Q_GLOBAL_STATIC_WITH_ARGS(QStringList, ZshCompletionsDirPaths,
                           ({"/usr/local/share/zsh/site-functions",
-                            "/usr/share/zsh/site-functions"}));
+                            "/usr/share/zsh/site-functions"}))
 
 /*! Zsh completion files structure holds parent directory path and also filepath. */
 struct ZshCompletionPathsItem
@@ -376,7 +376,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(
         ({{ZshCompletionsDirPaths->constFirst(),
            QString("%1/_tom").arg(ZshCompletionsDirPaths->constFirst())},
           {ZshCompletionsDirPaths->at(1),
-           QString("%1/_tom").arg(ZshCompletionsDirPaths->at(1))}}));
+           QString("%1/_tom").arg(ZshCompletionsDirPaths->at(1))}}))
 
 bool IntegrateCommand::writeTomZshCompletionWrapper() const
 {