9 files changed, 19 insertions, 19 deletions
diff --git a/src/plugins/cpptools/completionsettingspage.cpp b/src/plugins/cpptools/completionsettingspage.cpp
index bb415f754d..bae359a33b 100644
--- a/src/plugins/cpptools/completionsettingspage.cpp
+++ b/src/plugins/cpptools/completionsettingspage.cpp
@@ -55,7 +55,7 @@ QString CompletionSettingsPage::id() const
     return QLatin1String("P.Completion");
 }
 
-QString CompletionSettingsPage::trName() const
+QString CompletionSettingsPage::displayName() const
 {
     return tr("Completion");
 }
@@ -65,7 +65,7 @@ QString CompletionSettingsPage::category() const
     return QLatin1String(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY);
 }
 
-QString CompletionSettingsPage::trCategory() const
+QString CompletionSettingsPage::displayCategory() const
 {
     return QCoreApplication::translate("Text Editor", TextEditor::Constants::TEXT_EDITOR_SETTINGS_TR_CATEGORY);
 }
diff --git a/src/plugins/cpptools/completionsettingspage.h b/src/plugins/cpptools/completionsettingspage.h
index fe210b1207..b7cacfe5d5 100644
--- a/src/plugins/cpptools/completionsettingspage.h
+++ b/src/plugins/cpptools/completionsettingspage.h
@@ -50,9 +50,9 @@ public:
     ~CompletionSettingsPage();
 
     QString id() const;
-    QString trName() const;
+    QString displayName() const;
     QString category() const;
-    QString trCategory() const;
+    QString displayCategory() const;
 
     QWidget *createPage(QWidget *parent);
     void apply();
diff --git a/src/plugins/cpptools/cppclassesfilter.h b/src/plugins/cpptools/cppclassesfilter.h
index 6069eb70a5..f441803382 100644
--- a/src/plugins/cpptools/cppclassesfilter.h
+++ b/src/plugins/cpptools/cppclassesfilter.h
@@ -43,8 +43,8 @@ public:
     CppClassesFilter(CppModelManager *manager, Core::EditorManager *editorManager);
     ~CppClassesFilter();
 
-    QString trName() const { return tr("Classes"); }
-    QString name() const { return QLatin1String("Classes"); }
+    QString displayName() const { return tr("Classes"); }
+    QString id() const { return QLatin1String("Classes"); }
     Priority priority() const { return Medium; }
 };
 
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.h b/src/plugins/cpptools/cppcurrentdocumentfilter.h
index 905f1da4fb..2dd2820dbe 100644
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.h
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.h
@@ -50,8 +50,8 @@ public:
     CppCurrentDocumentFilter(CppModelManager *manager, Core::EditorManager *editorManager);
     ~CppCurrentDocumentFilter() {}
 
-    QString trName() const { return tr("Methods in current Document"); }
-    QString name() const { return QLatin1String("Methods in current Document"); }
+    QString displayName() const { return tr("Methods in current Document"); }
+    QString id() const { return QLatin1String("Methods in current Document"); }
     Priority priority() const { return Medium; }
     QList<Locator::FilterEntry> matchesFor(const QString &entry);
     void accept(Locator::FilterEntry selection) const;
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 017c35cdf0..c35c85d858 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -268,7 +268,7 @@ void CppFileSettingsWidget::slotEdit()
     QString path = licenseTemplatePath();
     // Edit existing file with C++
     if (!path.isEmpty()) {
-        Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_KIND));
+        Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID));
         return;
     }
     // Pick a file name and write new template, edit with C++
@@ -284,7 +284,7 @@ void CppFileSettingsWidget::slotEdit()
     file.write(tr(licenseTemplateTemplate).toUtf8());
     file.close();
     setLicenseTemplatePath(path);
-    Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_KIND));
+    Core::EditorManager::instance()->openEditor(path, QLatin1String(CppEditor::Constants::CPPEDITOR_ID));
 }
 
 // --------------- CppFileSettingsPage
@@ -304,7 +304,7 @@ QString CppFileSettingsPage::id() const
     return QLatin1String(Constants::CPP_SETTINGS_ID);
 }
 
-QString CppFileSettingsPage::trName() const
+QString CppFileSettingsPage::displayName() const
 {
     return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_NAME);
 }
@@ -314,7 +314,7 @@ QString CppFileSettingsPage::category() const
     return QLatin1String(Constants::CPP_SETTINGS_CATEGORY);
 }
 
-QString CppFileSettingsPage::trCategory() const
+QString CppFileSettingsPage::displayCategory() const
 {
     return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY);
 }
diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h
index aa431057d2..1c167ff35a 100644
--- a/src/plugins/cpptools/cppfilesettingspage.h
+++ b/src/plugins/cpptools/cppfilesettingspage.h
@@ -98,9 +98,9 @@ public:
     virtual ~CppFileSettingsPage();
 
     virtual QString id() const;
-    virtual QString trName() const;
+    virtual QString displayName() const;
     virtual QString category() const;
-    virtual QString trCategory() const;
+    virtual QString displayCategory() const;
 
     virtual QWidget *createPage(QWidget *parent);
     virtual void apply();
diff --git a/src/plugins/cpptools/cppfunctionsfilter.h b/src/plugins/cpptools/cppfunctionsfilter.h
index d28c4cc472..7b16d5cce9 100644
--- a/src/plugins/cpptools/cppfunctionsfilter.h
+++ b/src/plugins/cpptools/cppfunctionsfilter.h
@@ -43,8 +43,8 @@ public:
     CppFunctionsFilter(CppModelManager *manager, Core::EditorManager *editorManager);
     ~CppFunctionsFilter();
 
-    QString trName() const { return tr("Methods"); }
-    QString name() const { return QLatin1String("Methods"); }
+    QString displayName() const { return tr("Methods"); }
+    QString id() const { return QLatin1String("Methods"); }
     Priority priority() const { return Medium; }
 };
 
diff --git a/src/plugins/cpptools/cpplocatorfilter.h b/src/plugins/cpptools/cpplocatorfilter.h
index c33fcf45ae..6c1cfc17cb 100644
--- a/src/plugins/cpptools/cpplocatorfilter.h
+++ b/src/plugins/cpptools/cpplocatorfilter.h
@@ -50,8 +50,8 @@ public:
     CppLocatorFilter(CppModelManager *manager, Core::EditorManager *editorManager);
     ~CppLocatorFilter();
 
-    QString trName() const { return tr("Classes and Methods"); }
-    QString name() const { return QLatin1String("Classes and Methods"); }
+    QString displayName() const { return tr("Classes and Methods"); }
+    QString id() const { return QLatin1String("Classes and Methods"); }
     Priority priority() const { return Medium; }
     QList<Locator::FilterEntry> matchesFor(const QString &entry);
     void accept(Locator::FilterEntry selection) const;
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 7b758237c0..d921aa4bd2 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -128,7 +128,7 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
     mtools->addMenu(mcpptools);
 
     // Actions
-    m_context = core->uniqueIDManager()->uniqueIdentifier(CppEditor::Constants::C_CPPEDITOR);
+    m_context = core->uniqueIDManager()->uniqueIdentifier(CppEditor::Constants::CPPEDITOR_ID);
     QList<int> context = QList<int>() << m_context;
 
     QAction *switchAction = new QAction(tr("Switch Header/Source"), this);