Clang: Rename ForCodeCompletion in ForEditor

It reflects that the translation units and projects have a tied relationship with an editor. Change-Id: I3c01d5776980fe079af1fdef82feded83fdf5463 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-08-31 14:36:58 +02:00
parent 8ad7616420
commit 6e14eb6940
33 changed files with 388 additions and 389 deletions
--- a/src/libs/clangbackendipc/clangbackendipc-lib.pri
+++ b/src/libs/clangbackendipc/clangbackendipc-lib.pri
@@ -24,14 +24,14 @@ SOURCES += $$PWD/ipcserverinterface.cpp \
    $$PWD/connectionclient.cpp \
    $$PWD/cmbechomessage.cpp \
    $$PWD/ipcclientdispatcher.cpp \
-    $$PWD/cmbregistertranslationunitsforcodecompletionmessage.cpp \
+    $$PWD/cmbregistertranslationunitsforeditormessage.cpp \
    $$PWD/filecontainer.cpp \
-    $$PWD/cmbunregistertranslationunitsforcodecompletionmessage.cpp \
+    $$PWD/cmbunregistertranslationunitsforeditormessage.cpp \
    $$PWD/cmbcompletecodemessage.cpp \
    $$PWD/cmbcodecompletedmessage.cpp \
    $$PWD/codecompletion.cpp \
-    $$PWD/cmbregisterprojectsforcodecompletionmessage.cpp \
-    $$PWD/cmbunregisterprojectsforcodecompletionmessage.cpp \
+    $$PWD/cmbregisterprojectsforeditormessage.cpp \
+    $$PWD/cmbunregisterprojectsforeditormessage.cpp \
    $$PWD/translationunitdoesnotexistmessage.cpp \
    $$PWD/codecompletionchunk.cpp \
    $$PWD/projectpartcontainer.cpp \
@@ -60,14 +60,14 @@ HEADERS += \
    $$PWD/connectionclient.h \
    $$PWD/cmbechomessage.h \
    $$PWD/ipcclientdispatcher.h \
-    $$PWD/cmbregistertranslationunitsforcodecompletionmessage.h \
+    $$PWD/cmbregistertranslationunitsforeditormessage.h \
    $$PWD/filecontainer.h \
-    $$PWD/cmbunregistertranslationunitsforcodecompletionmessage.h \
+    $$PWD/cmbunregistertranslationunitsforeditormessage.h \
    $$PWD/cmbcompletecodemessage.h \
    $$PWD/cmbcodecompletedmessage.h \
    $$PWD/codecompletion.h \
-    $$PWD/cmbregisterprojectsforcodecompletionmessage.h \
-    $$PWD/cmbunregisterprojectsforcodecompletionmessage.h \
+    $$PWD/cmbregisterprojectsforeditormessage.h \
+    $$PWD/cmbunregisterprojectsforeditormessage.h \
    $$PWD/translationunitdoesnotexistmessage.h \
    $$PWD/codecompletionchunk.h \
    $$PWD/projectpartcontainer.h \
--- a/src/libs/clangbackendipc/cmbmessages.cpp
+++ b/src/libs/clangbackendipc/cmbmessages.cpp
@@ -33,10 +33,10 @@
 #include "cmbalivemessage.h"
 #include "cmbendmessage.h"
 #include "cmbechomessage.h"
-#include "cmbregistertranslationunitsforcodecompletionmessage.h"
-#include "cmbunregistertranslationunitsforcodecompletionmessage.h"
-#include "cmbregisterprojectsforcodecompletionmessage.h"
-#include "cmbunregisterprojectsforcodecompletionmessage.h"
+#include "cmbregistertranslationunitsforeditormessage.h"
+#include "cmbunregistertranslationunitsforeditormessage.h"
+#include "cmbregisterprojectsforeditormessage.h"
+#include "cmbunregisterprojectsforeditormessage.h"
 #include "cmbcompletecodemessage.h"
 #include "cmbcodecompletedmessage.h"
 #include "diagnosticcontainer.h"
@@ -64,17 +64,17 @@ void Messages::registerMessages()
    qRegisterMetaType<EchoMessage>();
    qRegisterMetaTypeStreamOperators<EchoMessage>();

-    qRegisterMetaType<RegisterTranslationUnitForCodeCompletionMessage>();
-    qRegisterMetaTypeStreamOperators<RegisterTranslationUnitForCodeCompletionMessage>();
-    QMetaType::registerComparators<RegisterTranslationUnitForCodeCompletionMessage>();
+    qRegisterMetaType<RegisterTranslationUnitForEditorMessage>();
+    qRegisterMetaTypeStreamOperators<RegisterTranslationUnitForEditorMessage>();
+    QMetaType::registerComparators<RegisterTranslationUnitForEditorMessage>();

    qRegisterMetaType<FileContainer>();
    qRegisterMetaTypeStreamOperators<FileContainer>();
    QMetaType::registerComparators<FileContainer>();

-    qRegisterMetaType<UnregisterTranslationUnitsForCodeCompletionMessage>();
-    qRegisterMetaTypeStreamOperators<UnregisterTranslationUnitsForCodeCompletionMessage>();
-    QMetaType::registerComparators<UnregisterTranslationUnitsForCodeCompletionMessage>();
+    qRegisterMetaType<UnregisterTranslationUnitsForEditorMessage>();
+    qRegisterMetaTypeStreamOperators<UnregisterTranslationUnitsForEditorMessage>();
+    QMetaType::registerComparators<UnregisterTranslationUnitsForEditorMessage>();

    qRegisterMetaType<CompleteCodeMessage>();
    qRegisterMetaTypeStreamOperators<CompleteCodeMessage>();
@@ -88,17 +88,17 @@ void Messages::registerMessages()
    qRegisterMetaTypeStreamOperators<CodeCompletedMessage>();
    QMetaType::registerComparators<CodeCompletedMessage>();

