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,11 +31,11 @@
 #ifndef CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
 #define CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
 
-#include <qmetatype.h>
-
-#include <QVector>
 #include "filecontainer.h"
 
+#include <QMetaType>
+#include <QVector>
+
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT RegisterTranslationUnitForCodeCompletionCommand

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 <QCoreApplication>
-#include <QTimer>
-
 #include <ipcserverinterface.h>
 
+#include <QCoreApplication>
+#include <QLocalSocket>
+#include <QTimer>
+
 #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 @@
 
 #include "ipcclientproxy.h"
 
-#include <cmbalivecommand.h>
-
-#include <QVariant>
-#include <QVector>
-#include <QIODevice>
-#include <QtDebug>
-
-#include "ipcserverinterface.h"
+#include "cmbalivecommand.h"
+#include "cmbcodecompletedcommand.h"
 #include "cmbechocommand.h"
 #include "cmbregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbcodecompletedcommand.h"
-#include "translationunitdoesnotexistcommand.h"
+#include "ipcserverinterface.h"
 #include "projectpartsdonotexistcommand.h"
+#include "translationunitdoesnotexistcommand.h"
+
+#include <QDebug>
+#include <QIODevice>
+#include <QVariant>
+#include <QVector>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/ipcclientproxy.h

@@ -31,16 +31,15 @@
 #ifndef CODELMODELBACKEND_IPCCLIENTPROXY_H
 #define CODELMODELBACKEND_IPCCLIENTPROXY_H
 
+#include "clangbackendipc_global.h"
+#include "ipcclientinterface.h"
+#include "readcommandblock.h"
+#include "writecommandblock.h"
+
 #include <QtGlobal>
 
 #include <memory>
 
-#include "clangbackendipc_global.h"
-#include "ipcclientinterface.h"
-
-#include "writecommandblock.h"
-#include "readcommandblock.h"
-
 QT_BEGIN_NAMESPACE
 class QLocalServer;
 class QIODevice;

src/libs/clangbackendipc/ipcinterface.h

@@ -31,14 +31,14 @@
 #ifndef CLANGBACKEND_IPCINTERFACE_H
 #define CLANGBACKEND_IPCINTERFACE_H
 
+#include "clangbackendipc_global.h"
+
 #include <QtGlobal>
 
 QT_BEGIN_NAMESPACE
 class QVariant;
 QT_END_NAMESPACE
 
-#include "clangbackendipc_global.h"
-
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT IpcInterface

src/libs/clangbackendipc/ipcserver.cpp

@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://www.qt.io/licensing.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "ipcserver.h"
-
-namespace ClangBackEnd {
-
-IpcServer::IpcServer()
-{
-
-}
-
-IpcServer::~IpcServer()
-{
-
-}
-
-} // namespace ClangBackEnd
-

src/libs/clangbackendipc/ipcserver.h

@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://www.qt.io/licensing.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef CLANGBACKEND_IPCSERVER_H
-#define CLANGBACKEND_IPCSERVER_H
-
-#include "ipcserverinterface.h"
-
-namespace ClangBackEnd {
-
-class IpcServer : public IpcServerInterface
-{
-public:
-    IpcServer();
-    ~IpcServer();
-};
-
-} // namespace ClangBackEnd
-
-#endif // CLANGBACKEND_IPCSERVER_H

src/libs/clangbackendipc/ipcserverinterface.cpp

@@ -30,14 +30,14 @@
 
 #include "ipcserverinterface.h"
 
-#include <QVariant>
-#include <QtDebug>
-
-#include "cmbregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbunregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbregisterprojectsforcodecompletioncommand.h"
-#include "cmbunregisterprojectsforcodecompletioncommand.h"
 #include "cmbcompletecodecommand.h"
+#include "cmbregisterprojectsforcodecompletioncommand.h"
+#include "cmbregistertranslationunitsforcodecompletioncommand.h"
+#include "cmbunregisterprojectsforcodecompletioncommand.h"
+#include "cmbunregistertranslationunitsforcodecompletioncommand.h"
+
+#include <QDebug>
+#include <QVariant>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/ipcserverproxy.cpp

@@ -30,20 +30,19 @@
 
 #include "ipcserverproxy.h"
 
-#include <QProcess>
-#include <QLocalSocket>
-#include <QLocalServer>
-
-#include <cmbendcommand.h>
 #include <cmbalivecommand.h>
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbregisterprojectsforcodecompletioncommand.h>
-#include <cmbunregisterprojectsforcodecompletioncommand.h>
 #include <cmbcompletecodecommand.h>
