diff --git a/src/libs/clangbackendipc/clangbackendipc_dependencies.pri b/src/libs/clangbackendipc/clangbackendipc_dependencies.pri deleted file mode 100644 index 3b52d130c3f..00000000000 --- a/src/libs/clangbackendipc/clangbackendipc_dependencies.pri +++ /dev/null @@ -1,3 +0,0 @@ -QTC_LIB_NAME = Clangbackendipc -QTC_LIB_DEPENDS += sqlite utils -INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/clangbackendipc diff --git a/src/libs/clangbackendipc/cancelmessage.cpp b/src/libs/clangsupport/cancelmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/cancelmessage.cpp rename to src/libs/clangsupport/cancelmessage.cpp diff --git a/src/libs/clangbackendipc/cancelmessage.h b/src/libs/clangsupport/cancelmessage.h similarity index 98% rename from src/libs/clangbackendipc/cancelmessage.h rename to src/libs/clangsupport/cancelmessage.h index c8924faec6b..151799c3ab4 100644 --- a/src/libs/clangbackendipc/cancelmessage.h +++ b/src/libs/clangsupport/cancelmessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" namespace ClangBackEnd { diff --git a/src/libs/clangbackendipc/clangcodemodelclientinterface.cpp b/src/libs/clangsupport/clangcodemodelclientinterface.cpp similarity index 100% rename from src/libs/clangbackendipc/clangcodemodelclientinterface.cpp rename to src/libs/clangsupport/clangcodemodelclientinterface.cpp diff --git a/src/libs/clangbackendipc/clangcodemodelclientinterface.h b/src/libs/clangsupport/clangcodemodelclientinterface.h similarity index 100% rename from src/libs/clangbackendipc/clangcodemodelclientinterface.h rename to src/libs/clangsupport/clangcodemodelclientinterface.h diff --git a/src/libs/clangbackendipc/clangcodemodelclientmessages.h b/src/libs/clangsupport/clangcodemodelclientmessages.h similarity index 100% rename from src/libs/clangbackendipc/clangcodemodelclientmessages.h rename to src/libs/clangsupport/clangcodemodelclientmessages.h diff --git a/src/libs/clangbackendipc/clangcodemodelclientproxy.cpp b/src/libs/clangsupport/clangcodemodelclientproxy.cpp similarity index 100% rename from src/libs/clangbackendipc/clangcodemodelclientproxy.cpp rename to src/libs/clangsupport/clangcodemodelclientproxy.cpp diff --git a/src/libs/clangbackendipc/clangcodemodelclientproxy.h b/src/libs/clangsupport/clangcodemodelclientproxy.h similarity index 98% rename from src/libs/clangbackendipc/clangcodemodelclientproxy.h rename to src/libs/clangsupport/clangcodemodelclientproxy.h index 9c2c58c6ebf..a86321888de 100644 --- a/src/libs/clangbackendipc/clangcodemodelclientproxy.h +++ b/src/libs/clangsupport/clangcodemodelclientproxy.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "clangcodemodelclientinterface.h" #include "readmessageblock.h" #include "writemessageblock.h" diff --git a/src/libs/clangbackendipc/clangcodemodelconnectionclient.cpp b/src/libs/clangsupport/clangcodemodelconnectionclient.cpp similarity index 100% rename from src/libs/clangbackendipc/clangcodemodelconnectionclient.cpp rename to src/libs/clangsupport/clangcodemodelconnectionclient.cpp diff --git a/src/libs/clangbackendipc/clangcodemodelconnectionclient.h b/src/libs/clangsupport/clangcodemodelconnectionclient.h similarity index 100% rename from src/libs/clangbackendipc/clangcodemodelconnectionclient.h rename to src/libs/clangsupport/clangcodemodelconnectionclient.h diff --git a/src/libs/clangbackendipc/clangcodemodelserverinterface.cpp b/src/libs/clangsupport/clangcodemodelserverinterface.cpp similarity index 100% rename from src/libs/clangbackendipc/clangcodemodelserverinterface.cpp rename to src/libs/clangsupport/clangcodemodelserverinterface.cpp diff --git a/src/libs/clangbackendipc/clangcodemodelserverinterface.h b/src/libs/clangsupport/clangcodemodelserverinterface.h similarity index 100% rename from src/libs/clangbackendipc/clangcodemodelserverinterface.h rename to src/libs/clangsupport/clangcodemodelserverinterface.h diff --git a/src/libs/clangbackendipc/clangcodemodelservermessages.h b/src/libs/clangsupport/clangcodemodelservermessages.h similarity index 100% rename from src/libs/clangbackendipc/clangcodemodelservermessages.h rename to src/libs/clangsupport/clangcodemodelservermessages.h diff --git a/src/libs/clangbackendipc/clangcodemodelserverproxy.cpp b/src/libs/clangsupport/clangcodemodelserverproxy.cpp similarity index 100% rename from src/libs/clangbackendipc/clangcodemodelserverproxy.cpp rename to src/libs/clangsupport/clangcodemodelserverproxy.cpp diff --git a/src/libs/clangbackendipc/clangcodemodelserverproxy.h b/src/libs/clangsupport/clangcodemodelserverproxy.h similarity index 100% rename from src/libs/clangbackendipc/clangcodemodelserverproxy.h rename to src/libs/clangsupport/clangcodemodelserverproxy.h diff --git a/src/libs/clangbackendipc/clangrefactoringclientmessages.h b/src/libs/clangsupport/clangrefactoringclientmessages.h similarity index 100% rename from src/libs/clangbackendipc/clangrefactoringclientmessages.h rename to src/libs/clangsupport/clangrefactoringclientmessages.h diff --git a/src/libs/clangbackendipc/clangrefactoringmessages.h b/src/libs/clangsupport/clangrefactoringmessages.h similarity index 100% rename from src/libs/clangbackendipc/clangrefactoringmessages.h rename to src/libs/clangsupport/clangrefactoringmessages.h diff --git a/src/libs/clangbackendipc/clangrefactoringservermessages.h b/src/libs/clangsupport/clangrefactoringservermessages.h similarity index 100% rename from src/libs/clangbackendipc/clangrefactoringservermessages.h rename to src/libs/clangsupport/clangrefactoringservermessages.h diff --git a/src/libs/clangbackendipc/clangbackendipc-lib.pri b/src/libs/clangsupport/clangsupport-lib.pri similarity index 96% rename from src/libs/clangbackendipc/clangbackendipc-lib.pri rename to src/libs/clangsupport/clangsupport-lib.pri index 1716bfe9e17..1c18e89870f 100644 --- a/src/libs/clangbackendipc/clangbackendipc-lib.pri +++ b/src/libs/clangsupport/clangsupport-lib.pri @@ -1,7 +1,7 @@ shared { - DEFINES += CLANGBACKENDIPC_BUILD_LIB + DEFINES += CLANGSUPPORT_BUILD_LIB } else { - DEFINES += CLANGBACKENDIPC_BUILD_STATIC_LIB + DEFINES += CLANGSUPPORT_BUILD_STATIC_LIB } QT += network @@ -10,7 +10,7 @@ INCLUDEPATH += $$PWD SOURCES += \ $$PWD/cancelmessage.cpp \ - $$PWD/clangbackendipcdebugutils.cpp \ + $$PWD/clangsupportdebugutils.cpp \ $$PWD/clangcodemodelclientinterface.cpp \ $$PWD/clangcodemodelclientproxy.cpp \ $$PWD/clangcodemodelconnectionclient.cpp \ @@ -88,8 +88,8 @@ SOURCES += \ HEADERS += \ $$PWD/cancelmessage.h \ - $$PWD/clangbackendipcdebugutils.h \ - $$PWD/clangbackendipc_global.h \ + $$PWD/clangsupportdebugutils.h \ + $$PWD/clangsupport_global.h \ $$PWD/clangcodemodelclientinterface.h \ $$PWD/clangcodemodelclientmessages.h \ $$PWD/clangcodemodelclientproxy.h \ diff --git a/src/libs/clangbackendipc/clangbackendipc.pro b/src/libs/clangsupport/clangsupport.pro similarity index 52% rename from src/libs/clangbackendipc/clangbackendipc.pro rename to src/libs/clangsupport/clangsupport.pro index e5997d06881..fa614e74ff6 100644 --- a/src/libs/clangbackendipc/clangbackendipc.pro +++ b/src/libs/clangsupport/clangsupport.pro @@ -1,2 +1,2 @@ include(../../qtcreatorlibrary.pri) -include(clangbackendipc-lib.pri) +include(clangsupport-lib.pri) diff --git a/src/libs/clangbackendipc/clangbackendipc.qbs b/src/libs/clangsupport/clangsupport.qbs similarity index 84% rename from src/libs/clangbackendipc/clangbackendipc.qbs rename to src/libs/clangsupport/clangsupport.qbs index afa80a5e2b4..6b76f784aff 100644 --- a/src/libs/clangbackendipc/clangbackendipc.qbs +++ b/src/libs/clangsupport/clangsupport.qbs @@ -1,14 +1,14 @@ import qbs 1.0 QtcLibrary { - name: "ClangBackEndIpc" + name: "ClangSupport" targetName: "Clangbackendipc" Depends { name: "Qt.network" } Depends { name: "Sqlite" } Depends { name: "Utils" } - cpp.defines: base.concat("CLANGBACKENDIPC_BUILD_LIB") + cpp.defines: base.concat("CLANGSUPPORT_BUILD_LIB") cpp.includePaths: base.concat(".") Group { diff --git a/src/libs/clangsupport/clangsupport_dependencies.pri b/src/libs/clangsupport/clangsupport_dependencies.pri new file mode 100644 index 00000000000..74afbf09a8a --- /dev/null +++ b/src/libs/clangsupport/clangsupport_dependencies.pri @@ -0,0 +1,3 @@ +QTC_LIB_NAME = Clangsupport +QTC_LIB_DEPENDS += sqlite utils +INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/clangsupport diff --git a/src/libs/clangbackendipc/clangbackendipc_global.h b/src/libs/clangsupport/clangsupport_global.h similarity index 97% rename from src/libs/clangbackendipc/clangbackendipc_global.h rename to src/libs/clangsupport/clangsupport_global.h index ec22645db56..18e15f52ea6 100644 --- a/src/libs/clangbackendipc/clangbackendipc_global.h +++ b/src/libs/clangsupport/clangsupport_global.h @@ -35,9 +35,9 @@ #include #endif -#if defined(CLANGBACKENDIPC_BUILD_LIB) +#if defined(CLANGSUPPORT_BUILD_LIB) # define CMBIPC_EXPORT Q_DECL_EXPORT -#elif defined(CLANGBACKENDIPC_BUILD_STATIC_LIB) +#elif defined(CLANGSUPPORT_BUILD_STATIC_LIB) # define CMBIPC_EXPORT #else # define CMBIPC_EXPORT Q_DECL_IMPORT diff --git a/src/libs/clangbackendipc/clangbackendipcdebugutils.cpp b/src/libs/clangsupport/clangsupportdebugutils.cpp similarity index 98% rename from src/libs/clangbackendipc/clangbackendipcdebugutils.cpp rename to src/libs/clangsupport/clangsupportdebugutils.cpp index 8c0f83e10be..c62ad0bbc1f 100644 --- a/src/libs/clangbackendipc/clangbackendipcdebugutils.cpp +++ b/src/libs/clangsupport/clangsupportdebugutils.cpp @@ -23,7 +23,7 @@ ** ****************************************************************************/ -#include "clangbackendipcdebugutils.h" +#include "clangsupportdebugutils.h" #include "filecontainer.h" @@ -43,7 +43,7 @@ class DebugInspectionDir : public QTemporaryDir { public: DebugInspectionDir() - : QTemporaryDir(QDir::tempPath() + QLatin1String("/qtc-clangbackendipc-XXXXXX")) + : QTemporaryDir(QDir::tempPath() + QLatin1String("/qtc-clangsupport-XXXXXX")) { setAutoRemove(false); // Keep around for later inspection. } diff --git a/src/libs/clangbackendipc/clangbackendipcdebugutils.h b/src/libs/clangsupport/clangsupportdebugutils.h similarity index 98% rename from src/libs/clangbackendipc/clangbackendipcdebugutils.h rename to src/libs/clangsupport/clangsupportdebugutils.h index 7f766c45d51..52352bb315d 100644 --- a/src/libs/clangbackendipc/clangbackendipcdebugutils.h +++ b/src/libs/clangsupport/clangsupportdebugutils.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/cmbalivemessage.cpp b/src/libs/clangsupport/cmbalivemessage.cpp similarity index 100% rename from src/libs/clangbackendipc/cmbalivemessage.cpp rename to src/libs/clangsupport/cmbalivemessage.cpp diff --git a/src/libs/clangbackendipc/cmbalivemessage.h b/src/libs/clangsupport/cmbalivemessage.h similarity index 98% rename from src/libs/clangbackendipc/cmbalivemessage.h rename to src/libs/clangsupport/cmbalivemessage.h index 435423a2f09..6093b4b86bf 100644 --- a/src/libs/clangbackendipc/cmbalivemessage.h +++ b/src/libs/clangsupport/cmbalivemessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/cmbcodecompletedmessage.cpp b/src/libs/clangsupport/cmbcodecompletedmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/cmbcodecompletedmessage.cpp rename to src/libs/clangsupport/cmbcodecompletedmessage.cpp diff --git a/src/libs/clangbackendipc/cmbcodecompletedmessage.h b/src/libs/clangsupport/cmbcodecompletedmessage.h similarity index 100% rename from src/libs/clangbackendipc/cmbcodecompletedmessage.h rename to src/libs/clangsupport/cmbcodecompletedmessage.h diff --git a/src/libs/clangbackendipc/cmbcompletecodemessage.cpp b/src/libs/clangsupport/cmbcompletecodemessage.cpp similarity index 100% rename from src/libs/clangbackendipc/cmbcompletecodemessage.cpp rename to src/libs/clangsupport/cmbcompletecodemessage.cpp diff --git a/src/libs/clangbackendipc/cmbcompletecodemessage.h b/src/libs/clangsupport/cmbcompletecodemessage.h similarity index 98% rename from src/libs/clangbackendipc/cmbcompletecodemessage.h rename to src/libs/clangsupport/cmbcompletecodemessage.h index 1c37a6538b1..94a4d300ebe 100644 --- a/src/libs/clangbackendipc/cmbcompletecodemessage.h +++ b/src/libs/clangsupport/cmbcompletecodemessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/cmbechomessage.cpp b/src/libs/clangsupport/cmbechomessage.cpp similarity index 100% rename from src/libs/clangbackendipc/cmbechomessage.cpp rename to src/libs/clangsupport/cmbechomessage.cpp diff --git a/src/libs/clangbackendipc/cmbechomessage.h b/src/libs/clangsupport/cmbechomessage.h similarity index 98% rename from src/libs/clangbackendipc/cmbechomessage.h rename to src/libs/clangsupport/cmbechomessage.h index 098d75f2403..7e75a35e3a6 100644 --- a/src/libs/clangbackendipc/cmbechomessage.h +++ b/src/libs/clangsupport/cmbechomessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "messageenvelop.h" diff --git a/src/libs/clangbackendipc/cmbendmessage.cpp b/src/libs/clangsupport/cmbendmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/cmbendmessage.cpp rename to src/libs/clangsupport/cmbendmessage.cpp diff --git a/src/libs/clangbackendipc/cmbendmessage.h b/src/libs/clangsupport/cmbendmessage.h similarity index 98% rename from src/libs/clangbackendipc/cmbendmessage.h rename to src/libs/clangsupport/cmbendmessage.h index 684e5b7a7d2..40db9ef51fc 100644 --- a/src/libs/clangbackendipc/cmbendmessage.h +++ b/src/libs/clangsupport/cmbendmessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.cpp similarity index 100% rename from src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.cpp rename to src/libs/clangsupport/cmbregisterprojectsforeditormessage.cpp diff --git a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h similarity index 100% rename from src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h rename to src/libs/clangsupport/cmbregisterprojectsforeditormessage.h diff --git a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.cpp b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.cpp similarity index 100% rename from src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.cpp rename to src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.cpp diff --git a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h similarity index 100% rename from src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h rename to src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h diff --git a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.cpp b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.cpp similarity index 100% rename from src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.cpp rename to src/libs/clangsupport/cmbunregisterprojectsforeditormessage.cpp diff --git a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h similarity index 98% rename from src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h rename to src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h index 355e85217db..8f1e02f2fe5 100644 --- a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h +++ b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.cpp b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.cpp similarity index 100% rename from src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.cpp rename to src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.cpp diff --git a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h similarity index 98% rename from src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h rename to src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h index ea9df17d286..aa6bf47edd3 100644 --- a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h +++ b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "filecontainer.h" diff --git a/src/libs/clangbackendipc/codecompletion.cpp b/src/libs/clangsupport/codecompletion.cpp similarity index 100% rename from src/libs/clangbackendipc/codecompletion.cpp rename to src/libs/clangsupport/codecompletion.cpp diff --git a/src/libs/clangbackendipc/codecompletion.h b/src/libs/clangsupport/codecompletion.h similarity index 99% rename from src/libs/clangbackendipc/codecompletion.h rename to src/libs/clangsupport/codecompletion.h index bd63115da09..78303c1c33f 100644 --- a/src/libs/clangbackendipc/codecompletion.h +++ b/src/libs/clangsupport/codecompletion.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "codecompletionchunk.h" #include diff --git a/src/libs/clangbackendipc/codecompletionchunk.cpp b/src/libs/clangsupport/codecompletionchunk.cpp similarity index 100% rename from src/libs/clangbackendipc/codecompletionchunk.cpp rename to src/libs/clangsupport/codecompletionchunk.cpp diff --git a/src/libs/clangbackendipc/codecompletionchunk.h b/src/libs/clangsupport/codecompletionchunk.h similarity index 98% rename from src/libs/clangbackendipc/codecompletionchunk.h rename to src/libs/clangsupport/codecompletionchunk.h index 8ba1032c8e9..57d351afde5 100644 --- a/src/libs/clangbackendipc/codecompletionchunk.h +++ b/src/libs/clangsupport/codecompletionchunk.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/connectionclient.cpp b/src/libs/clangsupport/connectionclient.cpp similarity index 99% rename from src/libs/clangbackendipc/connectionclient.cpp rename to src/libs/clangsupport/connectionclient.cpp index c0a0fa5de54..e53fac18102 100644 --- a/src/libs/clangbackendipc/connectionclient.cpp +++ b/src/libs/clangsupport/connectionclient.cpp @@ -25,7 +25,7 @@ #include "connectionclient.h" -#include "clangbackendipcdebugutils.h" +#include "clangsupportdebugutils.h" #include #include diff --git a/src/libs/clangbackendipc/connectionclient.h b/src/libs/clangsupport/connectionclient.h similarity index 100% rename from src/libs/clangbackendipc/connectionclient.h rename to src/libs/clangsupport/connectionclient.h diff --git a/src/libs/clangbackendipc/connectionserver.cpp b/src/libs/clangsupport/connectionserver.cpp similarity index 100% rename from src/libs/clangbackendipc/connectionserver.cpp rename to src/libs/clangsupport/connectionserver.cpp diff --git a/src/libs/clangbackendipc/connectionserver.h b/src/libs/clangsupport/connectionserver.h similarity index 99% rename from src/libs/clangbackendipc/connectionserver.h rename to src/libs/clangsupport/connectionserver.h index 021ffac0f95..268c3776a43 100644 --- a/src/libs/clangbackendipc/connectionserver.h +++ b/src/libs/clangsupport/connectionserver.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include #include diff --git a/src/libs/clangbackendipc/diagnosticcontainer.cpp b/src/libs/clangsupport/diagnosticcontainer.cpp similarity index 100% rename from src/libs/clangbackendipc/diagnosticcontainer.cpp rename to src/libs/clangsupport/diagnosticcontainer.cpp diff --git a/src/libs/clangbackendipc/diagnosticcontainer.h b/src/libs/clangsupport/diagnosticcontainer.h similarity index 100% rename from src/libs/clangbackendipc/diagnosticcontainer.h rename to src/libs/clangsupport/diagnosticcontainer.h diff --git a/src/libs/clangbackendipc/documentannotationschangedmessage.cpp b/src/libs/clangsupport/documentannotationschangedmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/documentannotationschangedmessage.cpp rename to src/libs/clangsupport/documentannotationschangedmessage.cpp diff --git a/src/libs/clangbackendipc/documentannotationschangedmessage.h b/src/libs/clangsupport/documentannotationschangedmessage.h similarity index 99% rename from src/libs/clangbackendipc/documentannotationschangedmessage.h rename to src/libs/clangsupport/documentannotationschangedmessage.h index 75b9350cd3a..63fbdcd902e 100644 --- a/src/libs/clangbackendipc/documentannotationschangedmessage.h +++ b/src/libs/clangsupport/documentannotationschangedmessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "diagnosticcontainer.h" #include "filecontainer.h" #include "highlightingmarkcontainer.h" diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.cpp b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.cpp similarity index 100% rename from src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.cpp rename to src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.cpp diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h similarity index 100% rename from src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontainer.h rename to src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.cpp b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.cpp similarity index 100% rename from src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.cpp rename to src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.cpp diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h similarity index 100% rename from src/libs/clangbackendipc/dynamicastmatcherdiagnosticcontextcontainer.h rename to src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.cpp b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.cpp similarity index 100% rename from src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.cpp rename to src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.cpp diff --git a/src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h similarity index 100% rename from src/libs/clangbackendipc/dynamicastmatcherdiagnosticmessagecontainer.h rename to src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h diff --git a/src/libs/clangbackendipc/dynamicmatcherdiagnostics.h b/src/libs/clangsupport/dynamicmatcherdiagnostics.h similarity index 100% rename from src/libs/clangbackendipc/dynamicmatcherdiagnostics.h rename to src/libs/clangsupport/dynamicmatcherdiagnostics.h diff --git a/src/libs/clangbackendipc/filecontainer.cpp b/src/libs/clangsupport/filecontainer.cpp similarity index 98% rename from src/libs/clangbackendipc/filecontainer.cpp rename to src/libs/clangsupport/filecontainer.cpp index 9de0b550a36..c3f484dbdf0 100644 --- a/src/libs/clangbackendipc/filecontainer.cpp +++ b/src/libs/clangsupport/filecontainer.cpp @@ -25,7 +25,7 @@ #include "filecontainer.h" -#include "clangbackendipcdebugutils.h" +#include "clangsupportdebugutils.h" #include diff --git a/src/libs/clangbackendipc/filecontainer.h b/src/libs/clangsupport/filecontainer.h similarity index 99% rename from src/libs/clangbackendipc/filecontainer.h rename to src/libs/clangsupport/filecontainer.h index 56779396949..0a45c491d2f 100644 --- a/src/libs/clangbackendipc/filecontainer.h +++ b/src/libs/clangsupport/filecontainer.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include #include diff --git a/src/libs/clangbackendipc/filecontainerv2.cpp b/src/libs/clangsupport/filecontainerv2.cpp similarity index 100% rename from src/libs/clangbackendipc/filecontainerv2.cpp rename to src/libs/clangsupport/filecontainerv2.cpp diff --git a/src/libs/clangbackendipc/filecontainerv2.h b/src/libs/clangsupport/filecontainerv2.h similarity index 99% rename from src/libs/clangbackendipc/filecontainerv2.h rename to src/libs/clangsupport/filecontainerv2.h index 365bb5283dd..7832a43c392 100644 --- a/src/libs/clangbackendipc/filecontainerv2.h +++ b/src/libs/clangsupport/filecontainerv2.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "filepath.h" #include diff --git a/src/libs/clangbackendipc/filepath.cpp b/src/libs/clangsupport/filepath.cpp similarity index 100% rename from src/libs/clangbackendipc/filepath.cpp rename to src/libs/clangsupport/filepath.cpp diff --git a/src/libs/clangbackendipc/filepath.h b/src/libs/clangsupport/filepath.h similarity index 99% rename from src/libs/clangbackendipc/filepath.h rename to src/libs/clangsupport/filepath.h index a29ecf941fe..c57da408bc0 100644 --- a/src/libs/clangbackendipc/filepath.h +++ b/src/libs/clangsupport/filepath.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/fixitcontainer.cpp b/src/libs/clangsupport/fixitcontainer.cpp similarity index 100% rename from src/libs/clangbackendipc/fixitcontainer.cpp rename to src/libs/clangsupport/fixitcontainer.cpp diff --git a/src/libs/clangbackendipc/fixitcontainer.h b/src/libs/clangsupport/fixitcontainer.h similarity index 100% rename from src/libs/clangbackendipc/fixitcontainer.h rename to src/libs/clangsupport/fixitcontainer.h diff --git a/src/libs/clangbackendipc/followsymbolmessage.cpp b/src/libs/clangsupport/followsymbolmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/followsymbolmessage.cpp rename to src/libs/clangsupport/followsymbolmessage.cpp diff --git a/src/libs/clangbackendipc/followsymbolmessage.h b/src/libs/clangsupport/followsymbolmessage.h similarity index 100% rename from src/libs/clangbackendipc/followsymbolmessage.h rename to src/libs/clangsupport/followsymbolmessage.h diff --git a/src/libs/clangbackendipc/highlightingmarkcontainer.cpp b/src/libs/clangsupport/highlightingmarkcontainer.cpp similarity index 100% rename from src/libs/clangbackendipc/highlightingmarkcontainer.cpp rename to src/libs/clangsupport/highlightingmarkcontainer.cpp diff --git a/src/libs/clangbackendipc/highlightingmarkcontainer.h b/src/libs/clangsupport/highlightingmarkcontainer.h similarity index 99% rename from src/libs/clangbackendipc/highlightingmarkcontainer.h rename to src/libs/clangsupport/highlightingmarkcontainer.h index 56e998f26c0..0bc3ab0b555 100644 --- a/src/libs/clangbackendipc/highlightingmarkcontainer.h +++ b/src/libs/clangsupport/highlightingmarkcontainer.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/ipcclientinterface.cpp b/src/libs/clangsupport/ipcclientinterface.cpp similarity index 100% rename from src/libs/clangbackendipc/ipcclientinterface.cpp rename to src/libs/clangsupport/ipcclientinterface.cpp diff --git a/src/libs/clangbackendipc/ipcclientinterface.h b/src/libs/clangsupport/ipcclientinterface.h similarity index 100% rename from src/libs/clangbackendipc/ipcclientinterface.h rename to src/libs/clangsupport/ipcclientinterface.h diff --git a/src/libs/clangbackendipc/ipcclientprovider.h b/src/libs/clangsupport/ipcclientprovider.h similarity index 100% rename from src/libs/clangbackendipc/ipcclientprovider.h rename to src/libs/clangsupport/ipcclientprovider.h diff --git a/src/libs/clangbackendipc/ipcinterface.cpp b/src/libs/clangsupport/ipcinterface.cpp similarity index 100% rename from src/libs/clangbackendipc/ipcinterface.cpp rename to src/libs/clangsupport/ipcinterface.cpp diff --git a/src/libs/clangbackendipc/ipcinterface.h b/src/libs/clangsupport/ipcinterface.h similarity index 97% rename from src/libs/clangbackendipc/ipcinterface.h rename to src/libs/clangsupport/ipcinterface.h index f58a7e2a5c6..25ebeb650fe 100644 --- a/src/libs/clangbackendipc/ipcinterface.h +++ b/src/libs/clangsupport/ipcinterface.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/ipcserverinterface.cpp b/src/libs/clangsupport/ipcserverinterface.cpp similarity index 100% rename from src/libs/clangbackendipc/ipcserverinterface.cpp rename to src/libs/clangsupport/ipcserverinterface.cpp diff --git a/src/libs/clangbackendipc/ipcserverinterface.h b/src/libs/clangsupport/ipcserverinterface.h similarity index 100% rename from src/libs/clangbackendipc/ipcserverinterface.h rename to src/libs/clangsupport/ipcserverinterface.h diff --git a/src/libs/clangbackendipc/lineprefixer.cpp b/src/libs/clangsupport/lineprefixer.cpp similarity index 100% rename from src/libs/clangbackendipc/lineprefixer.cpp rename to src/libs/clangsupport/lineprefixer.cpp diff --git a/src/libs/clangbackendipc/lineprefixer.h b/src/libs/clangsupport/lineprefixer.h similarity index 97% rename from src/libs/clangbackendipc/lineprefixer.h rename to src/libs/clangsupport/lineprefixer.h index 4e2972319c7..de87e4b10d0 100644 --- a/src/libs/clangbackendipc/lineprefixer.h +++ b/src/libs/clangsupport/lineprefixer.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include #include diff --git a/src/libs/clangbackendipc/messageenvelop.cpp b/src/libs/clangsupport/messageenvelop.cpp similarity index 100% rename from src/libs/clangbackendipc/messageenvelop.cpp rename to src/libs/clangsupport/messageenvelop.cpp diff --git a/src/libs/clangbackendipc/messageenvelop.h b/src/libs/clangsupport/messageenvelop.h similarity index 98% rename from src/libs/clangbackendipc/messageenvelop.h rename to src/libs/clangsupport/messageenvelop.h index 592fdcd7f97..b2dd6576200 100644 --- a/src/libs/clangbackendipc/messageenvelop.h +++ b/src/libs/clangsupport/messageenvelop.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include #include diff --git a/src/libs/clangbackendipc/pchmanagerclientinterface.cpp b/src/libs/clangsupport/pchmanagerclientinterface.cpp similarity index 100% rename from src/libs/clangbackendipc/pchmanagerclientinterface.cpp rename to src/libs/clangsupport/pchmanagerclientinterface.cpp diff --git a/src/libs/clangbackendipc/pchmanagerclientinterface.h b/src/libs/clangsupport/pchmanagerclientinterface.h similarity index 100% rename from src/libs/clangbackendipc/pchmanagerclientinterface.h rename to src/libs/clangsupport/pchmanagerclientinterface.h diff --git a/src/libs/clangbackendipc/pchmanagerclientproxy.cpp b/src/libs/clangsupport/pchmanagerclientproxy.cpp similarity index 100% rename from src/libs/clangbackendipc/pchmanagerclientproxy.cpp rename to src/libs/clangsupport/pchmanagerclientproxy.cpp diff --git a/src/libs/clangbackendipc/pchmanagerclientproxy.h b/src/libs/clangsupport/pchmanagerclientproxy.h similarity index 98% rename from src/libs/clangbackendipc/pchmanagerclientproxy.h rename to src/libs/clangsupport/pchmanagerclientproxy.h index 210e5b01250..71361881e9a 100644 --- a/src/libs/clangbackendipc/pchmanagerclientproxy.h +++ b/src/libs/clangsupport/pchmanagerclientproxy.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "pchmanagerclientinterface.h" #include "readmessageblock.h" #include "writemessageblock.h" diff --git a/src/libs/clangbackendipc/pchmanagerserverinterface.cpp b/src/libs/clangsupport/pchmanagerserverinterface.cpp similarity index 100% rename from src/libs/clangbackendipc/pchmanagerserverinterface.cpp rename to src/libs/clangsupport/pchmanagerserverinterface.cpp diff --git a/src/libs/clangbackendipc/pchmanagerserverinterface.h b/src/libs/clangsupport/pchmanagerserverinterface.h similarity index 100% rename from src/libs/clangbackendipc/pchmanagerserverinterface.h rename to src/libs/clangsupport/pchmanagerserverinterface.h diff --git a/src/libs/clangbackendipc/pchmanagerserverproxy.cpp b/src/libs/clangsupport/pchmanagerserverproxy.cpp similarity index 100% rename from src/libs/clangbackendipc/pchmanagerserverproxy.cpp rename to src/libs/clangsupport/pchmanagerserverproxy.cpp diff --git a/src/libs/clangbackendipc/pchmanagerserverproxy.h b/src/libs/clangsupport/pchmanagerserverproxy.h similarity index 98% rename from src/libs/clangbackendipc/pchmanagerserverproxy.h rename to src/libs/clangsupport/pchmanagerserverproxy.h index 0b4e593bc1a..6b7c212934c 100644 --- a/src/libs/clangbackendipc/pchmanagerserverproxy.h +++ b/src/libs/clangsupport/pchmanagerserverproxy.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "pchmanagerserverinterface.h" #include "readmessageblock.h" #include "writemessageblock.h" diff --git a/src/libs/clangbackendipc/precompiledheadersupdatedmessage.cpp b/src/libs/clangsupport/precompiledheadersupdatedmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/precompiledheadersupdatedmessage.cpp rename to src/libs/clangsupport/precompiledheadersupdatedmessage.cpp diff --git a/src/libs/clangbackendipc/precompiledheadersupdatedmessage.h b/src/libs/clangsupport/precompiledheadersupdatedmessage.h similarity index 100% rename from src/libs/clangbackendipc/precompiledheadersupdatedmessage.h rename to src/libs/clangsupport/precompiledheadersupdatedmessage.h diff --git a/src/libs/clangbackendipc/projectpartcontainer.cpp b/src/libs/clangsupport/projectpartcontainer.cpp similarity index 98% rename from src/libs/clangbackendipc/projectpartcontainer.cpp rename to src/libs/clangsupport/projectpartcontainer.cpp index f39ba741c3e..9fc1e8d905a 100644 --- a/src/libs/clangbackendipc/projectpartcontainer.cpp +++ b/src/libs/clangsupport/projectpartcontainer.cpp @@ -25,7 +25,7 @@ #include "projectpartcontainer.h" -#include "clangbackendipcdebugutils.h" +#include "clangsupportdebugutils.h" #include diff --git a/src/libs/clangbackendipc/projectpartcontainer.h b/src/libs/clangsupport/projectpartcontainer.h similarity index 98% rename from src/libs/clangbackendipc/projectpartcontainer.h rename to src/libs/clangsupport/projectpartcontainer.h index 6d5fb147f15..9c735632a51 100644 --- a/src/libs/clangbackendipc/projectpartcontainer.h +++ b/src/libs/clangsupport/projectpartcontainer.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/projectpartcontainerv2.cpp b/src/libs/clangsupport/projectpartcontainerv2.cpp similarity index 100% rename from src/libs/clangbackendipc/projectpartcontainerv2.cpp rename to src/libs/clangsupport/projectpartcontainerv2.cpp diff --git a/src/libs/clangbackendipc/projectpartcontainerv2.h b/src/libs/clangsupport/projectpartcontainerv2.h similarity index 99% rename from src/libs/clangbackendipc/projectpartcontainerv2.h rename to src/libs/clangsupport/projectpartcontainerv2.h index a0ad06f3ca4..be2102fad37 100644 --- a/src/libs/clangbackendipc/projectpartcontainerv2.h +++ b/src/libs/clangsupport/projectpartcontainerv2.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/projectpartpch.cpp b/src/libs/clangsupport/projectpartpch.cpp similarity index 100% rename from src/libs/clangbackendipc/projectpartpch.cpp rename to src/libs/clangsupport/projectpartpch.cpp diff --git a/src/libs/clangbackendipc/projectpartpch.h b/src/libs/clangsupport/projectpartpch.h similarity index 98% rename from src/libs/clangbackendipc/projectpartpch.h rename to src/libs/clangsupport/projectpartpch.h index 6798f0eafbc..5ddbca57a0a 100644 --- a/src/libs/clangbackendipc/projectpartpch.h +++ b/src/libs/clangsupport/projectpartpch.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/projectpartsdonotexistmessage.cpp b/src/libs/clangsupport/projectpartsdonotexistmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/projectpartsdonotexistmessage.cpp rename to src/libs/clangsupport/projectpartsdonotexistmessage.cpp diff --git a/src/libs/clangbackendipc/projectpartsdonotexistmessage.h b/src/libs/clangsupport/projectpartsdonotexistmessage.h similarity index 98% rename from src/libs/clangbackendipc/projectpartsdonotexistmessage.h rename to src/libs/clangsupport/projectpartsdonotexistmessage.h index 65a8132dc5f..1c579929062 100644 --- a/src/libs/clangbackendipc/projectpartsdonotexistmessage.h +++ b/src/libs/clangsupport/projectpartsdonotexistmessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/readmessageblock.cpp b/src/libs/clangsupport/readmessageblock.cpp similarity index 100% rename from src/libs/clangbackendipc/readmessageblock.cpp rename to src/libs/clangsupport/readmessageblock.cpp diff --git a/src/libs/clangbackendipc/readmessageblock.h b/src/libs/clangsupport/readmessageblock.h similarity index 100% rename from src/libs/clangbackendipc/readmessageblock.h rename to src/libs/clangsupport/readmessageblock.h diff --git a/src/libs/clangbackendipc/refactoringclientinterface.cpp b/src/libs/clangsupport/refactoringclientinterface.cpp similarity index 100% rename from src/libs/clangbackendipc/refactoringclientinterface.cpp rename to src/libs/clangsupport/refactoringclientinterface.cpp diff --git a/src/libs/clangbackendipc/refactoringclientinterface.h b/src/libs/clangsupport/refactoringclientinterface.h similarity index 100% rename from src/libs/clangbackendipc/refactoringclientinterface.h rename to src/libs/clangsupport/refactoringclientinterface.h diff --git a/src/libs/clangbackendipc/refactoringclientproxy.cpp b/src/libs/clangsupport/refactoringclientproxy.cpp similarity index 100% rename from src/libs/clangbackendipc/refactoringclientproxy.cpp rename to src/libs/clangsupport/refactoringclientproxy.cpp diff --git a/src/libs/clangbackendipc/refactoringclientproxy.h b/src/libs/clangsupport/refactoringclientproxy.h similarity index 98% rename from src/libs/clangbackendipc/refactoringclientproxy.h rename to src/libs/clangsupport/refactoringclientproxy.h index 2f7c3af980c..482fde8b1fd 100644 --- a/src/libs/clangbackendipc/refactoringclientproxy.h +++ b/src/libs/clangsupport/refactoringclientproxy.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "refactoringclientinterface.h" #include "readmessageblock.h" #include "writemessageblock.h" diff --git a/src/libs/clangbackendipc/refactoringserverinterface.cpp b/src/libs/clangsupport/refactoringserverinterface.cpp similarity index 100% rename from src/libs/clangbackendipc/refactoringserverinterface.cpp rename to src/libs/clangsupport/refactoringserverinterface.cpp diff --git a/src/libs/clangbackendipc/refactoringserverinterface.h b/src/libs/clangsupport/refactoringserverinterface.h similarity index 100% rename from src/libs/clangbackendipc/refactoringserverinterface.h rename to src/libs/clangsupport/refactoringserverinterface.h diff --git a/src/libs/clangbackendipc/refactoringserverproxy.cpp b/src/libs/clangsupport/refactoringserverproxy.cpp similarity index 100% rename from src/libs/clangbackendipc/refactoringserverproxy.cpp rename to src/libs/clangsupport/refactoringserverproxy.cpp diff --git a/src/libs/clangbackendipc/refactoringserverproxy.h b/src/libs/clangsupport/refactoringserverproxy.h similarity index 98% rename from src/libs/clangbackendipc/refactoringserverproxy.h rename to src/libs/clangsupport/refactoringserverproxy.h index 73d165a9a05..9b10e375298 100644 --- a/src/libs/clangbackendipc/refactoringserverproxy.h +++ b/src/libs/clangsupport/refactoringserverproxy.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "refactoringserverinterface.h" #include "readmessageblock.h" #include "writemessageblock.h" diff --git a/src/libs/clangbackendipc/referencesmessage.cpp b/src/libs/clangsupport/referencesmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/referencesmessage.cpp rename to src/libs/clangsupport/referencesmessage.cpp diff --git a/src/libs/clangbackendipc/referencesmessage.h b/src/libs/clangsupport/referencesmessage.h similarity index 100% rename from src/libs/clangbackendipc/referencesmessage.h rename to src/libs/clangsupport/referencesmessage.h diff --git a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp b/src/libs/clangsupport/registerunsavedfilesforeditormessage.cpp similarity index 100% rename from src/libs/clangbackendipc/registerunsavedfilesforeditormessage.cpp rename to src/libs/clangsupport/registerunsavedfilesforeditormessage.cpp diff --git a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h b/src/libs/clangsupport/registerunsavedfilesforeditormessage.h similarity index 100% rename from src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h rename to src/libs/clangsupport/registerunsavedfilesforeditormessage.h diff --git a/src/libs/clangbackendipc/removepchprojectpartsmessage.cpp b/src/libs/clangsupport/removepchprojectpartsmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/removepchprojectpartsmessage.cpp rename to src/libs/clangsupport/removepchprojectpartsmessage.cpp diff --git a/src/libs/clangbackendipc/removepchprojectpartsmessage.h b/src/libs/clangsupport/removepchprojectpartsmessage.h similarity index 100% rename from src/libs/clangbackendipc/removepchprojectpartsmessage.h rename to src/libs/clangsupport/removepchprojectpartsmessage.h diff --git a/src/libs/clangbackendipc/requestdocumentannotations.cpp b/src/libs/clangsupport/requestdocumentannotations.cpp similarity index 100% rename from src/libs/clangbackendipc/requestdocumentannotations.cpp rename to src/libs/clangsupport/requestdocumentannotations.cpp diff --git a/src/libs/clangbackendipc/requestdocumentannotations.h b/src/libs/clangsupport/requestdocumentannotations.h similarity index 100% rename from src/libs/clangbackendipc/requestdocumentannotations.h rename to src/libs/clangsupport/requestdocumentannotations.h diff --git a/src/libs/clangbackendipc/requestfollowsymbolmessage.cpp b/src/libs/clangsupport/requestfollowsymbolmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/requestfollowsymbolmessage.cpp rename to src/libs/clangsupport/requestfollowsymbolmessage.cpp diff --git a/src/libs/clangbackendipc/requestfollowsymbolmessage.h b/src/libs/clangsupport/requestfollowsymbolmessage.h similarity index 99% rename from src/libs/clangbackendipc/requestfollowsymbolmessage.h rename to src/libs/clangsupport/requestfollowsymbolmessage.h index fe564bf8285..a9c37e101a5 100644 --- a/src/libs/clangbackendipc/requestfollowsymbolmessage.h +++ b/src/libs/clangsupport/requestfollowsymbolmessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "filecontainer.h" diff --git a/src/libs/clangbackendipc/requestreferencesmessage.cpp b/src/libs/clangsupport/requestreferencesmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/requestreferencesmessage.cpp rename to src/libs/clangsupport/requestreferencesmessage.cpp diff --git a/src/libs/clangbackendipc/requestreferencesmessage.h b/src/libs/clangsupport/requestreferencesmessage.h similarity index 98% rename from src/libs/clangbackendipc/requestreferencesmessage.h rename to src/libs/clangsupport/requestreferencesmessage.h index 8d76c1c5afd..8757799d206 100644 --- a/src/libs/clangbackendipc/requestreferencesmessage.h +++ b/src/libs/clangsupport/requestreferencesmessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "filecontainer.h" diff --git a/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.cpp b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.cpp rename to src/libs/clangsupport/requestsourcelocationforrenamingmessage.cpp diff --git a/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.h b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h similarity index 99% rename from src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.h rename to src/libs/clangsupport/requestsourcelocationforrenamingmessage.h index 8b1f46798c1..271202cda3c 100644 --- a/src/libs/clangbackendipc/requestsourcelocationforrenamingmessage.h +++ b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "filepath.h" #include diff --git a/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.cpp b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.cpp similarity index 100% rename from src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.cpp rename to src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.cpp diff --git a/src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.h b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h similarity index 100% rename from src/libs/clangbackendipc/requestsourcerangesanddiagnosticsforquerymessage.h rename to src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h diff --git a/src/libs/clangbackendipc/requestsourcerangesforquerymessage.cpp b/src/libs/clangsupport/requestsourcerangesforquerymessage.cpp similarity index 100% rename from src/libs/clangbackendipc/requestsourcerangesforquerymessage.cpp rename to src/libs/clangsupport/requestsourcerangesforquerymessage.cpp diff --git a/src/libs/clangbackendipc/requestsourcerangesforquerymessage.h b/src/libs/clangsupport/requestsourcerangesforquerymessage.h similarity index 100% rename from src/libs/clangbackendipc/requestsourcerangesforquerymessage.h rename to src/libs/clangsupport/requestsourcerangesforquerymessage.h diff --git a/src/libs/clangbackendipc/sourcefilepathcontainerbase.cpp b/src/libs/clangsupport/sourcefilepathcontainerbase.cpp similarity index 100% rename from src/libs/clangbackendipc/sourcefilepathcontainerbase.cpp rename to src/libs/clangsupport/sourcefilepathcontainerbase.cpp diff --git a/src/libs/clangbackendipc/sourcefilepathcontainerbase.h b/src/libs/clangsupport/sourcefilepathcontainerbase.h similarity index 100% rename from src/libs/clangbackendipc/sourcefilepathcontainerbase.h rename to src/libs/clangsupport/sourcefilepathcontainerbase.h diff --git a/src/libs/clangbackendipc/sourcelocationcontainer.cpp b/src/libs/clangsupport/sourcelocationcontainer.cpp similarity index 100% rename from src/libs/clangbackendipc/sourcelocationcontainer.cpp rename to src/libs/clangsupport/sourcelocationcontainer.cpp diff --git a/src/libs/clangbackendipc/sourcelocationcontainer.h b/src/libs/clangsupport/sourcelocationcontainer.h similarity index 98% rename from src/libs/clangbackendipc/sourcelocationcontainer.h rename to src/libs/clangsupport/sourcelocationcontainer.h index 6514b484697..80971e8ee8f 100644 --- a/src/libs/clangbackendipc/sourcelocationcontainer.h +++ b/src/libs/clangsupport/sourcelocationcontainer.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/sourcelocationcontainerv2.cpp b/src/libs/clangsupport/sourcelocationcontainerv2.cpp similarity index 100% rename from src/libs/clangbackendipc/sourcelocationcontainerv2.cpp rename to src/libs/clangsupport/sourcelocationcontainerv2.cpp diff --git a/src/libs/clangbackendipc/sourcelocationcontainerv2.h b/src/libs/clangsupport/sourcelocationcontainerv2.h similarity index 99% rename from src/libs/clangbackendipc/sourcelocationcontainerv2.h rename to src/libs/clangsupport/sourcelocationcontainerv2.h index db54c7c0282..def1c389fa2 100644 --- a/src/libs/clangbackendipc/sourcelocationcontainerv2.h +++ b/src/libs/clangsupport/sourcelocationcontainerv2.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/sourcelocationscontainer.cpp b/src/libs/clangsupport/sourcelocationscontainer.cpp similarity index 100% rename from src/libs/clangbackendipc/sourcelocationscontainer.cpp rename to src/libs/clangsupport/sourcelocationscontainer.cpp diff --git a/src/libs/clangbackendipc/sourcelocationscontainer.h b/src/libs/clangsupport/sourcelocationscontainer.h similarity index 100% rename from src/libs/clangbackendipc/sourcelocationscontainer.h rename to src/libs/clangsupport/sourcelocationscontainer.h diff --git a/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.cpp b/src/libs/clangsupport/sourcelocationsforrenamingmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/sourcelocationsforrenamingmessage.cpp rename to src/libs/clangsupport/sourcelocationsforrenamingmessage.cpp diff --git a/src/libs/clangbackendipc/sourcelocationsforrenamingmessage.h b/src/libs/clangsupport/sourcelocationsforrenamingmessage.h similarity index 100% rename from src/libs/clangbackendipc/sourcelocationsforrenamingmessage.h rename to src/libs/clangsupport/sourcelocationsforrenamingmessage.h diff --git a/src/libs/clangbackendipc/sourcerangecontainer.cpp b/src/libs/clangsupport/sourcerangecontainer.cpp similarity index 100% rename from src/libs/clangbackendipc/sourcerangecontainer.cpp rename to src/libs/clangsupport/sourcerangecontainer.cpp diff --git a/src/libs/clangbackendipc/sourcerangecontainer.h b/src/libs/clangsupport/sourcerangecontainer.h similarity index 100% rename from src/libs/clangbackendipc/sourcerangecontainer.h rename to src/libs/clangsupport/sourcerangecontainer.h diff --git a/src/libs/clangbackendipc/sourcerangecontainerv2.cpp b/src/libs/clangsupport/sourcerangecontainerv2.cpp similarity index 100% rename from src/libs/clangbackendipc/sourcerangecontainerv2.cpp rename to src/libs/clangsupport/sourcerangecontainerv2.cpp diff --git a/src/libs/clangbackendipc/sourcerangecontainerv2.h b/src/libs/clangsupport/sourcerangecontainerv2.h similarity index 100% rename from src/libs/clangbackendipc/sourcerangecontainerv2.h rename to src/libs/clangsupport/sourcerangecontainerv2.h diff --git a/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.cpp b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.cpp similarity index 100% rename from src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.cpp rename to src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.cpp diff --git a/src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.h b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h similarity index 100% rename from src/libs/clangbackendipc/sourcerangesanddiagnosticsforquerymessage.h rename to src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h diff --git a/src/libs/clangbackendipc/sourcerangescontainer.cpp b/src/libs/clangsupport/sourcerangescontainer.cpp similarity index 100% rename from src/libs/clangbackendipc/sourcerangescontainer.cpp rename to src/libs/clangsupport/sourcerangescontainer.cpp diff --git a/src/libs/clangbackendipc/sourcerangescontainer.h b/src/libs/clangsupport/sourcerangescontainer.h similarity index 100% rename from src/libs/clangbackendipc/sourcerangescontainer.h rename to src/libs/clangsupport/sourcerangescontainer.h diff --git a/src/libs/clangbackendipc/sourcerangesforquerymessage.cpp b/src/libs/clangsupport/sourcerangesforquerymessage.cpp similarity index 100% rename from src/libs/clangbackendipc/sourcerangesforquerymessage.cpp rename to src/libs/clangsupport/sourcerangesforquerymessage.cpp diff --git a/src/libs/clangbackendipc/sourcerangesforquerymessage.h b/src/libs/clangsupport/sourcerangesforquerymessage.h similarity index 100% rename from src/libs/clangbackendipc/sourcerangesforquerymessage.h rename to src/libs/clangsupport/sourcerangesforquerymessage.h diff --git a/src/libs/clangbackendipc/sourcerangewithtextcontainer.cpp b/src/libs/clangsupport/sourcerangewithtextcontainer.cpp similarity index 100% rename from src/libs/clangbackendipc/sourcerangewithtextcontainer.cpp rename to src/libs/clangsupport/sourcerangewithtextcontainer.cpp diff --git a/src/libs/clangbackendipc/sourcerangewithtextcontainer.h b/src/libs/clangsupport/sourcerangewithtextcontainer.h similarity index 100% rename from src/libs/clangbackendipc/sourcerangewithtextcontainer.h rename to src/libs/clangsupport/sourcerangewithtextcontainer.h diff --git a/src/libs/clangbackendipc/stringcache.h b/src/libs/clangsupport/stringcache.h similarity index 100% rename from src/libs/clangbackendipc/stringcache.h rename to src/libs/clangsupport/stringcache.h diff --git a/src/libs/clangbackendipc/stringcachefwd.h b/src/libs/clangsupport/stringcachefwd.h similarity index 100% rename from src/libs/clangbackendipc/stringcachefwd.h rename to src/libs/clangsupport/stringcachefwd.h diff --git a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.cpp b/src/libs/clangsupport/translationunitdoesnotexistmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/translationunitdoesnotexistmessage.cpp rename to src/libs/clangsupport/translationunitdoesnotexistmessage.cpp diff --git a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.h b/src/libs/clangsupport/translationunitdoesnotexistmessage.h similarity index 100% rename from src/libs/clangbackendipc/translationunitdoesnotexistmessage.h rename to src/libs/clangsupport/translationunitdoesnotexistmessage.h diff --git a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.cpp b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.cpp similarity index 100% rename from src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.cpp rename to src/libs/clangsupport/unregisterunsavedfilesforeditormessage.cpp diff --git a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h similarity index 100% rename from src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h rename to src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h diff --git a/src/libs/clangbackendipc/updatepchprojectpartsmessage.cpp b/src/libs/clangsupport/updatepchprojectpartsmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/updatepchprojectpartsmessage.cpp rename to src/libs/clangsupport/updatepchprojectpartsmessage.cpp diff --git a/src/libs/clangbackendipc/updatepchprojectpartsmessage.h b/src/libs/clangsupport/updatepchprojectpartsmessage.h similarity index 100% rename from src/libs/clangbackendipc/updatepchprojectpartsmessage.h rename to src/libs/clangsupport/updatepchprojectpartsmessage.h diff --git a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.cpp b/src/libs/clangsupport/updatetranslationunitsforeditormessage.cpp similarity index 100% rename from src/libs/clangbackendipc/updatetranslationunitsforeditormessage.cpp rename to src/libs/clangsupport/updatetranslationunitsforeditormessage.cpp diff --git a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h b/src/libs/clangsupport/updatetranslationunitsforeditormessage.h similarity index 100% rename from src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h rename to src/libs/clangsupport/updatetranslationunitsforeditormessage.h diff --git a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp b/src/libs/clangsupport/updatevisibletranslationunitsmessage.cpp similarity index 100% rename from src/libs/clangbackendipc/updatevisibletranslationunitsmessage.cpp rename to src/libs/clangsupport/updatevisibletranslationunitsmessage.cpp diff --git a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h b/src/libs/clangsupport/updatevisibletranslationunitsmessage.h similarity index 98% rename from src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h rename to src/libs/clangsupport/updatevisibletranslationunitsmessage.h index 033d3a98a16..cdd57fe2f10 100644 --- a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h +++ b/src/libs/clangsupport/updatevisibletranslationunitsmessage.h @@ -25,7 +25,7 @@ #pragma once -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include diff --git a/src/libs/clangbackendipc/writemessageblock.cpp b/src/libs/clangsupport/writemessageblock.cpp similarity index 100% rename from src/libs/clangbackendipc/writemessageblock.cpp rename to src/libs/clangsupport/writemessageblock.cpp diff --git a/src/libs/clangbackendipc/writemessageblock.h b/src/libs/clangsupport/writemessageblock.h similarity index 100% rename from src/libs/clangbackendipc/writemessageblock.h rename to src/libs/clangsupport/writemessageblock.h diff --git a/src/libs/libs.pro b/src/libs/libs.pro index 178a7a4cb8c..669dc0183ab 100644 --- a/src/libs/libs.pro +++ b/src/libs/libs.pro @@ -15,7 +15,7 @@ SUBDIRS = \ glsl \ ssh \ sqlite \ - clangbackendipc + clangsupport qtHaveModule(quick) { SUBDIRS += \ diff --git a/src/libs/libs.qbs b/src/libs/libs.qbs index 29eb744c1a7..4eedda662ce 100644 --- a/src/libs/libs.qbs +++ b/src/libs/libs.qbs @@ -4,7 +4,7 @@ Project { name: "Libs" references: [ "aggregation/aggregation.qbs", - "clangbackendipc/clangbackendipc.qbs", + "clangsupport/clangsupport.qbs", "cplusplus/cplusplus.qbs", "extensionsystem/extensionsystem.qbs", "flamegraph/flamegraph.qbs", diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.h b/src/plugins/clangcodemodel/clangassistproposalmodel.h index 6a722145139..b71d2568564 100644 --- a/src/plugins/clangcodemodel/clangassistproposalmodel.h +++ b/src/plugins/clangcodemodel/clangassistproposalmodel.h @@ -29,7 +29,7 @@ #include -#include +#include namespace ClangCodeModel { namespace Internal { diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp index 8be441b7d6e..1d1ab500d80 100644 --- a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp +++ b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp @@ -48,9 +48,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.h b/src/plugins/clangcodemodel/clangbackendipcintegration.h index 36258667ef3..fe38435220a 100644 --- a/src/plugins/clangcodemodel/clangbackendipcintegration.h +++ b/src/plugins/clangcodemodel/clangbackendipcintegration.h @@ -29,10 +29,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs index eb46d8f2bd0..6223c124346 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.qbs +++ b/src/plugins/clangcodemodel/clangcodemodel.qbs @@ -10,7 +10,7 @@ QtcPlugin { Depends { name: "ProjectExplorer" } Depends { name: "TextEditor" } Depends { name: "Utils" } - Depends { name: "ClangBackEndIpc" } + Depends { name: "ClangSupport" } Depends { name: "libclang"; required: false } pluginTestDepends: [ @@ -41,7 +41,7 @@ QtcPlugin { "clangassistproposalitem.h", "clangassistproposalmodel.cpp", "clangassistproposalmodel.h", - "clangbackendipcintegration.cpp", + "clangsupportintegration.cpp", "clangbackendipcintegration.h", "clangcodemodelplugin.cpp", "clangcodemodelplugin.h", diff --git a/src/plugins/clangcodemodel/clangcodemodel_dependencies.pri b/src/plugins/clangcodemodel/clangcodemodel_dependencies.pri index 335569d766d..9b44838b011 100644 --- a/src/plugins/clangcodemodel/clangcodemodel_dependencies.pri +++ b/src/plugins/clangcodemodel/clangcodemodel_dependencies.pri @@ -1,7 +1,7 @@ QTC_PLUGIN_NAME = ClangCodeModel QTC_LIB_DEPENDS += \ utils \ - clangbackendipc + clangsupport QTC_PLUGIN_DEPENDS += \ coreplugin \ cpptools \ diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp index 9d84b3ba813..1cd9a770d72 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.h b/src/plugins/clangcodemodel/clangcompletionassistprocessor.h index 8b67116e874..4172d646f44 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.h +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.h @@ -29,7 +29,7 @@ #include -#include +#include #include #include diff --git a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h index 4a8f6b8a958..27eccbcf169 100644 --- a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h +++ b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h @@ -25,7 +25,7 @@ #pragma once -#include +#include #include diff --git a/src/plugins/clangcodemodel/clangdiagnosticfilter.h b/src/plugins/clangcodemodel/clangdiagnosticfilter.h index 9329d43ceba..0fe164ecf07 100644 --- a/src/plugins/clangcodemodel/clangdiagnosticfilter.h +++ b/src/plugins/clangcodemodel/clangdiagnosticfilter.h @@ -25,7 +25,7 @@ #pragma once -#include +#include #include diff --git a/src/plugins/clangcodemodel/clangdiagnosticmanager.h b/src/plugins/clangcodemodel/clangdiagnosticmanager.h index 1321702c99c..dff768a09d4 100644 --- a/src/plugins/clangcodemodel/clangdiagnosticmanager.h +++ b/src/plugins/clangcodemodel/clangdiagnosticmanager.h @@ -29,7 +29,7 @@ #include -#include +#include #include #include diff --git a/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h b/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h index 3ea1bfb0ada..91fdfc67d6b 100644 --- a/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h +++ b/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.h @@ -25,7 +25,7 @@ #pragma once -#include +#include QT_BEGIN_NAMESPACE class QLayout; diff --git a/src/plugins/clangcodemodel/clangfixitoperation.h b/src/plugins/clangcodemodel/clangfixitoperation.h index e4183451b49..1270e98f36c 100644 --- a/src/plugins/clangcodemodel/clangfixitoperation.h +++ b/src/plugins/clangcodemodel/clangfixitoperation.h @@ -27,7 +27,7 @@ #include -#include +#include #include diff --git a/src/plugins/clangcodemodel/clangfixitoperationsextractor.h b/src/plugins/clangcodemodel/clangfixitoperationsextractor.h index f0b1fb83abf..ee2da9a4b21 100644 --- a/src/plugins/clangcodemodel/clangfixitoperationsextractor.h +++ b/src/plugins/clangcodemodel/clangfixitoperationsextractor.h @@ -27,7 +27,7 @@ #include -#include +#include namespace ClangCodeModel { diff --git a/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h b/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h index af4f1773b0e..379e2c55f62 100644 --- a/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h +++ b/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h @@ -32,7 +32,7 @@ #include -#include +#include namespace ClangCodeModel { diff --git a/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h b/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h index 8d44634bacd..2676bbffded 100644 --- a/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h +++ b/src/plugins/clangcodemodel/clangisdiagnosticrelatedtolocation.h @@ -25,7 +25,7 @@ #pragma once -#include +#include namespace ClangCodeModel { namespace Internal { diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp index a2dd65103b4..d14fb64e6fb 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp @@ -38,9 +38,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/plugins/clangcodemodel/clangtextmark.h b/src/plugins/clangcodemodel/clangtextmark.h index ae5478168a3..5c794d970c3 100644 --- a/src/plugins/clangcodemodel/clangtextmark.h +++ b/src/plugins/clangcodemodel/clangtextmark.h @@ -25,8 +25,8 @@ #pragma once -#include -#include +#include +#include #include diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp index ac5d09ec3fb..db09aea6723 100644 --- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp +++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/clangpchmanager/clangpchmanager_dependencies.pri b/src/plugins/clangpchmanager/clangpchmanager_dependencies.pri index 281eca80d5e..197da5a97cf 100644 --- a/src/plugins/clangpchmanager/clangpchmanager_dependencies.pri +++ b/src/plugins/clangpchmanager/clangpchmanager_dependencies.pri @@ -1,7 +1,7 @@ QTC_PLUGIN_NAME = ClangPchManager QTC_LIB_DEPENDS += \ utils \ - clangbackendipc + clangsupport QTC_PLUGIN_DEPENDS += \ coreplugin \ cpptools diff --git a/src/plugins/clangrefactoring/clangrefactoring_dependencies.pri b/src/plugins/clangrefactoring/clangrefactoring_dependencies.pri index 15005bd6893..ed775ae4fca 100644 --- a/src/plugins/clangrefactoring/clangrefactoring_dependencies.pri +++ b/src/plugins/clangrefactoring/clangrefactoring_dependencies.pri @@ -1,7 +1,7 @@ QTC_PLUGIN_NAME = ClangRefactoring QTC_LIB_DEPENDS += \ utils \ - clangbackendipc + clangsupport QTC_PLUGIN_DEPENDS += \ coreplugin \ cpptools \ diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index c20d46ed40d..1c68cf5ab5e 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -38,7 +38,7 @@ #include "cppquickfixassistant.h" #include "cppuseselectionsupdater.h" -#include +#include #include #include diff --git a/src/plugins/cpptools/refactoringengineinterface.h b/src/plugins/cpptools/refactoringengineinterface.h index 2076a379d8a..4afecb7a243 100644 --- a/src/plugins/cpptools/refactoringengineinterface.h +++ b/src/plugins/cpptools/refactoringengineinterface.h @@ -27,8 +27,8 @@ #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE class QTextCursor; diff --git a/src/tools/clangbackend/clangbackend.pro b/src/tools/clangbackend/clangbackend.pro index f75775c8e78..b17d923a3b5 100644 --- a/src/tools/clangbackend/clangbackend.pro +++ b/src/tools/clangbackend/clangbackend.pro @@ -1,6 +1,6 @@ QTC_LIB_DEPENDS += \ sqlite \ - clangbackendipc + clangsupport include(../../qtcreatortool.pri) include(../../shared/clang/clang_installation.pri) diff --git a/src/tools/clangbackend/clangbackend.qbs b/src/tools/clangbackend/clangbackend.qbs index 457c218501a..4a1ca115792 100644 --- a/src/tools/clangbackend/clangbackend.qbs +++ b/src/tools/clangbackend/clangbackend.qbs @@ -3,7 +3,7 @@ import qbs 1.0 QtcTool { name: "clangbackend" - Depends { name: "ClangBackEndIpc" } + Depends { name: "ClangSupport" } Depends { name: "libclang"; required: false } Group { diff --git a/src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp b/src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp index 5f07f99a066..4c5f3712eb5 100644 --- a/src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp +++ b/src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp @@ -35,8 +35,8 @@ #include "clangexceptions.h" #include "skippedsourceranges.h" -#include -#include +#include +#include #include #include diff --git a/src/tools/clangbackend/ipcsource/clangcompletecodejob.cpp b/src/tools/clangbackend/ipcsource/clangcompletecodejob.cpp index d45f53fdda0..24378b201c8 100644 --- a/src/tools/clangbackend/ipcsource/clangcompletecodejob.cpp +++ b/src/tools/clangbackend/ipcsource/clangcompletecodejob.cpp @@ -25,9 +25,9 @@ #include "clangcompletecodejob.h" -#include -#include -#include +#include +#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangcompletecodejob.h b/src/tools/clangbackend/ipcsource/clangcompletecodejob.h index 142988d7403..54b0ae5ec34 100644 --- a/src/tools/clangbackend/ipcsource/clangcompletecodejob.h +++ b/src/tools/clangbackend/ipcsource/clangcompletecodejob.h @@ -28,7 +28,7 @@ #include "clangasyncjob.h" #include "clangdocument.h" -#include +#include namespace ClangBackEnd { diff --git a/src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.cpp b/src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.cpp index a9bf6698661..62ae318f61d 100644 --- a/src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.cpp +++ b/src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.cpp @@ -25,7 +25,7 @@ #include "clangcreateinitialdocumentpreamblejob.h" -#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.cpp b/src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.cpp index bae98893187..cd0e29b5d05 100644 --- a/src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.cpp +++ b/src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.cpp @@ -25,7 +25,7 @@ #include "clangdocumentsuspenderresumer.h" -#include "clangbackendipc_global.h" +#include "clangsupport_global.h" #include "clangdocumentprocessors.h" #include "clangdocuments.h" diff --git a/src/tools/clangbackend/ipcsource/clangfollowsymbol.cpp b/src/tools/clangbackend/ipcsource/clangfollowsymbol.cpp index b4d3fdb3338..7074af52ee4 100644 --- a/src/tools/clangbackend/ipcsource/clangfollowsymbol.cpp +++ b/src/tools/clangbackend/ipcsource/clangfollowsymbol.cpp @@ -29,7 +29,7 @@ #include "cursor.h" #include "clangstring.h" #include "sourcerange.h" -#include "clangbackendipcdebugutils.h" +#include "clangsupportdebugutils.h" #include diff --git a/src/tools/clangbackend/ipcsource/clangfollowsymboljob.cpp b/src/tools/clangbackend/ipcsource/clangfollowsymboljob.cpp index ffac66b65fd..2a04be1b0e7 100644 --- a/src/tools/clangbackend/ipcsource/clangfollowsymboljob.cpp +++ b/src/tools/clangbackend/ipcsource/clangfollowsymboljob.cpp @@ -25,9 +25,9 @@ #include "clangfollowsymboljob.h" -#include -#include -#include +#include +#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangfollowsymboljob.h b/src/tools/clangbackend/ipcsource/clangfollowsymboljob.h index 2d56e2ca101..ce2ca4e06c0 100644 --- a/src/tools/clangbackend/ipcsource/clangfollowsymboljob.h +++ b/src/tools/clangbackend/ipcsource/clangfollowsymboljob.h @@ -28,7 +28,7 @@ #include "clangasyncjob.h" #include "clangdocument.h" -#include +#include namespace ClangBackEnd { diff --git a/src/tools/clangbackend/ipcsource/clangjobs.h b/src/tools/clangbackend/ipcsource/clangjobs.h index c4167110f5e..d154d401e88 100644 --- a/src/tools/clangbackend/ipcsource/clangjobs.h +++ b/src/tools/clangbackend/ipcsource/clangjobs.h @@ -27,7 +27,7 @@ #include "clangjobqueue.h" -#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.cpp b/src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.cpp index fa8937c1951..c7646f5834b 100644 --- a/src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.cpp +++ b/src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.cpp @@ -25,7 +25,7 @@ #include "clangparsesupportivetranslationunitjob.h" -#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangreferencescollector.cpp b/src/tools/clangbackend/ipcsource/clangreferencescollector.cpp index df9d937de05..d2b7bf5431d 100644 --- a/src/tools/clangbackend/ipcsource/clangreferencescollector.cpp +++ b/src/tools/clangbackend/ipcsource/clangreferencescollector.cpp @@ -29,7 +29,7 @@ #include "cursor.h" #include "sourcerange.h" -#include +#include #include #include diff --git a/src/tools/clangbackend/ipcsource/clangreferencescollector.h b/src/tools/clangbackend/ipcsource/clangreferencescollector.h index 6feee77c79b..263ba07fd9e 100644 --- a/src/tools/clangbackend/ipcsource/clangreferencescollector.h +++ b/src/tools/clangbackend/ipcsource/clangreferencescollector.h @@ -25,7 +25,7 @@ #pragma once -#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.cpp b/src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.cpp index da922db8e9d..833b8fe2b9d 100644 --- a/src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.cpp +++ b/src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.cpp @@ -25,7 +25,7 @@ #include "clangreparsesupportivetranslationunitjob.h" -#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.cpp b/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.cpp index 45b06c02037..f0f7f78210c 100644 --- a/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.cpp +++ b/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.cpp @@ -25,9 +25,9 @@ #include "clangrequestdocumentannotationsjob.h" -#include -#include -#include +#include +#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.h b/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.h index e6bb4f9edca..dcbe42b6e45 100644 --- a/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.h +++ b/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.h @@ -28,9 +28,9 @@ #include "clangasyncjob.h" #include "clangdocument.h" -#include -#include -#include +#include +#include +#include namespace ClangBackEnd { diff --git a/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.cpp b/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.cpp index f80072c0ed4..1ebc22c9713 100644 --- a/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.cpp +++ b/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.cpp @@ -25,9 +25,9 @@ #include "clangrequestreferencesjob.h" -#include -#include -#include +#include +#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.h b/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.h index 179f8b845b8..13a904bddc1 100644 --- a/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.h +++ b/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.h @@ -29,7 +29,7 @@ #include "clangreferencescollector.h" #include "clangdocument.h" -#include +#include namespace ClangBackEnd { diff --git a/src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.cpp b/src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.cpp index e3406fcf327..0e71813ba20 100644 --- a/src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.cpp +++ b/src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.cpp @@ -25,7 +25,7 @@ #include "clangsuspenddocumentjob.h" -#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunit.h b/src/tools/clangbackend/ipcsource/clangtranslationunit.h index 8bb317a8cd0..9553138c991 100644 --- a/src/tools/clangbackend/ipcsource/clangtranslationunit.h +++ b/src/tools/clangbackend/ipcsource/clangtranslationunit.h @@ -25,7 +25,7 @@ #pragma once -#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.cpp b/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.cpp index b4b56fe5341..3698d1c40c8 100644 --- a/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.cpp +++ b/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.cpp @@ -25,9 +25,9 @@ #include "clangupdatedocumentannotationsjob.h" -#include -#include -#include +#include +#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.h b/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.h index fdbe9068a6d..a49e9b45b51 100644 --- a/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.h +++ b/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.h @@ -29,9 +29,9 @@ #include "clangdocument.h" #include "clangtranslationunitupdater.h" -#include -#include -#include +#include +#include +#include namespace ClangBackEnd { diff --git a/src/tools/clangbackend/ipcsource/diagnostic.h b/src/tools/clangbackend/ipcsource/diagnostic.h index 64d4eff9b77..140322931fb 100644 --- a/src/tools/clangbackend/ipcsource/diagnostic.h +++ b/src/tools/clangbackend/ipcsource/diagnostic.h @@ -25,7 +25,7 @@ #pragma once -#include +#include #include diff --git a/src/tools/clangbackend/ipcsource/highlightingmark.h b/src/tools/clangbackend/ipcsource/highlightingmark.h index a749a5c9223..151bd263d25 100644 --- a/src/tools/clangbackend/ipcsource/highlightingmark.h +++ b/src/tools/clangbackend/ipcsource/highlightingmark.h @@ -25,7 +25,7 @@ #pragma once -#include +#include #include #include "cursor.h" diff --git a/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro b/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro index b115782dfe7..8dab349dd34 100644 --- a/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro +++ b/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro @@ -1,5 +1,5 @@ QTC_LIB_DEPENDS += \ - clangbackendipc + clangsupport include(../../qtcreatortool.pri) include(../../shared/clang/clang_installation.pri) diff --git a/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro b/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro index 705198f216e..3b94d003c06 100644 --- a/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro +++ b/src/tools/clangrefactoringbackend/clangrefactoringbackend.pro @@ -1,5 +1,5 @@ QTC_LIB_DEPENDS += \ - clangbackendipc + clangsupport include(../../qtcreatortool.pri) include(../../shared/clang/clang_installation.pri) diff --git a/tests/unit/echoserver/echoclangcodemodelserver.cpp b/tests/unit/echoserver/echoclangcodemodelserver.cpp index c4a761b19fc..b5de4ba5392 100644 --- a/tests/unit/echoserver/echoclangcodemodelserver.cpp +++ b/tests/unit/echoserver/echoclangcodemodelserver.cpp @@ -25,8 +25,8 @@ #include "echoclangcodemodelserver.h" -#include -#include +#include +#include #include #include diff --git a/tests/unit/echoserver/echoclangcodemodelserver.h b/tests/unit/echoserver/echoclangcodemodelserver.h index 7704283d5b1..2dc8c30913a 100644 --- a/tests/unit/echoserver/echoclangcodemodelserver.h +++ b/tests/unit/echoserver/echoclangcodemodelserver.h @@ -25,7 +25,7 @@ #pragma once -#include +#include #include namespace ClangBackEnd { diff --git a/tests/unit/echoserver/echoserver.pro b/tests/unit/echoserver/echoserver.pro index 0f9ed76afa3..38d0ff20780 100644 --- a/tests/unit/echoserver/echoserver.pro +++ b/tests/unit/echoserver/echoserver.pro @@ -15,7 +15,7 @@ IDE_BIN_PATH=$$PWD include($$PWD/../../../src/libs/utils/utils-lib.pri) include(../../../qtcreator.pri) -include(../../../src/libs/clangbackendipc/clangbackendipc-lib.pri) +include(../../../src/libs/clangsupport/clangsupport-lib.pri) include(../../../src/libs/sqlite/sqlite-lib.pri) INCLUDEPATH += ../../../src/libs @@ -27,7 +27,7 @@ SOURCES += \ HEADERS += \ echoclangcodemodelserver.h -DEFINES += CLANGBACKENDIPC_TESTS +DEFINES += CLANGSUPPORT_TESTS DEFINES += DONT_CHECK_MESSAGE_COUNTER win32:DESTDIR = .. diff --git a/tests/unit/echoserver/echoserverprocessmain.cpp b/tests/unit/echoserver/echoserverprocessmain.cpp index a627c11faeb..a153feaf155 100644 --- a/tests/unit/echoserver/echoserverprocessmain.cpp +++ b/tests/unit/echoserver/echoserverprocessmain.cpp @@ -25,8 +25,8 @@ #include "echoclangcodemodelserver.h" -#include -#include +#include +#include #include diff --git a/tests/unit/unittest/clangasyncjob-base.cpp b/tests/unit/unittest/clangasyncjob-base.cpp index c3695d96397..81593c9ac3a 100644 --- a/tests/unit/unittest/clangasyncjob-base.cpp +++ b/tests/unit/unittest/clangasyncjob-base.cpp @@ -26,7 +26,7 @@ #include "clangasyncjob-base.h" #include "processevents-utilities.h" -#include +#include using namespace ClangBackEnd; diff --git a/tests/unit/unittest/clangfollowsymbol-test.cpp b/tests/unit/unittest/clangfollowsymbol-test.cpp index 7346e31c251..64023116fb3 100644 --- a/tests/unit/unittest/clangfollowsymbol-test.cpp +++ b/tests/unit/unittest/clangfollowsymbol-test.cpp @@ -26,7 +26,7 @@ #include "googletest.h" #include "testenvironment.h" -#include +#include #include #include #include diff --git a/tests/unit/unittest/clangreferencescollector-test.cpp b/tests/unit/unittest/clangreferencescollector-test.cpp index 7141ee2afb9..4fae0785ea1 100644 --- a/tests/unit/unittest/clangreferencescollector-test.cpp +++ b/tests/unit/unittest/clangreferencescollector-test.cpp @@ -26,7 +26,7 @@ #include "googletest.h" #include "testenvironment.h" -#include +#include #include #include #include diff --git a/tests/unit/unittest/creator_dependency.pri b/tests/unit/unittest/creator_dependency.pri index 1932640249c..edf7417029b 100644 --- a/tests/unit/unittest/creator_dependency.pri +++ b/tests/unit/unittest/creator_dependency.pri @@ -5,7 +5,7 @@ IDE_BIN_PATH=$$PWD include($$PWD/../../../src/libs/utils/utils-lib.pri) include($$PWD/../../../src/libs/sqlite/sqlite-lib.pri) -include($$PWD/../../../src/libs/clangbackendipc/clangbackendipc-lib.pri) +include($$PWD/../../../src/libs/clangsupport/clangsupport-lib.pri) include($$PWD/../../../src/plugins/coreplugin/corepluginunittestfiles.pri) include($$PWD/../../../src/tools/clangrefactoringbackend/source/clangrefactoringbackend-source.pri) include($$PWD/../../../src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri) diff --git a/tests/unit/unittest/diagnosticset-test.cpp b/tests/unit/unittest/diagnosticset-test.cpp index 007c8d2f5f6..7f67e8c2cae 100644 --- a/tests/unit/unittest/diagnosticset-test.cpp +++ b/tests/unit/unittest/diagnosticset-test.cpp @@ -27,7 +27,7 @@ #include "diagnosticcontainer-matcher.h" #include "testenvironment.h" -#include +#include #include #include #include diff --git a/tests/unit/unittest/highlightingmarks-test.cpp b/tests/unit/unittest/highlightingmarks-test.cpp index cbedd9d8445..16c7bc59e60 100644 --- a/tests/unit/unittest/highlightingmarks-test.cpp +++ b/tests/unit/unittest/highlightingmarks-test.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/unit/unittest/mockclangcodemodelclient.h b/tests/unit/unittest/mockclangcodemodelclient.h index 44283378520..47da03e33d1 100644 --- a/tests/unit/unittest/mockclangcodemodelclient.h +++ b/tests/unit/unittest/mockclangcodemodelclient.h @@ -27,8 +27,8 @@ #include "googletest.h" -#include -#include +#include +#include class MockClangCodeModelClient : public ClangBackEnd::ClangCodeModelClientInterface {