-    qRegisterMetaType<RegisterProjectPartsForCodeCompletionMessage>();
-    qRegisterMetaTypeStreamOperators<RegisterProjectPartsForCodeCompletionMessage>();
-    QMetaType::registerComparators<RegisterProjectPartsForCodeCompletionMessage>();
+    qRegisterMetaType<RegisterProjectPartsForEditorMessage>();
+    qRegisterMetaTypeStreamOperators<RegisterProjectPartsForEditorMessage>();
+    QMetaType::registerComparators<RegisterProjectPartsForEditorMessage>();

    qRegisterMetaType<ProjectPartContainer>();
    qRegisterMetaTypeStreamOperators<ProjectPartContainer>();
    QMetaType::registerComparators<ProjectPartContainer>();

-    qRegisterMetaType<UnregisterProjectPartsForCodeCompletionMessage>();
-    qRegisterMetaTypeStreamOperators<UnregisterProjectPartsForCodeCompletionMessage>();
-    QMetaType::registerComparators<UnregisterProjectPartsForCodeCompletionMessage>();
+    qRegisterMetaType<UnregisterProjectPartsForEditorMessage>();
+    qRegisterMetaTypeStreamOperators<UnregisterProjectPartsForEditorMessage>();
+    QMetaType::registerComparators<UnregisterProjectPartsForEditorMessage>();

    qRegisterMetaType<TranslationUnitDoesNotExistMessage>();
    qRegisterMetaTypeStreamOperators<TranslationUnitDoesNotExistMessage>();
--- a/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletionmessage.cpp
+++ b/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletionmessage.cpp
@@ -28,7 +28,7 @@
 **
 ****************************************************************************/

-#include "cmbregisterprojectsforcodecompletionmessage.h"
+#include "cmbregisterprojectsforeditormessage.h"

 #include "container_common.h"

@@ -40,43 +40,43 @@

 namespace ClangBackEnd {

-RegisterProjectPartsForCodeCompletionMessage::RegisterProjectPartsForCodeCompletionMessage(const QVector<ProjectPartContainer> &projectContainers)
+RegisterProjectPartsForEditorMessage::RegisterProjectPartsForEditorMessage(const QVector<ProjectPartContainer> &projectContainers)
    :projectContainers_(projectContainers)
 {
 }

-const QVector<ProjectPartContainer> &RegisterProjectPartsForCodeCompletionMessage::projectContainers() const
+const QVector<ProjectPartContainer> &RegisterProjectPartsForEditorMessage::projectContainers() const
 {
    return projectContainers_;
 }

-QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForCodeCompletionMessage &message)
+QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForEditorMessage &message)
 {
    out << message.projectContainers_;

    return out;
 }

-QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForCodeCompletionMessage &message)
+QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForEditorMessage &message)
 {
    in >> message.projectContainers_;

    return in;
 }

-bool operator==(const RegisterProjectPartsForCodeCompletionMessage &first, const RegisterProjectPartsForCodeCompletionMessage &second)
+bool operator==(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second)
 {
    return first.projectContainers_ == second.projectContainers_;
 }

-bool operator<(const RegisterProjectPartsForCodeCompletionMessage &first, const RegisterProjectPartsForCodeCompletionMessage &second)
+bool operator<(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second)
 {
    return compareContainer(first.projectContainers_, second.projectContainers_);
 }

-QDebug operator<<(QDebug debug, const RegisterProjectPartsForCodeCompletionMessage &message)
+QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message)
 {
-    debug.nospace() << "RegisterProjectPartsForCodeCompletionMessage(";
+    debug.nospace() << "RegisterProjectPartsForEditorMessage(";

    for (const ProjectPartContainer &projectContainer : message.projectContainers())
        debug.nospace() << projectContainer<< ", ";
@@ -86,9 +86,9 @@ QDebug operator<<(QDebug debug, const RegisterProjectPartsForCodeCompletionMessa
    return debug;
 }

-void PrintTo(const RegisterProjectPartsForCodeCompletionMessage &message, ::std::ostream* os)
+void PrintTo(const RegisterProjectPartsForEditorMessage &message, ::std::ostream* os)
 {
-    *os << "RegisterProjectPartsForCodeCompletionMessage(";
+    *os << "RegisterProjectPartsForEditorMessage(";

    for (const ProjectPartContainer &projectContainer : message.projectContainers())
        PrintTo(projectContainer, os);
--- a/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletionmessage.h
+++ b/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletionmessage.h
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/

-#ifndef CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONMESSAGE_H
-#define CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONMESSAGE_H
+#ifndef CLANGBACKEND_REGISTERPROJECTSFOREDITORMESSAGE_H
+#define CLANGBACKEND_REGISTERPROJECTSFOREDITORMESSAGE_H

 #include "projectpartcontainer.h"

@@ -38,16 +38,16 @@

 namespace ClangBackEnd {

-class CMBIPC_EXPORT RegisterProjectPartsForCodeCompletionMessage
+class CMBIPC_EXPORT RegisterProjectPartsForEditorMessage
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForCodeCompletionMessage &message);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForCodeCompletionMessage &message);
-    friend CMBIPC_EXPORT bool operator==(const RegisterProjectPartsForCodeCompletionMessage &first, const RegisterProjectPartsForCodeCompletionMessage &second);
-    friend CMBIPC_EXPORT bool operator<(const RegisterProjectPartsForCodeCompletionMessage &first, const RegisterProjectPartsForCodeCompletionMessage &second);
-    friend void PrintTo(const RegisterProjectPartsForCodeCompletionMessage &message, ::std::ostream* os);
+    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForEditorMessage &message);
+    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForEditorMessage &message);
+    friend CMBIPC_EXPORT bool operator==(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second);
+    friend CMBIPC_EXPORT bool operator<(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second);
+    friend void PrintTo(const RegisterProjectPartsForEditorMessage &message, ::std::ostream* os);
 public:
-    RegisterProjectPartsForCodeCompletionMessage() = default;
-    RegisterProjectPartsForCodeCompletionMessage(const QVector<ProjectPartContainer> &projectContainers);
+    RegisterProjectPartsForEditorMessage() = default;
+    RegisterProjectPartsForEditorMessage(const QVector<ProjectPartContainer> &projectContainers);

    const QVector<ProjectPartContainer> &projectContainers() const;

