Clang: Reorder includes

Change-Id: I324e88c0d295114390c1fac2745c0d2d47637ece
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

src/libs/clangbackendipc/clangbackendipc-lib.pri

@@ -12,7 +12,6 @@ INCLUDEPATH += $$PWD
 
 SOURCES += $$PWD/ipcserverinterface.cpp \
     $$PWD/ipcserverproxy.cpp \
-    $$PWD/ipcserver.cpp \
     $$PWD/ipcclientinterface.cpp \
     $$PWD/cmbendcommand.cpp \
     $$PWD/cmbalivecommand.cpp \
@@ -42,7 +41,6 @@ SOURCES += $$PWD/ipcserverinterface.cpp \
 HEADERS += \
     $$PWD/ipcserverinterface.h \
     $$PWD/ipcserverproxy.h \
-    $$PWD/ipcserver.h \
     $$PWD/ipcclientinterface.h \
     $$PWD/cmbendcommand.h \
     $$PWD/cmbalivecommand.h \

src/libs/clangbackendipc/cmbalivecommand.cpp

@@ -30,9 +30,8 @@
 
 #include "cmbalivecommand.h"
 
-#include <QtDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/cmbcodecompletedcommand.cpp

@@ -30,9 +30,8 @@
 
 #include "cmbcodecompletedcommand.h"
 
-#include <QDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 

src/libs/clangbackendipc/cmbcodecompletedcommand.h

@@ -31,11 +31,11 @@
 #ifndef CLANGBACKEND_CODECOMPLETEDCOMMAND_H
 #define CLANGBACKEND_CODECOMPLETEDCOMMAND_H
 
+#include "codecompletion.h"
+
 #include <QMetaType>
 #include <QVector>
 
-#include "codecompletion.h"
-
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT CodeCompletedCommand

src/libs/clangbackendipc/cmbcompletecodecommand.cpp

@@ -30,9 +30,8 @@
 
 #include "cmbcompletecodecommand.h"
 
-#include <QDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 

src/libs/clangbackendipc/cmbcompletecodecommand.h

@@ -33,9 +33,10 @@
 
 #include "clangbackendipc_global.h"
 
-#include <QMetaType>
 #include <utf8string.h>
 
+#include <QMetaType>
+
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT CompleteCodeCommand

src/libs/clangbackendipc/cmbechocommand.cpp

@@ -30,9 +30,8 @@
 
 #include "cmbechocommand.h"
 
-#include <QtDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 

src/libs/clangbackendipc/cmbendcommand.cpp

@@ -30,9 +30,8 @@
 
 #include "cmbendcommand.h"
 
-#include <QtDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 

src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp

@@ -30,15 +30,13 @@
 
 #include "cmbregisterprojectsforcodecompletioncommand.h"
 
-#include <QtDebug>
+#include "container_common.h"
 
 #include <QDataStream>
-
-#include <ostream>
+#include <QDebug>
 
 #include <algorithm>
-
-#include "container_common.h"
+#include <ostream>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.h

@@ -31,11 +31,11 @@
 #ifndef CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
 #define CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
 
+#include "projectpartcontainer.h"
+
 #include <QMetaType>
 #include <QVector>
 
-#include "projectpartcontainer.h"
-
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT RegisterProjectPartsForCodeCompletionCommand

src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp

@@ -30,14 +30,13 @@
 
 #include "cmbregistertranslationunitsforcodecompletioncommand.h"
 
-#include <QtDebug>
+#include "container_common.h"
 
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
-#include "container_common.h"
-
 namespace ClangBackEnd {
 
 RegisterTranslationUnitForCodeCompletionCommand::RegisterTranslationUnitForCodeCompletionCommand(const QVector<FileContainer> &fileContainers)

src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h

@@ -31,10 +31,10 @@
 #ifndef CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
 #define CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
 
-#include <qmetatype.h>
+#include "filecontainer.h"
 
+#include <QMetaType>
 #include <QVector>
-#include "filecontainer.h"
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp

@@ -30,13 +30,13 @@
 
 #include "cmbunregisterprojectsforcodecompletioncommand.h"
 
-#include <QtDebug>
+#include "container_common.h"
 
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
-#include "container_common.h"
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp

@@ -30,15 +30,14 @@
 
 #include "cmbunregistertranslationunitsforcodecompletioncommand.h"
 
-#include <QtDebug>
+#include "container_common.h"
 
 #ifdef CLANGBACKEND_TESTS
 #include <gtest/gtest-printers.h>
 #endif
 
 #include <QDataStream>
-
-#include "container_common.h"
+#include <QDebug>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h

@@ -35,8 +35,8 @@
 
 #include "filecontainer.h"
 
-#include <QVector>
 #include <QMetaType>
+#include <QVector>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/codecompletion.cpp

@@ -30,9 +30,8 @@
 
 #include "codecompletion.h"
 
-#include <QDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 

src/libs/clangbackendipc/codecompletion.h

@@ -31,12 +31,12 @@
 #ifndef CLANGBACKEND_CODECOMPLETION_H
 #define CLANGBACKEND_CODECOMPLETION_H
 
-#include <QMetaType>
-#include <utf8string.h>
-
+#include "clangbackendipc_global.h"
 #include "codecompletionchunk.h"
 
-#include "clangbackendipc_global.h"
+#include <utf8string.h>
+
+#include <QMetaType>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/codecompletionchunk.cpp

@@ -31,7 +31,6 @@
 #include "codecompletionchunk.h"
 
 #include <QDataStream>
-
 #include <QDebug>
 
 #include <ostream>

src/libs/clangbackendipc/codecompletionchunk.h

@@ -31,12 +31,12 @@
 #ifndef CLANGBACKEND_CODECOMPLETIONCHUNK_H
 #define CLANGBACKEND_CODECOMPLETIONCHUNK_H
 
+#include "clangbackendipc_global.h"
+
 #include <utf8string.h>
 
 #include <QVector>
 
-#include "clangbackendipc_global.h"
-
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT CodeCompletionChunk

src/libs/clangbackendipc/connectionclient.cpp

@@ -30,13 +30,13 @@
 
 #include "connectionclient.h"
 
-#include <QProcess>
-#include <QThread>
-#include <QCoreApplication>
-
+#include "cmbcompletecodecommand.h"
 #include "cmbregistertranslationunitsforcodecompletioncommand.h"
 #include "cmbunregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbcompletecodecommand.h"
+
+#include <QCoreApplication>
+#include <QProcess>
+#include <QThread>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/connectionclient.h

@@ -31,12 +31,12 @@
 #ifndef CLANGBACKEND_CONNECTIONCLIENT_H
 #define CLANGBACKEND_CONNECTIONCLIENT_H
 
+#include "ipcserverproxy.h"
+
 #include <QLocalSocket>
 
 #include <memory>
 
-#include "ipcserverproxy.h"
-
 QT_BEGIN_NAMESPACE
 class QProcess;
 QT_END_NAMESPACE

src/libs/clangbackendipc/connectionserver.cpp

@@ -30,12 +30,12 @@
 
 #include "connectionserver.h"
 
-#include <QLocalSocket>
+#include <ipcserverinterface.h>
+
 #include <QCoreApplication>
+#include <QLocalSocket>
 #include <QTimer>
 
-#include <ipcserverinterface.h>
-
 #include <cstdlib>
 
 namespace ClangBackEnd {

src/libs/clangbackendipc/connectionserver.h

@@ -31,8 +31,10 @@
 #ifndef CLANGBACKEND_CONNECTIONSERVER_H
 #define CLANGBACKEND_CONNECTIONSERVER_H
 
-#include <QLocalServer>
 #include <ipcclientproxy.h>
+
+#include <QLocalServer>
+
 #include <vector>
 
 namespace ClangBackEnd {

src/libs/clangbackendipc/filecontainer.cpp

@@ -30,9 +30,8 @@
 
 #include "filecontainer.h"
 
-#include <QtDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 

src/libs/clangbackendipc/filecontainer.h

@@ -31,11 +31,11 @@
 #ifndef CLANGBACKEND_FILECONTAINER_H
 #define CLANGBACKEND_FILECONTAINER_H
 
-#include <qmetatype.h>
+#include <clangbackendipc_global.h>
 
 #include <utf8string.h>
 
-#include <clangbackendipc_global.h>
+#include <QMetaType>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/ipcclientdispatcher.cpp

@@ -30,7 +30,7 @@
 
 #include "ipcclientdispatcher.h"
 
-#include <QtDebug>
+#include <QDebug>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/ipcclientinterface.cpp

@@ -30,13 +30,13 @@
 
 #include "ipcclientinterface.h"
 
-#include <QVariant>
-#include <QtDebug>
-
-#include "cmbechocommand.h"
 #include "cmbcodecompletedcommand.h"
-#include "translationunitdoesnotexistcommand.h"
+#include "cmbechocommand.h"
 #include "projectpartsdonotexistcommand.h"
+#include "translationunitdoesnotexistcommand.h"
+
+#include <QDebug>
+#include <QVariant>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/ipcclientproxy.cpp

@@ -30,19 +30,18 @@