clangify everything with the new header sorting (#3908)

cockatrice/src/abstractcarddragitem.cpp

@@ -1,5 +1,7 @@
 #include "abstractcarddragitem.h"
+
 #include "carddatabase.h"
+
 #include <QCursor>
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>

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 <google/protobuf/descriptor.h>
 
 AbstractClient::AbstractClient(QObject *parent) : QObject(parent), nextCmdId(0), status(StatusDisconnected)

cockatrice/src/abstractclient.h

@@ -3,6 +3,7 @@
 
 #include "pb/response.pb.h"
 #include "pb/serverinfo_user.pb.h"
+
 #include <QMutex>
 #include <QObject>
 #include <QVariant>

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 <QAction>
 #include <QApplication>
 #include <QGraphicsSceneHoverEvent>

cockatrice/src/abstractgraphicsitem.cpp

@@ -1,4 +1,5 @@
 #include "abstractgraphicsitem.h"
+
 #include <QPainter>
 
 void AbstractGraphicsItem::paintNumberEllipse(int number,

cockatrice/src/arrowitem.cpp

@@ -1,22 +1,22 @@
 #define _USE_MATH_DEFINES
-#include <cmath>
-
 #include "arrowitem.h"
+
 #include "carddatabase.h"
 #include "carditem.h"
 #include "cardzone.h"
-#include "player.h"
-#include "playertarget.h"
-#include "settingscache.h"
-#include <QDebug>
-#include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
-
 #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 <QDebug>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+#include <cmath>
 
 ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color)
     : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), color(_color),

cockatrice/src/arrowtarget.cpp

@@ -1,4 +1,5 @@
 #include "arrowtarget.h"
+
 #include "arrowitem.h"
 #include "player.h"
 

cockatrice/src/arrowtarget.h

@@ -2,6 +2,7 @@
 #define ARROWTARGET_H
 
 #include "abstractgraphicsitem.h"
+
 #include <QList>
 
 class Player;

cockatrice/src/carddatabase.cpp

@@ -1,4 +1,5 @@
 #include "carddatabase.h"
+
 #include "carddbparser/cockatricexml3.h"
 #include "carddbparser/cockatricexml4.h"
 #include "game_specific_terms.h"

cockatrice/src/carddatabasemodel.cpp

@@ -1,5 +1,7 @@
 #include "carddatabasemodel.h"
+
 #include "filtertree.h"
+
 #include <QMap>
 
 #define CARDDBMODEL_COLUMNS 6

cockatrice/src/carddatabasemodel.h

@@ -3,6 +3,7 @@
 
 #include "carddatabase.h"
 #include "filter_string.h"
+
 #include <QAbstractListModel>
 #include <QList>
 #include <QSet>

cockatrice/src/carddbparser/carddatabaseparser.h

@@ -1,11 +1,11 @@
 #ifndef CARDDATABASE_PARSER_H
 #define CARDDATABASE_PARSER_H
 
+#include "../carddatabase.h"
+
 #include <QIODevice>
 #include <QString>
 
