clang-format: Enable regrouping and sorting of includes

SkBlaz · Feb 2, 2020 · 99b850a · 99b850a
1 parent 2dd54da
commit 99b850a
Show file tree

Hide file tree

Showing 178 changed files with 519 additions and 446 deletions.
diff --git a/.clang-format b/.clang-format
@@ -9,7 +9,15 @@ BreakBeforeBraces: Custom
 BreakConstructorInitializers: BeforeColon
 DerivePointerAlignment: true
 DisableFormat: false
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex: "^.QXmpp.*"
+    Priority: 1
+  - Regex: "^<Q(?!Xmpp).*"
+    Priority: 2
+  - Regex: "^<[^Q].*"
+    Priority: 3
 Language: Cpp
-SortIncludes: false
+SortIncludes: true
 SpaceAfterTemplateKeyword: false
 SpacesBeforeTrailingComments: 2
diff --git a/examples/example_0_connected/example_0_connected.cpp b/examples/example_0_connected/example_0_connected.cpp
@@ -21,12 +21,11 @@
  *
  */
 
-
-#include <QCoreApplication>
-
 #include "QXmppClient.h"
 #include "QXmppLogger.h"
 
+#include <QCoreApplication>
+
 int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);

diff --git a/examples/example_1_echoClient/example_1_echoClient.cpp b/examples/example_1_echoClient/example_1_echoClient.cpp
@@ -21,13 +21,12 @@
  *
  */
 
-
-#include <QCoreApplication>
+#include "example_1_echoClient.h"
 
 #include "QXmppLogger.h"
 #include "QXmppMessage.h"
 
-#include "example_1_echoClient.h"
+#include <QCoreApplication>
 
 echoClient::echoClient(QObject *parent)
     : QXmppClient(parent)

diff --git a/examples/example_2_rosterHandling/example_2_rosterHandling.cpp b/examples/example_2_rosterHandling/example_2_rosterHandling.cpp
@@ -21,12 +21,12 @@
  *
  */
 
-#include <QCoreApplication>
+#include "example_2_rosterHandling.h"
 
 #include "QXmppMessage.h"
 #include "QXmppRosterManager.h"
 
-#include "example_2_rosterHandling.h"
+#include <QCoreApplication>
 
 xmppClient::xmppClient(QObject *parent)
     : QXmppClient(parent),

diff --git a/examples/example_3_transferHandling/example_3_transferHandling.cpp b/examples/example_3_transferHandling/example_3_transferHandling.cpp
@@ -22,18 +22,18 @@
  *
  */
 
-#include <cstdlib>
+#include "example_3_transferHandling.h"
+
+#include "QXmppMessage.h"
+#include "QXmppUtils.h"
+
 #include <cstdio>
+#include <cstdlib>
 
 #include <QBuffer>
 #include <QCoreApplication>
 #include <QDebug>
 