@@ -55,15 +55,15 @@ private:
    QVector<ProjectPartContainer> projectContainers_;
 };

-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForCodeCompletionMessage &message);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForCodeCompletionMessage &message);
-CMBIPC_EXPORT bool operator==(const RegisterProjectPartsForCodeCompletionMessage &first, const RegisterProjectPartsForCodeCompletionMessage &second);
-CMBIPC_EXPORT bool operator<(const RegisterProjectPartsForCodeCompletionMessage &first, const RegisterProjectPartsForCodeCompletionMessage &second);
+CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterProjectPartsForEditorMessage &message);
+CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterProjectPartsForEditorMessage &message);
+CMBIPC_EXPORT bool operator==(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second);
+CMBIPC_EXPORT bool operator<(const RegisterProjectPartsForEditorMessage &first, const RegisterProjectPartsForEditorMessage &second);

-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForCodeCompletionMessage &message);
-void PrintTo(const RegisterProjectPartsForCodeCompletionMessage &message, ::std::ostream* os);
+CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message);
+void PrintTo(const RegisterProjectPartsForEditorMessage &message, ::std::ostream* os);
 } // namespace ClangBackEnd

-Q_DECLARE_METATYPE(ClangBackEnd::RegisterProjectPartsForCodeCompletionMessage)
+Q_DECLARE_METATYPE(ClangBackEnd::RegisterProjectPartsForEditorMessage)

-#endif // CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONMESSAGE_H
+#endif // CLANGBACKEND_REGISTERPROJECTSFOREDITORMESSAGE_H
--- a/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletionmessage.cpp
+++ b/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletionmessage.cpp
@@ -28,7 +28,7 @@
 **
 ****************************************************************************/

-#include "cmbregistertranslationunitsforcodecompletionmessage.h"
+#include "cmbregistertranslationunitsforeditormessage.h"

 #include "container_common.h"

@@ -39,43 +39,43 @@

 namespace ClangBackEnd {

-RegisterTranslationUnitForCodeCompletionMessage::RegisterTranslationUnitForCodeCompletionMessage(const QVector<FileContainer> &fileContainers)
+RegisterTranslationUnitForEditorMessage::RegisterTranslationUnitForEditorMessage(const QVector<FileContainer> &fileContainers)
    : fileContainers_(fileContainers)
 {
 }

-const QVector<FileContainer> &RegisterTranslationUnitForCodeCompletionMessage::fileContainers() const
+const QVector<FileContainer> &RegisterTranslationUnitForEditorMessage::fileContainers() const
 {
    return fileContainers_;
 }

-QDataStream &operator<<(QDataStream &out, const RegisterTranslationUnitForCodeCompletionMessage &message)
+QDataStream &operator<<(QDataStream &out, const RegisterTranslationUnitForEditorMessage &message)
 {
    out << message.fileContainers_;

    return out;
 }

-QDataStream &operator>>(QDataStream &in, RegisterTranslationUnitForCodeCompletionMessage &message)
+QDataStream &operator>>(QDataStream &in, RegisterTranslationUnitForEditorMessage &message)
 {
    in >> message.fileContainers_;

    return in;
 }

-bool operator==(const RegisterTranslationUnitForCodeCompletionMessage &first, const RegisterTranslationUnitForCodeCompletionMessage &second)
+bool operator==(const RegisterTranslationUnitForEditorMessage &first, const RegisterTranslationUnitForEditorMessage &second)
 {
    return first.fileContainers_ == second.fileContainers_;
 }

-bool operator<(const RegisterTranslationUnitForCodeCompletionMessage &first, const RegisterTranslationUnitForCodeCompletionMessage &second)
+bool operator<(const RegisterTranslationUnitForEditorMessage &first, const RegisterTranslationUnitForEditorMessage &second)
 {
    return compareContainer(first.fileContainers_, second.fileContainers_);
 }

-QDebug operator<<(QDebug debug, const RegisterTranslationUnitForCodeCompletionMessage &message)
+QDebug operator<<(QDebug debug, const RegisterTranslationUnitForEditorMessage &message)
 {
-    debug.nospace() << "RegisterTranslationUnitForCodeCompletionMessage(";
+    debug.nospace() << "RegisterTranslationUnitForEditorMessage(";

    for (const FileContainer &fileContainer : message.fileContainers())
        debug.nospace() << fileContainer<< ", ";
@@ -85,9 +85,9 @@ QDebug operator<<(QDebug debug, const RegisterTranslationUnitForCodeCompletionMe
    return debug;
 }

-void PrintTo(const RegisterTranslationUnitForCodeCompletionMessage &message, ::std::ostream* os)
+void PrintTo(const RegisterTranslationUnitForEditorMessage &message, ::std::ostream* os)
 {
-    *os << "RegisterTranslationUnitForCodeCompletionMessage(";
+    *os << "RegisterTranslationUnitForEditorMessage(";

    for (const FileContainer &fileContainer : message.fileContainers())
        PrintTo(fileContainer, os);
--- a/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletionmessage.h
+++ b/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletionmessage.h
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/

-#ifndef CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
-#define CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
+#ifndef CLANGBACKEND_REGISTERFILEFOREDITOR_H
+#define CLANGBACKEND_REGISTERFILEFOREDITOR_H

 #include "filecontainer.h"

@@ -38,16 +38,16 @@

 namespace ClangBackEnd {

-class CMBIPC_EXPORT RegisterTranslationUnitForCodeCompletionMessage
+class CMBIPC_EXPORT RegisterTranslationUnitForEditorMessage
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterTranslationUnitForCodeCompletionMessage &message);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterTranslationUnitForCodeCompletionMessage &message);
-    friend CMBIPC_EXPORT bool operator==(const RegisterTranslationUnitForCodeCompletionMessage &first, const RegisterTranslationUnitForCodeCompletionMessage &second);
-    friend CMBIPC_EXPORT bool operator<(const RegisterTranslationUnitForCodeCompletionMessage &first, const RegisterTranslationUnitForCodeCompletionMessage &second);
-    friend void PrintTo(const RegisterTranslationUnitForCodeCompletionMessage &message, ::std::ostream* os);
+    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterTranslationUnitForEditorMessage &message);
+    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterTranslationUnitForEditorMessage &message);
+    friend CMBIPC_EXPORT bool operator==(const RegisterTranslationUnitForEditorMessage &first, const RegisterTranslationUnitForEditorMessage &second);
+    friend CMBIPC_EXPORT bool operator<(const RegisterTranslationUnitForEditorMessage &first, const RegisterTranslationUnitForEditorMessage &second);
+    friend void PrintTo(const RegisterTranslationUnitForEditorMessage &message, ::std::ostream* os);
 public:
