From 06d252e23aebc4ad147a72f1862b0fbc16127c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Fri, 17 Jan 2025 11:42:33 +0100 Subject: [PATCH] Lint. --- cockatrice/src/client/network/release_channel.cpp | 10 +++++----- .../src/client/network/spoiler_background_updater.h | 2 +- cockatrice/src/client/sound_engine.h | 2 +- cockatrice/src/client/tabs/tab_game.h | 2 +- cockatrice/src/client/tapped_out_interface.cpp | 6 +++--- cockatrice/src/client/tapped_out_interface.h | 4 ++-- cockatrice/src/client/ui/window_main.cpp | 8 +++++--- cockatrice/src/dialogs/dlg_edit_avatar.h | 2 +- cockatrice/src/dialogs/dlg_settings.cpp | 3 ++- cockatrice/src/dialogs/dlg_tip_of_the_day.h | 2 +- cockatrice/src/game/cards/card_database.cpp | 3 ++- cockatrice/src/main.cpp | 7 ++++--- 12 files changed, 28 insertions(+), 23 deletions(-) diff --git a/cockatrice/src/client/network/release_channel.cpp b/cockatrice/src/client/network/release_channel.cpp index 972d87468..b5040eeb0 100644 --- a/cockatrice/src/client/network/release_channel.cpp +++ b/cockatrice/src/client/network/release_channel.cpp @@ -148,8 +148,8 @@ void StableReleaseChannel::releaseListFinished() qCDebug(ReleaseChannelLog) << "Current hash=" << myHash << "update hash=" << shortHash; qCDebug(ReleaseChannelLog) << "Got reply from release server, name=" << lastRelease->getName() - << "desc=" << lastRelease->getDescriptionUrl() << "date=" << lastRelease->getPublishDate() - << "url=" << lastRelease->getDownloadUrl(); + << "desc=" << lastRelease->getDescriptionUrl() + << "date=" << lastRelease->getPublishDate() << "url=" << lastRelease->getDownloadUrl(); const QString &tagName = resultMap["tag_name"].toString(); QString url = QString(STABLETAG_URL) + tagName; @@ -249,9 +249,9 @@ void BetaReleaseChannel::releaseListFinished() lastRelease->setName(QString("%1 (%2)").arg(resultMap["tag_name"].toString()).arg(shortHash)); lastRelease->setDescriptionUrl(QString(BETARELEASE_CHANGESURL).arg(VERSION_COMMIT, shortHash)); - qCDebug(ReleaseChannelLog) << "Got reply from release server, size=" << resultMap.size() << "name=" << lastRelease->getName() - << "desc=" << lastRelease->getDescriptionUrl() << "commit=" << lastRelease->getCommitHash() - << "date=" << lastRelease->getPublishDate(); + qCDebug(ReleaseChannelLog) << "Got reply from release server, size=" << resultMap.size() + << "name=" << lastRelease->getName() << "desc=" << lastRelease->getDescriptionUrl() + << "commit=" << lastRelease->getCommitHash() << "date=" << lastRelease->getPublishDate(); QString betaBuildDownloadUrl = resultMap["assets_url"].toString(); diff --git a/cockatrice/src/client/network/spoiler_background_updater.h b/cockatrice/src/client/network/spoiler_background_updater.h index 8f8293305..a102447c1 100644 --- a/cockatrice/src/client/network/spoiler_background_updater.h +++ b/cockatrice/src/client/network/spoiler_background_updater.h @@ -2,9 +2,9 @@ #define COCKATRICE_SPOILER_DOWNLOADER_H #include +#include #include #include -#include inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater.debug"); diff --git a/cockatrice/src/client/sound_engine.h b/cockatrice/src/client/sound_engine.h index 28976a0ed..86412ca60 100644 --- a/cockatrice/src/client/sound_engine.h +++ b/cockatrice/src/client/sound_engine.h @@ -2,11 +2,11 @@ #define SOUNDENGINE_H #include +#include #include #include #include #include -#include inline Q_LOGGING_CATEGORY(SoundEngineLog, "sound_engine.debug"); diff --git a/cockatrice/src/client/tabs/tab_game.h b/cockatrice/src/client/tabs/tab_game.h index 9698c4b2c..8304d3f93 100644 --- a/cockatrice/src/client/tabs/tab_game.h +++ b/cockatrice/src/client/tabs/tab_game.h @@ -9,8 +9,8 @@ #include "tab.h" #include -#include #include +#include inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game.debug"); diff --git a/cockatrice/src/client/tapped_out_interface.cpp b/cockatrice/src/client/tapped_out_interface.cpp index d953ac17f..eb5f5d221 100644 --- a/cockatrice/src/client/tapped_out_interface.cpp +++ b/cockatrice/src/client/tapped_out_interface.cpp @@ -57,8 +57,8 @@ void TappedOutInterface::queryFinished(QNetworkReply *reply) } QString errorMessage = errorMessageList.join("\n"); - qCDebug(TappedOutInterfaceLog) << "Tappedout: bad reply, http status" << httpStatus << "size" << data.size() << "message" - << errorMessage; + qCDebug(TappedOutInterfaceLog) << "Tappedout: bad reply, http status" << httpStatus << "size" << data.size() + << "message" << errorMessage; QMessageBox::critical(nullptr, tr("Error"), errorMessage); } @@ -98,7 +98,7 @@ struct CopyMainOrSide DeckList &mainboard, &sideboard; CopyMainOrSide(CardDatabase &_cardDatabase, DeckList &_mainboard, DeckList &_sideboard) - : cardDatabase(_cardDatabase), mainboard(_mainboard), sideboard(_sideboard){}; + : cardDatabase(_cardDatabase), mainboard(_mainboard), sideboard(_sideboard) {}; void operator()(const InnerDecklistNode *node, const DecklistCardNode *card) const { diff --git a/cockatrice/src/client/tapped_out_interface.h b/cockatrice/src/client/tapped_out_interface.h index f10d28555..f76d634d4 100644 --- a/cockatrice/src/client/tapped_out_interface.h +++ b/cockatrice/src/client/tapped_out_interface.h @@ -4,12 +4,12 @@ #include "../game/cards/card_database.h" #include "decklist.h" -#include #include +#include inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface.debug") -class QByteArray; + class QByteArray; class QNetworkAccessManager; class QNetworkReply; class DeckList; diff --git a/cockatrice/src/client/ui/window_main.cpp b/cockatrice/src/client/ui/window_main.cpp index 8154ca277..167e93e23 100644 --- a/cockatrice/src/client/ui/window_main.cpp +++ b/cockatrice/src/client/ui/window_main.cpp @@ -904,14 +904,16 @@ void MainWindow::startupConfigCheck() if (SettingsCache::instance().getClientVersion() == CLIENT_INFO_NOT_SET) { // no config found, 99% new clean install - qCDebug(WindowMainStartupVersionLog) << "Startup: old client version empty, assuming first start after clean install"; + qCDebug(WindowMainStartupVersionLog) + << "Startup: old client version empty, assuming first start after clean install"; alertForcedOracleRun(VERSION_STRING, false); SettingsCache::instance().downloads().resetToDefaultURLs(); // populate the download urls SettingsCache::instance().setClientVersion(VERSION_STRING); } else if (SettingsCache::instance().getClientVersion() != VERSION_STRING) { // config found, from another (presumably older) version - qCDebug(WindowMainStartupVersionLog) << "Startup: old client version" << SettingsCache::instance().getClientVersion() - << "differs, assuming first start after update"; + qCDebug(WindowMainStartupVersionLog) + << "Startup: old client version" << SettingsCache::instance().getClientVersion() + << "differs, assuming first start after update"; if (SettingsCache::instance().getNotifyAboutNewVersion()) { alertForcedOracleRun(VERSION_STRING, true); } else { diff --git a/cockatrice/src/dialogs/dlg_edit_avatar.h b/cockatrice/src/dialogs/dlg_edit_avatar.h index 0c868cc34..f8f020c58 100644 --- a/cockatrice/src/dialogs/dlg_edit_avatar.h +++ b/cockatrice/src/dialogs/dlg_edit_avatar.h @@ -8,7 +8,7 @@ inline Q_LOGGING_CATEGORY(DlgEditAvatarLog, "dlg_edit_avatar.debug") -class QLabel; + class QLabel; class QPushButton; class QCheckBox; diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index f4c631cd5..861090e5c 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -198,7 +198,8 @@ QString GeneralSettingsPage::languageName(const QString &lang) QString appNameHint = translationPrefix + "_" + lang; bool appTranslationLoaded = qTranslator.load(appNameHint, translationPath); if (!appTranslationLoaded) { - qCDebug(DlgSettingsLog) << "Unable to load" << translationPrefix << "translation" << appNameHint << "at" << translationPath; + qCDebug(DlgSettingsLog) << "Unable to load" << translationPrefix << "translation" << appNameHint << "at" + << translationPath; } return qTranslator.translate("i18n", DEFAULT_LANG_NAME); diff --git a/cockatrice/src/dialogs/dlg_tip_of_the_day.h b/cockatrice/src/dialogs/dlg_tip_of_the_day.h index 95fffabd8..e8ed152c7 100644 --- a/cockatrice/src/dialogs/dlg_tip_of_the_day.h +++ b/cockatrice/src/dialogs/dlg_tip_of_the_day.h @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/game/cards/card_database.cpp index 2000806df..cc0a0f15e 100644 --- a/cockatrice/src/game/cards/card_database.cpp +++ b/cockatrice/src/game/cards/card_database.cpp @@ -583,7 +583,8 @@ LoadStatus CardDatabase::loadCardDatabase(const QString &path) int msecs = startTime.msecsTo(QTime::currentTime()); qCDebug(CardDatabaseLoadingLog) << "[CardDatabase] loadCardDatabase(): Path =" << path - << "Status =" << tempLoadStatus << "Cards =" << cards.size() << "Sets =" << sets.size() << QString("%1ms").arg(msecs); + << "Status =" << tempLoadStatus << "Cards =" << cards.size() + << "Sets =" << sets.size() << QString("%1ms").arg(msecs); return tempLoadStatus; } diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index 0589adec8..1ed258f5a 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -102,7 +102,7 @@ void installNewTranslator() bool qtTranslationLoaded = qtTranslator->load(qtNameHint, qtTranslationPath); if (!qtTranslationLoaded) { - qCDebug(QtTranslatorDebug) << "aaUnable to load qt translation" << qtNameHint << "at" << qtTranslationPath; + qCDebug(QtTranslatorDebug) << "Unable to load qt translation" << qtNameHint << "at" << qtTranslationPath; } else { qCDebug(QtTranslatorDebug) << "Loaded qt translation" << qtNameHint << "at" << qtTranslationPath; } @@ -111,10 +111,11 @@ void installNewTranslator() QString appNameHint = translationPrefix + "_" + lang; bool appTranslationLoaded = qtTranslator->load(appNameHint, translationPath); if (!appTranslationLoaded) { - qCDebug(QtTranslatorDebug) << "aaUnable to load" << translationPrefix << "translation" << appNameHint << "at" + qCDebug(QtTranslatorDebug) << "Unable to load" << translationPrefix << "translation" << appNameHint << "at" << translationPath; } else { - qCDebug(QtTranslatorDebug) << "Loaded" << translationPrefix << "translation" << appNameHint << "at" << translationPath; + qCDebug(QtTranslatorDebug) << "Loaded" << translationPrefix << "translation" << appNameHint << "at" + << translationPath; } qApp->installTranslator(translator); }