jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-19 08:52:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lint.

Browse source
This commit is contained in:
Lukas Brübach 2025-01-17 11:42:33 +01:00
parent 710f7b0f07
commit 06d252e23a
12 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/client/network/release_channel.cpp
View file

@ -148,8 +148,8 @@ void StableReleaseChannel::releaseListFinished()
qCDebug(ReleaseChannelLog) << "Current hash=" << myHash << "update hash=" << shortHash; qCDebug(ReleaseChannelLog) << "Current hash=" << myHash << "update hash=" << shortHash;
qCDebug(ReleaseChannelLog) << "Got reply from release server, name=" << lastRelease->getName() qCDebug(ReleaseChannelLog) << "Got reply from release server, name=" << lastRelease->getName()
<< "desc=" << lastRelease->getDescriptionUrl() << "date=" << lastRelease->getPublishDate() << "desc=" << lastRelease->getDescriptionUrl()
<< "url=" << lastRelease->getDownloadUrl(); << "date=" << lastRelease->getPublishDate() << "url=" << lastRelease->getDownloadUrl();
const QString &tagName = resultMap["tag_name"].toString(); const QString &tagName = resultMap["tag_name"].toString();
QString url = QString(STABLETAG_URL) + tagName; 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->setName(QString("%1 (%2)").arg(resultMap["tag_name"].toString()).arg(shortHash));
lastRelease->setDescriptionUrl(QString(BETARELEASE_CHANGESURL).arg(VERSION_COMMIT, shortHash)); lastRelease->setDescriptionUrl(QString(BETARELEASE_CHANGESURL).arg(VERSION_COMMIT, shortHash));
qCDebug(ReleaseChannelLog) << "Got reply from release server, size=" << resultMap.size() << "name=" << lastRelease->getName() qCDebug(ReleaseChannelLog) << "Got reply from release server, size=" << resultMap.size()
<< "desc=" << lastRelease->getDescriptionUrl() << "commit=" << lastRelease->getCommitHash() << "name=" << lastRelease->getName() << "desc=" << lastRelease->getDescriptionUrl()
<< "date=" << lastRelease->getPublishDate(); << "commit=" << lastRelease->getCommitHash() << "date=" << lastRelease->getPublishDate();
QString betaBuildDownloadUrl = resultMap["assets_url"].toString(); QString betaBuildDownloadUrl = resultMap["assets_url"].toString();

2
cockatrice/src/client/network/spoiler_background_updater.h
View file

@ -2,9 +2,9 @@
#define COCKATRICE_SPOILER_DOWNLOADER_H #define COCKATRICE_SPOILER_DOWNLOADER_H
#include <QByteArray> #include <QByteArray>
#include <QLoggingCategory>
#include <QObject> #include <QObject>
#include <QProcess> #include <QProcess>
#include <QLoggingCategory>
inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater.debug"); inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater.debug");

2
cockatrice/src/client/sound_engine.h
View file

@ -2,11 +2,11 @@
#define SOUNDENGINE_H #define SOUNDENGINE_H
#include <QAudioOutput> #include <QAudioOutput>
#include <QLoggingCategory>
#include <QMap> #include <QMap>
#include <QMediaPlayer> #include <QMediaPlayer>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QLoggingCategory>
inline Q_LOGGING_CATEGORY(SoundEngineLog, "sound_engine.debug"); inline Q_LOGGING_CATEGORY(SoundEngineLog, "sound_engine.debug");

2
cockatrice/src/client/tabs/tab_game.h
View file

@ -9,8 +9,8 @@
#include "tab.h" #include "tab.h"
#include <QCompleter> #include <QCompleter>
#include <QMap>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QMap>
inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game.debug"); inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game.debug");

6
cockatrice/src/client/tapped_out_interface.cpp
View file