-    RegisterTranslationUnitForCodeCompletionMessage() = default;
-    RegisterTranslationUnitForCodeCompletionMessage(const QVector<FileContainer> &fileContainers);
+    RegisterTranslationUnitForEditorMessage() = default;
+    RegisterTranslationUnitForEditorMessage(const QVector<FileContainer> &fileContainers);

    const QVector<FileContainer> &fileContainers() const;

@@ -55,15 +55,15 @@ private:
    QVector<FileContainer> fileContainers_;
 };

-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterTranslationUnitForCodeCompletionMessage &message);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterTranslationUnitForCodeCompletionMessage &message);
-CMBIPC_EXPORT bool operator==(const RegisterTranslationUnitForCodeCompletionMessage &first, const RegisterTranslationUnitForCodeCompletionMessage &second);
-CMBIPC_EXPORT bool operator<(const RegisterTranslationUnitForCodeCompletionMessage &first, const RegisterTranslationUnitForCodeCompletionMessage &second);
+CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RegisterTranslationUnitForEditorMessage &message);
+CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RegisterTranslationUnitForEditorMessage &message);
+CMBIPC_EXPORT bool operator==(const RegisterTranslationUnitForEditorMessage &first, const RegisterTranslationUnitForEditorMessage &second);
+CMBIPC_EXPORT bool operator<(const RegisterTranslationUnitForEditorMessage &first, const RegisterTranslationUnitForEditorMessage &second);

-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterTranslationUnitForCodeCompletionMessage &message);
-void PrintTo(const RegisterTranslationUnitForCodeCompletionMessage &message, ::std::ostream* os);
+CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterTranslationUnitForEditorMessage &message);
+void PrintTo(const RegisterTranslationUnitForEditorMessage &message, ::std::ostream* os);
 } // namespace ClangBackEnd

-Q_DECLARE_METATYPE(ClangBackEnd::RegisterTranslationUnitForCodeCompletionMessage)
+Q_DECLARE_METATYPE(ClangBackEnd::RegisterTranslationUnitForEditorMessage)

 #endif // CLANGBACKEND_REGISTERFILEFORCODECOMPLITION_H
--- a/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletionmessage.cpp
+++ b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletionmessage.cpp
@@ -28,7 +28,7 @@
 **
 ****************************************************************************/

-#include "cmbunregisterprojectsforcodecompletionmessage.h"
+#include "cmbunregisterprojectsforeditormessage.h"

 #include "container_common.h"

@@ -41,43 +41,43 @@
 namespace ClangBackEnd {


-UnregisterProjectPartsForCodeCompletionMessage::UnregisterProjectPartsForCodeCompletionMessage(const Utf8StringVector &filePaths)
+UnregisterProjectPartsForEditorMessage::UnregisterProjectPartsForEditorMessage(const Utf8StringVector &filePaths)
    : projectPartIds_(filePaths)
 {
 }

-const Utf8StringVector &UnregisterProjectPartsForCodeCompletionMessage::projectPartIds() const
+const Utf8StringVector &UnregisterProjectPartsForEditorMessage::projectPartIds() const
 {
    return projectPartIds_;
 }

-QDataStream &operator<<(QDataStream &out, const UnregisterProjectPartsForCodeCompletionMessage &message)
+QDataStream &operator<<(QDataStream &out, const UnregisterProjectPartsForEditorMessage &message)
 {
    out << message.projectPartIds_;

    return out;
 }

-QDataStream &operator>>(QDataStream &in, UnregisterProjectPartsForCodeCompletionMessage &message)
+QDataStream &operator>>(QDataStream &in, UnregisterProjectPartsForEditorMessage &message)
 {
    in >> message.projectPartIds_;

    return in;
 }

-bool operator==(const UnregisterProjectPartsForCodeCompletionMessage &first, const UnregisterProjectPartsForCodeCompletionMessage &second)
+bool operator==(const UnregisterProjectPartsForEditorMessage &first, const UnregisterProjectPartsForEditorMessage &second)
 {
    return first.projectPartIds_ == second.projectPartIds_;
 }

-bool operator<(const UnregisterProjectPartsForCodeCompletionMessage &first, const UnregisterProjectPartsForCodeCompletionMessage &second)
+bool operator<(const UnregisterProjectPartsForEditorMessage &first, const UnregisterProjectPartsForEditorMessage &second)
 {
    return compareContainer(first.projectPartIds_, second.projectPartIds_);
 }

-QDebug operator<<(QDebug debug, const UnregisterProjectPartsForCodeCompletionMessage &message)
+QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &message)
 {
-    debug.nospace() << "UnregisterProjectPartsForCodeCompletionMessage(";
+    debug.nospace() << "UnregisterProjectPartsForEditorMessage(";

    for (const Utf8String &fileNames_ : message.projectPartIds())
        debug.nospace() << fileNames_ << ", ";
@@ -87,9 +87,9 @@ QDebug operator<<(QDebug debug, const UnregisterProjectPartsForCodeCompletionMes
    return debug;
 }

-void PrintTo(const UnregisterProjectPartsForCodeCompletionMessage &message, ::std::ostream* os)
+void PrintTo(const UnregisterProjectPartsForEditorMessage &message, ::std::ostream* os)
 {
-    *os << "UnregisterProjectPartsForCodeCompletionMessage(";
+    *os << "UnregisterProjectPartsForEditorMessage(";

    for (const Utf8String &fileNames_ : message.projectPartIds())
        *os << fileNames_.constData() << ", ";
--- a/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletionmessage.h
+++ b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletionmessage.h
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/

-#ifndef CLANGBACKEND_UNREGISTERPROJECTSFORCODECOMPLETION_H
-#define CLANGBACKEND_UNREGISTERPROJECTSFORCODECOMPLETION_H
+#ifndef CLANGBACKEND_UNREGISTERPROJECTSFOREDITOR_H
+#define CLANGBACKEND_UNREGISTERPROJECTSFOREDITOR_H

 #include "clangbackendipc_global.h"

@@ -39,17 +39,17 @@

 namespace ClangBackEnd {

-class CMBIPC_EXPORT UnregisterProjectPartsForCodeCompletionMessage
+class CMBIPC_EXPORT UnregisterProjectPartsForEditorMessage
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const UnregisterProjectPartsForCodeCompletionMessage &message);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, UnregisterProjectPartsForCodeCompletionMessage &message);
-    friend CMBIPC_EXPORT bool operator==(const UnregisterProjectPartsForCodeCompletionMessage &first, const UnregisterProjectPartsForCodeCompletionMessage &second);
-    friend CMBIPC_EXPORT bool operator<(const UnregisterProjectPartsForCodeCompletionMessage &first, const UnregisterProjectPartsForCodeCompletionMessage &second);
-    friend void PrintTo(const UnregisterProjectPartsForCodeCompletionMessage &message, ::std::ostream* os);
+    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const UnregisterProjectPartsForEditorMessage &message);
+    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, UnregisterProjectPartsForEditorMessage &message);
+    friend CMBIPC_EXPORT bool operator==(const UnregisterProjectPartsForEditorMessage &first, const UnregisterProjectPartsForEditorMessage &second);
+    friend CMBIPC_EXPORT bool operator<(const UnregisterProjectPartsForEditorMessage &first, const UnregisterProjectPartsForEditorMessage &second);
+    friend void PrintTo(const UnregisterProjectPartsForEditorMessage &message, ::std::ostream* os);

 public:
-    UnregisterProjectPartsForCodeCompletionMessage() = default;
-    UnregisterProjectPartsForCodeCompletionMessage(const Utf8StringVector &projectPartIds);
+    UnregisterProjectPartsForEditorMessage() = default;
+    UnregisterProjectPartsForEditorMessage(const Utf8StringVector &projectPartIds);

    const Utf8StringVector &projectPartIds() const;

@@ -57,15 +57,15 @@ private:
    Utf8StringVector projectPartIds_;
 };

-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const UnregisterProjectPartsForCodeCompletionMessage &message);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, UnregisterProjectPartsForCodeCompletionMessage &message);
-CMBIPC_EXPORT bool operator==(const UnregisterProjectPartsForCodeCompletionMessage &first, const UnregisterProjectPartsForCodeCompletionMessage &second);
-CMBIPC_EXPORT bool operator<(const UnregisterProjectPartsForCodeCompletionMessage &first, const UnregisterProjectPartsForCodeCompletionMessage &second);
+CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const UnregisterProjectPartsForEditorMessage &message);
+CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, UnregisterProjectPartsForEditorMessage &message);
+CMBIPC_EXPORT bool operator==(const UnregisterProjectPartsForEditorMessage &first, const UnregisterProjectPartsForEditorMessage &second);
+CMBIPC_EXPORT bool operator<(const UnregisterProjectPartsForEditorMessage &first, const UnregisterProjectPartsForEditorMessage &second);

-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterProjectPartsForCodeCompletionMessage &message);
-void PrintTo(const UnregisterProjectPartsForCodeCompletionMessage &message, ::std::ostream* os);
+CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &message);
+void PrintTo(const UnregisterProjectPartsForEditorMessage &message, ::std::ostream* os);
 } // namespace ClangBackEnd

-Q_DECLARE_METATYPE(ClangBackEnd::UnregisterProjectPartsForCodeCompletionMessage)
+Q_DECLARE_METATYPE(ClangBackEnd::UnregisterProjectPartsForEditorMessage)

-#endif // CLANGBACKEND_UNREGISTERPROJECTSFORCODECOMPLETION_H
+#endif // CLANGBACKEND_UNREGISTERPROJECTSFOREDITOR_H
--- a/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletionmessage.cpp
+++ b/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletionmessage.cpp
@@ -28,7 +28,7 @@
 **
 ****************************************************************************/

-#include "cmbunregistertranslationunitsforcodecompletionmessage.h"
+#include "cmbunregistertranslationunitsforeditormessage.h"

 #include "container_common.h"