-#include "QXmppMessage.h"
-#include "QXmppUtils.h"
-
-#include "example_3_transferHandling.h"
-
 xmppClient::xmppClient(QObject *parent)
     : QXmppClient(parent), transferManager(nullptr)
 {

diff --git a/examples/example_5_rpcInterface/main.cpp b/examples/example_5_rpcInterface/main.cpp
@@ -22,13 +22,12 @@
  *
  */
 
-#include <QCoreApplication>
-
 #include "QXmppClient.h"
 #include "QXmppLogger.h"
 #include "QXmppRpcManager.h"
 
 #include "remoteinterface.h"
+#include <QCoreApplication>
 
 int main(int argc, char *argv[])
 {

diff --git a/examples/example_6_rpcClient/main.cpp b/examples/example_6_rpcClient/main.cpp
@@ -21,10 +21,10 @@
  *
  */
 
+#include "QXmppLogger.h"
 
-#include <QtCore/QCoreApplication>
 #include "rpcClient.h"
-#include "QXmppLogger.h"
+#include <QtCore/QCoreApplication>
 
 int main(int argc, char *argv[])
 {

diff --git a/examples/example_6_rpcClient/rpcClient.cpp b/examples/example_6_rpcClient/rpcClient.cpp
@@ -22,13 +22,13 @@
  *
  */
 
-#include <QDebug>
-#include <QTimer>
+#include "rpcClient.h"
 
 #include "QXmppRpcManager.h"
 #include "QXmppUtils.h"
 
-#include "rpcClient.h"
+#include <QDebug>
+#include <QTimer>
 
 rpcClient::rpcClient(QObject *parent)
     : QXmppClient(parent)

diff --git a/examples/example_7_archiveHandling/example_7_archiveHandling.cpp b/examples/example_7_archiveHandling/example_7_archiveHandling.cpp
@@ -21,13 +21,13 @@
  *
  */
 
-#include <QCoreApplication>
-#include <QDateTime>
+#include "example_7_archiveHandling.h"
 
 #include "QXmppArchiveIq.h"
 #include "QXmppArchiveManager.h"
 
-#include "example_7_archiveHandling.h"
+#include <QCoreApplication>
+#include <QDateTime>
 
 static void logStart(const QString &msg)
 {

diff --git a/examples/example_7_archiveHandling/example_7_archiveHandling.h b/examples/example_7_archiveHandling/example_7_archiveHandling.h
@@ -24,10 +24,10 @@
 #ifndef XMPPCLIENT_H
 #define XMPPCLIENT_H
 
-#include <QDateTime>
-
 #include "QXmppClient.h"
 
+#include <QDateTime>
+
 class QXmppArchiveChat;
 class QXmppArchiveManager;
 class QXmppResultSetReply;

diff --git a/examples/example_8_server/example_8_server.cpp b/examples/example_8_server/example_8_server.cpp
@@ -21,12 +21,12 @@
  *
  */
 
-#include <QtCore/QCoreApplication>
-
 #include "QXmppLogger.h"
 #include "QXmppPasswordChecker.h"
 #include "QXmppServer.h"
 
+#include <QtCore/QCoreApplication>
+
 #define USERNAME "qxmpp.test1"
 #define PASSWORD "qxmpp123"
 

diff --git a/examples/example_9_vCard/example_9_vCard.cpp b/examples/example_9_vCard/example_9_vCard.cpp
@@ -21,6 +21,13 @@
  *
  */
 
+#include "example_9_vCard.h"
+
+#include "QXmppMessage.h"
+#include "QXmppRosterManager.h"
+#include "QXmppVCardIq.h"
+#include "QXmppVCardManager.h"
+
 #include <QBuffer>
 #include <QCoreApplication>
 #include <QDebug>
@@ -30,13 +37,6 @@
 #include <QImageReader>
 #include <QXmlStreamWriter>
 
-#include "QXmppMessage.h"
-#include "QXmppRosterManager.h"
-#include "QXmppVCardIq.h"
-#include "QXmppVCardManager.h"
-
-#include "example_9_vCard.h"
-
 xmppClient::xmppClient(QObject *parent)
     : QXmppClient(parent),
       m_rosterManager(findExtension<QXmppRosterManager>()),

diff --git a/src/base/QXmppArchiveIq.cpp b/src/base/QXmppArchiveIq.cpp
@@ -21,12 +21,13 @@
  *
  */
 
-#include <QDomElement>
-
 #include "QXmppArchiveIq.h"
+
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 QXmppArchiveMessage::QXmppArchiveMessage()
     : m_received(false)
 {

diff --git a/src/base/QXmppBindIq.cpp b/src/base/QXmppBindIq.cpp
@@ -22,14 +22,15 @@
  *
  */
 
+#include "QXmppBindIq.h"
+
+#include "QXmppConstants_p.h"
+#include "QXmppUtils.h"
+
 #include <QDomElement>
 #include <QTextStream>
 #include <QXmlStreamWriter>
 
-#include "QXmppBindIq.h"
-#include "QXmppUtils.h"
-#include "QXmppConstants_p.h"
-
 /// Returns the bound JID.
 ///
 

diff --git a/src/base/QXmppBitsOfBinaryContentId.h b/src/base/QXmppBitsOfBinaryContentId.h
@@ -24,11 +24,11 @@
 #ifndef QXMPPBITSOFBINARYCONTENTID_H
 #define QXMPPBITSOFBINARYCONTENTID_H
 
-#include <QSharedDataPointer>
-#include <QCryptographicHash>
-
 #include "QXmppGlobal.h"
 
+#include <QCryptographicHash>
+#include <QSharedDataPointer>
+
 class QXmppBitsOfBinaryContentIdPrivate;
 
 /// \class QXmppBitsOfBinaryContentId represents a link to or an identifier of

diff --git a/src/base/QXmppBitsOfBinaryData.cpp b/src/base/QXmppBitsOfBinaryData.cpp
@@ -23,16 +23,16 @@
 
 #include "QXmppBitsOfBinaryData.h"
 
-#include <QDomElement>
-#include <QSharedData>
-#include <QMimeType>
-#include <QMimeDatabase>
-#include <QXmlStreamWriter>
-
 #include "QXmppBitsOfBinaryContentId.h"
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+#include <QMimeDatabase>
+#include <QMimeType>
+#include <QSharedData>
+#include <QXmlStreamWriter>
+
 class QXmppBitsOfBinaryDataPrivate : public QSharedData
 {
 public:

diff --git a/src/base/QXmppBitsOfBinaryData.h b/src/base/QXmppBitsOfBinaryData.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPBITSOFBINARYDATA_H
 #define QXMPPBITSOFBINARYDATA_H
 
-#include <QSharedDataPointer>
-
 #include "QXmppGlobal.h"
 
+#include <QSharedDataPointer>
+
 class QDomElement;
 class QMimeType;
 class QXmlStreamWriter;

diff --git a/src/base/QXmppBitsOfBinaryDataList.cpp b/src/base/QXmppBitsOfBinaryDataList.cpp
@@ -23,11 +23,11 @@
 
 #include "QXmppBitsOfBinaryDataList.h"
 
-#include <QDomElement>
-
 #include "QXmppBitsOfBinaryData.h"
 #include "QXmppConstants_p.h"
 
+#include <QDomElement>
+
 QXmppBitsOfBinaryDataList::QXmppBitsOfBinaryDataList() = default;
 
 QXmppBitsOfBinaryDataList::~QXmppBitsOfBinaryDataList() = default;

diff --git a/src/base/QXmppBitsOfBinaryDataList.h b/src/base/QXmppBitsOfBinaryDataList.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPBITSOFBINARYDATACONTAINER_H
 #define QXMPPBITSOFBINARYDATACONTAINER_H
 
-#include <QVector>
-
 #include "QXmppBitsOfBinaryData.h"
 
+#include <QVector>
+
 class QDomElement;
 class QXmlStreamWriter;
 

diff --git a/src/base/QXmppBitsOfBinaryIq.h b/src/base/QXmppBitsOfBinaryIq.h
@@ -24,8 +24,8 @@
 #ifndef QXMPPBITSOFBINARYIQ_H
 #define QXMPPBITSOFBINARYIQ_H
 
-#include "QXmppIq.h"
 #include "QXmppBitsOfBinaryData.h"
+#include "QXmppIq.h"
 
 /// \class QXmppBitsOfBinaryIq represents a XEP-0231: Bits of Binary IQ to
 /// request and transmit Bits of Binary data elements.

diff --git a/src/base/QXmppBookmarkSet.cpp b/src/base/QXmppBookmarkSet.cpp
@@ -21,11 +21,12 @@
  *
  */
 
-#include <QDomElement>
-
 #include "QXmppBookmarkSet.h"
+
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 static const char *ns_bookmarks = "storage:bookmarks";
 
 /// Constructs a new conference room bookmark.

diff --git a/src/base/QXmppBookmarkSet.h b/src/base/QXmppBookmarkSet.h
@@ -24,11 +24,11 @@
 #ifndef QXMPPBOOKMARKSET_H
 #define QXMPPBOOKMARKSET_H
 
+#include "QXmppStanza.h"
+
 #include <QList>
 #include <QUrl>
 
-#include "QXmppStanza.h"
-
 /// \brief The QXmppBookmarkConference class represents a bookmark for a conference room,
 /// as defined by XEP-0048: Bookmarks.
 ///

diff --git a/src/base/QXmppByteStreamIq.cpp b/src/base/QXmppByteStreamIq.cpp
@@ -21,12 +21,13 @@
  *
  */
 
-#include <QDomElement>
-
 #include "QXmppByteStreamIq.h"
+
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 QString QXmppByteStreamIq::StreamHost::host() const
 {
     return m_host;

diff --git a/src/base/QXmppCodec.cpp b/src/base/QXmppCodec.cpp
@@ -25,17 +25,17 @@
  *  G.711 based on reference implementation by Sun Microsystems, Inc.
  */
 
-#include <QDataStream>
-#include <QDebug>
-#include <QSize>
-#include <QThread>
-
 #include "QXmppCodec_p.h"
 #include "QXmppRtpChannel.h"
 #include "QXmppRtpPacket.h"
 
 #include <cstring>
 
+#include <QDataStream>
+#include <QDebug>
+#include <QSize>
+#include <QThread>
+
 #ifdef QXMPP_USE_SPEEX
 #include <speex/speex.h>
 #endif