-#include "../carddatabase.h"
-
 class ICardDatabaseParser : public QObject
 {
 public:

cockatrice/src/carddbparser/cockatricexml3.h

@@ -1,10 +1,10 @@
 #ifndef COCKATRICE_XML3_H
 #define COCKATRICE_XML3_H
 
-#include <QXmlStreamReader>
-
 #include "carddatabaseparser.h"
 
+#include <QXmlStreamReader>
+
 class CockatriceXml3Parser : public ICardDatabaseParser
 {
     Q_OBJECT

cockatrice/src/carddbparser/cockatricexml4.h

@@ -1,10 +1,10 @@
 #ifndef COCKATRICE_XML4_H
 #define COCKATRICE_XML4_H
 
-#include <QXmlStreamReader>
-
 #include "carddatabaseparser.h"
 
+#include <QXmlStreamReader>
+
 class CockatriceXml4Parser : public ICardDatabaseParser
 {
     Q_OBJECT

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 <QCursor>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>

cockatrice/src/cardframe.cpp

@@ -1,5 +1,3 @@
-#include <utility>
-
 #include "cardframe.h"
 
 #include "cardinfopicture.h"
@@ -10,6 +8,7 @@
 
 #include <QSplitter>
 #include <QVBoxLayout>
+#include <utility>
 
 CardFrame::CardFrame(const QString &cardName, QWidget *parent) : QTabWidget(parent), info(nullptr), cardTextOnly(false)
 {

cockatrice/src/cardframe.h

@@ -1,10 +1,10 @@
 #ifndef CARDFRAME_H
 #define CARDFRAME_H
 
-#include <QTabWidget>
-
 #include "carddatabase.h"
 
+#include <QTabWidget>
+
 class AbstractCardItem;
 class CardInfoPicture;
 class CardInfoText;

cockatrice/src/cardinfopicture.cpp

@@ -1,13 +1,13 @@
 #include "cardinfopicture.h"
 
-#include <QPainter>
-#include <QStyle>
-#include <QWidget>
-
 #include "carditem.h"
 #include "main.h"
 #include "pictureloader.h"
 
+#include <QPainter>
+#include <QStyle>
+#include <QWidget>
+
 CardInfoPicture::CardInfoPicture(QWidget *parent) : QWidget(parent), info(nullptr), pixmapDirty(true)
 {
     setMinimumHeight(100);

cockatrice/src/cardinfopicture.h

@@ -1,10 +1,10 @@
 #ifndef CARDINFOPICTURE_H
 #define CARDINFOPICTURE_H
 
-#include <QWidget>
-
 #include "carddatabase.h"
 
+#include <QWidget>
+
 class AbstractCardItem;
 
 class CardInfoPicture : public QWidget

cockatrice/src/cardinfotext.cpp

@@ -1,4 +1,5 @@
 #include "cardinfotext.h"
+
 #include "carditem.h"
 #include "game_specific_terms.h"
 #include "main.h"

cockatrice/src/cardinfotext.h

@@ -1,9 +1,9 @@
 #ifndef CARDINFOTEXT_H
 #define CARDINFOTEXT_H
 
-#include <QFrame>
-
 #include "carddatabase.h"
+
+#include <QFrame>
 class QLabel;
 class QTextEdit;
 

cockatrice/src/cardinfowidget.cpp

@@ -1,11 +1,12 @@
-#include <utility>
+#include "cardinfowidget.h"
 
 #include "cardinfopicture.h"
 #include "cardinfotext.h"
-#include "cardinfowidget.h"
 #include "carditem.h"
 #include "main.h"
+
 #include <QApplication>
+#include <utility>
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
 #include <QScreen>
 #else

cockatrice/src/cardinfowidget.h

@@ -1,12 +1,12 @@
 #ifndef CARDINFOWIDGET_H
 #define CARDINFOWIDGET_H
 
+#include "carddatabase.h"
+
 #include <QComboBox>
 #include <QFrame>
 #include <QStringList>
 
-#include "carddatabase.h"
-
 class CardInfoPicture;
 class CardInfoText;
 class AbstractCardItem;

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 <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QMenu>

cockatrice/src/cardlist.cpp

@@ -1,4 +1,5 @@
 #include "cardlist.h"
+
 #include "carddatabase.h"
 #include "carditem.h"
 

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 <QAction>
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>

cockatrice/src/cardzone.h

@@ -4,6 +4,7 @@
 #include "abstractgraphicsitem.h"
 #include "cardlist.h"
 #include "translation.h"
+
 #include <QString>
 
 class Player;

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 <QApplication>
 #include <QDateTime>
 #include <QDesktopServices>

cockatrice/src/chatview/chatview.h

@@ -6,6 +6,7 @@
 #include "room_message_type.h"
 #include "user_level.h"
 #include "userlistProxy.h"
+
 #include <QAction>
 #include <QColor>
 #include <QTextBrowser>

cockatrice/src/counter_general.cpp

@@ -1,6 +1,8 @@
 #include "counter_general.h"
+
 #include "abstractgraphicsitem.h"
 #include "pixmapgenerator.h"
+
 #include <QPainter>
 
 GeneralCounter::GeneralCounter(Player *_player,

cockatrice/src/deck_loader.cpp

@@ -1,7 +1,9 @@
 #include "deck_loader.h"
+
 #include "carddatabase.h"
 #include "decklist.h"
 #include "main.h"
+
 #include <QDebug>
 #include <QFile>
 #include <QStringList>

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 <QBrush>
 #include <QFile>
 #include <QFont>

cockatrice/src/decklistmodel.h

@@ -2,6 +2,7 @@
 #define DECKLISTMODEL_H
 
 #include "decklist.h"
+
 #include <QAbstractItemModel>
 #include <QList>
 

cockatrice/src/deckstats_interface.cpp

@@ -1,5 +1,7 @@
 #include "deckstats_interface.h"
+
 #include "decklist.h"
+
 #include <QDesktopServices>
 #include <QMessageBox>
 #include <QNetworkAccessManager>

cockatrice/src/deckstats_interface.h

@@ -3,6 +3,7 @@
 
 #include "carddatabase.h"
 #include "decklist.h"
+
 #include <QObject>
 
 class QByteArray;

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 <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QMouseEvent>

cockatrice/src/deckview.h

@@ -2,14 +2,14 @@
 #define DECKVIEW_H
 
 #include "abstractcarddragitem.h"
+#include "pb/move_card_to_zone.pb.h"
+
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QMap>
 #include <QMultiMap>
 #include <QPixmap>
 
-#include "pb/move_card_to_zone.pb.h"
-
 class DeckList;
 class InnerDecklistNode;
 class CardInfo;

cockatrice/src/dlg_connect.cpp

@@ -1,6 +1,8 @@
 #include "dlg_connect.h"
+
 #include "settingscache.h"
 #include "userconnection_information.h"
+
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDebug>

cockatrice/src/dlg_connect.h

@@ -3,6 +3,7 @@
 
 #include "handle_public_servers.h"
 #include "userconnection_information.h"
+
 #include <QDialog>
 #include <QLineEdit>
 

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 <QCheckBox>
 #include <QCloseEvent>
 #include <QComboBox>
@@ -12,13 +20,6 @@
 #include <QTreeView>
 #include <QVBoxLayout>
 
-#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)
 {

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 <QApplication>
 #include <QCheckBox>
 #include <QDialogButtonBox>
@@ -15,9 +19,6 @@
 #include <QSpinBox>
 #include <QWizard>
 
-#include "pb/serverinfo_game.pb.h"
-#include "pending_command.h"
-
 void DlgCreateGame::sharedCtor()
 {
     rememberGameSettings = new QCheckBox(tr("Re&member settings"));

cockatrice/src/dlg_edit_avatar.cpp

@@ -1,3 +1,5 @@
+#include "dlg_edit_avatar.h"
+
 #include <QBuffer>
 #include <QDebug>
 #include <QDialogButtonBox>
@@ -8,8 +10,6 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include "dlg_edit_avatar.h"
-
 DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent)
 {
     imageLabel = new QLabel(tr("No image chosen."));

cockatrice/src/dlg_edit_password.cpp

@@ -1,12 +1,13 @@
+#include "dlg_edit_password.h"
+
+#include "settingscache.h"
+
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
 
-#include "dlg_edit_password.h"
-#include "settingscache.h"
-
 DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent)
 {
 

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 <QAction>
 #include <QComboBox>
 #include <QDialogButtonBox>

cockatrice/src/dlg_edit_tokens.h

@@ -2,6 +2,7 @@
 #define DLG_EDIT_TOKENS_H
 
 #include "carddatabase.h"
+
 #include <QDialog>
 
 class QModelIndex;

cockatrice/src/dlg_edit_user.cpp

@@ -1,12 +1,13 @@
+#include "dlg_edit_user.h"
+
+#include "settingscache.h"
+
 #include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 
-#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:"));

cockatrice/src/dlg_filter_games.cpp

@@ -1,4 +1,5 @@
 #include "dlg_filter_games.h"
+
 #include <QCheckBox>
 #include <QCryptographicHash>
 #include <QDialogButtonBox>

cockatrice/src/dlg_filter_games.h

@@ -2,6 +2,7 @@
 #define DLG_FILTER_GAMES_H
 
 #include "gamesmodel.h"
+
 #include <QCheckBox>
 #include <QDialog>
 #include <QMap>

cockatrice/src/dlg_forgotpasswordchallenge.cpp

@@ -1,3 +1,7 @@
+#include "dlg_forgotpasswordchallenge.h"
+
+#include "settingscache.h"
+
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@@ -6,9 +10,6 @@
 #include <QLabel>
 #include <QMessageBox>
 
-#include "dlg_forgotpasswordchallenge.h"
-#include "settingscache.h"
-
 DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent)
 {
 

cockatrice/src/dlg_forgotpasswordrequest.cpp

@@ -1,3 +1,7 @@
+#include "dlg_forgotpasswordrequest.h"
+
+#include "settingscache.h"
+
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@@ -6,9 +10,6 @@
 #include <QLabel>
 #include <QMessageBox>
 
-#include "dlg_forgotpasswordrequest.h"
-#include "settingscache.h"
-
 DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent)
 {
 

cockatrice/src/dlg_forgotpasswordreset.cpp

@@ -1,3 +1,7 @@
+#include "dlg_forgotpasswordreset.h"
+
+#include "settingscache.h"
+
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@@ -6,9 +10,6 @@
 #include <QLabel>
 #include <QMessageBox>
 
-#include "dlg_forgotpasswordreset.h"
-#include "settingscache.h"
-
 DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent)
 {
 

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 <QApplication>
 #include <QClipboard>
 #include <QDialogButtonBox>

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 <QDialogButtonBox>
 #include <QHBoxLayout>
 #include <QPushButton>

cockatrice/src/dlg_register.cpp

@@ -1,3 +1,8 @@
+#include "dlg_register.h"
+
+#include "pb/serverinfo_user.pb.h"
+#include "settingscache.h"
+
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@@ -6,10 +11,6 @@
 #include <QLabel>
 #include <QMessageBox>
 
-#include "dlg_register.h"
-#include "pb/serverinfo_user.pb.h"
-#include "settingscache.h"
-
 DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
 {
     hostLabel = new QLabel(tr("&Host:"));

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 <QAction>
 #include <QApplication>
 #include <QCheckBox>

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 <QCheckBox>
 #include <QDate>
 #include <QDebug>
@@ -6,10 +11,6 @@
 #include <QLabel>
 #include <QPushButton>
 
-#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

cockatrice/src/dlg_update.cpp

@@ -1,20 +1,20 @@
-#include <QDesktopServices>
-#include <QMessageBox>
-#include <QProgressDialog>
-#include <QVBoxLayout>
-#include <QtNetwork>
-
-#include <QApplication>
-#include <QLabel>
-#include <QProgressBar>
-#include <QPushButton>
-#include <version_string.h>
-
 #include "dlg_update.h"
+
 #include "releasechannel.h"
 #include "settingscache.h"
 #include "window_main.h"
 
+#include <QApplication>
+#include <QDesktopServices>
+#include <QLabel>
+#include <QMessageBox>
+#include <QProgressBar>
+#include <QProgressDialog>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QtNetwork>
+#include <version_string.h>
+
 DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent)
 {
 

cockatrice/src/dlg_update.h

@@ -1,11 +1,11 @@
 #ifndef DLG_UPDATE_H
 #define DLG_UPDATE_H
 
+#include "update_downloader.h"
+
 #include <QDialogButtonBox>
 #include <QProgressDialog>
 #include <QtNetwork>
-
-#include "update_downloader.h"
 class Release;
 
 class DlgUpdate : public QDialog

cockatrice/src/dlg_viewlog.cpp

@@ -1,4 +1,5 @@
 #include "dlg_viewlog.h"
+
 #include "logger.h"
 #include "settingscache.h"
 

cockatrice/src/filter_string.cpp

@@ -1,4 +1,5 @@
 #include "filter_string.h"
+
 #include "../../common/lib/peglib.h"
 
 #include <QByteArray>

cockatrice/src/filtertree.cpp

@@ -1,4 +1,5 @@
 #include "filtertree.h"
+
 #include "cardfilter.h"
 
 #include <QList>

cockatrice/src/filtertree.h

@@ -5,6 +5,7 @@
 
 #include "carddatabase.h"
 #include "cardfilter.h"
+
 #include <QList>
 #include <QMap>
 #include <QObject>

cockatrice/src/filtertreemodel.cpp

@@ -1,6 +1,8 @@
 #include "filtertreemodel.h"
+
 #include "cardfilter.h"
 #include "filtertree.h"
+
 #include <QFont>
 
 FilterTreeModel::FilterTreeModel(QObject *parent) : QAbstractItemModel(parent)

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 <QAction>
 #include <QBasicTimer>
 #include <QDebug>

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 <QApplication>
 #include <QCheckBox>
 #include <QDebug>

cockatrice/src/gameselector.h

@@ -2,6 +2,7 @@
 #define GAMESELECTOR_H
 
 #include "gametypemap.h"
+
 #include <QGroupBox>
 #include <common/pb/event_add_to_list.pb.h>
 #include <common/pb/event_remove_from_list.pb.h>

cockatrice/src/gamesmodel.cpp

@@ -1,4 +1,5 @@
 #include "gamesmodel.h"
+
 #include "pb/serverinfo_game.pb.h"
 #include "pixmapgenerator.h"
 #include "settingscache.h"

cockatrice/src/gamesmodel.h

@@ -4,6 +4,7 @@
 #include "gametypemap.h"
 #include "pb/serverinfo_game.pb.h"
 #include "tab_supervisor.h"
+
 #include <QAbstractTableModel>
 #include <QList>
 #include <QSet>

cockatrice/src/gameview.cpp

@@ -1,6 +1,8 @@
 #include "gameview.h"
+
 #include "gamescene.h"
 #include "settingscache.h"
+
 #include <QAction>
 #include <QResizeEvent>
 #include <QRubberBand>

cockatrice/src/handcounter.cpp

@@ -1,5 +1,7 @@
 #include "handcounter.h"
+
 #include "cardzone.h"
+
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <QPixmapCache>

cockatrice/src/handcounter.h

@@ -2,6 +2,7 @@
 #define HANDCOUNTER_H
 
 #include "abstractgraphicsitem.h"
+
 #include <QString>
 
 class QPainter;

cockatrice/src/handle_public_servers.cpp

@@ -1,5 +1,7 @@
 #include "handle_public_servers.h"
+
 #include "settingscache.h"
+
 #include <QJsonDocument>
 #include <QMessageBox>
 #include <QNetworkAccessManager>

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 <QPainter>
 
-#include "pb/command_move_card.pb.h"
+#include <QPainter>
 
 HandZone::HandZone(Player *_p, bool _contentsKnown, int _zoneHeight, QGraphicsItem *parent)
     : SelectZone(_p, "hand", false, false, _contentsKnown, parent), zoneHeight(_zoneHeight)

cockatrice/src/keysignals.cpp

@@ -1,4 +1,5 @@
 #include "keysignals.h"
+
 #include <QKeyEvent>
 
 bool KeySignals::eventFilter(QObject * /*object*/, QEvent *event)

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,

cockatrice/src/localserver.cpp

@@ -1,4 +1,5 @@
 #include "localserver.h"
+
 #include "localserverinterface.h"
 #include "server_room.h"
 

cockatrice/src/localserverinterface.cpp

@@ -1,5 +1,7 @@
 #include "localserverinterface.h"
+
 #include "localserver.h"
+
 #include <QDebug>
 
 LocalServerInterface::LocalServerInterface(LocalServer *_server, Server_DatabaseInterface *_databaseInterface)

cockatrice/src/logger.cpp

@@ -1,4 +1,5 @@
 #include "logger.h"
+
 #include "version_string.h"
 
 #include <QApplication>

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 <QApplication>
 #include <QCryptographicHash>
 #include <QDateTime>

cockatrice/src/messagelogwidget.cpp

@@ -1,14 +1,15 @@
-#include <utility>
+#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 <utility>
+
 const QString MessageLogWidget::tableConstant() const
 {
     static const QString constant("table");

cockatrice/src/pending_command.h

@@ -3,6 +3,7 @@
 
 #include "pb/commands.pb.h"
 #include "pb/response.pb.h"
+
 #include <QVariant>
 
 class PendingCommand : public QObject

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),

cockatrice/src/phasestoolbar.h

@@ -2,6 +2,7 @@
 #define PHASESTOOLBAR_H
 
 #include "abstractgraphicsitem.h"
+
 #include <QFrame>
 #include <QGraphicsObject>
 #include <QList>

cockatrice/src/pictureloader.cpp

@@ -1,4 +1,5 @@
 #include "pictureloader.h"
+
 #include "carddatabase.h"
 #include "main.h"
 #include "settingscache.h"

cockatrice/src/pictureloader.h

@@ -1,12 +1,12 @@
 #ifndef PICTURELOADER_H
 #define PICTURELOADER_H
 
+#include "carddatabase.h"
+
 #include <QList>
 #include <QMap>
 #include <QMutex>
 #include <QNetworkRequest>
-
-#include "carddatabase.h"
 class QNetworkAccessManager;
 class QNetworkReply;
 class QThread;

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 <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 
-#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)
 {

cockatrice/src/pixmapgenerator.cpp

@@ -1,5 +1,7 @@
 #include "pixmapgenerator.h"
+
 #include "pb/serverinfo_user.pb.h"
+
 #include <QApplication>
 #include <QPainter>
 #include <QPalette>

cockatrice/src/pixmapgenerator.h

@@ -1,11 +1,11 @@
 #ifndef PIXMAPGENERATOR_H
 #define PIXMAPGENERATOR_H
 
+#include "user_level.h"
+
 #include <QMap>
 #include <QPixmap>
 
-#include "user_level.h"
-
 class PhasePixmapGenerator
 {
 private:

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 <QDebug>
-#include <QMenu>
-#include <QPainter>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-
 #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 <QDebug>
+#include <QMenu>
+#include <QPainter>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
 
 PlayerArea::PlayerArea(QGraphicsItem *parentItem) : QObject(), QGraphicsItem(parentItem)
 {

cockatrice/src/player.h

@@ -6,6 +6,7 @@
 #include "pb/card_attributes.pb.h"
 #include "pb/game_event.pb.h"
 #include "tearoffmenu.h"
+
 #include <QInputDialog>
 #include <QMap>
 #include <QPoint>

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 <QAction>
 #include <QHeaderView>
 #include <QMenu>
 #include <QMouseEvent>
 
-#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)
 {
 }

cockatrice/src/playertarget.cpp

@@ -1,7 +1,9 @@
 #include "playertarget.h"
+
 #include "pb/serverinfo_user.pb.h"
 #include "pixmapgenerator.h"
 #include "player.h"
+
 #include <QDebug>
 #include <QPainter>
 #include <QPixmapCache>

cockatrice/src/playertarget.h

@@ -3,6 +3,7 @@
 
 #include "abstractcounter.h"
 #include "arrowtarget.h"
+
 #include <QFont>
 #include <QPixmap>
 

cockatrice/src/releasechannel.cpp

@@ -1,4 +1,5 @@
 #include "releasechannel.h"
+
 #include "version_string.h"
 
 #include <QJsonArray>

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 <QCryptographicHash>
 #include <QDebug>
 #include <QHostAddress>

cockatrice/src/remoteclient.h

@@ -2,6 +2,7 @@
 #define REMOTECLIENT_H
 
 #include "abstractclient.h"
+
 #include <QTcpSocket>
 #include <QWebSocket>
 

cockatrice/src/remotedecklist_treewidget.cpp

@@ -1,14 +1,15 @@
 #include "remotedecklist_treewidget.h"
-#include "abstractclient.h"
-#include <QFileIconProvider>
-#include <QHeaderView>
-#include <QSortFilterProxyModel>
 
+#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 <QFileIconProvider>
+#include <QHeaderView>
+#include <QSortFilterProxyModel>
+
 RemoteDeckList_TreeModel::DirectoryNode::DirectoryNode(const QString &_name,
                                                        RemoteDeckList_TreeModel::DirectoryNode *_parent)
     : RemoteDeckList_TreeModel::Node(_name, _parent)

cockatrice/src/remotereplaylist_treewidget.cpp

@@ -1,14 +1,15 @@
 #include "remotereplaylist_treewidget.h"
-#include "abstractclient.h"
-#include <QFileIconProvider>
-#include <QHeaderView>
-#include <QSortFilterProxyModel>
 
+#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 <QFileIconProvider>
+#include <QHeaderView>
+#include <QSortFilterProxyModel>
+
 const int RemoteReplayList_TreeModel::numberOfColumns = 6;
 
 RemoteReplayList_TreeModel::MatchNode::MatchNode(const ServerInfo_ReplayMatch &_matchInfo)

cockatrice/src/remotereplaylist_treewidget.h

@@ -3,6 +3,7 @@
 
 #include "pb/serverinfo_replay.pb.h"
 #include "pb/serverinfo_replay_match.pb.h"
+
 #include <QAbstractItemModel>
 #include <QDateTime>
 #include <QTreeView>

cockatrice/src/replay_timeline_widget.cpp

@@ -1,4 +1,5 @@
 #include "replay_timeline_widget.h"
+
 #include <QPainter>
 #include <QPalette>
 #include <QTimer>