From 18a07274d4d775c070e16c0f6b7781a4be539365 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Wed, 18 Mar 2020 22:36:02 +0100 Subject: [PATCH] clangify everything with the new header sorting (#3908) --- cockatrice/src/abstractcarddragitem.cpp | 2 + cockatrice/src/abstractclient.cpp | 1 + cockatrice/src/abstractclient.h | 1 + cockatrice/src/abstractcounter.cpp | 2 + cockatrice/src/abstractgraphicsitem.cpp | 1 + cockatrice/src/arrowitem.cpp | 20 ++++----- cockatrice/src/arrowtarget.cpp | 1 + cockatrice/src/arrowtarget.h | 1 + cockatrice/src/carddatabase.cpp | 1 + cockatrice/src/carddatabasemodel.cpp | 2 + cockatrice/src/carddatabasemodel.h | 1 + .../src/carddbparser/carddatabaseparser.h | 4 +- cockatrice/src/carddbparser/cockatricexml3.h | 4 +- cockatrice/src/carddbparser/cockatricexml4.h | 4 +- cockatrice/src/carddragitem.cpp | 2 + cockatrice/src/cardframe.cpp | 3 +- cockatrice/src/cardframe.h | 4 +- cockatrice/src/cardinfopicture.cpp | 8 ++-- cockatrice/src/cardinfopicture.h | 4 +- cockatrice/src/cardinfotext.cpp | 1 + cockatrice/src/cardinfotext.h | 4 +- cockatrice/src/cardinfowidget.cpp | 5 ++- cockatrice/src/cardinfowidget.h | 4 +- cockatrice/src/carditem.cpp | 2 + cockatrice/src/cardlist.cpp | 1 + cockatrice/src/cardzone.cpp | 2 + cockatrice/src/cardzone.h | 1 + cockatrice/src/chatview/chatview.cpp | 2 + cockatrice/src/chatview/chatview.h | 1 + cockatrice/src/counter_general.cpp | 2 + cockatrice/src/deck_loader.cpp | 2 + cockatrice/src/decklistmodel.cpp | 2 + cockatrice/src/decklistmodel.h | 1 + cockatrice/src/deckstats_interface.cpp | 2 + cockatrice/src/deckstats_interface.h | 1 + cockatrice/src/deckview.cpp | 2 + cockatrice/src/deckview.h | 4 +- cockatrice/src/dlg_connect.cpp | 2 + cockatrice/src/dlg_connect.h | 1 + cockatrice/src/dlg_create_token.cpp | 15 +++---- cockatrice/src/dlg_creategame.cpp | 7 ++-- cockatrice/src/dlg_edit_avatar.cpp | 4 +- cockatrice/src/dlg_edit_password.cpp | 7 ++-- cockatrice/src/dlg_edit_tokens.cpp | 2 + cockatrice/src/dlg_edit_tokens.h | 1 + cockatrice/src/dlg_edit_user.cpp | 7 ++-- cockatrice/src/dlg_filter_games.cpp | 1 + cockatrice/src/dlg_filter_games.h | 1 + .../src/dlg_forgotpasswordchallenge.cpp | 7 ++-- cockatrice/src/dlg_forgotpasswordrequest.cpp | 7 ++-- cockatrice/src/dlg_forgotpasswordreset.cpp | 7 ++-- .../src/dlg_load_deck_from_clipboard.cpp | 2 + cockatrice/src/dlg_load_remote_deck.cpp | 2 + cockatrice/src/dlg_register.cpp | 9 ++-- cockatrice/src/dlg_settings.cpp | 2 + cockatrice/src/dlg_tip_of_the_day.cpp | 9 ++-- cockatrice/src/dlg_update.cpp | 24 +++++------ cockatrice/src/dlg_update.h | 4 +- cockatrice/src/dlg_viewlog.cpp | 1 + cockatrice/src/filter_string.cpp | 1 + cockatrice/src/filtertree.cpp | 1 + cockatrice/src/filtertree.h | 1 + cockatrice/src/filtertreemodel.cpp | 2 + cockatrice/src/gamescene.cpp | 2 + cockatrice/src/gameselector.cpp | 2 + cockatrice/src/gameselector.h | 1 + cockatrice/src/gamesmodel.cpp | 1 + cockatrice/src/gamesmodel.h | 1 + cockatrice/src/gameview.cpp | 2 + cockatrice/src/handcounter.cpp | 2 + cockatrice/src/handcounter.h | 1 + cockatrice/src/handle_public_servers.cpp | 2 + cockatrice/src/handzone.cpp | 5 ++- cockatrice/src/keysignals.cpp | 1 + cockatrice/src/localclient.cpp | 2 +- cockatrice/src/localserver.cpp | 1 + cockatrice/src/localserverinterface.cpp | 2 + cockatrice/src/logger.cpp | 1 + cockatrice/src/main.cpp | 2 + cockatrice/src/messagelogwidget.cpp | 5 ++- cockatrice/src/pending_command.h | 1 + cockatrice/src/phasestoolbar.cpp | 5 +-- cockatrice/src/phasestoolbar.h | 1 + cockatrice/src/pictureloader.cpp | 1 + cockatrice/src/pictureloader.h | 4 +- cockatrice/src/pilezone.cpp | 5 ++- cockatrice/src/pixmapgenerator.cpp | 2 + cockatrice/src/pixmapgenerator.h | 4 +- cockatrice/src/player.cpp | 31 +++++++------- cockatrice/src/player.h | 1 + cockatrice/src/playerlistwidget.cpp | 9 ++-- cockatrice/src/playertarget.cpp | 2 + cockatrice/src/playertarget.h | 1 + cockatrice/src/releasechannel.cpp | 1 + cockatrice/src/remoteclient.cpp | 2 + cockatrice/src/remoteclient.h | 1 + cockatrice/src/remotedecklist_treewidget.cpp | 9 ++-- .../src/remotereplaylist_treewidget.cpp | 9 ++-- cockatrice/src/remotereplaylist_treewidget.h | 1 + cockatrice/src/replay_timeline_widget.cpp | 1 + cockatrice/src/selectzone.cpp | 2 + cockatrice/src/sequenceEdit/sequenceedit.cpp | 2 + cockatrice/src/setsmodel.h | 1 + cockatrice/src/settings/downloadsettings.cpp | 1 + cockatrice/src/settings/downloadsettings.h | 1 + .../src/settings/gamefilterssettings.cpp | 1 + cockatrice/src/settings/layoutssettings.h | 1 + cockatrice/src/settings/serverssettings.cpp | 1 + cockatrice/src/settings/serverssettings.h | 1 + cockatrice/src/settingscache.cpp | 1 + cockatrice/src/settingscache.h | 1 + cockatrice/src/shortcutssettings.cpp | 1 + cockatrice/src/soundengine.cpp | 1 + cockatrice/src/spoilerbackgroundupdater.cpp | 13 +++--- cockatrice/src/stackzone.cpp | 5 ++- cockatrice/src/tab.cpp | 2 + cockatrice/src/tab_admin.cpp | 5 ++- cockatrice/src/tab_admin.h | 1 + cockatrice/src/tab_deck_storage.cpp | 21 +++++----- cockatrice/src/tab_replays.cpp | 19 +++++---- cockatrice/src/tab_server.h | 1 + cockatrice/src/tab_supervisor.cpp | 21 +++++----- cockatrice/src/tab_supervisor.h | 1 + cockatrice/src/tablezone.cpp | 5 +-- cockatrice/src/tappedout_interface.cpp | 2 + cockatrice/src/tappedout_interface.h | 1 + cockatrice/src/thememanager.cpp | 2 + cockatrice/src/tip_of_the_day.cpp | 4 +- cockatrice/src/update_downloader.cpp | 4 +- cockatrice/src/user_context_menu.cpp | 28 ++++++------- cockatrice/src/user_context_menu.h | 1 + cockatrice/src/userconnection_information.cpp | 2 + cockatrice/src/userinfobox.cpp | 8 ++-- cockatrice/src/userlist.h | 1 + cockatrice/src/window_main.cpp | 42 +++++++++---------- cockatrice/src/window_main.h | 6 +-- cockatrice/src/zoneviewwidget.cpp | 7 ++-- cockatrice/src/zoneviewzone.cpp | 2 + cockatrice/src/zoneviewzone.h | 1 + common/decklist.cpp | 1 + common/decklist.h | 1 - common/expression.cpp | 1 + common/featureset.cpp | 1 + common/get_pb_extension.cpp | 1 + common/rng_abstract.cpp | 1 + common/rng_sfmt.cpp | 1 + common/rng_sfmt.h | 1 + common/room_message_type.h | 1 + common/server.cpp | 2 + common/server.h | 1 + common/server_abstractuserinterface.cpp | 2 + common/server_abstractuserinterface.h | 1 + common/server_arrow.cpp | 1 + common/server_card.cpp | 1 + common/server_card.h | 1 + common/server_cardzone.cpp | 2 + common/server_cardzone.h | 1 + common/server_counter.cpp | 1 + common/server_counter.h | 1 + common/server_database_interface.h | 1 + common/server_game.cpp | 2 + common/server_game.h | 1 + common/server_metatypes.h | 4 +- common/server_player.cpp | 39 +++++++++-------- common/server_player.h | 6 +-- common/server_protocolhandler.cpp | 2 + common/server_protocolhandler.h | 1 + common/server_remoteuserinterface.cpp | 1 + common/server_response_containers.cpp | 2 + common/server_response_containers.h | 1 + common/server_room.cpp | 9 ++-- common/server_room.h | 1 + common/serverinfo_user_container.cpp | 1 + common/user_level.h | 1 + oracle/src/main.cpp | 11 ++--- oracle/src/oracleimporter.cpp | 4 +- oracle/src/oraclewizard.cpp | 13 +++--- oracle/src/pagetemplates.cpp | 7 ++-- servatrice/src/isl_interface.cpp | 11 ++--- servatrice/src/isl_interface.h | 1 + servatrice/src/main.cpp | 16 +++---- servatrice/src/passwordhasher.cpp | 1 + servatrice/src/servatrice.cpp | 2 + servatrice/src/servatrice.h | 1 + servatrice/src/servatrice_connection_pool.cpp | 2 + .../src/servatrice_database_interface.cpp | 2 + .../src/servatrice_database_interface.h | 6 +-- servatrice/src/server_logger.cpp | 2 + servatrice/src/serversocketinterface.cpp | 6 +-- servatrice/src/serversocketinterface.h | 1 + servatrice/src/settingscache.cpp | 1 + servatrice/src/signalhandler.cpp | 5 ++- 192 files changed, 481 insertions(+), 282 deletions(-) diff --git a/cockatrice/src/abstractcarddragitem.cpp b/cockatrice/src/abstractcarddragitem.cpp index 7d5a3ac6..7c2b0c3f 100644 --- a/cockatrice/src/abstractcarddragitem.cpp +++ b/cockatrice/src/abstractcarddragitem.cpp @@ -1,5 +1,7 @@ #include "abstractcarddragitem.h" + #include "carddatabase.h" + #include #include #include diff --git a/cockatrice/src/abstractclient.cpp b/cockatrice/src/abstractclient.cpp index 9a700dbe..abd1ec0d 100644 --- a/cockatrice/src/abstractclient.cpp +++ b/cockatrice/src/abstractclient.cpp @@ -19,6 +19,7 @@ #include "pb/event_user_message.pb.h" #include "pb/server_message.pb.h" #include "pending_command.h" + #include AbstractClient::AbstractClient(QObject *parent) : QObject(parent), nextCmdId(0), status(StatusDisconnected) diff --git a/cockatrice/src/abstractclient.h b/cockatrice/src/abstractclient.h index 307da1f4..75956f76 100644 --- a/cockatrice/src/abstractclient.h +++ b/cockatrice/src/abstractclient.h @@ -3,6 +3,7 @@ #include "pb/response.pb.h" #include "pb/serverinfo_user.pb.h" + #include #include #include diff --git a/cockatrice/src/abstractcounter.cpp b/cockatrice/src/abstractcounter.cpp index fd80e421..3050803e 100644 --- a/cockatrice/src/abstractcounter.cpp +++ b/cockatrice/src/abstractcounter.cpp @@ -1,9 +1,11 @@ #include "abstractcounter.h" + #include "expression.h" #include "pb/command_inc_counter.pb.h" #include "pb/command_set_counter.pb.h" #include "player.h" #include "settingscache.h" + #include #include #include diff --git a/cockatrice/src/abstractgraphicsitem.cpp b/cockatrice/src/abstractgraphicsitem.cpp index 1eef22c8..e6a64646 100644 --- a/cockatrice/src/abstractgraphicsitem.cpp +++ b/cockatrice/src/abstractgraphicsitem.cpp @@ -1,4 +1,5 @@ #include "abstractgraphicsitem.h" + #include void AbstractGraphicsItem::paintNumberEllipse(int number, diff --git a/cockatrice/src/arrowitem.cpp b/cockatrice/src/arrowitem.cpp index d571eaa0..47062bc4 100644 --- a/cockatrice/src/arrowitem.cpp +++ b/cockatrice/src/arrowitem.cpp @@ -1,22 +1,22 @@ #define _USE_MATH_DEFINES -#include - #include "arrowitem.h" + #include "carddatabase.h" #include "carditem.h" #include "cardzone.h" -#include "player.h" -#include "playertarget.h" -#include "settingscache.h" -#include -#include -#include -#include - #include "color.h" #include "pb/command_attach_card.pb.h" #include "pb/command_create_arrow.pb.h" #include "pb/command_delete_arrow.pb.h" +#include "player.h" +#include "playertarget.h" +#include "settingscache.h" + +#include +#include +#include +#include +#include ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color) : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), color(_color), diff --git a/cockatrice/src/arrowtarget.cpp b/cockatrice/src/arrowtarget.cpp index f20405a5..f0123f84 100644 --- a/cockatrice/src/arrowtarget.cpp +++ b/cockatrice/src/arrowtarget.cpp @@ -1,4 +1,5 @@ #include "arrowtarget.h" + #include "arrowitem.h" #include "player.h" diff --git a/cockatrice/src/arrowtarget.h b/cockatrice/src/arrowtarget.h index 741fda83..bbe0f013 100644 --- a/cockatrice/src/arrowtarget.h +++ b/cockatrice/src/arrowtarget.h @@ -2,6 +2,7 @@ #define ARROWTARGET_H #include "abstractgraphicsitem.h" + #include class Player; diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp index 2417a15e..99dfdc63 100644 --- a/cockatrice/src/carddatabase.cpp +++ b/cockatrice/src/carddatabase.cpp @@ -1,4 +1,5 @@ #include "carddatabase.h" + #include "carddbparser/cockatricexml3.h" #include "carddbparser/cockatricexml4.h" #include "game_specific_terms.h" diff --git a/cockatrice/src/carddatabasemodel.cpp b/cockatrice/src/carddatabasemodel.cpp index 87f6a9fb..553b87f4 100644 --- a/cockatrice/src/carddatabasemodel.cpp +++ b/cockatrice/src/carddatabasemodel.cpp @@ -1,5 +1,7 @@ #include "carddatabasemodel.h" + #include "filtertree.h" + #include #define CARDDBMODEL_COLUMNS 6 diff --git a/cockatrice/src/carddatabasemodel.h b/cockatrice/src/carddatabasemodel.h index 7c993d53..9c07711d 100644 --- a/cockatrice/src/carddatabasemodel.h +++ b/cockatrice/src/carddatabasemodel.h @@ -3,6 +3,7 @@ #include "carddatabase.h" #include "filter_string.h" + #include #include #include diff --git a/cockatrice/src/carddbparser/carddatabaseparser.h b/cockatrice/src/carddbparser/carddatabaseparser.h index e8b46f95..a353db4c 100644 --- a/cockatrice/src/carddbparser/carddatabaseparser.h +++ b/cockatrice/src/carddbparser/carddatabaseparser.h @@ -1,11 +1,11 @@ #ifndef CARDDATABASE_PARSER_H #define CARDDATABASE_PARSER_H +#include "../carddatabase.h" + #include #include -#include "../carddatabase.h" - class ICardDatabaseParser : public QObject { public: diff --git a/cockatrice/src/carddbparser/cockatricexml3.h b/cockatrice/src/carddbparser/cockatricexml3.h index 109832cf..1d4b6c8f 100644 --- a/cockatrice/src/carddbparser/cockatricexml3.h +++ b/cockatrice/src/carddbparser/cockatricexml3.h @@ -1,10 +1,10 @@ #ifndef COCKATRICE_XML3_H #define COCKATRICE_XML3_H -#include - #include "carddatabaseparser.h" +#include + class CockatriceXml3Parser : public ICardDatabaseParser { Q_OBJECT diff --git a/cockatrice/src/carddbparser/cockatricexml4.h b/cockatrice/src/carddbparser/cockatricexml4.h index cc37c4f3..11f9ac59 100644 --- a/cockatrice/src/carddbparser/cockatricexml4.h +++ b/cockatrice/src/carddbparser/cockatricexml4.h @@ -1,10 +1,10 @@ #ifndef COCKATRICE_XML4_H #define COCKATRICE_XML4_H -#include - #include "carddatabaseparser.h" +#include + class CockatriceXml4Parser : public ICardDatabaseParser { Q_OBJECT diff --git a/cockatrice/src/carddragitem.cpp b/cockatrice/src/carddragitem.cpp index c92924bd..f70e1e9c 100644 --- a/cockatrice/src/carddragitem.cpp +++ b/cockatrice/src/carddragitem.cpp @@ -1,9 +1,11 @@ #include "carddragitem.h" + #include "carditem.h" #include "cardzone.h" #include "gamescene.h" #include "tablezone.h" #include "zoneviewzone.h" + #include #include #include diff --git a/cockatrice/src/cardframe.cpp b/cockatrice/src/cardframe.cpp index fd1d0873..73b59f4d 100644 --- a/cockatrice/src/cardframe.cpp +++ b/cockatrice/src/cardframe.cpp @@ -1,5 +1,3 @@ -#include - #include "cardframe.h" #include "cardinfopicture.h" @@ -10,6 +8,7 @@ #include #include +#include CardFrame::CardFrame(const QString &cardName, QWidget *parent) : QTabWidget(parent), info(nullptr), cardTextOnly(false) { diff --git a/cockatrice/src/cardframe.h b/cockatrice/src/cardframe.h index 5023fd70..6e11c912 100644 --- a/cockatrice/src/cardframe.h +++ b/cockatrice/src/cardframe.h @@ -1,10 +1,10 @@ #ifndef CARDFRAME_H #define CARDFRAME_H -#include - #include "carddatabase.h" +#include + class AbstractCardItem; class CardInfoPicture; class CardInfoText; diff --git a/cockatrice/src/cardinfopicture.cpp b/cockatrice/src/cardinfopicture.cpp index 8db9a912..2f255378 100644 --- a/cockatrice/src/cardinfopicture.cpp +++ b/cockatrice/src/cardinfopicture.cpp @@ -1,13 +1,13 @@ #include "cardinfopicture.h" -#include -#include -#include - #include "carditem.h" #include "main.h" #include "pictureloader.h" +#include +#include +#include + CardInfoPicture::CardInfoPicture(QWidget *parent) : QWidget(parent), info(nullptr), pixmapDirty(true) { setMinimumHeight(100); diff --git a/cockatrice/src/cardinfopicture.h b/cockatrice/src/cardinfopicture.h index 39b59deb..f81f889a 100644 --- a/cockatrice/src/cardinfopicture.h +++ b/cockatrice/src/cardinfopicture.h @@ -1,10 +1,10 @@ #ifndef CARDINFOPICTURE_H #define CARDINFOPICTURE_H -#include - #include "carddatabase.h" +#include + class AbstractCardItem; class CardInfoPicture : public QWidget diff --git a/cockatrice/src/cardinfotext.cpp b/cockatrice/src/cardinfotext.cpp index 38caab8c..faf5da9f 100644 --- a/cockatrice/src/cardinfotext.cpp +++ b/cockatrice/src/cardinfotext.cpp @@ -1,4 +1,5 @@ #include "cardinfotext.h" + #include "carditem.h" #include "game_specific_terms.h" #include "main.h" diff --git a/cockatrice/src/cardinfotext.h b/cockatrice/src/cardinfotext.h index 882e542a..bdeb0569 100644 --- a/cockatrice/src/cardinfotext.h +++ b/cockatrice/src/cardinfotext.h @@ -1,9 +1,9 @@ #ifndef CARDINFOTEXT_H #define CARDINFOTEXT_H -#include - #include "carddatabase.h" + +#include class QLabel; class QTextEdit; diff --git a/cockatrice/src/cardinfowidget.cpp b/cockatrice/src/cardinfowidget.cpp index eabf5003..cb864c4f 100644 --- a/cockatrice/src/cardinfowidget.cpp +++ b/cockatrice/src/cardinfowidget.cpp @@ -1,11 +1,12 @@ -#include +#include "cardinfowidget.h" #include "cardinfopicture.h" #include "cardinfotext.h" -#include "cardinfowidget.h" #include "carditem.h" #include "main.h" + #include +#include #if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)) #include #else diff --git a/cockatrice/src/cardinfowidget.h b/cockatrice/src/cardinfowidget.h index 7e986b75..894635c7 100644 --- a/cockatrice/src/cardinfowidget.h +++ b/cockatrice/src/cardinfowidget.h @@ -1,12 +1,12 @@ #ifndef CARDINFOWIDGET_H #define CARDINFOWIDGET_H +#include "carddatabase.h" + #include #include #include -#include "carddatabase.h" - class CardInfoPicture; class CardInfoText; class AbstractCardItem; diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/carditem.cpp index 20bf2fe1..088c8cf4 100644 --- a/cockatrice/src/carditem.cpp +++ b/cockatrice/src/carditem.cpp @@ -1,4 +1,5 @@ #include "carditem.h" + #include "arrowitem.h" #include "carddatabase.h" #include "carddragitem.h" @@ -11,6 +12,7 @@ #include "tab_game.h" #include "tablezone.h" #include "zoneviewzone.h" + #include #include #include diff --git a/cockatrice/src/cardlist.cpp b/cockatrice/src/cardlist.cpp index 01ec445d..d0347df5 100644 --- a/cockatrice/src/cardlist.cpp +++ b/cockatrice/src/cardlist.cpp @@ -1,4 +1,5 @@ #include "cardlist.h" + #include "carddatabase.h" #include "carditem.h" diff --git a/cockatrice/src/cardzone.cpp b/cockatrice/src/cardzone.cpp index 80f8d8ed..7010e56a 100644 --- a/cockatrice/src/cardzone.cpp +++ b/cockatrice/src/cardzone.cpp @@ -1,9 +1,11 @@ #include "cardzone.h" + #include "carditem.h" #include "pb/command_move_card.pb.h" #include "pb/serverinfo_user.pb.h" #include "player.h" #include "zoneviewzone.h" + #include #include #include diff --git a/cockatrice/src/cardzone.h b/cockatrice/src/cardzone.h index 4484a1b0..e64fef02 100644 --- a/cockatrice/src/cardzone.h +++ b/cockatrice/src/cardzone.h @@ -4,6 +4,7 @@ #include "abstractgraphicsitem.h" #include "cardlist.h" #include "translation.h" + #include class Player; diff --git a/cockatrice/src/chatview/chatview.cpp b/cockatrice/src/chatview/chatview.cpp index 631c0838..e5f3fc4b 100644 --- a/cockatrice/src/chatview/chatview.cpp +++ b/cockatrice/src/chatview/chatview.cpp @@ -1,10 +1,12 @@ #include "chatview.h" + #include "../pixmapgenerator.h" #include "../settingscache.h" #include "../soundengine.h" #include "../tab_userlists.h" #include "../user_context_menu.h" #include "user_level.h" + #include #include #include diff --git a/cockatrice/src/chatview/chatview.h b/cockatrice/src/chatview/chatview.h index e78b837e..52d38abc 100644 --- a/cockatrice/src/chatview/chatview.h +++ b/cockatrice/src/chatview/chatview.h @@ -6,6 +6,7 @@ #include "room_message_type.h" #include "user_level.h" #include "userlistProxy.h" + #include #include #include diff --git a/cockatrice/src/counter_general.cpp b/cockatrice/src/counter_general.cpp index 1c57e9e5..e33ce58a 100644 --- a/cockatrice/src/counter_general.cpp +++ b/cockatrice/src/counter_general.cpp @@ -1,6 +1,8 @@ #include "counter_general.h" + #include "abstractgraphicsitem.h" #include "pixmapgenerator.h" + #include GeneralCounter::GeneralCounter(Player *_player, diff --git a/cockatrice/src/deck_loader.cpp b/cockatrice/src/deck_loader.cpp index 39214e34..8f8cd38c 100644 --- a/cockatrice/src/deck_loader.cpp +++ b/cockatrice/src/deck_loader.cpp @@ -1,7 +1,9 @@ #include "deck_loader.h" + #include "carddatabase.h" #include "decklist.h" #include "main.h" + #include #include #include diff --git a/cockatrice/src/decklistmodel.cpp b/cockatrice/src/decklistmodel.cpp index 7b66a927..2b55101d 100644 --- a/cockatrice/src/decklistmodel.cpp +++ b/cockatrice/src/decklistmodel.cpp @@ -1,8 +1,10 @@ #include "decklistmodel.h" + #include "carddatabase.h" #include "deck_loader.h" #include "main.h" #include "settingscache.h" + #include #include #include diff --git a/cockatrice/src/decklistmodel.h b/cockatrice/src/decklistmodel.h index 19a0aeca..01cf6178 100644 --- a/cockatrice/src/decklistmodel.h +++ b/cockatrice/src/decklistmodel.h @@ -2,6 +2,7 @@ #define DECKLISTMODEL_H #include "decklist.h" + #include #include diff --git a/cockatrice/src/deckstats_interface.cpp b/cockatrice/src/deckstats_interface.cpp index 3b410ad2..44c14fab 100644 --- a/cockatrice/src/deckstats_interface.cpp +++ b/cockatrice/src/deckstats_interface.cpp @@ -1,5 +1,7 @@ #include "deckstats_interface.h" + #include "decklist.h" + #include #include #include diff --git a/cockatrice/src/deckstats_interface.h b/cockatrice/src/deckstats_interface.h index 34d87509..6738c35b 100644 --- a/cockatrice/src/deckstats_interface.h +++ b/cockatrice/src/deckstats_interface.h @@ -3,6 +3,7 @@ #include "carddatabase.h" #include "decklist.h" + #include class QByteArray; diff --git a/cockatrice/src/deckview.cpp b/cockatrice/src/deckview.cpp index 0529eff8..15a677fd 100644 --- a/cockatrice/src/deckview.cpp +++ b/cockatrice/src/deckview.cpp @@ -1,9 +1,11 @@ #include "deckview.h" + #include "carddatabase.h" #include "decklist.h" #include "main.h" #include "settingscache.h" #include "thememanager.h" + #include #include #include diff --git a/cockatrice/src/deckview.h b/cockatrice/src/deckview.h index 5066c87f..8aab1dc2 100644 --- a/cockatrice/src/deckview.h +++ b/cockatrice/src/deckview.h @@ -2,14 +2,14 @@ #define DECKVIEW_H #include "abstractcarddragitem.h" +#include "pb/move_card_to_zone.pb.h" + #include #include #include #include #include -#include "pb/move_card_to_zone.pb.h" - class DeckList; class InnerDecklistNode; class CardInfo; diff --git a/cockatrice/src/dlg_connect.cpp b/cockatrice/src/dlg_connect.cpp index cf01777a..8cfe86c5 100644 --- a/cockatrice/src/dlg_connect.cpp +++ b/cockatrice/src/dlg_connect.cpp @@ -1,6 +1,8 @@ #include "dlg_connect.h" + #include "settingscache.h" #include "userconnection_information.h" + #include #include #include diff --git a/cockatrice/src/dlg_connect.h b/cockatrice/src/dlg_connect.h index 179f6f3d..f7f70b63 100644 --- a/cockatrice/src/dlg_connect.h +++ b/cockatrice/src/dlg_connect.h @@ -3,6 +3,7 @@ #include "handle_public_servers.h" #include "userconnection_information.h" + #include #include diff --git a/cockatrice/src/dlg_create_token.cpp b/cockatrice/src/dlg_create_token.cpp index 6b2a3eab..5007ad9a 100644 --- a/cockatrice/src/dlg_create_token.cpp +++ b/cockatrice/src/dlg_create_token.cpp @@ -1,3 +1,11 @@ +#include "dlg_create_token.h" + +#include "carddatabasemodel.h" +#include "cardinfopicture.h" +#include "decklist.h" +#include "main.h" +#include "settingscache.h" + #include #include #include @@ -12,13 +20,6 @@ #include #include -#include "carddatabasemodel.h" -#include "cardinfopicture.h" -#include "decklist.h" -#include "dlg_create_token.h" -#include "main.h" -#include "settingscache.h" - DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent) : QDialog(parent), predefinedTokens(_predefinedTokens) { diff --git a/cockatrice/src/dlg_creategame.cpp b/cockatrice/src/dlg_creategame.cpp index df0280f1..847b33dd 100644 --- a/cockatrice/src/dlg_creategame.cpp +++ b/cockatrice/src/dlg_creategame.cpp @@ -1,6 +1,10 @@ #include "dlg_creategame.h" + +#include "pb/serverinfo_game.pb.h" +#include "pending_command.h" #include "settingscache.h" #include "tab_room.h" + #include #include #include @@ -15,9 +19,6 @@ #include #include -#include "pb/serverinfo_game.pb.h" -#include "pending_command.h" - void DlgCreateGame::sharedCtor() { rememberGameSettings = new QCheckBox(tr("Re&member settings")); diff --git a/cockatrice/src/dlg_edit_avatar.cpp b/cockatrice/src/dlg_edit_avatar.cpp index c6a1818f..48aae67d 100644 --- a/cockatrice/src/dlg_edit_avatar.cpp +++ b/cockatrice/src/dlg_edit_avatar.cpp @@ -1,3 +1,5 @@ +#include "dlg_edit_avatar.h" + #include #include #include @@ -8,8 +10,6 @@ #include #include -#include "dlg_edit_avatar.h" - DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent) { imageLabel = new QLabel(tr("No image chosen.")); diff --git a/cockatrice/src/dlg_edit_password.cpp b/cockatrice/src/dlg_edit_password.cpp index 8cae0bc0..9ead5fe7 100644 --- a/cockatrice/src/dlg_edit_password.cpp +++ b/cockatrice/src/dlg_edit_password.cpp @@ -1,12 +1,13 @@ +#include "dlg_edit_password.h" + +#include "settingscache.h" + #include #include #include #include #include -#include "dlg_edit_password.h" -#include "settingscache.h" - DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dlg_edit_tokens.cpp b/cockatrice/src/dlg_edit_tokens.cpp index 9df57705..a8836837 100644 --- a/cockatrice/src/dlg_edit_tokens.cpp +++ b/cockatrice/src/dlg_edit_tokens.cpp @@ -1,7 +1,9 @@ #include "dlg_edit_tokens.h" + #include "carddatabase.h" #include "carddatabasemodel.h" #include "main.h" + #include #include #include diff --git a/cockatrice/src/dlg_edit_tokens.h b/cockatrice/src/dlg_edit_tokens.h index f576090c..2c7c8ebc 100644 --- a/cockatrice/src/dlg_edit_tokens.h +++ b/cockatrice/src/dlg_edit_tokens.h @@ -2,6 +2,7 @@ #define DLG_EDIT_TOKENS_H #include "carddatabase.h" + #include class QModelIndex; diff --git a/cockatrice/src/dlg_edit_user.cpp b/cockatrice/src/dlg_edit_user.cpp index 23f16f7f..d94b59dd 100644 --- a/cockatrice/src/dlg_edit_user.cpp +++ b/cockatrice/src/dlg_edit_user.cpp @@ -1,12 +1,13 @@ +#include "dlg_edit_user.h" + +#include "settingscache.h" + #include #include #include #include #include -#include "dlg_edit_user.h" -#include "settingscache.h" - DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QString realName) : QDialog(parent) { emailLabel = new QLabel(tr("Email:")); diff --git a/cockatrice/src/dlg_filter_games.cpp b/cockatrice/src/dlg_filter_games.cpp index 795f7def..c7649705 100644 --- a/cockatrice/src/dlg_filter_games.cpp +++ b/cockatrice/src/dlg_filter_games.cpp @@ -1,4 +1,5 @@ #include "dlg_filter_games.h" + #include #include #include diff --git a/cockatrice/src/dlg_filter_games.h b/cockatrice/src/dlg_filter_games.h index 7e0158f0..1f37bf31 100644 --- a/cockatrice/src/dlg_filter_games.h +++ b/cockatrice/src/dlg_filter_games.h @@ -2,6 +2,7 @@ #define DLG_FILTER_GAMES_H #include "gamesmodel.h" + #include #include #include diff --git a/cockatrice/src/dlg_forgotpasswordchallenge.cpp b/cockatrice/src/dlg_forgotpasswordchallenge.cpp index 8ae4404c..c92bb09a 100644 --- a/cockatrice/src/dlg_forgotpasswordchallenge.cpp +++ b/cockatrice/src/dlg_forgotpasswordchallenge.cpp @@ -1,3 +1,7 @@ +#include "dlg_forgotpasswordchallenge.h" + +#include "settingscache.h" + #include #include #include @@ -6,9 +10,6 @@ #include #include -#include "dlg_forgotpasswordchallenge.h" -#include "settingscache.h" - DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dlg_forgotpasswordrequest.cpp b/cockatrice/src/dlg_forgotpasswordrequest.cpp index 38dec831..f4ce26f8 100644 --- a/cockatrice/src/dlg_forgotpasswordrequest.cpp +++ b/cockatrice/src/dlg_forgotpasswordrequest.cpp @@ -1,3 +1,7 @@ +#include "dlg_forgotpasswordrequest.h" + +#include "settingscache.h" + #include #include #include @@ -6,9 +10,6 @@ #include #include -#include "dlg_forgotpasswordrequest.h" -#include "settingscache.h" - DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dlg_forgotpasswordreset.cpp b/cockatrice/src/dlg_forgotpasswordreset.cpp index a699cb4b..fc01aabb 100644 --- a/cockatrice/src/dlg_forgotpasswordreset.cpp +++ b/cockatrice/src/dlg_forgotpasswordreset.cpp @@ -1,3 +1,7 @@ +#include "dlg_forgotpasswordreset.h" + +#include "settingscache.h" + #include #include #include @@ -6,9 +10,6 @@ #include #include -#include "dlg_forgotpasswordreset.h" -#include "settingscache.h" - DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/dlg_load_deck_from_clipboard.cpp index 32d1dec4..2dcdb723 100644 --- a/cockatrice/src/dlg_load_deck_from_clipboard.cpp +++ b/cockatrice/src/dlg_load_deck_from_clipboard.cpp @@ -1,6 +1,8 @@ #include "dlg_load_deck_from_clipboard.h" + #include "deck_loader.h" #include "settingscache.h" + #include #include #include diff --git a/cockatrice/src/dlg_load_remote_deck.cpp b/cockatrice/src/dlg_load_remote_deck.cpp index cd2c889d..cd32e0f6 100644 --- a/cockatrice/src/dlg_load_remote_deck.cpp +++ b/cockatrice/src/dlg_load_remote_deck.cpp @@ -1,6 +1,8 @@ #include "dlg_load_remote_deck.h" + #include "main.h" #include "remotedecklist_treewidget.h" + #include #include #include diff --git a/cockatrice/src/dlg_register.cpp b/cockatrice/src/dlg_register.cpp index b7f54b20..d2b33040 100644 --- a/cockatrice/src/dlg_register.cpp +++ b/cockatrice/src/dlg_register.cpp @@ -1,3 +1,8 @@ +#include "dlg_register.h" + +#include "pb/serverinfo_user.pb.h" +#include "settingscache.h" + #include #include #include @@ -6,10 +11,6 @@ #include #include -#include "dlg_register.h" -#include "pb/serverinfo_user.pb.h" -#include "settingscache.h" - DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) { hostLabel = new QLabel(tr("&Host:")); diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index 83c7c200..e881a31b 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/cockatrice/src/dlg_settings.cpp @@ -1,4 +1,5 @@ #include "dlg_settings.h" + #include "carddatabase.h" #include "main.h" #include "releasechannel.h" @@ -7,6 +8,7 @@ #include "soundengine.h" #include "spoilerbackgroundupdater.h" #include "thememanager.h" + #include #include #include diff --git a/cockatrice/src/dlg_tip_of_the_day.cpp b/cockatrice/src/dlg_tip_of_the_day.cpp index c26af60b..714442ac 100644 --- a/cockatrice/src/dlg_tip_of_the_day.cpp +++ b/cockatrice/src/dlg_tip_of_the_day.cpp @@ -1,3 +1,8 @@ +#include "dlg_tip_of_the_day.h" + +#include "settingscache.h" +#include "tip_of_the_day.h" + #include #include #include @@ -6,10 +11,6 @@ #include #include -#include "dlg_tip_of_the_day.h" -#include "settingscache.h" -#include "tip_of_the_day.h" - #define MIN_TIP_IMAGE_HEIGHT 200 #define MIN_TIP_IMAGE_WIDTH 200 #define MAX_TIP_IMAGE_HEIGHT 300 diff --git a/cockatrice/src/dlg_update.cpp b/cockatrice/src/dlg_update.cpp index e62daacd..863fecf9 100644 --- a/cockatrice/src/dlg_update.cpp +++ b/cockatrice/src/dlg_update.cpp @@ -1,20 +1,20 @@ -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - #include "dlg_update.h" + #include "releasechannel.h" #include "settingscache.h" #include "window_main.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/dlg_update.h b/cockatrice/src/dlg_update.h index b4cb8344..2c8f2bbb 100644 --- a/cockatrice/src/dlg_update.h +++ b/cockatrice/src/dlg_update.h @@ -1,11 +1,11 @@ #ifndef DLG_UPDATE_H #define DLG_UPDATE_H +#include "update_downloader.h" + #include #include #include - -#include "update_downloader.h" class Release; class DlgUpdate : public QDialog diff --git a/cockatrice/src/dlg_viewlog.cpp b/cockatrice/src/dlg_viewlog.cpp index a10d6212..99d3e5dc 100644 --- a/cockatrice/src/dlg_viewlog.cpp +++ b/cockatrice/src/dlg_viewlog.cpp @@ -1,4 +1,5 @@ #include "dlg_viewlog.h" + #include "logger.h" #include "settingscache.h" diff --git a/cockatrice/src/filter_string.cpp b/cockatrice/src/filter_string.cpp index bcd6565b..01afe74c 100644 --- a/cockatrice/src/filter_string.cpp +++ b/cockatrice/src/filter_string.cpp @@ -1,4 +1,5 @@ #include "filter_string.h" + #include "../../common/lib/peglib.h" #include diff --git a/cockatrice/src/filtertree.cpp b/cockatrice/src/filtertree.cpp index 327b2745..bf5a91e9 100644 --- a/cockatrice/src/filtertree.cpp +++ b/cockatrice/src/filtertree.cpp @@ -1,4 +1,5 @@ #include "filtertree.h" + #include "cardfilter.h" #include diff --git a/cockatrice/src/filtertree.h b/cockatrice/src/filtertree.h index a837c221..ad651e7c 100644 --- a/cockatrice/src/filtertree.h +++ b/cockatrice/src/filtertree.h @@ -5,6 +5,7 @@ #include "carddatabase.h" #include "cardfilter.h" + #include #include #include diff --git a/cockatrice/src/filtertreemodel.cpp b/cockatrice/src/filtertreemodel.cpp index f01f7b4a..13dd1b9c 100644 --- a/cockatrice/src/filtertreemodel.cpp +++ b/cockatrice/src/filtertreemodel.cpp @@ -1,6 +1,8 @@ #include "filtertreemodel.h" + #include "cardfilter.h" #include "filtertree.h" + #include FilterTreeModel::FilterTreeModel(QObject *parent) : QAbstractItemModel(parent) diff --git a/cockatrice/src/gamescene.cpp b/cockatrice/src/gamescene.cpp index 8fab1d7e..9072dfe9 100644 --- a/cockatrice/src/gamescene.cpp +++ b/cockatrice/src/gamescene.cpp @@ -1,10 +1,12 @@ #include "gamescene.h" + #include "carditem.h" #include "phasestoolbar.h" #include "player.h" #include "settingscache.h" #include "zoneviewwidget.h" #include "zoneviewzone.h" + #include #include #include diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/gameselector.cpp index 48c8e0b9..dd762065 100644 --- a/cockatrice/src/gameselector.cpp +++ b/cockatrice/src/gameselector.cpp @@ -1,4 +1,5 @@ #include "gameselector.h" + #include "abstractclient.h" #include "dlg_creategame.h" #include "dlg_filter_games.h" @@ -10,6 +11,7 @@ #include "tab_room.h" #include "tab_supervisor.h" #include "tab_userlists.h" + #include #include #include diff --git a/cockatrice/src/gameselector.h b/cockatrice/src/gameselector.h index e723f139..0e3249db 100644 --- a/cockatrice/src/gameselector.h +++ b/cockatrice/src/gameselector.h @@ -2,6 +2,7 @@ #define GAMESELECTOR_H #include "gametypemap.h" + #include #include #include diff --git a/cockatrice/src/gamesmodel.cpp b/cockatrice/src/gamesmodel.cpp index 6033df94..4aace4aa 100644 --- a/cockatrice/src/gamesmodel.cpp +++ b/cockatrice/src/gamesmodel.cpp @@ -1,4 +1,5 @@ #include "gamesmodel.h" + #include "pb/serverinfo_game.pb.h" #include "pixmapgenerator.h" #include "settingscache.h" diff --git a/cockatrice/src/gamesmodel.h b/cockatrice/src/gamesmodel.h index b2c54eb4..6a2484fe 100644 --- a/cockatrice/src/gamesmodel.h +++ b/cockatrice/src/gamesmodel.h @@ -4,6 +4,7 @@ #include "gametypemap.h" #include "pb/serverinfo_game.pb.h" #include "tab_supervisor.h" + #include #include #include diff --git a/cockatrice/src/gameview.cpp b/cockatrice/src/gameview.cpp index 26f97550..97b26b3a 100644 --- a/cockatrice/src/gameview.cpp +++ b/cockatrice/src/gameview.cpp @@ -1,6 +1,8 @@ #include "gameview.h" + #include "gamescene.h" #include "settingscache.h" + #include #include #include diff --git a/cockatrice/src/handcounter.cpp b/cockatrice/src/handcounter.cpp index 0faff902..3da337ea 100644 --- a/cockatrice/src/handcounter.cpp +++ b/cockatrice/src/handcounter.cpp @@ -1,5 +1,7 @@ #include "handcounter.h" + #include "cardzone.h" + #include #include #include diff --git a/cockatrice/src/handcounter.h b/cockatrice/src/handcounter.h index c0833fc2..b4646e4a 100644 --- a/cockatrice/src/handcounter.h +++ b/cockatrice/src/handcounter.h @@ -2,6 +2,7 @@ #define HANDCOUNTER_H #include "abstractgraphicsitem.h" + #include class QPainter; diff --git a/cockatrice/src/handle_public_servers.cpp b/cockatrice/src/handle_public_servers.cpp index 917fb5d6..3898fde1 100644 --- a/cockatrice/src/handle_public_servers.cpp +++ b/cockatrice/src/handle_public_servers.cpp @@ -1,5 +1,7 @@ #include "handle_public_servers.h" + #include "settingscache.h" + #include #include #include diff --git a/cockatrice/src/handzone.cpp b/cockatrice/src/handzone.cpp index e7d4e589..f8beda8c 100644 --- a/cockatrice/src/handzone.cpp +++ b/cockatrice/src/handzone.cpp @@ -1,12 +1,13 @@ #include "handzone.h" + #include "carddragitem.h" #include "carditem.h" +#include "pb/command_move_card.pb.h" #include "player.h" #include "settingscache.h" #include "thememanager.h" -#include -#include "pb/command_move_card.pb.h" +#include HandZone::HandZone(Player *_p, bool _contentsKnown, int _zoneHeight, QGraphicsItem *parent) : SelectZone(_p, "hand", false, false, _contentsKnown, parent), zoneHeight(_zoneHeight) diff --git a/cockatrice/src/keysignals.cpp b/cockatrice/src/keysignals.cpp index e8db0c7a..394c655f 100644 --- a/cockatrice/src/keysignals.cpp +++ b/cockatrice/src/keysignals.cpp @@ -1,4 +1,5 @@ #include "keysignals.h" + #include bool KeySignals::eventFilter(QObject * /*object*/, QEvent *event) diff --git a/cockatrice/src/localclient.cpp b/cockatrice/src/localclient.cpp index 1f34c89f..0abb3deb 100644 --- a/cockatrice/src/localclient.cpp +++ b/cockatrice/src/localclient.cpp @@ -1,6 +1,6 @@ #include "localclient.h" -#include "localserverinterface.h" +#include "localserverinterface.h" #include "pb/session_commands.pb.h" LocalClient::LocalClient(LocalServerInterface *_lsi, diff --git a/cockatrice/src/localserver.cpp b/cockatrice/src/localserver.cpp index 7cd5bf6c..f4e4ebfa 100644 --- a/cockatrice/src/localserver.cpp +++ b/cockatrice/src/localserver.cpp @@ -1,4 +1,5 @@ #include "localserver.h" + #include "localserverinterface.h" #include "server_room.h" diff --git a/cockatrice/src/localserverinterface.cpp b/cockatrice/src/localserverinterface.cpp index 291da146..e92e29d2 100644 --- a/cockatrice/src/localserverinterface.cpp +++ b/cockatrice/src/localserverinterface.cpp @@ -1,5 +1,7 @@ #include "localserverinterface.h" + #include "localserver.h" + #include LocalServerInterface::LocalServerInterface(LocalServer *_server, Server_DatabaseInterface *_databaseInterface) diff --git a/cockatrice/src/logger.cpp b/cockatrice/src/logger.cpp index 69b0a038..de3a7df6 100644 --- a/cockatrice/src/logger.cpp +++ b/cockatrice/src/logger.cpp @@ -1,4 +1,5 @@ #include "logger.h" + #include "version_string.h" #include diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index f8147ba2..06dd9c38 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include "main.h" + #include "QtNetwork/QNetworkInterface" #include "carddatabase.h" #include "dlg_settings.h" @@ -32,6 +33,7 @@ #include "thememanager.h" #include "version_string.h" #include "window_main.h" + #include #include #include diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp index 9d64a972..e0e83b25 100644 --- a/cockatrice/src/messagelogwidget.cpp +++ b/cockatrice/src/messagelogwidget.cpp @@ -1,14 +1,15 @@ -#include +#include "messagelogwidget.h" #include "carditem.h" #include "cardzone.h" -#include "messagelogwidget.h" #include "pb/context_move_card.pb.h" #include "pb/context_mulligan.pb.h" #include "pb/serverinfo_user.pb.h" #include "player.h" #include "soundengine.h" +#include + const QString MessageLogWidget::tableConstant() const { static const QString constant("table"); diff --git a/cockatrice/src/pending_command.h b/cockatrice/src/pending_command.h index 8b6d3cd6..c42ef8eb 100644 --- a/cockatrice/src/pending_command.h +++ b/cockatrice/src/pending_command.h @@ -3,6 +3,7 @@ #include "pb/commands.pb.h" #include "pb/response.pb.h" + #include class PendingCommand : public QObject diff --git a/cockatrice/src/phasestoolbar.cpp b/cockatrice/src/phasestoolbar.cpp index 30863735..f78df0a2 100644 --- a/cockatrice/src/phasestoolbar.cpp +++ b/cockatrice/src/phasestoolbar.cpp @@ -7,13 +7,12 @@ #ifdef _WIN32 #include "round.h" #endif /* _WIN32 */ -#include "phasestoolbar.h" -#include "pixmapgenerator.h" - #include "pb/command_draw_cards.pb.h" #include "pb/command_next_turn.pb.h" #include "pb/command_set_active_phase.pb.h" #include "pb/command_set_card_attr.pb.h" +#include "phasestoolbar.h" +#include "pixmapgenerator.h" PhaseButton::PhaseButton(const QString &_name, QGraphicsItem *parent, QAction *_doubleClickAction, bool _highlightable) : QObject(), QGraphicsItem(parent), name(_name), active(false), highlightable(_highlightable), diff --git a/cockatrice/src/phasestoolbar.h b/cockatrice/src/phasestoolbar.h index e0da1c2e..2de1cfe6 100644 --- a/cockatrice/src/phasestoolbar.h +++ b/cockatrice/src/phasestoolbar.h @@ -2,6 +2,7 @@ #define PHASESTOOLBAR_H #include "abstractgraphicsitem.h" + #include #include #include diff --git a/cockatrice/src/pictureloader.cpp b/cockatrice/src/pictureloader.cpp index a1d61c31..1ea511cd 100644 --- a/cockatrice/src/pictureloader.cpp +++ b/cockatrice/src/pictureloader.cpp @@ -1,4 +1,5 @@ #include "pictureloader.h" + #include "carddatabase.h" #include "main.h" #include "settingscache.h" diff --git a/cockatrice/src/pictureloader.h b/cockatrice/src/pictureloader.h index db5757e8..f085ecde 100644 --- a/cockatrice/src/pictureloader.h +++ b/cockatrice/src/pictureloader.h @@ -1,12 +1,12 @@ #ifndef PICTURELOADER_H #define PICTURELOADER_H +#include "carddatabase.h" + #include #include #include #include - -#include "carddatabase.h" class QNetworkAccessManager; class QNetworkReply; class QThread; diff --git a/cockatrice/src/pilezone.cpp b/cockatrice/src/pilezone.cpp index db48e686..271c713e 100644 --- a/cockatrice/src/pilezone.cpp +++ b/cockatrice/src/pilezone.cpp @@ -1,14 +1,15 @@ #include "pilezone.h" + #include "carddragitem.h" #include "carditem.h" +#include "pb/command_move_card.pb.h" #include "player.h" #include "zoneviewzone.h" + #include #include #include -#include "pb/command_move_card.pb.h" - PileZone::PileZone(Player *_p, const QString &_name, bool _isShufflable, bool _contentsKnown, QGraphicsItem *parent) : CardZone(_p, _name, false, _isShufflable, _contentsKnown, parent) { diff --git a/cockatrice/src/pixmapgenerator.cpp b/cockatrice/src/pixmapgenerator.cpp index 45962d8b..dfb80177 100644 --- a/cockatrice/src/pixmapgenerator.cpp +++ b/cockatrice/src/pixmapgenerator.cpp @@ -1,5 +1,7 @@ #include "pixmapgenerator.h" + #include "pb/serverinfo_user.pb.h" + #include #include #include diff --git a/cockatrice/src/pixmapgenerator.h b/cockatrice/src/pixmapgenerator.h index 10e423de..9fdc7f32 100644 --- a/cockatrice/src/pixmapgenerator.h +++ b/cockatrice/src/pixmapgenerator.h @@ -1,11 +1,11 @@ #ifndef PIXMAPGENERATOR_H #define PIXMAPGENERATOR_H +#include "user_level.h" + #include #include -#include "user_level.h" - class PhasePixmapGenerator { private: diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 27d1b099..f0ea55a6 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -1,4 +1,5 @@ #include "player.h" + #include "arrowitem.h" #include "carddatabase.h" #include "carditem.h" @@ -12,21 +13,6 @@ #include "handcounter.h" #include "handzone.h" #include "main.h" -#include "pilezone.h" -#include "playertarget.h" -#include "settingscache.h" -#include "stackzone.h" -#include "tab_game.h" -#include "tablezone.h" -#include "thememanager.h" -#include "zoneviewwidget.h" -#include "zoneviewzone.h" -#include -#include -#include -#include -#include - #include "pb/command_attach_card.pb.h" #include "pb/command_change_zone_properties.pb.h" #include "pb/command_concede.pb.h" @@ -67,6 +53,21 @@ #include "pb/serverinfo_player.pb.h" #include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_zone.pb.h" +#include "pilezone.h" +#include "playertarget.h" +#include "settingscache.h" +#include "stackzone.h" +#include "tab_game.h" +#include "tablezone.h" +#include "thememanager.h" +#include "zoneviewwidget.h" +#include "zoneviewzone.h" + +#include +#include +#include +#include +#include PlayerArea::PlayerArea(QGraphicsItem *parentItem) : QObject(), QGraphicsItem(parentItem) { diff --git a/cockatrice/src/player.h b/cockatrice/src/player.h index 703c7c21..085c4640 100644 --- a/cockatrice/src/player.h +++ b/cockatrice/src/player.h @@ -6,6 +6,7 @@ #include "pb/card_attributes.pb.h" #include "pb/game_event.pb.h" #include "tearoffmenu.h" + #include #include #include diff --git a/cockatrice/src/playerlistwidget.cpp b/cockatrice/src/playerlistwidget.cpp index 8cd497d8..ebdf2ff5 100644 --- a/cockatrice/src/playerlistwidget.cpp +++ b/cockatrice/src/playerlistwidget.cpp @@ -1,20 +1,21 @@ #include "playerlistwidget.h" + #include "abstractclient.h" +#include "pb/command_kick_from_game.pb.h" +#include "pb/serverinfo_playerproperties.pb.h" +#include "pb/session_commands.pb.h" #include "pixmapgenerator.h" #include "tab_game.h" #include "tab_supervisor.h" #include "tab_userlists.h" #include "user_context_menu.h" #include "userlist.h" + #include #include #include #include -#include "pb/command_kick_from_game.pb.h" -#include "pb/serverinfo_playerproperties.pb.h" -#include "pb/session_commands.pb.h" - PlayerListItemDelegate::PlayerListItemDelegate(QObject *const parent) : QStyledItemDelegate(parent) { } diff --git a/cockatrice/src/playertarget.cpp b/cockatrice/src/playertarget.cpp index 6fb14f09..fb4c9f3d 100644 --- a/cockatrice/src/playertarget.cpp +++ b/cockatrice/src/playertarget.cpp @@ -1,7 +1,9 @@ #include "playertarget.h" + #include "pb/serverinfo_user.pb.h" #include "pixmapgenerator.h" #include "player.h" + #include #include #include diff --git a/cockatrice/src/playertarget.h b/cockatrice/src/playertarget.h index 5dc5a272..e68b3436 100644 --- a/cockatrice/src/playertarget.h +++ b/cockatrice/src/playertarget.h @@ -3,6 +3,7 @@ #include "abstractcounter.h" #include "arrowtarget.h" + #include #include diff --git a/cockatrice/src/releasechannel.cpp b/cockatrice/src/releasechannel.cpp index aab2cd80..bbd6206b 100644 --- a/cockatrice/src/releasechannel.cpp +++ b/cockatrice/src/releasechannel.cpp @@ -1,4 +1,5 @@ #include "releasechannel.h" + #include "version_string.h" #include diff --git a/cockatrice/src/remoteclient.cpp b/cockatrice/src/remoteclient.cpp index b49228a9..0a068d3a 100644 --- a/cockatrice/src/remoteclient.cpp +++ b/cockatrice/src/remoteclient.cpp @@ -1,4 +1,5 @@ #include "remoteclient.h" + #include "main.h" #include "pb/commands.pb.h" #include "pb/event_server_identification.pb.h" @@ -11,6 +12,7 @@ #include "pending_command.h" #include "settingscache.h" #include "version_string.h" + #include #include #include diff --git a/cockatrice/src/remoteclient.h b/cockatrice/src/remoteclient.h index 7c6ff2ab..3639a0ab 100644 --- a/cockatrice/src/remoteclient.h +++ b/cockatrice/src/remoteclient.h @@ -2,6 +2,7 @@ #define REMOTECLIENT_H #include "abstractclient.h" + #include #include diff --git a/cockatrice/src/remotedecklist_treewidget.cpp b/cockatrice/src/remotedecklist_treewidget.cpp index 612987b1..cc0c40e4 100644 --- a/cockatrice/src/remotedecklist_treewidget.cpp +++ b/cockatrice/src/remotedecklist_treewidget.cpp @@ -1,14 +1,15 @@ #include "remotedecklist_treewidget.h" -#include "abstractclient.h" -#include -#include -#include +#include "abstractclient.h" #include "pb/command_deck_list.pb.h" #include "pb/response_deck_list.pb.h" #include "pb/serverinfo_deckstorage.pb.h" #include "pending_command.h" +#include +#include +#include + RemoteDeckList_TreeModel::DirectoryNode::DirectoryNode(const QString &_name, RemoteDeckList_TreeModel::DirectoryNode *_parent) : RemoteDeckList_TreeModel::Node(_name, _parent) diff --git a/cockatrice/src/remotereplaylist_treewidget.cpp b/cockatrice/src/remotereplaylist_treewidget.cpp index 6132e9ba..15e81774 100644 --- a/cockatrice/src/remotereplaylist_treewidget.cpp +++ b/cockatrice/src/remotereplaylist_treewidget.cpp @@ -1,14 +1,15 @@ #include "remotereplaylist_treewidget.h" -#include "abstractclient.h" -#include -#include -#include +#include "abstractclient.h" #include "pb/command_replay_list.pb.h" #include "pb/response_replay_list.pb.h" #include "pb/serverinfo_replay.pb.h" #include "pending_command.h" +#include +#include +#include + const int RemoteReplayList_TreeModel::numberOfColumns = 6; RemoteReplayList_TreeModel::MatchNode::MatchNode(const ServerInfo_ReplayMatch &_matchInfo) diff --git a/cockatrice/src/remotereplaylist_treewidget.h b/cockatrice/src/remotereplaylist_treewidget.h index 240626a6..042d5a5b 100644 --- a/cockatrice/src/remotereplaylist_treewidget.h +++ b/cockatrice/src/remotereplaylist_treewidget.h @@ -3,6 +3,7 @@ #include "pb/serverinfo_replay.pb.h" #include "pb/serverinfo_replay_match.pb.h" + #include #include #include diff --git a/cockatrice/src/replay_timeline_widget.cpp b/cockatrice/src/replay_timeline_widget.cpp index 148e2aa4..6d04dce8 100644 --- a/cockatrice/src/replay_timeline_widget.cpp +++ b/cockatrice/src/replay_timeline_widget.cpp @@ -1,4 +1,5 @@ #include "replay_timeline_widget.h" + #include #include #include diff --git a/cockatrice/src/selectzone.cpp b/cockatrice/src/selectzone.cpp index 7546a4c0..7250e6ca 100644 --- a/cockatrice/src/selectzone.cpp +++ b/cockatrice/src/selectzone.cpp @@ -1,6 +1,8 @@ #include "selectzone.h" + #include "carditem.h" #include "gamescene.h" + #include #include diff --git a/cockatrice/src/sequenceEdit/sequenceedit.cpp b/cockatrice/src/sequenceEdit/sequenceedit.cpp index eb0ba319..f6989c3f 100644 --- a/cockatrice/src/sequenceEdit/sequenceedit.cpp +++ b/cockatrice/src/sequenceEdit/sequenceedit.cpp @@ -1,5 +1,7 @@ #include "sequenceedit.h" + #include "../settingscache.h" + #include #include #include diff --git a/cockatrice/src/setsmodel.h b/cockatrice/src/setsmodel.h index d8659a9b..b40a5390 100644 --- a/cockatrice/src/setsmodel.h +++ b/cockatrice/src/setsmodel.h @@ -2,6 +2,7 @@ #define SETSMODEL_H #include "carddatabase.h" + #include #include #include diff --git a/cockatrice/src/settings/downloadsettings.cpp b/cockatrice/src/settings/downloadsettings.cpp index 239b3d6c..fdda815d 100644 --- a/cockatrice/src/settings/downloadsettings.cpp +++ b/cockatrice/src/settings/downloadsettings.cpp @@ -1,4 +1,5 @@ #include "downloadsettings.h" + #include "settingsmanager.h" DownloadSettings::DownloadSettings(const QString &settingPath, QObject *parent = nullptr) diff --git a/cockatrice/src/settings/downloadsettings.h b/cockatrice/src/settings/downloadsettings.h index f3c3e4d1..cee4d94b 100644 --- a/cockatrice/src/settings/downloadsettings.h +++ b/cockatrice/src/settings/downloadsettings.h @@ -2,6 +2,7 @@ #define COCKATRICE_DOWNLOADSETTINGS_H #include "settingsmanager.h" + #include class DownloadSettings : public SettingsManager diff --git a/cockatrice/src/settings/gamefilterssettings.cpp b/cockatrice/src/settings/gamefilterssettings.cpp index 20d8cc02..28515a88 100644 --- a/cockatrice/src/settings/gamefilterssettings.cpp +++ b/cockatrice/src/settings/gamefilterssettings.cpp @@ -1,4 +1,5 @@ #include "gamefilterssettings.h" + #include GameFiltersSettings::GameFiltersSettings(QString settingPath, QObject *parent) diff --git a/cockatrice/src/settings/layoutssettings.h b/cockatrice/src/settings/layoutssettings.h index e57ac0b2..3bd5813a 100644 --- a/cockatrice/src/settings/layoutssettings.h +++ b/cockatrice/src/settings/layoutssettings.h @@ -2,6 +2,7 @@ #define LAYOUTSSETTINGS_H #include "settingsmanager.h" + #include class LayoutsSettings : public SettingsManager diff --git a/cockatrice/src/settings/serverssettings.cpp b/cockatrice/src/settings/serverssettings.cpp index 629787e0..a4d831b3 100644 --- a/cockatrice/src/settings/serverssettings.cpp +++ b/cockatrice/src/settings/serverssettings.cpp @@ -1,4 +1,5 @@ #include "serverssettings.h" + #include #include diff --git a/cockatrice/src/settings/serverssettings.h b/cockatrice/src/settings/serverssettings.h index 89550abf..3195c26a 100644 --- a/cockatrice/src/settings/serverssettings.h +++ b/cockatrice/src/settings/serverssettings.h @@ -2,6 +2,7 @@ #define SERVERSSETTINGS_H #include "settingsmanager.h" + #include class ServersSettings : public SettingsManager diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp index 1c7316c5..f6356047 100644 --- a/cockatrice/src/settingscache.cpp +++ b/cockatrice/src/settingscache.cpp @@ -1,4 +1,5 @@ #include "settingscache.h" + #include "releasechannel.h" #include diff --git a/cockatrice/src/settingscache.h b/cockatrice/src/settingscache.h index 6cbada53..09f049f1 100644 --- a/cockatrice/src/settingscache.h +++ b/cockatrice/src/settingscache.h @@ -8,6 +8,7 @@ #include "settings/messagesettings.h" #include "settings/serverssettings.h" #include "shortcutssettings.h" + #include #include #include diff --git a/cockatrice/src/shortcutssettings.cpp b/cockatrice/src/shortcutssettings.cpp index 11ce2cd7..b34afb3c 100644 --- a/cockatrice/src/shortcutssettings.cpp +++ b/cockatrice/src/shortcutssettings.cpp @@ -1,4 +1,5 @@ #include "shortcutssettings.h" + #include #include #include diff --git a/cockatrice/src/soundengine.cpp b/cockatrice/src/soundengine.cpp index 75a92aa0..47d69a18 100644 --- a/cockatrice/src/soundengine.cpp +++ b/cockatrice/src/soundengine.cpp @@ -1,4 +1,5 @@ #include "soundengine.h" + #include "settingscache.h" #include diff --git a/cockatrice/src/spoilerbackgroundupdater.cpp b/cockatrice/src/spoilerbackgroundupdater.cpp index 0bcdbbbc..078dc545 100644 --- a/cockatrice/src/spoilerbackgroundupdater.cpp +++ b/cockatrice/src/spoilerbackgroundupdater.cpp @@ -1,3 +1,10 @@ +#include "spoilerbackgroundupdater.h" + +#include "carddatabase.h" +#include "main.h" +#include "settingscache.h" +#include "window_main.h" + #include #include #include @@ -9,12 +16,6 @@ #include #include -#include "carddatabase.h" -#include "main.h" -#include "settingscache.h" -#include "spoilerbackgroundupdater.h" -#include "window_main.h" - #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled" #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml" diff --git a/cockatrice/src/stackzone.cpp b/cockatrice/src/stackzone.cpp index f518d075..f2be3073 100644 --- a/cockatrice/src/stackzone.cpp +++ b/cockatrice/src/stackzone.cpp @@ -1,15 +1,16 @@ #include "stackzone.h" + #include "arrowitem.h" #include "carddragitem.h" #include "carditem.h" +#include "pb/command_move_card.pb.h" #include "player.h" #include "settingscache.h" #include "thememanager.h" + #include #include -#include "pb/command_move_card.pb.h" - StackZone::StackZone(Player *_p, int _zoneHeight, QGraphicsItem *parent) : SelectZone(_p, "stack", false, false, true, parent), zoneHeight(_zoneHeight) { diff --git a/cockatrice/src/tab.cpp b/cockatrice/src/tab.cpp index 2bc5aaf1..3eaaaebc 100644 --- a/cockatrice/src/tab.cpp +++ b/cockatrice/src/tab.cpp @@ -1,5 +1,7 @@ #include "tab.h" + #include "cardinfowidget.h" + #include #include #include diff --git a/cockatrice/src/tab_admin.cpp b/cockatrice/src/tab_admin.cpp index b7b82218..9c94272a 100644 --- a/cockatrice/src/tab_admin.cpp +++ b/cockatrice/src/tab_admin.cpp @@ -1,5 +1,8 @@ #include "tab_admin.h" + #include "abstractclient.h" +#include "pb/admin_commands.pb.h" + #include #include #include @@ -11,8 +14,6 @@ #include #include -#include "pb/admin_commands.pb.h" - ShutdownDialog::ShutdownDialog(QWidget *parent) : QDialog(parent) { QLabel *reasonLabel = new QLabel(tr("&Reason for shutdown:")); diff --git a/cockatrice/src/tab_admin.h b/cockatrice/src/tab_admin.h index 1ff3581a..650e881a 100644 --- a/cockatrice/src/tab_admin.h +++ b/cockatrice/src/tab_admin.h @@ -2,6 +2,7 @@ #define TAB_ADMIN_H #include "tab.h" + #include class AbstractClient; diff --git a/cockatrice/src/tab_deck_storage.cpp b/cockatrice/src/tab_deck_storage.cpp index 371868a6..4427ebf1 100644 --- a/cockatrice/src/tab_deck_storage.cpp +++ b/cockatrice/src/tab_deck_storage.cpp @@ -1,9 +1,20 @@ #include "tab_deck_storage.h" + #include "abstractclient.h" #include "deck_loader.h" #include "decklist.h" +#include "pb/command_deck_del.pb.h" +#include "pb/command_deck_del_dir.pb.h" +#include "pb/command_deck_download.pb.h" +#include "pb/command_deck_new_dir.pb.h" +#include "pb/command_deck_upload.pb.h" +#include "pb/response.pb.h" +#include "pb/response_deck_download.pb.h" +#include "pb/response_deck_upload.pb.h" +#include "pending_command.h" #include "remotedecklist_treewidget.h" #include "settingscache.h" + #include #include #include @@ -16,16 +27,6 @@ #include #include -#include "pb/command_deck_del.pb.h" -#include "pb/command_deck_del_dir.pb.h" -#include "pb/command_deck_download.pb.h" -#include "pb/command_deck_new_dir.pb.h" -#include "pb/command_deck_upload.pb.h" -#include "pb/response.pb.h" -#include "pb/response_deck_download.pb.h" -#include "pb/response_deck_upload.pb.h" -#include "pending_command.h" - TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client) { diff --git a/cockatrice/src/tab_replays.cpp b/cockatrice/src/tab_replays.cpp index 557177a0..ad99937b 100644 --- a/cockatrice/src/tab_replays.cpp +++ b/cockatrice/src/tab_replays.cpp @@ -1,8 +1,18 @@ #include "tab_replays.h" + #include "abstractclient.h" +#include "pb/command_replay_delete_match.pb.h" +#include "pb/command_replay_download.pb.h" +#include "pb/command_replay_modify_match.pb.h" +#include "pb/event_replay_added.pb.h" +#include "pb/game_replay.pb.h" +#include "pb/response.pb.h" +#include "pb/response_replay_download.pb.h" +#include "pending_command.h" #include "remotereplaylist_treewidget.h" #include "settingscache.h" #include "tab_game.h" + #include #include #include @@ -15,15 +25,6 @@ #include #include -#include "pb/command_replay_delete_match.pb.h" -#include "pb/command_replay_download.pb.h" -#include "pb/command_replay_modify_match.pb.h" -#include "pb/event_replay_added.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/response.pb.h" -#include "pb/response_replay_download.pb.h" -#include "pending_command.h" - TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client) { localDirModel = new QFileSystemModel(this); diff --git a/cockatrice/src/tab_server.h b/cockatrice/src/tab_server.h index d0f55614..aa2a17c1 100644 --- a/cockatrice/src/tab_server.h +++ b/cockatrice/src/tab_server.h @@ -2,6 +2,7 @@ #define TAB_SERVER_H #include "tab.h" + #include #include #include diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index cd026402..b0ddde5d 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -1,6 +1,16 @@ #include "tab_supervisor.h" + #include "abstractclient.h" #include "main.h" +#include "pb/event_game_joined.pb.h" +#include "pb/event_notify_user.pb.h" +#include "pb/event_user_message.pb.h" +#include "pb/game_event_container.pb.h" +#include "pb/moderator_commands.pb.h" +#include "pb/room_commands.pb.h" +#include "pb/room_event.pb.h" +#include "pb/serverinfo_room.pb.h" +#include "pb/serverinfo_user.pb.h" #include "pixmapgenerator.h" #include "settingscache.h" #include "tab_admin.h" @@ -14,22 +24,13 @@ #include "tab_server.h" #include "tab_userlists.h" #include "userlist.h" + #include #include #include #include #include -#include "pb/event_game_joined.pb.h" -#include "pb/event_notify_user.pb.h" -#include "pb/event_user_message.pb.h" -#include "pb/game_event_container.pb.h" -#include "pb/moderator_commands.pb.h" -#include "pb/room_commands.pb.h" -#include "pb/room_event.pb.h" -#include "pb/serverinfo_room.pb.h" -#include "pb/serverinfo_user.pb.h" - QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const { if (element != SE_TabBarTabText) { diff --git a/cockatrice/src/tab_supervisor.h b/cockatrice/src/tab_supervisor.h index b1b01110..b6737557 100644 --- a/cockatrice/src/tab_supervisor.h +++ b/cockatrice/src/tab_supervisor.h @@ -3,6 +3,7 @@ #include "chatview/userlistProxy.h" #include "deck_loader.h" + #include #include #include diff --git a/cockatrice/src/tablezone.cpp b/cockatrice/src/tablezone.cpp index 483863fa..9fd06766 100644 --- a/cockatrice/src/tablezone.cpp +++ b/cockatrice/src/tablezone.cpp @@ -9,14 +9,13 @@ #include "carddatabase.h" #include "carddragitem.h" #include "carditem.h" +#include "pb/command_move_card.pb.h" +#include "pb/command_set_card_attr.pb.h" #include "player.h" #include "settingscache.h" #include "tablezone.h" #include "thememanager.h" -#include "pb/command_move_card.pb.h" -#include "pb/command_set_card_attr.pb.h" - const QColor TableZone::BACKGROUND_COLOR = QColor(100, 100, 100); const QColor TableZone::FADE_MASK = QColor(0, 0, 0, 80); const QColor TableZone::GRADIENT_COLOR = QColor(255, 255, 255, 150); diff --git a/cockatrice/src/tappedout_interface.cpp b/cockatrice/src/tappedout_interface.cpp index f2ea6790..6c7428ed 100644 --- a/cockatrice/src/tappedout_interface.cpp +++ b/cockatrice/src/tappedout_interface.cpp @@ -1,5 +1,7 @@ #include "tappedout_interface.h" + #include "decklist.h" + #include #include #include diff --git a/cockatrice/src/tappedout_interface.h b/cockatrice/src/tappedout_interface.h index 2ac59ee8..670e0003 100644 --- a/cockatrice/src/tappedout_interface.h +++ b/cockatrice/src/tappedout_interface.h @@ -3,6 +3,7 @@ #include "carddatabase.h" #include "decklist.h" + #include class QByteArray; diff --git a/cockatrice/src/thememanager.cpp b/cockatrice/src/thememanager.cpp index 7840adee..81c04870 100644 --- a/cockatrice/src/thememanager.cpp +++ b/cockatrice/src/thememanager.cpp @@ -1,5 +1,7 @@ #include "thememanager.h" + #include "settingscache.h" + #include #include #include diff --git a/cockatrice/src/tip_of_the_day.cpp b/cockatrice/src/tip_of_the_day.cpp index 7c703679..876b6db3 100644 --- a/cockatrice/src/tip_of_the_day.cpp +++ b/cockatrice/src/tip_of_the_day.cpp @@ -1,3 +1,5 @@ +#include "tip_of_the_day.h" + #include #include #include @@ -5,8 +7,6 @@ #include #include -#include "tip_of_the_day.h" - #define TIPDDBMODEL_COLUMNS 3 TipOfTheDay::TipOfTheDay(QString _title, QString _content, QString _imagePath, QDate _date) diff --git a/cockatrice/src/update_downloader.cpp b/cockatrice/src/update_downloader.cpp index 2f7b57ba..161137cb 100644 --- a/cockatrice/src/update_downloader.cpp +++ b/cockatrice/src/update_downloader.cpp @@ -1,8 +1,8 @@ +#include "update_downloader.h" + #include #include -#include "update_downloader.h" - UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent), response(nullptr) { netMan = new QNetworkAccessManager(this); diff --git a/cockatrice/src/user_context_menu.cpp b/cockatrice/src/user_context_menu.cpp index f03a3e89..29d7d2eb 100644 --- a/cockatrice/src/user_context_menu.cpp +++ b/cockatrice/src/user_context_menu.cpp @@ -1,20 +1,7 @@ #include "user_context_menu.h" + #include "abstractclient.h" #include "gameselector.h" -#include "pending_command.h" -#include "tab_game.h" -#include "tab_supervisor.h" -#include "tab_userlists.h" -#include "userinfobox.h" -#include "userlist.h" -#include -#include -#include - -#include -#include -#include - #include "pb/command_kick_from_game.pb.h" #include "pb/commands.pb.h" #include "pb/moderator_commands.pb.h" @@ -24,6 +11,19 @@ #include "pb/response_warn_history.pb.h" #include "pb/response_warn_list.pb.h" #include "pb/session_commands.pb.h" +#include "pending_command.h" +#include "tab_game.h" +#include "tab_supervisor.h" +#include "tab_userlists.h" +#include "userinfobox.h" +#include "userlist.h" + +#include +#include +#include +#include +#include +#include UserContextMenu::UserContextMenu(const TabSupervisor *_tabSupervisor, QWidget *parent, TabGame *_game) : QObject(parent), client(_tabSupervisor->getClient()), tabSupervisor(_tabSupervisor), game(_game) diff --git a/cockatrice/src/user_context_menu.h b/cockatrice/src/user_context_menu.h index ac663e53..b87dafc3 100644 --- a/cockatrice/src/user_context_menu.h +++ b/cockatrice/src/user_context_menu.h @@ -2,6 +2,7 @@ #define USER_CONTEXT_MENU_H #include "user_level.h" + #include class QAction; diff --git a/cockatrice/src/userconnection_information.cpp b/cockatrice/src/userconnection_information.cpp index ac2a2fd4..d3c502ef 100644 --- a/cockatrice/src/userconnection_information.cpp +++ b/cockatrice/src/userconnection_information.cpp @@ -1,5 +1,7 @@ #include "userconnection_information.h" + #include "settingscache.h" + #include #include diff --git a/cockatrice/src/userinfobox.cpp b/cockatrice/src/userinfobox.cpp index ebb063b2..88d47a9e 100644 --- a/cockatrice/src/userinfobox.cpp +++ b/cockatrice/src/userinfobox.cpp @@ -1,8 +1,12 @@ #include "userinfobox.h" + #include "abstractclient.h" #include "dlg_edit_avatar.h" #include "dlg_edit_password.h" #include "dlg_edit_user.h" +#include "pb/response_get_user_info.pb.h" +#include "pb/session_commands.pb.h" +#include "pending_command.h" #include "pixmapgenerator.h" #include @@ -11,10 +15,6 @@ #include #include -#include "pb/response_get_user_info.pb.h" -#include "pb/session_commands.pb.h" -#include "pending_command.h" - const qint64 SIXTY = 60; const qint64 HOURS_IN_A_DAY = 24; const qint64 DAYS_IN_A_YEAR = 365; diff --git a/cockatrice/src/userlist.h b/cockatrice/src/userlist.h index 05d65064..2ddfc271 100644 --- a/cockatrice/src/userlist.h +++ b/cockatrice/src/userlist.h @@ -3,6 +3,7 @@ #include "pb/moderator_commands.pb.h" #include "user_level.h" + #include #include #include diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp index 56fd4c9e..5749dbed 100644 --- a/cockatrice/src/window_main.cpp +++ b/cockatrice/src/window_main.cpp @@ -17,22 +17,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "window_main.h" #include "carddatabase.h" #include "dlg_connect.h" @@ -50,18 +35,33 @@ #include "localserverinterface.h" #include "logger.h" #include "main.h" +#include "pb/event_connection_closed.pb.h" +#include "pb/event_server_shutdown.pb.h" +#include "pb/game_replay.pb.h" +#include "pb/room_commands.pb.h" #include "remoteclient.h" #include "settingscache.h" #include "tab_game.h" #include "tab_supervisor.h" #include "version_string.h" -#include "window_main.h" #include "window_sets.h" -#include "pb/event_connection_closed.pb.h" -#include "pb/event_server_shutdown.pb.h" -#include "pb/game_replay.pb.h" -#include "pb/room_commands.pb.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define GITHUB_PAGES_URL "https://cockatrice.github.io" #define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors?type=c" diff --git a/cockatrice/src/window_main.h b/cockatrice/src/window_main.h index 137d5825..47e10ad4 100644 --- a/cockatrice/src/window_main.h +++ b/cockatrice/src/window_main.h @@ -20,6 +20,9 @@ #ifndef WINDOW_H #define WINDOW_H +#include "abstractclient.h" +#include "pb/response.pb.h" + #include #include #include @@ -27,9 +30,6 @@ #include #include -#include "abstractclient.h" -#include "pb/response.pb.h" - class DlgConnect; class DlgViewLog; class GameReplay; diff --git a/cockatrice/src/zoneviewwidget.cpp b/cockatrice/src/zoneviewwidget.cpp index dc8f5ba5..225f46e1 100644 --- a/cockatrice/src/zoneviewwidget.cpp +++ b/cockatrice/src/zoneviewwidget.cpp @@ -1,9 +1,13 @@ #include "zoneviewwidget.h" + #include "carditem.h" #include "gamescene.h" +#include "pb/command_shuffle.pb.h" +#include "pb/command_stop_dump_zone.pb.h" #include "player.h" #include "settingscache.h" #include "zoneviewzone.h" + #include #include #include @@ -14,9 +18,6 @@ #include #include -#include "pb/command_shuffle.pb.h" -#include "pb/command_stop_dump_zone.pb.h" - ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberCards, diff --git a/cockatrice/src/zoneviewzone.cpp b/cockatrice/src/zoneviewzone.cpp index 425caeaa..c71f9a09 100644 --- a/cockatrice/src/zoneviewzone.cpp +++ b/cockatrice/src/zoneviewzone.cpp @@ -1,4 +1,5 @@ #include "zoneviewzone.h" + #include "carddatabase.h" #include "carddragitem.h" #include "carditem.h" @@ -8,6 +9,7 @@ #include "pb/serverinfo_card.pb.h" #include "pending_command.h" #include "player.h" + #include #include #include diff --git a/cockatrice/src/zoneviewzone.h b/cockatrice/src/zoneviewzone.h index e25b1542..416de585 100644 --- a/cockatrice/src/zoneviewzone.h +++ b/cockatrice/src/zoneviewzone.h @@ -2,6 +2,7 @@ #define ZONEVIEWERZONE_H #include "selectzone.h" + #include class ZoneViewWidget; diff --git a/common/decklist.cpp b/common/decklist.cpp index e750c641..0759cd96 100644 --- a/common/decklist.cpp +++ b/common/decklist.cpp @@ -1,4 +1,5 @@ #include "decklist.h" + #include #include #include diff --git a/common/decklist.h b/common/decklist.h index 9236a77b..3323dc99 100644 --- a/common/decklist.h +++ b/common/decklist.h @@ -12,7 +12,6 @@ // Required on Mac. Forward declaration doesn't work. Don't ask why. #include #include - #include class CardDatabase; diff --git a/common/expression.cpp b/common/expression.cpp index 66e39aef..0bb1f5ee 100644 --- a/common/expression.cpp +++ b/common/expression.cpp @@ -1,4 +1,5 @@ #include "expression.h" + #include "./lib/peglib.h" #include diff --git a/common/featureset.cpp b/common/featureset.cpp index 43e35150..cdd30f22 100644 --- a/common/featureset.cpp +++ b/common/featureset.cpp @@ -1,4 +1,5 @@ #include "featureset.h" + #include #include diff --git a/common/get_pb_extension.cpp b/common/get_pb_extension.cpp index f685ceb3..d6235858 100644 --- a/common/get_pb_extension.cpp +++ b/common/get_pb_extension.cpp @@ -1,4 +1,5 @@ #include "get_pb_extension.h" + #include #include diff --git a/common/rng_abstract.cpp b/common/rng_abstract.cpp index c016244d..63072b98 100644 --- a/common/rng_abstract.cpp +++ b/common/rng_abstract.cpp @@ -1,4 +1,5 @@ #include "rng_abstract.h" + #include QVector RNG_Abstract::makeNumbersVector(int n, int min, int max) diff --git a/common/rng_sfmt.cpp b/common/rng_sfmt.cpp index 7667dcd5..88c5be82 100644 --- a/common/rng_sfmt.cpp +++ b/common/rng_sfmt.cpp @@ -1,4 +1,5 @@ #include "rng_sfmt.h" + #include #include #include diff --git a/common/rng_sfmt.h b/common/rng_sfmt.h index f5497799..b4e87ae1 100644 --- a/common/rng_sfmt.h +++ b/common/rng_sfmt.h @@ -3,6 +3,7 @@ #include "rng_abstract.h" #include "sfmt/SFMT.h" + #include #include diff --git a/common/room_message_type.h b/common/room_message_type.h index f5114025..4e87bd86 100644 --- a/common/room_message_type.h +++ b/common/room_message_type.h @@ -7,6 +7,7 @@ #undef TYPE_BOOL #endif #include "pb/event_room_say.pb.h" + #include Q_DECLARE_FLAGS(RoomMessageTypeFlags, Event_RoomSay::RoomMessageType) diff --git a/common/server.cpp b/common/server.cpp index 8db4b59d..401ce5f3 100644 --- a/common/server.cpp +++ b/common/server.cpp @@ -18,6 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "server.h" + #include "featureset.h" #include "pb/event_connection_closed.pb.h" #include "pb/event_list_rooms.pb.h" @@ -33,6 +34,7 @@ #include "server_protocolhandler.h" #include "server_remoteuserinterface.h" #include "server_room.h" + #include #include #include diff --git a/common/server.h b/common/server.h index b7f5e85f..6e62fb6c 100644 --- a/common/server.h +++ b/common/server.h @@ -7,6 +7,7 @@ #include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_warning.pb.h" #include "server_player_reference.h" + #include #include #include diff --git a/common/server_abstractuserinterface.cpp b/common/server_abstractuserinterface.cpp index b5cd502e..f40e64f8 100644 --- a/common/server_abstractuserinterface.cpp +++ b/common/server_abstractuserinterface.cpp @@ -1,4 +1,5 @@ #include "server_abstractuserinterface.h" + #include "pb/event_game_joined.pb.h" #include "pb/event_game_state_changed.pb.h" #include "server.h" @@ -7,6 +8,7 @@ #include "server_player_reference.h" #include "server_response_containers.h" #include "server_room.h" + #include #include #include diff --git a/common/server_abstractuserinterface.h b/common/server_abstractuserinterface.h index a40a9b76..ab4e746c 100644 --- a/common/server_abstractuserinterface.h +++ b/common/server_abstractuserinterface.h @@ -4,6 +4,7 @@ #include "pb/response.pb.h" #include "pb/server_message.pb.h" #include "serverinfo_user_container.h" + #include #include #include diff --git a/common/server_arrow.cpp b/common/server_arrow.cpp index 978115d0..fe02995d 100644 --- a/common/server_arrow.cpp +++ b/common/server_arrow.cpp @@ -1,4 +1,5 @@ #include "server_arrow.h" + #include "pb/serverinfo_arrow.pb.h" #include "server_card.h" #include "server_cardzone.h" diff --git a/common/server_card.cpp b/common/server_card.cpp index a8b5f1f1..0359fa16 100644 --- a/common/server_card.cpp +++ b/common/server_card.cpp @@ -18,6 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "server_card.h" + #include "pb/serverinfo_card.pb.h" #include "server_cardzone.h" #include "server_player.h" diff --git a/common/server_card.h b/common/server_card.h index b397e555..e43997af 100644 --- a/common/server_card.h +++ b/common/server_card.h @@ -22,6 +22,7 @@ #include "pb/card_attributes.pb.h" #include "server_arrowtarget.h" + #include #include diff --git a/common/server_cardzone.cpp b/common/server_cardzone.cpp index 7aeae74f..6d519a59 100644 --- a/common/server_cardzone.cpp +++ b/common/server_cardzone.cpp @@ -18,10 +18,12 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "server_cardzone.h" + #include "pb/command_move_card.pb.h" #include "rng_abstract.h" #include "server_card.h" #include "server_player.h" + #include #include diff --git a/common/server_cardzone.h b/common/server_cardzone.h index 4fc8f066..b9fa8ba9 100644 --- a/common/server_cardzone.h +++ b/common/server_cardzone.h @@ -21,6 +21,7 @@ #define SERVER_CARDZONE_H #include "pb/serverinfo_zone.pb.h" + #include #include #include diff --git a/common/server_counter.cpp b/common/server_counter.cpp index 14f52617..3dc5c6d6 100644 --- a/common/server_counter.cpp +++ b/common/server_counter.cpp @@ -1,4 +1,5 @@ #include "server_counter.h" + #include "pb/serverinfo_counter.pb.h" Server_Counter::Server_Counter(int _id, const QString &_name, const color &_counterColor, int _radius, int _count) diff --git a/common/server_counter.h b/common/server_counter.h index 30cfb588..3a5f837a 100644 --- a/common/server_counter.h +++ b/common/server_counter.h @@ -21,6 +21,7 @@ #define SERVER_COUNTER_H #include "pb/color.pb.h" + #include class ServerInfo_Counter; diff --git a/common/server_database_interface.h b/common/server_database_interface.h index 037353ba..a95603e3 100644 --- a/common/server_database_interface.h +++ b/common/server_database_interface.h @@ -2,6 +2,7 @@ #define SERVER_DATABASE_INTERFACE_H #include "server.h" + #include class Server_DatabaseInterface : public QObject diff --git a/common/server_game.cpp b/common/server_game.cpp index c87c1a64..3996c69b 100644 --- a/common/server_game.cpp +++ b/common/server_game.cpp @@ -18,6 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "server_game.h" + #include "decklist.h" #include "pb/context_connection_state_changed.pb.h" #include "pb/context_ping_changed.pb.h" @@ -43,6 +44,7 @@ #include "server_player.h" #include "server_protocolhandler.h" #include "server_room.h" + #include #include #include diff --git a/common/server_game.h b/common/server_game.h index dc282433..905f7c18 100644 --- a/common/server_game.h +++ b/common/server_game.h @@ -24,6 +24,7 @@ #include "pb/response.pb.h" #include "pb/serverinfo_game.pb.h" #include "server_response_containers.h" + #include #include #include diff --git a/common/server_metatypes.h b/common/server_metatypes.h index 0a52fd3e..a95a11a1 100644 --- a/common/server_metatypes.h +++ b/common/server_metatypes.h @@ -1,8 +1,6 @@ #ifndef SERVER_METATYPES_H #define SERVER_METATYPES_H -#include - #include "pb/commands.pb.h" #include "pb/game_event_container.pb.h" #include "pb/isl_message.pb.h" @@ -13,6 +11,8 @@ #include "pb/serverinfo_room.pb.h" #include "pb/serverinfo_user.pb.h" +#include + Q_DECLARE_METATYPE(ServerInfo_Ban) Q_DECLARE_METATYPE(ServerInfo_User) Q_DECLARE_METATYPE(ServerInfo_Room) diff --git a/common/server_player.cpp b/common/server_player.cpp index 9a199cad..fa19c63b 100644 --- a/common/server_player.cpp +++ b/common/server_player.cpp @@ -1,18 +1,8 @@ #include "server_player.h" + #include "color.h" #include "decklist.h" #include "get_pb_extension.h" -#include "rng_abstract.h" -#include "server.h" -#include "server_abstractuserinterface.h" -#include "server_arrow.h" -#include "server_card.h" -#include "server_cardzone.h" -#include "server_counter.h" -#include "server_database_interface.h" -#include "server_game.h" -#include "server_room.h" - #include "pb/command_attach_card.pb.h" #include "pb/command_change_zone_properties.pb.h" #include "pb/command_concede.pb.h" @@ -46,6 +36,14 @@ #include "pb/command_shuffle.pb.h" #include "pb/command_stop_dump_zone.pb.h" #include "pb/command_undo_draw.pb.h" +#include "pb/context_concede.pb.h" +#include "pb/context_connection_state_changed.pb.h" +#include "pb/context_deck_select.pb.h" +#include "pb/context_move_card.pb.h" +#include "pb/context_mulligan.pb.h" +#include "pb/context_ready_start.pb.h" +#include "pb/context_set_sideboard_lock.pb.h" +#include "pb/context_undo_draw.pb.h" #include "pb/event_attach_card.pb.h" #include "pb/event_change_zone_properties.pb.h" #include "pb/event_create_arrow.pb.h" @@ -73,15 +71,16 @@ #include "pb/response_dump_zone.pb.h" #include "pb/serverinfo_player.pb.h" #include "pb/serverinfo_user.pb.h" - -#include "pb/context_concede.pb.h" -#include "pb/context_connection_state_changed.pb.h" -#include "pb/context_deck_select.pb.h" -#include "pb/context_move_card.pb.h" -#include "pb/context_mulligan.pb.h" -#include "pb/context_ready_start.pb.h" -#include "pb/context_set_sideboard_lock.pb.h" -#include "pb/context_undo_draw.pb.h" +#include "rng_abstract.h" +#include "server.h" +#include "server_abstractuserinterface.h" +#include "server_arrow.h" +#include "server_card.h" +#include "server_cardzone.h" +#include "server_counter.h" +#include "server_database_interface.h" +#include "server_game.h" +#include "server_room.h" #include #include diff --git a/common/server_player.h b/common/server_player.h index b31cf64e..a7f3eaeb 100644 --- a/common/server_player.h +++ b/common/server_player.h @@ -1,16 +1,16 @@ #ifndef PLAYER_H #define PLAYER_H +#include "pb/card_attributes.pb.h" +#include "pb/response.pb.h" #include "server_arrowtarget.h" #include "serverinfo_user_container.h" + #include #include #include #include -#include "pb/card_attributes.pb.h" -#include "pb/response.pb.h" - class DeckList; class Server_Game; class Server_CardZone; diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp index e49c5b0a..96715d4e 100644 --- a/common/server_protocolhandler.cpp +++ b/common/server_protocolhandler.cpp @@ -1,4 +1,5 @@ #include "server_protocolhandler.h" + #include "featureset.h" #include "get_pb_extension.h" #include "pb/commands.pb.h" @@ -19,6 +20,7 @@ #include "server_game.h" #include "server_player.h" #include "server_room.h" + #include #include #include diff --git a/common/server_protocolhandler.h b/common/server_protocolhandler.h index f3d82a27..65086259 100644 --- a/common/server_protocolhandler.h +++ b/common/server_protocolhandler.h @@ -5,6 +5,7 @@ #include "pb/server_message.pb.h" #include "server.h" #include "server_abstractuserinterface.h" + #include #include diff --git a/common/server_remoteuserinterface.cpp b/common/server_remoteuserinterface.cpp index ca0fc7dc..ec9b5d88 100644 --- a/common/server_remoteuserinterface.cpp +++ b/common/server_remoteuserinterface.cpp @@ -1,4 +1,5 @@ #include "server_remoteuserinterface.h" + #include "pb/serverinfo_user.pb.h" #include "server.h" diff --git a/common/server_response_containers.cpp b/common/server_response_containers.cpp index c487e7f2..415e4af9 100644 --- a/common/server_response_containers.cpp +++ b/common/server_response_containers.cpp @@ -1,5 +1,7 @@ #include "server_response_containers.h" + #include "server_game.h" + #include GameEventStorageItem::GameEventStorageItem(const ::google::protobuf::Message &_event, diff --git a/common/server_response_containers.h b/common/server_response_containers.h index 404e8773..94f49f11 100644 --- a/common/server_response_containers.h +++ b/common/server_response_containers.h @@ -2,6 +2,7 @@ #define SERVER_RESPONSE_CONTAINERS_H #include "pb/server_message.pb.h" + #include #include diff --git a/common/server_room.cpp b/common/server_room.cpp index a95f4eb6..369b5f78 100644 --- a/common/server_room.cpp +++ b/common/server_room.cpp @@ -1,8 +1,4 @@ #include "server_room.h" -#include "server_game.h" -#include "server_protocolhandler.h" -#include -#include #include "pb/commands.pb.h" #include "pb/event_join_room.pb.h" @@ -12,6 +8,11 @@ #include "pb/room_commands.pb.h" #include "pb/serverinfo_chat_message.pb.h" #include "pb/serverinfo_room.pb.h" +#include "server_game.h" +#include "server_protocolhandler.h" + +#include +#include #include Server_Room::Server_Room(int _id, diff --git a/common/server_room.h b/common/server_room.h index ec4b82b9..7f55aee8 100644 --- a/common/server_room.h +++ b/common/server_room.h @@ -4,6 +4,7 @@ #include "pb/response.pb.h" #include "pb/serverinfo_chat_message.pb.h" #include "serverinfo_user_container.h" + #include #include #include diff --git a/common/serverinfo_user_container.cpp b/common/serverinfo_user_container.cpp index cf8c9888..1c261040 100644 --- a/common/serverinfo_user_container.cpp +++ b/common/serverinfo_user_container.cpp @@ -1,4 +1,5 @@ #include "serverinfo_user_container.h" + #include "pb/serverinfo_user.pb.h" ServerInfo_User_Container::ServerInfo_User_Container(ServerInfo_User *_userInfo) : userInfo(_userInfo) diff --git a/common/user_level.h b/common/user_level.h index 57daee49..c682a93b 100644 --- a/common/user_level.h +++ b/common/user_level.h @@ -7,6 +7,7 @@ #undef TYPE_BOOL #endif #include "pb/serverinfo_user.pb.h" + #include Q_DECLARE_FLAGS(UserLevelFlags, ServerInfo_User::UserLevelFlag) diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp index 9c4c0575..889b8732 100644 --- a/oracle/src/main.cpp +++ b/oracle/src/main.cpp @@ -1,3 +1,9 @@ +#include "main.h" + +#include "oraclewizard.h" +#include "settingscache.h" +#include "thememanager.h" + #include #include #include @@ -5,11 +11,6 @@ #include #include -#include "main.h" -#include "oraclewizard.h" -#include "settingscache.h" -#include "thememanager.h" - QTranslator *translator, *qtTranslator; SettingsCache *settingsCache; ThemeManager *themeManager; diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index e7d09d62..aa5081eb 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -1,13 +1,13 @@ #include "oracleimporter.h" + #include "carddbparser/cockatricexml4.h" +#include "qt-json/json.h" #include #include #include #include -#include "qt-json/json.h" - SplitCardPart::SplitCardPart(const int _index, const QString &_text, const QVariantHash &_properties, diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index 4d87ec6b..e4c10a1d 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -1,3 +1,10 @@ +#include "oraclewizard.h" + +#include "main.h" +#include "oracleimporter.h" +#include "settingscache.h" +#include "version_string.h" + #include #include #include @@ -20,12 +27,6 @@ #include #include -#include "main.h" -#include "oracleimporter.h" -#include "oraclewizard.h" -#include "settingscache.h" -#include "version_string.h" - #ifdef HAS_LZMA #include "lzma/decompress.h" #endif diff --git a/oracle/src/pagetemplates.cpp b/oracle/src/pagetemplates.cpp index 01220310..609c0b6b 100644 --- a/oracle/src/pagetemplates.cpp +++ b/oracle/src/pagetemplates.cpp @@ -1,3 +1,7 @@ +#include "pagetemplates.h" + +#include "oraclewizard.h" + #include #include #include @@ -10,9 +14,6 @@ #include #include -#include "oraclewizard.h" -#include "pagetemplates.h" - SimpleDownloadFilePage::SimpleDownloadFilePage(QWidget *parent) : OracleWizardPage(parent) { urlLabel = new QLabel(this); diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp index 646248b0..b23f6036 100644 --- a/servatrice/src/isl_interface.cpp +++ b/servatrice/src/isl_interface.cpp @@ -1,11 +1,7 @@ #include "isl_interface.h" -#include "main.h" -#include "server_logger.h" -#include "server_protocolhandler.h" -#include "server_room.h" -#include #include "get_pb_extension.h" +#include "main.h" #include "pb/event_game_joined.pb.h" #include "pb/event_join_room.pb.h" #include "pb/event_leave_room.pb.h" @@ -16,6 +12,11 @@ #include "pb/event_user_left.pb.h" #include "pb/event_user_message.pb.h" #include "pb/isl_message.pb.h" +#include "server_logger.h" +#include "server_protocolhandler.h" +#include "server_room.h" + +#include #include void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privateKey) diff --git a/servatrice/src/isl_interface.h b/servatrice/src/isl_interface.h index 7296d0a4..e9c7857d 100644 --- a/servatrice/src/isl_interface.h +++ b/servatrice/src/isl_interface.h @@ -5,6 +5,7 @@ #include "pb/serverinfo_room.pb.h" #include "pb/serverinfo_user.pb.h" #include "servatrice.h" + #include #include diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp index ec4f8fe5..b9a61d5f 100644 --- a/servatrice/src/main.cpp +++ b/servatrice/src/main.cpp @@ -18,14 +18,6 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include - #include "passwordhasher.h" #include "rng_sfmt.h" #include "servatrice.h" @@ -34,7 +26,15 @@ #include "signalhandler.h" #include "smtpclient.h" #include "version_string.h" + +#include +#include +#include +#include +#include +#include #include +#include RNG_Abstract *rng; ServerLogger *logger; diff --git a/servatrice/src/passwordhasher.cpp b/servatrice/src/passwordhasher.cpp index 32c5ea89..83085d6f 100644 --- a/servatrice/src/passwordhasher.cpp +++ b/servatrice/src/passwordhasher.cpp @@ -1,6 +1,7 @@ #include "passwordhasher.h" #include "rng_sfmt.h" + #include void PasswordHasher::initialize() diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index ec6242e6..ea464005 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -18,6 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "servatrice.h" + #include "decklist.h" #include "featureset.h" #include "isl_interface.h" @@ -32,6 +33,7 @@ #include "serversocketinterface.h" #include "settingscache.h" #include "smtpclient.h" + #include #include #include diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h index e43ede22..67053590 100644 --- a/servatrice/src/servatrice.h +++ b/servatrice/src/servatrice.h @@ -21,6 +21,7 @@ #define SERVATRICE_H #include "server.h" + #include #include #include diff --git a/servatrice/src/servatrice_connection_pool.cpp b/servatrice/src/servatrice_connection_pool.cpp index 353b23c8..3edb4da2 100644 --- a/servatrice/src/servatrice_connection_pool.cpp +++ b/servatrice/src/servatrice_connection_pool.cpp @@ -1,5 +1,7 @@ #include "servatrice_connection_pool.h" + #include "servatrice_database_interface.h" + #include Servatrice_ConnectionPool::Servatrice_ConnectionPool(Servatrice_DatabaseInterface *_databaseInterface) diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index 955dfb01..648f939e 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -1,10 +1,12 @@ #include "servatrice_database_interface.h" + #include "decklist.h" #include "passwordhasher.h" #include "pb/game_replay.pb.h" #include "servatrice.h" #include "serversocketinterface.h" #include "settingscache.h" + #include #include #include diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h index 5628fb42..0107e02b 100644 --- a/servatrice/src/servatrice_database_interface.h +++ b/servatrice/src/servatrice_database_interface.h @@ -1,14 +1,14 @@ #ifndef SERVATRICE_DATABASE_INTERFACE_H #define SERVATRICE_DATABASE_INTERFACE_H +#include "server.h" +#include "server_database_interface.h" + #include #include #include #include -#include "server.h" -#include "server_database_interface.h" - #define DATABASE_SCHEMA_VERSION 27 class Servatrice; diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp index 99d78060..59871a3f 100644 --- a/servatrice/src/server_logger.cpp +++ b/servatrice/src/server_logger.cpp @@ -1,5 +1,7 @@ #include "server_logger.h" + #include "settingscache.h" + #include #include #include diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index 02e1d6ef..77e99d6a 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include "serversocketinterface.h" + #include "decklist.h" #include "main.h" #include "pb/command_deck_del.pb.h" @@ -61,6 +62,8 @@ #include "server_player.h" #include "server_response_containers.h" #include "settingscache.h" +#include "version_string.h" + #include #include #include @@ -68,9 +71,6 @@ #include #include #include - -#include "version_string.h" -#include #include static const int protocolVersion = 14; diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h index f5422800..71c59dac 100644 --- a/servatrice/src/serversocketinterface.h +++ b/servatrice/src/serversocketinterface.h @@ -21,6 +21,7 @@ #define SERVERSOCKETINTERFACE_H #include "server_protocolhandler.h" + #include #include #include diff --git a/servatrice/src/settingscache.cpp b/servatrice/src/settingscache.cpp index f8702074..8d9c0c23 100644 --- a/servatrice/src/settingscache.cpp +++ b/servatrice/src/settingscache.cpp @@ -1,4 +1,5 @@ #include "settingscache.h" + #include #include #include diff --git a/servatrice/src/signalhandler.cpp b/servatrice/src/signalhandler.cpp index 9fd9e486..0592c632 100644 --- a/servatrice/src/signalhandler.cpp +++ b/servatrice/src/signalhandler.cpp @@ -1,9 +1,10 @@ -#include +#include "signalhandler.h" #include "main.h" #include "server_logger.h" #include "settingscache.h" -#include "signalhandler.h" + +#include #ifdef Q_OS_UNIX #include