From f576ad9f2c169bfa4d336ba2b3b1918f03df6916 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 21 Feb 2011 16:02:26 +0100
Subject: texteditor: merge ITextEditable into ITextEditor

rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
---
 src/plugins/cpptools/cppcodecompletion.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/plugins/cpptools/cppcodecompletion.h')

diff --git a/src/plugins/cpptools/cppcodecompletion.h b/src/plugins/cpptools/cppcodecompletion.h
index 4817e24e97..0bb4ae765b 100644
--- a/src/plugins/cpptools/cppcodecompletion.h
+++ b/src/plugins/cpptools/cppcodecompletion.h
@@ -52,7 +52,7 @@ QT_END_NAMESPACE
 
 namespace TextEditor {
 class ITextEditor;
-class BaseTextEditor;
+class BaseTextEditorWidget;
 }
 
 namespace CPlusPlus {
@@ -75,14 +75,14 @@ public:
     void setObjcEnabled(bool objcEnabled)
     { m_objcEnabled = objcEnabled; }
 
-    TextEditor::ITextEditable *editor() const;
+    TextEditor::ITextEditor *editor() const;
     int startPosition() const;
     bool shouldRestartCompletion();
     QList<TextEditor::CompletionItem> getCompletions();
-    bool supportsEditor(TextEditor::ITextEditable *editor) const;
+    bool supportsEditor(TextEditor::ITextEditor *editor) const;
     bool supportsPolicy(TextEditor::CompletionPolicy policy) const;
-    bool triggersCompletion(TextEditor::ITextEditable *editor);
-    int startCompletion(TextEditor::ITextEditable *editor);
+    bool triggersCompletion(TextEditor::ITextEditor *editor);
+    int startCompletion(TextEditor::ITextEditor *editor);
     void completions(QList<TextEditor::CompletionItem> *completions);
 
     bool typedCharCompletes(const TextEditor::CompletionItem &item, QChar typedChar);
@@ -131,9 +131,9 @@ private:
 
     int findStartOfName(int pos = -1) const;
 
-    int startCompletionHelper(TextEditor::ITextEditable *editor);
+    int startCompletionHelper(TextEditor::ITextEditor *editor);
 
-    int startCompletionInternal(TextEditor::BaseTextEditor *edit,
+    int startCompletionInternal(TextEditor::BaseTextEditorWidget *edit,
                                 const QString fileName,
                                 unsigned line, unsigned column,
                                 const QString &expression,
@@ -144,13 +144,13 @@ private:
 private:
     void completeObjCMsgSend(CPlusPlus::ClassOrNamespace *binding,
                              bool staticClassAccess);
-    bool tryObjCCompletion(TextEditor::BaseTextEditor *edit);
+    bool tryObjCCompletion(TextEditor::BaseTextEditorWidget *edit);
     bool objcKeywordsWanted() const;
 
     static QStringList preprocessorCompletions;
 
     CppModelManager *m_manager;
-    TextEditor::ITextEditable *m_editor;
+    TextEditor::ITextEditor *m_editor;
     int m_startPosition;     // Position of the cursor from which completion started
     bool m_shouldRestartCompletion;
 
-- 
cgit v1.2.1