@ -57,8 +57,8 @@ void TappedOutInterface::queryFinished(QNetworkReply *reply)
} }
QString errorMessage = errorMessageList.join("\n"); QString errorMessage = errorMessageList.join("\n");
qCDebug(TappedOutInterfaceLog) << "Tappedout: bad reply, http status" << httpStatus << "size" << data.size() << "message" qCDebug(TappedOutInterfaceLog) << "Tappedout: bad reply, http status" << httpStatus << "size" << data.size()
<< errorMessage; << "message" << errorMessage;
QMessageBox::critical(nullptr, tr("Error"), errorMessage); QMessageBox::critical(nullptr, tr("Error"), errorMessage);
} }
@ -98,7 +98,7 @@ struct CopyMainOrSide
DeckList &mainboard, &sideboard; DeckList &mainboard, &sideboard;
CopyMainOrSide(CardDatabase &_cardDatabase, DeckList &_mainboard, DeckList &_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 void operator()(const InnerDecklistNode *node, const DecklistCardNode *card) const
{ {

4
cockatrice/src/client/tapped_out_interface.h
View file

@ -4,12 +4,12 @@
#include "../game/cards/card_database.h" #include "../game/cards/card_database.h"
#include "decklist.h" #include "decklist.h"
#include <QObject>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QObject>
inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface.debug") inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface.debug")
class QByteArray; class QByteArray;
class QNetworkAccessManager; class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class DeckList; class DeckList;

6
cockatrice/src/client/ui/window_main.cpp
View file

@ -904,13 +904,15 @@ void MainWindow::startupConfigCheck()
if (SettingsCache::instance().getClientVersion() == CLIENT_INFO_NOT_SET) { if (SettingsCache::instance().getClientVersion() == CLIENT_INFO_NOT_SET) {
// no config found, 99% new clean install // 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); alertForcedOracleRun(VERSION_STRING, false);
SettingsCache::instance().downloads().resetToDefaultURLs(); // populate the download urls SettingsCache::instance().downloads().resetToDefaultURLs(); // populate the download urls
SettingsCache::instance().setClientVersion(VERSION_STRING); SettingsCache::instance().setClientVersion(VERSION_STRING);
} else if (SettingsCache::instance().getClientVersion() != VERSION_STRING) { } else if (SettingsCache::instance().getClientVersion() != VERSION_STRING) {
// config found, from another (presumably older) version // config found, from another (presumably older) version
qCDebug(WindowMainStartupVersionLog) << "Startup: old client version" << SettingsCache::instance().getClientVersion() qCDebug(WindowMainStartupVersionLog)
<< "Startup: old client version" << SettingsCache::instance().getClientVersion()
<< "differs, assuming first start after update"; << "differs, assuming first start after update";
if (SettingsCache::instance().getNotifyAboutNewVersion()) { if (SettingsCache::instance().getNotifyAboutNewVersion()) {
alertForcedOracleRun(VERSION_STRING, true); alertForcedOracleRun(VERSION_STRING, true);

2
cockatrice/src/dialogs/dlg_edit_avatar.h
View file

@ -8,7 +8,7 @@
inline Q_LOGGING_CATEGORY(DlgEditAvatarLog, "dlg_edit_avatar.debug") inline Q_LOGGING_CATEGORY(DlgEditAvatarLog, "dlg_edit_avatar.debug")
class QLabel; class QLabel;
class QPushButton; class QPushButton;
class QCheckBox; class QCheckBox;

3
cockatrice/src/dialogs/dlg_settings.cpp
View file

@ -198,7 +198,8 @@ QString GeneralSettingsPage::languageName(const QString &lang)
QString appNameHint = translationPrefix + "_" + lang; QString appNameHint = translationPrefix + "_" + lang;
bool appTranslationLoaded = qTranslator.load(appNameHint, translationPath); bool appTranslationLoaded = qTranslator.load(appNameHint, translationPath);
if (!appTranslationLoaded) { 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); return qTranslator.translate("i18n", DEFAULT_LANG_NAME);

2
cockatrice/src/dialogs/dlg_tip_of_the_day.h
View file

@ -5,8 +5,8 @@
#include <QDialog> #include <QDialog>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLoggingCategory>
#include <QLineEdit> #include <QLineEdit>
#include <QLoggingCategory>
#include <QPushButton> #include <QPushButton>
#include <QVBoxLayout> #include <QVBoxLayout>

3
cockatrice/src/game/cards/card_database.cpp
View file

@ -583,7 +583,8 @@ LoadStatus CardDatabase::loadCardDatabase(const QString &path)
int msecs = startTime.msecsTo(QTime::currentTime()); int msecs = startTime.msecsTo(QTime::currentTime());
qCDebug(CardDatabaseLoadingLog) << "[CardDatabase] loadCardDatabase(): Path =" << path 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; return tempLoadStatus;
} }

7
cockatrice/src/main.cpp
View file

@ -102,7 +102,7 @@ void installNewTranslator()
bool qtTranslationLoaded = qtTranslator->load(qtNameHint, qtTranslationPath); bool qtTranslationLoaded = qtTranslator->load(qtNameHint, qtTranslationPath);
if (!qtTranslationLoaded) { if (!qtTranslationLoaded) {
qCDebug(QtTranslatorDebug) << "aaUnable to load qt translation" << qtNameHint << "at" << qtTranslationPath; qCDebug(QtTranslatorDebug) << "Unable to load qt translation" << qtNameHint << "at" << qtTranslationPath;
} else { } else {
qCDebug(QtTranslatorDebug) << "Loaded qt translation" << qtNameHint << "at" << qtTranslationPath; qCDebug(QtTranslatorDebug) << "Loaded qt translation" << qtNameHint << "at" << qtTranslationPath;
} }
@ -111,10 +111,11 @@ void installNewTranslator()
QString appNameHint = translationPrefix + "_" + lang; QString appNameHint = translationPrefix + "_" + lang;
bool appTranslationLoaded = qtTranslator->load(appNameHint, translationPath); bool appTranslationLoaded = qtTranslator->load(appNameHint, translationPath);
if (!appTranslationLoaded) { if (!appTranslationLoaded) {
qCDebug(QtTranslatorDebug) << "aaUnable to load" << translationPrefix << "translation" << appNameHint << "at" qCDebug(QtTranslatorDebug) << "Unable to load" << translationPrefix << "translation" << appNameHint << "at"
<< translationPath; << translationPath;
} else { } else {
qCDebug(QtTranslatorDebug) << "Loaded" << translationPrefix << "translation" << appNameHint << "at" << translationPath; qCDebug(QtTranslatorDebug) << "Loaded" << translationPrefix << "translation" << appNameHint << "at"
<< translationPath;
} }
qApp->installTranslator(translator); qApp->installTranslator(translator);
} }