@@ -42,43 +42,43 @@
 namespace ClangBackEnd {


-UnregisterTranslationUnitsForCodeCompletionMessage::UnregisterTranslationUnitsForCodeCompletionMessage(const QVector<FileContainer> &fileContainers)
+UnregisterTranslationUnitsForEditorMessage::UnregisterTranslationUnitsForEditorMessage(const QVector<FileContainer> &fileContainers)
    : fileContainers_(fileContainers)
 {
 }

-const QVector<FileContainer> &UnregisterTranslationUnitsForCodeCompletionMessage::fileContainers() const
+const QVector<FileContainer> &UnregisterTranslationUnitsForEditorMessage::fileContainers() const
 {
    return fileContainers_;
 }

-QDataStream &operator<<(QDataStream &out, const UnregisterTranslationUnitsForCodeCompletionMessage &message)
+QDataStream &operator<<(QDataStream &out, const UnregisterTranslationUnitsForEditorMessage &message)
 {
    out << message.fileContainers_;

    return out;
 }

-QDataStream &operator>>(QDataStream &in, UnregisterTranslationUnitsForCodeCompletionMessage &message)
+QDataStream &operator>>(QDataStream &in, UnregisterTranslationUnitsForEditorMessage &message)
 {
    in >> message.fileContainers_;

    return in;
 }

-bool operator==(const UnregisterTranslationUnitsForCodeCompletionMessage &first, const UnregisterTranslationUnitsForCodeCompletionMessage &second)
+bool operator==(const UnregisterTranslationUnitsForEditorMessage &first, const UnregisterTranslationUnitsForEditorMessage &second)
 {
    return first.fileContainers_ == second.fileContainers_;
 }

-bool operator<(const UnregisterTranslationUnitsForCodeCompletionMessage &first, const UnregisterTranslationUnitsForCodeCompletionMessage &second)
+bool operator<(const UnregisterTranslationUnitsForEditorMessage &first, const UnregisterTranslationUnitsForEditorMessage &second)
 {
    return compareContainer(first.fileContainers_, second.fileContainers_);
 }

-QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForCodeCompletionMessage &message)
+QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage &message)
 {
-    debug.nospace() << "UnregisterTranslationUnitsForCodeCompletionMessage(";
+    debug.nospace() << "UnregisterTranslationUnitsForEditorMessage(";

    for (const FileContainer &fileContainer : message.fileContainers())
        debug.nospace() << fileContainer << ", ";
@@ -89,9 +89,9 @@ QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForCodeCompletio
 }

 #ifdef CLANGBACKEND_TESTS
-void PrintTo(const UnregisterTranslationUnitsForCodeCompletionMessage &message, ::std::ostream* os)
+void PrintTo(const UnregisterTranslationUnitsForEditorMessage &message, ::std::ostream* os)
 {
-    *os << "UnregisterTranslationUnitsForCodeCompletionMessage(";
+    *os << "UnregisterTranslationUnitsForEditorMessage(";

    for (const FileContainer &fileContainer : message.fileContainers())
        *os << ::testing::PrintToString(fileContainer) << ", ";
--- a/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletionmessage.h
+++ b/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletionmessage.h
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/

-#ifndef CLANGBACKEND_UNRegisterTranslationUnitForCodeCompletionMessage_H
-#define CLANGBACKEND_UNRegisterTranslationUnitForCodeCompletionMessage_H
+#ifndef CLANGBACKEND_UNRegisterTranslationUnitForEditorMessage_H
+#define CLANGBACKEND_UNRegisterTranslationUnitForEditorMessage_H

 #include "clangbackendipc_global.h"

@@ -40,17 +40,17 @@

 namespace ClangBackEnd {

-class CMBIPC_EXPORT UnregisterTranslationUnitsForCodeCompletionMessage
+class CMBIPC_EXPORT UnregisterTranslationUnitsForEditorMessage
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const UnregisterTranslationUnitsForCodeCompletionMessage &message);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, UnregisterTranslationUnitsForCodeCompletionMessage &message);
-    friend CMBIPC_EXPORT bool operator==(const UnregisterTranslationUnitsForCodeCompletionMessage &first, const UnregisterTranslationUnitsForCodeCompletionMessage &second);
-    friend CMBIPC_EXPORT bool operator<(const UnregisterTranslationUnitsForCodeCompletionMessage &first, const UnregisterTranslationUnitsForCodeCompletionMessage &second);
-    friend void PrintTo(const UnregisterTranslationUnitsForCodeCompletionMessage &message, ::std::ostream* os);
+    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const UnregisterTranslationUnitsForEditorMessage &message);
+    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, UnregisterTranslationUnitsForEditorMessage &message);
+    friend CMBIPC_EXPORT bool operator==(const UnregisterTranslationUnitsForEditorMessage &first, const UnregisterTranslationUnitsForEditorMessage &second);
+    friend CMBIPC_EXPORT bool operator<(const UnregisterTranslationUnitsForEditorMessage &first, const UnregisterTranslationUnitsForEditorMessage &second);
+    friend void PrintTo(const UnregisterTranslationUnitsForEditorMessage &message, ::std::ostream* os);

 public:
-    UnregisterTranslationUnitsForCodeCompletionMessage() = default;
-    UnregisterTranslationUnitsForCodeCompletionMessage(const QVector<FileContainer> &fileContainers);
+    UnregisterTranslationUnitsForEditorMessage() = default;
+    UnregisterTranslationUnitsForEditorMessage(const QVector<FileContainer> &fileContainers);

    const QVector<FileContainer> &fileContainers() const;

@@ -58,17 +58,17 @@ private:
    QVector<FileContainer> fileContainers_;
 };

-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const UnregisterTranslationUnitsForCodeCompletionMessage &message);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, UnregisterTranslationUnitsForCodeCompletionMessage &message);
-CMBIPC_EXPORT bool operator==(const UnregisterTranslationUnitsForCodeCompletionMessage &first, const UnregisterTranslationUnitsForCodeCompletionMessage &second);
-CMBIPC_EXPORT bool operator<(const UnregisterTranslationUnitsForCodeCompletionMessage &first, const UnregisterTranslationUnitsForCodeCompletionMessage &second);
+CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const UnregisterTranslationUnitsForEditorMessage &message);
+CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, UnregisterTranslationUnitsForEditorMessage &message);
+CMBIPC_EXPORT bool operator==(const UnregisterTranslationUnitsForEditorMessage &first, const UnregisterTranslationUnitsForEditorMessage &second);
+CMBIPC_EXPORT bool operator<(const UnregisterTranslationUnitsForEditorMessage &first, const UnregisterTranslationUnitsForEditorMessage &second);

-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForCodeCompletionMessage &message);
+CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage &message);
 #ifdef CLANGBACKEND_TESTS
-void PrintTo(const UnregisterTranslationUnitsForCodeCompletionMessage &message, ::std::ostream* os);
+void PrintTo(const UnregisterTranslationUnitsForEditorMessage &message, ::std::ostream* os);
 #endif
 } // namespace ClangBackEnd

-Q_DECLARE_METATYPE(ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionMessage)
+Q_DECLARE_METATYPE(ClangBackEnd::UnregisterTranslationUnitsForEditorMessage)

