clangify everything with the new header sorting (#3908)

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 <QSslSocket>
 
 #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 <QSslSocket>
 #include <google/protobuf/descriptor.h>
 
 void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privateKey)

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 <QSslCertificate>
 #include <QWaitCondition>
 

servatrice/src/main.cpp

@@ -18,14 +18,6 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <QCommandLineParser>
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QMetaType>
-#include <QTextCodec>
-#include <QtGlobal>
-#include <iostream>
-
 #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 <QCommandLineParser>
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QMetaType>
+#include <QTextCodec>
+#include <QtGlobal>
 #include <google/protobuf/stubs/common.h>
+#include <iostream>
 
 RNG_Abstract *rng;
 ServerLogger *logger;

servatrice/src/passwordhasher.cpp

@@ -1,6 +1,7 @@
 #include "passwordhasher.h"
 
 #include "rng_sfmt.h"
+
 #include <QCryptographicHash>
 
 void PasswordHasher::initialize()

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 <QDateTime>
 #include <QDebug>
 #include <QFile>

servatrice/src/servatrice.h

@@ -21,6 +21,7 @@
 #define SERVATRICE_H
 
 #include "server.h"
+
 #include <QHostAddress>
 #include <QMetaType>
 #include <QMutex>

servatrice/src/servatrice_connection_pool.cpp

@@ -1,5 +1,7 @@
 #include "servatrice_connection_pool.h"
+
 #include "servatrice_database_interface.h"
+
 #include <QThread>
 
 Servatrice_ConnectionPool::Servatrice_ConnectionPool(Servatrice_DatabaseInterface *_databaseInterface)

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 <QChar>
 #include <QDateTime>
 #include <QDebug>

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 <QChar>
 #include <QHash>
 #include <QObject>
 #include <QSqlDatabase>
 
-#include "server.h"
-#include "server_database_interface.h"
-
 #define DATABASE_SCHEMA_VERSION 27
 
 class Servatrice;

servatrice/src/server_logger.cpp

@@ -1,5 +1,7 @@
 #include "server_logger.h"
+
 #include "settingscache.h"
+
 #include <QDateTime>
 #include <QDir>
 #include <QFile>

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 <QDateTime>
 #include <QDebug>
 #include <QHostAddress>
@@ -68,9 +71,6 @@
 #include <QSqlQuery>
 #include <QString>
 #include <iostream>
-
-#include "version_string.h"
-#include <iostream>
 #include <string>
 
 static const int protocolVersion = 14;

servatrice/src/serversocketinterface.h

@@ -21,6 +21,7 @@
 #define SERVERSOCKETINTERFACE_H
 
 #include "server_protocolhandler.h"
+
 #include <QHostAddress>
 #include <QMutex>
 #include <QTcpSocket>

servatrice/src/settingscache.cpp

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

servatrice/src/signalhandler.cpp

@@ -1,9 +1,10 @@
-#include <QSocketNotifier>
+#include "signalhandler.h"
 
 #include "main.h"
 #include "server_logger.h"
 #include "settingscache.h"
-#include "signalhandler.h"
+
+#include <QSocketNotifier>
 
 #ifdef Q_OS_UNIX
 #include <cstdio>