clang-format: Enable regrouping and sorting of includes

12 files changed, 52 insertions, 47 deletions

diff --git a/src/server/QXmppDialback.cpp b/src/server/QXmppDialback.cpp
index ee3e41bb..852edc5b 100644
--- a/src/server/QXmppDialback.cpp
+++ b/src/server/QXmppDialback.cpp
@@ -21,12 +21,13 @@
  *
  */
 
-#include <QDomElement>
+#include "QXmppDialback.h"
 
 #include "QXmppConstants_p.h"
-#include "QXmppDialback.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 /// Constructs a QXmppDialback.
 
 QXmppDialback::QXmppDialback()
diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp
index 009d4427..6142faab 100644
--- a/src/server/QXmppIncomingClient.cpp
+++ b/src/server/QXmppIncomingClient.cpp
@@ -21,11 +21,7 @@
  *
  */
 
-#include <QDomElement>
-#include <QHostAddress>
-#include <QSslKey>
-#include <QSslSocket>
-#include <QTimer>
+#include "QXmppIncomingClient.h"
 
 #include "QXmppBindIq.h"
 #include "QXmppConstants_p.h"
@@ -37,7 +33,11 @@
 #include "QXmppStreamFeatures.h"
 #include "QXmppUtils.h"
 
-#include "QXmppIncomingClient.h"
+#include <QDomElement>
+#include <QHostAddress>
+#include <QSslKey>
+#include <QSslSocket>
+#include <QTimer>
 
 class QXmppIncomingClientPrivate
 {
diff --git a/src/server/QXmppIncomingServer.cpp b/src/server/QXmppIncomingServer.cpp
index bc76738d..7e2e8a0b 100644
--- a/src/server/QXmppIncomingServer.cpp
+++ b/src/server/QXmppIncomingServer.cpp
@@ -21,19 +21,20 @@
  *
  */
 
-#include <QDomElement>
-#include <QHostAddress>
-#include <QSslKey>
-#include <QSslSocket>
+#include "QXmppIncomingServer.h"
 
 #include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
-#include "QXmppIncomingServer.h"
 #include "QXmppOutgoingServer.h"
 #include "QXmppStartTlsPacket.h"
 #include "QXmppStreamFeatures.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+#include <QHostAddress>
+#include <QSslKey>
+#include <QSslSocket>
+
 class QXmppIncomingServerPrivate
 {
 public:
diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp
index 99e9fd9a..b0085867 100644
--- a/src/server/QXmppOutgoingServer.cpp
+++ b/src/server/QXmppOutgoingServer.cpp
@@ -21,21 +21,22 @@
  *
  */
 
-#include <QDomElement>
-#include <QSslError>
-#include <QSslKey>
-#include <QSslSocket>
-#include <QList>
-#include <QTimer>
-#include <QDnsLookup>
+#include "QXmppOutgoingServer.h"
 
 #include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
-#include "QXmppOutgoingServer.h"
 #include "QXmppStartTlsPacket.h"
 #include "QXmppStreamFeatures.h"
 #include "QXmppUtils.h"
 
+#include <QDnsLookup>
+#include <QDomElement>
+#include <QList>
+#include <QSslError>
+#include <QSslKey>
+#include <QSslSocket>
+#include <QTimer>
+
 class QXmppOutgoingServerPrivate
 {
 public:
diff --git a/src/server/QXmppOutgoingServer.h b/src/server/QXmppOutgoingServer.h
index 618b69a1..c0a6a589 100644
--- a/src/server/QXmppOutgoingServer.h
+++ b/src/server/QXmppOutgoingServer.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPOUTGOINGSERVER_H
 #define QXMPPOUTGOINGSERVER_H
 
-#include <QAbstractSocket>
-
 #include "QXmppStream.h"
 
+#include <QAbstractSocket>
+
 class QSslError;
 class QXmppDialback;
 class QXmppOutgoingServer;
diff --git a/src/server/QXmppPasswordChecker.cpp b/src/server/QXmppPasswordChecker.cpp
index 70bfad83..af03ecb5 100644
--- a/src/server/QXmppPasswordChecker.cpp
+++ b/src/server/QXmppPasswordChecker.cpp
@@ -21,12 +21,12 @@
  *
  */
 
+#include "QXmppPasswordChecker.h"
+
 #include <QCryptographicHash>
 #include <QString>
 #include <QTimer>
 
-#include "QXmppPasswordChecker.h"
-
 /// Returns the requested domain.
 
 QString QXmppPasswordRequest::domain() const
diff --git a/src/server/QXmppPasswordChecker.h b/src/server/QXmppPasswordChecker.h
index 7d79676f..160b879e 100644
--- a/src/server/QXmppPasswordChecker.h
+++ b/src/server/QXmppPasswordChecker.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPPASSWORDCHECKER_H
 #define QXMPPPASSWORDCHECKER_H
 
-#include <QObject>
-
 #include "QXmppGlobal.h"
 
+#include <QObject>
+
 /// \brief The QXmppPasswordRequest class represents a password request.
 ///
 class QXMPP_EXPORT QXmppPasswordRequest
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index 49a5d6fe..ea86e124 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -21,27 +21,28 @@
  *
  */
 
-#include <QCoreApplication>
-#include <QDomElement>
-#include <QFileInfo>
-#include <QPluginLoader>
-#include <QSslCertificate>
-#include <QSslKey>
-#include <QSslSocket>
+#include "QXmppServer.h"
 
 #include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
-#include "QXmppIq.h"
 #include "QXmppIncomingClient.h"
 #include "QXmppIncomingServer.h"
+#include "QXmppIq.h"
 #include "QXmppOutgoingServer.h"
 #include "QXmppPresence.h"
-#include "QXmppServer.h"
 #include "QXmppServerExtension.h"
 #include "QXmppServerPlugin.h"
 #include "QXmppUtils.h"
 
-static void helperToXmlAddDomElement(QXmlStreamWriter* stream, const QDomElement& element, const QStringList &omitNamespaces)
+#include <QCoreApplication>
+#include <QDomElement>
+#include <QFileInfo>
+#include <QPluginLoader>
+#include <QSslCertificate>
+#include <QSslKey>
+#include <QSslSocket>
+
+static void helperToXmlAddDomElement(QXmlStreamWriter *stream, const QDomElement &element, const QStringList &omitNamespaces)
 {
     stream->writeStartElement(element.tagName());
 
diff --git a/src/server/QXmppServer.h b/src/server/QXmppServer.h
index f7a15905..609886f8 100644
--- a/src/server/QXmppServer.h
+++ b/src/server/QXmppServer.h
@@ -24,11 +24,11 @@
 #ifndef QXMPPSERVER_H
 #define QXMPPSERVER_H
 
+#include "QXmppLogger.h"
+
 #include <QTcpServer>
 #include <QVariantMap>
 
-#include "QXmppLogger.h"
-
 class QDomElement;
 class QSslCertificate;
 class QSslKey;
diff --git a/src/server/QXmppServerExtension.cpp b/src/server/QXmppServerExtension.cpp
index 7a6a19b3..0db387aa 100644
--- a/src/server/QXmppServerExtension.cpp
+++ b/src/server/QXmppServerExtension.cpp
@@ -21,13 +21,14 @@
  *
  */
 
-#include <QDomElement>
-#include <QMetaClassInfo>
-#include <QStringList>
+#include "QXmppServerExtension.h"
 
 #include "QXmppLogger.h"
 #include "QXmppServer.h"
-#include "QXmppServerExtension.h"
+
+#include <QDomElement>
+#include <QMetaClassInfo>
+#include <QStringList>
 
 class QXmppServerExtensionPrivate
 {
diff --git a/src/server/QXmppServerExtension.h b/src/server/QXmppServerExtension.h
index 52c61d3c..af736225 100644
--- a/src/server/QXmppServerExtension.h
+++ b/src/server/QXmppServerExtension.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPSERVEREXTENSION_H
 #define QXMPPSERVEREXTENSION_H
 
-#include <QVariant>
-
 #include "QXmppLogger.h"
 
+#include <QVariant>
+
 class QDomElement;
 class QStringList;
 
diff --git a/src/server/QXmppServerPlugin.h b/src/server/QXmppServerPlugin.h
index e7ea6a51..c0dc61d3 100644
--- a/src/server/QXmppServerPlugin.h
+++ b/src/server/QXmppServerPlugin.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPSERVERPLUGIN_H
 #define QXMPPSERVERPLUGIN_H
 
-#include <QtPlugin>
-
 #include "QXmppGlobal.h"
 
+#include <QtPlugin>
+
 class QXmppServer;
 class QXmppServerExtension;