Mercurial > minori
diff src/gui/dialog/about.cpp @ 63:3d2decf093bb
*: fix many clang warnings
| author | Paper <mrpapersonic@gmail.com> |
|---|---|
| date | Sun, 01 Oct 2023 06:39:47 -0400 |
| parents | d10b6c6b432e |
| children | fe719c109dbc |
line wrap: on
line diff
--- a/src/gui/dialog/about.cpp Sun Oct 01 06:16:06 2023 -0400 +++ b/src/gui/dialog/about.cpp Sun Oct 01 06:39:47 2023 -0400 @@ -1,20 +1,18 @@ -#include "core/version.h" -#include "gui/widgets/text.h" #include "gui/dialog/about.h" #include "core/json.h" +#include "core/version.h" +#include "gui/widgets/text.h" #include "pugixml.hpp" -#include <curl/curl.h> #include <QFont> -#include <QTextCharFormat> -#include <QTextBrowser> -#include <QTextCursor> #include <QHBoxLayout> +#include <QTextBrowser> +#include <QTextCharFormat> +#include <QTextCursor> +#include <curl/curl.h> -#define CONCAT_VERSION_NX(major, minor, patch) \ - ("v" #major "." #minor "." #patch) +#define CONCAT_VERSION_NX(major, minor, patch) ("v" #major "." #minor "." #patch) -#define CONCAT_VERSION(major, minor, patch) \ - CONCAT_VERSION_NX(major, minor, patch) +#define CONCAT_VERSION(major, minor, patch) CONCAT_VERSION_NX(major, minor, patch) #define SET_TITLE_FONT(font, format, cursor) \ { \ @@ -99,7 +97,9 @@ UNSET_FONT_BOLD(font, format, cursor); cursor.insertBlock(); SET_FORMAT_HYPERLINK(format, cursor, "https://github.com/nlohmann/json"); - cursor.insertText(tr("JSON for Modern C++ ") + CONCAT_VERSION(NLOHMANN_JSON_VERSION_MAJOR, NLOHMANN_JSON_VERSION_MINOR, NLOHMANN_JSON_VERSION_PATCH)); + cursor.insertText(tr("JSON for Modern C++ ") + CONCAT_VERSION(NLOHMANN_JSON_VERSION_MAJOR, + NLOHMANN_JSON_VERSION_MINOR, + NLOHMANN_JSON_VERSION_PATCH)); UNSET_FORMAT_HYPERLINK(format, cursor); cursor.insertText(", "); { @@ -114,7 +114,8 @@ UNSET_FORMAT_HYPERLINK(format, cursor); cursor.insertText(", "); SET_FORMAT_HYPERLINK(format, cursor, "https://pugixml.org/"); - cursor.insertText(tr("pugixml v") + QString::number(PUGIXML_VERSION / 1000) + "." + QString::number(PUGIXML_VERSION / 10 % 100) + "." + QString::number(PUGIXML_VERSION % 10)); + cursor.insertText(tr("pugixml v") + QString::number(PUGIXML_VERSION / 1000) + "." + + QString::number(PUGIXML_VERSION / 10 % 100) + "." + QString::number(PUGIXML_VERSION % 10)); UNSET_FORMAT_HYPERLINK(format, cursor); cursor.insertText(", "); SET_FORMAT_HYPERLINK(format, cursor, "https://github.com/erengy/anitomy");