From 70f29256fd1d675c97e5f8bfff187f5cd656110d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Wed, 10 Sep 2025 15:13:30 +0200 Subject: [PATCH] Lint. Took 10 minutes --- cockatrice/src/game/abstract_game.cpp | 3 +-- cockatrice/src/game/game.cpp | 1 - cockatrice/src/game/game.h | 1 + cockatrice/src/game/game_state.cpp | 1 + cockatrice/src/game/player/player_list_widget.cpp | 5 ++++- cockatrice/src/game/player/player_list_widget.h | 5 ++++- cockatrice/src/game/player/player_manager.cpp | 5 ++++- cockatrice/src/game/replay.cpp | 11 +++++------ cockatrice/src/game/replay.h | 3 ++- 9 files changed, 22 insertions(+), 13 deletions(-) diff --git a/cockatrice/src/game/abstract_game.cpp b/cockatrice/src/game/abstract_game.cpp index a047e3a51..505cd5fde 100644 --- a/cockatrice/src/game/abstract_game.cpp +++ b/cockatrice/src/game/abstract_game.cpp @@ -2,8 +2,7 @@ #include "player/player.h" -AbstractGame::AbstractGame(TabGame *_tab) - : tab(_tab) +AbstractGame::AbstractGame(TabGame *_tab) : tab(_tab) { gameMetaInfo = new GameMetaInfo(this); gameEventHandler = new GameEventHandler(this); diff --git a/cockatrice/src/game/game.cpp b/cockatrice/src/game/game.cpp index 1a429f3c2..89009f8d6 100644 --- a/cockatrice/src/game/game.cpp +++ b/cockatrice/src/game/game.cpp @@ -17,4 +17,3 @@ Game::Game(TabGame *_tab, playerManager = new PlayerManager(this, event.player_id(), event.judge(), event.spectator()); gameMetaInfo->setStarted(false); } - diff --git a/cockatrice/src/game/game.h b/cockatrice/src/game/game.h index d62090c27..123d18378 100644 --- a/cockatrice/src/game/game.h +++ b/cockatrice/src/game/game.h @@ -2,6 +2,7 @@ #define COCKATRICE_GAME_H #include "abstract_game.h" + #include class Game : public AbstractGame diff --git a/cockatrice/src/game/game_state.cpp b/cockatrice/src/game/game_state.cpp index dc656ff79..4d86a16d4 100644 --- a/cockatrice/src/game/game_state.cpp +++ b/cockatrice/src/game/game_state.cpp @@ -1,4 +1,5 @@ #include "game_state.h" + #include "abstract_game.h" GameState::GameState(AbstractGame *_game, diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp index f43974805..72bed247d 100644 --- a/cockatrice/src/game/player/player_list_widget.cpp +++ b/cockatrice/src/game/player/player_list_widget.cpp @@ -54,7 +54,10 @@ bool PlayerListTWI::operator<(const QTreeWidgetItem &other) const return data(4, Qt::UserRole + 1).toInt() < other.data(4, Qt::UserRole + 1).toInt(); } -PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor, AbstractClient *_client, AbstractGame *_game, QWidget *parent) +PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor, + AbstractClient *_client, + AbstractGame *_game, + QWidget *parent) : QTreeWidget(parent), tabSupervisor(_tabSupervisor), client(_client), game(_game), gameStarted(false) { readyIcon = QPixmap("theme:icons/ready_start"); diff --git a/cockatrice/src/game/player/player_list_widget.h b/cockatrice/src/game/player/player_list_widget.h index 6310c05ef..ef5ceb212 100644 --- a/cockatrice/src/game/player/player_list_widget.h +++ b/cockatrice/src/game/player/player_list_widget.h @@ -47,7 +47,10 @@ signals: void openMessageDialog(const QString &userName, bool focus); public: - PlayerListWidget(TabSupervisor *_tabSupervisor, AbstractClient *_client, AbstractGame *_game, QWidget *parent = nullptr); + PlayerListWidget(TabSupervisor *_tabSupervisor, + AbstractClient *_client, + AbstractGame *_game, + QWidget *parent = nullptr); void retranslateUi(); void setActivePlayer(int playerId); void setGameStarted(bool _gameStarted, bool resuming); diff --git a/cockatrice/src/game/player/player_manager.cpp b/cockatrice/src/game/player/player_manager.cpp index 9724c28b7..eb86fcace 100644 --- a/cockatrice/src/game/player/player_manager.cpp +++ b/cockatrice/src/game/player/player_manager.cpp @@ -3,7 +3,10 @@ #include "../abstract_game.h" #include "player.h" -PlayerManager::PlayerManager(AbstractGame *_game, int _localPlayerId, bool _localPlayerIsJudge, bool localPlayerIsSpectator) +PlayerManager::PlayerManager(AbstractGame *_game, + int _localPlayerId, + bool _localPlayerIsJudge, + bool localPlayerIsSpectator) : QObject(_game), game(_game), players(QMap()), localPlayerId(_localPlayerId), localPlayerIsJudge(_localPlayerIsJudge), localPlayerIsSpectator(localPlayerIsSpectator) { diff --git a/cockatrice/src/game/replay.cpp b/cockatrice/src/game/replay.cpp index 891d97df5..e52ed8a7c 100644 --- a/cockatrice/src/game/replay.cpp +++ b/cockatrice/src/game/replay.cpp @@ -2,11 +2,10 @@ #include "../client/tabs/tab_game.h" - Replay::Replay(TabGame *_tab, GameReplay *_replay) : AbstractGame(_tab) +Replay::Replay(TabGame *_tab, GameReplay *_replay) : AbstractGame(_tab) { - gameState = new GameState(this, 0, -1, tab->getTabSupervisor()->getIsLocalGame(), {}, false, - false, -1, false); - connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged); - playerManager = new PlayerManager(this, -1, false, true); - loadReplay(_replay); + gameState = new GameState(this, 0, -1, tab->getTabSupervisor()->getIsLocalGame(), {}, false, false, -1, false); + connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged); + playerManager = new PlayerManager(this, -1, false, true); + loadReplay(_replay); } diff --git a/cockatrice/src/game/replay.h b/cockatrice/src/game/replay.h index 2f7508a0d..bfad6731b 100644 --- a/cockatrice/src/game/replay.h +++ b/cockatrice/src/game/replay.h @@ -3,7 +3,8 @@ #include "abstract_game.h" -class Replay : public AbstractGame { +class Replay : public AbstractGame +{ Q_OBJECT public: