Commit 2b84d761 authored by Marco Bubke's avatar Marco Bubke

Clang: Reorder includes

Change-Id: I324e88c0d295114390c1fac2745c0d2d47637ece
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@theqtcompany.com>
parent 1402c067
...@@ -12,7 +12,6 @@ INCLUDEPATH += $$PWD ...@@ -12,7 +12,6 @@ INCLUDEPATH += $$PWD
SOURCES += $$PWD/ipcserverinterface.cpp \ SOURCES += $$PWD/ipcserverinterface.cpp \
$$PWD/ipcserverproxy.cpp \ $$PWD/ipcserverproxy.cpp \
$$PWD/ipcserver.cpp \
$$PWD/ipcclientinterface.cpp \ $$PWD/ipcclientinterface.cpp \
$$PWD/cmbendcommand.cpp \ $$PWD/cmbendcommand.cpp \
$$PWD/cmbalivecommand.cpp \ $$PWD/cmbalivecommand.cpp \
...@@ -42,7 +41,6 @@ SOURCES += $$PWD/ipcserverinterface.cpp \ ...@@ -42,7 +41,6 @@ SOURCES += $$PWD/ipcserverinterface.cpp \
HEADERS += \ HEADERS += \
$$PWD/ipcserverinterface.h \ $$PWD/ipcserverinterface.h \
$$PWD/ipcserverproxy.h \ $$PWD/ipcserverproxy.h \
$$PWD/ipcserver.h \
$$PWD/ipcclientinterface.h \ $$PWD/ipcclientinterface.h \
$$PWD/cmbendcommand.h \ $$PWD/cmbendcommand.h \
$$PWD/cmbalivecommand.h \ $$PWD/cmbalivecommand.h \
......
...@@ -30,9 +30,8 @@ ...@@ -30,9 +30,8 @@
#include "cmbalivecommand.h" #include "cmbalivecommand.h"
#include <QtDebug>
#include <QDataStream> #include <QDataStream>
#include <QDebug>
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -30,9 +30,8 @@ ...@@ -30,9 +30,8 @@
#include "cmbcodecompletedcommand.h" #include "cmbcodecompletedcommand.h"
#include <QDebug>
#include <QDataStream> #include <QDataStream>
#include <QDebug>
#include <ostream> #include <ostream>
......
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
#ifndef CLANGBACKEND_CODECOMPLETEDCOMMAND_H #ifndef CLANGBACKEND_CODECOMPLETEDCOMMAND_H
#define CLANGBACKEND_CODECOMPLETEDCOMMAND_H #define CLANGBACKEND_CODECOMPLETEDCOMMAND_H
#include "codecompletion.h"
#include <QMetaType> #include <QMetaType>
#include <QVector> #include <QVector>
#include "codecompletion.h"
namespace ClangBackEnd { namespace ClangBackEnd {
class CMBIPC_EXPORT CodeCompletedCommand class CMBIPC_EXPORT CodeCompletedCommand
......
...@@ -30,9 +30,8 @@ ...@@ -30,9 +30,8 @@
#include "cmbcompletecodecommand.h" #include "cmbcompletecodecommand.h"
#include <QDebug>
#include <QDataStream> #include <QDataStream>
#include <QDebug>
#include <ostream> #include <ostream>
......
...@@ -33,9 +33,10 @@ ...@@ -33,9 +33,10 @@
#include "clangbackendipc_global.h" #include "clangbackendipc_global.h"
#include <QMetaType>
#include <utf8string.h> #include <utf8string.h>
#include <QMetaType>
namespace ClangBackEnd { namespace ClangBackEnd {
class CMBIPC_EXPORT CompleteCodeCommand class CMBIPC_EXPORT CompleteCodeCommand
......
...@@ -30,9 +30,8 @@ ...@@ -30,9 +30,8 @@
#include "cmbechocommand.h" #include "cmbechocommand.h"
#include <QtDebug>
#include <QDataStream> #include <QDataStream>
#include <QDebug>
#include <ostream> #include <ostream>
......
...@@ -30,9 +30,8 @@ ...@@ -30,9 +30,8 @@
#include "cmbendcommand.h" #include "cmbendcommand.h"
#include <QtDebug>
#include <QDataStream> #include <QDataStream>
#include <QDebug>
#include <ostream> #include <ostream>
......
...@@ -30,15 +30,13 @@ ...@@ -30,15 +30,13 @@
#include "cmbregisterprojectsforcodecompletioncommand.h" #include "cmbregisterprojectsforcodecompletioncommand.h"
#include <QtDebug> #include "container_common.h"
#include <QDataStream> #include <QDataStream>
#include <QDebug>
#include <ostream>
#include <algorithm> #include <algorithm>
#include <ostream>
#include "container_common.h"
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
#ifndef CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H #ifndef CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
#define CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H #define CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
#include "projectpartcontainer.h"
#include <QMetaType> #include <QMetaType>
#include <QVector> #include <QVector>
#include "projectpartcontainer.h"
namespace ClangBackEnd { namespace ClangBackEnd {
class CMBIPC_EXPORT RegisterProjectPartsForCodeCompletionCommand class CMBIPC_EXPORT RegisterProjectPartsForCodeCompletionCommand
......
...@@ -30,14 +30,13 @@ ...@@ -30,14 +30,13 @@
#include "cmbregistertranslationunitsforcodecompletioncommand.h" #include "cmbregistertranslationunitsforcodecompletioncommand.h"
#include <QtDebug> #include "container_common.h"
#include <QDataStream> #include <QDataStream>
#include <QDebug>
#include <ostream> #include <ostream>
#include "container_common.h"
namespace ClangBackEnd { namespace ClangBackEnd {
RegisterTranslationUnitForCodeCompletionCommand::RegisterTranslationUnitForCodeCompletionCommand(const QVector<FileContainer> &fileContainers) RegisterTranslationUnitForCodeCompletionCommand::RegisterTranslationUnitForCodeCompletionCommand(const QVector<FileContainer> &fileContainers)
......
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
#ifndef CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H #ifndef CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
#define CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H #define CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
#include <qmetatype.h> #include "filecontainer.h"
#include <QMetaType>
#include <QVector> #include <QVector>
#include "filecontainer.h"
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
#include "cmbunregisterprojectsforcodecompletioncommand.h" #include "cmbunregisterprojectsforcodecompletioncommand.h"
#include <QtDebug> #include "container_common.h"
#include <QDataStream> #include <QDataStream>
#include <QDebug>
#include <ostream> #include <ostream>
#include "container_common.h"
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -30,15 +30,14 @@ ...@@ -30,15 +30,14 @@
#include "cmbunregistertranslationunitsforcodecompletioncommand.h" #include "cmbunregistertranslationunitsforcodecompletioncommand.h"
#include <QtDebug> #include "container_common.h"
#ifdef CLANGBACKEND_TESTS #ifdef CLANGBACKEND_TESTS
#include <gtest/gtest-printers.h> #include <gtest/gtest-printers.h>
#endif #endif
#include <QDataStream> #include <QDataStream>
#include <QDebug>
#include "container_common.h"
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
#include "filecontainer.h" #include "filecontainer.h"
#include <QVector>
#include <QMetaType> #include <QMetaType>
#include <QVector>
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -30,9 +30,8 @@ ...@@ -30,9 +30,8 @@
#include "codecompletion.h" #include "codecompletion.h"
#include <QDebug>
#include <QDataStream> #include <QDataStream>
#include <QDebug>
#include <ostream> #include <ostream>
......
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
#ifndef CLANGBACKEND_CODECOMPLETION_H #ifndef CLANGBACKEND_CODECOMPLETION_H
#define CLANGBACKEND_CODECOMPLETION_H #define CLANGBACKEND_CODECOMPLETION_H
#include <QMetaType> #include "clangbackendipc_global.h"
#include <utf8string.h>
#include "codecompletionchunk.h" #include "codecompletionchunk.h"
#include "clangbackendipc_global.h" #include <utf8string.h>
#include <QMetaType>
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "codecompletionchunk.h" #include "codecompletionchunk.h"
#include <QDataStream> #include <QDataStream>
#include <QDebug> #include <QDebug>
#include <ostream> #include <ostream>
......
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
#ifndef CLANGBACKEND_CODECOMPLETIONCHUNK_H #ifndef CLANGBACKEND_CODECOMPLETIONCHUNK_H
#define CLANGBACKEND_CODECOMPLETIONCHUNK_H #define CLANGBACKEND_CODECOMPLETIONCHUNK_H
#include "clangbackendipc_global.h"
#include <utf8string.h> #include <utf8string.h>
#include <QVector> #include <QVector>
#include "clangbackendipc_global.h"
namespace ClangBackEnd { namespace ClangBackEnd {
class CMBIPC_EXPORT CodeCompletionChunk class CMBIPC_EXPORT CodeCompletionChunk
......
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
#include "connectionclient.h" #include "connectionclient.h"
#include <QProcess> #include "cmbcompletecodecommand.h"
#include <QThread>
#include <QCoreApplication>
#include "cmbregistertranslationunitsforcodecompletioncommand.h" #include "cmbregistertranslationunitsforcodecompletioncommand.h"
#include "cmbunregistertranslationunitsforcodecompletioncommand.h" #include "cmbunregistertranslationunitsforcodecompletioncommand.h"
#include "cmbcompletecodecommand.h"
#include <QCoreApplication>
#include <QProcess>
#include <QThread>
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
#ifndef CLANGBACKEND_CONNECTIONCLIENT_H #ifndef CLANGBACKEND_CONNECTIONCLIENT_H
#define CLANGBACKEND_CONNECTIONCLIENT_H #define CLANGBACKEND_CONNECTIONCLIENT_H
#include "ipcserverproxy.h"
#include <QLocalSocket> #include <QLocalSocket>
#include <memory> #include <memory>
#include "ipcserverproxy.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QProcess; class QProcess;
QT_END_NAMESPACE QT_END_NAMESPACE
......
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
#include "connectionserver.h" #include "connectionserver.h"
#include <QLocalSocket> #include <ipcserverinterface.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QLocalSocket>
#include <QTimer> #include <QTimer>
#include <ipcserverinterface.h>
#include <cstdlib> #include <cstdlib>
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -31,8 +31,10 @@ ...@@ -31,8 +31,10 @@
#ifndef CLANGBACKEND_CONNECTIONSERVER_H #ifndef CLANGBACKEND_CONNECTIONSERVER_H
#define CLANGBACKEND_CONNECTIONSERVER_H #define CLANGBACKEND_CONNECTIONSERVER_H
#include <QLocalServer>
#include <ipcclientproxy.h> #include <ipcclientproxy.h>
#include <QLocalServer>
#include <vector> #include <vector>
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -30,9 +30,8 @@ ...@@ -30,9 +30,8 @@
#include "filecontainer.h" #include "filecontainer.h"
#include <QtDebug>
#include <QDataStream> #include <QDataStream>
#include <QDebug>
#include <ostream> #include <ostream>
......
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
#ifndef CLANGBACKEND_FILECONTAINER_H #ifndef CLANGBACKEND_FILECONTAINER_H
#define CLANGBACKEND_FILECONTAINER_H #define CLANGBACKEND_FILECONTAINER_H
#include <qmetatype.h> #include <clangbackendipc_global.h>
#include <utf8string.h> #include <utf8string.h>
#include <clangbackendipc_global.h> #include <QMetaType>
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "ipcclientdispatcher.h" #include "ipcclientdispatcher.h"
#include <QtDebug> #include <QDebug>
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
#include "ipcclientinterface.h" #include "ipcclientinterface.h"
#include <QVariant>
#include <QtDebug>
#include "cmbechocommand.h"
#include "cmbcodecompletedcommand.h" #include "cmbcodecompletedcommand.h"
#include "translationunitdoesnotexistcommand.h" #include "cmbechocommand.h"
#include "projectpartsdonotexistcommand.h" #include "projectpartsdonotexistcommand.h"
#include "translationunitdoesnotexistcommand.h"
#include <QDebug>
#include <QVariant>
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -30,19 +30,18 @@ ...@@ -30,19 +30,18 @@
#include "ipcclientproxy.h" #include "ipcclientproxy.h"
#include <cmbalivecommand.h> #include "cmbalivecommand.h"
#include "cmbcodecompletedcommand.h"
#include <QVariant>
#include <QVector>
#include <QIODevice>
#include <QtDebug>
#include "ipcserverinterface.h"
#include "cmbechocommand.h" #include "cmbechocommand.h"
#include "cmbregistertranslationunitsforcodecompletioncommand.h" #include "cmbregistertranslationunitsforcodecompletioncommand.h"
#include "cmbcodecompletedcommand.h" #include "ipcserverinterface.h"
#include "translationunitdoesnotexistcommand.h"
#include "projectpartsdonotexistcommand.h" #include "projectpartsdonotexistcommand.h"
#include "translationunitdoesnotexistcommand.h"
#include <QDebug>
#include <QIODevice>
#include <QVariant>
#include <QVector>
namespace ClangBackEnd { namespace ClangBackEnd {
......
...@@ -31,15 +31,14 @@ ...@@ -31,15 +31,14 @@