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
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 \
......
......@@ -30,9 +30,8 @@
#include "cmbalivecommand.h"
#include <QtDebug>
#include <QDataStream>
#include <QDebug>
namespace ClangBackEnd {
......
......@@ -30,9 +30,8 @@
#include "cmbcodecompletedcommand.h"
#include <QDebug>
#include <QDataStream>
#include <QDebug>
#include <ostream>
......
......@@ -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
......
......@@ -30,9 +30,8 @@
#include "cmbcompletecodecommand.h"
#include <QDebug>
#include <QDataStream>
#include <QDebug>
#include <ostream>
......
......@@ -33,9 +33,10 @@
#include "clangbackendipc_global.h"
#include <QMetaType>
#include <utf8string.h>
#include <QMetaType>
namespace ClangBackEnd {
class CMBIPC_EXPORT CompleteCodeCommand
......
......@@ -30,9 +30,8 @@
#include "cmbechocommand.h"
#include <QtDebug>
#include <QDataStream>
#include <QDebug>
#include <ostream>
......
......@@ -30,9 +30,8 @@
#include "cmbendcommand.h"
#include <QtDebug>
#include <QDataStream>
#include <QDebug>
#include <ostream>
......
......@@ -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 {
......
......@@ -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
......
......@@ -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)
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -35,8 +35,8 @@
#include "filecontainer.h"
#include <QVector>
#include <QMetaType>
#include <QVector>
namespace ClangBackEnd {
......
......@@ -30,9 +30,8 @@
#include "codecompletion.h"
#include <QDebug>
#include <QDataStream>
#include <QDebug>
#include <ostream>
......
......@@ -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 {
......
......@@ -31,7 +31,6 @@
#include "codecompletionchunk.h"
#include <QDataStream>
#include <QDebug>
#include <ostream>
......
......@@ -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
......
......@@ -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 {
......
......@@ -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
......
......@@ -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 {
......
......@@ -31,8 +31,10 @@
#ifndef CLANGBACKEND_CONNECTIONSERVER_H
#define CLANGBACKEND_CONNECTIONSERVER_H
#include <QLocalServer>
#include <ipcclientproxy.h>
#include <QLocalServer>
#include <vector>
namespace ClangBackEnd {
......
......@@ -30,9 +30,8 @@
#include "filecontainer.h"
#include <QtDebug>
#include <QDataStream>
#include <QDebug>
#include <ostream>
......
......@@ -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 {
......
......@@ -30,7 +30,7 @@
#include "ipcclientdispatcher.h"
#include <QtDebug>
#include <QDebug>
namespace ClangBackEnd {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -31,15 +31,14 @@
#ifndef CODELMODELBACKEND_IPCCLIENTPROXY_H
#define CODELMODELBACKEND_IPCCLIENTPROXY_H
#include <QtGlobal>
#include <memory>
#include "clangbackendipc_global.h"
#include "ipcclientinterface.h"
#include "writecommandblock.h"
#include "readcommandblock.h"
#include "writecommandblock.h"
#include <QtGlobal>
#include <memory>
QT_BEGIN_NAMESPACE
class QLocalServer;
......
......@@ -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
......
/****************************************************************************
**
** 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
/****************************************************************************
**
** 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
......@@ -30,14 +30,14 @@
#include "ipcserverinterface.h"
#include <QVariant>
#include <QtDebug>
#include "cmbregistertranslationunitsforcodecompletioncommand.h"
#include "cmbunregistertranslationunitsforcodecompletioncommand.h"
#include "cmbcompletecodecommand.h"
#include "cmbregisterprojectsforcodecompletioncommand.h"
#include "cmbregistertranslationunitsforcodecompletioncommand.h"
#include "cmbunregisterprojectsforcodecompletioncommand.h"
#include "cmbcompletecodecommand.h"
#include "cmbunregistertranslationunitsforcodecompletioncommand.h"
#include <QDebug>
#include <QVariant>
namespace ClangBackEnd {
......
......@@ -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 <cmbcompletecodecommand.h>
#include <cmbendcommand.h>
#include <cmbregisterprojectsforcodecompletioncommand.h>
#include <cmbregistertranslationunitsforcodecompletioncommand.h>
#include <cmbunregisterprojectsforcodecompletioncommand.h>
#include <cmbcompletecodecommand.h>
#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
#include <ipcclientinterface.h>
#include <QLocalServer>
#include <QLocalSocket>
#include <QProcess>
namespace ClangBackEnd {
IpcServerProxy::IpcServerProxy(IpcClientInterface *client, QIODevice *ioDevice)
......
......@@ -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;
......
......@@ -30,7 +30,7 @@
#include "projectpartcontainer.h"
#include <QtDebug>
#include <QDebug>
#include <QDataStream>
......
......@@ -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 {
......
......@@ -30,9 +30,8 @@
#include "projectpartsdonotexistcommand.h"
#include <QDebug>
#include <QDataStream>
#include <QDebug>
#include <ostream>
......
......@@ -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 {
......
......@@ -31,9 +31,9 @@
#include "readcommandblock.h"
#include <QDataStream>
#include <QDebug>
#include <QIODevice>
#include <QVariant>
#include <QtDebug>
namespace ClangBackEnd {
......
......@@ -30,9 +30,8 @@
#include "translationunitdoesnotexistcommand.h"
#include <QDebug>
#include <QDataStream>
#include <QDebug>
#include <ostream>