-#endif // CLANGBACKEND_UNRegisterTranslationUnitForCodeCompletionMessage_H
+#endif // CLANGBACKEND_UNRegisterTranslationUnitForEditorMessage_H
--- a/src/libs/clangbackendipc/connectionclient.cpp
+++ b/src/libs/clangbackendipc/connectionclient.cpp
@@ -32,8 +32,8 @@

 #include "clangbackendipcdebugutils.h"
 #include "cmbcompletecodemessage.h"
-#include "cmbregistertranslationunitsforcodecompletionmessage.h"
-#include "cmbunregistertranslationunitsforcodecompletionmessage.h"
+#include "cmbregistertranslationunitsforeditormessage.h"
+#include "cmbunregistertranslationunitsforeditormessage.h"

 #include <QCoreApplication>
 #include <QProcess>
--- a/src/libs/clangbackendipc/ipcclientinterface.h
+++ b/src/libs/clangbackendipc/ipcclientinterface.h
@@ -36,10 +36,10 @@
 namespace ClangBackEnd {

 class IpcServerInterface;
-class RegisterTranslationUnitForCodeCompletionMessage;
-class RegisterProjectPartsForCodeCompletionMessage;
-class UnregisterTranslationUnitsForCodeCompletionMessage;
-class UnregisterProjectPartsForCodeCompletionMessage;
+class RegisterTranslationUnitForEditorMessage;
+class RegisterProjectPartsForEditorMessage;
+class UnregisterTranslationUnitsForEditorMessage;
+class UnregisterProjectPartsForEditorMessage;
 class EchoMessage;
 class CompleteCodeMessage;
 class CodeCompletedMessage;
--- a/src/libs/clangbackendipc/ipcclientproxy.cpp
+++ b/src/libs/clangbackendipc/ipcclientproxy.cpp
@@ -33,7 +33,7 @@
 #include "cmbalivemessage.h"
 #include "cmbcodecompletedmessage.h"
 #include "cmbechomessage.h"
-#include "cmbregistertranslationunitsforcodecompletionmessage.h"
+#include "cmbregistertranslationunitsforeditormessage.h"
 #include "diagnosticschangedmessage.h"
 #include "ipcserverinterface.h"
 #include "projectpartsdonotexistmessage.h"
--- a/src/libs/clangbackendipc/ipcserverinterface.cpp
+++ b/src/libs/clangbackendipc/ipcserverinterface.cpp
@@ -31,10 +31,10 @@
 #include "ipcserverinterface.h"

 #include "cmbcompletecodemessage.h"
-#include "cmbregisterprojectsforcodecompletionmessage.h"
-#include "cmbregistertranslationunitsforcodecompletionmessage.h"
-#include "cmbunregisterprojectsforcodecompletionmessage.h"
-#include "cmbunregistertranslationunitsforcodecompletionmessage.h"
+#include "cmbregisterprojectsforeditormessage.h"
+#include "cmbregistertranslationunitsforeditormessage.h"
+#include "cmbunregisterprojectsforeditormessage.h"
+#include "cmbunregistertranslationunitsforeditormessage.h"
 #include "requestdiagnosticsmessage.h"

 #include <QDebug>
@@ -45,10 +45,10 @@ namespace ClangBackEnd {
 void IpcServerInterface::dispatch(const QVariant &message)
 {
    static const int endMessageType = QMetaType::type("ClangBackEnd::EndMessage");
-    static const int registerTranslationUnitsForCodeCompletionMessageType = QMetaType::type("ClangBackEnd::RegisterTranslationUnitForCodeCompletionMessage");
-    static const int unregisterTranslationUnitsForCodeCompletionMessageType = QMetaType::type("ClangBackEnd::UnregisterTranslationUnitsForCodeCompletionMessage");
-    static const int registerProjectPartsForCodeCompletionMessageType = QMetaType::type("ClangBackEnd::RegisterProjectPartsForCodeCompletionMessage");
-    static const int unregisterProjectPartsForCodeCompletionMessageType = QMetaType::type("ClangBackEnd::UnregisterProjectPartsForCodeCompletionMessage");
+    static const int registerTranslationUnitsForEditorMessageType = QMetaType::type("ClangBackEnd::RegisterTranslationUnitForEditorMessage");
+    static const int unregisterTranslationUnitsForEditorMessageType = QMetaType::type("ClangBackEnd::UnregisterTranslationUnitsForEditorMessage");
+    static const int registerProjectPartsForEditorMessageType = QMetaType::type("ClangBackEnd::RegisterProjectPartsForEditorMessage");
+    static const int unregisterProjectPartsForEditorMessageType = QMetaType::type("ClangBackEnd::UnregisterProjectPartsForEditorMessage");
    static const int completeCodeMessageType = QMetaType::type("ClangBackEnd::CompleteCodeMessage");
    static const int requestDiagnosticsMessageType = QMetaType::type("ClangBackEnd::RequestDiagnosticsMessage");

@@ -56,14 +56,14 @@ void IpcServerInterface::dispatch(const QVariant &message)

    if (type == endMessageType)
        end();
-    else if (type == registerTranslationUnitsForCodeCompletionMessageType)
-        registerTranslationUnitsForCodeCompletion(message.value<RegisterTranslationUnitForCodeCompletionMessage>());
-    else if (type == unregisterTranslationUnitsForCodeCompletionMessageType)
-        unregisterTranslationUnitsForCodeCompletion(message.value<UnregisterTranslationUnitsForCodeCompletionMessage>());
-    else if (type == registerProjectPartsForCodeCompletionMessageType)
-        registerProjectPartsForCodeCompletion(message.value<RegisterProjectPartsForCodeCompletionMessage>());
-    else if (type == unregisterProjectPartsForCodeCompletionMessageType)
-        unregisterProjectPartsForCodeCompletion(message.value<UnregisterProjectPartsForCodeCompletionMessage>());
+    else if (type == registerTranslationUnitsForEditorMessageType)
+        registerTranslationUnitsForEditor(message.value<RegisterTranslationUnitForEditorMessage>());
+    else if (type == unregisterTranslationUnitsForEditorMessageType)
+        unregisterTranslationUnitsForEditor(message.value<UnregisterTranslationUnitsForEditorMessage>());
+    else if (type == registerProjectPartsForEditorMessageType)
+        registerProjectPartsForEditor(message.value<RegisterProjectPartsForEditorMessage>());
+    else if (type == unregisterProjectPartsForEditorMessageType)
+        unregisterProjectPartsForEditor(message.value<UnregisterProjectPartsForEditorMessage>());
    else if (type == completeCodeMessageType)
        completeCode(message.value<CompleteCodeMessage>());
    else if (type == requestDiagnosticsMessageType)
--- a/src/libs/clangbackendipc/ipcserverinterface.h
+++ b/src/libs/clangbackendipc/ipcserverinterface.h
@@ -45,10 +45,10 @@ public:
    void dispatch(const QVariant &message) override;

    virtual void end() = 0;
-    virtual void registerTranslationUnitsForCodeCompletion(const RegisterTranslationUnitForCodeCompletionMessage &message) = 0;
-    virtual void unregisterTranslationUnitsForCodeCompletion(const UnregisterTranslationUnitsForCodeCompletionMessage &message) = 0;
-    virtual void registerProjectPartsForCodeCompletion(const RegisterProjectPartsForCodeCompletionMessage &message) = 0;
-    virtual void unregisterProjectPartsForCodeCompletion(const UnregisterProjectPartsForCodeCompletionMessage &message) = 0;
+    virtual void registerTranslationUnitsForEditor(const RegisterTranslationUnitForEditorMessage &message) = 0;
+    virtual void unregisterTranslationUnitsForEditor(const UnregisterTranslationUnitsForEditorMessage &message) = 0;
+    virtual void registerProjectPartsForEditor(const RegisterProjectPartsForEditorMessage &message) = 0;
+    virtual void unregisterProjectPartsForEditor(const UnregisterProjectPartsForEditorMessage &message) = 0;
    virtual void completeCode(const CompleteCodeMessage &message) = 0;
    virtual void requestDiagnostics(const RequestDiagnosticsMessage &message) = 0;

--- a/src/libs/clangbackendipc/ipcserverproxy.cpp
+++ b/src/libs/clangbackendipc/ipcserverproxy.cpp
@@ -33,10 +33,10 @@
 #include <cmbalivemessage.h>
 #include <cmbcompletecodemessage.h>
 #include <cmbendmessage.h>
-#include <cmbregisterprojectsforcodecompletionmessage.h>
-#include <cmbregistertranslationunitsforcodecompletionmessage.h>
-#include <cmbunregisterprojectsforcodecompletionmessage.h>
-#include <cmbunregistertranslationunitsforcodecompletionmessage.h>
+#include <cmbregisterprojectsforeditormessage.h>
+#include <cmbregistertranslationunitsforeditormessage.h>
+#include <cmbunregisterprojectsforeditormessage.h>
+#include <cmbunregistertranslationunitsforeditormessage.h>
 #include <requestdiagnosticsmessage.h>
 #include <ipcclientinterface.h>

@@ -71,22 +71,22 @@ void IpcServerProxy::end()
    writeMessageBlock.write(QVariant::fromValue(EndMessage()));
 }

-void IpcServerProxy::registerTranslationUnitsForCodeCompletion(const RegisterTranslationUnitForCodeCompletionMessage &message)
+void IpcServerProxy::registerTranslationUnitsForEditor(const RegisterTranslationUnitForEditorMessage &message)
 {
    writeMessageBlock.write(QVariant::fromValue(message));
 }

-void IpcServerProxy::unregisterTranslationUnitsForCodeCompletion(const UnregisterTranslationUnitsForCodeCompletionMessage &message)
+void IpcServerProxy::unregisterTranslationUnitsForEditor(const UnregisterTranslationUnitsForEditorMessage &message)
 {
    writeMessageBlock.write(QVariant::fromValue(message));
 }

-void IpcServerProxy::registerProjectPartsForCodeCompletion(const RegisterProjectPartsForCodeCompletionMessage &message)
+void IpcServerProxy::registerProjectPartsForEditor(const RegisterProjectPartsForEditorMessage &message)
 {
    writeMessageBlock.write(QVariant::fromValue(message));
 }

-void IpcServerProxy::unregisterProjectPartsForCodeCompletion(const UnregisterProjectPartsForCodeCompletionMessage &message)
+void IpcServerProxy::unregisterProjectPartsForEditor(const UnregisterProjectPartsForEditorMessage &message)
 {
    writeMessageBlock.write(QVariant::fromValue(message));
 }
--- a/src/libs/clangbackendipc/ipcserverproxy.h
+++ b/src/libs/clangbackendipc/ipcserverproxy.h
@@ -56,10 +56,10 @@ public:
    IpcServerProxy &operator=(const IpcServerProxy&) = delete;

    void end() override;
-    void registerTranslationUnitsForCodeCompletion(const RegisterTranslationUnitForCodeCompletionMessage &message) override;
-    void unregisterTranslationUnitsForCodeCompletion(const UnregisterTranslationUnitsForCodeCompletionMessage &message) override;
-    void registerProjectPartsForCodeCompletion(const RegisterProjectPartsForCodeCompletionMessage &message) override;
-    void unregisterProjectPartsForCodeCompletion(const UnregisterProjectPartsForCodeCompletionMessage &message) override;
+    void registerTranslationUnitsForEditor(const RegisterTranslationUnitForEditorMessage &message) override;
+    void unregisterTranslationUnitsForEditor(const UnregisterTranslationUnitsForEditorMessage &message) override;
+    void registerProjectPartsForEditor(const RegisterProjectPartsForEditorMessage &message) override;
+    void unregisterProjectPartsForEditor(const UnregisterProjectPartsForEditorMessage &message) override;
    void completeCode(const CompleteCodeMessage &message) override;
    void requestDiagnostics(const RequestDiagnosticsMessage &message) override;