From 99b850a3008bbb03d3449d683adb87839f7d5c4b Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Sun, 2 Feb 2020 18:13:26 +0100 Subject: [PATCH] clang-format: Enable regrouping and sorting of includes --- .clang-format | 10 +++++++- .../example_0_connected.cpp | 5 ++-- .../example_1_echoClient.cpp | 5 ++-- .../example_2_rosterHandling.cpp | 4 +-- .../example_3_transferHandling.cpp | 12 ++++----- examples/example_5_rpcInterface/main.cpp | 3 +-- examples/example_6_rpcClient/main.cpp | 4 +-- examples/example_6_rpcClient/rpcClient.cpp | 6 ++--- .../example_7_archiveHandling.cpp | 6 ++--- .../example_7_archiveHandling.h | 4 +-- .../example_8_server/example_8_server.cpp | 4 +-- examples/example_9_vCard/example_9_vCard.cpp | 14 +++++------ src/base/QXmppArchiveIq.cpp | 5 ++-- src/base/QXmppBindIq.cpp | 9 ++++--- src/base/QXmppBitsOfBinaryContentId.h | 6 ++--- src/base/QXmppBitsOfBinaryData.cpp | 12 ++++----- src/base/QXmppBitsOfBinaryData.h | 4 +-- src/base/QXmppBitsOfBinaryDataList.cpp | 4 +-- src/base/QXmppBitsOfBinaryDataList.h | 4 +-- src/base/QXmppBitsOfBinaryIq.h | 2 +- src/base/QXmppBookmarkSet.cpp | 5 ++-- src/base/QXmppBookmarkSet.h | 4 +-- src/base/QXmppByteStreamIq.cpp | 5 ++-- src/base/QXmppCodec.cpp | 10 ++++---- src/base/QXmppCodec_p.h | 4 +-- src/base/QXmppConstants.cpp | 1 - src/base/QXmppDataForm.cpp | 5 ++++ src/base/QXmppDiscoveryIq.cpp | 7 +++--- src/base/QXmppElement.cpp | 1 + src/base/QXmppElement.h | 4 +-- src/base/QXmppEntityTimeIq.cpp | 5 ++-- src/base/QXmppEntityTimeIq.h | 4 +-- src/base/QXmppHttpUploadIq.cpp | 7 +++--- src/base/QXmppHttpUploadIq.h | 4 +-- src/base/QXmppIbbIq.cpp | 8 +++--- src/base/QXmppIq.cpp | 2 +- src/base/QXmppJingleIq.cpp | 9 ++++--- src/base/QXmppJingleIq.h | 4 +-- src/base/QXmppLogger.cpp | 2 ++ src/base/QXmppLogger.h | 4 +-- src/base/QXmppMamIq.cpp | 6 ++--- src/base/QXmppMamIq.h | 2 +- src/base/QXmppMessage.cpp | 11 ++++---- src/base/QXmppMessage.h | 4 +-- src/base/QXmppMixIq.cpp | 3 ++- src/base/QXmppMixIq.h | 1 + src/base/QXmppMixItem.cpp | 3 ++- src/base/QXmppMixItem.h | 4 +-- src/base/QXmppMucIq.cpp | 5 ++-- src/base/QXmppNonSASLAuth.cpp | 9 ++++--- src/base/QXmppPingIq.cpp | 3 ++- src/base/QXmppPresence.cpp | 7 +++--- src/base/QXmppPresence.h | 2 +- src/base/QXmppPubSubIq.cpp | 6 ++--- src/base/QXmppPubSubIq.h | 4 +-- src/base/QXmppPubSubItem.cpp | 4 +-- src/base/QXmppPubSubItem.h | 4 +-- src/base/QXmppRegisterIq.cpp | 9 ++++--- src/base/QXmppResultSet.cpp | 4 +-- src/base/QXmppResultSet.h | 4 +-- src/base/QXmppRosterIq.cpp | 9 ++++--- src/base/QXmppRosterIq.h | 1 + src/base/QXmppRpcIq.h | 1 + src/base/QXmppRtcpPacket.cpp | 4 +-- src/base/QXmppRtcpPacket.h | 4 +-- src/base/QXmppRtpChannel.cpp | 12 ++++----- src/base/QXmppRtpChannel.h | 6 ++--- src/base/QXmppRtpPacket.cpp | 4 +-- src/base/QXmppRtpPacket.h | 4 +-- src/base/QXmppSasl.cpp | 8 +++--- src/base/QXmppSasl_p.h | 8 +++--- src/base/QXmppSessionIq.cpp | 7 +++--- src/base/QXmppSocks.cpp | 4 +-- src/base/QXmppSocks.h | 4 +-- src/base/QXmppStanza.cpp | 6 ++--- src/base/QXmppStanza.h | 6 ++--- src/base/QXmppStream.cpp | 2 +- src/base/QXmppStream.h | 3 ++- src/base/QXmppStreamFeatures.cpp | 5 ++-- src/base/QXmppStreamInitiationIq.cpp | 4 +-- src/base/QXmppStreamInitiationIq_p.h | 4 +-- src/base/QXmppStreamManagement.cpp | 5 ++-- src/base/QXmppStun.cpp | 10 ++++---- src/base/QXmppStun.h | 6 ++--- src/base/QXmppUtils.cpp | 6 ++--- src/base/QXmppUtils.h | 4 +-- src/base/QXmppVCardIq.cpp | 8 +++--- src/base/QXmppVCardIq.h | 3 ++- src/base/QXmppVersionIq.cpp | 5 ++-- src/client/QXmppArchiveManager.cpp | 5 ++-- src/client/QXmppArchiveManager.h | 4 +-- src/client/QXmppBookmarkManager.cpp | 5 ++-- src/client/QXmppBookmarkManager.h | 4 +-- src/client/QXmppCallManager.cpp | 7 +++--- src/client/QXmppCallManager.h | 8 +++--- src/client/QXmppCarbonManager.cpp | 8 +++--- src/client/QXmppClient.cpp | 22 ++++++++-------- src/client/QXmppClient.h | 6 ++--- src/client/QXmppClientExtension.cpp | 4 +-- src/client/QXmppConfiguration.cpp | 7 +++--- src/client/QXmppConfiguration.h | 6 ++--- src/client/QXmppDiscoveryManager.cpp | 8 +++--- src/client/QXmppEntityTimeManager.cpp | 7 +++--- src/client/QXmppInternalClientExtension.cpp | 3 +-- src/client/QXmppInternalClientExtension_p.h | 2 +- src/client/QXmppInvokable.cpp | 3 +-- src/client/QXmppInvokable.h | 8 +++--- src/client/QXmppMamManager.cpp | 7 +++--- src/client/QXmppMamManager.h | 4 +-- src/client/QXmppMessageReceiptManager.cpp | 6 ++--- src/client/QXmppMucManager.cpp | 7 +++--- src/client/QXmppOutgoingClient.cpp | 25 ++++++++++--------- src/client/QXmppRemoteMethod.cpp | 1 + src/client/QXmppRosterManager.cpp | 5 ++-- src/client/QXmppRosterManager.h | 8 +++--- src/client/QXmppRpcManager.cpp | 3 ++- src/client/QXmppRpcManager.h | 6 ++--- src/client/QXmppTlsManager.cpp | 7 +++--- src/client/QXmppTransferManager.cpp | 23 +++++++++-------- src/client/QXmppUploadRequestManager.cpp | 10 ++++---- src/client/QXmppUploadRequestManager.h | 1 + src/client/QXmppVCardManager.cpp | 2 +- src/client/QXmppVersionManager.cpp | 9 ++++--- src/server/QXmppDialback.cpp | 5 ++-- src/server/QXmppIncomingClient.cpp | 12 ++++----- src/server/QXmppIncomingServer.cpp | 11 ++++---- src/server/QXmppOutgoingServer.cpp | 17 +++++++------ src/server/QXmppOutgoingServer.h | 4 +-- src/server/QXmppPasswordChecker.cpp | 4 +-- src/server/QXmppPasswordChecker.h | 4 +-- src/server/QXmppServer.cpp | 21 ++++++++-------- src/server/QXmppServer.h | 4 +-- src/server/QXmppServerExtension.cpp | 9 ++++--- src/server/QXmppServerExtension.h | 4 +-- src/server/QXmppServerPlugin.h | 4 +-- tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp | 1 + tests/qxmppbindiq/tst_qxmppbindiq.cpp | 3 ++- .../tst_qxmppbitsofbinarycontentid.cpp | 4 +-- .../tst_qxmppbitsofbinaryiq.cpp | 6 ++--- .../qxmppcallmanager/tst_qxmppcallmanager.cpp | 6 ++--- .../tst_qxmppcarbonmanager.cpp | 7 +++--- tests/qxmppclient/tst_qxmppclient.cpp | 3 +-- tests/qxmppcodec/tst_qxmppcodec.cpp | 6 ++--- tests/qxmppdataform/tst_qxmppdataform.cpp | 3 ++- .../qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp | 3 ++- .../tst_qxmppentitytimeiq.cpp | 3 ++- .../tst_qxmpphttpuploadiq.cpp | 3 ++- .../tst_qxmppiceconnection.cpp | 3 ++- tests/qxmppiq/tst_qxmppiq.cpp | 4 +-- tests/qxmppjingleiq/tst_qxmppjingleiq.cpp | 3 ++- tests/qxmppmammanager/tst_qxmppmammanager.cpp | 7 +++--- tests/qxmppmessage/tst_qxmppmessage.cpp | 3 ++- .../tst_qxmppmessagereceiptmanager.cpp | 3 ++- tests/qxmppmixiq/tst_qxmppmixiq.cpp | 4 +-- tests/qxmppmixitem/tst_qxmppmixitem.cpp | 5 ++-- .../tst_qxmppnonsaslauthiq.cpp | 1 + tests/qxmpppresence/tst_qxmpppresence.cpp | 5 ++-- tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp | 3 ++- tests/qxmppregisteriq/tst_qxmppregisteriq.cpp | 4 +-- tests/qxmppresultset/tst_qxmppresultset.cpp | 3 ++- tests/qxmpprosteriq/tst_qxmpprosteriq.cpp | 3 ++- tests/qxmpprpciq/tst_qxmpprpciq.cpp | 3 ++- tests/qxmpprtcppacket/tst_qxmpprtcppacket.cpp | 3 ++- tests/qxmpprtppacket/tst_qxmpprtppacket.cpp | 3 ++- tests/qxmppserver/tst_qxmppserver.cpp | 1 + tests/qxmppsessioniq/tst_qxmppsessioniq.cpp | 1 + tests/qxmppsocks/tst_qxmppsocks.cpp | 5 ++-- tests/qxmppstanza/tst_qxmppstanza.cpp | 3 ++- .../tst_qxmppstarttlspacket.cpp | 4 +-- .../tst_qxmppstreamfeatures.cpp | 1 + .../tst_qxmppstreaminitiationiq.cpp | 1 + .../qxmppstunmessage/tst_qxmppstunmessage.cpp | 3 ++- .../tst_qxmpptransfermanager.cpp | 6 ++--- .../tst_qxmppuploadrequestmanager.cpp | 14 +++++------ tests/qxmpputils/tst_qxmpputils.cpp | 3 ++- tests/qxmppvcardiq/tst_qxmppvcardiq.cpp | 3 ++- tests/qxmppversioniq/tst_qxmppversioniq.cpp | 3 ++- tests/util.h | 3 ++- 178 files changed, 519 insertions(+), 446 deletions(-) diff --git a/.clang-format b/.clang-format index e56ac534b..6e719d20b 100644 --- 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: "^ - #include "QXmppClient.h" #include "QXmppLogger.h" +#include + 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 index 86c33049d..bd45c4c4e 100644 --- a/examples/example_1_echoClient/example_1_echoClient.cpp +++ b/examples/example_1_echoClient/example_1_echoClient.cpp @@ -21,13 +21,12 @@ * */ - -#include +#include "example_1_echoClient.h" #include "QXmppLogger.h" #include "QXmppMessage.h" -#include "example_1_echoClient.h" +#include 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 index d163b41ad..d59a5fae0 100644 --- a/examples/example_2_rosterHandling/example_2_rosterHandling.cpp +++ b/examples/example_2_rosterHandling/example_2_rosterHandling.cpp @@ -21,12 +21,12 @@ * */ -#include +#include "example_2_rosterHandling.h" #include "QXmppMessage.h" #include "QXmppRosterManager.h" -#include "example_2_rosterHandling.h" +#include 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 index c533fd188..c39e4b9be 100644 --- a/examples/example_3_transferHandling/example_3_transferHandling.cpp +++ b/examples/example_3_transferHandling/example_3_transferHandling.cpp @@ -22,18 +22,18 @@ * */ -#include +#include "example_3_transferHandling.h" + +#include "QXmppMessage.h" +#include "QXmppUtils.h" + #include +#include #include #include #include -#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 index 4c5c67b53..9465358d6 100644 --- a/examples/example_5_rpcInterface/main.cpp +++ b/examples/example_5_rpcInterface/main.cpp @@ -22,13 +22,12 @@ * */ -#include - #include "QXmppClient.h" #include "QXmppLogger.h" #include "QXmppRpcManager.h" #include "remoteinterface.h" +#include int main(int argc, char *argv[]) { diff --git a/examples/example_6_rpcClient/main.cpp b/examples/example_6_rpcClient/main.cpp index 7a5f24113..4246185ae 100644 --- a/examples/example_6_rpcClient/main.cpp +++ b/examples/example_6_rpcClient/main.cpp @@ -21,10 +21,10 @@ * */ +#include "QXmppLogger.h" -#include #include "rpcClient.h" -#include "QXmppLogger.h" +#include int main(int argc, char *argv[]) { diff --git a/examples/example_6_rpcClient/rpcClient.cpp b/examples/example_6_rpcClient/rpcClient.cpp index 0179231ad..c4868bc38 100644 --- a/examples/example_6_rpcClient/rpcClient.cpp +++ b/examples/example_6_rpcClient/rpcClient.cpp @@ -22,13 +22,13 @@ * */ -#include -#include +#include "rpcClient.h" #include "QXmppRpcManager.h" #include "QXmppUtils.h" -#include "rpcClient.h" +#include +#include 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 index 8ee77626b..b223995ed 100644 --- a/examples/example_7_archiveHandling/example_7_archiveHandling.cpp +++ b/examples/example_7_archiveHandling/example_7_archiveHandling.cpp @@ -21,13 +21,13 @@ * */ -#include -#include +#include "example_7_archiveHandling.h" #include "QXmppArchiveIq.h" #include "QXmppArchiveManager.h" -#include "example_7_archiveHandling.h" +#include +#include 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 index f00bde2f8..6cd9ad0ac 100644 --- 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 - #include "QXmppClient.h" +#include + 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 index 837ff76ea..ef83ac6ee 100644 --- a/examples/example_8_server/example_8_server.cpp +++ b/examples/example_8_server/example_8_server.cpp @@ -21,12 +21,12 @@ * */ -#include - #include "QXmppLogger.h" #include "QXmppPasswordChecker.h" #include "QXmppServer.h" +#include + #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 index 24f7cf9f4..980f3e680 100644 --- 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 #include #include @@ -30,13 +37,6 @@ #include #include -#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()), diff --git a/src/base/QXmppArchiveIq.cpp b/src/base/QXmppArchiveIq.cpp index de3fbed86..9f919c1d8 100644 --- a/src/base/QXmppArchiveIq.cpp +++ b/src/base/QXmppArchiveIq.cpp @@ -21,12 +21,13 @@ * */ -#include - #include "QXmppArchiveIq.h" + #include "QXmppConstants_p.h" #include "QXmppUtils.h" +#include + QXmppArchiveMessage::QXmppArchiveMessage() : m_received(false) { diff --git a/src/base/QXmppBindIq.cpp b/src/base/QXmppBindIq.cpp index b0351980a..3eb6d9087 100644 --- 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 #include #include -#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 index aff3fc7bb..049bc54aa 100644 --- a/src/base/QXmppBitsOfBinaryContentId.h +++ b/src/base/QXmppBitsOfBinaryContentId.h @@ -24,11 +24,11 @@ #ifndef QXMPPBITSOFBINARYCONTENTID_H #define QXMPPBITSOFBINARYCONTENTID_H -#include -#include - #include "QXmppGlobal.h" +#include +#include + class QXmppBitsOfBinaryContentIdPrivate; /// \class QXmppBitsOfBinaryContentId represents a link to or an identifier of diff --git a/src/base/QXmppBitsOfBinaryData.cpp b/src/base/QXmppBitsOfBinaryData.cpp index f3eba9cbe..89c83cf6a 100644 --- a/src/base/QXmppBitsOfBinaryData.cpp +++ b/src/base/QXmppBitsOfBinaryData.cpp @@ -23,16 +23,16 @@ #include "QXmppBitsOfBinaryData.h" -#include -#include -#include -#include -#include - #include "QXmppBitsOfBinaryContentId.h" #include "QXmppConstants_p.h" #include "QXmppUtils.h" +#include +#include +#include +#include +#include + class QXmppBitsOfBinaryDataPrivate : public QSharedData { public: diff --git a/src/base/QXmppBitsOfBinaryData.h b/src/base/QXmppBitsOfBinaryData.h index b8e3780a1..28fe9dfde 100644 --- a/src/base/QXmppBitsOfBinaryData.h +++ b/src/base/QXmppBitsOfBinaryData.h @@ -24,10 +24,10 @@ #ifndef QXMPPBITSOFBINARYDATA_H #define QXMPPBITSOFBINARYDATA_H -#include - #include "QXmppGlobal.h" +#include + class QDomElement; class QMimeType; class QXmlStreamWriter; diff --git a/src/base/QXmppBitsOfBinaryDataList.cpp b/src/base/QXmppBitsOfBinaryDataList.cpp index 1f13fa82a..1a879e727 100644 --- a/src/base/QXmppBitsOfBinaryDataList.cpp +++ b/src/base/QXmppBitsOfBinaryDataList.cpp @@ -23,11 +23,11 @@ #include "QXmppBitsOfBinaryDataList.h" -#include - #include "QXmppBitsOfBinaryData.h" #include "QXmppConstants_p.h" +#include + QXmppBitsOfBinaryDataList::QXmppBitsOfBinaryDataList() = default; QXmppBitsOfBinaryDataList::~QXmppBitsOfBinaryDataList() = default; diff --git a/src/base/QXmppBitsOfBinaryDataList.h b/src/base/QXmppBitsOfBinaryDataList.h index bf94df832..e4c057947 100644 --- a/src/base/QXmppBitsOfBinaryDataList.h +++ b/src/base/QXmppBitsOfBinaryDataList.h @@ -24,10 +24,10 @@ #ifndef QXMPPBITSOFBINARYDATACONTAINER_H #define QXMPPBITSOFBINARYDATACONTAINER_H -#include - #include "QXmppBitsOfBinaryData.h" +#include + class QDomElement; class QXmlStreamWriter; diff --git a/src/base/QXmppBitsOfBinaryIq.h b/src/base/QXmppBitsOfBinaryIq.h index 09325c01b..524deaf09 100644 --- 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 index e70adcc65..d4fd4daf9 100644 --- a/src/base/QXmppBookmarkSet.cpp +++ b/src/base/QXmppBookmarkSet.cpp @@ -21,11 +21,12 @@ * */ -#include - #include "QXmppBookmarkSet.h" + #include "QXmppUtils.h" +#include + 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 index 72826db38..9b9b0d4c4 100644 --- a/src/base/QXmppBookmarkSet.h +++ b/src/base/QXmppBookmarkSet.h @@ -24,11 +24,11 @@ #ifndef QXMPPBOOKMARKSET_H #define QXMPPBOOKMARKSET_H +#include "QXmppStanza.h" + #include #include -#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 index 92709b4dc..2a8d3d8c6 100644 --- a/src/base/QXmppByteStreamIq.cpp +++ b/src/base/QXmppByteStreamIq.cpp @@ -21,12 +21,13 @@ * */ -#include - #include "QXmppByteStreamIq.h" + #include "QXmppConstants_p.h" #include "QXmppUtils.h" +#include + QString QXmppByteStreamIq::StreamHost::host() const { return m_host; diff --git a/src/base/QXmppCodec.cpp b/src/base/QXmppCodec.cpp index 91478e0ad..0a4cfb735 100644 --- 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 -#include -#include -#include - #include "QXmppCodec_p.h" #include "QXmppRtpChannel.h" #include "QXmppRtpPacket.h" #include +#include +#include +#include +#include + #ifdef QXMPP_USE_SPEEX #include #endif diff --git a/src/base/QXmppCodec_p.h b/src/base/QXmppCodec_p.h index 6ca0dfd78..d9a8e3c23 100644 --- a/src/base/QXmppCodec_p.h +++ b/src/base/QXmppCodec_p.h @@ -24,10 +24,10 @@ #ifndef QXMPPCODEC_H #define QXMPPCODEC_H -#include - #include "QXmppGlobal.h" +#include + class QXmppRtpPacket; class QXmppVideoFormat; class QXmppVideoFrame; diff --git a/src/base/QXmppConstants.cpp b/src/base/QXmppConstants.cpp index 073475801..0ff845f8c 100644 --- a/src/base/QXmppConstants.cpp +++ b/src/base/QXmppConstants.cpp @@ -21,7 +21,6 @@ * */ - #include "QXmppConstants_p.h" const char* ns_stream = "http://etherx.jabber.org/streams"; diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp index 7face3389..f162268e0 100644 --- a/src/base/QXmppDataForm.cpp +++ b/src/base/QXmppDataForm.cpp @@ -22,6 +22,11 @@ * */ +#include "QXmppDataForm.h" + +#include "QXmppConstants_p.h" +#include "QXmppUtils.h" + #include #include #include diff --git a/src/base/QXmppDiscoveryIq.cpp b/src/base/QXmppDiscoveryIq.cpp index 6524e81fc..b38eec521 100644 --- a/src/base/QXmppDiscoveryIq.cpp +++ b/src/base/QXmppDiscoveryIq.cpp @@ -21,13 +21,14 @@ * */ -#include -#include +#include "QXmppDiscoveryIq.h" #include "QXmppConstants_p.h" -#include "QXmppDiscoveryIq.h" #include "QXmppUtils.h" +#include +#include + static bool identityLessThan(const QXmppDiscoveryIq::Identity &i1, const QXmppDiscoveryIq::Identity &i2) { if (i1.category() < i2.category()) diff --git a/src/base/QXmppElement.cpp b/src/base/QXmppElement.cpp index fbf8762c4..1e3ec7fb6 100644 --- a/src/base/QXmppElement.cpp +++ b/src/base/QXmppElement.cpp @@ -22,6 +22,7 @@ */ #include "QXmppElement.h" + #include "QXmppUtils.h" #include diff --git a/src/base/QXmppElement.h b/src/base/QXmppElement.h index 7a02f221e..99f589895 100644 --- a/src/base/QXmppElement.h +++ b/src/base/QXmppElement.h @@ -24,12 +24,12 @@ #ifndef QXMPPELEMENT_H #define QXMPPELEMENT_H +#include "QXmppGlobal.h" + #include #include #include -#include "QXmppGlobal.h" - class QDomElement; class QXmppElement; class QXmppElementPrivate; diff --git a/src/base/QXmppEntityTimeIq.cpp b/src/base/QXmppEntityTimeIq.cpp index 9dad7ce05..938517bcb 100644 --- a/src/base/QXmppEntityTimeIq.cpp +++ b/src/base/QXmppEntityTimeIq.cpp @@ -21,14 +21,13 @@ * */ - #include "QXmppEntityTimeIq.h" -#include - #include "QXmppConstants_p.h" #include "QXmppUtils.h" +#include + /// Returns the timezone offset in seconds. /// diff --git a/src/base/QXmppEntityTimeIq.h b/src/base/QXmppEntityTimeIq.h index cac3e19d8..ba9b5629d 100644 --- a/src/base/QXmppEntityTimeIq.h +++ b/src/base/QXmppEntityTimeIq.h @@ -24,10 +24,10 @@ #ifndef QXMPPENTITYTIMEIQ_H #define QXMPPENTITYTIMEIQ_H -#include - #include "QXmppIq.h" +#include + /// \ingroup Stanzas class QXMPP_EXPORT QXmppEntityTimeIq : public QXmppIq diff --git a/src/base/QXmppHttpUploadIq.cpp b/src/base/QXmppHttpUploadIq.cpp index 932f5504d..81c70776d 100644 --- a/src/base/QXmppHttpUploadIq.cpp +++ b/src/base/QXmppHttpUploadIq.cpp @@ -21,14 +21,15 @@ * */ +#include "QXmppHttpUploadIq.h" + +#include "QXmppConstants_p.h" + #include #include #include #include -#include "QXmppHttpUploadIq.h" -#include "QXmppConstants_p.h" - class QXmppHttpUploadRequestIqPrivate : public QSharedData { public: diff --git a/src/base/QXmppHttpUploadIq.h b/src/base/QXmppHttpUploadIq.h index 964842eea..4b39e5b97 100644 --- a/src/base/QXmppHttpUploadIq.h +++ b/src/base/QXmppHttpUploadIq.h @@ -24,10 +24,10 @@ #ifndef QXMPPHTTPUPLOADIQ_H #define QXMPPHTTPUPLOADIQ_H -#include - #include "QXmppIq.h" +#include + class QUrl; class QMimeType; diff --git a/src/base/QXmppIbbIq.cpp b/src/base/QXmppIbbIq.cpp index 7f79140b1..13928d888 100644 --- a/src/base/QXmppIbbIq.cpp +++ b/src/base/QXmppIbbIq.cpp @@ -22,15 +22,15 @@ * */ -#include -#include +#include "QXmppIbbIq.h" #include "QXmppConstants_p.h" -#include "QXmppIbbIq.h" + +#include +#include QXmppIbbOpenIq::QXmppIbbOpenIq() : QXmppIq(QXmppIq::Set), m_block_size(1024) { - } long QXmppIbbOpenIq::blockSize() const diff --git a/src/base/QXmppIq.cpp b/src/base/QXmppIq.cpp index 21084c43c..4d8623787 100644 --- a/src/base/QXmppIq.cpp +++ b/src/base/QXmppIq.cpp @@ -21,9 +21,9 @@ * */ +#include "QXmppIq.h" #include "QXmppUtils.h" -#include "QXmppIq.h" #include #include diff --git a/src/base/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp index 4c0be4569..00b1c0c11 100644 --- a/src/base/QXmppJingleIq.cpp +++ b/src/base/QXmppJingleIq.cpp @@ -21,15 +21,16 @@ * */ +#include "QXmppJingleIq.h" + +#include "QXmppConstants_p.h" +#include "QXmppUtils.h" + #include #include #include #include -#include "QXmppConstants_p.h" -#include "QXmppJingleIq.h" -#include "QXmppUtils.h" - static const int RTP_COMPONENT = 1; static const char* ns_jingle_rtp_info = "urn:xmpp:jingle:apps:rtp:info:1"; diff --git a/src/base/QXmppJingleIq.h b/src/base/QXmppJingleIq.h index 5a1eb3374..5fcd1bb97 100644 --- a/src/base/QXmppJingleIq.h +++ b/src/base/QXmppJingleIq.h @@ -24,10 +24,10 @@ #ifndef QXMPPJINGLEIQ_H #define QXMPPJINGLEIQ_H -#include - #include "QXmppIq.h" +#include + class QXmppJingleCandidatePrivate; class QXmppJingleIqContentPrivate; class QXmppJingleIqPrivate; diff --git a/src/base/QXmppLogger.cpp b/src/base/QXmppLogger.cpp index 10ee34719..d1f2e57b8 100644 --- a/src/base/QXmppLogger.cpp +++ b/src/base/QXmppLogger.cpp @@ -22,6 +22,8 @@ * */ +#include "QXmppLogger.h" + #include #include diff --git a/src/base/QXmppLogger.h b/src/base/QXmppLogger.h index 7deec338f..4513b59ad 100644 --- a/src/base/QXmppLogger.h +++ b/src/base/QXmppLogger.h @@ -25,10 +25,10 @@ #ifndef QXMPPLOGGER_H #define QXMPPLOGGER_H -#include - #include "QXmppGlobal.h" +#include + #ifdef QXMPP_LOGGABLE_TRACE #define qxmpp_loggable_trace(x) QString("%1(0x%2) %3").arg(metaObject()->className(), QString::number(reinterpret_cast(this), 16), x) #else diff --git a/src/base/QXmppMamIq.cpp b/src/base/QXmppMamIq.cpp index c2a719e41..75493c9d5 100644 --- a/src/base/QXmppMamIq.cpp +++ b/src/base/QXmppMamIq.cpp @@ -21,11 +21,12 @@ * */ -#include - #include "QXmppMamIq.h" + #include "QXmppConstants_p.h" +#include + QXmppMamQueryIq::QXmppMamQueryIq() : QXmppIq(QXmppIq::Set) { } @@ -129,7 +130,6 @@ void QXmppMamQueryIq::toXmlElementFromChild(QXmlStreamWriter *writer) const } /// \endcond - QXmppMamResultIq::QXmppMamResultIq() : m_complete(false) { } diff --git a/src/base/QXmppMamIq.h b/src/base/QXmppMamIq.h index a60e4ecd1..115fc289c 100644 --- a/src/base/QXmppMamIq.h +++ b/src/base/QXmppMamIq.h @@ -24,8 +24,8 @@ #ifndef QXMPPMAMIQ_H #define QXMPPMAMIQ_H -#include "QXmppIq.h" #include "QXmppDataForm.h" +#include "QXmppIq.h" #include "QXmppResultSet.h" /// \brief The QXmppMamQueryIq class represents the query IQ for diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp index 4f50b836d..2d4ee40ab 100644 --- a/src/base/QXmppMessage.cpp +++ b/src/base/QXmppMessage.cpp @@ -23,16 +23,17 @@ * */ -#include -#include -#include -#include +#include "QXmppMessage.h" #include "QXmppBitsOfBinaryDataList.h" #include "QXmppConstants_p.h" -#include "QXmppMessage.h" #include "QXmppUtils.h" +#include +#include +#include +#include + static const QStringList CHAT_STATES = { QString(), QStringLiteral("active"), diff --git a/src/base/QXmppMessage.h b/src/base/QXmppMessage.h index 9a1ef4017..970395aae 100644 --- a/src/base/QXmppMessage.h +++ b/src/base/QXmppMessage.h @@ -27,10 +27,10 @@ #define QXMPPMESSAGE_H // Required for source compatibility -#include - #include "QXmppStanza.h" +#include + class QXmppMessagePrivate; class QXmppBitsOfBinaryDataList; diff --git a/src/base/QXmppMixIq.cpp b/src/base/QXmppMixIq.cpp index 854b86b8c..1ed02176b 100644 --- a/src/base/QXmppMixIq.cpp +++ b/src/base/QXmppMixIq.cpp @@ -22,8 +22,9 @@ */ #include "QXmppMixIq.h" -#include "QXmppDataForm.h" + #include "QXmppConstants_p.h" +#include "QXmppDataForm.h" #include "QXmppUtils.h" #include diff --git a/src/base/QXmppMixIq.h b/src/base/QXmppMixIq.h index 06af53a11..7866e4ee5 100644 --- a/src/base/QXmppMixIq.h +++ b/src/base/QXmppMixIq.h @@ -25,6 +25,7 @@ #define QXMPPMIXIQ_H #include "QXmppIq.h" + #include class QXmppMixIqPrivate; diff --git a/src/base/QXmppMixItem.cpp b/src/base/QXmppMixItem.cpp index f06dac4fb..882a3b99c 100644 --- a/src/base/QXmppMixItem.cpp +++ b/src/base/QXmppMixItem.cpp @@ -22,8 +22,9 @@ */ #include "QXmppMixItem.h" -#include "QXmppDataForm.h" + #include "QXmppConstants_p.h" +#include "QXmppDataForm.h" #include "QXmppUtils.h" #include diff --git a/src/base/QXmppMixItem.h b/src/base/QXmppMixItem.h index d1b42b48c..c7107c276 100644 --- a/src/base/QXmppMixItem.h +++ b/src/base/QXmppMixItem.h @@ -24,10 +24,10 @@ #ifndef QXMPPMIXITEM_H #define QXMPPMIXITEM_H -#include - #include "QXmppElement.h" +#include + class QXmppMixInfoItemPrivate; class QXmppMixParticipantItemPrivate; diff --git a/src/base/QXmppMucIq.cpp b/src/base/QXmppMucIq.cpp index 7120536c9..d0c50fc21 100644 --- a/src/base/QXmppMucIq.cpp +++ b/src/base/QXmppMucIq.cpp @@ -21,12 +21,13 @@ * */ -#include +#include "QXmppMucIq.h" #include "QXmppConstants_p.h" -#include "QXmppMucIq.h" #include "QXmppUtils.h" +#include + QXmppMucItem::QXmppMucItem() : m_affiliation(QXmppMucItem::UnspecifiedAffiliation), m_role(QXmppMucItem::UnspecifiedRole) diff --git a/src/base/QXmppNonSASLAuth.cpp b/src/base/QXmppNonSASLAuth.cpp index aa6f87910..4acee23b3 100644 --- a/src/base/QXmppNonSASLAuth.cpp +++ b/src/base/QXmppNonSASLAuth.cpp @@ -21,14 +21,15 @@ * */ -#include -#include -#include +#include "QXmppNonSASLAuth.h" #include "QXmppConstants_p.h" -#include "QXmppNonSASLAuth.h" #include "QXmppUtils.h" +#include +#include +#include + QXmppNonSASLAuthIq::QXmppNonSASLAuthIq() : QXmppIq(QXmppIq::Set) { diff --git a/src/base/QXmppPingIq.cpp b/src/base/QXmppPingIq.cpp index bbec9dca7..3a8d49fe1 100644 --- a/src/base/QXmppPingIq.cpp +++ b/src/base/QXmppPingIq.cpp @@ -21,8 +21,9 @@ * */ -#include "QXmppConstants_p.h" #include "QXmppPingIq.h" + +#include "QXmppConstants_p.h" #include "QXmppUtils.h" #include diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp index f0353b8d1..f7959aa6b 100644 --- a/src/base/QXmppPresence.cpp +++ b/src/base/QXmppPresence.cpp @@ -21,15 +21,14 @@ * */ - #include "QXmppPresence.h" -#include -#include - #include "QXmppConstants_p.h" #include "QXmppUtils.h" +#include +#include + static const QStringList PRESENCE_TYPES = { QStringLiteral("error"), QString(), diff --git a/src/base/QXmppPresence.h b/src/base/QXmppPresence.h index c22418bc9..b1502da3f 100644 --- a/src/base/QXmppPresence.h +++ b/src/base/QXmppPresence.h @@ -24,8 +24,8 @@ #ifndef QXMPPPRESENCE_H #define QXMPPPRESENCE_H -#include "QXmppStanza.h" #include "QXmppMucIq.h" +#include "QXmppStanza.h" class QXmppPresencePrivate; diff --git a/src/base/QXmppPubSubIq.cpp b/src/base/QXmppPubSubIq.cpp index ea96903b7..9ef3c952c 100644 --- a/src/base/QXmppPubSubIq.cpp +++ b/src/base/QXmppPubSubIq.cpp @@ -23,12 +23,12 @@ #include "QXmppPubSubIq.h" -#include -#include - #include "QXmppConstants_p.h" #include "QXmppUtils.h" +#include +#include + static const QStringList PUBSUB_QUERIES = { QStringLiteral("affiliations"), QStringLiteral("default"), diff --git a/src/base/QXmppPubSubIq.h b/src/base/QXmppPubSubIq.h index 9f9174f8a..1272a2f5f 100644 --- a/src/base/QXmppPubSubIq.h +++ b/src/base/QXmppPubSubIq.h @@ -24,9 +24,9 @@ #ifndef QXMPPPUBSUBIQ_H #define QXMPPPUBSUBIQ_H -#include - #include "QXmppIq.h" + +#include // required for compatibility: #include "QXmppPubSubItem.h" diff --git a/src/base/QXmppPubSubItem.cpp b/src/base/QXmppPubSubItem.cpp index 6751325f9..835aeccbd 100644 --- a/src/base/QXmppPubSubItem.cpp +++ b/src/base/QXmppPubSubItem.cpp @@ -23,11 +23,11 @@ #include "QXmppPubSubItem.h" -#include - #include "QXmppElement.h" #include "QXmppUtils.h" +#include + class QXmppPubSubItemPrivate : public QSharedData { public: diff --git a/src/base/QXmppPubSubItem.h b/src/base/QXmppPubSubItem.h index 384d3baf4..e8e59df42 100644 --- a/src/base/QXmppPubSubItem.h +++ b/src/base/QXmppPubSubItem.h @@ -24,10 +24,10 @@ #ifndef QXMPPPUBSUBITEM_H #define QXMPPPUBSUBITEM_H -#include - #include "QXmppGlobal.h" +#include + class QDomElement; class QXmlStreamWriter; diff --git a/src/base/QXmppRegisterIq.cpp b/src/base/QXmppRegisterIq.cpp index de96aee93..ecc2c9a0f 100644 --- a/src/base/QXmppRegisterIq.cpp +++ b/src/base/QXmppRegisterIq.cpp @@ -22,12 +22,13 @@ * */ -#include -#include - -#include "QXmppConstants_p.h" #include "QXmppRegisterIq.h" + #include "QXmppBitsOfBinaryDataList.h" +#include "QXmppConstants_p.h" + +#include +#include static const QStringList REGISTER_TYPES = { QString(), diff --git a/src/base/QXmppResultSet.cpp b/src/base/QXmppResultSet.cpp index fc4fd88c9..5e52cba8a 100644 --- a/src/base/QXmppResultSet.cpp +++ b/src/base/QXmppResultSet.cpp @@ -21,13 +21,13 @@ * */ +#include "QXmppResultSet.h" #include "QXmppConstants_p.h" -#include "QXmppResultSet.h" #include "QXmppUtils.h" -#include #include +#include QXmppResultSetQuery::QXmppResultSetQuery() : m_index(-1) diff --git a/src/base/QXmppResultSet.h b/src/base/QXmppResultSet.h index 6716d23ba..b75d7f1a6 100644 --- a/src/base/QXmppResultSet.h +++ b/src/base/QXmppResultSet.h @@ -24,10 +24,10 @@ #ifndef QXMPPRESULTSET_H #define QXMPPRESULTSET_H -#include - #include "QXmppStanza.h" +#include + /// \brief The QXmppResultSetQuery class represents a set element in a query /// as defined by XEP-0059: Result Set Management. diff --git a/src/base/QXmppRosterIq.cpp b/src/base/QXmppRosterIq.cpp index 01e0956d2..f37f4a686 100644 --- a/src/base/QXmppRosterIq.cpp +++ b/src/base/QXmppRosterIq.cpp @@ -22,14 +22,15 @@ * */ -#include -#include -#include - #include "QXmppRosterIq.h" + #include "QXmppConstants_p.h" #include "QXmppUtils.h" +#include +#include +#include + class QXmppRosterIqPrivate : public QSharedData { public: diff --git a/src/base/QXmppRosterIq.h b/src/base/QXmppRosterIq.h index f5dac4f1d..5baf4b631 100644 --- a/src/base/QXmppRosterIq.h +++ b/src/base/QXmppRosterIq.h @@ -26,6 +26,7 @@ #define QXMPPROSTERIQ_H #include "QXmppIq.h" + #include #include #include diff --git a/src/base/QXmppRpcIq.h b/src/base/QXmppRpcIq.h index 7355781c3..959491a58 100644 --- a/src/base/QXmppRpcIq.h +++ b/src/base/QXmppRpcIq.h @@ -26,6 +26,7 @@ #define QXMPPRPCIQ_H #include "QXmppIq.h" + #include class QXMPP_EXPORT QXmppRpcMarshaller diff --git a/src/base/QXmppRtcpPacket.cpp b/src/base/QXmppRtcpPacket.cpp index e3cb7417b..3b3be8b36 100644 --- a/src/base/QXmppRtcpPacket.cpp +++ b/src/base/QXmppRtcpPacket.cpp @@ -21,11 +21,11 @@ * */ +#include "QXmppRtcpPacket.h" + #include #include -#include "QXmppRtcpPacket.h" - #define RTP_VERSION 2 enum DescriptionType { diff --git a/src/base/QXmppRtcpPacket.h b/src/base/QXmppRtcpPacket.h index 0a709e464..a2041672a 100644 --- a/src/base/QXmppRtcpPacket.h +++ b/src/base/QXmppRtcpPacket.h @@ -24,10 +24,10 @@ #ifndef QXMPPRTCPPACKET_H #define QXMPPRTCPPACKET_H -#include - #include "QXmppGlobal.h" +#include + class QXmppRtcpPacketPrivate; class QXmppRtcpReceiverReport; class QXmppRtcpReceiverReportPrivate; diff --git a/src/base/QXmppRtpChannel.cpp b/src/base/QXmppRtpChannel.cpp index d4c20fad2..7fc69eb92 100644 --- a/src/base/QXmppRtpChannel.cpp +++ b/src/base/QXmppRtpChannel.cpp @@ -21,17 +21,18 @@ * */ +#include "QXmppRtpChannel.h" + +#include "QXmppCodec_p.h" +#include "QXmppJingleIq.h" +#include "QXmppRtpPacket.h" + #include #include #include #include -#include "QXmppCodec_p.h" -#include "QXmppJingleIq.h" -#include "QXmppRtpChannel.h" -#include "QXmppRtpPacket.h" - #ifndef M_PI #define M_PI 3.14159265358979323846264338327950288 #endif @@ -108,7 +109,6 @@ void QXmppRtpChannel::setLocalSsrc(quint32 ssrc) m_outgoingSsrc = ssrc; } - enum CodecId { G711u = 0, GSM = 3, diff --git a/src/base/QXmppRtpChannel.h b/src/base/QXmppRtpChannel.h index 56b689258..0882bd574 100644 --- a/src/base/QXmppRtpChannel.h +++ b/src/base/QXmppRtpChannel.h @@ -24,12 +24,12 @@ #ifndef QXMPPRTPCHANNEL_H #define QXMPPRTPCHANNEL_H -#include -#include - #include "QXmppJingleIq.h" #include "QXmppLogger.h" +#include +#include + class QXmppCodec; class QXmppJinglePayloadType; class QXmppRtpAudioChannelPrivate; diff --git a/src/base/QXmppRtpPacket.cpp b/src/base/QXmppRtpPacket.cpp index bb5d1d4b7..d8bb668b6 100644 --- a/src/base/QXmppRtpPacket.cpp +++ b/src/base/QXmppRtpPacket.cpp @@ -21,11 +21,11 @@ * */ +#include "QXmppRtpPacket.h" + #include #include -#include "QXmppRtpPacket.h" - #define RTP_VERSION 2 class QXmppRtpPacketPrivate : public QSharedData diff --git a/src/base/QXmppRtpPacket.h b/src/base/QXmppRtpPacket.h index a7f21043b..dd479eeb7 100644 --- a/src/base/QXmppRtpPacket.h +++ b/src/base/QXmppRtpPacket.h @@ -24,10 +24,10 @@ #ifndef QXMPPRTPPACKET_H #define QXMPPRTPPACKET_H -#include - #include "QXmppGlobal.h" +#include + class QXmppRtpPacketPrivate; /// \internal diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp index 3f70b093b..93edaf0ad 100644 --- a/src/base/QXmppSasl.cpp +++ b/src/base/QXmppSasl.cpp @@ -22,16 +22,16 @@ * */ +#include "QXmppSasl_p.h" +#include "QXmppUtils.h" + #include #include #include #include -#include #include - -#include "QXmppSasl_p.h" -#include "QXmppUtils.h" +#include const char *ns_xmpp_sasl = "urn:ietf:params:xml:ns:xmpp-sasl"; diff --git a/src/base/QXmppSasl_p.h b/src/base/QXmppSasl_p.h index 57eb344fe..f1d2692a9 100644 --- a/src/base/QXmppSasl_p.h +++ b/src/base/QXmppSasl_p.h @@ -25,14 +25,14 @@ #ifndef QXMPPSASL_P_H #define QXMPPSASL_P_H -#include -#include -#include - #include "QXmppGlobal.h" #include "QXmppLogger.h" #include "QXmppStanza.h" +#include +#include +#include + class QXmppSaslClientPrivate; class QXmppSaslServerPrivate; diff --git a/src/base/QXmppSessionIq.cpp b/src/base/QXmppSessionIq.cpp index 4916fef56..f4ce9cf26 100644 --- a/src/base/QXmppSessionIq.cpp +++ b/src/base/QXmppSessionIq.cpp @@ -22,13 +22,14 @@ * */ -#include -#include - #include "QXmppSessionIq.h" + #include "QXmppConstants_p.h" #include "QXmppUtils.h" +#include +#include + /// \cond bool QXmppSessionIq::isSessionIq(const QDomElement &element) { diff --git a/src/base/QXmppSocks.cpp b/src/base/QXmppSocks.cpp index ce8cdcc30..43a36bf15 100644 --- a/src/base/QXmppSocks.cpp +++ b/src/base/QXmppSocks.cpp @@ -21,13 +21,13 @@ * */ +#include "QXmppSocks.h" + #include #include #include #include -#include "QXmppSocks.h" - const static char SocksVersion = 5; enum AuthenticationMethod { diff --git a/src/base/QXmppSocks.h b/src/base/QXmppSocks.h index ceda5b597..355ba1440 100644 --- a/src/base/QXmppSocks.h +++ b/src/base/QXmppSocks.h @@ -24,11 +24,11 @@ #ifndef QXMPPSOCKS_H #define QXMPPSOCKS_H +#include "QXmppGlobal.h" + #include #include -#include "QXmppGlobal.h" - class QTcpServer; class QXMPP_EXPORT QXmppSocksClient : public QTcpSocket diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp index 002ef65ac..ffd6687df 100644 --- a/src/base/QXmppStanza.cpp +++ b/src/base/QXmppStanza.cpp @@ -23,15 +23,15 @@ * */ - #include "QXmppStanza.h" + +#include "QXmppConstants_p.h" #include "QXmppStanza_p.h" #include "QXmppUtils.h" -#include "QXmppConstants_p.h" +#include #include #include -#include uint QXmppStanza::s_uniqeIdNo = 0; diff --git a/src/base/QXmppStanza.h b/src/base/QXmppStanza.h index 5ad3dcad6..1fbd69e0b 100644 --- a/src/base/QXmppStanza.h +++ b/src/base/QXmppStanza.h @@ -27,17 +27,17 @@ #define QXMPPSTANZA_H #include -#include #include +#include // forward declarations of QXmlStream* classes will not work on Mac, we need to // include the whole header. // See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html // for an explanation. -#include - #include "QXmppElement.h" +#include + class QXmppExtendedAddressPrivate; /// \brief Represents an extended address as defined by XEP-0033: Extended Stanza Addressing. diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp index 0a2b0c4bf..676465af3 100644 --- a/src/base/QXmppStream.cpp +++ b/src/base/QXmppStream.cpp @@ -22,11 +22,11 @@ * */ +#include "QXmppStream.h" #include "QXmppConstants_p.h" #include "QXmppLogger.h" #include "QXmppStanza.h" -#include "QXmppStream.h" #include "QXmppStreamManagement_p.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppStream.h b/src/base/QXmppStream.h index 50927ed8f..19c3cbeac 100644 --- a/src/base/QXmppStream.h +++ b/src/base/QXmppStream.h @@ -25,9 +25,10 @@ #ifndef QXMPPSTREAM_H #define QXMPPSTREAM_H +#include "QXmppLogger.h" + #include #include -#include "QXmppLogger.h" class QDomElement; class QSslSocket; diff --git a/src/base/QXmppStreamFeatures.cpp b/src/base/QXmppStreamFeatures.cpp index 992cf3093..a921937ed 100644 --- a/src/base/QXmppStreamFeatures.cpp +++ b/src/base/QXmppStreamFeatures.cpp @@ -21,10 +21,11 @@ * */ -#include +#include "QXmppStreamFeatures.h" #include "QXmppConstants_p.h" -#include "QXmppStreamFeatures.h" + +#include QXmppStreamFeatures::QXmppStreamFeatures() : m_bindMode(Disabled), diff --git a/src/base/QXmppStreamInitiationIq.cpp b/src/base/QXmppStreamInitiationIq.cpp index 87067b657..acc52c66b 100644 --- a/src/base/QXmppStreamInitiationIq.cpp +++ b/src/base/QXmppStreamInitiationIq.cpp @@ -21,12 +21,12 @@ * */ -#include - #include "QXmppConstants_p.h" #include "QXmppStreamInitiationIq_p.h" #include "QXmppUtils.h" +#include + QXmppDataForm QXmppStreamInitiationIq::featureForm() const { return m_featureForm; diff --git a/src/base/QXmppStreamInitiationIq_p.h b/src/base/QXmppStreamInitiationIq_p.h index 863062787..4c8bd786a 100644 --- a/src/base/QXmppStreamInitiationIq_p.h +++ b/src/base/QXmppStreamInitiationIq_p.h @@ -24,12 +24,12 @@ #ifndef QXMPPSTREAMINITIATIONIQ_P_H #define QXMPPSTREAMINITIATIONIQ_P_H -#include - #include "QXmppDataForm.h" #include "QXmppIq.h" #include "QXmppTransferManager.h" +#include + // // W A R N I N G // ------------- diff --git a/src/base/QXmppStreamManagement.cpp b/src/base/QXmppStreamManagement.cpp index 1e9a96fc1..ed91a30ae 100644 --- a/src/base/QXmppStreamManagement.cpp +++ b/src/base/QXmppStreamManagement.cpp @@ -21,10 +21,9 @@ * */ -#include "QXmppStreamManagement_p.h" -#include "QXmppStanza_p.h" - #include "QXmppConstants_p.h" +#include "QXmppStanza_p.h" +#include "QXmppStreamManagement_p.h" QXmppStreamManagementEnable::QXmppStreamManagementEnable(const bool resume, const unsigned max) : m_resume(resume), m_max(max) diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp index 5ac859d48..2d4bbdc58 100644 --- a/src/base/QXmppStun.cpp +++ b/src/base/QXmppStun.cpp @@ -23,19 +23,19 @@ #define QXMPP_DEBUG_STUN +#include "QXmppStun_p.h" +#include "QXmppUtils.h" + #include #include #include #include -#include #include - -#include "QXmppStun_p.h" -#include "QXmppUtils.h" +#include #define STUN_ID_SIZE 12 #define STUN_RTO_INTERVAL 500 -#define STUN_RTO_MAX 7 +#define STUN_RTO_MAX 7 static const quint32 STUN_MAGIC = 0x2112A442; static const quint16 STUN_HEADER = 20; diff --git a/src/base/QXmppStun.h b/src/base/QXmppStun.h index 7aa047257..6b66aad45 100644 --- a/src/base/QXmppStun.h +++ b/src/base/QXmppStun.h @@ -24,10 +24,10 @@ #ifndef QXMPPSTUN_H #define QXMPPSTUN_H -#include - -#include "QXmppLogger.h" #include "QXmppJingleIq.h" +#include "QXmppLogger.h" + +#include class CandidatePair; class QDataStream; diff --git a/src/base/QXmppUtils.cpp b/src/base/QXmppUtils.cpp index b84d59e8b..658e9d8d5 100644 --- a/src/base/QXmppUtils.cpp +++ b/src/base/QXmppUtils.cpp @@ -22,6 +22,9 @@ * */ +#include "QXmppUtils.h" + +#include "QXmppLogger.h" #include #include @@ -34,9 +37,6 @@ #include #include -#include "QXmppUtils.h" -#include "QXmppLogger.h" - // adapted from public domain source by Ross Williams and Eric Durbin // FIXME : is this valid for big-endian machines? static quint32 crctable[256] = diff --git a/src/base/QXmppUtils.h b/src/base/QXmppUtils.h index 89829dc35..b9d5c0a0a 100644 --- a/src/base/QXmppUtils.h +++ b/src/base/QXmppUtils.h @@ -29,10 +29,10 @@ // include the whole header. // See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html // for an explanation. -#include - #include "QXmppGlobal.h" +#include + class QByteArray; class QDateTime; class QDomElement; diff --git a/src/base/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp index 839229bc5..da41db9db 100644 --- a/src/base/QXmppVCardIq.cpp +++ b/src/base/QXmppVCardIq.cpp @@ -21,14 +21,14 @@ * */ +#include "QXmppVCardIq.h" + +#include "QXmppConstants_p.h" +#include "QXmppUtils.h" #include #include -#include "QXmppVCardIq.h" -#include "QXmppUtils.h" -#include "QXmppConstants_p.h" - static QString getImageType(const QByteArray &contents) { if (contents.startsWith("\x89PNG\x0d\x0a\x1a\x0a")) diff --git a/src/base/QXmppVCardIq.h b/src/base/QXmppVCardIq.h index ec5a50af3..eb3ade50e 100644 --- a/src/base/QXmppVCardIq.h +++ b/src/base/QXmppVCardIq.h @@ -25,9 +25,10 @@ #define QXMPPVCARDIQ_H #include "QXmppIq.h" + #include -#include #include +#include class QXmppVCardAddressPrivate; class QXmppVCardEmailPrivate; diff --git a/src/base/QXmppVersionIq.cpp b/src/base/QXmppVersionIq.cpp index 7d41aebd7..1e7cd33a7 100644 --- a/src/base/QXmppVersionIq.cpp +++ b/src/base/QXmppVersionIq.cpp @@ -21,11 +21,12 @@ * */ -#include +#include "QXmppVersionIq.h" #include "QXmppConstants_p.h" #include "QXmppUtils.h" -#include "QXmppVersionIq.h" + +#include /// Returns the name of the software. /// diff --git a/src/client/QXmppArchiveManager.cpp b/src/client/QXmppArchiveManager.cpp index 75f9bea75..e9bb5ef8a 100644 --- a/src/client/QXmppArchiveManager.cpp +++ b/src/client/QXmppArchiveManager.cpp @@ -21,13 +21,14 @@ * */ -#include +#include "QXmppArchiveManager.h" #include "QXmppArchiveIq.h" -#include "QXmppArchiveManager.h" #include "QXmppClient.h" #include "QXmppConstants_p.h" +#include + /// \cond QStringList QXmppArchiveManager::discoveryFeatures() const { diff --git a/src/client/QXmppArchiveManager.h b/src/client/QXmppArchiveManager.h index e17fd65a6..5f0cb88ee 100644 --- a/src/client/QXmppArchiveManager.h +++ b/src/client/QXmppArchiveManager.h @@ -24,11 +24,11 @@ #ifndef QXMPPARCHIVEMANAGER_H #define QXMPPARCHIVEMANAGER_H -#include - #include "QXmppClientExtension.h" #include "QXmppResultSet.h" +#include + class QXmppArchiveChat; class QXmppArchiveChatIq; class QXmppArchiveListIq; diff --git a/src/client/QXmppBookmarkManager.cpp b/src/client/QXmppBookmarkManager.cpp index 246d24371..8afb0bd0d 100644 --- a/src/client/QXmppBookmarkManager.cpp +++ b/src/client/QXmppBookmarkManager.cpp @@ -21,15 +21,16 @@ * */ -#include - #include "QXmppBookmarkManager.h" + #include "QXmppBookmarkSet.h" #include "QXmppClient.h" #include "QXmppConstants_p.h" #include "QXmppIq.h" #include "QXmppUtils.h" +#include + // The QXmppPrivateStorageIq class represents an XML private storage IQ // as defined by XEP-0049: Private XML Storage. // diff --git a/src/client/QXmppBookmarkManager.h b/src/client/QXmppBookmarkManager.h index cebdf90db..8f14e1f71 100644 --- a/src/client/QXmppBookmarkManager.h +++ b/src/client/QXmppBookmarkManager.h @@ -24,10 +24,10 @@ #ifndef QXMPPBOOKMARKMANAGER_H #define QXMPPBOOKMARKMANAGER_H -#include - #include "QXmppClientExtension.h" +#include + class QXmppBookmarkManagerPrivate; class QXmppBookmarkSet; diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp index f670aa02a..067efb82e 100644 --- a/src/client/QXmppCallManager.cpp +++ b/src/client/QXmppCallManager.cpp @@ -21,10 +21,8 @@ * */ -#include -#include - #include "QXmppCallManager.h" + #include "QXmppClient.h" #include "QXmppConstants_p.h" #include "QXmppJingleIq.h" @@ -32,6 +30,9 @@ #include "QXmppStun.h" #include "QXmppUtils.h" +#include +#include + static const int RTP_COMPONENT = 1; static const int RTCP_COMPONENT = 2; diff --git a/src/client/QXmppCallManager.h b/src/client/QXmppCallManager.h index ae3f98229..78cafe5b3 100644 --- a/src/client/QXmppCallManager.h +++ b/src/client/QXmppCallManager.h @@ -24,13 +24,13 @@ #ifndef QXMPPCALLMANAGER_H #define QXMPPCALLMANAGER_H -#include -#include -#include - #include "QXmppClientExtension.h" #include "QXmppLogger.h" +#include +#include +#include + class QHostAddress; class QXmppCallPrivate; class QXmppCallManager; diff --git a/src/client/QXmppCarbonManager.cpp b/src/client/QXmppCarbonManager.cpp index ff4806609..68277f905 100644 --- a/src/client/QXmppCarbonManager.cpp +++ b/src/client/QXmppCarbonManager.cpp @@ -21,25 +21,23 @@ * */ -#include - #include "QXmppCarbonManager.h" -#include "QXmppConstants_p.h" + #include "QXmppClient.h" +#include "QXmppConstants_p.h" #include "QXmppDiscoveryManager.h" #include "QXmppMessage.h" #include "QXmppUtils.h" +#include QXmppCarbonManager::QXmppCarbonManager() : m_carbonsEnabled(false) { - } QXmppCarbonManager::~QXmppCarbonManager() { - } /// Returns whether message carbons are currently enabled diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp index f6622e943..6c958dd63 100644 --- a/src/client/QXmppClient.cpp +++ b/src/client/QXmppClient.cpp @@ -21,25 +21,25 @@ * */ -#include -#include - #include "QXmppClient.h" -#include "QXmppClient_p.h" + #include "QXmppClientExtension.h" +#include "QXmppClient_p.h" #include "QXmppConstants_p.h" +#include "QXmppDiscoveryIq.h" +#include "QXmppDiscoveryManager.h" +#include "QXmppEntityTimeManager.h" #include "QXmppLogger.h" -#include "QXmppOutgoingClient.h" #include "QXmppMessage.h" -#include "QXmppUtils.h" - -#include "QXmppTlsManager_p.h" +#include "QXmppOutgoingClient.h" #include "QXmppRosterManager.h" +#include "QXmppTlsManager_p.h" +#include "QXmppUtils.h" #include "QXmppVCardManager.h" #include "QXmppVersionManager.h" -#include "QXmppEntityTimeManager.h" -#include "QXmppDiscoveryManager.h" -#include "QXmppDiscoveryIq.h" + +#include +#include /// \cond QXmppClientPrivate::QXmppClientPrivate(QXmppClient *qq) diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h index 7df6839bb..be411993b 100644 --- a/src/client/QXmppClient.h +++ b/src/client/QXmppClient.h @@ -24,13 +24,13 @@ #ifndef QXMPPCLIENT_H #define QXMPPCLIENT_H -#include -#include - #include "QXmppConfiguration.h" #include "QXmppLogger.h" #include "QXmppPresence.h" +#include +#include + class QSslError; class QXmppClientExtension; diff --git a/src/client/QXmppClientExtension.cpp b/src/client/QXmppClientExtension.cpp index 855551620..01f0ab8cd 100644 --- a/src/client/QXmppClientExtension.cpp +++ b/src/client/QXmppClientExtension.cpp @@ -21,10 +21,10 @@ * */ -#include - #include "QXmppClientExtension.h" +#include + class QXmppClientExtensionPrivate { public: diff --git a/src/client/QXmppConfiguration.cpp b/src/client/QXmppConfiguration.cpp index 6f2470ec9..200dc47c8 100644 --- a/src/client/QXmppConfiguration.cpp +++ b/src/client/QXmppConfiguration.cpp @@ -21,12 +21,13 @@ * */ -#include -#include - #include "QXmppConfiguration.h" + #include "QXmppUtils.h" +#include +#include + class QXmppConfigurationPrivate : public QSharedData { public: diff --git a/src/client/QXmppConfiguration.h b/src/client/QXmppConfiguration.h index 72ff97bd4..975acfdc8 100644 --- a/src/client/QXmppConfiguration.h +++ b/src/client/QXmppConfiguration.h @@ -24,11 +24,11 @@ #ifndef QXMPPCONFIGURATION_H #define QXMPPCONFIGURATION_H -#include -#include - #include "QXmppGlobal.h" +#include +#include + class QNetworkProxy; class QSslCertificate; class QXmppConfigurationPrivate; diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp index d98fb3f93..21c3c3978 100644 --- a/src/client/QXmppDiscoveryManager.cpp +++ b/src/client/QXmppDiscoveryManager.cpp @@ -23,15 +23,15 @@ #include "QXmppDiscoveryManager.h" -#include -#include - #include "QXmppClient.h" #include "QXmppConstants_p.h" #include "QXmppDataForm.h" #include "QXmppDiscoveryIq.h" -#include "QXmppStream.h" #include "QXmppGlobal.h" +#include "QXmppStream.h" + +#include +#include class QXmppDiscoveryManagerPrivate { diff --git a/src/client/QXmppEntityTimeManager.cpp b/src/client/QXmppEntityTimeManager.cpp index e66126f1e..fdb9e24ac 100644 --- a/src/client/QXmppEntityTimeManager.cpp +++ b/src/client/QXmppEntityTimeManager.cpp @@ -21,17 +21,16 @@ * */ - #include "QXmppEntityTimeManager.h" -#include -#include - #include "QXmppClient.h" #include "QXmppConstants_p.h" #include "QXmppEntityTimeIq.h" #include "QXmppUtils.h" +#include +#include + /// Request the time from an XMPP entity. /// /// \param jid diff --git a/src/client/QXmppInternalClientExtension.cpp b/src/client/QXmppInternalClientExtension.cpp index c36666fbc..17e0349fd 100644 --- a/src/client/QXmppInternalClientExtension.cpp +++ b/src/client/QXmppInternalClientExtension.cpp @@ -21,10 +21,9 @@ * */ -#include "QXmppInternalClientExtension_p.h" - #include "QXmppClient.h" #include "QXmppClient_p.h" +#include "QXmppInternalClientExtension_p.h" /// \cond QXmppInternalClientExtension::QXmppInternalClientExtension() diff --git a/src/client/QXmppInternalClientExtension_p.h b/src/client/QXmppInternalClientExtension_p.h index 5692a21ab..ff8940de2 100644 --- a/src/client/QXmppInternalClientExtension_p.h +++ b/src/client/QXmppInternalClientExtension_p.h @@ -58,4 +58,4 @@ class QXmppInternalClientExtension : public QXmppClientExtension QXmppOutgoingClient *clientStream(); }; -#endif // QXMPPINTERNALCLIENTEXTENSION_H +#endif // QXMPPINTERNALCLIENTEXTENSION_H diff --git a/src/client/QXmppInvokable.cpp b/src/client/QXmppInvokable.cpp index 7a840d0f6..6b511e30d 100644 --- a/src/client/QXmppInvokable.cpp +++ b/src/client/QXmppInvokable.cpp @@ -23,10 +23,9 @@ #include "QXmppInvokable.h" -#include #include #include - +#include #include /// Constructs a QXmppInvokable with the specified \a parent. diff --git a/src/client/QXmppInvokable.h b/src/client/QXmppInvokable.h index 62b46b361..54c8ad02c 100644 --- a/src/client/QXmppInvokable.h +++ b/src/client/QXmppInvokable.h @@ -24,13 +24,13 @@ #ifndef QXMPPINVOKABLE_H #define QXMPPINVOKABLE_H -#include +#include "QXmppGlobal.h" + #include +#include +#include #include #include -#include - -#include "QXmppGlobal.h" /** This is the base class for all objects that will be invokable via RPC. All public slots of objects derived from this class will be exposed to the RPC interface. As a note for all methods, they can only understand types that QVariant knows about. diff --git a/src/client/QXmppMamManager.cpp b/src/client/QXmppMamManager.cpp index 2be546d07..268ec6f21 100644 --- a/src/client/QXmppMamManager.cpp +++ b/src/client/QXmppMamManager.cpp @@ -21,16 +21,17 @@ * */ -#include - #include "QXmppMamManager.h" -#include "QXmppMamIq.h" + #include "QXmppClient.h" #include "QXmppConstants_p.h" #include "QXmppDataForm.h" +#include "QXmppMamIq.h" #include "QXmppMessage.h" #include "QXmppUtils.h" +#include + /// \cond QStringList QXmppMamManager::discoveryFeatures() const { diff --git a/src/client/QXmppMamManager.h b/src/client/QXmppMamManager.h index c2c8f2990..f66db3b1f 100644 --- a/src/client/QXmppMamManager.h +++ b/src/client/QXmppMamManager.h @@ -24,11 +24,11 @@ #ifndef QXMPPMAMMANAGER_H #define QXMPPMAMMANAGER_H -#include - #include "QXmppClientExtension.h" #include "QXmppResultSet.h" +#include + class QXmppMessage; /// \brief The QXmppMamManager class makes it possible to access message diff --git a/src/client/QXmppMessageReceiptManager.cpp b/src/client/QXmppMessageReceiptManager.cpp index 3f08f1acc..e3b8aae52 100644 --- a/src/client/QXmppMessageReceiptManager.cpp +++ b/src/client/QXmppMessageReceiptManager.cpp @@ -24,13 +24,13 @@ #include "QXmppMessageReceiptManager.h" -#include - +#include "QXmppClient.h" #include "QXmppConstants_p.h" #include "QXmppMessage.h" -#include "QXmppClient.h" #include "QXmppUtils.h" +#include + /// Constructs a QXmppMessageReceiptManager to handle incoming and outgoing /// message delivery receipts. diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp index 4c2214bab..b65df6b0d 100644 --- a/src/client/QXmppMucManager.cpp +++ b/src/client/QXmppMucManager.cpp @@ -21,17 +21,18 @@ * */ -#include -#include +#include "QXmppMucManager.h" #include "QXmppClient.h" #include "QXmppConstants_p.h" #include "QXmppDiscoveryManager.h" #include "QXmppMessage.h" #include "QXmppMucIq.h" -#include "QXmppMucManager.h" #include "QXmppUtils.h" +#include +#include + class QXmppMucManagerPrivate { public: diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp index 8cbde9e2e..ba4f93491 100644 --- a/src/client/QXmppOutgoingClient.cpp +++ b/src/client/QXmppOutgoingClient.cpp @@ -22,26 +22,27 @@ * */ -#include -#include -#include -#include -#include -#include +#include "QXmppOutgoingClient.h" #include "QXmppConfiguration.h" #include "QXmppConstants_p.h" #include "QXmppIq.h" #include "QXmppLogger.h" #include "QXmppMessage.h" +#include "QXmppNonSASLAuth.h" #include "QXmppPresence.h" -#include "QXmppOutgoingClient.h" +#include "QXmppSasl_p.h" #include "QXmppStreamFeatures.h" #include "QXmppStreamManagement_p.h" -#include "QXmppNonSASLAuth.h" -#include "QXmppSasl_p.h" #include "QXmppUtils.h" +#include +#include +#include +#include +#include +#include + // IQ types #include "QXmppBindIq.h" #include "QXmppPingIq.h" @@ -50,11 +51,11 @@ #include #include #include -#include -#include #include -#include +#include +#include #include +#include class QXmppOutgoingClientPrivate { diff --git a/src/client/QXmppRemoteMethod.cpp b/src/client/QXmppRemoteMethod.cpp index da3b97f6d..9493f54ea 100644 --- a/src/client/QXmppRemoteMethod.cpp +++ b/src/client/QXmppRemoteMethod.cpp @@ -22,6 +22,7 @@ */ #include "QXmppRemoteMethod.h" + #include "QXmppClient.h" #include "QXmppUtils.h" diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp index 041d18514..1b93870da 100644 --- a/src/client/QXmppRosterManager.cpp +++ b/src/client/QXmppRosterManager.cpp @@ -22,14 +22,15 @@ * */ -#include +#include "QXmppRosterManager.h" #include "QXmppClient.h" #include "QXmppPresence.h" #include "QXmppRosterIq.h" -#include "QXmppRosterManager.h" #include "QXmppUtils.h" +#include + class QXmppRosterManagerPrivate { public: diff --git a/src/client/QXmppRosterManager.h b/src/client/QXmppRosterManager.h index a212b8842..5caf00113 100644 --- a/src/client/QXmppRosterManager.h +++ b/src/client/QXmppRosterManager.h @@ -25,14 +25,14 @@ #ifndef QXMPPROSTERMANAGER_H #define QXMPPROSTERMANAGER_H -#include -#include -#include - #include "QXmppClientExtension.h" #include "QXmppPresence.h" #include "QXmppRosterIq.h" +#include +#include +#include + class QXmppRosterManagerPrivate; /// \brief The QXmppRosterManager class provides access to a connected client's diff --git a/src/client/QXmppRpcManager.cpp b/src/client/QXmppRpcManager.cpp index 0707834af..f76546e13 100644 --- a/src/client/QXmppRpcManager.cpp +++ b/src/client/QXmppRpcManager.cpp @@ -21,12 +21,13 @@ * */ +#include "QXmppRpcManager.h" + #include "QXmppClient.h" #include "QXmppConstants_p.h" #include "QXmppInvokable.h" #include "QXmppRemoteMethod.h" #include "QXmppRpcIq.h" -#include "QXmppRpcManager.h" /// Constructs a QXmppRpcManager. diff --git a/src/client/QXmppRpcManager.h b/src/client/QXmppRpcManager.h index b88341095..13ad0aacb 100644 --- a/src/client/QXmppRpcManager.h +++ b/src/client/QXmppRpcManager.h @@ -24,13 +24,13 @@ #ifndef QXMPPRPCMANAGER_H #define QXMPPRPCMANAGER_H -#include -#include - #include "QXmppClientExtension.h" #include "QXmppInvokable.h" #include "QXmppRemoteMethod.h" +#include +#include + class QXmppRpcErrorIq; class QXmppRpcInvokeIq; class QXmppRpcResponseIq; diff --git a/src/client/QXmppTlsManager.cpp b/src/client/QXmppTlsManager.cpp index 683d6ec2e..20001473e 100644 --- a/src/client/QXmppTlsManager.cpp +++ b/src/client/QXmppTlsManager.cpp @@ -21,14 +21,13 @@ * */ -#include "QXmppTlsManager_p.h" - -#include "QXmppConstants_p.h" #include "QXmppClient.h" #include "QXmppClient_p.h" +#include "QXmppConstants_p.h" #include "QXmppOutgoingClient.h" -#include "QXmppStreamFeatures.h" #include "QXmppStartTlsPacket.h" +#include "QXmppStreamFeatures.h" +#include "QXmppTlsManager_p.h" #include #include diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp index 3621ba6fd..ecbdbd1e8 100644 --- a/src/client/QXmppTransferManager.cpp +++ b/src/client/QXmppTransferManager.cpp @@ -21,6 +21,18 @@ * */ +#include "QXmppTransferManager.h" + +#include "QXmppByteStreamIq.h" +#include "QXmppClient.h" +#include "QXmppConstants_p.h" +#include "QXmppIbbIq.h" +#include "QXmppSocks.h" +#include "QXmppStreamInitiationIq_p.h" +#include "QXmppStun.h" +#include "QXmppTransferManager_p.h" +#include "QXmppUtils.h" + #include #include #include @@ -34,17 +46,6 @@ #include #include -#include "QXmppByteStreamIq.h" -#include "QXmppClient.h" -#include "QXmppConstants_p.h" -#include "QXmppIbbIq.h" -#include "QXmppSocks.h" -#include "QXmppStreamInitiationIq_p.h" -#include "QXmppStun.h" -#include "QXmppTransferManager.h" -#include "QXmppTransferManager_p.h" -#include "QXmppUtils.h" - // time to try to connect to a SOCKS host (7 seconds) const int socksTimeout = 7000; diff --git a/src/client/QXmppUploadRequestManager.cpp b/src/client/QXmppUploadRequestManager.cpp index 1127d3b46..b03211500 100644 --- a/src/client/QXmppUploadRequestManager.cpp +++ b/src/client/QXmppUploadRequestManager.cpp @@ -21,17 +21,17 @@ * */ -#include -#include +#include "QXmppUploadRequestManager.h" #include "QXmppClient.h" #include "QXmppConstants_p.h" -#include "QXmppDiscoveryManager.h" -#include "QXmppDiscoveryIq.h" #include "QXmppDataForm.h" +#include "QXmppDiscoveryIq.h" +#include "QXmppDiscoveryManager.h" #include "QXmppHttpUploadIq.h" -#include "QXmppUploadRequestManager.h" +#include +#include class QXmppUploadServicePrivate : public QSharedData { diff --git a/src/client/QXmppUploadRequestManager.h b/src/client/QXmppUploadRequestManager.h index 742b465d5..f04b4563f 100644 --- a/src/client/QXmppUploadRequestManager.h +++ b/src/client/QXmppUploadRequestManager.h @@ -25,6 +25,7 @@ #define QXMPPUPLOADREQUESTMANAGER_H #include + #include class QFileInfo; diff --git a/src/client/QXmppVCardManager.cpp b/src/client/QXmppVCardManager.cpp index 5f26ba4d6..9d8b782a5 100644 --- a/src/client/QXmppVCardManager.cpp +++ b/src/client/QXmppVCardManager.cpp @@ -21,12 +21,12 @@ * */ +#include "QXmppVCardManager.h" #include "QXmppClient.h" #include "QXmppConstants_p.h" #include "QXmppUtils.h" #include "QXmppVCardIq.h" -#include "QXmppVCardManager.h" class QXmppVCardManagerPrivate { diff --git a/src/client/QXmppVersionManager.cpp b/src/client/QXmppVersionManager.cpp index 3e212786e..7c5fbafd6 100644 --- a/src/client/QXmppVersionManager.cpp +++ b/src/client/QXmppVersionManager.cpp @@ -21,16 +21,17 @@ * */ -#include -#include -#include +#include "QXmppVersionManager.h" #include "QXmppClient.h" #include "QXmppConstants_p.h" #include "QXmppGlobal.h" -#include "QXmppVersionManager.h" #include "QXmppVersionIq.h" +#include +#include +#include + class QXmppVersionManagerPrivate { public: diff --git a/src/server/QXmppDialback.cpp b/src/server/QXmppDialback.cpp index ee3e41bba..852edc5bb 100644 --- a/src/server/QXmppDialback.cpp +++ b/src/server/QXmppDialback.cpp @@ -21,12 +21,13 @@ * */ -#include +#include "QXmppDialback.h" #include "QXmppConstants_p.h" -#include "QXmppDialback.h" #include "QXmppUtils.h" +#include + /// Constructs a QXmppDialback. QXmppDialback::QXmppDialback() diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp index 009d4427f..6142faabc 100644 --- a/src/server/QXmppIncomingClient.cpp +++ b/src/server/QXmppIncomingClient.cpp @@ -21,11 +21,7 @@ * */ -#include -#include -#include -#include -#include +#include "QXmppIncomingClient.h" #include "QXmppBindIq.h" #include "QXmppConstants_p.h" @@ -37,7 +33,11 @@ #include "QXmppStreamFeatures.h" #include "QXmppUtils.h" -#include "QXmppIncomingClient.h" +#include +#include +#include +#include +#include class QXmppIncomingClientPrivate { diff --git a/src/server/QXmppIncomingServer.cpp b/src/server/QXmppIncomingServer.cpp index bc76738d8..7e2e8a0b3 100644 --- a/src/server/QXmppIncomingServer.cpp +++ b/src/server/QXmppIncomingServer.cpp @@ -21,19 +21,20 @@ * */ -#include -#include -#include -#include +#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 +#include +#include +#include + class QXmppIncomingServerPrivate { public: diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp index 99e9fd9a3..b00858679 100644 --- a/src/server/QXmppOutgoingServer.cpp +++ b/src/server/QXmppOutgoingServer.cpp @@ -21,21 +21,22 @@ * */ -#include -#include -#include -#include -#include -#include -#include +#include "QXmppOutgoingServer.h" #include "QXmppConstants_p.h" #include "QXmppDialback.h" -#include "QXmppOutgoingServer.h" #include "QXmppStartTlsPacket.h" #include "QXmppStreamFeatures.h" #include "QXmppUtils.h" +#include +#include +#include +#include +#include +#include +#include + class QXmppOutgoingServerPrivate { public: diff --git a/src/server/QXmppOutgoingServer.h b/src/server/QXmppOutgoingServer.h index 618b69a18..c0a6a5899 100644 --- a/src/server/QXmppOutgoingServer.h +++ b/src/server/QXmppOutgoingServer.h @@ -24,10 +24,10 @@ #ifndef QXMPPOUTGOINGSERVER_H #define QXMPPOUTGOINGSERVER_H -#include - #include "QXmppStream.h" +#include + class QSslError; class QXmppDialback; class QXmppOutgoingServer; diff --git a/src/server/QXmppPasswordChecker.cpp b/src/server/QXmppPasswordChecker.cpp index 70bfad835..af03ecb51 100644 --- a/src/server/QXmppPasswordChecker.cpp +++ b/src/server/QXmppPasswordChecker.cpp @@ -21,12 +21,12 @@ * */ +#include "QXmppPasswordChecker.h" + #include #include #include -#include "QXmppPasswordChecker.h" - /// Returns the requested domain. QString QXmppPasswordRequest::domain() const diff --git a/src/server/QXmppPasswordChecker.h b/src/server/QXmppPasswordChecker.h index 7d79676f6..160b879eb 100644 --- a/src/server/QXmppPasswordChecker.h +++ b/src/server/QXmppPasswordChecker.h @@ -24,10 +24,10 @@ #ifndef QXMPPPASSWORDCHECKER_H #define QXMPPPASSWORDCHECKER_H -#include - #include "QXmppGlobal.h" +#include + /// \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 49a5d6fe8..ea86e1240 100644 --- a/src/server/QXmppServer.cpp +++ b/src/server/QXmppServer.cpp @@ -21,27 +21,28 @@ * */ -#include -#include -#include -#include -#include -#include -#include +#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 +#include +#include +#include +#include +#include +#include + +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 f7a15905a..609886f8c 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 #include -#include "QXmppLogger.h" - class QDomElement; class QSslCertificate; class QSslKey; diff --git a/src/server/QXmppServerExtension.cpp b/src/server/QXmppServerExtension.cpp index 7a6a19b30..0db387aad 100644 --- a/src/server/QXmppServerExtension.cpp +++ b/src/server/QXmppServerExtension.cpp @@ -21,13 +21,14 @@ * */ -#include -#include -#include +#include "QXmppServerExtension.h" #include "QXmppLogger.h" #include "QXmppServer.h" -#include "QXmppServerExtension.h" + +#include +#include +#include class QXmppServerExtensionPrivate { diff --git a/src/server/QXmppServerExtension.h b/src/server/QXmppServerExtension.h index 52c61d3cb..af736225a 100644 --- a/src/server/QXmppServerExtension.h +++ b/src/server/QXmppServerExtension.h @@ -24,10 +24,10 @@ #ifndef QXMPPSERVEREXTENSION_H #define QXMPPSERVEREXTENSION_H -#include - #include "QXmppLogger.h" +#include + class QDomElement; class QStringList; diff --git a/src/server/QXmppServerPlugin.h b/src/server/QXmppServerPlugin.h index e7ea6a510..c0dc61d39 100644 --- a/src/server/QXmppServerPlugin.h +++ b/src/server/QXmppServerPlugin.h @@ -24,10 +24,10 @@ #ifndef QXMPPSERVERPLUGIN_H #define QXMPPSERVERPLUGIN_H -#include - #include "QXmppGlobal.h" +#include + class QXmppServer; class QXmppServerExtension; diff --git a/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp b/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp index 615a30960..8c60c8791 100644 --- a/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp +++ b/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp @@ -23,6 +23,7 @@ */ #include "QXmppArchiveIq.h" + #include "util.h" class tst_QXmppArchiveIq : public QObject diff --git a/tests/qxmppbindiq/tst_qxmppbindiq.cpp b/tests/qxmppbindiq/tst_qxmppbindiq.cpp index 60e93c7c6..65a4f12fe 100644 --- a/tests/qxmppbindiq/tst_qxmppbindiq.cpp +++ b/tests/qxmppbindiq/tst_qxmppbindiq.cpp @@ -22,9 +22,10 @@ * */ -#include #include "QXmppBindIq.h" + #include "util.h" +#include class tst_QXmppBindIq : public QObject { diff --git a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp index 551c79d67..2c23d145b 100644 --- a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp +++ b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp @@ -21,10 +21,10 @@ * */ -#include - #include "QXmppBitsOfBinaryContentId.h" + #include "util.h" +#include class tst_QXmppBitsOfBinaryContentId : public QObject { diff --git a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp index 258c30442..4e9cb954d 100644 --- a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp +++ b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp @@ -21,12 +21,12 @@ * */ -#include -#include - #include "QXmppBitsOfBinaryContentId.h" #include "QXmppBitsOfBinaryIq.h" + #include "util.h" +#include +#include class tst_QXmppBitsOfBinaryIq : public QObject { diff --git a/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp b/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp index 908c54505..319f91018 100644 --- a/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp +++ b/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp @@ -21,13 +21,13 @@ * */ -#include -#include - #include "QXmppCallManager.h" #include "QXmppClient.h" #include "QXmppServer.h" + #include "util.h" +#include +#include class tst_QXmppCallManager : public QObject { diff --git a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp index 2f4f9357f..bad351a45 100644 --- a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp +++ b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp @@ -22,12 +22,13 @@ * */ -#include -#include "QXmppMessage.h" #include "QXmppCarbonManager.h" +#include "QXmppMessage.h" + #include "util.h" +#include -class QXmppCarbonTestHelper : public QObject +class QXmppCarbonTestHelper : public QObject { Q_OBJECT diff --git a/tests/qxmppclient/tst_qxmppclient.cpp b/tests/qxmppclient/tst_qxmppclient.cpp index 122d6acaf..bf14f97eb 100644 --- a/tests/qxmppclient/tst_qxmppclient.cpp +++ b/tests/qxmppclient/tst_qxmppclient.cpp @@ -22,8 +22,6 @@ * */ -#include - #include "QXmppClient.h" #include "QXmppLogger.h" #include "QXmppMessage.h" @@ -32,6 +30,7 @@ #include "QXmppVersionManager.h" #include "util.h" +#include class tst_QXmppClient : public QObject { diff --git a/tests/qxmppcodec/tst_qxmppcodec.cpp b/tests/qxmppcodec/tst_qxmppcodec.cpp index 506c04899..21122102d 100644 --- a/tests/qxmppcodec/tst_qxmppcodec.cpp +++ b/tests/qxmppcodec/tst_qxmppcodec.cpp @@ -21,12 +21,12 @@ * */ -#include -#include - #include "QXmppCodec_p.h" #include "QXmppRtpChannel.h" +#include +#include + class tst_QXmppCodec : public QObject { Q_OBJECT diff --git a/tests/qxmppdataform/tst_qxmppdataform.cpp b/tests/qxmppdataform/tst_qxmppdataform.cpp index 08be2e2c6..1efabaf5c 100644 --- a/tests/qxmppdataform/tst_qxmppdataform.cpp +++ b/tests/qxmppdataform/tst_qxmppdataform.cpp @@ -23,14 +23,15 @@ * */ -#include #include +#include // deprecated methods are also tested: this is used to avoid unnecessary warnings #undef QT_DEPRECATED_X #define QT_DEPRECATED_X(text) #include "QXmppDataForm.h" + #include "util.h" class tst_QXmppDataForm : public QObject diff --git a/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp b/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp index 0b8666953..9dc95238c 100644 --- a/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp +++ b/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp @@ -22,9 +22,10 @@ * */ -#include #include "QXmppDiscoveryIq.h" + #include "util.h" +#include class tst_QXmppDiscoveryIq : public QObject { diff --git a/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp b/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp index ccb6643c5..755ba0858 100644 --- a/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp +++ b/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp @@ -22,9 +22,10 @@ * */ -#include #include "QXmppEntityTimeIq.h" + #include "util.h" +#include class tst_QXmppEntityTimeIq : public QObject { diff --git a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp index c877825aa..4f22dcc36 100644 --- a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp +++ b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp @@ -21,9 +21,10 @@ * */ -#include #include "QXmppHttpUploadIq.h" + #include "util.h" +#include class tst_QXmppHttpUploadIq : public QObject { diff --git a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp index 57cde0e27..c71b02a11 100644 --- a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp +++ b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp @@ -21,9 +21,10 @@ * */ -#include #include "QXmppStun.h" + #include "util.h" +#include class tst_QXmppIceConnection : public QObject { diff --git a/tests/qxmppiq/tst_qxmppiq.cpp b/tests/qxmppiq/tst_qxmppiq.cpp index 66fcbd545..cad73ffcc 100644 --- a/tests/qxmppiq/tst_qxmppiq.cpp +++ b/tests/qxmppiq/tst_qxmppiq.cpp @@ -21,10 +21,10 @@ * */ -#include - #include "QXmppIq.h" + #include "util.h" +#include class tst_QXmppIq : public QObject { diff --git a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp index 254cbd440..114e095b9 100644 --- a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp +++ b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp @@ -21,9 +21,10 @@ * */ -#include #include "QXmppJingleIq.h" + #include "util.h" +#include class tst_QXmppJingleIq : public QObject { diff --git a/tests/qxmppmammanager/tst_qxmppmammanager.cpp b/tests/qxmppmammanager/tst_qxmppmammanager.cpp index 3d32a3e10..38d86909f 100644 --- a/tests/qxmppmammanager/tst_qxmppmammanager.cpp +++ b/tests/qxmppmammanager/tst_qxmppmammanager.cpp @@ -21,12 +21,13 @@ * */ -#include -#include "QXmppMessage.h" #include "QXmppMamManager.h" +#include "QXmppMessage.h" + #include "util.h" +#include -class QXmppMamTestHelper : public QObject +class QXmppMamTestHelper : public QObject { Q_OBJECT diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp index f9d815829..a7c0a3b34 100644 --- a/tests/qxmppmessage/tst_qxmppmessage.cpp +++ b/tests/qxmppmessage/tst_qxmppmessage.cpp @@ -22,11 +22,12 @@ * */ -#include #include "QXmppBitsOfBinaryContentId.h" #include "QXmppBitsOfBinaryDataList.h" #include "QXmppMessage.h" + #include "util.h" +#include class tst_QXmppMessage : public QObject { diff --git a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp index c205dfeb4..6bf53cf2a 100644 --- a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp +++ b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp @@ -21,10 +21,11 @@ * */ -#include #include "QXmppClient.h" #include "QXmppMessageReceiptManager.h" + #include "util.h" +#include class tst_QXmppMessageReceiptManager : public QObject { diff --git a/tests/qxmppmixiq/tst_qxmppmixiq.cpp b/tests/qxmppmixiq/tst_qxmppmixiq.cpp index 7348c03b7..7387c6672 100644 --- a/tests/qxmppmixiq/tst_qxmppmixiq.cpp +++ b/tests/qxmppmixiq/tst_qxmppmixiq.cpp @@ -21,10 +21,10 @@ * */ -#include - #include "QXmppMixIq.h" + #include "util.h" +#include Q_DECLARE_METATYPE(QXmppIq::Type); Q_DECLARE_METATYPE(QXmppMixIq::Type); diff --git a/tests/qxmppmixitem/tst_qxmppmixitem.cpp b/tests/qxmppmixitem/tst_qxmppmixitem.cpp index 65e1e1904..2120aa740 100644 --- a/tests/qxmppmixitem/tst_qxmppmixitem.cpp +++ b/tests/qxmppmixitem/tst_qxmppmixitem.cpp @@ -21,11 +21,12 @@ * */ -#include -#include #include "QXmppMixItem.h" #include "QXmppPubSubIq.h" + #include "util.h" +#include +#include class tst_QXmppMixItem : public QObject { diff --git a/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp b/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp index eb6460b0f..ed5b3e46a 100644 --- a/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp +++ b/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp @@ -23,6 +23,7 @@ */ #include "QXmppNonSASLAuth.h" + #include "util.h" class tst_QXmppNonSASLAuthIq : public QObject diff --git a/tests/qxmpppresence/tst_qxmpppresence.cpp b/tests/qxmpppresence/tst_qxmpppresence.cpp index 9bdf4953b..701b91922 100644 --- a/tests/qxmpppresence/tst_qxmpppresence.cpp +++ b/tests/qxmpppresence/tst_qxmpppresence.cpp @@ -22,12 +22,11 @@ * */ -#include -#include - #include "QXmppPresence.h" #include "util.h" +#include +#include class tst_QXmppPresence : public QObject { diff --git a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp index 8257a72aa..1f85a8c79 100644 --- a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp +++ b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp @@ -21,9 +21,10 @@ * */ -#include #include "QXmppPubSubIq.h" + #include "util.h" +#include class tst_QXmppPubSubIq : public QObject { diff --git a/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp index b6062af69..0ea2914e6 100644 --- a/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp +++ b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp @@ -22,13 +22,13 @@ * */ -#include - #include "QXmppBitsOfBinaryContentId.h" #include "QXmppBitsOfBinaryData.h" #include "QXmppBitsOfBinaryDataList.h" #include "QXmppRegisterIq.h" + #include "util.h" +#include class tst_QXmppRegisterIq : public QObject { diff --git a/tests/qxmppresultset/tst_qxmppresultset.cpp b/tests/qxmppresultset/tst_qxmppresultset.cpp index 7704d2fe5..b27d81af7 100644 --- a/tests/qxmppresultset/tst_qxmppresultset.cpp +++ b/tests/qxmppresultset/tst_qxmppresultset.cpp @@ -22,9 +22,10 @@ * */ -#include #include "QXmppResultSet.h" + #include "util.h" +#include class tst_QXmppResultSet : public QObject { diff --git a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp index 4d4e43a48..ae8e7f515 100644 --- a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp +++ b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp @@ -21,9 +21,10 @@ * */ -#include #include "QXmppRosterIq.h" + #include "util.h" +#include class tst_QXmppRosterIq : public QObject { diff --git a/tests/qxmpprpciq/tst_qxmpprpciq.cpp b/tests/qxmpprpciq/tst_qxmpprpciq.cpp index 8dbecec3f..28034dd28 100644 --- a/tests/qxmpprpciq/tst_qxmpprpciq.cpp +++ b/tests/qxmpprpciq/tst_qxmpprpciq.cpp @@ -21,9 +21,10 @@ * */ -#include #include "QXmppRpcIq.h" + #include "util.h" +#include static void checkVariant(const QVariant &value, const QByteArray &xml) { diff --git a/tests/qxmpprtcppacket/tst_qxmpprtcppacket.cpp b/tests/qxmpprtcppacket/tst_qxmpprtcppacket.cpp index 70f7d2bc6..d3e8b9549 100644 --- a/tests/qxmpprtcppacket/tst_qxmpprtcppacket.cpp +++ b/tests/qxmpprtcppacket/tst_qxmpprtcppacket.cpp @@ -21,9 +21,10 @@ * */ +#include "QXmppRtcpPacket.h" + #include #include -#include "QXmppRtcpPacket.h" class tst_QXmppRtcpPacket : public QObject { diff --git a/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp b/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp index 457f0afbf..28d822041 100644 --- a/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp +++ b/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp @@ -21,9 +21,10 @@ * */ +#include "QXmppRtpPacket.h" + #include #include -#include "QXmppRtpPacket.h" class tst_QXmppRtpPacket : public QObject { diff --git a/tests/qxmppserver/tst_qxmppserver.cpp b/tests/qxmppserver/tst_qxmppserver.cpp index 6edc4effe..cefa8ee07 100644 --- a/tests/qxmppserver/tst_qxmppserver.cpp +++ b/tests/qxmppserver/tst_qxmppserver.cpp @@ -23,6 +23,7 @@ #include "QXmppClient.h" #include "QXmppServer.h" + #include "util.h" class tst_QXmppServer : public QObject diff --git a/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp b/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp index 7a1d57bcb..ba766af27 100644 --- a/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp +++ b/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp @@ -23,6 +23,7 @@ */ #include "QXmppSessionIq.h" + #include "util.h" class TestPackets : public QObject diff --git a/tests/qxmppsocks/tst_qxmppsocks.cpp b/tests/qxmppsocks/tst_qxmppsocks.cpp index 9861891c7..694fc2777 100644 --- a/tests/qxmppsocks/tst_qxmppsocks.cpp +++ b/tests/qxmppsocks/tst_qxmppsocks.cpp @@ -21,10 +21,11 @@ * */ -#include -#include #include "QXmppSocks.h" + #include "util.h" +#include +#include class tst_QXmppSocks : public QObject { diff --git a/tests/qxmppstanza/tst_qxmppstanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp index 6dd704c51..38ffd9327 100644 --- a/tests/qxmppstanza/tst_qxmppstanza.cpp +++ b/tests/qxmppstanza/tst_qxmppstanza.cpp @@ -21,9 +21,10 @@ * */ -#include #include "QXmppStanza.h" + #include "util.h" +#include class tst_QXmppStanza : public QObject { diff --git a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp index 1b6119d85..7f1e0d3e5 100644 --- a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp +++ b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp @@ -21,10 +21,10 @@ * */ -#include - #include "QXmppStartTlsPacket.h" + #include "util.h" +#include class tst_QXmppStartTlsPacket : public QObject { diff --git a/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp b/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp index 223fd9651..eb5a174b6 100644 --- a/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp +++ b/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp @@ -22,6 +22,7 @@ */ #include "QXmppStreamFeatures.h" + #include "util.h" class tst_QXmppStreamFeatures : public QObject diff --git a/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp index 22572cc45..1bf55b779 100644 --- a/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp +++ b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp @@ -24,6 +24,7 @@ #include "QXmppStreamInitiationIq_p.h" #include "QXmppTransferManager.h" + #include "util.h" class tst_QXmppStreamInitiationIq : public QObject diff --git a/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp b/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp index 8385d0834..f1cfdbbba 100644 --- a/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp +++ b/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp @@ -21,9 +21,10 @@ * */ -#include #include "QXmppStun.h" + #include "util.h" +#include class tst_QXmppStunMessage : public QObject { diff --git a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp index 537b52ded..87f04eb65 100644 --- a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp +++ b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp @@ -21,13 +21,13 @@ * */ -#include -#include - #include "QXmppClient.h" #include "QXmppServer.h" #include "QXmppTransferManager.h" + #include "util.h" +#include +#include class tst_QXmppTransferManager : public QObject { diff --git a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp b/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp index 0332b410f..0486f519d 100644 --- a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp +++ b/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp @@ -22,18 +22,18 @@ * */ -#include -#include -#include - -#include "QXmppUploadRequestManager.h" #include "QXmppClient.h" #include "QXmppDiscoveryManager.h" -#include "QXmppLogger.h" #include "QXmppHttpUploadIq.h" +#include "QXmppLogger.h" +#include "QXmppUploadRequestManager.h" + #include "util.h" +#include +#include +#include -class TestHelper : public QObject +class TestHelper : public QObject { Q_OBJECT diff --git a/tests/qxmpputils/tst_qxmpputils.cpp b/tests/qxmpputils/tst_qxmpputils.cpp index 69b02b397..27424e1ab 100644 --- a/tests/qxmpputils/tst_qxmpputils.cpp +++ b/tests/qxmpputils/tst_qxmpputils.cpp @@ -22,9 +22,10 @@ * */ -#include #include "QXmppUtils.h" + #include "util.h" +#include class tst_QXmppUtils : public QObject { diff --git a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp index 81d120664..932ee9b9f 100644 --- a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp +++ b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp @@ -21,9 +21,10 @@ * */ -#include #include "QXmppVCardIq.h" + #include "util.h" +#include class tst_QXmppVCardIq : public QObject { diff --git a/tests/qxmppversioniq/tst_qxmppversioniq.cpp b/tests/qxmppversioniq/tst_qxmppversioniq.cpp index 2d9ec6327..00c17da0f 100644 --- a/tests/qxmppversioniq/tst_qxmppversioniq.cpp +++ b/tests/qxmppversioniq/tst_qxmppversioniq.cpp @@ -22,9 +22,10 @@ * */ -#include #include "QXmppVersionIq.h" + #include "util.h" +#include class tst_QXmppVersionIq : public QObject { diff --git a/tests/util.h b/tests/util.h index 5d5bf9f96..9d1cee909 100644 --- a/tests/util.h +++ b/tests/util.h @@ -22,9 +22,10 @@ * */ +#include "QXmppPasswordChecker.h" + #include #include -#include "QXmppPasswordChecker.h" template static void parsePacket(T &packet, const QByteArray &xml)