From 1402c067b1cf9c46c2e38190f243e44138deddbe Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@theqtcompany.com>
Date: Tue, 16 Jun 2015 11:56:00 +0200
Subject: [PATCH] Clang: Rename CodeModelBackEnd in ClangBackEnd
Change-Id: I13e8a458634110456375956d4d4da7239c86957f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
---
.gitignore | 2 +-
.../clangbackendipc-lib.pri} | 12 +-
src/libs/clangbackendipc/clangbackendipc.pro | 2 +
.../clangbackendipc.qbs} | 4 +-
.../clangbackendipc_dependencies.pri | 3 +
.../clangbackendipc_global.h} | 14 +-
.../cmbalivecommand.cpp | 2 +-
.../cmbalivecommand.h | 6 +-
.../cmbcodecompletedcommand.cpp | 4 +-
.../cmbcodecompletedcommand.h | 12 +-
.../cmbcommands.cpp | 4 +-
.../cmbcommands.h | 12 +-
.../cmbcompletecodecommand.cpp | 4 +-
.../cmbcompletecodecommand.h | 14 +-
.../cmbechocommand.cpp | 4 +-
.../cmbechocommand.h | 14 +-
.../cmbendcommand.cpp | 2 +-
.../cmbendcommand.h | 6 +-
...gisterprojectsforcodecompletioncommand.cpp | 6 +-
...registerprojectsforcodecompletioncommand.h | 12 +-
...anslationunitsforcodecompletioncommand.cpp | 6 +-
...translationunitsforcodecompletioncommand.h | 12 +-
...gisterprojectsforcodecompletioncommand.cpp | 6 +-
...registerprojectsforcodecompletioncommand.h | 14 +-
...anslationunitsforcodecompletioncommand.cpp | 10 +-
...translationunitsforcodecompletioncommand.h | 16 +-
.../codecompletion.cpp | 4 +-
.../codecompletion.h | 14 +-
.../codecompletionchunk.cpp | 4 +-
.../codecompletionchunk.h | 14 +-
.../connectionclient.cpp | 10 +-
.../connectionclient.h | 10 +-
.../connectionserver.cpp | 4 +-
.../connectionserver.h | 10 +-
.../container_common.h | 2 +-
.../filecontainer.cpp | 4 +-
.../filecontainer.h | 14 +-
.../ipcclientdispatcher.cpp | 4 +-
.../ipcclientdispatcher.h | 12 +-
.../ipcclientinterface.cpp | 14 +-
.../ipcclientinterface.h | 10 +-
.../ipcclientproxy.cpp | 4 +-
.../ipcclientproxy.h | 10 +-
.../ipcinterface.cpp | 4 +-
.../ipcinterface.h | 12 +-
.../ipcserver.cpp | 4 +-
.../ipcserver.h | 10 +-
.../ipcserverinterface.cpp | 16 +-
.../ipcserverinterface.h | 10 +-
.../ipcserverproxy.cpp | 4 +-
.../ipcserverproxy.h | 14 +-
.../projectpartcontainer.cpp | 4 +-
.../projectpartcontainer.h | 14 +-
.../projectpartsdonotexistcommand.cpp | 4 +-
.../projectpartsdonotexistcommand.h | 14 +-
.../readcommandblock.cpp | 4 +-
.../readcommandblock.h | 10 +-
.../translationunitdoesnotexistcommand.cpp | 4 +-
.../translationunitdoesnotexistcommand.h | 12 +-
.../writecommandblock.cpp | 4 +-
.../writecommandblock.h | 10 +-
.../codemodelbackendipc.pro | 2 -
.../codemodelbackendipc_dependencies.pri | 3 -
.../codemodelbackendipc_global.cpp | 37 ----
src/libs/libs.pro | 2 +-
src/libs/libs.qbs | 2 +-
...ion.cpp => clangbackendipcintegration.cpp} | 62 +++---
...gration.h => clangbackendipcintegration.h} | 40 ++--
src/plugins/clangcodemodel/clangcodemodel.pro | 4 +-
src/plugins/clangcodemodel/clangcodemodel.qbs | 6 +-
.../clangcodemodel_dependencies.pri | 2 +-
.../clangcodemodel/clangcompletion.cpp | 2 +-
src/plugins/clangcodemodel/clangcompletion.h | 12 +-
.../clangeditordocumentprocessor.cpp | 2 +-
.../clangmodelmanagersupport.cpp | 8 +-
.../completionchunkstotextconverter.cpp | 10 +-
.../completionchunkstotextconverter.h | 10 +-
.../test/clangcodecompletion_test.cpp | 16 +-
.../clangbackend.pri} | 8 +-
.../clangbackend.pro} | 2 +-
.../clangbackend.qbs} | 6 +-
.../clangbackendmain.cpp} | 8 +-
.../clangbackendclangipc-source.pri} | 0
.../ipcsource/clangcodecompleteresults.cpp | 4 +-
.../ipcsource/clangcodecompleteresults.h | 10 +-
.../ipcsource/clangipcserver.cpp | 8 +-
.../ipcsource/clangipcserver.h | 4 +-
.../ipcsource/clangstring.cpp | 4 +-
.../ipcsource/clangstring.h | 10 +-
.../ipcsource/codecompletefailedexception.cpp | 0
.../ipcsource/codecompletefailedexception.h | 0
.../ipcsource/codecompleter.cpp | 4 +-
.../ipcsource/codecompleter.h | 10 +-
.../codecompletionchunkconverter.cpp | 4 +-
.../ipcsource/codecompletionchunkconverter.h | 10 +-
.../ipcsource/codecompletionsextractor.cpp | 8 +-
.../ipcsource/codecompletionsextractor.h | 12 +-
.../ipcsource/projectpart.cpp | 4 +-
.../ipcsource/projectpart.h | 10 +-
.../projectpartsdonotexistexception.cpp | 4 +-
.../projectpartsdonotexistexception.h | 10 +-
.../ipcsource/projects.cpp | 4 +-
.../ipcsource/projects.h | 10 +-
.../ipcsource/translationunit.cpp | 4 +-
.../ipcsource/translationunit.h | 10 +-
.../translationunitdoesnotexistexception.cpp | 4 +-
.../translationunitdoesnotexistexception.h | 10 +-
.../translationunitfilenotexitexception.cpp | 4 +-
.../translationunitfilenotexitexception.h | 10 +-
.../translationunitisnullexception.cpp | 4 +-
.../translationunitisnullexception.h | 10 +-
.../translationunitparseerrorexception.cpp | 4 +-
.../translationunitparseerrorexception.h | 10 +-
.../ipcsource/translationunits.cpp | 6 +-
.../ipcsource/translationunits.h | 10 +-
.../ipcsource/unsavedfiles.cpp | 4 +-
.../ipcsource/unsavedfiles.h | 10 +-
.../ipcsource/projectcontainer.cpp | 99 ---------
.../ipcsource/projectcontainer.h | 73 -------
src/tools/tools.pro | 2 +-
src/tools/tools.qbs | 2 +-
.../echoserver/echoipcserver.cpp | 4 +-
.../echoserver/echoipcserver.h | 12 +-
.../echoserver/echoserver.pro | 6 +-
.../echoserver/echoserverprocessmain.cpp | 6 +-
.../codemodelbackend.pro => unit.pro} | 0
.../unittest/clangcodecompleteresultstest.cpp | 8 +-
.../unittest/clangipcservertest.cpp | 24 +--
.../unittest/clangstringtest.cpp | 2 +-
.../unittest/clientserverinprocesstest.cpp | 32 +--
.../unittest/clientserveroutsideprocess.cpp | 18 +-
.../unittest/codecompletionsextractortest.cpp | 192 +++++++++---------
.../unittest/codecompletiontest.cpp | 24 +--
.../completionchunkstotextconvertertest.cpp | 2 +-
.../createtablesqlstatementbuildertest.cpp | 0
.../unittest/data/complete_completer.cpp | 0
.../data/complete_completer_unsaved.cpp | 0
.../data/complete_extractor_class.cpp | 0
.../data/complete_extractor_constructor.cpp | 0
.../data/complete_extractor_enumeration.cpp | 0
.../data/complete_extractor_function.cpp | 0
.../complete_extractor_function_unsaved.cpp | 0
.../complete_extractor_function_unsaved_2.cpp | 0
.../data/complete_extractor_namespace.cpp | 0
.../data/complete_extractor_variable.cpp | 0
.../unittest/data/complete_testfile_1.cpp | 0
.../complete_translationunit_parse_error.cpp | 0
.../unittest/gtest-qt-printing.cpp | 0
.../unittest/gtest-qt-printing.h | 0
.../{codemodelbackend => }/unittest/main.cpp | 2 +-
.../unittest/mockipclient.h | 10 +-
.../unittest/mockipcserver.h | 12 +-
.../unittest/projecttest.cpp | 58 +++---
.../unittest/readandwritecommandblocktest.cpp | 48 ++---
.../unittest/spydummy.cpp | 0
.../unittest/spydummy.h | 0
.../unittest/sqlitecolumntest.cpp | 0
.../unittest/sqlitedatabasebackendtest.cpp | 0
.../unittest/sqlitedatabasetest.cpp | 0
.../unittest/sqlitestatementtest.cpp | 0
.../unittest/sqlitetabletest.cpp | 0
.../unittest/sqlstatementbuildertest.cpp | 0
.../unittest/translationunitstest.cpp | 44 ++--
.../unittest/translationunittest.cpp | 16 +-
.../unittest/unittest.pro | 20 +-
.../unittest/unsavedfilestest.cpp | 8 +-
.../unittest/utf8test.cpp | 0
167 files changed, 745 insertions(+), 954 deletions(-)
rename src/libs/{codemodelbackendipc/codemodelbackendipc-lib.pri => clangbackendipc/clangbackendipc-lib.pri} (89%)
create mode 100644 src/libs/clangbackendipc/clangbackendipc.pro
rename src/libs/{codemodelbackendipc/codemodelbackendipc.qbs => clangbackendipc/clangbackendipc.qbs} (80%)
create mode 100644 src/libs/clangbackendipc/clangbackendipc_dependencies.pri
rename src/libs/{codemodelbackendipc/codemodelbackendipc_global.h => clangbackendipc/clangbackendipc_global.h} (86%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbalivecommand.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbalivecommand.h (94%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbcodecompletedcommand.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbcodecompletedcommand.h (92%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbcommands.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbcommands.h (88%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbcompletecodecommand.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbcompletecodecommand.h (91%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbechocommand.cpp (97%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbechocommand.h (90%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbendcommand.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbendcommand.h (94%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbregisterprojectsforcodecompletioncommand.cpp (97%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbregisterprojectsforcodecompletioncommand.h (90%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbregistertranslationunitsforcodecompletioncommand.cpp (97%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbregistertranslationunitsforcodecompletioncommand.h (91%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbunregisterprojectsforcodecompletioncommand.cpp (97%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbunregisterprojectsforcodecompletioncommand.h (89%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbunregistertranslationunitsforcodecompletioncommand.cpp (95%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/cmbunregistertranslationunitsforcodecompletioncommand.h (88%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/codecompletion.cpp (99%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/codecompletion.h (94%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/codecompletionchunk.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/codecompletionchunk.h (91%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/connectionclient.cpp (96%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/connectionclient.h (94%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/connectionserver.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/connectionserver.h (92%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/container_common.h (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/filecontainer.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/filecontainer.h (91%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcclientdispatcher.cpp (97%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcclientdispatcher.h (87%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcclientinterface.cpp (86%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcclientinterface.h (92%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcclientproxy.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcclientproxy.h (92%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcinterface.cpp (96%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcinterface.h (88%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcserver.cpp (96%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcserver.h (90%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcserverinterface.cpp (86%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcserverinterface.h (92%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcserverproxy.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/ipcserverproxy.h (89%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/projectpartcontainer.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/projectpartcontainer.h (90%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/projectpartsdonotexistcommand.cpp (97%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/projectpartsdonotexistcommand.h (90%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/readcommandblock.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/readcommandblock.h (91%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/translationunitdoesnotexistcommand.cpp (98%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/translationunitdoesnotexistcommand.h (91%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/writecommandblock.cpp (97%)
rename src/libs/{codemodelbackendipc => clangbackendipc}/writecommandblock.h (90%)
delete mode 100644 src/libs/codemodelbackendipc/codemodelbackendipc.pro
delete mode 100644 src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri
delete mode 100644 src/libs/codemodelbackendipc/codemodelbackendipc_global.cpp
rename src/plugins/clangcodemodel/{codemodelbackendipcintegration.cpp => clangbackendipcintegration.cpp} (85%)
rename src/plugins/clangcodemodel/{codemodelbackendipcintegration.h => clangbackendipcintegration.h} (74%)
rename src/tools/{codemodelbackend/codemodelbackend.pri => clangbackend/clangbackend.pri} (71%)
rename src/tools/{codemodelbackend/codemodelbackend.pro => clangbackend/clangbackend.pro} (78%)
rename src/tools/{codemodelbackend/codemodelbackend.qbs => clangbackend/clangbackend.qbs} (85%)
rename src/tools/{codemodelbackend/codemodelbackendmain.cpp => clangbackend/clangbackendmain.cpp} (89%)
rename src/tools/{codemodelbackend/ipcsource/codemodelbackendclangipc-source.pri => clangbackend/ipcsource/clangbackendclangipc-source.pri} (100%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/clangcodecompleteresults.cpp (97%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/clangcodecompleteresults.h (91%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/clangipcserver.cpp (94%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/clangipcserver.h (97%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/clangstring.cpp (97%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/clangstring.h (91%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/codecompletefailedexception.cpp (100%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/codecompletefailedexception.h (100%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/codecompleter.cpp (97%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/codecompleter.h (91%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/codecompletionchunkconverter.cpp (98%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/codecompletionchunkconverter.h (90%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/codecompletionsextractor.cpp (98%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/codecompletionsextractor.h (91%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/projectpart.cpp (98%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/projectpart.h (93%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/projectpartsdonotexistexception.cpp (97%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/projectpartsdonotexistexception.h (89%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/projects.cpp (98%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/projects.h (92%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunit.cpp (99%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunit.h (94%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunitdoesnotexistexception.cpp (97%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunitdoesnotexistexception.h (90%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunitfilenotexitexception.cpp (97%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunitfilenotexitexception.h (89%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunitisnullexception.cpp (96%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunitisnullexception.h (88%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunitparseerrorexception.cpp (97%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunitparseerrorexception.h (89%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunits.cpp (98%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/translationunits.h (93%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/unsavedfiles.cpp (98%)
rename src/tools/{codemodelbackend => clangbackend}/ipcsource/unsavedfiles.h (94%)
delete mode 100644 src/tools/codemodelbackend/ipcsource/projectcontainer.cpp
delete mode 100644 src/tools/codemodelbackend/ipcsource/projectcontainer.h
rename tests/unit/{codemodelbackend => }/echoserver/echoipcserver.cpp (98%)
rename tests/unit/{codemodelbackend => }/echoserver/echoipcserver.h (91%)
rename tests/unit/{codemodelbackend => }/echoserver/echoserver.pro (67%)
rename tests/unit/{codemodelbackend => }/echoserver/echoserverprocessmain.cpp (92%)
rename tests/unit/{codemodelbackend/codemodelbackend.pro => unit.pro} (100%)
rename tests/unit/{codemodelbackend => }/unittest/clangcodecompleteresultstest.cpp (95%)
rename tests/unit/{codemodelbackend => }/unittest/clangipcservertest.cpp (96%)
rename tests/unit/{codemodelbackend => }/unittest/clangstringtest.cpp (98%)
rename tests/unit/{codemodelbackend => }/unittest/clientserverinprocesstest.cpp (79%)
rename tests/unit/{codemodelbackend => }/unittest/clientserveroutsideprocess.cpp (85%)
rename tests/unit/{codemodelbackend => }/unittest/codecompletionsextractortest.cpp (76%)
rename tests/unit/{codemodelbackend => }/unittest/codecompletiontest.cpp (86%)
rename tests/unit/{codemodelbackend => }/unittest/completionchunkstotextconvertertest.cpp (99%)
rename tests/unit/{codemodelbackend => }/unittest/createtablesqlstatementbuildertest.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_completer.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_completer_unsaved.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_extractor_class.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_extractor_constructor.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_extractor_enumeration.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_extractor_function.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_extractor_function_unsaved.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_extractor_function_unsaved_2.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_extractor_namespace.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_extractor_variable.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_testfile_1.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/data/complete_translationunit_parse_error.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/gtest-qt-printing.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/gtest-qt-printing.h (100%)
rename tests/unit/{codemodelbackend => }/unittest/main.cpp (97%)
rename tests/unit/{codemodelbackend => }/unittest/mockipclient.h (83%)
rename tests/unit/{codemodelbackend => }/unittest/mockipcserver.h (80%)
rename tests/unit/{codemodelbackend => }/unittest/projecttest.cpp (67%)
rename tests/unit/{codemodelbackend => }/unittest/readandwritecommandblocktest.cpp (72%)
rename tests/unit/{codemodelbackend => }/unittest/spydummy.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/spydummy.h (100%)
rename tests/unit/{codemodelbackend => }/unittest/sqlitecolumntest.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/sqlitedatabasebackendtest.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/sqlitedatabasetest.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/sqlitestatementtest.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/sqlitetabletest.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/sqlstatementbuildertest.cpp (100%)
rename tests/unit/{codemodelbackend => }/unittest/translationunitstest.cpp (73%)
rename tests/unit/{codemodelbackend => }/unittest/translationunittest.cpp (89%)
rename tests/unit/{codemodelbackend => }/unittest/unittest.pro (80%)
rename tests/unit/{codemodelbackend => }/unittest/unsavedfilestest.cpp (96%)
rename tests/unit/{codemodelbackend => }/unittest/utf8test.cpp (100%)
diff --git a/.gitignore b/.gitignore
index 5efdf6e49f0..1242e01ea6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,7 +117,7 @@ tmp/
*.dll
*.exe
/bin/buildoutputparser
-/bin/codemodelbackend
+/bin/clangbackend
/bin/cpaster
/bin/cplusplus-ast2png
/bin/cplusplus-frontend
diff --git a/src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri b/src/libs/clangbackendipc/clangbackendipc-lib.pri
similarity index 89%
rename from src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri
rename to src/libs/clangbackendipc/clangbackendipc-lib.pri
index 8e1ff2fdb9f..ed1a01d6f3a 100644
--- a/src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri
+++ b/src/libs/clangbackendipc/clangbackendipc-lib.pri
@@ -1,12 +1,12 @@
contains(CONFIG, dll) {
- DEFINES += CODEMODELBACKENDIPC_BUILD_LIB
+ DEFINES += CLANGBACKENDIPC_BUILD_LIB
} else {
- DEFINES += CODEMODELBACKENDIPC_BUILD_STATIC_LIB
+ DEFINES += CLANGBACKENDIPC_BUILD_STATIC_LIB
}
QT += network
-DEFINES += CODEMODELBACKENDIPC_LIBRARY
+DEFINES += CLANGBACKENDIPC_LIBRARY
INCLUDEPATH += $$PWD
@@ -31,7 +31,6 @@ SOURCES += $$PWD/ipcserverinterface.cpp \
$$PWD/cmbcompletecodecommand.cpp \
$$PWD/cmbcodecompletedcommand.cpp \
$$PWD/codecompletion.cpp \
- $$PWD/codemodelbackendipc_global.cpp \
$$PWD/cmbregisterprojectsforcodecompletioncommand.cpp \
$$PWD/cmbunregisterprojectsforcodecompletioncommand.cpp \
$$PWD/translationunitdoesnotexistcommand.cpp \
@@ -40,7 +39,7 @@ SOURCES += $$PWD/ipcserverinterface.cpp \
$$PWD/projectpartsdonotexistcommand.cpp
-HEADERS += $$PWD/codemodelbackendipc_global.h \
+HEADERS += \
$$PWD/ipcserverinterface.h \
$$PWD/ipcserverproxy.h \
$$PWD/ipcserver.h \
@@ -68,6 +67,7 @@ HEADERS += $$PWD/codemodelbackendipc_global.h \
$$PWD/codecompletionchunk.h \
$$PWD/projectpartcontainer.h \
$$PWD/projectpartsdonotexistcommand.h \
- $$PWD/container_common.h
+ $$PWD/container_common.h \
+ $$PWD/clangbackendipc_global.h
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
diff --git a/src/libs/clangbackendipc/clangbackendipc.pro b/src/libs/clangbackendipc/clangbackendipc.pro
new file mode 100644
index 00000000000..e5997d06881
--- /dev/null
+++ b/src/libs/clangbackendipc/clangbackendipc.pro
@@ -0,0 +1,2 @@
+include(../../qtcreatorlibrary.pri)
+include(clangbackendipc-lib.pri)
diff --git a/src/libs/codemodelbackendipc/codemodelbackendipc.qbs b/src/libs/clangbackendipc/clangbackendipc.qbs
similarity index 80%
rename from src/libs/codemodelbackendipc/codemodelbackendipc.qbs
rename to src/libs/clangbackendipc/clangbackendipc.qbs
index 7d086155864..0ffe8cacb2b 100644
--- a/src/libs/codemodelbackendipc/codemodelbackendipc.qbs
+++ b/src/libs/clangbackendipc/clangbackendipc.qbs
@@ -1,12 +1,12 @@
import qbs 1.0
QtcLibrary {
- name: "CodeModelBackEndIpc"
+ name: "ClangBackEndIpc"
Depends { name: "Qt.network" }
Depends { name: "Sqlite" }
- cpp.defines: base.concat("CODEMODELBACKENDIPC_LIBRARY")
+ cpp.defines: base.concat("CLANGIPC_LIBRARY")
cpp.includePaths: base.concat(".")
Group {
diff --git a/src/libs/clangbackendipc/clangbackendipc_dependencies.pri b/src/libs/clangbackendipc/clangbackendipc_dependencies.pri
new file mode 100644
index 00000000000..4813d6ce77e
--- /dev/null
+++ b/src/libs/clangbackendipc/clangbackendipc_dependencies.pri
@@ -0,0 +1,3 @@
+QTC_LIB_NAME = Clangbackendipc
+QTC_LIB_DEPENDS += sqlite
+INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/clangbackendipc
diff --git a/src/libs/codemodelbackendipc/codemodelbackendipc_global.h b/src/libs/clangbackendipc/clangbackendipc_global.h
similarity index 86%
rename from src/libs/codemodelbackendipc/codemodelbackendipc_global.h
rename to src/libs/clangbackendipc/clangbackendipc_global.h
index 5a7d6cc3827..38b20faf423 100644
--- a/src/libs/codemodelbackendipc/codemodelbackendipc_global.h
+++ b/src/libs/clangbackendipc/clangbackendipc_global.h
@@ -28,23 +28,23 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKENDIPC_GLOBAL_H
-#define CODEMODELBACKENDIPC_GLOBAL_H
+#ifndef CLANGBACKENDIPC_GLOBAL_H
+#define CLANGBACKENDIPC_GLOBAL_H
#include <QtCore/qglobal.h>
-#if defined(CODEMODELBACKENDIPC_LIBRARY)
+#if defined(CLANGBACKENDIPC_LIBRARY)
# define CMBIPC_EXPORT Q_DECL_EXPORT
#else
# define CMBIPC_EXPORT Q_DECL_IMPORT
#endif
-#ifndef CODEMODELBACKENDPROCESSPATH
-# define CODEMODELBACKENDPROCESSPATH ""
+#ifndef CLANGBACKENDPROCESSPATH
+# define CLANGBACKENDPROCESSPATH ""
#endif
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
CMBIPC_EXPORT void registerTypes();
}
-#endif // CODEMODELBACKENDIPC_GLOBAL_H
+#endif // CLANGBACKENDIPC_GLOBAL_H
diff --git a/src/libs/codemodelbackendipc/cmbalivecommand.cpp b/src/libs/clangbackendipc/cmbalivecommand.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/cmbalivecommand.cpp
rename to src/libs/clangbackendipc/cmbalivecommand.cpp
index 636c801c9c1..9be8d30745a 100644
--- a/src/libs/codemodelbackendipc/cmbalivecommand.cpp
+++ b/src/libs/clangbackendipc/cmbalivecommand.cpp
@@ -34,7 +34,7 @@
#include <QDataStream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
QDataStream &operator<<(QDataStream &out, const AliveCommand &/*command*/)
{
diff --git a/src/libs/codemodelbackendipc/cmbalivecommand.h b/src/libs/clangbackendipc/cmbalivecommand.h
similarity index 94%
rename from src/libs/codemodelbackendipc/cmbalivecommand.h
rename to src/libs/clangbackendipc/cmbalivecommand.h
index 1bfae90b912..5ddb747fa9b 100644
--- a/src/libs/codemodelbackendipc/cmbalivecommand.h
+++ b/src/libs/clangbackendipc/cmbalivecommand.h
@@ -31,11 +31,11 @@
#ifndef CMBALIVECOMMAND_H
#define CMBALIVECOMMAND_H
-#include "codemodelbackendipc_global.h"
+#include "clangbackendipc_global.h"
#include <QMetaType>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT AliveCommand
{
@@ -50,6 +50,6 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const AliveCommand &command);
}
-Q_DECLARE_METATYPE(CodeModelBackEnd::AliveCommand)
+Q_DECLARE_METATYPE(ClangBackEnd::AliveCommand)
#endif // CMBALIVECOMMAND_H
diff --git a/src/libs/codemodelbackendipc/cmbcodecompletedcommand.cpp b/src/libs/clangbackendipc/cmbcodecompletedcommand.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/cmbcodecompletedcommand.cpp
rename to src/libs/clangbackendipc/cmbcodecompletedcommand.cpp
index 34b53b6aaa0..75473fd34d9 100644
--- a/src/libs/codemodelbackendipc/cmbcodecompletedcommand.cpp
+++ b/src/libs/clangbackendipc/cmbcodecompletedcommand.cpp
@@ -36,7 +36,7 @@
#include <ostream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
CodeCompletedCommand::CodeCompletedCommand(const QVector<CodeCompletion> &codeCompletions, quint64 ticketNumber)
: codeCompletions_(codeCompletions),
@@ -102,5 +102,5 @@ void PrintTo(const CodeCompletedCommand &command, ::std::ostream* os)
*os << output.toUtf8().constData();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/cmbcodecompletedcommand.h b/src/libs/clangbackendipc/cmbcodecompletedcommand.h
similarity index 92%
rename from src/libs/codemodelbackendipc/cmbcodecompletedcommand.h
rename to src/libs/clangbackendipc/cmbcodecompletedcommand.h
index 6e6a70875b7..c6e6b87685f 100644
--- a/src/libs/codemodelbackendipc/cmbcodecompletedcommand.h
+++ b/src/libs/clangbackendipc/cmbcodecompletedcommand.h
@@ -28,15 +28,15 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_CODECOMPLETEDCOMMAND_H
-#define CODEMODELBACKEND_CODECOMPLETEDCOMMAND_H
+#ifndef CLANGBACKEND_CODECOMPLETEDCOMMAND_H
+#define CLANGBACKEND_CODECOMPLETEDCOMMAND_H
#include <QMetaType>
#include <QVector>
#include "codecompletion.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT CodeCompletedCommand
{
@@ -67,8 +67,8 @@ CMBIPC_EXPORT bool operator<(const CodeCompletedCommand &first, const CodeComple
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedCommand &command);
void PrintTo(const CodeCompletedCommand &command, ::std::ostream* os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::CodeCompletedCommand)
+Q_DECLARE_METATYPE(ClangBackEnd::CodeCompletedCommand)
-#endif // CODEMODELBACKEND_CODECOMPLETEDCOMMAND_H
+#endif // CLANGBACKEND_CODECOMPLETEDCOMMAND_H
diff --git a/src/libs/codemodelbackendipc/cmbcommands.cpp b/src/libs/clangbackendipc/cmbcommands.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/cmbcommands.cpp
rename to src/libs/clangbackendipc/cmbcommands.cpp
index 7a817f09df5..169df082461 100644
--- a/src/libs/codemodelbackendipc/cmbcommands.cpp
+++ b/src/libs/clangbackendipc/cmbcommands.cpp
@@ -44,7 +44,7 @@
#include <QDataStream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
void Commands::registerCommands()
{
@@ -104,5 +104,5 @@ void Commands::registerCommands()
QMetaType::registerComparators<ProjectPartsDoNotExistCommand>();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/cmbcommands.h b/src/libs/clangbackendipc/cmbcommands.h
similarity index 88%
rename from src/libs/codemodelbackendipc/cmbcommands.h
rename to src/libs/clangbackendipc/cmbcommands.h
index 08119d9fdf5..7cad34ced43 100644
--- a/src/libs/codemodelbackendipc/cmbcommands.h
+++ b/src/libs/clangbackendipc/cmbcommands.h
@@ -28,18 +28,18 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_COMMANDS_H
-#define CODEMODELBACKEND_COMMANDS_H
+#ifndef CLANGBACKEND_COMMANDS_H
+#define CLANGBACKEND_COMMANDS_H
-#include <codemodelbackendipc_global.h>
+#include <clangbackendipc_global.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
namespace Commands
{
CMBIPC_EXPORT void registerCommands();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_COMMANDS_H
+#endif // CLANGBACKEND_COMMANDS_H
diff --git a/src/libs/codemodelbackendipc/cmbcompletecodecommand.cpp b/src/libs/clangbackendipc/cmbcompletecodecommand.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/cmbcompletecodecommand.cpp
rename to src/libs/clangbackendipc/cmbcompletecodecommand.cpp
index d41121be5e0..cbf242582b2 100644
--- a/src/libs/codemodelbackendipc/cmbcompletecodecommand.cpp
+++ b/src/libs/clangbackendipc/cmbcompletecodecommand.cpp
@@ -36,7 +36,7 @@
#include <ostream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
quint64 CompleteCodeCommand::ticketCounter = 0;
@@ -142,5 +142,5 @@ void PrintTo(const CompleteCodeCommand &command, ::std::ostream* os)
*os << ")";
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/cmbcompletecodecommand.h b/src/libs/clangbackendipc/cmbcompletecodecommand.h
similarity index 91%
rename from src/libs/codemodelbackendipc/cmbcompletecodecommand.h
rename to src/libs/clangbackendipc/cmbcompletecodecommand.h
index c24f9365cc5..545c6ab926b 100644
--- a/src/libs/codemodelbackendipc/cmbcompletecodecommand.h
+++ b/src/libs/clangbackendipc/cmbcompletecodecommand.h
@@ -28,15 +28,15 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_COMPLETECODECOMMAND_H
-#define CODEMODELBACKEND_COMPLETECODECOMMAND_H
+#ifndef CLANGBACKEND_COMPLETECODECOMMAND_H
+#define CLANGBACKEND_COMPLETECODECOMMAND_H
-#include "codemodelbackendipc_global.h"
+#include "clangbackendipc_global.h"
#include <QMetaType>
#include <utf8string.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT CompleteCodeCommand
{
@@ -79,8 +79,8 @@ CMBIPC_EXPORT bool operator<(const CompleteCodeCommand &first, const CompleteCod
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeCommand &command);
void PrintTo(const CompleteCodeCommand &command, ::std::ostream* os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::CompleteCodeCommand)
+Q_DECLARE_METATYPE(ClangBackEnd::CompleteCodeCommand)
-#endif // CODEMODELBACKEND_COMPLETECODECOMMAND_H
+#endif // CLANGBACKEND_COMPLETECODECOMMAND_H
diff --git a/src/libs/codemodelbackendipc/cmbechocommand.cpp b/src/libs/clangbackendipc/cmbechocommand.cpp
similarity index 97%
rename from src/libs/codemodelbackendipc/cmbechocommand.cpp
rename to src/libs/clangbackendipc/cmbechocommand.cpp
index 5db788893cd..812c6f24e68 100644
--- a/src/libs/codemodelbackendipc/cmbechocommand.cpp
+++ b/src/libs/clangbackendipc/cmbechocommand.cpp
@@ -36,7 +36,7 @@
#include <ostream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
EchoCommand::EchoCommand(const QVariant &command)
: command_(command)
@@ -88,5 +88,5 @@ void PrintTo(const EchoCommand &command, ::std::ostream* os)
*os << output.toUtf8().constData();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/cmbechocommand.h b/src/libs/clangbackendipc/cmbechocommand.h
similarity index 90%
rename from src/libs/codemodelbackendipc/cmbechocommand.h
rename to src/libs/clangbackendipc/cmbechocommand.h
index 3f2c59b41b8..73660ea484a 100644
--- a/src/libs/codemodelbackendipc/cmbechocommand.h
+++ b/src/libs/clangbackendipc/cmbechocommand.h
@@ -28,15 +28,15 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_ECHOCOMMAND_H
-#define CODEMODELBACKEND_ECHOCOMMAND_H
+#ifndef CLANGBACKEND_ECHOCOMMAND_H
+#define CLANGBACKEND_ECHOCOMMAND_H
-#include "codemodelbackendipc_global.h"
+#include "clangbackendipc_global.h"
#include <QMetaType>
#include <QVariant>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT EchoCommand
{
@@ -61,8 +61,8 @@ CMBIPC_EXPORT bool operator<(const EchoCommand &first, const EchoCommand &second
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EchoCommand &command);
void PrintTo(const EchoCommand &command, ::std::ostream* os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::EchoCommand)
+Q_DECLARE_METATYPE(ClangBackEnd::EchoCommand)
-#endif // CODEMODELBACKEND_ECHOCOMMAND_H
+#endif // CLANGBACKEND_ECHOCOMMAND_H
diff --git a/src/libs/codemodelbackendipc/cmbendcommand.cpp b/src/libs/clangbackendipc/cmbendcommand.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/cmbendcommand.cpp
rename to src/libs/clangbackendipc/cmbendcommand.cpp
index 43df8e20d0a..e99a50137bb 100644
--- a/src/libs/codemodelbackendipc/cmbendcommand.cpp
+++ b/src/libs/clangbackendipc/cmbendcommand.cpp
@@ -36,7 +36,7 @@
#include <ostream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
QDataStream &operator<<(QDataStream &out, const EndCommand &/*command*/)
{
diff --git a/src/libs/codemodelbackendipc/cmbendcommand.h b/src/libs/clangbackendipc/cmbendcommand.h
similarity index 94%
rename from src/libs/codemodelbackendipc/cmbendcommand.h
rename to src/libs/clangbackendipc/cmbendcommand.h
index f5a4e53376f..418e7abdfe5 100644
--- a/src/libs/codemodelbackendipc/cmbendcommand.h
+++ b/src/libs/clangbackendipc/cmbendcommand.h
@@ -31,11 +31,11 @@
#ifndef CMBENDCOMMAND_H
#define CMBENDCOMMAND_H
-#include "codemodelbackendipc_global.h"
+#include "clangbackendipc_global.h"
#include <QMetaType>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT EndCommand
{
@@ -50,6 +50,6 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EndCommand &command);
void PrintTo(const EndCommand &command, ::std::ostream* os);
}
-Q_DECLARE_METATYPE(CodeModelBackEnd::EndCommand)
+Q_DECLARE_METATYPE(ClangBackEnd::EndCommand)
#endif // CMBENDCOMMAND_H
diff --git a/src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp b/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp
similarity index 97%
rename from src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp
rename to src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp
index e02997748f2..83e582f7e28 100644
--- a/src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp
+++ b/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp
@@ -38,9 +38,9 @@
#include <algorithm>
-#include <container_common.h>
+#include "container_common.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
RegisterProjectPartsForCodeCompletionCommand::RegisterProjectPartsForCodeCompletionCommand(const QVector<ProjectPartContainer> &projectContainers)
:projectContainers_(projectContainers)
@@ -98,5 +98,5 @@ void PrintTo(const RegisterProjectPartsForCodeCompletionCommand &command, ::std:
*os << ")";
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.h b/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.h
similarity index 90%
rename from src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.h
rename to src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.h
index 6533ae190bc..8902181a1ce 100644
--- a/src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.h
+++ b/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.h
@@ -28,15 +28,15 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
-#define CODEMODELBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
+#ifndef CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
+#define CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
#include <QMetaType>
#include <QVector>
#include "projectpartcontainer.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT RegisterProjectPartsForCodeCompletionCommand
{
@@ -62,8 +62,8 @@ CMBIPC_EXPORT bool operator<(const RegisterProjectPartsForCodeCompletionCommand
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForCodeCompletionCommand &command);
void PrintTo(const RegisterProjectPartsForCodeCompletionCommand &command, ::std::ostream* os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::RegisterProjectPartsForCodeCompletionCommand)
+Q_DECLARE_METATYPE(ClangBackEnd::RegisterProjectPartsForCodeCompletionCommand)
-#endif // CODEMODELBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
+#endif // CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
diff --git a/src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp b/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp
similarity index 97%
rename from src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp
rename to src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp
index a21b53f5fa2..39b3d083dbf 100644
--- a/src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp
+++ b/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp
@@ -36,9 +36,9 @@
#include <ostream>
-#include <container_common.h>
+#include "container_common.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
RegisterTranslationUnitForCodeCompletionCommand::RegisterTranslationUnitForCodeCompletionCommand(const QVector<FileContainer> &fileContainers)
: fileContainers_(fileContainers)
@@ -96,5 +96,5 @@ void PrintTo(const RegisterTranslationUnitForCodeCompletionCommand &command, ::s
*os << ")";
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h b/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h
similarity index 91%
rename from src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h
rename to src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h
index 588ad421d75..e598b0cdb59 100644
--- a/src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h
+++ b/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h
@@ -28,15 +28,15 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_REGISTERFILEFORCODECOMPLETION_H
-#define CODEMODELBACKEND_REGISTERFILEFORCODECOMPLETION_H
+#ifndef CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
+#define CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
#include <qmetatype.h>
#include <QVector>
#include "filecontainer.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT RegisterTranslationUnitForCodeCompletionCommand
{
@@ -62,8 +62,8 @@ CMBIPC_EXPORT bool operator<(const RegisterTranslationUnitForCodeCompletionComma
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterTranslationUnitForCodeCompletionCommand &command);
void PrintTo(const RegisterTranslationUnitForCodeCompletionCommand &command, ::std::ostream* os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::RegisterTranslationUnitForCodeCompletionCommand)
+Q_DECLARE_METATYPE(ClangBackEnd::RegisterTranslationUnitForCodeCompletionCommand)
-#endif // CODEMODELBACKEND_REGISTERFILEFORCODECOMPLITION_H
+#endif // CLANGBACKEND_REGISTERFILEFORCODECOMPLITION_H
diff --git a/src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp
similarity index 97%
rename from src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp
rename to src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp
index 0d6f2ddea06..6abb3b45ebc 100644
--- a/src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp
+++ b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp
@@ -36,9 +36,9 @@
#include <ostream>
-#include <container_common.h>
+#include "container_common.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
UnregisterProjectPartsForCodeCompletionCommand::UnregisterProjectPartsForCodeCompletionCommand(const Utf8StringVector &filePaths)
@@ -97,5 +97,5 @@ void PrintTo(const UnregisterProjectPartsForCodeCompletionCommand &command, ::st
*os << ")";
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.h b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.h
similarity index 89%
rename from src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.h
rename to src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.h
index a28998afb2f..59bf8ce5c58 100644
--- a/src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.h
+++ b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.h
@@ -28,16 +28,16 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_UNREGISTERPROJECTSFORCODECOMPLETION_H
-#define CODEMODELBACKEND_UNREGISTERPROJECTSFORCODECOMPLETION_H
+#ifndef CLANGBACKEND_UNREGISTERPROJECTSFORCODECOMPLETION_H
+#define CLANGBACKEND_UNREGISTERPROJECTSFORCODECOMPLETION_H
-#include "codemodelbackendipc_global.h"
+#include "clangbackendipc_global.h"
#include <utf8stringvector.h>
#include <QMetaType>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT UnregisterProjectPartsForCodeCompletionCommand
{
@@ -64,8 +64,8 @@ CMBIPC_EXPORT bool operator<(const UnregisterProjectPartsForCodeCompletionComman
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterProjectPartsForCodeCompletionCommand &command);
void PrintTo(const UnregisterProjectPartsForCodeCompletionCommand &command, ::std::ostream* os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand)
+Q_DECLARE_METATYPE(ClangBackEnd::UnregisterProjectPartsForCodeCompletionCommand)
-#endif // CODEMODELBACKEND_UNREGISTERPROJECTSFORCODECOMPLETION_H
+#endif // CLANGBACKEND_UNREGISTERPROJECTSFORCODECOMPLETION_H
diff --git a/src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp b/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp
similarity index 95%
rename from src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp
rename to src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp
index 27d905c00eb..cf19c18a7cc 100644
--- a/src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp
+++ b/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp
@@ -32,15 +32,15 @@
#include <QtDebug>
-#ifdef CODEMODELBACKEND_TESTS
+#ifdef CLANGBACKEND_TESTS
#include <gtest/gtest-printers.h>
#endif
#include <QDataStream>
-#include <container_common.h>
+#include "container_common.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
UnregisterTranslationUnitsForCodeCompletionCommand::UnregisterTranslationUnitsForCodeCompletionCommand(const QVector<FileContainer> &fileContainers)
@@ -89,7 +89,7 @@ QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForCodeCompletio
return debug;
}
-#ifdef CODEMODELBACKEND_TESTS
+#ifdef CLANGBACKEND_TESTS
void PrintTo(const UnregisterTranslationUnitsForCodeCompletionCommand &command, ::std::ostream* os)
{
*os << "UnregisterTranslationUnitsForCodeCompletionCommand(";
@@ -102,5 +102,5 @@ void PrintTo(const UnregisterTranslationUnitsForCodeCompletionCommand &command,
#endif
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h b/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h
similarity index 88%
rename from src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h
rename to src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h
index e1593aaf049..327dd99556f 100644
--- a/src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h
+++ b/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h
@@ -28,17 +28,17 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_UNRegisterTranslationUnitForCodeCompletionCommand_H
-#define CODEMODELBACKEND_UNRegisterTranslationUnitForCodeCompletionCommand_H
+#ifndef CLANGBACKEND_UNRegisterTranslationUnitForCodeCompletionCommand_H
+#define CLANGBACKEND_UNRegisterTranslationUnitForCodeCompletionCommand_H
-#include "codemodelbackendipc_global.h"
+#include "clangbackendipc_global.h"
#include "filecontainer.h"
#include <QVector>
#include <QMetaType>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT UnregisterTranslationUnitsForCodeCompletionCommand
{
@@ -64,11 +64,11 @@ CMBIPC_EXPORT bool operator==(const UnregisterTranslationUnitsForCodeCompletionC
CMBIPC_EXPORT bool operator<(const UnregisterTranslationUnitsForCodeCompletionCommand &first, const UnregisterTranslationUnitsForCodeCompletionCommand &second);
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForCodeCompletionCommand &command);
-#ifdef CODEMODELBACKEND_TESTS
+#ifdef CLANGBACKEND_TESTS
void PrintTo(const UnregisterTranslationUnitsForCodeCompletionCommand &command, ::std::ostream* os);
#endif
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand)
+Q_DECLARE_METATYPE(ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand)
-#endif // CODEMODELBACKEND_UNRegisterTranslationUnitForCodeCompletionCommand_H
+#endif // CLANGBACKEND_UNRegisterTranslationUnitForCodeCompletionCommand_H
diff --git a/src/libs/codemodelbackendipc/codecompletion.cpp b/src/libs/clangbackendipc/codecompletion.cpp
similarity index 99%
rename from src/libs/codemodelbackendipc/codecompletion.cpp
rename to src/libs/clangbackendipc/codecompletion.cpp
index 651a342d23b..542fcf4e139 100644
--- a/src/libs/codemodelbackendipc/codecompletion.cpp
+++ b/src/libs/clangbackendipc/codecompletion.cpp
@@ -36,7 +36,7 @@
#include <ostream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
CodeCompletion::CodeCompletion(const Utf8String &text,
const Utf8String &hint,
@@ -251,5 +251,5 @@ void PrintTo(CodeCompletion::Availability availability, std::ostream *os)
*os << availabilityToString(availability);
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/codecompletion.h b/src/libs/clangbackendipc/codecompletion.h
similarity index 94%
rename from src/libs/codemodelbackendipc/codecompletion.h
rename to src/libs/clangbackendipc/codecompletion.h
index ba64af485fc..328fa504021 100644
--- a/src/libs/codemodelbackendipc/codecompletion.h
+++ b/src/libs/clangbackendipc/codecompletion.h
@@ -28,17 +28,17 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_CODECOMPLETION_H
-#define CODEMODELBACKEND_CODECOMPLETION_H
+#ifndef CLANGBACKEND_CODECOMPLETION_H
+#define CLANGBACKEND_CODECOMPLETION_H
#include <QMetaType>
#include <utf8string.h>
#include "codecompletionchunk.h"
-#include "codemodelbackendipc_global.h"
+#include "clangbackendipc_global.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT CodeCompletion
{
@@ -134,8 +134,8 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, CodeCompletion::Kind kind);
void PrintTo(const CodeCompletion &command, ::std::ostream* os);
void PrintTo(CodeCompletion::Kind kind, ::std::ostream *os);
void PrintTo(CodeCompletion::Availability availability, ::std::ostream *os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::CodeCompletion)
+Q_DECLARE_METATYPE(ClangBackEnd::CodeCompletion)
-#endif // CODEMODELBACKEND_CODECOMPLETION_H
+#endif // CLANGBACKEND_CODECOMPLETION_H
diff --git a/src/libs/codemodelbackendipc/codecompletionchunk.cpp b/src/libs/clangbackendipc/codecompletionchunk.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/codecompletionchunk.cpp
rename to src/libs/clangbackendipc/codecompletionchunk.cpp
index 43363d68a4e..5b5dfbb587e 100644
--- a/src/libs/codemodelbackendipc/codecompletionchunk.cpp
+++ b/src/libs/clangbackendipc/codecompletionchunk.cpp
@@ -36,7 +36,7 @@
#include <ostream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
CodeCompletionChunk::CodeCompletionChunk()
: kind_(Invalid)
@@ -174,5 +174,5 @@ void PrintTo(const CodeCompletionChunk::Kind &kind, ::std::ostream* os)
*os << completionChunkKindToString(kind);
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/codecompletionchunk.h b/src/libs/clangbackendipc/codecompletionchunk.h
similarity index 91%
rename from src/libs/codemodelbackendipc/codecompletionchunk.h
rename to src/libs/clangbackendipc/codecompletionchunk.h
index 94648e086aa..d6b481ab72a 100644
--- a/src/libs/codemodelbackendipc/codecompletionchunk.h
+++ b/src/libs/clangbackendipc/codecompletionchunk.h
@@ -28,16 +28,16 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_CODECOMPLETIONCHUNK_H
-#define CODEMODELBACKEND_CODECOMPLETIONCHUNK_H
+#ifndef CLANGBACKEND_CODECOMPLETIONCHUNK_H
+#define CLANGBACKEND_CODECOMPLETIONCHUNK_H
#include <utf8string.h>
#include <QVector>
-#include "codemodelbackendipc_global.h"
+#include "clangbackendipc_global.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT CodeCompletionChunk
{
@@ -98,8 +98,8 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletionChunk &chunk);
void PrintTo(const CodeCompletionChunk &chunk, ::std::ostream* os);
void PrintTo(const CodeCompletionChunk::Kind &kind, ::std::ostream* os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::CodeCompletionChunk)
+Q_DECLARE_METATYPE(ClangBackEnd::CodeCompletionChunk)
-#endif // CODEMODELBACKEND_CODECOMPLETIONCHUNK_H
+#endif // CLANGBACKEND_CODECOMPLETIONCHUNK_H
diff --git a/src/libs/codemodelbackendipc/connectionclient.cpp b/src/libs/clangbackendipc/connectionclient.cpp
similarity index 96%
rename from src/libs/codemodelbackendipc/connectionclient.cpp
rename to src/libs/clangbackendipc/connectionclient.cpp
index d3c96991153..c2f504e036f 100644
--- a/src/libs/codemodelbackendipc/connectionclient.cpp
+++ b/src/libs/clangbackendipc/connectionclient.cpp
@@ -38,7 +38,7 @@
#include "cmbunregistertranslationunitsforcodecompletioncommand.h"
#include "cmbcompletecodecommand.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
namespace {
QString currentProcessId()
@@ -48,7 +48,7 @@ QString currentProcessId()
QString connectionName()
{
- return QStringLiteral("CodeModelBackEnd-") + currentProcessId();
+ return QStringLiteral("ClangBackEnd-") + currentProcessId();
}
}
@@ -198,12 +198,12 @@ void ConnectionClient::printLocalSocketError(QLocalSocket::LocalSocketError /*so
void ConnectionClient::printStandardOutput()
{
- qWarning() << "CodeModelBackEnd:" << process_->readAllStandardOutput();
+ qWarning() << "ClangBackEnd:" << process_->readAllStandardOutput();
}
void ConnectionClient::printStandardError()
{
- qWarning() << "CodeModelBackEnd Error:" << process_->readAllStandardError();
+ qWarning() << "ClangBackEnd Error:" << process_->readAllStandardError();
}
void ConnectionClient::finishProcess()
@@ -284,5 +284,5 @@ void ConnectionClient::setProcessPath(const QString &processPath)
processPath_ = processPath;
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/connectionclient.h b/src/libs/clangbackendipc/connectionclient.h
similarity index 94%
rename from src/libs/codemodelbackendipc/connectionclient.h
rename to src/libs/clangbackendipc/connectionclient.h
index ea36bfd08bc..390995792bc 100644
--- a/src/libs/codemodelbackendipc/connectionclient.h
+++ b/src/libs/clangbackendipc/connectionclient.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_CONNECTIONCLIENT_H
-#define CODEMODELBACKEND_CONNECTIONCLIENT_H
+#ifndef CLANGBACKEND_CONNECTIONCLIENT_H
+#define CLANGBACKEND_CONNECTIONCLIENT_H
#include <QLocalSocket>
@@ -44,7 +44,7 @@ QT_END_NAMESPACE
class Utf8String;
class Utf8StringVector;
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class FileContainer;
@@ -108,6 +108,6 @@ private:
bool isAliveTimerResetted;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_CONNECTIONCLIENT_H
+#endif // CLANGBACKEND_CONNECTIONCLIENT_H
diff --git a/src/libs/codemodelbackendipc/connectionserver.cpp b/src/libs/clangbackendipc/connectionserver.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/connectionserver.cpp
rename to src/libs/clangbackendipc/connectionserver.cpp
index 1c26c6f7c9d..f16e2f56d76 100644
--- a/src/libs/codemodelbackendipc/connectionserver.cpp
+++ b/src/libs/clangbackendipc/connectionserver.cpp
@@ -38,7 +38,7 @@
#include <cstdlib>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
QString ConnectionServer::connectionName;
@@ -146,5 +146,5 @@ void ConnectionServer::exitApplicationIfNoSockedIsConnected()
QCoreApplication::exit();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/connectionserver.h b/src/libs/clangbackendipc/connectionserver.h
similarity index 92%
rename from src/libs/codemodelbackendipc/connectionserver.h
rename to src/libs/clangbackendipc/connectionserver.h
index 1e863ba463d..27d1265c95a 100644
--- a/src/libs/codemodelbackendipc/connectionserver.h
+++ b/src/libs/clangbackendipc/connectionserver.h
@@ -28,14 +28,14 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_CONNECTIONSERVER_H
-#define CODEMODELBACKEND_CONNECTIONSERVER_H
+#ifndef CLANGBACKEND_CONNECTIONSERVER_H
+#define CLANGBACKEND_CONNECTIONSERVER_H
#include <QLocalServer>
#include <ipcclientproxy.h>
#include <vector>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class IpcServerInterface;
class IpcClientProxy;
@@ -78,6 +78,6 @@ private:
int aliveTimerId;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_CONNECTIONSERVER_H
+#endif // CLANGBACKEND_CONNECTIONSERVER_H
diff --git a/src/libs/codemodelbackendipc/container_common.h b/src/libs/clangbackendipc/container_common.h
similarity index 98%
rename from src/libs/codemodelbackendipc/container_common.h
rename to src/libs/clangbackendipc/container_common.h
index 61b078dadd9..e20b5d04ece 100644
--- a/src/libs/codemodelbackendipc/container_common.h
+++ b/src/libs/clangbackendipc/container_common.h
@@ -32,7 +32,7 @@
#define CONTAINER_COMMON_H
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
template <typename Container>
bool compareContainer(const Container &first, const Container &second)
diff --git a/src/libs/codemodelbackendipc/filecontainer.cpp b/src/libs/clangbackendipc/filecontainer.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/filecontainer.cpp
rename to src/libs/clangbackendipc/filecontainer.cpp
index a0141d698a2..9073ca6f372 100644
--- a/src/libs/codemodelbackendipc/filecontainer.cpp
+++ b/src/libs/clangbackendipc/filecontainer.cpp
@@ -36,7 +36,7 @@
#include <ostream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
FileContainer::FileContainer(const Utf8String &fileName,
const Utf8String &projectPartId,
@@ -132,5 +132,5 @@ void PrintTo(const FileContainer &container, ::std::ostream* os)
*os << ")";
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/filecontainer.h b/src/libs/clangbackendipc/filecontainer.h
similarity index 91%
rename from src/libs/codemodelbackendipc/filecontainer.h
rename to src/libs/clangbackendipc/filecontainer.h
index 9b353c3d0b7..2a749e08095 100644
--- a/src/libs/codemodelbackendipc/filecontainer.h
+++ b/src/libs/clangbackendipc/filecontainer.h
@@ -28,16 +28,16 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_FILECONTAINER_H
-#define CODEMODELBACKEND_FILECONTAINER_H
+#ifndef CLANGBACKEND_FILECONTAINER_H
+#define CLANGBACKEND_FILECONTAINER_H
#include <qmetatype.h>
#include <utf8string.h>
-#include <codemodelbackendipc_global.h>
+#include <clangbackendipc_global.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT FileContainer
{
@@ -72,8 +72,8 @@ CMBIPC_EXPORT bool operator<(const FileContainer &first, const FileContainer &se
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container);
void PrintTo(const FileContainer &container, ::std::ostream* os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::FileContainer)
+Q_DECLARE_METATYPE(ClangBackEnd::FileContainer)
-#endif // CODEMODELBACKEND_FILECONTAINER_H
+#endif // CLANGBACKEND_FILECONTAINER_H
diff --git a/src/libs/codemodelbackendipc/ipcclientdispatcher.cpp b/src/libs/clangbackendipc/ipcclientdispatcher.cpp
similarity index 97%
rename from src/libs/codemodelbackendipc/ipcclientdispatcher.cpp
rename to src/libs/clangbackendipc/ipcclientdispatcher.cpp
index 8dbf4658bb4..7de8c7f01db 100644
--- a/src/libs/codemodelbackendipc/ipcclientdispatcher.cpp
+++ b/src/libs/clangbackendipc/ipcclientdispatcher.cpp
@@ -32,7 +32,7 @@
#include <QtDebug>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
void IpcClientDispatcher::addClient(IpcClientInterface *client)
{
@@ -74,5 +74,5 @@ void IpcClientDispatcher::projectPartsDoNotExist(const ProjectPartsDoNotExistCom
client->projectPartsDoNotExist(command);
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/ipcclientdispatcher.h b/src/libs/clangbackendipc/ipcclientdispatcher.h
similarity index 87%
rename from src/libs/codemodelbackendipc/ipcclientdispatcher.h
rename to src/libs/clangbackendipc/ipcclientdispatcher.h
index 8409c005244..70fd77b9541 100644
--- a/src/libs/codemodelbackendipc/ipcclientdispatcher.h
+++ b/src/libs/clangbackendipc/ipcclientdispatcher.h
@@ -28,16 +28,16 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_IPCCLIENTDISPATCHER_H
-#define CODEMODELBACKEND_IPCCLIENTDISPATCHER_H
+#ifndef CLANGBACKEND_IPCCLIENTDISPATCHER_H
+#define CLANGBACKEND_IPCCLIENTDISPATCHER_H
#include "ipcclientinterface.h"
#include <QVector>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
-class CMBIPC_EXPORT IpcClientDispatcher : public CodeModelBackEnd::IpcClientInterface
+class CMBIPC_EXPORT IpcClientDispatcher : public ClangBackEnd::IpcClientInterface
{
public:
void addClient(IpcClientInterface *client);
@@ -53,6 +53,6 @@ private:
QVector<IpcClientInterface*> clients;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_IPCCLIENTDISPATCHER_H
+#endif // CLANGBACKEND_IPCCLIENTDISPATCHER_H
diff --git a/src/libs/codemodelbackendipc/ipcclientinterface.cpp b/src/libs/clangbackendipc/ipcclientinterface.cpp
similarity index 86%
rename from src/libs/codemodelbackendipc/ipcclientinterface.cpp
rename to src/libs/clangbackendipc/ipcclientinterface.cpp
index 87fa32547b9..b1959ceab30 100644
--- a/src/libs/codemodelbackendipc/ipcclientinterface.cpp
+++ b/src/libs/clangbackendipc/ipcclientinterface.cpp
@@ -38,16 +38,16 @@
#include "translationunitdoesnotexistcommand.h"
#include "projectpartsdonotexistcommand.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
void IpcClientInterface::dispatch(const QVariant &command)
{
- static const int aliveCommandType = QMetaType::type("CodeModelBackEnd::AliveCommand");
- static const int echoCommandType = QMetaType::type("CodeModelBackEnd::EchoCommand");
- static const int codeCompletedCommandType = QMetaType::type("CodeModelBackEnd::CodeCompletedCommand");
- static const int translationUnitDoesNotExistCommand = QMetaType::type("CodeModelBackEnd::TranslationUnitDoesNotExistCommand");
- static const int projectPartsDoNotExistCommand = QMetaType::type("CodeModelBackEnd::ProjectPartsDoNotExistCommand");
+ static const int aliveCommandType = QMetaType::type("ClangBackEnd::AliveCommand");
+ static const int echoCommandType = QMetaType::type("ClangBackEnd::EchoCommand");
+ static const int codeCompletedCommandType = QMetaType::type("ClangBackEnd::CodeCompletedCommand");
+ static const int translationUnitDoesNotExistCommand = QMetaType::type("ClangBackEnd::TranslationUnitDoesNotExistCommand");
+ static const int projectPartsDoNotExistCommand = QMetaType::type("ClangBackEnd::ProjectPartsDoNotExistCommand");
int type = command.userType();
@@ -65,5 +65,5 @@ void IpcClientInterface::dispatch(const QVariant &command)
qWarning() << "Unknown IpcClientCommand";
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/ipcclientinterface.h b/src/libs/clangbackendipc/ipcclientinterface.h
similarity index 92%
rename from src/libs/codemodelbackendipc/ipcclientinterface.h
rename to src/libs/clangbackendipc/ipcclientinterface.h
index 9bf5fe1507d..31db6d6c731 100644
--- a/src/libs/codemodelbackendipc/ipcclientinterface.h
+++ b/src/libs/clangbackendipc/ipcclientinterface.h
@@ -28,12 +28,12 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_IPCCLIENTINTERFACE_H
-#define CODEMODELBACKEND_IPCCLIENTINTERFACE_H
+#ifndef CLANGBACKEND_IPCCLIENTINTERFACE_H
+#define CLANGBACKEND_IPCCLIENTINTERFACE_H
#include "ipcinterface.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class IpcServerInterface;
class RegisterTranslationUnitForCodeCompletionCommand;
@@ -58,6 +58,6 @@ public:
virtual void projectPartsDoNotExist(const ProjectPartsDoNotExistCommand &command) = 0;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_IPCCLIENTINTERFACE_H
+#endif // CLANGBACKEND_IPCCLIENTINTERFACE_H
diff --git a/src/libs/codemodelbackendipc/ipcclientproxy.cpp b/src/libs/clangbackendipc/ipcclientproxy.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/ipcclientproxy.cpp
rename to src/libs/clangbackendipc/ipcclientproxy.cpp
index 00b41fda839..ea0655e7fb0 100644
--- a/src/libs/codemodelbackendipc/ipcclientproxy.cpp
+++ b/src/libs/clangbackendipc/ipcclientproxy.cpp
@@ -44,7 +44,7 @@
#include "translationunitdoesnotexistcommand.h"
#include "projectpartsdonotexistcommand.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
IpcClientProxy::IpcClientProxy(IpcServerInterface *server, QIODevice *ioDevice)
: writeCommandBlock(ioDevice),
@@ -110,5 +110,5 @@ bool IpcClientProxy::isUsingThatIoDevice(QIODevice *ioDevice) const
return this->ioDevice == ioDevice;
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/ipcclientproxy.h b/src/libs/clangbackendipc/ipcclientproxy.h
similarity index 92%
rename from src/libs/codemodelbackendipc/ipcclientproxy.h
rename to src/libs/clangbackendipc/ipcclientproxy.h
index a829b7e841d..36820266c07 100644
--- a/src/libs/codemodelbackendipc/ipcclientproxy.h
+++ b/src/libs/clangbackendipc/ipcclientproxy.h
@@ -35,7 +35,7 @@
#include <memory>
-#include "codemodelbackendipc_global.h"
+#include "clangbackendipc_global.h"
#include "ipcclientinterface.h"
#include "writecommandblock.h"
@@ -46,7 +46,7 @@ class QLocalServer;
class QIODevice;
QT_END_NAMESPACE
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT IpcClientProxy : public IpcClientInterface
{
@@ -69,12 +69,12 @@ public:
bool isUsingThatIoDevice(QIODevice *ioDevice) const;
private:
- CodeModelBackEnd::WriteCommandBlock writeCommandBlock;
- CodeModelBackEnd::ReadCommandBlock readCommandBlock;
+ ClangBackEnd::WriteCommandBlock writeCommandBlock;
+ ClangBackEnd::ReadCommandBlock readCommandBlock;
IpcServerInterface *server = nullptr;
QIODevice *ioDevice = nullptr;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
#endif // CODELMODELBACKEND_IPCCLIENTPROXY_H
diff --git a/src/libs/codemodelbackendipc/ipcinterface.cpp b/src/libs/clangbackendipc/ipcinterface.cpp
similarity index 96%
rename from src/libs/codemodelbackendipc/ipcinterface.cpp
rename to src/libs/clangbackendipc/ipcinterface.cpp
index 5576e804760..8645c25f904 100644
--- a/src/libs/codemodelbackendipc/ipcinterface.cpp
+++ b/src/libs/clangbackendipc/ipcinterface.cpp
@@ -30,11 +30,11 @@
#include "ipcinterface.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
IpcInterface::~IpcInterface()
{
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/ipcinterface.h b/src/libs/clangbackendipc/ipcinterface.h
similarity index 88%
rename from src/libs/codemodelbackendipc/ipcinterface.h
rename to src/libs/clangbackendipc/ipcinterface.h
index c2b9de5f9eb..68cfa6724ec 100644
--- a/src/libs/codemodelbackendipc/ipcinterface.h
+++ b/src/libs/clangbackendipc/ipcinterface.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_IPCINTERFACE_H
-#define CODEMODELBACKEND_IPCINTERFACE_H
+#ifndef CLANGBACKEND_IPCINTERFACE_H
+#define CLANGBACKEND_IPCINTERFACE_H
#include <QtGlobal>
@@ -37,9 +37,9 @@ QT_BEGIN_NAMESPACE
class QVariant;
QT_END_NAMESPACE
-#include "codemodelbackendipc_global.h"
+#include "clangbackendipc_global.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT IpcInterface
{
@@ -48,6 +48,6 @@ public:
virtual void dispatch(const QVariant &command) = 0;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_IPCINTERFACE_H
+#endif // CLANGBACKEND_IPCINTERFACE_H
diff --git a/src/libs/codemodelbackendipc/ipcserver.cpp b/src/libs/clangbackendipc/ipcserver.cpp
similarity index 96%
rename from src/libs/codemodelbackendipc/ipcserver.cpp
rename to src/libs/clangbackendipc/ipcserver.cpp
index dccaa5db4f4..220361c6234 100644
--- a/src/libs/codemodelbackendipc/ipcserver.cpp
+++ b/src/libs/clangbackendipc/ipcserver.cpp
@@ -30,7 +30,7 @@
#include "ipcserver.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
IpcServer::IpcServer()
{
@@ -42,5 +42,5 @@ IpcServer::~IpcServer()
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/ipcserver.h b/src/libs/clangbackendipc/ipcserver.h
similarity index 90%
rename from src/libs/codemodelbackendipc/ipcserver.h
rename to src/libs/clangbackendipc/ipcserver.h
index 23d5c4769fb..0512f992346 100644
--- a/src/libs/codemodelbackendipc/ipcserver.h
+++ b/src/libs/clangbackendipc/ipcserver.h
@@ -28,12 +28,12 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_IPCSERVER_H
-#define CODEMODELBACKEND_IPCSERVER_H
+#ifndef CLANGBACKEND_IPCSERVER_H
+#define CLANGBACKEND_IPCSERVER_H
#include "ipcserverinterface.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class IpcServer : public IpcServerInterface
{
@@ -42,6 +42,6 @@ public:
~IpcServer();
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_IPCSERVER_H
+#endif // CLANGBACKEND_IPCSERVER_H
diff --git a/src/libs/codemodelbackendipc/ipcserverinterface.cpp b/src/libs/clangbackendipc/ipcserverinterface.cpp
similarity index 86%
rename from src/libs/codemodelbackendipc/ipcserverinterface.cpp
rename to src/libs/clangbackendipc/ipcserverinterface.cpp
index 1ea47c05031..87ef9a5c3af 100644
--- a/src/libs/codemodelbackendipc/ipcserverinterface.cpp
+++ b/src/libs/clangbackendipc/ipcserverinterface.cpp
@@ -39,16 +39,16 @@
#include "cmbunregisterprojectsforcodecompletioncommand.h"
#include "cmbcompletecodecommand.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
void IpcServerInterface::dispatch(const QVariant &command)
{
- static const int endCommandType = QMetaType::type("CodeModelBackEnd::EndCommand");
- static const int registerTranslationUnitsForCodeCompletionCommandType = QMetaType::type("CodeModelBackEnd::RegisterTranslationUnitForCodeCompletionCommand");
- static const int unregisterTranslationUnitsForCodeCompletionCommandType = QMetaType::type("CodeModelBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand");
- static const int registerProjectPartsForCodeCompletionCommandType = QMetaType::type("CodeModelBackEnd::RegisterProjectPartsForCodeCompletionCommand");
- static const int unregisterProjectPartsForCodeCompletionCommandType = QMetaType::type("CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand");
- static const int completeCodeCommandType = QMetaType::type("CodeModelBackEnd::CompleteCodeCommand");
+ static const int endCommandType = QMetaType::type("ClangBackEnd::EndCommand");
+ static const int registerTranslationUnitsForCodeCompletionCommandType = QMetaType::type("ClangBackEnd::RegisterTranslationUnitForCodeCompletionCommand");
+ static const int unregisterTranslationUnitsForCodeCompletionCommandType = QMetaType::type("ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand");
+ static const int registerProjectPartsForCodeCompletionCommandType = QMetaType::type("ClangBackEnd::RegisterProjectPartsForCodeCompletionCommand");
+ static const int unregisterProjectPartsForCodeCompletionCommandType = QMetaType::type("ClangBackEnd::UnregisterProjectPartsForCodeCompletionCommand");
+ static const int completeCodeCommandType = QMetaType::type("ClangBackEnd::CompleteCodeCommand");
int type = command.userType();
@@ -83,5 +83,5 @@ IpcClientInterface *IpcServerInterface::client()
return &clientDispatcher;
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/ipcserverinterface.h b/src/libs/clangbackendipc/ipcserverinterface.h
similarity index 92%
rename from src/libs/codemodelbackendipc/ipcserverinterface.h
rename to src/libs/clangbackendipc/ipcserverinterface.h
index 1fcffcde6f8..b67cff3c309 100644
--- a/src/libs/codemodelbackendipc/ipcserverinterface.h
+++ b/src/libs/clangbackendipc/ipcserverinterface.h
@@ -28,14 +28,14 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_IPCSERVERINTERFACE_H
-#define CODEMODELBACKEND_IPCSERVERINTERFACE_H
+#ifndef CLANGBACKEND_IPCSERVERINTERFACE_H
+#define CLANGBACKEND_IPCSERVERINTERFACE_H
#include "ipcinterface.h"
#include "ipcclientdispatcher.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class IpcClientInterface;
@@ -60,6 +60,6 @@ private:
IpcClientDispatcher clientDispatcher;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_IPCSERVERINTERFACE_H
+#endif // CLANGBACKEND_IPCSERVERINTERFACE_H
diff --git a/src/libs/codemodelbackendipc/ipcserverproxy.cpp b/src/libs/clangbackendipc/ipcserverproxy.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/ipcserverproxy.cpp
rename to src/libs/clangbackendipc/ipcserverproxy.cpp
index 17d95292dfe..30e002cee24 100644
--- a/src/libs/codemodelbackendipc/ipcserverproxy.cpp
+++ b/src/libs/clangbackendipc/ipcserverproxy.cpp
@@ -44,7 +44,7 @@
#include <ipcclientinterface.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
IpcServerProxy::IpcServerProxy(IpcClientInterface *client, QIODevice *ioDevice)
: writeCommandBlock(ioDevice),
@@ -96,5 +96,5 @@ void IpcServerProxy::completeCode(const CompleteCodeCommand &command)
writeCommandBlock.write(QVariant::fromValue(command));
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/ipcserverproxy.h b/src/libs/clangbackendipc/ipcserverproxy.h
similarity index 89%
rename from src/libs/codemodelbackendipc/ipcserverproxy.h
rename to src/libs/clangbackendipc/ipcserverproxy.h
index 94f2a340e36..f10a9595bb3 100644
--- a/src/libs/codemodelbackendipc/ipcserverproxy.h
+++ b/src/libs/clangbackendipc/ipcserverproxy.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_IPCSERVERPROXY_H
-#define CODEMODELBACKEND_IPCSERVERPROXY_H
+#ifndef CLANGBACKEND_IPCSERVERPROXY_H
+#define CLANGBACKEND_IPCSERVERPROXY_H
#include <qglobal.h>
#include <QTimer>
@@ -47,7 +47,7 @@ class QLocalServer;
class QLocalSocket;
QT_END_NAMESPACE
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT IpcServerProxy : public IpcServerInterface
{
@@ -68,11 +68,11 @@ public:
void resetCounter();
private:
- CodeModelBackEnd::WriteCommandBlock writeCommandBlock;
- CodeModelBackEnd::ReadCommandBlock readCommandBlock;
+ ClangBackEnd::WriteCommandBlock writeCommandBlock;
+ ClangBackEnd::ReadCommandBlock readCommandBlock;
IpcClientInterface *client;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_IPCSERVERPROXY_H
+#endif // CLANGBACKEND_IPCSERVERPROXY_H
diff --git a/src/libs/codemodelbackendipc/projectpartcontainer.cpp b/src/libs/clangbackendipc/projectpartcontainer.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/projectpartcontainer.cpp
rename to src/libs/clangbackendipc/projectpartcontainer.cpp
index 4264134c50d..cd3f7a98a3e 100644
--- a/src/libs/codemodelbackendipc/projectpartcontainer.cpp
+++ b/src/libs/clangbackendipc/projectpartcontainer.cpp
@@ -36,7 +36,7 @@
#include <ostream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
ProjectPartContainer::ProjectPartContainer(const Utf8String &projectPathId,
const Utf8StringVector &arguments)
@@ -103,5 +103,5 @@ void PrintTo(const ProjectPartContainer &container, ::std::ostream* os)
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/projectpartcontainer.h b/src/libs/clangbackendipc/projectpartcontainer.h
similarity index 90%
rename from src/libs/codemodelbackendipc/projectpartcontainer.h
rename to src/libs/clangbackendipc/projectpartcontainer.h
index b1bc664e55e..4fdf26451e3 100644
--- a/src/libs/codemodelbackendipc/projectpartcontainer.h
+++ b/src/libs/clangbackendipc/projectpartcontainer.h
@@ -28,16 +28,16 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_PROJECTCONTAINER_H
-#define CODEMODELBACKEND_PROJECTCONTAINER_H
+#ifndef CLANGBACKEND_PROJECTCONTAINER_H
+#define CLANGBACKEND_PROJECTCONTAINER_H
#include <QMetaType>
#include <utf8stringvector.h>
-#include <codemodelbackendipc_global.h>
+#include <clangbackendipc_global.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT ProjectPartContainer
{
@@ -66,8 +66,8 @@ CMBIPC_EXPORT bool operator<(const ProjectPartContainer &first, const ProjectPar
QDebug operator<<(QDebug debug, const ProjectPartContainer &container);
void PrintTo(const ProjectPartContainer &container, ::std::ostream* os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::ProjectPartContainer)
+Q_DECLARE_METATYPE(ClangBackEnd::ProjectPartContainer)
-#endif // CODEMODELBACKEND_PROJECTCONTAINER_H
+#endif // CLANGBACKEND_PROJECTCONTAINER_H
diff --git a/src/libs/codemodelbackendipc/projectpartsdonotexistcommand.cpp b/src/libs/clangbackendipc/projectpartsdonotexistcommand.cpp
similarity index 97%
rename from src/libs/codemodelbackendipc/projectpartsdonotexistcommand.cpp
rename to src/libs/clangbackendipc/projectpartsdonotexistcommand.cpp
index c664b6030ba..f0f78bf6207 100644
--- a/src/libs/codemodelbackendipc/projectpartsdonotexistcommand.cpp
+++ b/src/libs/clangbackendipc/projectpartsdonotexistcommand.cpp
@@ -36,7 +36,7 @@
#include <ostream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
ProjectPartsDoNotExistCommand::ProjectPartsDoNotExistCommand(const Utf8StringVector &projectPartIds)
: projectPartIds_(projectPartIds)
@@ -95,5 +95,5 @@ void PrintTo(const ProjectPartsDoNotExistCommand &command, ::std::ostream* os)
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/projectpartsdonotexistcommand.h b/src/libs/clangbackendipc/projectpartsdonotexistcommand.h
similarity index 90%
rename from src/libs/codemodelbackendipc/projectpartsdonotexistcommand.h
rename to src/libs/clangbackendipc/projectpartsdonotexistcommand.h
index c408fc04bb5..c633f9d6e9a 100644
--- a/src/libs/codemodelbackendipc/projectpartsdonotexistcommand.h
+++ b/src/libs/clangbackendipc/projectpartsdonotexistcommand.h
@@ -28,16 +28,16 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_PROJECTPARTSDONOTEXISTCOMMAND_H
-#define CODEMODELBACKEND_PROJECTPARTSDONOTEXISTCOMMAND_H
+#ifndef CLANGBACKEND_PROJECTPARTSDONOTEXISTCOMMAND_H
+#define CLANGBACKEND_PROJECTPARTSDONOTEXISTCOMMAND_H
#include <QMetaType>
#include <utf8stringvector.h>
-#include "codemodelbackendipc_global.h"
+#include "clangbackendipc_global.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT ProjectPartsDoNotExistCommand
{
@@ -65,8 +65,8 @@ CMBIPC_EXPORT bool operator<(const ProjectPartsDoNotExistCommand &first, const P
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const ProjectPartsDoNotExistCommand &command);
void PrintTo(const ProjectPartsDoNotExistCommand &command, ::std::ostream* os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::ProjectPartsDoNotExistCommand)
+Q_DECLARE_METATYPE(ClangBackEnd::ProjectPartsDoNotExistCommand)
-#endif // CODEMODELBACKEND_PROJECTPARTSDONOTEXISTCOMMAND_H
+#endif // CLANGBACKEND_PROJECTPARTSDONOTEXISTCOMMAND_H
diff --git a/src/libs/codemodelbackendipc/readcommandblock.cpp b/src/libs/clangbackendipc/readcommandblock.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/readcommandblock.cpp
rename to src/libs/clangbackendipc/readcommandblock.cpp
index 90109c0eb32..318b318e41e 100644
--- a/src/libs/codemodelbackendipc/readcommandblock.cpp
+++ b/src/libs/clangbackendipc/readcommandblock.cpp
@@ -35,7 +35,7 @@
#include <QVariant>
#include <QtDebug>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
ReadCommandBlock::ReadCommandBlock(QIODevice *ioDevice)
: ioDevice(ioDevice),
@@ -109,5 +109,5 @@ bool ReadCommandBlock::isTheWholeCommandReadable(QDataStream &in)
return true;
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/readcommandblock.h b/src/libs/clangbackendipc/readcommandblock.h
similarity index 91%
rename from src/libs/codemodelbackendipc/readcommandblock.h
rename to src/libs/clangbackendipc/readcommandblock.h
index 1d4d93246f8..04af1a660d3 100644
--- a/src/libs/codemodelbackendipc/readcommandblock.h
+++ b/src/libs/clangbackendipc/readcommandblock.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_READCOMMANDBLOCK_H
-#define CODEMODELBACKEND_READCOMMANDBLOCK_H
+#ifndef CLANGBACKEND_READCOMMANDBLOCK_H
+#define CLANGBACKEND_READCOMMANDBLOCK_H
#include <QtGlobal>
@@ -39,7 +39,7 @@ class QDataStream;
class QIODevice;
QT_END_NAMESPACE
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class ReadCommandBlock
{
@@ -61,6 +61,6 @@ private:
qint32 blockSize;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_READCOMMANDBLOCK_H
+#endif // CLANGBACKEND_READCOMMANDBLOCK_H
diff --git a/src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.cpp b/src/libs/clangbackendipc/translationunitdoesnotexistcommand.cpp
similarity index 98%
rename from src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.cpp
rename to src/libs/clangbackendipc/translationunitdoesnotexistcommand.cpp
index 0a2ce033f06..5c512dd19ec 100644
--- a/src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.cpp
+++ b/src/libs/clangbackendipc/translationunitdoesnotexistcommand.cpp
@@ -36,7 +36,7 @@
#include <ostream>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
TranslationUnitDoesNotExistCommand::TranslationUnitDoesNotExistCommand(const FileContainer &fileContainer)
: fileContainer_(fileContainer)
@@ -108,5 +108,5 @@ void PrintTo(const TranslationUnitDoesNotExistCommand &command, ::std::ostream*
*os << output.toUtf8().constData();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.h b/src/libs/clangbackendipc/translationunitdoesnotexistcommand.h
similarity index 91%
rename from src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.h
rename to src/libs/clangbackendipc/translationunitdoesnotexistcommand.h
index 62f08a1b24c..e6124d56ad7 100644
--- a/src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.h
+++ b/src/libs/clangbackendipc/translationunitdoesnotexistcommand.h
@@ -28,14 +28,14 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_TRANSLATIONUNITDOESNOTEXISTSCOMMAND_H
-#define CODEMODELBACKEND_TRANSLATIONUNITDOESNOTEXISTSCOMMAND_H
+#ifndef CLANGBACKEND_TRANSLATIONUNITDOESNOTEXISTSCOMMAND_H
+#define CLANGBACKEND_TRANSLATIONUNITDOESNOTEXISTSCOMMAND_H
#include <QMetaType>
#include "filecontainer.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CMBIPC_EXPORT TranslationUnitDoesNotExistCommand
{
@@ -66,8 +66,8 @@ CMBIPC_EXPORT bool operator<(const TranslationUnitDoesNotExistCommand &first, co
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const TranslationUnitDoesNotExistCommand &command);
void PrintTo(const TranslationUnitDoesNotExistCommand &command, ::std::ostream* os);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-Q_DECLARE_METATYPE(CodeModelBackEnd::TranslationUnitDoesNotExistCommand)
+Q_DECLARE_METATYPE(ClangBackEnd::TranslationUnitDoesNotExistCommand)
-#endif // CODEMODELBACKEND_TRANSLATIONUNITDOESNOTEXISTSCOMMAND_H
+#endif // CLANGBACKEND_TRANSLATIONUNITDOESNOTEXISTSCOMMAND_H
diff --git a/src/libs/codemodelbackendipc/writecommandblock.cpp b/src/libs/clangbackendipc/writecommandblock.cpp
similarity index 97%
rename from src/libs/codemodelbackendipc/writecommandblock.cpp
rename to src/libs/clangbackendipc/writecommandblock.cpp
index 505567fc754..3d0d2fca07f 100644
--- a/src/libs/codemodelbackendipc/writecommandblock.cpp
+++ b/src/libs/clangbackendipc/writecommandblock.cpp
@@ -35,7 +35,7 @@
#include <QVariant>
#include <QtDebug>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
WriteCommandBlock::WriteCommandBlock(QIODevice *ioDevice)
: commandCounter(0),
@@ -74,5 +74,5 @@ void WriteCommandBlock::resetCounter()
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/libs/codemodelbackendipc/writecommandblock.h b/src/libs/clangbackendipc/writecommandblock.h
similarity index 90%
rename from src/libs/codemodelbackendipc/writecommandblock.h
rename to src/libs/clangbackendipc/writecommandblock.h
index 18ee35b7c17..9a35bc0df15 100644
--- a/src/libs/codemodelbackendipc/writecommandblock.h
+++ b/src/libs/clangbackendipc/writecommandblock.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_WRITECOMMANDBLOCK_H
-#define CODEMODELBACKEND_WRITECOMMANDBLOCK_H
+#ifndef CLANGBACKEND_WRITECOMMANDBLOCK_H
+#define CLANGBACKEND_WRITECOMMANDBLOCK_H
#include <QtGlobal>
@@ -39,7 +39,7 @@ class QDataStream;
class QIODevice;
QT_END_NAMESPACE
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class WriteCommandBlock
{
@@ -57,6 +57,6 @@ private:
QIODevice *ioDevice;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_WRITECOMMANDBLOCK_H
+#endif // CLANGBACKEND_WRITECOMMANDBLOCK_H
diff --git a/src/libs/codemodelbackendipc/codemodelbackendipc.pro b/src/libs/codemodelbackendipc/codemodelbackendipc.pro
deleted file mode 100644
index bc048b4f9d5..00000000000
--- a/src/libs/codemodelbackendipc/codemodelbackendipc.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-include(../../qtcreatorlibrary.pri)
-include(codemodelbackendipc-lib.pri)
diff --git a/src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri b/src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri
deleted file mode 100644
index 98a3a2a5d97..00000000000
--- a/src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-QTC_LIB_NAME = Codemodelbackendipc
-QTC_LIB_DEPENDS += sqlite
-INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/codemodelbackendipc
diff --git a/src/libs/codemodelbackendipc/codemodelbackendipc_global.cpp b/src/libs/codemodelbackendipc/codemodelbackendipc_global.cpp
deleted file mode 100644
index 2ad16d31d7b..00000000000
--- a/src/libs/codemodelbackendipc/codemodelbackendipc_global.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://www.qt.io/licensing. For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "codecompletion.h"
-
-namespace CodeModelBackEnd {
-void registerTypes()
-{
-}
-}
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index 8b0d7554aab..eba9c31b8c4 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -15,7 +15,7 @@ SUBDIRS = \
ssh \
timeline \
sqlite \
- codemodelbackendipc
+ clangbackendipc
for(l, SUBDIRS) {
QTC_LIB_DEPENDS =
diff --git a/src/libs/libs.qbs b/src/libs/libs.qbs
index ae2c1d0303e..bd17e195531 100644
--- a/src/libs/libs.qbs
+++ b/src/libs/libs.qbs
@@ -4,7 +4,7 @@ Project {
name: "Libs"
references: [
"aggregation/aggregation.qbs",
- "codemodelbackendipc/codemodelbackendipc.qbs",
+ "clangbackendipc/clangbackendipc.qbs",
"cplusplus/cplusplus.qbs",
"extensionsystem/extensionsystem.qbs",
"glsl/glsl.qbs",
diff --git a/src/plugins/clangcodemodel/codemodelbackendipcintegration.cpp b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
similarity index 85%
rename from src/plugins/clangcodemodel/codemodelbackendipcintegration.cpp
rename to src/plugins/clangcodemodel/clangbackendipcintegration.cpp
index b93b0c2cf6c..7374cfddbf6 100644
--- a/src/plugins/clangcodemodel/codemodelbackendipcintegration.cpp
+++ b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp
@@ -28,7 +28,7 @@
**
****************************************************************************/
-#include "codemodelbackendipcintegration.h"
+#include "clangbackendipcintegration.h"
#include "clangcompletion.h"
#include "clangmodelmanagersupport.h"
@@ -49,16 +49,16 @@
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
-#include <codemodelbackendipc/cmbcodecompletedcommand.h>
-#include <codemodelbackendipc/cmbcompletecodecommand.h>
-#include <codemodelbackendipc/cmbechocommand.h>
-#include <codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.h>
-#include <codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h>
-#include <codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.h>
-#include <codemodelbackendipc/cmbcommands.h>
-#include <codemodelbackendipc/projectpartsdonotexistcommand.h>
-#include <codemodelbackendipc/translationunitdoesnotexistcommand.h>
+#include <clangbackendipc/cmbcodecompletedcommand.h>
+#include <clangbackendipc/cmbcompletecodecommand.h>
+#include <clangbackendipc/cmbechocommand.h>
+#include <clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <clangbackendipc/cmbregisterprojectsforcodecompletioncommand.h>
+#include <clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h>
+#include <clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.h>
+#include <clangbackendipc/cmbcommands.h>
+#include <clangbackendipc/projectpartsdonotexistcommand.h>
+#include <clangbackendipc/translationunitdoesnotexistcommand.h>
#include <cplusplus/Icons.h>
@@ -71,7 +71,7 @@ static Q_LOGGING_CATEGORY(log, "qtc.clangcodemodel.ipc")
using namespace CPlusPlus;
using namespace ClangCodeModel;
using namespace ClangCodeModel::Internal;
-using namespace CodeModelBackEnd;
+using namespace ClangBackEnd;
using namespace TextEditor;
namespace {
@@ -79,7 +79,7 @@ namespace {
QString backendProcessPath()
{
return Core::ICore::libexecPath()
- + QStringLiteral("/codemodelbackend")
+ + QStringLiteral("/clangbackend")
+ QStringLiteral(QTC_HOST_EXE_SUFFIX);
}
@@ -164,19 +164,19 @@ void IpcReceiver::projectPartsDoNotExist(const ProjectPartsDoNotExistCommand &co
class IpcSender : public IpcSenderInterface
{
public:
- IpcSender(CodeModelBackEnd::ConnectionClient &connectionClient)
+ IpcSender(ClangBackEnd::ConnectionClient &connectionClient)
: m_connection(connectionClient)
{}
void end() override;
- void registerTranslationUnitsForCodeCompletion(const CodeModelBackEnd::RegisterTranslationUnitForCodeCompletionCommand &command) override;
- void unregisterTranslationUnitsForCodeCompletion(const CodeModelBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand &command) override;
- void registerProjectPartsForCodeCompletion(const CodeModelBackEnd::RegisterProjectPartsForCodeCompletionCommand &command) override;
- void unregisterProjectPartsForCodeCompletion(const CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand &command) override;
- void completeCode(const CodeModelBackEnd::CompleteCodeCommand &command) override;
+ void registerTranslationUnitsForCodeCompletion(const ClangBackEnd::RegisterTranslationUnitForCodeCompletionCommand &command) override;
+ void unregisterTranslationUnitsForCodeCompletion(const ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand &command) override;
+ void registerProjectPartsForCodeCompletion(const ClangBackEnd::RegisterProjectPartsForCodeCompletionCommand &command) override;
+ void unregisterProjectPartsForCodeCompletion(const ClangBackEnd::UnregisterProjectPartsForCodeCompletionCommand &command) override;
+ void completeCode(const ClangBackEnd::CompleteCodeCommand &command) override;
private:
- CodeModelBackEnd::ConnectionClient &m_connection;
+ ClangBackEnd::ConnectionClient &m_connection;
};
void IpcSender::end()
@@ -243,12 +243,12 @@ void IpcCommunicator::initializeBackend()
}
QElapsedTimer timer; timer.start();
- const QString codeModelBackEndProcessPath = backendProcessPath();
- qCDebug(log) << "Starting" << codeModelBackEndProcessPath;
- QTC_ASSERT(QFileInfo(codeModelBackEndProcessPath).exists(), return);
+ const QString clangBackEndProcessPath = backendProcessPath();
+ qCDebug(log) << "Starting" << clangBackEndProcessPath;
+ QTC_ASSERT(QFileInfo(clangBackEndProcessPath).exists(), return);
m_connection.setProcessAliveTimerInterval(10 * 1000);
- m_connection.setProcessPath(codeModelBackEndProcessPath);
+ m_connection.setProcessPath(clangBackEndProcessPath);
connect(&m_connection, &ConnectionClient::processRestarted,
this, &IpcCommunicator::onBackendRestarted);
@@ -264,7 +264,7 @@ void IpcCommunicator::initializeBackend()
void IpcCommunicator::registerEmptyProjectForProjectLessFiles()
{
QTC_CHECK(m_connection.isConnected());
- registerProjectPartsForCodeCompletion({CodeModelBackEnd::ProjectPartContainer(
+ registerProjectPartsForCodeCompletion({ClangBackEnd::ProjectPartContainer(
Utf8String(),
Utf8StringVector())});
}
@@ -308,18 +308,18 @@ static QStringList projectPartCommandLine(const CppTools::ProjectPart::Ptr &proj
return options;
}
-static CodeModelBackEnd::ProjectPartContainer toProjectPartContainer(
+static ClangBackEnd::ProjectPartContainer toProjectPartContainer(
const CppTools::ProjectPart::Ptr &projectPart)
{
const QStringList arguments = projectPartCommandLine(projectPart);
- return CodeModelBackEnd::ProjectPartContainer(projectPart->projectFile,
+ return ClangBackEnd::ProjectPartContainer(projectPart->projectFile,
Utf8StringVector(arguments));
}
-static QVector<CodeModelBackEnd::ProjectPartContainer> toProjectPartContainers(
+static QVector<ClangBackEnd::ProjectPartContainer> toProjectPartContainers(
const QList<CppTools::ProjectPart::Ptr> projectParts)
{
- QVector<CodeModelBackEnd::ProjectPartContainer> projectPartContainers;
+ QVector<ClangBackEnd::ProjectPartContainer> projectPartContainers;
projectPartContainers.reserve(projectParts.size());
foreach (const CppTools::ProjectPart::Ptr &projectPart, projectParts)
projectPartContainers << toProjectPartContainer(projectPart);
@@ -346,7 +346,7 @@ void IpcCommunicator::updateUnsavedFile(const QString &filePath, const QByteArra
// TODO: Send new only if changed
registerFilesForCodeCompletion({
- CodeModelBackEnd::FileContainer(filePath,
+ ClangBackEnd::FileContainer(filePath,
projectFilePath,
Utf8String::fromByteArray(contents),
hasUnsavedContent)
@@ -363,7 +363,7 @@ void IpcCommunicator::updateUnsavedFileIfNotCurrentDocument(Core::IDocument *doc
void IpcCommunicator::onBackendRestarted()
{
- qWarning("Codemodelbackend finished unexpectedly, restarted.");
+ qWarning("Clang back end finished unexpectedly, restarted.");
qCDebug(log) << "Backend restarted, re-initializing with project data and unsaved files.";
m_ipcReceiver.deleteAndClearWaitingAssistProcessors();
diff --git a/src/plugins/clangcodemodel/codemodelbackendipcintegration.h b/src/plugins/clangcodemodel/clangbackendipcintegration.h
similarity index 74%
rename from src/plugins/clangcodemodel/codemodelbackendipcintegration.h
rename to src/plugins/clangcodemodel/clangbackendipcintegration.h
index 8891bc91aab..365654fd921 100644
--- a/src/plugins/clangcodemodel/codemodelbackendipcintegration.h
+++ b/src/plugins/clangcodemodel/clangbackendipcintegration.h
@@ -28,15 +28,15 @@
**
****************************************************************************/
-#ifndef CLANGCODEMODEL_INTERNAL_CODEMODELBACKENDIPCINTEGRATION_H
-#define CLANGCODEMODEL_INTERNAL_CODEMODELBACKENDIPCINTEGRATION_H
+#ifndef CLANGCODEMODEL_INTERNAL_CLANGBACKENDIPCINTEGRATION_H
+#define CLANGCODEMODEL_INTERNAL_CLANGBACKENDIPCINTEGRATION_H
#include <cpptools/cppprojects.h>
-#include <codemodelbackendipc/connectionclient.h>
-#include <codemodelbackendipc/filecontainer.h>
-#include <codemodelbackendipc/ipcclientinterface.h>
-#include <codemodelbackendipc/projectpartcontainer.h>
+#include <clangbackendipc/connectionclient.h>
+#include <clangbackendipc/filecontainer.h>
+#include <clangbackendipc/ipcclientinterface.h>
+#include <clangbackendipc/projectpartcontainer.h>
#include <QObject>
#include <QSharedPointer>
@@ -58,7 +58,7 @@ class ModelManagerSupportClang;
class ClangCompletionAssistProcessor;
-class IpcReceiver : public CodeModelBackEnd::IpcClientInterface
+class IpcReceiver : public ClangBackEnd::IpcClientInterface
{
public:
IpcReceiver();
@@ -73,11 +73,11 @@ public:
private:
void alive() override;
- void echo(const CodeModelBackEnd::EchoCommand &command) override;
- void codeCompleted(const CodeModelBackEnd::CodeCompletedCommand &command) override;
+ void echo(const ClangBackEnd::EchoCommand &command) override;
+ void codeCompleted(const ClangBackEnd::CodeCompletedCommand &command) override;
- void translationUnitDoesNotExist(const CodeModelBackEnd::TranslationUnitDoesNotExistCommand &command) override;
- void projectPartsDoNotExist(const CodeModelBackEnd::ProjectPartsDoNotExistCommand &command) override;
+ void translationUnitDoesNotExist(const ClangBackEnd::TranslationUnitDoesNotExistCommand &command) override;
+ void projectPartsDoNotExist(const ClangBackEnd::ProjectPartsDoNotExistCommand &command) override;
private:
AliveHandler m_aliveHandler;
@@ -90,11 +90,11 @@ public:
virtual ~IpcSenderInterface() {}
virtual void end() = 0;
- virtual void registerTranslationUnitsForCodeCompletion(const CodeModelBackEnd::RegisterTranslationUnitForCodeCompletionCommand &command) = 0;
- virtual void unregisterTranslationUnitsForCodeCompletion(const CodeModelBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand &command) = 0;
- virtual void registerProjectPartsForCodeCompletion(const CodeModelBackEnd::RegisterProjectPartsForCodeCompletionCommand &command) = 0;
- virtual void unregisterProjectPartsForCodeCompletion(const CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand &command) = 0;
- virtual void completeCode(const CodeModelBackEnd::CompleteCodeCommand &command) = 0;
+ virtual void registerTranslationUnitsForCodeCompletion(const ClangBackEnd::RegisterTranslationUnitForCodeCompletionCommand &command) = 0;
+ virtual void unregisterTranslationUnitsForCodeCompletion(const ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand &command) = 0;
+ virtual void registerProjectPartsForCodeCompletion(const ClangBackEnd::RegisterProjectPartsForCodeCompletionCommand &command) = 0;
+ virtual void unregisterProjectPartsForCodeCompletion(const ClangBackEnd::UnregisterProjectPartsForCodeCompletionCommand &command) = 0;
+ virtual void completeCode(const ClangBackEnd::CompleteCodeCommand &command) = 0;
};
class IpcCommunicator : public QObject
@@ -103,8 +103,8 @@ class IpcCommunicator : public QObject
public:
using Ptr = QSharedPointer<IpcCommunicator>;
- using FileContainers = QVector<CodeModelBackEnd::FileContainer>;
- using ProjectPartContainers = QVector<CodeModelBackEnd::ProjectPartContainer>;
+ using FileContainers = QVector<ClangBackEnd::FileContainer>;
+ using ProjectPartContainers = QVector<ClangBackEnd::ProjectPartContainer>;
public:
IpcCommunicator();
@@ -145,7 +145,7 @@ private:
void onEditorAboutToClose(Core::IEditor *editor);
IpcReceiver m_ipcReceiver;
- CodeModelBackEnd::ConnectionClient m_connection;
+ ClangBackEnd::ConnectionClient m_connection;
QScopedPointer<IpcSenderInterface> m_ipcSender;
SendMode m_sendMode = RespectSendRequests;
@@ -154,4 +154,4 @@ private:
} // namespace Internal
} // namespace ClangCodeModel
-#endif // CLANGCODEMODEL_INTERNAL_CODEMODELBACKENDIPCINTEGRATION_H
+#endif // CLANGCODEMODEL_INTERNAL_CLANGBACKENDIPCINTEGRATION_H
diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro
index 9fe02700fa8..6165b78fbf2 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.pro
+++ b/src/plugins/clangcodemodel/clangcodemodel.pro
@@ -22,7 +22,7 @@ SOURCES += \
$$PWD/clangprojectsettings.cpp \
$$PWD/clangprojectsettingspropertiespage.cpp \
$$PWD/clangutils.cpp \
- $$PWD/codemodelbackendipcintegration.cpp \
+ $$PWD/clangbackendipcintegration.cpp \
$$PWD/completionchunkstotextconverter.cpp \
$$PWD/completionproposalsbuilder.cpp \
$$PWD/cppcreatemarkers.cpp \
@@ -53,7 +53,7 @@ HEADERS += \
$$PWD/clangprojectsettings.h \
$$PWD/clangprojectsettingspropertiespage.h \
$$PWD/clangutils.h \
- $$PWD/codemodelbackendipcintegration.h \
+ $$PWD/clangbackendipcintegration.h \
$$PWD/completionchunkstotextconverter.h \
$$PWD/completionproposalsbuilder.h \
$$PWD/constants.h \
diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index ea0a46f0a58..8e3e2c24180 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -12,7 +12,7 @@ QtcPlugin {
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
Depends { name: "Utils" }
- Depends { name: "CodeModelBackEndIpc" }
+ Depends { name: "ClangBackEndIpc" }
pluginTestDepends: [
"CppEditor",
@@ -152,8 +152,8 @@ QtcPlugin {
"clangprojectsettingspropertiespage.ui",
"clangutils.cpp",
"clangutils.h",
- "codemodelbackendipcintegration.cpp",
- "codemodelbackendipcintegration.h",
+ "clangbackendipcintegration.cpp",
+ "clangbackendipcintegration.h",
"completionchunkstotextconverter.cpp",
"completionchunkstotextconverter.h",
"constants.h",
diff --git a/src/plugins/clangcodemodel/clangcodemodel_dependencies.pri b/src/plugins/clangcodemodel/clangcodemodel_dependencies.pri
index e5025980de6..335569d766d 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 \
- codemodelbackendipc
+ clangbackendipc
QTC_PLUGIN_DEPENDS += \
coreplugin \
cpptools \
diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index e1edeb50978..9d358231c66 100644
--- a/src/plugins/clangcodemodel/clangcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangcompletion.cpp
@@ -68,7 +68,7 @@
#include <QTextCursor>
#include <QTextDocument>
-using namespace CodeModelBackEnd;
+using namespace ClangBackEnd;
using namespace ClangCodeModel;
using namespace ClangCodeModel::Internal;
using namespace CPlusPlus;
diff --git a/src/plugins/clangcodemodel/clangcompletion.h b/src/plugins/clangcodemodel/clangcompletion.h
index 11166f43787..09f551a2f01 100644
--- a/src/plugins/clangcodemodel/clangcompletion.h
+++ b/src/plugins/clangcodemodel/clangcompletion.h
@@ -32,7 +32,7 @@
#define CPPEDITOR_INTERNAL_CLANGCOMPLETION_H
#include "clangcompleter.h"
-#include "codemodelbackendipcintegration.h"
+#include "clangbackendipcintegration.h"
#include <cpptools/cppcompletionassistprocessor.h>
#include <cpptools/cppcompletionassistprovider.h>
@@ -43,7 +43,7 @@
#include <texteditor/codeassist/completionassistprovider.h>
#include <texteditor/codeassist/ifunctionhintproposalmodel.h>
-#include <codemodelbackendipc/codecompletion.h>
+#include <clangbackendipc/codecompletion.h>
#include <QStringList>
#include <QTextCursor>
@@ -51,7 +51,7 @@
namespace ClangCodeModel {
namespace Internal {
-using CodeCompletions = QVector<CodeModelBackEnd::CodeCompletion>;
+using CodeCompletions = QVector<ClangBackEnd::CodeCompletion>;
class ClangAssistProposalModel;
@@ -87,16 +87,16 @@ public:
void keepCompletionOperator(unsigned compOp) { m_completionOperator = compOp; }
bool isOverloaded() const;
- void addOverload(const CodeModelBackEnd::CodeCompletion &ccr);
+ void addOverload(const ClangBackEnd::CodeCompletion &ccr);
- CodeModelBackEnd::CodeCompletion originalItem() const;
+ ClangBackEnd::CodeCompletion originalItem() const;
bool isCodeCompletion() const;
private:
unsigned m_completionOperator;
mutable QChar m_typedChar;
- QList<CodeModelBackEnd::CodeCompletion> m_overloads;
+ QList<ClangBackEnd::CodeCompletion> m_overloads;
};
class ClangFunctionHintModel : public TextEditor::IFunctionHintProposalModel
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 5f7a0ccf1ae..bae1ac3e2f5 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -138,7 +138,7 @@ ClangEditorDocumentProcessor::~ClangEditorDocumentProcessor()
QTC_ASSERT(m_modelManagerSupport, return);
m_modelManagerSupport->ipcCommunicator()->unregisterFilesForCodeCompletion(
- {CodeModelBackEnd::FileContainer(filePath(), projectFilePath)});
+ {ClangBackEnd::FileContainer(filePath(), projectFilePath)});
}
void ClangEditorDocumentProcessor::run()
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index 113090bfad1..5a15dad80f3 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -40,9 +40,9 @@
#include <cpptools/editordocumenthandle.h>
#include <projectexplorer/project.h>
-#include <codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.h>
-#include <codemodelbackendipc/filecontainer.h>
-#include <codemodelbackendipc/projectpartcontainer.h>
+#include <clangbackendipc/cmbregisterprojectsforcodecompletioncommand.h>
+#include <clangbackendipc/filecontainer.h>
+#include <clangbackendipc/projectpartcontainer.h>
#include <utils/qtcassert.h>
#include <QCoreApplication>
@@ -160,7 +160,7 @@ void ModelManagerSupportClang::onAbstractEditorSupportRemoved(const QString &fil
if (!cppModelManager()->cppEditorDocument(filePath)) {
const QString projectFilePath = Utils::projectFilePathForFile(filePath);
m_ipcCommunicator->unregisterFilesForCodeCompletion(
- {CodeModelBackEnd::FileContainer(filePath, projectFilePath)});
+ {ClangBackEnd::FileContainer(filePath, projectFilePath)});
}
}
diff --git a/src/plugins/clangcodemodel/completionchunkstotextconverter.cpp b/src/plugins/clangcodemodel/completionchunkstotextconverter.cpp
index 507c4d6939d..3027039603c 100644
--- a/src/plugins/clangcodemodel/completionchunkstotextconverter.cpp
+++ b/src/plugins/clangcodemodel/completionchunkstotextconverter.cpp
@@ -33,7 +33,7 @@
namespace ClangCodeModel {
namespace Internal {
-void CompletionChunksToTextConverter::parseChunks(const QVector<CodeModelBackEnd::CodeCompletionChunk> &codeCompletionChunks)
+void CompletionChunksToTextConverter::parseChunks(const QVector<ClangBackEnd::CodeCompletionChunk> &codeCompletionChunks)
{
m_text.clear();
@@ -46,7 +46,7 @@ const QString &CompletionChunksToTextConverter::text() const
return m_text;
}
-QString CompletionChunksToTextConverter::convert(const QVector<CodeModelBackEnd::CodeCompletionChunk> &codeCompletionChunks)
+QString CompletionChunksToTextConverter::convert(const QVector<ClangBackEnd::CodeCompletionChunk> &codeCompletionChunks)
{
CompletionChunksToTextConverter converter;
@@ -55,9 +55,9 @@ QString CompletionChunksToTextConverter::convert(const QVector<CodeModelBackEnd:
return converter.text();
}
-void CompletionChunksToTextConverter::parse(const CodeModelBackEnd::CodeCompletionChunk &codeCompletionChunk)
+void CompletionChunksToTextConverter::parse(const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk)
{
- using CodeModelBackEnd::CodeCompletionChunk;
+ using ClangBackEnd::CodeCompletionChunk;
switch (codeCompletionChunk.kind()) {
case CodeCompletionChunk::ResultType: parseResultType(codeCompletionChunk.text()); break;
@@ -76,7 +76,7 @@ void CompletionChunksToTextConverter::parseText(const Utf8String &text)
m_text += text.toString();
}
-void CompletionChunksToTextConverter::parseOptional(const CodeModelBackEnd::CodeCompletionChunk &optionalCodeCompletionChunk)
+void CompletionChunksToTextConverter::parseOptional(const ClangBackEnd::CodeCompletionChunk &optionalCodeCompletionChunk)
{
m_text += QStringLiteral("<i>");
diff --git a/src/plugins/clangcodemodel/completionchunkstotextconverter.h b/src/plugins/clangcodemodel/completionchunkstotextconverter.h
index fbb78929fef..41940f51e18 100644
--- a/src/plugins/clangcodemodel/completionchunkstotextconverter.h
+++ b/src/plugins/clangcodemodel/completionchunkstotextconverter.h
@@ -31,7 +31,7 @@
#ifndef CLANGCODEMODEL_INTERNAL_COMPLETIONCHUNKSTOTEXTCONVERTER_H
#define CLANGCODEMODEL_INTERNAL_COMPLETIONCHUNKSTOTEXTCONVERTER_H
-#include <codemodelbackendipc/codecompletionchunk.h>
+#include <clangbackendipc/codecompletionchunk.h>
#include <QString>
@@ -43,17 +43,17 @@ namespace Internal {
class CompletionChunksToTextConverter
{
public:
- void parseChunks(const QVector<CodeModelBackEnd::CodeCompletionChunk> &codeCompletionChunks);
+ void parseChunks(const QVector<ClangBackEnd::CodeCompletionChunk> &codeCompletionChunks);
const QString &text() const;
- static QString convert(const QVector<CodeModelBackEnd::CodeCompletionChunk> &codeCompletionChunks);
+ static QString convert(const QVector<ClangBackEnd::CodeCompletionChunk> &codeCompletionChunks);
private:
- void parse(const CodeModelBackEnd::CodeCompletionChunk & codeCompletionChunk);
+ void parse(const ClangBackEnd::CodeCompletionChunk & codeCompletionChunk);
void parseResultType(const Utf8String &text);
void parseText(const Utf8String &text);
- void parseOptional(const CodeModelBackEnd::CodeCompletionChunk & optionalCodeCompletionChunk);
+ void parseOptional(const ClangBackEnd::CodeCompletionChunk & optionalCodeCompletionChunk);
private:
QString m_text;
diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
index 7d196068fcf..29b74815ddf 100644
--- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
+++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
@@ -30,7 +30,7 @@
#include "clangcodecompletion_test.h"
-#include "../codemodelbackendipcintegration.h"
+#include "../clangbackendipcintegration.h"
#include "../clangmodelmanagersupport.h"
#include <clangcodemodel/clangcompletion.h>
@@ -52,19 +52,19 @@
#include <texteditor/textdocument.h>
#include <texteditor/texteditor.h>
-#include <codemodelbackendipc/cmbcompletecodecommand.h>
-#include <codemodelbackendipc/cmbendcommand.h>
-#include <codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.h>
-#include <codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.h>
-#include <codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h>
+#include <clangbackendipc/cmbcompletecodecommand.h>
+#include <clangbackendipc/cmbendcommand.h>
+#include <clangbackendipc/cmbregisterprojectsforcodecompletioncommand.h>
+#include <clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.h>
+#include <clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h>
#include <utils/changeset.h>
#include <utils/qtcassert.h>
#include <QDebug>
#include <QtTest>
-using namespace CodeModelBackEnd;
+using namespace ClangBackEnd;
using namespace ClangCodeModel;
using namespace ClangCodeModel::Internal;
diff --git a/src/tools/codemodelbackend/codemodelbackend.pri b/src/tools/clangbackend/clangbackend.pri
similarity index 71%
rename from src/tools/codemodelbackend/codemodelbackend.pri
rename to src/tools/clangbackend/clangbackend.pri
index 65f8d134662..099c9690893 100644
--- a/src/tools/codemodelbackend/codemodelbackend.pri
+++ b/src/tools/clangbackend/clangbackend.pri
@@ -1,17 +1,17 @@
QTC_LIB_DEPENDS += \
sqlite \
- codemodelbackendipc
+ clangbackendipc
QT += core network
QT -= gui
-TARGET = codemodelbackend
+TARGET = clangbackend
CONFIG += console
CONFIG -= app_bundle C++-14
TEMPLATE = app
-include(ipcsource/codemodelbackendclangipc-source.pri)
+include(ipcsource/clangbackendclangipc-source.pri)
include(../../../qtcreator.pri)
include(../../shared/clang/clang_installation.pri)
include(../../rpath.pri)
@@ -19,7 +19,7 @@ include(../../rpath.pri)
LIBS += $$LLVM_LIBS
INCLUDEPATH += $$LLVM_INCLUDEPATH
-SOURCES += codemodelbackendmain.cpp
+SOURCES += clangbackendmain.cpp
osx {
QMAKE_LFLAGS += -Wl,-rpath,$${LLVM_LIBDIR}
diff --git a/src/tools/codemodelbackend/codemodelbackend.pro b/src/tools/clangbackend/clangbackend.pro
similarity index 78%
rename from src/tools/codemodelbackend/codemodelbackend.pro
rename to src/tools/clangbackend/clangbackend.pro
index 3f99b04b004..eae95c5d92a 100644
--- a/src/tools/codemodelbackend/codemodelbackend.pro
+++ b/src/tools/clangbackend/clangbackend.pro
@@ -1,4 +1,4 @@
-include(codemodelbackend.pri)
+include(clangbackend.pri)
DESTDIR = $$IDE_LIBEXEC_PATH
target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
diff --git a/src/tools/codemodelbackend/codemodelbackend.qbs b/src/tools/clangbackend/clangbackend.qbs
similarity index 85%
rename from src/tools/codemodelbackend/codemodelbackend.qbs
rename to src/tools/clangbackend/clangbackend.qbs
index e7971199964..04499e75d04 100644
--- a/src/tools/codemodelbackend/codemodelbackend.qbs
+++ b/src/tools/clangbackend/clangbackend.qbs
@@ -3,9 +3,9 @@ import QtcClangInstallation as Clang
import QtcProcessOutputReader
QtcTool {
- name: "codemodelbackend"
+ name: "clangbackend"
- Depends { name: "CodeModelBackEndIpc" }
+ Depends { name: "ClangBackEndIpc" }
Group {
prefix: "ipcsource/"
@@ -15,7 +15,7 @@ QtcTool {
]
}
- files: [ "codemodelbackendmain.cpp" ]
+ files: [ "clangbackendmain.cpp" ]
property string llvmConfig: Clang.llvmConfig(qbs)
property string llvmIncludeDir: Clang.includeDir(llvmConfig, QtcProcessOutputReader)
diff --git a/src/tools/codemodelbackend/codemodelbackendmain.cpp b/src/tools/clangbackend/clangbackendmain.cpp
similarity index 89%
rename from src/tools/codemodelbackend/codemodelbackendmain.cpp
rename to src/tools/clangbackend/clangbackendmain.cpp
index 398ebaaaf51..500515f51f2 100644
--- a/src/tools/codemodelbackend/codemodelbackendmain.cpp
+++ b/src/tools/clangbackend/clangbackendmain.cpp
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
{
QCoreApplication::setOrganizationName(QStringLiteral("QtProject"));
QCoreApplication::setOrganizationDomain(QStringLiteral("qt-project.org"));
- QCoreApplication::setApplicationName(QStringLiteral("CodeModelBackend"));
+ QCoreApplication::setApplicationName(QStringLiteral("ClangBackend"));
QCoreApplication::setApplicationVersion(QStringLiteral("1.0.0"));
QCoreApplication application(argc, argv);
@@ -48,10 +48,10 @@ int main(int argc, char *argv[])
return 1;
}
- CodeModelBackEnd::Commands::registerCommands();
+ ClangBackEnd::Commands::registerCommands();
- CodeModelBackEnd::ClangIpcServer clangIpcServer;
- CodeModelBackEnd::ConnectionServer connectionServer(application.arguments()[1]);
+ ClangBackEnd::ClangIpcServer clangIpcServer;
+ ClangBackEnd::ConnectionServer connectionServer(application.arguments()[1]);
connectionServer.start();
connectionServer.setIpcServer(&clangIpcServer);
diff --git a/src/tools/codemodelbackend/ipcsource/codemodelbackendclangipc-source.pri b/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
similarity index 100%
rename from src/tools/codemodelbackend/ipcsource/codemodelbackendclangipc-source.pri
rename to src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
diff --git a/src/tools/codemodelbackend/ipcsource/clangcodecompleteresults.cpp b/src/tools/clangbackend/ipcsource/clangcodecompleteresults.cpp
similarity index 97%
rename from src/tools/codemodelbackend/ipcsource/clangcodecompleteresults.cpp
rename to src/tools/clangbackend/ipcsource/clangcodecompleteresults.cpp
index 25a57424145..210a6a71992 100644
--- a/src/tools/codemodelbackend/ipcsource/clangcodecompleteresults.cpp
+++ b/src/tools/clangbackend/ipcsource/clangcodecompleteresults.cpp
@@ -32,7 +32,7 @@
#include <memory>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
using std::swap;
@@ -68,5 +68,5 @@ ClangCodeCompleteResults::ClangCodeCompleteResults(ClangCodeCompleteResults &&cl
swap(cxCodeCompleteResults, clangCodeCompleteResults.cxCodeCompleteResults);
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/clangcodecompleteresults.h b/src/tools/clangbackend/ipcsource/clangcodecompleteresults.h
similarity index 91%
rename from src/tools/codemodelbackend/ipcsource/clangcodecompleteresults.h
rename to src/tools/clangbackend/ipcsource/clangcodecompleteresults.h
index 4ba7605f272..1f3fdca0844 100644
--- a/src/tools/codemodelbackend/ipcsource/clangcodecompleteresults.h
+++ b/src/tools/clangbackend/ipcsource/clangcodecompleteresults.h
@@ -28,15 +28,15 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_CLANGCODECOMPLETERESULTS_H
-#define CODEMODELBACKEND_CLANGCODECOMPLETERESULTS_H
+#ifndef CLANGBACKEND_CLANGCODECOMPLETERESULTS_H
+#define CLANGBACKEND_CLANGCODECOMPLETERESULTS_H
#include <clang-c/Index.h>
#include <utf8string.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class ClangCodeCompleteResults
{
@@ -58,6 +58,6 @@ private:
CXCodeCompleteResults *cxCodeCompleteResults = nullptr;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_CLANGCODECOMPLETERESULTS_H
+#endif // CLANGBACKEND_CLANGCODECOMPLETERESULTS_H
diff --git a/src/tools/codemodelbackend/ipcsource/clangipcserver.cpp b/src/tools/clangbackend/ipcsource/clangipcserver.cpp
similarity index 94%
rename from src/tools/codemodelbackend/ipcsource/clangipcserver.cpp
rename to src/tools/clangbackend/ipcsource/clangipcserver.cpp
index c385cfcd073..11805928d1d 100644
--- a/src/tools/codemodelbackend/ipcsource/clangipcserver.cpp
+++ b/src/tools/clangbackend/ipcsource/clangipcserver.cpp
@@ -51,7 +51,7 @@
#include <QDebug>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
ClangIpcServer::ClangIpcServer()
: translationUnits(projects, unsavedFiles)
@@ -63,7 +63,7 @@ void ClangIpcServer::end()
QCoreApplication::exit();
}
-void ClangIpcServer::registerTranslationUnitsForCodeCompletion(const CodeModelBackEnd::RegisterTranslationUnitForCodeCompletionCommand &command)
+void ClangIpcServer::registerTranslationUnitsForCodeCompletion(const ClangBackEnd::RegisterTranslationUnitForCodeCompletionCommand &command)
{
try {
translationUnits.createOrUpdate(command.fileContainers());
@@ -75,7 +75,7 @@ void ClangIpcServer::registerTranslationUnitsForCodeCompletion(const CodeModelBa
}
}
-void ClangIpcServer::unregisterTranslationUnitsForCodeCompletion(const CodeModelBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand &command)
+void ClangIpcServer::unregisterTranslationUnitsForCodeCompletion(const ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand &command)
{
try {
translationUnits.remove(command.fileContainers());
@@ -108,7 +108,7 @@ void ClangIpcServer::unregisterProjectPartsForCodeCompletion(const UnregisterPro
}
}
-void ClangIpcServer::completeCode(const CodeModelBackEnd::CompleteCodeCommand &command)
+void ClangIpcServer::completeCode(const ClangBackEnd::CompleteCodeCommand &command)
{
try {
CodeCompleter codeCompleter(translationUnits.translationUnit(command.filePath(), command.projectPartId()));
diff --git a/src/tools/codemodelbackend/ipcsource/clangipcserver.h b/src/tools/clangbackend/ipcsource/clangipcserver.h
similarity index 97%
rename from src/tools/codemodelbackend/ipcsource/clangipcserver.h
rename to src/tools/clangbackend/ipcsource/clangipcserver.h
index 10c7ebd8a79..4f2418da430 100644
--- a/src/tools/codemodelbackend/ipcsource/clangipcserver.h
+++ b/src/tools/clangbackend/ipcsource/clangipcserver.h
@@ -43,7 +43,7 @@
#include <QMap>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class ClangIpcServer : public IpcServerInterface
{
@@ -63,5 +63,5 @@ private:
TranslationUnits translationUnits;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
#endif // CLANGIPCSERVER_H
diff --git a/src/tools/codemodelbackend/ipcsource/clangstring.cpp b/src/tools/clangbackend/ipcsource/clangstring.cpp
similarity index 97%
rename from src/tools/codemodelbackend/ipcsource/clangstring.cpp
rename to src/tools/clangbackend/ipcsource/clangstring.cpp
index 139d496c18f..00bd83a3a33 100644
--- a/src/tools/codemodelbackend/ipcsource/clangstring.cpp
+++ b/src/tools/clangbackend/ipcsource/clangstring.cpp
@@ -32,7 +32,7 @@
#include <memory>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
ClangString::ClangString(CXString cxString)
: cxString(cxString)
@@ -70,5 +70,5 @@ ClangString::operator Utf8String() const
return Utf8String(clang_getCString(cxString), -1);
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/clangstring.h b/src/tools/clangbackend/ipcsource/clangstring.h
similarity index 91%
rename from src/tools/codemodelbackend/ipcsource/clangstring.h
rename to src/tools/clangbackend/ipcsource/clangstring.h
index c38712c1c0f..d0b1055a032 100644
--- a/src/tools/codemodelbackend/ipcsource/clangstring.h
+++ b/src/tools/clangbackend/ipcsource/clangstring.h
@@ -28,14 +28,14 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_CLANGSTRING_H
-#define CODEMODELBACKEND_CLANGSTRING_H
+#ifndef CLANGBACKEND_CLANGSTRING_H
+#define CLANGBACKEND_CLANGSTRING_H
#include <clang-c/CXString.h>
#include <utf8string.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class ClangString
{
@@ -57,6 +57,6 @@ private:
CXString cxString;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_CLANGSTRING_H
+#endif // CLANGBACKEND_CLANGSTRING_H
diff --git a/src/tools/codemodelbackend/ipcsource/codecompletefailedexception.cpp b/src/tools/clangbackend/ipcsource/codecompletefailedexception.cpp
similarity index 100%
rename from src/tools/codemodelbackend/ipcsource/codecompletefailedexception.cpp
rename to src/tools/clangbackend/ipcsource/codecompletefailedexception.cpp
diff --git a/src/tools/codemodelbackend/ipcsource/codecompletefailedexception.h b/src/tools/clangbackend/ipcsource/codecompletefailedexception.h
similarity index 100%
rename from src/tools/codemodelbackend/ipcsource/codecompletefailedexception.h
rename to src/tools/clangbackend/ipcsource/codecompletefailedexception.h
diff --git a/src/tools/codemodelbackend/ipcsource/codecompleter.cpp b/src/tools/clangbackend/ipcsource/codecompleter.cpp
similarity index 97%
rename from src/tools/codemodelbackend/ipcsource/codecompleter.cpp
rename to src/tools/clangbackend/ipcsource/codecompleter.cpp
index 1943d6fab8c..6aebe1a5f12 100644
--- a/src/tools/codemodelbackend/ipcsource/codecompleter.cpp
+++ b/src/tools/clangbackend/ipcsource/codecompleter.cpp
@@ -41,7 +41,7 @@
#include <QDebug>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
CodeCompleter::CodeCompleter(TranslationUnit translationUnit)
: translationUnit(std::move(translationUnit))
@@ -74,5 +74,5 @@ void CodeCompleter::checkCodeCompleteResult(CXCodeCompleteResults *completeResul
throw CodeCompleteFailedException();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/codecompleter.h b/src/tools/clangbackend/ipcsource/codecompleter.h
similarity index 91%
rename from src/tools/codemodelbackend/ipcsource/codecompleter.h
rename to src/tools/clangbackend/ipcsource/codecompleter.h
index d47f131516f..cf9f0aba6b5 100644
--- a/src/tools/codemodelbackend/ipcsource/codecompleter.h
+++ b/src/tools/clangbackend/ipcsource/codecompleter.h
@@ -28,15 +28,15 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_CODECOMPLETER_H
-#define CODEMODELBACKEND_CODECOMPLETER_H
+#ifndef CLANGBACKEND_CODECOMPLETER_H
+#define CLANGBACKEND_CODECOMPLETER_H
#include <codecompletion.h>
#include <utf8stringvector.h>
#include "translationunit.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class TranslationUnit;
@@ -56,6 +56,6 @@ private:
TranslationUnit translationUnit;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_CODECOMPLETER_H
+#endif // CLANGBACKEND_CODECOMPLETER_H
diff --git a/src/tools/codemodelbackend/ipcsource/codecompletionchunkconverter.cpp b/src/tools/clangbackend/ipcsource/codecompletionchunkconverter.cpp
similarity index 98%
rename from src/tools/codemodelbackend/ipcsource/codecompletionchunkconverter.cpp
rename to src/tools/clangbackend/ipcsource/codecompletionchunkconverter.cpp
index deda1fea0f3..7fb2429c257 100644
--- a/src/tools/codemodelbackend/ipcsource/codecompletionchunkconverter.cpp
+++ b/src/tools/clangbackend/ipcsource/codecompletionchunkconverter.cpp
@@ -32,7 +32,7 @@
#include "clangstring.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
void CodeCompletionChunkConverter::extractCompletionChunks(CXCompletionString completionString)
{
@@ -93,5 +93,5 @@ QVector<CodeCompletionChunk> CodeCompletionChunkConverter::optionalChunks(CXComp
return converter.chunks;
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/codecompletionchunkconverter.h b/src/tools/clangbackend/ipcsource/codecompletionchunkconverter.h
similarity index 90%
rename from src/tools/codemodelbackend/ipcsource/codecompletionchunkconverter.h
rename to src/tools/clangbackend/ipcsource/codecompletionchunkconverter.h
index 772cf8409ef..a3b92de62b3 100644
--- a/src/tools/codemodelbackend/ipcsource/codecompletionchunkconverter.h
+++ b/src/tools/clangbackend/ipcsource/codecompletionchunkconverter.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_CODECOMPLETIONCHUNKCONVERTER_H
-#define CODEMODELBACKEND_CODECOMPLETIONCHUNKCONVERTER_H
+#ifndef CLANGBACKEND_CODECOMPLETIONCHUNKCONVERTER_H
+#define CLANGBACKEND_CODECOMPLETIONCHUNKCONVERTER_H
#include <codecompletionchunk.h>
@@ -37,7 +37,7 @@
#include <clang-c/Index.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CodeCompletionChunkConverter
{
@@ -56,6 +56,6 @@ private:
QVector<CodeCompletionChunk> chunks;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_CODECOMPLETIONCHUNKCONVERTER_H
+#endif // CLANGBACKEND_CODECOMPLETIONCHUNKCONVERTER_H
diff --git a/src/tools/codemodelbackend/ipcsource/codecompletionsextractor.cpp b/src/tools/clangbackend/ipcsource/codecompletionsextractor.cpp
similarity index 98%
rename from src/tools/codemodelbackend/ipcsource/codecompletionsextractor.cpp
rename to src/tools/clangbackend/ipcsource/codecompletionsextractor.cpp
index b6e28b02d35..4621cbcf539 100644
--- a/src/tools/codemodelbackend/ipcsource/codecompletionsextractor.cpp
+++ b/src/tools/clangbackend/ipcsource/codecompletionsextractor.cpp
@@ -33,13 +33,13 @@
#include "clangstring.h"
#include "codecompletionchunkconverter.h"
-#ifdef CODEMODELBACKEND_TESTS
+#ifdef CLANGBACKEND_TESTS
#include <gtest/gtest.h>
#endif
#include <QDebug>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
CodeCompletionsExtractor::CodeCompletionsExtractor(CXCodeCompleteResults *cxCodeCompleteResults)
: cxCodeCompleteResults(cxCodeCompleteResults)
@@ -271,7 +271,7 @@ const CodeCompletion &CodeCompletionsExtractor::currentCodeCompletion() const
return currentCodeCompletion_;
}
-#ifdef CODEMODELBACKEND_TESTS
+#ifdef CLANGBACKEND_TESTS
void PrintTo(const CodeCompletionsExtractor &extractor, std::ostream *os)
{
*os << "name: " << ::testing::PrintToString(extractor.currentCodeCompletion().text())
@@ -281,5 +281,5 @@ void PrintTo(const CodeCompletionsExtractor &extractor, std::ostream *os)
}
#endif
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/codecompletionsextractor.h b/src/tools/clangbackend/ipcsource/codecompletionsextractor.h
similarity index 91%
rename from src/tools/codemodelbackend/ipcsource/codecompletionsextractor.h
rename to src/tools/clangbackend/ipcsource/codecompletionsextractor.h
index 54010edbcf3..efeae114859 100644
--- a/src/tools/codemodelbackend/ipcsource/codecompletionsextractor.h
+++ b/src/tools/clangbackend/ipcsource/codecompletionsextractor.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_CODECOMPLETIONSEXTRACTOR_H
-#define CODEMODELBACKEND_CODECOMPLETIONSEXTRACTOR_H
+#ifndef CLANGBACKEND_CODECOMPLETIONSEXTRACTOR_H
+#define CLANGBACKEND_CODECOMPLETIONSEXTRACTOR_H
#include <clang-c/Index.h>
@@ -37,7 +37,7 @@
#include <codecompletion.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class CodeCompletionsExtractor
{
@@ -76,9 +76,9 @@ private:
uint cxCodeCompleteResultIndex = -1;
};
-#ifdef CODEMODELBACKEND_TESTS
+#ifdef CLANGBACKEND_TESTS
void PrintTo(const CodeCompletionsExtractor &extractor, ::std::ostream* os);
#endif
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_CODECOMPLETIONSEXTRACTOR_H
+#endif // CLANGBACKEND_CODECOMPLETIONSEXTRACTOR_H
diff --git a/src/tools/codemodelbackend/ipcsource/projectpart.cpp b/src/tools/clangbackend/ipcsource/projectpart.cpp
similarity index 98%
rename from src/tools/codemodelbackend/ipcsource/projectpart.cpp
rename to src/tools/clangbackend/ipcsource/projectpart.cpp
index e560ea705f1..24828cc9653 100644
--- a/src/tools/codemodelbackend/ipcsource/projectpart.cpp
+++ b/src/tools/clangbackend/ipcsource/projectpart.cpp
@@ -36,7 +36,7 @@
#include <projectpartcontainer.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class ProjectPartData {
public:
@@ -154,5 +154,5 @@ bool operator==(const ProjectPart &first, const ProjectPart &second)
return first.projectPartId() == second.projectPartId();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/projectpart.h b/src/tools/clangbackend/ipcsource/projectpart.h
similarity index 93%
rename from src/tools/codemodelbackend/ipcsource/projectpart.h
rename to src/tools/clangbackend/ipcsource/projectpart.h
index 01e7b82cc8b..3b5419986b7 100644
--- a/src/tools/codemodelbackend/ipcsource/projectpart.h
+++ b/src/tools/clangbackend/ipcsource/projectpart.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_PROJECT_H
-#define CODEMODELBACKEND_PROJECT_H
+#ifndef CLANGBACKEND_PROJECT_H
+#define CLANGBACKEND_PROJECT_H
#include <memory>
#include <vector>
@@ -38,7 +38,7 @@
class Utf8String;
class Utf8StringVector;
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class ProjectPartContainer;
class ProjectPartData;
@@ -80,6 +80,6 @@ private:
bool operator==(const ProjectPart &first, const ProjectPart &second);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_PROJECT_H
+#endif // CLANGBACKEND_PROJECT_H
diff --git a/src/tools/codemodelbackend/ipcsource/projectpartsdonotexistexception.cpp b/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.cpp
similarity index 97%
rename from src/tools/codemodelbackend/ipcsource/projectpartsdonotexistexception.cpp
rename to src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.cpp
index a896481ca0f..4bdeea9bbf5 100644
--- a/src/tools/codemodelbackend/ipcsource/projectpartsdonotexistexception.cpp
+++ b/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.cpp
@@ -30,7 +30,7 @@
#include "projectpartsdonotexistexception.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
ProjectPartDoNotExistException::ProjectPartDoNotExistException(const Utf8StringVector &projectPartIds)
: projectPartIds_(projectPartIds)
@@ -52,5 +52,5 @@ const char *ProjectPartDoNotExistException::what() const Q_DECL_NOEXCEPT
return what_.constData();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/projectpartsdonotexistexception.h b/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.h
similarity index 89%
rename from src/tools/codemodelbackend/ipcsource/projectpartsdonotexistexception.h
rename to src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.h
index 6abaf390084..da10dba890e 100644
--- a/src/tools/codemodelbackend/ipcsource/projectpartsdonotexistexception.h
+++ b/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.h
@@ -28,14 +28,14 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_PROJECTDONOTEXISTSEXCEPTION_H
-#define CODEMODELBACKEND_PROJECTDONOTEXISTSEXCEPTION_H
+#ifndef CLANGBACKEND_PROJECTDONOTEXISTSEXCEPTION_H
+#define CLANGBACKEND_PROJECTDONOTEXISTSEXCEPTION_H
#include <utf8stringvector.h>
#include <exception>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class ProjectPartDoNotExistException : public std::exception
{
@@ -57,6 +57,6 @@ private:
mutable Utf8String what_;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_PROJECTDONOTEXISTSEXCEPTION_H
+#endif // CLANGBACKEND_PROJECTDONOTEXISTSEXCEPTION_H
diff --git a/src/tools/codemodelbackend/ipcsource/projects.cpp b/src/tools/clangbackend/ipcsource/projects.cpp
similarity index 98%
rename from src/tools/codemodelbackend/ipcsource/projects.cpp
rename to src/tools/clangbackend/ipcsource/projects.cpp
index 2e2aa4afb4a..cd6d4d0488b 100644
--- a/src/tools/codemodelbackend/ipcsource/projects.cpp
+++ b/src/tools/clangbackend/ipcsource/projects.cpp
@@ -34,7 +34,7 @@
#include "projectpartsdonotexistexception.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
void ProjectParts::createOrUpdate(const QVector<ProjectPartContainer> &projectContainers)
{
@@ -101,5 +101,5 @@ void ProjectParts::createOrUpdateProjectPart(const ProjectPartContainer &project
}
-} // namespace CodeModelbackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/projects.h b/src/tools/clangbackend/ipcsource/projects.h
similarity index 92%
rename from src/tools/codemodelbackend/ipcsource/projects.h
rename to src/tools/clangbackend/ipcsource/projects.h
index b63cc028747..10580365663 100644
--- a/src/tools/codemodelbackend/ipcsource/projects.h
+++ b/src/tools/clangbackend/ipcsource/projects.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_PROJECTS_H
-#define CODEMODELBACKEND_PROJECTS_H
+#ifndef CLANGBACKEND_PROJECTS_H
+#define CLANGBACKEND_PROJECTS_H
#include <projectpartcontainer.h>
@@ -37,7 +37,7 @@
#include <vector>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class ProjectParts
{
@@ -61,6 +61,6 @@ private:
std::vector<ProjectPart> projects_;
};
-} // namespace CodeModelbackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_PROJECTS_H
+#endif // CLANGBACKEND_PROJECTS_H
diff --git a/src/tools/codemodelbackend/ipcsource/translationunit.cpp b/src/tools/clangbackend/ipcsource/translationunit.cpp
similarity index 99%
rename from src/tools/codemodelbackend/ipcsource/translationunit.cpp
rename to src/tools/clangbackend/ipcsource/translationunit.cpp
index e9664038a79..63e173b3426 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunit.cpp
+++ b/src/tools/clangbackend/ipcsource/translationunit.cpp
@@ -42,7 +42,7 @@
#include "unsavedfiles.h"
#include "projectpart.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class TranslationUnitData
{
@@ -226,5 +226,5 @@ bool operator==(const TranslationUnit &first, const TranslationUnit &second)
return first.filePath() == second.filePath() && first.projectPartId() == second.projectPartId();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/translationunit.h b/src/tools/clangbackend/ipcsource/translationunit.h
similarity index 94%
rename from src/tools/codemodelbackend/ipcsource/translationunit.h
rename to src/tools/clangbackend/ipcsource/translationunit.h
index 52efd2b2010..5f7bc475d79 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunit.h
+++ b/src/tools/clangbackend/ipcsource/translationunit.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_TRANSLATIONUNIT_H
-#define CODEMODELBACKEND_TRANSLATIONUNIT_H
+#ifndef CLANGBACKEND_TRANSLATIONUNIT_H
+#define CLANGBACKEND_TRANSLATIONUNIT_H
#include <clang-c/Index.h>
@@ -40,7 +40,7 @@
class Utf8String;
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class TranslationUnitData;
class CodeCompleter;
@@ -98,6 +98,6 @@ private:
bool operator==(const TranslationUnit &first, const TranslationUnit &second);
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_TRANSLATIONUNIT_H
+#endif // CLANGBACKEND_TRANSLATIONUNIT_H
diff --git a/src/tools/codemodelbackend/ipcsource/translationunitdoesnotexistexception.cpp b/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.cpp
similarity index 97%
rename from src/tools/codemodelbackend/ipcsource/translationunitdoesnotexistexception.cpp
rename to src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.cpp
index 61761283cbe..e06bb85f3ff 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunitdoesnotexistexception.cpp
+++ b/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.cpp
@@ -30,7 +30,7 @@
#include "translationunitdoesnotexistexception.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
TranslationUnitDoesNotExistException::TranslationUnitDoesNotExistException(const FileContainer &fileContainer)
: fileContainer_(fileContainer)
@@ -59,5 +59,5 @@ const char *TranslationUnitDoesNotExistException::what() const Q_DECL_NOEXCEPT
return what_.constData();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/translationunitdoesnotexistexception.h b/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.h
similarity index 90%
rename from src/tools/codemodelbackend/ipcsource/translationunitdoesnotexistexception.h
rename to src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.h
index 648d76ea2c9..c4b539bc923 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunitdoesnotexistexception.h
+++ b/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.h
@@ -28,12 +28,12 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_TRANSLATIONUNITDONOTEXISTS_H
-#define CODEMODELBACKEND_TRANSLATIONUNITDONOTEXISTS_H
+#ifndef CLANGBACKEND_TRANSLATIONUNITDONOTEXISTS_H
+#define CLANGBACKEND_TRANSLATIONUNITDONOTEXISTS_H
#include <filecontainer.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class TranslationUnitDoesNotExistException : public std::exception
{
@@ -56,6 +56,6 @@ private:
mutable Utf8String what_;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_TRANSLATIONUNITDONOTEXISTS_H
+#endif // CLANGBACKEND_TRANSLATIONUNITDONOTEXISTS_H
diff --git a/src/tools/codemodelbackend/ipcsource/translationunitfilenotexitexception.cpp b/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.cpp
similarity index 97%
rename from src/tools/codemodelbackend/ipcsource/translationunitfilenotexitexception.cpp
rename to src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.cpp
index 29836a22bc6..1a94d612d9a 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunitfilenotexitexception.cpp
+++ b/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.cpp
@@ -30,7 +30,7 @@
#include "translationunitfilenotexitexception.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
TranslationUnitFileNotExitsException::TranslationUnitFileNotExitsException(const Utf8String &filePath)
: filePath_(filePath)
@@ -52,5 +52,5 @@ const char *TranslationUnitFileNotExitsException::what() const Q_DECL_NOEXCEPT
return what_.constData();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/translationunitfilenotexitexception.h b/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.h
similarity index 89%
rename from src/tools/codemodelbackend/ipcsource/translationunitfilenotexitexception.h
rename to src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.h
index 186336c6fa6..7bef6092f83 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunitfilenotexitexception.h
+++ b/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.h
@@ -28,14 +28,14 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_TRANSLATIONUNITFILENOTEXITS_H
-#define CODEMODELBACKEND_TRANSLATIONUNITFILENOTEXITS_H
+#ifndef CLANGBACKEND_TRANSLATIONUNITFILENOTEXITS_H
+#define CLANGBACKEND_TRANSLATIONUNITFILENOTEXITS_H
#include <utf8string.h>
#include <exception>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class TranslationUnitFileNotExitsException : public std::exception
{
@@ -57,6 +57,6 @@ private:
mutable Utf8String what_;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_TRANSLATIONUNITFILENOTEXITS_H
+#endif // CLANGBACKEND_TRANSLATIONUNITFILENOTEXITS_H
diff --git a/src/tools/codemodelbackend/ipcsource/translationunitisnullexception.cpp b/src/tools/clangbackend/ipcsource/translationunitisnullexception.cpp
similarity index 96%
rename from src/tools/codemodelbackend/ipcsource/translationunitisnullexception.cpp
rename to src/tools/clangbackend/ipcsource/translationunitisnullexception.cpp
index 3ebb6a796a2..2afd8896f7e 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunitisnullexception.cpp
+++ b/src/tools/clangbackend/ipcsource/translationunitisnullexception.cpp
@@ -30,7 +30,7 @@
#include "translationunitisnullexception.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
const char *TranslationUnitIsNullException::what() const Q_DECL_NOEXCEPT
{
@@ -38,5 +38,5 @@ const char *TranslationUnitIsNullException::what() const Q_DECL_NOEXCEPT
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/translationunitisnullexception.h b/src/tools/clangbackend/ipcsource/translationunitisnullexception.h
similarity index 88%
rename from src/tools/codemodelbackend/ipcsource/translationunitisnullexception.h
rename to src/tools/clangbackend/ipcsource/translationunitisnullexception.h
index 247a23b2e60..d92e22b5c49 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunitisnullexception.h
+++ b/src/tools/clangbackend/ipcsource/translationunitisnullexception.h
@@ -28,14 +28,14 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_TRANSLATIONUNITISNULLEXCEPTION_H
-#define CODEMODELBACKEND_TRANSLATIONUNITISNULLEXCEPTION_H
+#ifndef CLANGBACKEND_TRANSLATIONUNITISNULLEXCEPTION_H
+#define CLANGBACKEND_TRANSLATIONUNITISNULLEXCEPTION_H
#include <QtGlobal>
#include <exception>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class TranslationUnitIsNullException : public std::exception
{
@@ -49,6 +49,6 @@ public:
#endif
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_TRANSLATIONUNITISNULLEXCEPTION_H
+#endif // CLANGBACKEND_TRANSLATIONUNITISNULLEXCEPTION_H
diff --git a/src/tools/codemodelbackend/ipcsource/translationunitparseerrorexception.cpp b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp
similarity index 97%
rename from src/tools/codemodelbackend/ipcsource/translationunitparseerrorexception.cpp
rename to src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp
index abd79a64ed5..c4a5b9389fb 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunitparseerrorexception.cpp
+++ b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp
@@ -32,7 +32,7 @@
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
TranslationUnitParseErrorException::TranslationUnitParseErrorException(const Utf8String &filePath, const Utf8String &projectPartId)
: filePath_(filePath),
@@ -62,5 +62,5 @@ const char *TranslationUnitParseErrorException::what() const Q_DECL_NOEXCEPT
return what_.constData();
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/translationunitparseerrorexception.h b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h
similarity index 89%
rename from src/tools/codemodelbackend/ipcsource/translationunitparseerrorexception.h
rename to src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h
index 5a7050183d8..1b36b5a14ee 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunitparseerrorexception.h
+++ b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h
@@ -28,14 +28,14 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_TRANSLATIONUNITPARSEERROREXCEPTION_H
-#define CODEMODELBACKEND_TRANSLATIONUNITPARSEERROREXCEPTION_H
+#ifndef CLANGBACKEND_TRANSLATIONUNITPARSEERROREXCEPTION_H
+#define CLANGBACKEND_TRANSLATIONUNITPARSEERROREXCEPTION_H
#include <utf8string.h>
#include <exception>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class TranslationUnitParseErrorException : public std::exception
{
@@ -59,6 +59,6 @@ private:
mutable Utf8String what_;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_TRANSLATIONUNITPARSEERROREXCEPTION_H
+#endif // CLANGBACKEND_TRANSLATIONUNITPARSEERROREXCEPTION_H
diff --git a/src/tools/codemodelbackend/ipcsource/translationunits.cpp b/src/tools/clangbackend/ipcsource/translationunits.cpp
similarity index 98%
rename from src/tools/codemodelbackend/ipcsource/translationunits.cpp
rename to src/tools/clangbackend/ipcsource/translationunits.cpp
index 1b4a3a91380..a9eb585bc46 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunits.cpp
+++ b/src/tools/clangbackend/ipcsource/translationunits.cpp
@@ -30,11 +30,11 @@
#include "translationunits.h"
+#include <projectpartsdonotexistexception.h>
#include <projects.h>
#include <translationunitdoesnotexistexception.h>
-#include <projectpartsdonotexistexception.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
bool operator==(const FileContainer &fileContainer, const TranslationUnit &translationUnit)
{
@@ -146,5 +146,5 @@ void TranslationUnits::checkIfProjectPartsExists(const QVector<FileContainer> &f
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/translationunits.h b/src/tools/clangbackend/ipcsource/translationunits.h
similarity index 93%
rename from src/tools/codemodelbackend/ipcsource/translationunits.h
rename to src/tools/clangbackend/ipcsource/translationunits.h
index 105ec0052f2..9a1478ad3bd 100644
--- a/src/tools/codemodelbackend/ipcsource/translationunits.h
+++ b/src/tools/clangbackend/ipcsource/translationunits.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_TRANSLATIONUNITS_H
-#define CODEMODELBACKEND_TRANSLATIONUNITS_H
+#ifndef CLANGBACKEND_TRANSLATIONUNITS_H
+#define CLANGBACKEND_TRANSLATIONUNITS_H
#include <filecontainer.h>
#include <QVector>
@@ -38,7 +38,7 @@
#include "translationunit.h"
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class ProjectParts;
class UnsavedFiles;
@@ -69,6 +69,6 @@ private:
UnsavedFiles &unsavedFiles;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_TRANSLATIONUNITS_H
+#endif // CLANGBACKEND_TRANSLATIONUNITS_H
diff --git a/src/tools/codemodelbackend/ipcsource/unsavedfiles.cpp b/src/tools/clangbackend/ipcsource/unsavedfiles.cpp
similarity index 98%
rename from src/tools/codemodelbackend/ipcsource/unsavedfiles.cpp
rename to src/tools/clangbackend/ipcsource/unsavedfiles.cpp
index a5029245a84..5e9c0f99dfd 100644
--- a/src/tools/codemodelbackend/ipcsource/unsavedfiles.cpp
+++ b/src/tools/clangbackend/ipcsource/unsavedfiles.cpp
@@ -33,7 +33,7 @@
#include <cstring>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class UnsavedFilesData
{
@@ -184,5 +184,5 @@ void UnsavedFiles::updateLastChangeTimePoint()
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/src/tools/codemodelbackend/ipcsource/unsavedfiles.h b/src/tools/clangbackend/ipcsource/unsavedfiles.h
similarity index 94%
rename from src/tools/codemodelbackend/ipcsource/unsavedfiles.h
rename to src/tools/clangbackend/ipcsource/unsavedfiles.h
index 071bebdecf3..b1cc55440cf 100644
--- a/src/tools/codemodelbackend/ipcsource/unsavedfiles.h
+++ b/src/tools/clangbackend/ipcsource/unsavedfiles.h
@@ -28,8 +28,8 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_UNSAVEDFILES_H
-#define CODEMODELBACKEND_UNSAVEDFILES_H
+#ifndef CLANGBACKEND_UNSAVEDFILES_H
+#define CLANGBACKEND_UNSAVEDFILES_H
#include <filecontainer.h>
@@ -41,7 +41,7 @@
#include <clang-c/Index.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
using time_point = std::chrono::steady_clock::time_point;
@@ -83,6 +83,6 @@ private:
mutable std::shared_ptr<UnsavedFilesData> d;
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_UNSAVEDFILES_H
+#endif // CLANGBACKEND_UNSAVEDFILES_H
diff --git a/src/tools/codemodelbackend/ipcsource/projectcontainer.cpp b/src/tools/codemodelbackend/ipcsource/projectcontainer.cpp
deleted file mode 100644
index 8d7cff15f8e..00000000000
--- a/src/tools/codemodelbackend/ipcsource/projectcontainer.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** 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 "projectcontainer.h"
-
-#include <QtDebug>
-
-namespace CodeModelBackEnd {
-
-ProjectPartContainer::ProjectPartContainer(const Utf8String &fileName,
- const Utf8StringVector &arguments)
- : projectPartId_(fileName),
- arguments_(arguments)
-{
-}
-
-const Utf8String &ProjectPartContainer::projectPartId() const
-{
- return projectPartId_;
-}
-
-const Utf8StringVector &ProjectPartContainer::arguments() const
-{
- return arguments_;
-}
-
-
-QDataStream &operator<<(QDataStream &out, const ProjectPartContainer &container)
-{
- out << container.projectPartId_;
- out << container.arguments_;
-
- return out;
-}
-
-QDataStream &operator>>(QDataStream &in, ProjectPartContainer &container)
-{
- in >> container.projectPartId_;
- in >> container.arguments_;
-
- return in;
-}
-
-bool operator == (const ProjectPartContainer &first, const ProjectPartContainer &second)
-{
- return first.projectPartId_ == second.projectPartId_;
-}
-
-bool operator < (const ProjectPartContainer &first, const ProjectPartContainer &second)
-{
- return first.projectPartId_ < second.projectPartId_;
-}
-
-QDebug operator <<(QDebug debug, const ProjectPartContainer &container)
-{
- debug.nospace() << "ProjectContainer("
- << container.projectPartId()
- << ")";
-
- return debug;
-}
-
-void PrintTo(const ProjectPartContainer &container, ::std::ostream* os)
-{
- *os << "ProjectContainer("
- << container.projectPartId().constData()
- << ")";
-}
-
-
-} // namespace CodeModelBackEnd
-
diff --git a/src/tools/codemodelbackend/ipcsource/projectcontainer.h b/src/tools/codemodelbackend/ipcsource/projectcontainer.h
deleted file mode 100644
index ed2f2f96802..00000000000
--- a/src/tools/codemodelbackend/ipcsource/projectcontainer.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** 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 CODEMODELBACKEND_PROJECTCONTAINER_H
-#define CODEMODELBACKEND_PROJECTCONTAINER_H
-
-#include <QMetaType>
-
-#include <utf8stringvector.h>
-
-#include <codemodelbackendipc_global.h>
-
-namespace CodeModelBackEnd {
-
-class CMBIPC_EXPORT ProjectPartContainer
-{
- friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const ProjectPartContainer &container);
- friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, ProjectPartContainer &container);
- friend CMBIPC_EXPORT bool operator == (const ProjectPartContainer &first, const ProjectPartContainer &second);
- friend CMBIPC_EXPORT bool operator < (const ProjectPartContainer &first, const ProjectPartContainer &second);
-public:
- ProjectPartContainer() = default;
- ProjectPartContainer(const Utf8String &projectPartId,
- const Utf8StringVector &arguments = Utf8StringVector());
-
- const Utf8String &projectPartId() const;
- const Utf8StringVector &arguments() const;
-
-private:
- Utf8String projectPartId_;
- Utf8StringVector arguments_;
-};
-
-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const ProjectPartContainer &container);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, ProjectPartContainer &container);
-CMBIPC_EXPORT bool operator == (const ProjectPartContainer &first, const ProjectPartContainer &second);
-CMBIPC_EXPORT bool operator < (const ProjectPartContainer &first, const ProjectPartContainer &second);
-
-CMBIPC_EXPORT QDebug operator <<(QDebug debug, const ProjectPartContainer &container);
-void PrintTo(const ProjectPartContainer &container, ::std::ostream* os);
-
-} // namespace CodeModelBackEnd
-
-Q_DECLARE_METATYPE(CodeModelBackEnd::ProjectPartContainer)
-
-#endif // CODEMODELBACKEND_PROJECTCONTAINER_H
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 0e9140799f0..be4170db1ae 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -20,7 +20,7 @@ mac {
isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR)
exists($$LLVM_INSTALL_DIR) {
- SUBDIRS += codemodelbackend
+ SUBDIRS += clangbackend
}
BUILD_CPLUSPLUS_TOOLS = $$(BUILD_CPLUSPLUS_TOOLS)
diff --git a/src/tools/tools.qbs b/src/tools/tools.qbs
index d6bbbbe6578..1a378e86285 100644
--- a/src/tools/tools.qbs
+++ b/src/tools/tools.qbs
@@ -4,7 +4,7 @@ Project {
name: "Tools"
references: [
"buildoutputparser/buildoutputparser.qbs",
- "codemodelbackend/codemodelbackend.qbs",
+ "clangbackend/clangbackend.qbs",
"cplusplustools.qbs",
"qtcdebugger/qtcdebugger.qbs",
"qtcreatorcrashhandler/qtcreatorcrashhandler.qbs",
diff --git a/tests/unit/codemodelbackend/echoserver/echoipcserver.cpp b/tests/unit/echoserver/echoipcserver.cpp
similarity index 98%
rename from tests/unit/codemodelbackend/echoserver/echoipcserver.cpp
rename to tests/unit/echoserver/echoipcserver.cpp
index ca2c51c8c69..81a818d0a56 100644
--- a/tests/unit/codemodelbackend/echoserver/echoipcserver.cpp
+++ b/tests/unit/echoserver/echoipcserver.cpp
@@ -45,7 +45,7 @@
#include <QCoreApplication>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
void EchoIpcServer::dispatch(const QVariant &command)
{
@@ -88,5 +88,5 @@ void EchoIpcServer::echoCommand(const QVariant &command)
client()->echo(EchoCommand(command));
}
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
diff --git a/tests/unit/codemodelbackend/echoserver/echoipcserver.h b/tests/unit/echoserver/echoipcserver.h
similarity index 91%
rename from tests/unit/codemodelbackend/echoserver/echoipcserver.h
rename to tests/unit/echoserver/echoipcserver.h
index d26a1244bcd..55f18994a0a 100644
--- a/tests/unit/codemodelbackend/echoserver/echoipcserver.h
+++ b/tests/unit/echoserver/echoipcserver.h
@@ -28,12 +28,12 @@
**
****************************************************************************/
-#ifndef CODEMODELBACKEND_ECHOIPCSERVER_H
-#define CODEMODELBACKEND_ECHOIPCSERVER_H
+#ifndef CLANGBACKEND_ECHOIPCSERVER_H
+#define CLANGBACKEND_ECHOIPCSERVER_H
-#include "ipcserverinterface.h"
+#include <ipcserverinterface.h>
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
class EchoIpcServer : public IpcServerInterface
{
@@ -50,6 +50,6 @@ private:
void echoCommand(const QVariant &command);
};
-} // namespace CodeModelBackEnd
+} // namespace ClangBackEnd
-#endif // CODEMODELBACKEND_ECHOIPCSERVER_H
+#endif // CLANGBACKEND_ECHOIPCSERVER_H
diff --git a/tests/unit/codemodelbackend/echoserver/echoserver.pro b/tests/unit/echoserver/echoserver.pro
similarity index 67%
rename from tests/unit/codemodelbackend/echoserver/echoserver.pro
rename to tests/unit/echoserver/echoserver.pro
index 78946184414..7c3db335b9f 100644
--- a/tests/unit/codemodelbackend/echoserver/echoserver.pro
+++ b/tests/unit/echoserver/echoserver.pro
@@ -12,8 +12,8 @@ unix:LIBS += -ldl
osx:QMAKE_CXXFLAGS = -stdlib=libc++
-include(../../../../src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri)
-include(../../../../src/libs/sqlite/sqlite-lib.pri)
+include(../../../src/libs/clangbackendipc/clangbackendipc-lib.pri)
+include(../../../src/libs/sqlite/sqlite-lib.pri)
SOURCES += \
echoipcserver.cpp \
@@ -22,7 +22,7 @@ SOURCES += \
HEADERS += \
echoipcserver.h
-DEFINES += CODEMODELBACKENDIPC_TESTS
+DEFINES += CLANGBACKENDIPC_TESTS
DEFINES += DONT_CHECK_COMMAND_COUNTER
win32:DESTDIR = ..
diff --git a/tests/unit/codemodelbackend/echoserver/echoserverprocessmain.cpp b/tests/unit/echoserver/echoserverprocessmain.cpp
similarity index 92%
rename from tests/unit/codemodelbackend/echoserver/echoserverprocessmain.cpp
rename to tests/unit/echoserver/echoserverprocessmain.cpp
index 7dd1db90516..3a8b0b1ed5d 100644
--- a/tests/unit/codemodelbackend/echoserver/echoserverprocessmain.cpp
+++ b/tests/unit/echoserver/echoserverprocessmain.cpp
@@ -48,10 +48,10 @@ int main(int argc, char *argv[])
return 1;
}
- CodeModelBackEnd::Commands::registerCommands();
+ ClangBackEnd::Commands::registerCommands();
- CodeModelBackEnd::EchoIpcServer echoIpcServer;
- CodeModelBackEnd::ConnectionServer connectionServer(application.arguments()[1]);
+ ClangBackEnd::EchoIpcServer echoIpcServer;
+ ClangBackEnd::ConnectionServer connectionServer(application.arguments()[1]);
connectionServer.start();
connectionServer.setIpcServer(&echoIpcServer);
diff --git a/tests/unit/codemodelbackend/codemodelbackend.pro b/tests/unit/unit.pro
similarity index 100%
rename from tests/unit/codemodelbackend/codemodelbackend.pro
rename to tests/unit/unit.pro
diff --git a/tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp b/tests/unit/unittest/clangcodecompleteresultstest.cpp
similarity index 95%
rename from tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp
rename to tests/unit/unittest/clangcodecompleteresultstest.cpp
index 4f2ebbeee3c..228ec8ce872 100644
--- a/tests/unit/codemodelbackend/unittest/clangcodecompleteresultstest.cpp
+++ b/tests/unit/unittest/clangcodecompleteresultstest.cpp
@@ -43,10 +43,10 @@
namespace {
-using CodeModelBackEnd::ClangCodeCompleteResults;
-using CodeModelBackEnd::TranslationUnit;
-using CodeModelBackEnd::UnsavedFiles;
-using CodeModelBackEnd::ProjectPart;
+using ClangBackEnd::ClangCodeCompleteResults;
+using ClangBackEnd::TranslationUnit;
+using ClangBackEnd::UnsavedFiles;
+using ClangBackEnd::ProjectPart;
TEST(ClangCodeCompleteResults, GetData)
{
diff --git a/tests/unit/codemodelbackend/unittest/clangipcservertest.cpp b/tests/unit/unittest/clangipcservertest.cpp
similarity index 96%
rename from tests/unit/codemodelbackend/unittest/clangipcservertest.cpp
rename to tests/unit/unittest/clangipcservertest.cpp
index 73988fe3369..4070ad05794 100644
--- a/tests/unit/codemodelbackend/unittest/clangipcservertest.cpp
+++ b/tests/unit/unittest/clangipcservertest.cpp
@@ -63,17 +63,17 @@ using testing::Eq;
namespace {
-using CodeModelBackEnd::RegisterTranslationUnitForCodeCompletionCommand;
-using CodeModelBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand;
-using CodeModelBackEnd::RegisterProjectPartsForCodeCompletionCommand;
-using CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand;
-using CodeModelBackEnd::CompleteCodeCommand;
-using CodeModelBackEnd::CodeCompletedCommand;
-using CodeModelBackEnd::CodeCompletion;
-using CodeModelBackEnd::FileContainer;
-using CodeModelBackEnd::ProjectPartContainer;
-using CodeModelBackEnd::TranslationUnitDoesNotExistCommand;
-using CodeModelBackEnd::ProjectPartsDoNotExistCommand;
+using ClangBackEnd::RegisterTranslationUnitForCodeCompletionCommand;
+using ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand;
+using ClangBackEnd::RegisterProjectPartsForCodeCompletionCommand;
+using ClangBackEnd::UnregisterProjectPartsForCodeCompletionCommand;
+using ClangBackEnd::CompleteCodeCommand;
+using ClangBackEnd::CodeCompletedCommand;
+using ClangBackEnd::CodeCompletion;
+using ClangBackEnd::FileContainer;
+using ClangBackEnd::ProjectPartContainer;
+using ClangBackEnd::TranslationUnitDoesNotExistCommand;
+using ClangBackEnd::ProjectPartsDoNotExistCommand;
class ClangIpcServer : public ::testing::Test
{
@@ -88,7 +88,7 @@ protected:
protected:
MockIpcClient mockIpcClient;
- CodeModelBackEnd::ClangIpcServer clangServer;
+ ClangBackEnd::ClangIpcServer clangServer;
const Utf8String projectPartId = Utf8StringLiteral("pathToProjectPart.pro");
const Utf8String functionTestFilePath = Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_function.cpp");
const Utf8String variableTestFilePath = Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_variable.cpp");
diff --git a/tests/unit/codemodelbackend/unittest/clangstringtest.cpp b/tests/unit/unittest/clangstringtest.cpp
similarity index 98%
rename from tests/unit/codemodelbackend/unittest/clangstringtest.cpp
rename to tests/unit/unittest/clangstringtest.cpp
index 0e0a233dd6f..a7b5f86767d 100644
--- a/tests/unit/codemodelbackend/unittest/clangstringtest.cpp
+++ b/tests/unit/unittest/clangstringtest.cpp
@@ -41,7 +41,7 @@
namespace {
-using CodeModelBackEnd::ClangString;
+using ClangBackEnd::ClangString;
TEST(ClangString, ConvertToUtf8String)
{
diff --git a/tests/unit/codemodelbackend/unittest/clientserverinprocesstest.cpp b/tests/unit/unittest/clientserverinprocesstest.cpp
similarity index 79%
rename from tests/unit/codemodelbackend/unittest/clientserverinprocesstest.cpp
rename to tests/unit/unittest/clientserverinprocesstest.cpp
index 58961bd8bf1..3d29e596f0a 100644
--- a/tests/unit/codemodelbackend/unittest/clientserverinprocesstest.cpp
+++ b/tests/unit/unittest/clientserverinprocesstest.cpp
@@ -60,7 +60,7 @@
#include "mockipclient.h"
#include "mockipcserver.h"
-using namespace CodeModelBackEnd;
+using namespace ClangBackEnd;
namespace {
@@ -84,8 +84,8 @@ protected:
MockIpcClient mockIpcClient;
MockIpcServer mockIpcServer;
- CodeModelBackEnd::IpcServerProxy serverProxy;
- CodeModelBackEnd::IpcClientProxy clientProxy;
+ ClangBackEnd::IpcServerProxy serverProxy;
+ ClangBackEnd::IpcClientProxy clientProxy;
};
TEST_F(ClientServerInProcess, SendEndCommand)
@@ -108,9 +108,9 @@ TEST_F(ClientServerInProcess, SendAliveCommand)
TEST_F(ClientServerInProcess, SendRegisterTranslationUnitForCodeCompletionCommand)
{
- CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_function.cpp"),
+ ClangBackEnd::FileContainer fileContainer(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_function.cpp"),
Utf8StringLiteral("pathToProjectPart.pro"));
- CodeModelBackEnd::RegisterTranslationUnitForCodeCompletionCommand command({fileContainer});
+ ClangBackEnd::RegisterTranslationUnitForCodeCompletionCommand command({fileContainer});
EXPECT_CALL(mockIpcServer, registerTranslationUnitsForCodeCompletion(command))
.Times(1);
@@ -121,8 +121,8 @@ TEST_F(ClientServerInProcess, SendRegisterTranslationUnitForCodeCompletionComman
TEST_F(ClientServerInProcess, SendUnregisterTranslationUnitsForCodeCompletionCommand)
{
- CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), Utf8StringLiteral("pathToProjectPart.pro"));
- CodeModelBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand command({fileContainer});
+ ClangBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), Utf8StringLiteral("pathToProjectPart.pro"));
+ ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand command({fileContainer});
EXPECT_CALL(mockIpcServer, unregisterTranslationUnitsForCodeCompletion(command))
.Times(1);
@@ -133,7 +133,7 @@ TEST_F(ClientServerInProcess, SendUnregisterTranslationUnitsForCodeCompletionCom
TEST_F(ClientServerInProcess, SendCompleteCodeCommand)
{
- CodeModelBackEnd::CompleteCodeCommand command(Utf8StringLiteral("foo.cpp"), 24, 33, Utf8StringLiteral("do what I want"));
+ ClangBackEnd::CompleteCodeCommand command(Utf8StringLiteral("foo.cpp"), 24, 33, Utf8StringLiteral("do what I want"));
EXPECT_CALL(mockIpcServer, completeCode(command))
.Times(1);
@@ -144,8 +144,8 @@ TEST_F(ClientServerInProcess, SendCompleteCodeCommand)
TEST_F(ClientServerInProcess, SendCodeCompletedCommand)
{
- QVector<CodeModelBackEnd::CodeCompletion> codeCompletions({Utf8StringLiteral("newFunction()")});
- CodeModelBackEnd::CodeCompletedCommand command(codeCompletions, 1);
+ QVector<ClangBackEnd::CodeCompletion> codeCompletions({Utf8StringLiteral("newFunction()")});
+ ClangBackEnd::CodeCompletedCommand command(codeCompletions, 1);
EXPECT_CALL(mockIpcClient, codeCompleted(command))
.Times(1);
@@ -156,8 +156,8 @@ TEST_F(ClientServerInProcess, SendCodeCompletedCommand)
TEST_F(ClientServerInProcess, SendRegisterProjectPartsForCodeCompletionCommand)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral(TESTDATA_DIR"/complete.pro"));
- CodeModelBackEnd::RegisterProjectPartsForCodeCompletionCommand command({projectContainer});
+ ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral(TESTDATA_DIR"/complete.pro"));
+ ClangBackEnd::RegisterProjectPartsForCodeCompletionCommand command({projectContainer});
EXPECT_CALL(mockIpcServer, registerProjectPartsForCodeCompletion(command))
.Times(1);
@@ -168,7 +168,7 @@ TEST_F(ClientServerInProcess, SendRegisterProjectPartsForCodeCompletionCommand)
TEST_F(ClientServerInProcess, SendUnregisterProjectPartsForCodeCompletionCommand)
{
- CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand command({Utf8StringLiteral(TESTDATA_DIR"/complete.pro")});
+ ClangBackEnd::UnregisterProjectPartsForCodeCompletionCommand command({Utf8StringLiteral(TESTDATA_DIR"/complete.pro")});
EXPECT_CALL(mockIpcServer, unregisterProjectPartsForCodeCompletion(command))
.Times(1);
@@ -179,9 +179,9 @@ TEST_F(ClientServerInProcess, SendUnregisterProjectPartsForCodeCompletionCommand
TEST_F(ClientServerInProcess, SendTranslationUnitDoesNotExistCommand)
{
- CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_function.cpp"),
+ ClangBackEnd::FileContainer fileContainer(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_function.cpp"),
Utf8StringLiteral("pathToProjectPart.pro"));
- CodeModelBackEnd::TranslationUnitDoesNotExistCommand command(fileContainer);
+ ClangBackEnd::TranslationUnitDoesNotExistCommand command(fileContainer);
EXPECT_CALL(mockIpcClient, translationUnitDoesNotExist(command))
.Times(1);
@@ -193,7 +193,7 @@ TEST_F(ClientServerInProcess, SendTranslationUnitDoesNotExistCommand)
TEST_F(ClientServerInProcess, SendProjectPartDoesNotExistCommand)
{
- CodeModelBackEnd::ProjectPartsDoNotExistCommand command({Utf8StringLiteral("pathToProjectPart.pro")});
+ ClangBackEnd::ProjectPartsDoNotExistCommand command({Utf8StringLiteral("pathToProjectPart.pro")});
EXPECT_CALL(mockIpcClient, projectPartsDoNotExist(command))
.Times(1);
diff --git a/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp b/tests/unit/unittest/clientserveroutsideprocess.cpp
similarity index 85%
rename from tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp
rename to tests/unit/unittest/clientserveroutsideprocess.cpp
index 98553c3faa2..22be5abce8f 100644
--- a/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp
+++ b/tests/unit/unittest/clientserveroutsideprocess.cpp
@@ -67,7 +67,7 @@
#define QTC_HOST_EXE_SUFFIX ""
#endif
-using namespace CodeModelBackEnd;
+using namespace ClangBackEnd;
using ::testing::Eq;
@@ -81,11 +81,11 @@ protected:
static void TearDownTestCase();
static MockIpcClient mockIpcClient;
- static CodeModelBackEnd::ConnectionClient client;
+ static ClangBackEnd::ConnectionClient client;
};
MockIpcClient ClientServerOutsideProcess::mockIpcClient;
-CodeModelBackEnd::ConnectionClient ClientServerOutsideProcess::client(&ClientServerOutsideProcess::mockIpcClient);
+ClangBackEnd::ConnectionClient ClientServerOutsideProcess::client(&ClientServerOutsideProcess::mockIpcClient);
TEST_F(ClientServerOutsideProcess, RestartProcess)
{
@@ -115,8 +115,8 @@ TEST_F(ClientServerOutsideProcess, RestartProcessAfterTermination)
TEST_F(ClientServerOutsideProcess, SendRegisterTranslationUnitForCodeCompletionCommand)
{
- CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo"), Utf8StringLiteral("pathToProjectPart.pro"));
- CodeModelBackEnd::RegisterTranslationUnitForCodeCompletionCommand registerTranslationUnitForCodeCompletionCommand({fileContainer});
+ ClangBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo"), Utf8StringLiteral("pathToProjectPart.pro"));
+ ClangBackEnd::RegisterTranslationUnitForCodeCompletionCommand registerTranslationUnitForCodeCompletionCommand({fileContainer});
EchoCommand echoCommand(QVariant::fromValue(registerTranslationUnitForCodeCompletionCommand));
EXPECT_CALL(mockIpcClient, echo(echoCommand))
@@ -129,7 +129,7 @@ TEST_F(ClientServerOutsideProcess, SendRegisterTranslationUnitForCodeCompletionC
TEST_F(ClientServerOutsideProcess, SendUnregisterTranslationUnitsForCodeCompletionCommand)
{
FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), Utf8StringLiteral("bar.pro"));
- CodeModelBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand unregisterTranslationUnitsForCodeCompletionCommand ({fileContainer});
+ ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand unregisterTranslationUnitsForCodeCompletionCommand ({fileContainer});
EchoCommand echoCommand(QVariant::fromValue(unregisterTranslationUnitsForCodeCompletionCommand));
EXPECT_CALL(mockIpcClient, echo(echoCommand))
@@ -153,8 +153,8 @@ TEST_F(ClientServerOutsideProcess, SendCompleteCodeCommand)
TEST_F(ClientServerOutsideProcess, SendRegisterProjectPartsForCodeCompletionCommand)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral(TESTDATA_DIR"/complete.pro"));
- CodeModelBackEnd::RegisterProjectPartsForCodeCompletionCommand registerProjectPartsForCodeCompletionCommand({projectContainer});
+ ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral(TESTDATA_DIR"/complete.pro"));
+ ClangBackEnd::RegisterProjectPartsForCodeCompletionCommand registerProjectPartsForCodeCompletionCommand({projectContainer});
EchoCommand echoCommand(QVariant::fromValue(registerProjectPartsForCodeCompletionCommand));
EXPECT_CALL(mockIpcClient, echo(echoCommand))
@@ -166,7 +166,7 @@ TEST_F(ClientServerOutsideProcess, SendRegisterProjectPartsForCodeCompletionComm
TEST_F(ClientServerOutsideProcess, SendUnregisterProjectPartsForCodeCompletionCommand)
{
- CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand unregisterProjectPartsForCodeCompletionCommand({Utf8StringLiteral(TESTDATA_DIR"/complete.pro")});
+ ClangBackEnd::UnregisterProjectPartsForCodeCompletionCommand unregisterProjectPartsForCodeCompletionCommand({Utf8StringLiteral(TESTDATA_DIR"/complete.pro")});
EchoCommand echoCommand(QVariant::fromValue(unregisterProjectPartsForCodeCompletionCommand));
EXPECT_CALL(mockIpcClient, echo(echoCommand))
diff --git a/tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp b/tests/unit/unittest/codecompletionsextractortest.cpp
similarity index 76%
rename from tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp
rename to tests/unit/unittest/codecompletionsextractortest.cpp
index 0e88a7ebeee..e9a4f268569 100644
--- a/tests/unit/codemodelbackend/unittest/codecompletionsextractortest.cpp
+++ b/tests/unit/unittest/codecompletionsextractortest.cpp
@@ -46,12 +46,12 @@
#include <QFile>
-using CodeModelBackEnd::CodeCompletionsExtractor;
-using CodeModelBackEnd::ClangCodeCompleteResults;
-using CodeModelBackEnd::TranslationUnit;
-using CodeModelBackEnd::CodeCompletion;
-using CodeModelBackEnd::UnsavedFiles;
-using CodeModelBackEnd::CodeCompletionChunk;
+using ClangBackEnd::CodeCompletionsExtractor;
+using ClangBackEnd::ClangCodeCompleteResults;
+using ClangBackEnd::TranslationUnit;
+using ClangBackEnd::CodeCompletion;
+using ClangBackEnd::UnsavedFiles;
+using ClangBackEnd::CodeCompletionChunk;
@@ -108,18 +108,18 @@ const Utf8String unsavedFileContent(const char *unsavedFilePath)
QFile unsavedFileContentFile(QString::fromUtf8(unsavedFilePath));
bool isOpen = unsavedFileContentFile.open(QIODevice::ReadOnly | QIODevice::Text);
if (!isOpen)
- ADD_FAILURE() << "File with the unsaved content cannot be opened!";
+ ADD_FAILURE() << "File with the unsaved content cannot be opened!";
return Utf8String::fromByteArray(unsavedFileContentFile.readAll());
}
-const CodeModelBackEnd::FileContainer unsavedDataFileContainer(const char *filePath,
- const char *unsavedFilePath)
+const ClangBackEnd::FileContainer unsavedDataFileContainer(const char *filePath,
+ const char *unsavedFilePath)
{
- return CodeModelBackEnd::FileContainer(Utf8String::fromUtf8(filePath),
- Utf8String(),
- unsavedFileContent(unsavedFilePath),
- true);
+ return ClangBackEnd::FileContainer(Utf8String::fromUtf8(filePath),
+ Utf8String(),
+ unsavedFileContent(unsavedFilePath),
+ true);
}
ClangCodeCompleteResults getResults(const TranslationUnit &translationUnit, uint line, uint column = 1)
@@ -139,8 +139,8 @@ public:
static void TearDownTestCase();
protected:
- static CodeModelBackEnd::ProjectPart project;
- static CodeModelBackEnd::UnsavedFiles unsavedFiles;
+ static ClangBackEnd::ProjectPart project;
+ static ClangBackEnd::UnsavedFiles unsavedFiles;
static TranslationUnit functionTranslationUnit;
static TranslationUnit variableTranslationUnit;
static TranslationUnit classTranslationUnit ;
@@ -149,8 +149,8 @@ protected:
static TranslationUnit constructorTranslationUnit;
};
-CodeModelBackEnd::ProjectPart CodeCompletionsExtractor::project(Utf8StringLiteral("/path/to/projectfile"));
-CodeModelBackEnd::UnsavedFiles CodeCompletionsExtractor::unsavedFiles;
+ClangBackEnd::ProjectPart CodeCompletionsExtractor::project(Utf8StringLiteral("/path/to/projectfile"));
+ClangBackEnd::UnsavedFiles CodeCompletionsExtractor::unsavedFiles;
TranslationUnit CodeCompletionsExtractor::functionTranslationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_function.cpp"), unsavedFiles, project);
TranslationUnit CodeCompletionsExtractor::variableTranslationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_variable.cpp"), unsavedFiles, project);
TranslationUnit CodeCompletionsExtractor::classTranslationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_extractor_class.cpp"), unsavedFiles, project);
@@ -175,8 +175,8 @@ TEST_F(CodeCompletionsExtractor, Function)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Function"),
- CodeCompletion::FunctionCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::FunctionCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, TemplateFunction)
@@ -186,8 +186,8 @@ TEST_F(CodeCompletionsExtractor, TemplateFunction)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("TemplateFunction"),
- CodeCompletion::TemplateFunctionCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::TemplateFunctionCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Variable)
@@ -197,8 +197,8 @@ TEST_F(CodeCompletionsExtractor, Variable)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Var"),
- CodeCompletion::VariableCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::VariableCompletionKind,
+ CodeCompletion::Available));
}
@@ -209,8 +209,8 @@ TEST_F(CodeCompletionsExtractor, NonTypeTemplateParameter)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("NonTypeTemplateParameter"),
- CodeCompletion::VariableCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::VariableCompletionKind,
+ CodeCompletion::Available));
}
@@ -221,8 +221,8 @@ TEST_F(CodeCompletionsExtractor, VariableReference)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Var"),
- CodeCompletion::VariableCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::VariableCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Parameter)
@@ -232,8 +232,8 @@ TEST_F(CodeCompletionsExtractor, Parameter)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Parameter"),
- CodeCompletion::VariableCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::VariableCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Field)
@@ -243,8 +243,8 @@ TEST_F(CodeCompletionsExtractor, Field)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Field"),
- CodeCompletion::VariableCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::VariableCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Class)
@@ -254,8 +254,8 @@ TEST_F(CodeCompletionsExtractor, Class)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Class"),
- CodeCompletion::ClassCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::ClassCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Struct)
@@ -265,8 +265,8 @@ TEST_F(CodeCompletionsExtractor, Struct)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Struct"),
- CodeCompletion::ClassCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::ClassCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Union)
@@ -276,8 +276,8 @@ TEST_F(CodeCompletionsExtractor, Union)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Union"),
- CodeCompletion::ClassCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::ClassCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, TemplateTypeParameter)
@@ -287,8 +287,8 @@ TEST_F(CodeCompletionsExtractor, TemplateTypeParameter)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("TemplateTypeParameter"),
- CodeCompletion::ClassCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::ClassCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, TemplateClass)
@@ -298,8 +298,8 @@ TEST_F(CodeCompletionsExtractor, TemplateClass)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("TemplateClass"),
- CodeCompletion::TemplateClassCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::TemplateClassCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, TemplateTemplateParameter)
@@ -309,8 +309,8 @@ TEST_F(CodeCompletionsExtractor, TemplateTemplateParameter)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("TemplateTemplateParameter"),
- CodeCompletion::TemplateClassCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::TemplateClassCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, ClassTemplatePartialSpecialization)
@@ -320,8 +320,8 @@ TEST_F(CodeCompletionsExtractor, ClassTemplatePartialSpecialization)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("ClassTemplatePartialSpecialization"),
- CodeCompletion::TemplateClassCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::TemplateClassCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Namespace)
@@ -331,8 +331,8 @@ TEST_F(CodeCompletionsExtractor, Namespace)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Namespace"),
- CodeCompletion::NamespaceCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::NamespaceCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, NamespaceAlias)
@@ -342,8 +342,8 @@ TEST_F(CodeCompletionsExtractor, NamespaceAlias)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("NamespaceAlias"),
- CodeCompletion::NamespaceCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::NamespaceCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Enumeration)
@@ -353,8 +353,8 @@ TEST_F(CodeCompletionsExtractor, Enumeration)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Enumeration"),
- CodeCompletion::EnumerationCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::EnumerationCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Enumerator)
@@ -364,8 +364,8 @@ TEST_F(CodeCompletionsExtractor, Enumerator)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Enumerator"),
- CodeCompletion::EnumeratorCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::EnumeratorCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Constructor)
@@ -375,8 +375,8 @@ TEST_F(CodeCompletionsExtractor, Constructor)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Constructor"),
- CodeCompletion::ConstructorCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::ConstructorCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Destructor)
@@ -386,8 +386,8 @@ TEST_F(CodeCompletionsExtractor, Destructor)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("~Constructor"),
- CodeCompletion::DestructorCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::DestructorCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Method)
@@ -397,8 +397,8 @@ TEST_F(CodeCompletionsExtractor, Method)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method"),
- CodeCompletion::FunctionCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::FunctionCompletionKind,
+ CodeCompletion::Available));
ASSERT_FALSE(extractor.currentCodeCompletion().hasParameters());
}
@@ -409,8 +409,8 @@ TEST_F(CodeCompletionsExtractor, MethodWithParameters)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("MethodWithParameters"),
- CodeCompletion::FunctionCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::FunctionCompletionKind,
+ CodeCompletion::Available));
ASSERT_TRUE(extractor.currentCodeCompletion().hasParameters());
}
@@ -421,8 +421,8 @@ TEST_F(CodeCompletionsExtractor, Slot)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Slot"),
- CodeCompletion::SlotCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::SlotCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, Signal)
@@ -432,8 +432,8 @@ TEST_F(CodeCompletionsExtractor, Signal)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Signal"),
- CodeCompletion::SignalCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::SignalCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, MacroDefinition)
@@ -443,8 +443,8 @@ TEST_F(CodeCompletionsExtractor, MacroDefinition)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("MacroDefinition"),
- CodeCompletion::PreProcessorCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::PreProcessorCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, FunctionMacro)
@@ -454,8 +454,8 @@ TEST_F(CodeCompletionsExtractor, FunctionMacro)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("FunctionMacro"),
- CodeCompletion::FunctionCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::FunctionCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, IntKeyword)
@@ -465,8 +465,8 @@ TEST_F(CodeCompletionsExtractor, IntKeyword)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("int"),
- CodeCompletion::KeywordCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::KeywordCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, SwitchKeyword)
@@ -476,8 +476,8 @@ TEST_F(CodeCompletionsExtractor, SwitchKeyword)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("switch"),
- CodeCompletion::KeywordCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::KeywordCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, ClassKeyword)
@@ -487,8 +487,8 @@ TEST_F(CodeCompletionsExtractor, ClassKeyword)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("class"),
- CodeCompletion::KeywordCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::KeywordCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, DeprecatedFunction)
@@ -498,8 +498,8 @@ TEST_F(CodeCompletionsExtractor, DeprecatedFunction)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("DeprecatedFunction"),
- CodeCompletion::FunctionCompletionKind,
- CodeCompletion::Deprecated));
+ CodeCompletion::FunctionCompletionKind,
+ CodeCompletion::Deprecated));
}
TEST_F(CodeCompletionsExtractor, NotAccessibleFunction)
@@ -509,8 +509,8 @@ TEST_F(CodeCompletionsExtractor, NotAccessibleFunction)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("NotAccessibleFunction"),
- CodeCompletion::FunctionCompletionKind,
- CodeCompletion::NotAccessible));
+ CodeCompletion::FunctionCompletionKind,
+ CodeCompletion::NotAccessible));
}
TEST_F(CodeCompletionsExtractor, NotAvailableFunction)
@@ -520,43 +520,43 @@ TEST_F(CodeCompletionsExtractor, NotAvailableFunction)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("NotAvailableFunction"),
- CodeCompletion::FunctionCompletionKind,
- CodeCompletion::NotAvailable));
+ CodeCompletion::FunctionCompletionKind,
+ CodeCompletion::NotAvailable));
}
TEST_F(CodeCompletionsExtractor, UnsavedFile)
{
- CodeModelBackEnd::UnsavedFiles unsavedFiles;
- CodeModelBackEnd::ProjectPart project(Utf8StringLiteral("/path/to/projectfile"));
+ ClangBackEnd::UnsavedFiles unsavedFiles;
+ ClangBackEnd::ProjectPart project(Utf8StringLiteral("/path/to/projectfile"));
TranslationUnit translationUnit(Utf8String::fromUtf8(TESTDATA_DIR"/complete_extractor_function.cpp"), unsavedFiles, project);
unsavedFiles.createOrUpdate({unsavedDataFileContainer(TESTDATA_DIR"/complete_extractor_function.cpp",
- TESTDATA_DIR"/complete_extractor_function_unsaved.cpp")});
+ TESTDATA_DIR"/complete_extractor_function_unsaved.cpp")});
ClangCodeCompleteResults completeResults(getResults(translationUnit, 20));
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method2"),
- CodeCompletion::FunctionCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::FunctionCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, ChangeUnsavedFile)
{
- CodeModelBackEnd::UnsavedFiles unsavedFiles;
- CodeModelBackEnd::ProjectPart project(Utf8StringLiteral("/path/to/projectfile"));
+ ClangBackEnd::UnsavedFiles unsavedFiles;
+ ClangBackEnd::ProjectPart project(Utf8StringLiteral("/path/to/projectfile"));
TranslationUnit translationUnit(Utf8String::fromUtf8(TESTDATA_DIR"/complete_extractor_function.cpp"), unsavedFiles, project);
unsavedFiles.createOrUpdate({unsavedDataFileContainer(TESTDATA_DIR"/complete_extractor_function.cpp",
- TESTDATA_DIR"/complete_extractor_function_unsaved.cpp")});
+ TESTDATA_DIR"/complete_extractor_function_unsaved.cpp")});
ClangCodeCompleteResults completeResults(getResults(translationUnit, 20));
unsavedFiles.createOrUpdate({unsavedDataFileContainer(TESTDATA_DIR"/complete_extractor_function.cpp",
- TESTDATA_DIR"/complete_extractor_function_unsaved_2.cpp")});
+ TESTDATA_DIR"/complete_extractor_function_unsaved_2.cpp")});
completeResults = getResults(translationUnit, 20);
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("Method3"),
- CodeCompletion::FunctionCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::FunctionCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, ArgumentDefinition)
@@ -568,8 +568,8 @@ TEST_F(CodeCompletionsExtractor, ArgumentDefinition)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, HasCompletion(Utf8StringLiteral("ArgumentDefinitionVariable"),
- CodeCompletion::VariableCompletionKind,
- CodeCompletion::Available));
+ CodeCompletion::VariableCompletionKind,
+ CodeCompletion::Available));
}
TEST_F(CodeCompletionsExtractor, NoArgumentDefinition)
@@ -581,8 +581,8 @@ TEST_F(CodeCompletionsExtractor, NoArgumentDefinition)
::CodeCompletionsExtractor extractor(completeResults.data());
ASSERT_THAT(extractor, Not(HasCompletion(Utf8StringLiteral("ArgumentDefinitionVariable"),
- CodeCompletion::VariableCompletionKind,
- CodeCompletion::Available)));
+ CodeCompletion::VariableCompletionKind,
+ CodeCompletion::Available)));
}
TEST_F(CodeCompletionsExtractor, CompletionChunksFunction)
diff --git a/tests/unit/codemodelbackend/unittest/codecompletiontest.cpp b/tests/unit/unittest/codecompletiontest.cpp
similarity index 86%
rename from tests/unit/codemodelbackend/unittest/codecompletiontest.cpp
rename to tests/unit/unittest/codecompletiontest.cpp
index a92d1767731..efb4551a0ab 100644
--- a/tests/unit/codemodelbackend/unittest/codecompletiontest.cpp
+++ b/tests/unit/unittest/codecompletiontest.cpp
@@ -47,8 +47,8 @@ using ::testing::Contains;
using ::testing::AllOf;
using ::testing::Not;
-using CodeModelBackEnd::CodeCompletion;
-using CodeModelBackEnd::CodeCompleter;
+using ClangBackEnd::CodeCompletion;
+using ClangBackEnd::CodeCompleter;
namespace {
@@ -59,16 +59,16 @@ public:
static void TearDownTestCase();
protected:
- static CodeModelBackEnd::ProjectPart projectPart;
- static CodeModelBackEnd::UnsavedFiles unsavedFiles;
- static CodeModelBackEnd::TranslationUnit translationUnit;
- static CodeModelBackEnd::CodeCompleter completer;
+ static ClangBackEnd::ProjectPart projectPart;
+ static ClangBackEnd::UnsavedFiles unsavedFiles;
+ static ClangBackEnd::TranslationUnit translationUnit;
+ static ClangBackEnd::CodeCompleter completer;
};
-CodeModelBackEnd::ProjectPart CodeCompleter::projectPart(Utf8StringLiteral("projectPartId"));
-CodeModelBackEnd::UnsavedFiles CodeCompleter::unsavedFiles;
-CodeModelBackEnd::TranslationUnit CodeCompleter::translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_completer.cpp"), unsavedFiles, projectPart);
-CodeModelBackEnd::CodeCompleter CodeCompleter::completer = translationUnit;
+ClangBackEnd::ProjectPart CodeCompleter::projectPart(Utf8StringLiteral("projectPartId"));
+ClangBackEnd::UnsavedFiles CodeCompleter::unsavedFiles;
+ClangBackEnd::TranslationUnit CodeCompleter::translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_completer.cpp"), unsavedFiles, projectPart);
+ClangBackEnd::CodeCompleter CodeCompleter::completer = translationUnit;
void CodeCompleter::SetUpTestCase()
{
@@ -76,7 +76,7 @@ void CodeCompleter::SetUpTestCase()
unsavedFileContentFile.open(QIODevice::ReadOnly);
const Utf8String unsavedFileContent = Utf8String::fromByteArray(unsavedFileContentFile.readAll());
- const CodeModelBackEnd::FileContainer unsavedDataFileContainer(translationUnit.filePath(),
+ const ClangBackEnd::FileContainer unsavedDataFileContainer(translationUnit.filePath(),
projectPart.projectPartId(),
unsavedFileContent,
true);
@@ -87,7 +87,7 @@ void CodeCompleter::SetUpTestCase()
void CodeCompleter::TearDownTestCase()
{
translationUnit.reset();
- completer = CodeModelBackEnd::CodeCompleter();
+ completer = ClangBackEnd::CodeCompleter();
}
diff --git a/tests/unit/codemodelbackend/unittest/completionchunkstotextconvertertest.cpp b/tests/unit/unittest/completionchunkstotextconvertertest.cpp
similarity index 99%
rename from tests/unit/codemodelbackend/unittest/completionchunkstotextconvertertest.cpp
rename to tests/unit/unittest/completionchunkstotextconvertertest.cpp
index 7d43af8c599..c5c7f596e90 100644
--- a/tests/unit/codemodelbackend/unittest/completionchunkstotextconvertertest.cpp
+++ b/tests/unit/unittest/completionchunkstotextconvertertest.cpp
@@ -39,7 +39,7 @@
namespace {
-using CodeModelBackEnd::CodeCompletionChunk;
+using ClangBackEnd::CodeCompletionChunk;
class CompletionChunksToTextConverter : public ::testing::Test
{
diff --git a/tests/unit/codemodelbackend/unittest/createtablesqlstatementbuildertest.cpp b/tests/unit/unittest/createtablesqlstatementbuildertest.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/createtablesqlstatementbuildertest.cpp
rename to tests/unit/unittest/createtablesqlstatementbuildertest.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_completer.cpp b/tests/unit/unittest/data/complete_completer.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_completer.cpp
rename to tests/unit/unittest/data/complete_completer.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_completer_unsaved.cpp b/tests/unit/unittest/data/complete_completer_unsaved.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_completer_unsaved.cpp
rename to tests/unit/unittest/data/complete_completer_unsaved.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_extractor_class.cpp b/tests/unit/unittest/data/complete_extractor_class.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_extractor_class.cpp
rename to tests/unit/unittest/data/complete_extractor_class.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_extractor_constructor.cpp b/tests/unit/unittest/data/complete_extractor_constructor.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_extractor_constructor.cpp
rename to tests/unit/unittest/data/complete_extractor_constructor.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_extractor_enumeration.cpp b/tests/unit/unittest/data/complete_extractor_enumeration.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_extractor_enumeration.cpp
rename to tests/unit/unittest/data/complete_extractor_enumeration.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_extractor_function.cpp b/tests/unit/unittest/data/complete_extractor_function.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_extractor_function.cpp
rename to tests/unit/unittest/data/complete_extractor_function.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_extractor_function_unsaved.cpp b/tests/unit/unittest/data/complete_extractor_function_unsaved.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_extractor_function_unsaved.cpp
rename to tests/unit/unittest/data/complete_extractor_function_unsaved.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_extractor_function_unsaved_2.cpp b/tests/unit/unittest/data/complete_extractor_function_unsaved_2.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_extractor_function_unsaved_2.cpp
rename to tests/unit/unittest/data/complete_extractor_function_unsaved_2.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_extractor_namespace.cpp b/tests/unit/unittest/data/complete_extractor_namespace.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_extractor_namespace.cpp
rename to tests/unit/unittest/data/complete_extractor_namespace.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_extractor_variable.cpp b/tests/unit/unittest/data/complete_extractor_variable.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_extractor_variable.cpp
rename to tests/unit/unittest/data/complete_extractor_variable.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_testfile_1.cpp b/tests/unit/unittest/data/complete_testfile_1.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_testfile_1.cpp
rename to tests/unit/unittest/data/complete_testfile_1.cpp
diff --git a/tests/unit/codemodelbackend/unittest/data/complete_translationunit_parse_error.cpp b/tests/unit/unittest/data/complete_translationunit_parse_error.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/data/complete_translationunit_parse_error.cpp
rename to tests/unit/unittest/data/complete_translationunit_parse_error.cpp
diff --git a/tests/unit/codemodelbackend/unittest/gtest-qt-printing.cpp b/tests/unit/unittest/gtest-qt-printing.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/gtest-qt-printing.cpp
rename to tests/unit/unittest/gtest-qt-printing.cpp
diff --git a/tests/unit/codemodelbackend/unittest/gtest-qt-printing.h b/tests/unit/unittest/gtest-qt-printing.h
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/gtest-qt-printing.h
rename to tests/unit/unittest/gtest-qt-printing.h
diff --git a/tests/unit/codemodelbackend/unittest/main.cpp b/tests/unit/unittest/main.cpp
similarity index 97%
rename from tests/unit/codemodelbackend/unittest/main.cpp
rename to tests/unit/unittest/main.cpp
index 09ff5812c86..a1b332e7d7e 100644
--- a/tests/unit/codemodelbackend/unittest/main.cpp
+++ b/tests/unit/unittest/main.cpp
@@ -37,7 +37,7 @@
int main(int argc, char *argv[])
{
- CodeModelBackEnd::Commands::registerCommands();
+ ClangBackEnd::Commands::registerCommands();
Sqlite::registerTypes();
QCoreApplication application(argc, argv);
diff --git a/tests/unit/codemodelbackend/unittest/mockipclient.h b/tests/unit/unittest/mockipclient.h
similarity index 83%
rename from tests/unit/codemodelbackend/unittest/mockipclient.h
rename to tests/unit/unittest/mockipclient.h
index 677daee1732..9a09a06cc2a 100644
--- a/tests/unit/codemodelbackend/unittest/mockipclient.h
+++ b/tests/unit/unittest/mockipclient.h
@@ -34,18 +34,18 @@
#include <ipcclientinterface.h>
-class MockIpcClient : public CodeModelBackEnd::IpcClientInterface {
+class MockIpcClient : public ClangBackEnd::IpcClientInterface {
public:
MOCK_METHOD0(alive,
void());
MOCK_METHOD1(echo,
- void(const CodeModelBackEnd::EchoCommand &command));
+ void(const ClangBackEnd::EchoCommand &command));
MOCK_METHOD1(codeCompleted,
- void(const CodeModelBackEnd::CodeCompletedCommand &command));
+ void(const ClangBackEnd::CodeCompletedCommand &command));
MOCK_METHOD1(translationUnitDoesNotExist,
- void(const CodeModelBackEnd::TranslationUnitDoesNotExistCommand &command));
+ void(const ClangBackEnd::TranslationUnitDoesNotExistCommand &command));
MOCK_METHOD1(projectPartsDoNotExist,
- void(const CodeModelBackEnd::ProjectPartsDoNotExistCommand &command));
+ void(const ClangBackEnd::ProjectPartsDoNotExistCommand &command));
};
#endif // MOCKIPCLIENT_H
diff --git a/tests/unit/codemodelbackend/unittest/mockipcserver.h b/tests/unit/unittest/mockipcserver.h
similarity index 80%
rename from tests/unit/codemodelbackend/unittest/mockipcserver.h
rename to tests/unit/unittest/mockipcserver.h
index ab04b74ddba..276ee1aa8a9 100644
--- a/tests/unit/codemodelbackend/unittest/mockipcserver.h
+++ b/tests/unit/unittest/mockipcserver.h
@@ -33,20 +33,20 @@
#include <ipcserverinterface.h>
-class MockIpcServer : public CodeModelBackEnd::IpcServerInterface {
+class MockIpcServer : public ClangBackEnd::IpcServerInterface {
public:
MOCK_METHOD0(end,
void());
MOCK_METHOD1(registerTranslationUnitsForCodeCompletion,
- void(const CodeModelBackEnd::RegisterTranslationUnitForCodeCompletionCommand &command));
+ void(const ClangBackEnd::RegisterTranslationUnitForCodeCompletionCommand &command));
MOCK_METHOD1(unregisterTranslationUnitsForCodeCompletion,
- void(const CodeModelBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand &command));
+ void(const ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand &command));
MOCK_METHOD1(registerProjectPartsForCodeCompletion,
- void(const CodeModelBackEnd::RegisterProjectPartsForCodeCompletionCommand &command));
+ void(const ClangBackEnd::RegisterProjectPartsForCodeCompletionCommand &command));
MOCK_METHOD1(unregisterProjectPartsForCodeCompletion,
- void(const CodeModelBackEnd::UnregisterProjectPartsForCodeCompletionCommand &command));
+ void(const ClangBackEnd::UnregisterProjectPartsForCodeCompletionCommand &command));
MOCK_METHOD1(completeCode,
- void(const CodeModelBackEnd::CompleteCodeCommand &command));
+ void(const ClangBackEnd::CompleteCodeCommand &command));
};
#endif // MOCKIPCSERVER_H
diff --git a/tests/unit/codemodelbackend/unittest/projecttest.cpp b/tests/unit/unittest/projecttest.cpp
similarity index 67%
rename from tests/unit/codemodelbackend/unittest/projecttest.cpp
rename to tests/unit/unittest/projecttest.cpp
index 2310174635b..daab4e8816a 100644
--- a/tests/unit/codemodelbackend/unittest/projecttest.cpp
+++ b/tests/unit/unittest/projecttest.cpp
@@ -55,16 +55,16 @@ TEST(ProjectPart, CreateProjectPart)
{
Utf8String projectPath(Utf8StringLiteral("/tmp/blah.pro"));
- CodeModelBackEnd::ProjectPart project(projectPath);
+ ClangBackEnd::ProjectPart project(projectPath);
ASSERT_THAT(project.projectPartId(), projectPath);
}
TEST(ProjectPart, CreateProjectPartWithProjectPartContainer)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-O")});
+ ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-O")});
- CodeModelBackEnd::ProjectPart project(projectContainer);
+ ClangBackEnd::ProjectPart project(projectContainer);
ASSERT_THAT(project.projectPartId(), Utf8StringLiteral("pathToProjectPart.pro"));
ASSERT_THAT(project.arguments(), Contains(StrEq("-O")));
@@ -72,7 +72,7 @@ TEST(ProjectPart, CreateProjectPartWithProjectPartContainer)
TEST(ProjectPart, SetArguments)
{
- CodeModelBackEnd::ProjectPart project(Utf8StringLiteral("/tmp/blah.pro"));
+ ClangBackEnd::ProjectPart project(Utf8StringLiteral("/tmp/blah.pro"));
project.setArguments(Utf8StringVector({Utf8StringLiteral("-O"), Utf8StringLiteral("-fast")}));
@@ -81,7 +81,7 @@ TEST(ProjectPart, SetArguments)
TEST(ProjectPart, ArgumentCount)
{
- CodeModelBackEnd::ProjectPart project(Utf8StringLiteral("/tmp/blah.pro"));
+ ClangBackEnd::ProjectPart project(Utf8StringLiteral("/tmp/blah.pro"));
project.setArguments(Utf8StringVector({Utf8StringLiteral("-O"), Utf8StringLiteral("-fast")}));
@@ -90,7 +90,7 @@ TEST(ProjectPart, ArgumentCount)
TEST(ProjectPart, TimeStampIsUpdatedAsArgumentChanged)
{
- CodeModelBackEnd::ProjectPart project(Utf8StringLiteral("/tmp/blah.pro"));
+ ClangBackEnd::ProjectPart project(Utf8StringLiteral("/tmp/blah.pro"));
auto lastChangeTimePoint = project.lastChangeTimePoint();
std::this_thread::sleep_for(std::chrono::steady_clock::duration(1));
@@ -102,52 +102,52 @@ TEST(ProjectPart, TimeStampIsUpdatedAsArgumentChanged)
TEST(ProjectPart, GetNonExistingPoject)
{
- CodeModelBackEnd::ProjectParts projects;
+ ClangBackEnd::ProjectParts projects;
- ASSERT_THROW(projects.project(Utf8StringLiteral("pathToProjectPart.pro")), CodeModelBackEnd::ProjectPartDoNotExistException);
+ ASSERT_THROW(projects.project(Utf8StringLiteral("pathToProjectPart.pro")), ClangBackEnd::ProjectPartDoNotExistException);
}
TEST(ProjectPart, AddProjectParts)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-O")});
- CodeModelBackEnd::ProjectParts projects;
+ ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-O")});
+ ClangBackEnd::ProjectParts projects;
projects.createOrUpdate({projectContainer});
- ASSERT_THAT(projects.project(projectContainer.projectPartId()), CodeModelBackEnd::ProjectPart(projectContainer));
+ ASSERT_THAT(projects.project(projectContainer.projectPartId()), ClangBackEnd::ProjectPart(projectContainer));
ASSERT_THAT(projects.project(projectContainer.projectPartId()).arguments(), ElementsAre(StrEq("-O")));
}
TEST(ProjectPart, UpdateProjectParts)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-O")});
- CodeModelBackEnd::ProjectPartContainer projectContainerWithNewArguments(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-fast")});
- CodeModelBackEnd::ProjectParts projects;
+ ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-O")});
+ ClangBackEnd::ProjectPartContainer projectContainerWithNewArguments(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-fast")});
+ ClangBackEnd::ProjectParts projects;
projects.createOrUpdate({projectContainer});
projects.createOrUpdate({projectContainerWithNewArguments});
- ASSERT_THAT(projects.project(projectContainer.projectPartId()), CodeModelBackEnd::ProjectPart(projectContainer));
+ ASSERT_THAT(projects.project(projectContainer.projectPartId()), ClangBackEnd::ProjectPart(projectContainer));
ASSERT_THAT(projects.project(projectContainer.projectPartId()).arguments(), ElementsAre(StrEq("-fast")));
}
TEST(ProjectPart, ThrowExceptionForAccesingRemovedProjectParts)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-O")});
- CodeModelBackEnd::ProjectParts projects;
+ ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-O")});
+ ClangBackEnd::ProjectParts projects;
projects.createOrUpdate({projectContainer});
projects.remove({projectContainer.projectPartId()});
- ASSERT_THROW(projects.project(projectContainer.projectPartId()), CodeModelBackEnd::ProjectPartDoNotExistException);
+ ASSERT_THROW(projects.project(projectContainer.projectPartId()), ClangBackEnd::ProjectPartDoNotExistException);
}
TEST(ProjectPart, ProjectPartProjectPartIdIsEmptyfterRemoving)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-O")});
- CodeModelBackEnd::ProjectParts projects;
+ ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"), {Utf8StringLiteral("-O")});
+ ClangBackEnd::ProjectParts projects;
projects.createOrUpdate({projectContainer});
- CodeModelBackEnd::ProjectPart project(projects.project(projectContainer.projectPartId()));
+ ClangBackEnd::ProjectPart project(projects.project(projectContainer.projectPartId()));
projects.remove({projectContainer.projectPartId()});
@@ -156,20 +156,20 @@ TEST(ProjectPart, ProjectPartProjectPartIdIsEmptyfterRemoving)
TEST(Project, ThrowsForNotExistingProjectPartButRemovesAllExistingProject)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"));
- CodeModelBackEnd::ProjectParts projects;
+ ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"));
+ ClangBackEnd::ProjectParts projects;
projects.createOrUpdate({projectContainer});
- CodeModelBackEnd::ProjectPart project = *projects.findProjectPart(Utf8StringLiteral("pathToProjectPart.pro"));
+ ClangBackEnd::ProjectPart project = *projects.findProjectPart(Utf8StringLiteral("pathToProjectPart.pro"));
- EXPECT_THROW(projects.remove({Utf8StringLiteral("doesnotexist.pro"), projectContainer.projectPartId()}), CodeModelBackEnd::ProjectPartDoNotExistException);
+ EXPECT_THROW(projects.remove({Utf8StringLiteral("doesnotexist.pro"), projectContainer.projectPartId()}), ClangBackEnd::ProjectPartDoNotExistException);
ASSERT_THAT(projects.projects(), Not(Contains(project)));
}
TEST(ProjectPart, HasProjectPart)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"));
- CodeModelBackEnd::ProjectParts projects;
+ ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"));
+ ClangBackEnd::ProjectParts projects;
projects.createOrUpdate({projectContainer});
ASSERT_TRUE(projects.hasProjectPart(projectContainer.projectPartId()));
@@ -177,8 +177,8 @@ TEST(ProjectPart, HasProjectPart)
TEST(ProjectPart, DoNotHasProjectPart)
{
- CodeModelBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"));
- CodeModelBackEnd::ProjectParts projects;
+ ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"));
+ ClangBackEnd::ProjectParts projects;
projects.createOrUpdate({projectContainer});
ASSERT_FALSE(projects.hasProjectPart(Utf8StringLiteral("doesnotexist.pro")));
diff --git a/tests/unit/codemodelbackend/unittest/readandwritecommandblocktest.cpp b/tests/unit/unittest/readandwritecommandblocktest.cpp
similarity index 72%
rename from tests/unit/codemodelbackend/unittest/readandwritecommandblocktest.cpp
rename to tests/unit/unittest/readandwritecommandblocktest.cpp
index e0b4960b676..d9de87b529b 100644
--- a/tests/unit/codemodelbackend/unittest/readandwritecommandblocktest.cpp
+++ b/tests/unit/unittest/readandwritecommandblocktest.cpp
@@ -70,8 +70,8 @@ protected:
protected:
QBuffer buffer;
- CodeModelBackEnd::WriteCommandBlock writeCommandBlock;
- CodeModelBackEnd::ReadCommandBlock readCommandBlock;
+ ClangBackEnd::WriteCommandBlock writeCommandBlock;
+ ClangBackEnd::ReadCommandBlock readCommandBlock;
char lastCharacter = 0;
};
@@ -84,8 +84,8 @@ ReadAndWriteCommandBlockTest::ReadAndWriteCommandBlockTest()
void ReadAndWriteCommandBlockTest::SetUp()
{
buffer.open(QIODevice::ReadWrite);
- writeCommandBlock = CodeModelBackEnd::WriteCommandBlock(&buffer);
- readCommandBlock = CodeModelBackEnd::ReadCommandBlock(&buffer);
+ writeCommandBlock = ClangBackEnd::WriteCommandBlock(&buffer);
+ readCommandBlock = ClangBackEnd::ReadCommandBlock(&buffer);
}
void ReadAndWriteCommandBlockTest::TearDown()
@@ -95,31 +95,31 @@ void ReadAndWriteCommandBlockTest::TearDown()
TEST_F(ReadAndWriteCommandBlockTest, WriteCommandAndTestSize)
{
- writeCommandBlock.write(QVariant::fromValue(CodeModelBackEnd::EndCommand()));
+ writeCommandBlock.write(QVariant::fromValue(ClangBackEnd::EndCommand()));
- ASSERT_EQ(50, buffer.size());
+ ASSERT_EQ(46, buffer.size());
}
TEST_F(ReadAndWriteCommandBlockTest, WriteSecondCommandAndTestSize)
{
- writeCommandBlock.write(QVariant::fromValue(CodeModelBackEnd::EndCommand()));
+ writeCommandBlock.write(QVariant::fromValue(ClangBackEnd::EndCommand()));
- ASSERT_EQ(50, buffer.size());
+ ASSERT_EQ(46, buffer.size());
}
TEST_F(ReadAndWriteCommandBlockTest, WriteTwoCommandsAndTestCount)
{
- writeCommandBlock.write(QVariant::fromValue(CodeModelBackEnd::EndCommand()));
- writeCommandBlock.write(QVariant::fromValue(CodeModelBackEnd::EndCommand()));
+ writeCommandBlock.write(QVariant::fromValue(ClangBackEnd::EndCommand()));
+ writeCommandBlock.write(QVariant::fromValue(ClangBackEnd::EndCommand()));
ASSERT_EQ(2, writeCommandBlock.counter());
}
TEST_F(ReadAndWriteCommandBlockTest, ReadThreeCommandsAndTestCount)
{
- writeCommandBlock.write(QVariant::fromValue(CodeModelBackEnd::EndCommand()));
- writeCommandBlock.write(QVariant::fromValue(CodeModelBackEnd::EndCommand()));
- writeCommandBlock.write(QVariant::fromValue(CodeModelBackEnd::EndCommand()));
+ writeCommandBlock.write(QVariant::fromValue(ClangBackEnd::EndCommand()));
+ writeCommandBlock.write(QVariant::fromValue(ClangBackEnd::EndCommand()));
+ writeCommandBlock.write(QVariant::fromValue(ClangBackEnd::EndCommand()));
buffer.seek(0);
ASSERT_EQ(3, readCommandBlock.readAll().count());
@@ -127,39 +127,39 @@ TEST_F(ReadAndWriteCommandBlockTest, ReadThreeCommandsAndTestCount)
TEST_F(ReadAndWriteCommandBlockTest, CompareEndCommand)
{
- CompareCommand(CodeModelBackEnd::EndCommand());
+ CompareCommand(ClangBackEnd::EndCommand());
}
TEST_F(ReadAndWriteCommandBlockTest, CompareAliveCommand)
{
- CompareCommand(CodeModelBackEnd::AliveCommand());
+ CompareCommand(ClangBackEnd::AliveCommand());
}
TEST_F(ReadAndWriteCommandBlockTest, CompareRegisterTranslationUnitForCodeCompletionCommand)
{
- CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), Utf8StringLiteral("pathToProject.pro"));
- QVector<CodeModelBackEnd::FileContainer> fileContainers({fileContainer});
+ ClangBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), Utf8StringLiteral("pathToProject.pro"));
+ QVector<ClangBackEnd::FileContainer> fileContainers({fileContainer});
- CompareCommand(CodeModelBackEnd::RegisterTranslationUnitForCodeCompletionCommand(fileContainers));
+ CompareCommand(ClangBackEnd::RegisterTranslationUnitForCodeCompletionCommand(fileContainers));
}
TEST_F(ReadAndWriteCommandBlockTest, CompareUnregisterFileForCodeCompletionCommand)
{
- CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), Utf8StringLiteral("pathToProject.pro"));
+ ClangBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), Utf8StringLiteral("pathToProject.pro"));
- CompareCommand(CodeModelBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand({fileContainer}));
+ CompareCommand(ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionCommand({fileContainer}));
}
TEST_F(ReadAndWriteCommandBlockTest, CompareCompleteCodeCommand)
{
- CompareCommand(CodeModelBackEnd::CompleteCodeCommand(Utf8StringLiteral("foo.cpp"), 24, 33, Utf8StringLiteral("do what I want")));
+ CompareCommand(ClangBackEnd::CompleteCodeCommand(Utf8StringLiteral("foo.cpp"), 24, 33, Utf8StringLiteral("do what I want")));
}
TEST_F(ReadAndWriteCommandBlockTest, CompareCodeCompletedCommand)
{
- QVector<CodeModelBackEnd::CodeCompletion> codeCompletions({Utf8StringLiteral("newFunction()")});
+ QVector<ClangBackEnd::CodeCompletion> codeCompletions({Utf8StringLiteral("newFunction()")});
- CompareCommand(CodeModelBackEnd::CodeCompletedCommand(codeCompletions, 1));
+ CompareCommand(ClangBackEnd::CodeCompletedCommand(codeCompletions, 1));
}
TEST_F(ReadAndWriteCommandBlockTest, GetInvalidCommandForAPartialBuffer)
@@ -184,7 +184,7 @@ TEST_F(ReadAndWriteCommandBlockTest, ReadCommandAfterInterruption)
QVariant ReadAndWriteCommandBlockTest::writeCodeCompletedCommand()
{
- CodeModelBackEnd::CodeCompletedCommand command(QVector<CodeModelBackEnd::CodeCompletion>({Utf8StringLiteral("newFunction()")}), 1);
+ ClangBackEnd::CodeCompletedCommand command(QVector<ClangBackEnd::CodeCompletion>({Utf8StringLiteral("newFunction()")}), 1);
const QVariant writeCommand = QVariant::fromValue(command);
writeCommandBlock.write(writeCommand);
diff --git a/tests/unit/codemodelbackend/unittest/spydummy.cpp b/tests/unit/unittest/spydummy.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/spydummy.cpp
rename to tests/unit/unittest/spydummy.cpp
diff --git a/tests/unit/codemodelbackend/unittest/spydummy.h b/tests/unit/unittest/spydummy.h
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/spydummy.h
rename to tests/unit/unittest/spydummy.h
diff --git a/tests/unit/codemodelbackend/unittest/sqlitecolumntest.cpp b/tests/unit/unittest/sqlitecolumntest.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/sqlitecolumntest.cpp
rename to tests/unit/unittest/sqlitecolumntest.cpp
diff --git a/tests/unit/codemodelbackend/unittest/sqlitedatabasebackendtest.cpp b/tests/unit/unittest/sqlitedatabasebackendtest.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/sqlitedatabasebackendtest.cpp
rename to tests/unit/unittest/sqlitedatabasebackendtest.cpp
diff --git a/tests/unit/codemodelbackend/unittest/sqlitedatabasetest.cpp b/tests/unit/unittest/sqlitedatabasetest.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/sqlitedatabasetest.cpp
rename to tests/unit/unittest/sqlitedatabasetest.cpp
diff --git a/tests/unit/codemodelbackend/unittest/sqlitestatementtest.cpp b/tests/unit/unittest/sqlitestatementtest.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/sqlitestatementtest.cpp
rename to tests/unit/unittest/sqlitestatementtest.cpp
diff --git a/tests/unit/codemodelbackend/unittest/sqlitetabletest.cpp b/tests/unit/unittest/sqlitetabletest.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/sqlitetabletest.cpp
rename to tests/unit/unittest/sqlitetabletest.cpp
diff --git a/tests/unit/codemodelbackend/unittest/sqlstatementbuildertest.cpp b/tests/unit/unittest/sqlstatementbuildertest.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/sqlstatementbuildertest.cpp
rename to tests/unit/unittest/sqlstatementbuildertest.cpp
diff --git a/tests/unit/codemodelbackend/unittest/translationunitstest.cpp b/tests/unit/unittest/translationunitstest.cpp
similarity index 73%
rename from tests/unit/codemodelbackend/unittest/translationunitstest.cpp
rename to tests/unit/unittest/translationunitstest.cpp
index 533b422c3dd..3b74c5a1664 100644
--- a/tests/unit/codemodelbackend/unittest/translationunitstest.cpp
+++ b/tests/unit/unittest/translationunitstest.cpp
@@ -48,9 +48,9 @@
#include <translationunitfilenotexitexception.h>
#include <projectpartsdonotexistexception.h>
-using CodeModelBackEnd::TranslationUnit;
-using CodeModelBackEnd::UnsavedFiles;
-using CodeModelBackEnd::ProjectPart;
+using ClangBackEnd::TranslationUnit;
+using ClangBackEnd::UnsavedFiles;
+using ClangBackEnd::ProjectPart;
using testing::IsNull;
using testing::NotNull;
@@ -85,9 +85,9 @@ class TranslationUnits : public ::testing::Test
protected:
void SetUp() override;
- CodeModelBackEnd::ProjectParts projects;
- CodeModelBackEnd::UnsavedFiles unsavedFiles;
- CodeModelBackEnd::TranslationUnits translationUnits = CodeModelBackEnd::TranslationUnits(projects, unsavedFiles);
+ ClangBackEnd::ProjectParts projects;
+ ClangBackEnd::UnsavedFiles unsavedFiles;
+ ClangBackEnd::TranslationUnits translationUnits = ClangBackEnd::TranslationUnits(projects, unsavedFiles);
const Utf8String filePath = Utf8StringLiteral(TESTDATA_DIR"/complete_testfile_1.cpp");
const Utf8String projectPartId = Utf8StringLiteral("/path/to/projectfile");
@@ -95,42 +95,42 @@ protected:
void TranslationUnits::SetUp()
{
- projects.createOrUpdate({CodeModelBackEnd::ProjectPartContainer(projectPartId)});
+ projects.createOrUpdate({ClangBackEnd::ProjectPartContainer(projectPartId)});
}
TEST_F(TranslationUnits, ThrowForGettingWithWrongFilePath)
{
ASSERT_THROW(translationUnits.translationUnit(Utf8StringLiteral("foo.cpp"), projectPartId),
- CodeModelBackEnd::TranslationUnitDoesNotExistException);
+ ClangBackEnd::TranslationUnitDoesNotExistException);
}
TEST_F(TranslationUnits, ThrowForGettingWithWrongProjectPartFilePath)
{
ASSERT_THROW(translationUnits.translationUnit(filePath, Utf8StringLiteral("foo.pro")),
- CodeModelBackEnd::ProjectPartDoNotExistException);
+ ClangBackEnd::ProjectPartDoNotExistException);
}
TEST_F(TranslationUnits, ThrowForAddingNonExistingFile)
{
- CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), projectPartId);
+ ClangBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), projectPartId);
ASSERT_THROW(translationUnits.createOrUpdate({fileContainer}),
- CodeModelBackEnd::TranslationUnitFileNotExitsException);
+ ClangBackEnd::TranslationUnitFileNotExitsException);
}
TEST_F(TranslationUnits, DoNotThrowForAddingNonExistingFileWithUnsavedContent)
{
- CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), projectPartId, Utf8String(), true);
+ ClangBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), projectPartId, Utf8String(), true);
ASSERT_NO_THROW(translationUnits.createOrUpdate({fileContainer}));
}
TEST_F(TranslationUnits, Add)
{
- CodeModelBackEnd::FileContainer fileContainer(filePath, projectPartId);
+ ClangBackEnd::FileContainer fileContainer(filePath, projectPartId);
translationUnits.createOrUpdate({fileContainer});
@@ -140,38 +140,38 @@ TEST_F(TranslationUnits, Add)
TEST_F(TranslationUnits, ThrowForRemovingWithWrongFilePath)
{
- CodeModelBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), projectPartId);
+ ClangBackEnd::FileContainer fileContainer(Utf8StringLiteral("foo.cpp"), projectPartId);
ASSERT_THROW(translationUnits.remove({fileContainer}),
- CodeModelBackEnd::TranslationUnitDoesNotExistException);
+ ClangBackEnd::TranslationUnitDoesNotExistException);
}
TEST_F(TranslationUnits, ThrowForRemovingWithWrongProjectPartFilePath)
{
- CodeModelBackEnd::FileContainer fileContainer(filePath, Utf8StringLiteral("foo.pro"));
+ ClangBackEnd::FileContainer fileContainer(filePath, Utf8StringLiteral("foo.pro"));
ASSERT_THROW(translationUnits.remove({fileContainer}),
- CodeModelBackEnd::ProjectPartDoNotExistException);
+ ClangBackEnd::ProjectPartDoNotExistException);
}
TEST_F(TranslationUnits, Remove)
{
- CodeModelBackEnd::FileContainer fileContainer(filePath, projectPartId);
+ ClangBackEnd::FileContainer fileContainer(filePath, projectPartId);
translationUnits.createOrUpdate({fileContainer});
translationUnits.remove({fileContainer});
ASSERT_THROW(translationUnits.translationUnit(filePath, projectPartId),
- CodeModelBackEnd::TranslationUnitDoesNotExistException);
+ ClangBackEnd::TranslationUnitDoesNotExistException);
}
TEST_F(TranslationUnits, RemoveAllValidIfExceptionIsThrown)
{
- CodeModelBackEnd::FileContainer fileContainer(filePath, projectPartId);
+ ClangBackEnd::FileContainer fileContainer(filePath, projectPartId);
translationUnits.createOrUpdate({fileContainer});
- ASSERT_THROW(translationUnits.remove({CodeModelBackEnd::FileContainer(Utf8StringLiteral("dontextist.pro"), projectPartId), fileContainer}),
- CodeModelBackEnd::TranslationUnitDoesNotExistException);
+ ASSERT_THROW(translationUnits.remove({ClangBackEnd::FileContainer(Utf8StringLiteral("dontextist.pro"), projectPartId), fileContainer}),
+ ClangBackEnd::TranslationUnitDoesNotExistException);
ASSERT_THAT(translationUnits.translationUnits(),
Not(Contains(TranslationUnit(filePath, unsavedFiles, projects.project(projectPartId)))));
diff --git a/tests/unit/codemodelbackend/unittest/translationunittest.cpp b/tests/unit/unittest/translationunittest.cpp
similarity index 89%
rename from tests/unit/codemodelbackend/unittest/translationunittest.cpp
rename to tests/unit/unittest/translationunittest.cpp
index e2a91b69480..72cd39cf296 100644
--- a/tests/unit/codemodelbackend/unittest/translationunittest.cpp
+++ b/tests/unit/unittest/translationunittest.cpp
@@ -50,9 +50,9 @@
#include <chrono>
#include <thread>
-using CodeModelBackEnd::TranslationUnit;
-using CodeModelBackEnd::UnsavedFiles;
-using CodeModelBackEnd::ProjectPart;
+using ClangBackEnd::TranslationUnit;
+using ClangBackEnd::UnsavedFiles;
+using ClangBackEnd::ProjectPart;
using testing::IsNull;
using testing::NotNull;
@@ -70,7 +70,7 @@ TEST(TranslationUnit, DefaultTranslationUnitIsInvalid)
TEST(TranslationUnit, ThrowExceptionForNonExistingFilePath)
{
ASSERT_THROW(TranslationUnit(Utf8StringLiteral("file.cpp"), UnsavedFiles(), ProjectPart(Utf8StringLiteral("/path/to/projectfile"))),
- CodeModelBackEnd::TranslationUnitFileNotExitsException);
+ ClangBackEnd::TranslationUnitFileNotExitsException);
}
TEST(TranslationUnit, ThrowNoExceptionForNonExistingFilePathIfDoNotCheckIfFileExistsIsSet)
@@ -90,7 +90,7 @@ TEST(TranslationUnit, ThrowExceptionForGettingIndexForInvalidUnit)
{
TranslationUnit translationUnit;
- ASSERT_THROW(translationUnit.index(), CodeModelBackEnd::TranslationUnitIsNullException);
+ ASSERT_THROW(translationUnit.index(), ClangBackEnd::TranslationUnitIsNullException);
}
TEST(TranslationUnit, IndexGetterIsNonNullForValidUnit)
@@ -104,7 +104,7 @@ TEST(TranslationUnit, ThrowExceptionForGettingCxTranslationUnitForInvalidUnit)
{
TranslationUnit translationUnit;
- ASSERT_THROW(translationUnit.cxTranslationUnit(), CodeModelBackEnd::TranslationUnitIsNullException);
+ ASSERT_THROW(translationUnit.cxTranslationUnit(), ClangBackEnd::TranslationUnitIsNullException);
}
TEST(TranslationUnit, CxTranslationUnitGetterIsNonNullForValidUnit)
@@ -119,7 +119,7 @@ TEST(TranslationUnit, ThrowExceptionIfGettingFilePathForNullUnit)
{
TranslationUnit translationUnit;
- ASSERT_THROW(translationUnit.filePath(), CodeModelBackEnd::TranslationUnitIsNullException);
+ ASSERT_THROW(translationUnit.filePath(), ClangBackEnd::TranslationUnitIsNullException);
}
TEST(TranslationUnit, ResetedTranslationUnitIsNull)
@@ -149,7 +149,7 @@ TEST(TranslationUnit, TimeStampIsUpdatedAsNewCxTranslationUnitIsGenerated)
// project.setArguments({Utf8StringLiteral("-fblah")});
// TranslationUnit translationUnit(Utf8StringLiteral(TESTDATA_DIR"/complete_testfile_1.cpp"), UnsavedFiles(), project);
-// ASSERT_THROW(translationUnit.cxTranslationUnit(), CodeModelBackEnd::TranslationUnitParseErrorException);
+// ASSERT_THROW(translationUnit.cxTranslationUnit(), ClangBackEnd::TranslationUnitParseErrorException);
//}
}
diff --git a/tests/unit/codemodelbackend/unittest/unittest.pro b/tests/unit/unittest/unittest.pro
similarity index 80%
rename from tests/unit/codemodelbackend/unittest/unittest.pro
rename to tests/unit/unittest/unittest.pro
index 88d946f74fd..330a4f3d5b1 100644
--- a/tests/unit/codemodelbackend/unittest/unittest.pro
+++ b/tests/unit/unittest/unittest.pro
@@ -1,7 +1,7 @@
QT += core network testlib
QT -= gui
-TARGET = codemodelbackendtest
+TARGET = unittest
CONFIG += console c++14 testcase
CONFIG -= app_bundle
@@ -15,13 +15,13 @@ requires(exists($$GMOCK_DIR))
INCLUDEPATH += $$GTEST_DIR $$GTEST_DIR/include $$GMOCK_DIR $$GMOCK_DIR/include
-include(../../../../src/libs/sqlite/sqlite-lib.pri)
-include(../../../../src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri)
-include(../../../../src/tools/codemodelbackend/ipcsource/codemodelbackendclangipc-source.pri)
-include(../../../../src/shared/clang/clang_installation.pri)
-include(../../../../src/plugins/clangcodemodel/clangcodemodelunittestfiles.pri)
+include(../../../src/libs/sqlite/sqlite-lib.pri)
+include(../../../src/libs/clangbackendipc/clangbackendipc-lib.pri)
+include(../../../src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri)
+include(../../../src/shared/clang/clang_installation.pri)
+include(../../../src/plugins/clangcodemodel/clangcodemodelunittestfiles.pri)
-INCLUDEPATH += $$PWD/../../../../src/libs $$PWD/../../../../src/plugins
+INCLUDEPATH += $$PWD/../../../src/libs $$PWD/../../../src/plugins
requires(!isEmpty(LLVM_LIBS))
@@ -48,7 +48,7 @@ SOURCES += main.cpp \
clientserveroutsideprocess.cpp \
gtest-qt-printing.cpp \
codecompletiontest.cpp \
- ../../../../src/libs/utils/qtcassert.cpp \
+ ../../../src/libs/utils/qtcassert.cpp \
clangstringtest.cpp \
translationunittest.cpp \
clangcodecompleteresultstest.cpp \
@@ -62,7 +62,7 @@ SOURCES += main.cpp \
HEADERS += \
gtest-qt-printing.h \
spydummy.h \
- ../../../../src/libs/utils/qtcassert.h \
+ ../../../src/libs/utils/qtcassert.h \
mockipclient.h \
mockipcserver.h
@@ -80,7 +80,7 @@ OTHER_FILES += data/complete_testfile_1.cpp \
data/complete_translationunit_parse_error.cpp
DEFINES += QT_NO_CAST_FROM_ASCII
-DEFINES += CODEMODELBACKEND_TESTS
+DEFINES += CLANGBACKEND_TESTS
DEFINES += DONT_CHECK_COMMAND_COUNTER
DEFINES += GTEST_HAS_STD_INITIALIZER_LIST_ GTEST_LANG_CXX11
diff --git a/tests/unit/codemodelbackend/unittest/unsavedfilestest.cpp b/tests/unit/unittest/unsavedfilestest.cpp
similarity index 96%
rename from tests/unit/codemodelbackend/unittest/unsavedfilestest.cpp
rename to tests/unit/unittest/unsavedfilestest.cpp
index 0da931ec81e..0b843c6011a 100644
--- a/tests/unit/codemodelbackend/unittest/unsavedfilestest.cpp
+++ b/tests/unit/unittest/unsavedfilestest.cpp
@@ -38,8 +38,8 @@
#include <QVector>
-using CodeModelBackEnd::UnsavedFiles;
-using CodeModelBackEnd::FileContainer;
+using ClangBackEnd::UnsavedFiles;
+using ClangBackEnd::FileContainer;
using ::testing::IsNull;
using ::testing::NotNull;
@@ -47,7 +47,7 @@ using ::testing::Gt;
namespace {
-bool operator==(const CodeModelBackEnd::FileContainer &fileContainer, const CXUnsavedFile &cxUnsavedFile)
+bool operator==(const ClangBackEnd::FileContainer &fileContainer, const CXUnsavedFile &cxUnsavedFile)
{
return fileContainer.filePath() == Utf8String::fromUtf8(cxUnsavedFile.Filename)
&& fileContainer.unsavedFileContent() == Utf8String(cxUnsavedFile.Contents, cxUnsavedFile.Length);
@@ -64,7 +64,7 @@ bool fileContainersContainsItemMatchingToCxUnsavedFile(const QVector<FileContain
MATCHER_P(HasUnsavedFiles, fileContainers, "")
{
- CodeModelBackEnd::UnsavedFiles unsavedFiles = arg;
+ ClangBackEnd::UnsavedFiles unsavedFiles = arg;
if (unsavedFiles.count() != fileContainers.size()) {
*result_listener << "unsaved count is " << unsavedFiles.count() << " and not " << fileContainers.size();
return false;
diff --git a/tests/unit/codemodelbackend/unittest/utf8test.cpp b/tests/unit/unittest/utf8test.cpp
similarity index 100%
rename from tests/unit/codemodelbackend/unittest/utf8test.cpp
rename to tests/unit/unittest/utf8test.cpp
--
GitLab