clangify everything with the new header sorting (#3908)

common/decklist.cpp

@@ -1,4 +1,5 @@
 #include "decklist.h"
+
 #include <QCryptographicHash>
 #include <QDebug>
 #include <QFile>

common/decklist.h

@@ -12,7 +12,6 @@
 // Required on Mac. Forward declaration doesn't work. Don't ask why.
 #include <QtCore/QXmlStreamReader>
 #include <QtCore/QXmlStreamWriter>
-
 #include <common/pb/move_card_to_zone.pb.h>
 
 class CardDatabase;

common/expression.cpp

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

common/featureset.cpp

@@ -1,4 +1,5 @@
 #include "featureset.h"
+
 #include <QDebug>
 #include <QMap>
 

common/get_pb_extension.cpp

@@ -1,4 +1,5 @@
 #include "get_pb_extension.h"
+
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>
 

common/rng_abstract.cpp

@@ -1,4 +1,5 @@
 #include "rng_abstract.h"
+
 #include <QDebug>
 
 QVector<int> RNG_Abstract::makeNumbersVector(int n, int min, int max)

common/rng_sfmt.cpp

@@ -1,4 +1,5 @@
 #include "rng_sfmt.h"
+
 #include <QDateTime>
 #include <algorithm>
 #include <climits>

common/rng_sfmt.h

@@ -3,6 +3,7 @@
 
 #include "rng_abstract.h"
 #include "sfmt/SFMT.h"
+
 #include <QMutex>
 #include <climits>
 

common/room_message_type.h

@@ -7,6 +7,7 @@
 #undef TYPE_BOOL
 #endif
 #include "pb/event_room_say.pb.h"
+
 #include <QFlags>
 
 Q_DECLARE_FLAGS(RoomMessageTypeFlags, Event_RoomSay::RoomMessageType)

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 <QCoreApplication>
 #include <QDebug>
 #include <QThread>

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 <QMap>
 #include <QMultiMap>
 #include <QMutex>

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 <QDebug>
 #include <QList>
 #include <QPair>

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 <QMap>
 #include <QMutex>
 #include <QPair>

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"

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"

common/server_card.h

@@ -22,6 +22,7 @@
 
 #include "pb/card_attributes.pb.h"
 #include "server_arrowtarget.h"
+
 #include <QMap>
 #include <QString>
 

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 <QDebug>
 #include <QSet>
 

common/server_cardzone.h

@@ -21,6 +21,7 @@
 #define SERVER_CARDZONE_H
 
 #include "pb/serverinfo_zone.pb.h"
+
 #include <QList>
 #include <QMap>
 #include <QSet>

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)

common/server_counter.h

@@ -21,6 +21,7 @@
 #define SERVER_COUNTER_H
 
 #include "pb/color.pb.h"
+
 #include <QString>
 
 class ServerInfo_Counter;

common/server_database_interface.h

@@ -2,6 +2,7 @@
 #define SERVER_DATABASE_INTERFACE_H
 
 #include "server.h"
+
 #include <QObject>
 
 class Server_DatabaseInterface : public QObject

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 <QDebug>
 #include <QTimer>
 #include <google/protobuf/descriptor.h>

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 <QDateTime>
 #include <QMap>
 #include <QMutex>

common/server_metatypes.h

@@ -1,8 +1,6 @@
 #ifndef SERVER_METATYPES_H
 #define SERVER_METATYPES_H
 
-#include <QMetaType>
-
 #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 <QMetaType>
+
 Q_DECLARE_METATYPE(ServerInfo_Ban)
 Q_DECLARE_METATYPE(ServerInfo_User)
 Q_DECLARE_METATYPE(ServerInfo_Room)

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 <QDebug>
 #include <algorithm>

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 <QList>
 #include <QMap>
 #include <QMutex>
 #include <QString>
 
-#include "pb/card_attributes.pb.h"
-#include "pb/response.pb.h"
-
 class DeckList;
 class Server_Game;
 class Server_CardZone;

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 <QDateTime>
 #include <QDebug>
 #include <google/protobuf/descriptor.h>

common/server_protocolhandler.h

@@ -5,6 +5,7 @@
 #include "pb/server_message.pb.h"
 #include "server.h"
 #include "server_abstractuserinterface.h"
+
 #include <QObject>
 #include <QPair>
 

common/server_remoteuserinterface.cpp

@@ -1,4 +1,5 @@
 #include "server_remoteuserinterface.h"
+
 #include "pb/serverinfo_user.pb.h"
 #include "server.h"
 

common/server_response_containers.cpp

@@ -1,5 +1,7 @@
 #include "server_response_containers.h"
+
 #include "server_game.h"
+
 #include <google/protobuf/descriptor.h>
 
 GameEventStorageItem::GameEventStorageItem(const ::google::protobuf::Message &_event,

common/server_response_containers.h

@@ -2,6 +2,7 @@
 #define SERVER_RESPONSE_CONTAINERS_H
 
 #include "pb/server_message.pb.h"
+
 #include <QList>
 #include <QPair>
 

common/server_room.cpp

@@ -1,8 +1,4 @@
 #include "server_room.h"
-#include "server_game.h"
-#include "server_protocolhandler.h"
-#include <QDateTime>
-#include <QDebug>
 
 #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 <QDateTime>
+#include <QDebug>
 #include <google/protobuf/descriptor.h>
 
 Server_Room::Server_Room(int _id,

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 <QList>
 #include <QMap>
 #include <QMutex>

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)

common/user_level.h

@@ -7,6 +7,7 @@
 #undef TYPE_BOOL
 #endif
 #include "pb/serverinfo_user.pb.h"
+
 #include <QFlags>
 
 Q_DECLARE_FLAGS(UserLevelFlags, ServerInfo_User::UserLevelFlag)