diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 981c48f01c8..398752891d0 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -508,14 +508,11 @@ static int startOfOperator(TextEditor::ITextEditable *editor,
     return start;
 }
 
-bool CppCodeCompletion::isValid(TextEditor::ITextEditable *editor)
+bool CppCodeCompletion::supportsEditor(TextEditor::ITextEditable *editor)
 { return m_manager->isCppEditor(editor); }
 
 bool CppCodeCompletion::triggersCompletion(TextEditor::ITextEditable *editor)
 {
-    if (! m_manager->isCppEditor(editor)) // ### remove me
-        return false;
-
     const int pos = editor->position();
     if (startOfOperator(editor, pos, /*token =*/ 0,
                         /*want function call=*/ true) != pos)
diff --git a/src/plugins/cpptools/cppcodecompletion.h b/src/plugins/cpptools/cppcodecompletion.h
index 174e5d994f4..d95b9c825c9 100644
--- a/src/plugins/cpptools/cppcodecompletion.h
+++ b/src/plugins/cpptools/cppcodecompletion.h
@@ -58,7 +58,7 @@ class CppCodeCompletion : public TextEditor::ICompletionCollector
 public:
     explicit CppCodeCompletion(CppModelManager *manager);
 
-    bool isValid(TextEditor::ITextEditable *editor);
+    bool supportsEditor(TextEditor::ITextEditable *editor);
     bool triggersCompletion(TextEditor::ITextEditable *editor);
     int startCompletion(TextEditor::ITextEditable *editor);
     void completions(QList<TextEditor::CompletionItem> *completions);
diff --git a/src/plugins/find/searchresultwindow.h b/src/plugins/find/searchresultwindow.h
index e2336ba5f8c..c6022f951e9 100644
--- a/src/plugins/find/searchresultwindow.h
+++ b/src/plugins/find/searchresultwindow.h
@@ -84,7 +84,7 @@ public slots:
 private slots:
     void handleExpandCollapseToolButton(bool checked);
     void handleJumpToSearchResult(int index, const QString &fileName, int lineNumber,
-        int searchTermStart, int searchTermLength);
+                                  int searchTermStart, int searchTermLength);
 
 private:
     void readSettings();
diff --git a/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp b/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp
index d08a3e175ef..1ecefda7f04 100644
--- a/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp
+++ b/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp
@@ -22,7 +22,7 @@ Qt::CaseSensitivity QtScriptCodeCompletion::caseSensitivity() const
 void QtScriptCodeCompletion::setCaseSensitivity(Qt::CaseSensitivity caseSensitivity)
 { m_caseSensitivity = caseSensitivity; }
 
-bool QtScriptCodeCompletion::isValid(TextEditor::ITextEditable *editor)
+bool QtScriptCodeCompletion::supportsEditor(TextEditor::ITextEditable *editor)
 {
     if (qobject_cast<ScriptEditor *>(editor->widget()))
         return true;
diff --git a/src/plugins/qtscripteditor/qtscriptcodecompletion.h b/src/plugins/qtscripteditor/qtscriptcodecompletion.h
index a0650d5266a..9d8677b7ba9 100644
--- a/src/plugins/qtscripteditor/qtscriptcodecompletion.h
+++ b/src/plugins/qtscripteditor/qtscriptcodecompletion.h
@@ -21,7 +21,7 @@ public:
     Qt::CaseSensitivity caseSensitivity() const;
     void setCaseSensitivity(Qt::CaseSensitivity caseSensitivity);
 
-    virtual bool isValid(TextEditor::ITextEditable *editor);
+    virtual bool supportsEditor(TextEditor::ITextEditable *editor);
     virtual bool triggersCompletion(TextEditor::ITextEditable *editor);
     virtual int startCompletion(TextEditor::ITextEditable *editor);
     virtual void completions(QList<TextEditor::CompletionItem> *completions);
diff --git a/src/plugins/texteditor/completionsupport.cpp b/src/plugins/texteditor/completionsupport.cpp
index ef4834c8088..0cc1918e645 100644
--- a/src/plugins/texteditor/completionsupport.cpp
+++ b/src/plugins/texteditor/completionsupport.cpp
@@ -94,7 +94,7 @@ void CompletionSupport::autoComplete(ITextEditable *editor, bool forced)
     m_completionCollector = 0;
 
     foreach (ICompletionCollector *collector, m_completionCollectors) {
-        if (collector->isValid(editor)) {
+        if (collector->supportsEditor(editor)) {
             m_completionCollector = collector;
             break;
         }
diff --git a/src/plugins/texteditor/icompletioncollector.h b/src/plugins/texteditor/icompletioncollector.h
index a151e4cf41f..f9e58721105 100644
--- a/src/plugins/texteditor/icompletioncollector.h
+++ b/src/plugins/texteditor/icompletioncollector.h
@@ -80,7 +80,7 @@ public:
     /*
      * Returns true if this completion collector can be used with the given editor.
      */
-    virtual bool isValid(ITextEditable *editor) = 0;
+    virtual bool supportsEditor(ITextEditable *editor) = 0;
 
     /* This method should return whether the cursor is at a position which could
      * trigger an autocomplete. It will be called each time a character is typed in