-
+#include <cmbendcommand.h>
+#include <cmbregisterprojectsforcodecompletioncommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <cmbunregisterprojectsforcodecompletioncommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
 #include <ipcclientinterface.h>
 
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QProcess>
+
 namespace ClangBackEnd {
 
 IpcServerProxy::IpcServerProxy(IpcClientInterface *client, QIODevice *ioDevice)

src/libs/clangbackendipc/ipcserverproxy.h

@@ -30,16 +30,15 @@
 
 #ifndef CLANGBACKEND_IPCSERVERPROXY_H
 #define CLANGBACKEND_IPCSERVERPROXY_H
+#include "ipcserverinterface.h"
+#include "readcommandblock.h"
+#include "writecommandblock.h"
 
-#include <qglobal.h>
+#include <QtGlobal>
 #include <QTimer>
 
 #include <memory>
 
-#include "ipcserverinterface.h"
-#include "writecommandblock.h"
-#include "readcommandblock.h"
-
 QT_BEGIN_NAMESPACE
 class QVariant;
 class QProcess;

src/libs/clangbackendipc/projectpartcontainer.cpp

@@ -30,7 +30,7 @@
 
 #include "projectpartcontainer.h"
 
-#include <QtDebug>
+#include <QDebug>
 
 #include <QDataStream>
 

src/libs/clangbackendipc/projectpartcontainer.h

@@ -31,11 +31,11 @@
 #ifndef CLANGBACKEND_PROJECTCONTAINER_H
 #define CLANGBACKEND_PROJECTCONTAINER_H
 
-#include <QMetaType>
+#include <clangbackendipc_global.h>
 
 #include <utf8stringvector.h>
 
-#include <clangbackendipc_global.h>
+#include <QMetaType>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/projectpartsdonotexistcommand.cpp

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

src/libs/clangbackendipc/projectpartsdonotexistcommand.h

@@ -31,11 +31,11 @@
 #ifndef CLANGBACKEND_PROJECTPARTSDONOTEXISTCOMMAND_H
 #define CLANGBACKEND_PROJECTPARTSDONOTEXISTCOMMAND_H
 
-#include <QMetaType>
+#include "clangbackendipc_global.h"
 
 #include <utf8stringvector.h>
 
-#include "clangbackendipc_global.h"
+#include <QMetaType>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/readcommandblock.cpp

@@ -31,9 +31,9 @@
 #include "readcommandblock.h"
 
 #include <QDataStream>
+#include <QDebug>
 #include <QIODevice>
 #include <QVariant>
-#include <QtDebug>
 
 namespace ClangBackEnd {
 

src/libs/clangbackendipc/translationunitdoesnotexistcommand.cpp

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

src/libs/clangbackendipc/translationunitdoesnotexistcommand.h

@@ -31,10 +31,10 @@
 #ifndef CLANGBACKEND_TRANSLATIONUNITDOESNOTEXISTSCOMMAND_H
 #define CLANGBACKEND_TRANSLATIONUNITDOESNOTEXISTSCOMMAND_H
 
-#include <QMetaType>
-
 #include "filecontainer.h"
 
+#include <QMetaType>
+
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT TranslationUnitDoesNotExistCommand

src/libs/clangbackendipc/writecommandblock.cpp

@@ -31,9 +31,9 @@
 #include "writecommandblock.h"
 
 #include <QDataStream>
+#include <QDebug>
 #include <QIODevice>
 #include <QVariant>
-#include <QtDebug>
 
 namespace ClangBackEnd {
 

src/libs/sqlite/createtablecommand.h

@@ -31,12 +31,12 @@
 #ifndef INTERNAL_CREATETABLECOMMAND_H
 #define INTERNAL_CREATETABLECOMMAND_H
 
+#include "columndefinition.h"
+#include "utf8string.h"
+
 #include <QMetaType>
 #include <QVector>
 
-#include "utf8string.h"
-#include "columndefinition.h"
-
 namespace Internal {
 
 class CreateTableCommand

src/libs/sqlite/createtablesqlstatementbuilder.h

@@ -31,11 +31,10 @@
 #ifndef CREATETABLESQLSTATEMENTBUILDER_H
 #define CREATETABLESQLSTATEMENTBUILDER_H
 
-#include <QVector>
-
+#include "columndefinition.h"
 #include "sqlstatementbuilder.h"
 
-#include "columndefinition.h"
+#include <QVector>
 
 namespace Internal {
 

src/libs/sqlite/sqlitecolumn.h

@@ -31,10 +31,10 @@
 #ifndef SQLITECOLUMN_H
 #define SQLITECOLUMN_H
 
-#include <QObject>
-
-#include "utf8string.h"
 #include "columndefinition.h"
+#include "utf8string.h"
+
+#include <QObject>
 
 class SQLITE_EXPORT SqliteColumn : public QObject
 {

src/libs/sqlite/sqlitedatabase.h

@@ -31,12 +31,12 @@
 #ifndef SQLITEDATABASE_H
 #define SQLITEDATABASE_H
 
+#include "sqlitedatabaseconnectionproxy.h"
+#include "sqliteglobal.h"
+
 #include <QString>
 #include <QVector>
 
-#include "sqliteglobal.h"
-#include "sqlitedatabaseconnectionproxy.h"
-
 class SqliteTable;
 
 class SQLITE_EXPORT SqliteDatabase : public QObject

src/libs/sqlite/sqlitedatabasebackend.cpp

@@ -30,18 +30,18 @@
 
 #include "sqlitedatabasebackend.h"
 
-#include <QThread>
-#include <QtDebug>
+#include "sqliteexception.h"
+#include "sqlitereadstatement.h"
+#include "sqlitereadwritestatement.h"
+#include "sqlitestatement.h"
+#include "sqlitewritestatement.h"
 
-#include "sqlite3.h"
+#include <QThread>
+#include <QDebug>
 
 #include "okapi_bm25.h"
 
-#include "sqliteexception.h"
-#include "sqlitestatement.h"
-#include "sqlitereadstatement.h"
-#include "sqlitewritestatement.h"
-#include "sqlitereadwritestatement.h"
+#include "sqlite3.h"
 
 #if defined(Q_OS_UNIX)
 #define QTC_THREAD_LOCAL __thread

src/libs/sqlite/sqlitedatabasebackend.h

@@ -31,12 +31,12 @@
 #ifndef SQLITEDATABASEBACKEND_H
 #define SQLITEDATABASEBACKEND_H
 
-#include <QStringList>
-
 #include "sqliteglobal.h"
 
 #include "utf8stringvector.h"
 
+#include <QStringList>
+
 struct sqlite3;
 
 class SQLITE_EXPORT SqliteDatabaseBackend

src/libs/sqlite/sqlitedatabaseconnection.cpp

@@ -30,20 +30,20 @@
 
 #include "sqlitedatabaseconnection.h"
 
+#include "sqliteexception.h"
+#include "sqliteglobal.h"
+
 #include <sqlite3.h>
 
-#include <QtDebug>
+#include <QDebug>
 
 #ifdef Q_OS_LINUX
 #include <sys/resource.h>
+#include <sys/syscall.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/syscall.h>
 #endif
 
-#include "sqliteexception.h"
-#include "sqliteglobal.h"
-
 SqliteDatabaseConnection::SqliteDatabaseConnection(QObject *parent) :
     QObject(parent)
 {

src/libs/sqlite/sqlitedatabaseconnection.h

@@ -31,10 +31,10 @@
 #ifndef SQLITEDATABASECONNECTIONCONTROLLER_H
 #define SQLITEDATABASECONNECTIONCONTROLLER_H
 
-#include <QObject>
-
 #include "sqlitedatabasebackend.h"
 
+#include <QObject>
+
 struct sqlite3;
 
 class SQLITE_EXPORT SqliteDatabaseConnection final : public QObject

src/libs/sqlite/sqlitedatabaseconnectionproxy.h

@@ -31,11 +31,11 @@
 #ifndef SQLITEDATABASECONNECTION_H
 #define SQLITEDATABASECONNECTION_H
 
+#include <sqliteglobal.h>
+
 #include <QObject>
 #include <QPointer>
 
-#include <sqliteglobal.h>
-
 struct sqlite3;
 class SqliteWorkerThread;
 

src/libs/sqlite/sqliteexception.cpp

@@ -30,7 +30,7 @@
 
 #include "sqliteexception.h"
 
-#include <QtDebug>
+#include <QDebug>
 
 SqliteException::SqliteException(const char *whatErrorHasHappen, const char *sqliteErrorMessage)
     : whatErrorHasHappen(whatErrorHasHappen),

src/libs/sqlite/sqliteexception.h

@@ -31,10 +31,10 @@
 #ifndef SQLITEEXCEPTION_H
 #define SQLITEEXCEPTION_H
 
-#include <QByteArray>
-
 #include "sqliteglobal.h"
 
+#include <QByteArray>
+
 class SQLITE_EXPORT SqliteException
 {
 public:

src/libs/sqlite/sqlitereadwritestatement.cpp

@@ -30,7 +30,6 @@
 
 #include "sqlitereadwritestatement.h"
 
-
 SqliteReadWriteStatement::SqliteReadWriteStatement(const Utf8String &sqlStatementUft8)
     : SqliteStatement(sqlStatementUft8)
 {

src/libs/sqlite/sqlitestatement.cpp

@@ -30,16 +30,16 @@
 
 #include "sqlitestatement.h"
 
-#include <QMutex>
-#include <QWaitCondition>
-#include <QVariant>
-#include <QtGlobal>
-
-#include "sqlite3.h"
-
 #include "sqlitedatabasebackend.h"
 #include "sqliteexception.h"
 
+#include <QMutex>
+#include <QtGlobal>
+#include <QVariant>
+#include <QWaitCondition>
+
+#include "sqlite3.h"
+
 #if defined(__GNUC__)
 #  pragma GCC diagnostic ignored "-Wignored-qualifiers"
 #endif

src/libs/sqlite/sqlitestatement.h

@@ -31,23 +31,21 @@
 #ifndef SQLITESTATEMENT_H
 #define SQLITESTATEMENT_H
 
-#include <type_traits>
-#include <memory>
+#include "sqliteglobal.h"
+
+#include "sqliteexception.h"
+#include "utf8stringvector.h"
 
 #include <QString>
 #include <QVariant>
 #include <QVector>
 
-#include "sqliteglobal.h"
+#include <type_traits>
+#include <memory>
 
 struct sqlite3_stmt;
 struct sqlite3;
 
-#include "sqliteexception.h"
-#include "utf8stringvector.h"
-
-
-
 class SQLITE_EXPORT SqliteStatement
 {
 protected:

src/libs/sqlite/sqlitetable.h

@@ -31,12 +31,12 @@
 #ifndef SQLITETABLE_H
 #define SQLITETABLE_H
 
-#include <QObject>
-#include <QVector>
-#include "utf8string.h"
-
 #include "sqliteglobal.h"
 #include "tablewriteworkerproxy.h"
+#include "utf8string.h"
+
+#include <QObject>
+#include <QVector>
 
 class SqliteColumn;
 class SqliteDatabase;

src/libs/sqlite/sqlitetransaction.cpp

@@ -32,7 +32,6 @@
 
 #include "sqlitewritestatement.h"
 
-
 SqliteAbstractTransaction::~SqliteAbstractTransaction()
 {
     if (!isAlreadyCommited)

src/libs/sqlite/sqliteworkerthread.h

@@ -31,9 +31,9 @@
 #ifndef SQLITEWORKERTHREAD_H
 #define SQLITEWORKERTHREAD_H
 
-#include <QThread>
-#include <QPointer>
 #include <QMutex>
+#include <QPointer>
+#include <QThread>
 #include <QWaitCondition>
 
 class SqliteDatabaseConnection;

src/libs/sqlite/sqlstatementbuilder.h

@@ -31,11 +31,11 @@
 #ifndef SQLSTATEMENTBUILDER_H
 #define SQLSTATEMENTBUILDER_H
 
-#include <vector>
-#include <utility>
-
 #include "utf8string.h"
 
+#include <utility>
+#include <vector>
+
 class SQLITE_EXPORT SqlStatementBuilder
 {
     using BindingPair = std::pair<Utf8String, Utf8String>;

src/libs/sqlite/tablewriteworker.cpp

@@ -31,9 +31,8 @@
 #include "tablewriteworker.h"
 
 #include "createtablesqlstatementbuilder.h"
-
-#include "sqlitewritestatement.h"
 #include "sqlitetransaction.h"
+#include "sqlitewritestatement.h"
 
 namespace Internal {
 

src/libs/sqlite/tablewriteworker.h

@@ -31,10 +31,10 @@
 #ifndef INTERNAL_TABLEWRITEWORKER_H
 #define INTERNAL_TABLEWRITEWORKER_H
 
-#include <QObject>
-
 #include "createtablecommand.h"
 
+#include <QObject>
+
 namespace Internal {
 
 class TableWriteWorker : public QObject

src/libs/sqlite/tablewriteworkerproxy.cpp

@@ -30,10 +30,9 @@
 
 #include "tablewriteworkerproxy.h"
 
-#include "tablewriteworker.h"
-#include "sqlitetable.h"
-
 #include "createtablecommand.h"
+#include "sqlitetable.h"
+#include "tablewriteworker.h"
 
 namespace Internal {
 

src/libs/sqlite/tablewriteworkerproxy.h

@@ -31,12 +31,12 @@
 #ifndef INTERNAL_TABLEWRITEWORKERPROXY_H
 #define INTERNAL_TABLEWRITEWORKERPROXY_H
 
+#include "createtablecommand.h"
+
 #include <QObject>
 
 #include <memory>
 
-#include "createtablecommand.h"
-
 QT_BEGIN_NAMESPACE
 class QThread;
 QT_END_NAMESPACE

src/libs/sqlite/utf8string.h

@@ -31,11 +31,11 @@
 #ifndef UTF8STRING_H
 #define UTF8STRING_H
 
+#include "sqliteglobal.h"
+
 #include <QByteArray>
 #include <QMetaType>
 
-#include "sqliteglobal.h"
-
 class Utf8StringVector;
 class Utf8String;
 

src/libs/sqlite/utf8stringvector.h

@@ -31,12 +31,11 @@
 #ifndef UTF8STRINGVECTOR_H
 #define UTF8STRINGVECTOR_H
 
+#include "sqliteglobal.h"
 #include "utf8string.h"
 
 #include <QVector>
 
-#include "sqliteglobal.h"
-
 class SQLITE_EXPORT Utf8StringVector : public QVector<Utf8String>
 {
 public:

src/plugins/clangcodemodel/completionchunkstotextconverter.h

@@ -33,10 +33,10 @@
 
 #include <clangbackendipc/codecompletionchunk.h>
 
-#include <QString>
-
 #include <sqlite/utf8string.h>
 
+#include <QString>
+
 namespace ClangCodeModel {
 namespace Internal {
 

src/tools/clangbackend/ipcsource/clangcodecompleteresults.h

@@ -31,7 +31,6 @@
 #ifndef CLANGBACKEND_CLANGCODECOMPLETERESULTS_H
 #define CLANGBACKEND_CLANGCODECOMPLETERESULTS_H
 
-
 #include <clang-c/Index.h>
 
 #include <utf8string.h>

src/tools/clangbackend/ipcsource/clangipcserver.cpp

@@ -30,25 +30,24 @@
 
 #include "clangipcserver.h"
 
-#include <QCoreApplication>
-
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbregisterprojectsforcodecompletioncommand.h>
-#include <cmbunregisterprojectsforcodecompletioncommand.h>
 #include <cmbcodecompletedcommand.h>
 #include <cmbcompletecodecommand.h>
-#include <translationunitdoesnotexistcommand.h>
+#include <cmbregisterprojectsforcodecompletioncommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <cmbunregisterprojectsforcodecompletioncommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
 #include <projectpartsdonotexistcommand.h>
+#include <translationunitdoesnotexistcommand.h>
 
-#include "translationunits.h"
 #include "codecompleter.h"
-#include "translationunitdoesnotexistexception.h"
-#include "translationunitisnullexception.h"
-#include "translationunitfilenotexitexception.h"
 #include "projectpartsdonotexistexception.h"
+#include "translationunitdoesnotexistexception.h"
+#include "translationunitfilenotexitexception.h"
+#include "translationunitisnullexception.h"
 #include "translationunitparseerrorexception.h"
+#include "translationunits.h"
 
+#include <QCoreApplication>
 #include <QDebug>
 
 namespace ClangBackEnd {

src/tools/clangbackend/ipcsource/clangipcserver.h

@@ -33,11 +33,11 @@
 
 #include "ipcserverinterface.h"
 
-#include "translationunit.h"
 #include "projectpart.h"
-#include "unsavedfiles.h"
 #include "projects.h"
+#include "translationunit.h"
 #include "translationunits.h"
+#include "unsavedfiles.h"
 
 #include <utf8string.h>
 

src/tools/clangbackend/ipcsource/codecompleter.cpp

@@ -30,12 +30,11 @@
 
 #include "codecompleter.h"
 
-#include "clangstring.h"
 #include "clangcodecompleteresults.h"
-#include "translationunit.h"
+#include "clangstring.h"
 #include "codecompletefailedexception.h"
-
 #include "codecompletionsextractor.h"
+#include "translationunit.h"
 
 #include <clang-c/Index.h>
 

src/tools/clangbackend/ipcsource/codecompleter.h

@@ -31,11 +31,12 @@
 #ifndef CLANGBACKEND_CODECOMPLETER_H
 #define CLANGBACKEND_CODECOMPLETER_H
 
-#include <codecompletion.h>
-#include <utf8stringvector.h>
-
 #include "translationunit.h"
 
+#include <codecompletion.h>
+
+#include <utf8stringvector.h>
+
 namespace ClangBackEnd {
 
 class TranslationUnit;

src/tools/clangbackend/ipcsource/codecompletionsextractor.h

@@ -31,12 +31,12 @@
 #ifndef CLANGBACKEND_CODECOMPLETIONSEXTRACTOR_H
 #define CLANGBACKEND_CODECOMPLETIONSEXTRACTOR_H
 
+#include <codecompletion.h>
+
 #include <clang-c/Index.h>
 
 #include <QVector>
 
-#include <codecompletion.h>
-
 namespace ClangBackEnd {
 
 class CodeCompletionsExtractor

src/tools/clangbackend/ipcsource/projectpart.cpp

@@ -30,11 +30,11 @@
 
 #include "projectpart.h"
 
-#include <cstring>
+#include <projectpartcontainer.h>
 
 #include <utf8stringvector.h>
 
-#include <projectpartcontainer.h>
+#include <cstring>
 
 namespace ClangBackEnd {
 

src/tools/clangbackend/ipcsource/projectpart.h

@@ -31,9 +31,9 @@
 #ifndef CLANGBACKEND_PROJECT_H
 #define CLANGBACKEND_PROJECT_H
 
+#include <chrono>
 #include <memory>
 #include <vector>
-#include <chrono>
 
 class Utf8String;
 class Utf8StringVector;

src/tools/clangbackend/ipcsource/projects.cpp

@@ -30,10 +30,10 @@
 
 #include "projects.h"
 
-#include <QtGlobal>
-
 #include "projectpartsdonotexistexception.h"
 
+#include <QtGlobal>
+
 namespace ClangBackEnd {
 
 void ProjectParts::createOrUpdate(const QVector<ProjectPartContainer> &projectContainers)

src/tools/clangbackend/ipcsource/projects.h

@@ -31,10 +31,10 @@
 #ifndef CLANGBACKEND_PROJECTS_H
 #define CLANGBACKEND_PROJECTS_H
 
-#include <projectpartcontainer.h>
-
 #include "projectpart.h"
 
+#include <projectpartcontainer.h>
+
 #include <vector>
 
 namespace ClangBackEnd {

src/tools/clangbackend/ipcsource/translationunit.cpp

@@ -30,17 +30,16 @@
 
 #include "translationunit.h"
 
-#include <QFileInfo>
+#include "codecompleter.h"
+#include "projectpart.h"
+#include "translationunitfilenotexitexception.h"
+#include "translationunitisnullexception.h"
+#include "translationunitparseerrorexception.h"
+#include "unsavedfiles.h"
 
 #include <utf8string.h>
 
-#include "codecompleter.h"
-
-#include "translationunitisnullexception.h"
-#include "translationunitfilenotexitexception.h"
-#include "translationunitparseerrorexception.h"
-#include "unsavedfiles.h"
-#include "projectpart.h"
+#include <QFileInfo>
 
 namespace ClangBackEnd {
 

src/tools/clangbackend/ipcsource/translationunit.h

@@ -33,11 +33,11 @@
 
 #include <clang-c/Index.h>
 
+#include <QtGlobal>
+
 #include <chrono>
 #include <memory>
 
-#include <QtGlobal>
-
 class Utf8String;
 
 namespace ClangBackEnd {

src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp

@@ -30,8 +30,6 @@
 
 #include "translationunitparseerrorexception.h"
 
-
-
 namespace ClangBackEnd {
 
 TranslationUnitParseErrorException::TranslationUnitParseErrorException(const Utf8String &filePath, const Utf8String &projectPartId)

src/tools/clangbackend/ipcsource/translationunits.h

@@ -31,13 +31,14 @@
 #ifndef CLANGBACKEND_TRANSLATIONUNITS_H
 #define CLANGBACKEND_TRANSLATIONUNITS_H
 
+#include "translationunit.h"
+
 #include <filecontainer.h>
+
 #include <QVector>
 
 #include <vector>
 
-#include "translationunit.h"
-
 namespace ClangBackEnd {
 
 class ProjectParts;

src/tools/clangbackend/ipcsource/unsavedfiles.cpp

@@ -30,7 +30,6 @@
 
 #include "unsavedfiles.h"
 
-
 #include <cstring>
 
 namespace ClangBackEnd {

src/tools/clangbackend/ipcsource/unsavedfiles.h

@@ -33,14 +33,14 @@
 
 #include <filecontainer.h>
 
-#include <chrono>
-#include <vector>
-#include <memory>
-
 #include <QVector>
 
 #include <clang-c/Index.h>
 
+#include <chrono>
+#include <vector>
+#include <memory>
+
 namespace ClangBackEnd {
 
 using time_point = std::chrono::steady_clock::time_point;

tests/unit/echoserver/echoipcserver.cpp

@@ -30,20 +30,19 @@
 
 #include "echoipcserver.h"
 
-#include "cmbendcommand.h"
-#include "cmbechocommand.h"
-#include "cmbregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbunregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbregisterprojectsforcodecompletioncommand.h"
-#include "cmbunregisterprojectsforcodecompletioncommand.h"
-#include "cmbcompletecodecommand.h"
 #include "cmbcodecompletedcommand.h"
-
+#include "cmbcompletecodecommand.h"
+#include "cmbechocommand.h"
+#include "cmbendcommand.h"
+#include "cmbregisterprojectsforcodecompletioncommand.h"
+#include "cmbregistertranslationunitsforcodecompletioncommand.h"
+#include "cmbunregisterprojectsforcodecompletioncommand.h"
+#include "cmbunregistertranslationunitsforcodecompletioncommand.h"
 #include "connectionserver.h"
 
-#include <QtDebug>
-
 #include <QCoreApplication>
+#include <QDebug>
+
 
 namespace ClangBackEnd {
 

tests/unit/echoserver/echoserverprocessmain.cpp

@@ -28,11 +28,11 @@
 **
 ****************************************************************************/
 
-#include <QCoreApplication>
+#include <cmbcommands.h>
+#include <connectionserver.h>
+#include <echoipcserver.h>
 
-#include "echoipcserver.h"
-#include "connectionserver.h"
-#include "cmbcommands.h"
+#include <QCoreApplication>
 
 int main(int argc, char *argv[])
 {

tests/unit/unittest/clangcodecompleteresultstest.cpp

@@ -28,18 +28,18 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-#include "gtest-qt-printing.h"
+#include <clangcodecompleteresults.h>
+#include <projectpart.h>
+#include <translationunit.h>
+#include <unsavedfiles.h>
+#include <utf8string.h>
 
 #include <clang-c/Index.h>
 
-#include <clangcodecompleteresults.h>
-#include <translationunit.h>
-#include <projectpart.h>
-#include <unsavedfiles.h>
-#include <utf8string.h>
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 namespace {
 

tests/unit/unittest/clangipcservertest.cpp

@@ -28,33 +28,31 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-
-#include "gtest-qt-printing.h"
+#include "mockipclient.h"
 
+#include <clangipcserver.h>
 #include <ipcclientproxy.h>
 #include <ipcserverproxy.h>
-#include <clangipcserver.h>
 #include <translationunitdoesnotexistexception.h>
 #include <translationunitparseerrorexception.h>
 
 #include <cmbcodecompletedcommand.h>
 #include <cmbcompletecodecommand.h>
 #include <cmbechocommand.h>
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
 #include <cmbregisterprojectsforcodecompletioncommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
 #include <cmbunregisterprojectsforcodecompletioncommand.h>
-#include <translationunitdoesnotexistcommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
 #include <projectpartsdonotexistcommand.h>
+#include <translationunitdoesnotexistcommand.h>
 
 #include <QBuffer>
 #include <QFile>
-#include <projectpartsdonotexistcommand.h>
 
-#include "mockipclient.h"
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 using testing::Property;
 using testing::Contains;

tests/unit/unittest/clangstringtest.cpp

@@ -28,16 +28,17 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-#include "gtest-qt-printing.h"
+#include <clangstring.h>
+
+#include <utf8string.h>
 
 #include <clang-c/CXString.h>
 #include <clang-c/Index.h>
 
-#include <clangstring.h>
-#include <utf8string.h>
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 namespace {
 

tests/unit/unittest/clientserverinprocesstest.cpp

@@ -28,38 +28,39 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-
-#include "gtest-qt-printing.h"
-#include "translationunitdoesnotexistcommand.h"
-
-#include <QString>
-#include <QBuffer>
-#include <QVariant>
-#include <vector>
-
-#include <cmbendcommand.h>
-#include <cmbalivecommand.h>
-#include <cmbcommands.h>
-#include <cmbechocommand.h>
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbcodecompletedcommand.h>
-#include <cmbregisterprojectsforcodecompletioncommand.h>
-#include <cmbunregisterprojectsforcodecompletioncommand.h>
-#include <cmbcompletecodecommand.h>
-#include <writecommandblock.h>
-#include <readcommandblock.h>
-
-#include <ipcserverproxy.h>
-#include <ipcclientproxy.h>
-#include <projectpartsdonotexistcommand.h>
 
 #include "mockipclient.h"
 #include "mockipcserver.h"
 
+#include <ipcclientproxy.h>
+#include <ipcserverproxy.h>
+#include <projectpartsdonotexistcommand.h>
+
+#include <cmbalivecommand.h>
+#include <cmbcodecompletedcommand.h>
+#include <cmbcommands.h>
+#include <cmbcompletecodecommand.h>
+#include <cmbechocommand.h>
+#include <cmbendcommand.h>
+#include <cmbregisterprojectsforcodecompletioncommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <cmbunregisterprojectsforcodecompletioncommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
+#include <readcommandblock.h>
+#include <translationunitdoesnotexistcommand.h>
+#include <writecommandblock.h>
+
+#include <QBuffer>
+#include <QString>
+#include <QVariant>
+
+#include <vector>
+
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 using namespace ClangBackEnd;
 
 namespace {

tests/unit/unittest/clientserveroutsideprocess.cpp

@@ -28,10 +28,28 @@
 **
 ****************************************************************************/
 
+#include "mockipclient.h"
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
+#include <cmbalivecommand.h>
+#include <cmbcodecompletedcommand.h>
+#include <cmbcommands.h>
+#include <cmbcompletecodecommand.h>
+#include <cmbechocommand.h>
+#include <cmbendcommand.h>
+#include <cmbregisterprojectsforcodecompletioncommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <cmbunregisterprojectsforcodecompletioncommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
+#include <connectionclient.h>
+#include <projectpartsdonotexistcommand.h>
+#include <readcommandblock.h>
+#include <translationunitdoesnotexistcommand.h>
+#include <writecommandblock.h>
+
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 #include <QBuffer>
 #include <QProcess>
@@ -41,26 +59,6 @@
 
 #include <vector>
 
-#include "gtest-qt-printing.h"
-
-#include <cmbendcommand.h>
-#include <cmbalivecommand.h>
-#include <cmbcommands.h>
-#include <cmbechocommand.h>
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbregisterprojectsforcodecompletioncommand.h>
-#include <cmbunregisterprojectsforcodecompletioncommand.h>
-#include <cmbcodecompletedcommand.h>
-#include <cmbcompletecodecommand.h>
-#include <writecommandblock.h>
-#include <readcommandblock.h>
-#include <connectionclient.h>
-#include <translationunitdoesnotexistcommand.h>
-#include <projectpartsdonotexistcommand.h>
-
-#include <mockipclient.h>
-
 #ifdef Q_OS_WIN
 #define QTC_HOST_EXE_SUFFIX L".exe"
 #else

tests/unit/unittest/codecompletionsextractortest.cpp

@@ -28,24 +28,23 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-generated-matchers.h"
-#include "gtest-qt-printing.h"
+#include <clangcodecompleteresults.h>
+#include <codecompletionsextractor.h>
+#include <filecontainer.h>
+#include <projectpart.h>
+#include <translationunit.h>
+#include <unsavedfiles.h>
+#include <utf8stringvector.h>
 
 #include <clang-c/Index.h>
 
-#include <codecompletionsextractor.h>
-#include <clangcodecompleteresults.h>
-#include <filecontainer.h>
-#include <translationunit.h>
-#include <unsavedfiles.h>
-#include <projectpart.h>
-#include <utf8stringvector.h>
-
 #include <QFile>
 
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 using ClangBackEnd::CodeCompletionsExtractor;
 using ClangBackEnd::ClangCodeCompleteResults;
 using ClangBackEnd::TranslationUnit;

tests/unit/unittest/completionchunkstotextconvertertest.cpp

@@ -28,15 +28,14 @@
 **
 ****************************************************************************/
 
-
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-generated-matchers.h"
-#include "gtest-qt-printing.h"
-
 #include <codecompletionchunk.h>
 #include <completionchunkstotextconverter.h>
 
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 namespace {
 
 using ClangBackEnd::CodeCompletionChunk;

tests/unit/unittest/gtest-qt-printing.cpp

@@ -1,31 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://www.qt.io/licensing.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-//#include "gtest-qt-printing.h"

tests/unit/unittest/gtest-qt-printing.h

@@ -31,10 +31,10 @@
 #include <QString>
 #include <QDebug>
 
-#include <iostream>
-
 #include <gtest/gtest-printers.h>
 
+#include <iostream>
+
 #ifndef GTESTQTPRINTING_H
 #define GTESTQTPRINTING_H
 

tests/unit/unittest/main.cpp

@@ -28,13 +28,15 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-
-#include <cmbcommands.h>
 #include <sqliteglobal.h>
 
+#include <cmbcommands.h>
+
 #include <QCoreApplication>
 
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 int main(int argc, char *argv[])
 {
     ClangBackEnd::Commands::registerCommands();

tests/unit/unittest/mockipclient.h

@@ -33,6 +33,10 @@
 
 #include <ipcclientinterface.h>
 
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 class MockIpcClient : public ClangBackEnd::IpcClientInterface {
  public:

tests/unit/unittest/mockipcserver.h

@@ -33,6 +33,11 @@
 
 #include <ipcserverinterface.h>
 
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 class MockIpcServer : public ClangBackEnd::IpcServerInterface {
  public:
   MOCK_METHOD0(end,

tests/unit/unittest/projecttest.cpp

@@ -28,16 +28,15 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-generated-matchers.h"
-#include "gtest-qt-printing.h"
-
 #include <projectpart.h>
-#include <utf8stringvector.h>
-#include <projects.h>
 #include <projectpartsdonotexistexception.h>
+#include <projects.h>
+#include <utf8stringvector.h>
+
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 #include <chrono>
 #include <thread>

tests/unit/unittest/readandwritecommandblocktest.cpp

@@ -28,26 +28,25 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest-qt-printing.h"
+#include <cmbalivecommand.h>
+#include <cmbcodecompletedcommand.h>
+#include <cmbcommands.h>
+#include <cmbcompletecodecommand.h>
+#include <cmbendcommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
+#include <readcommandblock.h>
+#include <writecommandblock.h>
 
-#include <QString>
 #include <QBuffer>
+#include <QString>
 #include <QVariant>
 #include <vector>
 
-#include <cmbendcommand.h>
-#include <cmbalivecommand.h>
-#include <cmbcommands.h>
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbcodecompletedcommand.h>
-#include <cmbcompletecodecommand.h>
-#include <writecommandblock.h>
-#include <readcommandblock.h>
-
-#include "gtest-qt-printing.h"
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 using namespace testing;
 namespace CodeModelBackeEndTest {