Clang: Rename CodeModelBackEnd in ClangBackEnd

Change-Id: I13e8a458634110456375956d4d4da7239c86957f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

.gitignore

@@ -117,7 +117,7 @@ tmp/
 *.dll
 *.exe
 /bin/buildoutputparser
-/bin/codemodelbackend
+/bin/clangbackend
 /bin/cpaster
 /bin/cplusplus-ast2png
 /bin/cplusplus-frontend

src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri → src/libs/clangbackendipc/clangbackendipc-lib.pri

 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

src/libs/codemodelbackendipc/codemodelbackendipc.pro → src/libs/clangbackendipc/clangbackendipc.pro

 include(../../qtcreatorlibrary.pri)
-include(codemodelbackendipc-lib.pri)
+include(clangbackendipc-lib.pri)

src/libs/codemodelbackendipc/codemodelbackendipc.qbs → src/libs/clangbackendipc/clangbackendipc.qbs

 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 {

src/libs/clangbackendipc/clangbackendipc_dependencies.pri

+QTC_LIB_NAME = Clangbackendipc
+QTC_LIB_DEPENDS += sqlite
+INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/clangbackendipc

src/libs/codemodelbackendipc/codemodelbackendipc_global.h → 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

src/libs/codemodelbackendipc/cmbalivecommand.cpp → src/libs/clangbackendipc/cmbalivecommand.cpp

@@ -34,7 +34,7 @@
 
 #include <QDataStream>
 
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
 
 QDataStream &operator<<(QDataStream &out, const AliveCommand &/*command*/)
 {

src/libs/codemodelbackendipc/cmbalivecommand.h → 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

src/libs/codemodelbackendipc/cmbcodecompletedcommand.cpp → 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
 

src/libs/codemodelbackendipc/cmbcodecompletedcommand.h → 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

src/libs/codemodelbackendipc/cmbcommands.cpp → 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
 

src/libs/codemodelbackendipc/cmbcommands.h → 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

src/libs/codemodelbackendipc/cmbcompletecodecommand.cpp → 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
 

src/libs/codemodelbackendipc/cmbcompletecodecommand.h → 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

src/libs/codemodelbackendipc/cmbechocommand.cpp → 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
 

src/libs/codemodelbackendipc/cmbechocommand.h → 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

src/libs/codemodelbackendipc/cmbendcommand.cpp → src/libs/clangbackendipc/cmbendcommand.cpp

@@ -36,7 +36,7 @@
 
 #include <ostream>
 
-namespace CodeModelBackEnd {
+namespace ClangBackEnd {
 
 QDataStream &operator<<(QDataStream &out, const EndCommand &/*command*/)
 {

src/libs/codemodelbackendipc/cmbendcommand.h → 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

src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp → 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
 

src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.h → 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

src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp → 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
 

src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h → 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

src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp → 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
 

src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.h → 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

src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp → 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
 

src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h → 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

src/libs/codemodelbackendipc/codecompletion.cpp → 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
 

src/libs/codemodelbackendipc/codecompletion.h → 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>