Merge ITextMark and BaseTextMark

Turns out we don't even need two-phase initialization,
by transparently postponing registration until we get
a non-empty file name, either at constuction, or at
file name change times.

Change-Id: I3e87e47c820066e6707e946fc474ab9c1993e61f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/texteditor/texteditorplugin.h b/src/plugins/texteditor/texteditorplugin.h
index 82075b989c..66d5e8711e 100644
--- a/src/plugins/texteditor/texteditorplugin.h
+++ b/src/plugins/texteditor/texteditorplugin.h
@@ -45,7 +45,7 @@ namespace Internal {
 class LineNumberFilter;
 class PlainTextEditorFactory;
 class OutlineFactory;
-class BaseTextMarkRegistry;
+class TextMarkRegistry;
 
 class TextEditorPlugin : public ExtensionSystem::IPlugin
 {
@@ -62,7 +62,7 @@ public:
 
     static PlainTextEditorFactory *editorFactory();
     static LineNumberFilter *lineNumberFilter();
-    static BaseTextMarkRegistry *baseTextMarkRegistry();
+    static TextMarkRegistry *baseTextMarkRegistry();
 
 private slots:
     void invokeCompletion();
@@ -76,7 +76,7 @@ private:
     LineNumberFilter *m_lineNumberFilter;
     Core::SearchResultWindow *m_searchResultWindow;
     OutlineFactory *m_outlineFactory;
-    BaseTextMarkRegistry *m_baseTextMarkRegistry;
+    TextMarkRegistry *m_baseTextMarkRegistry;
 
 
 #ifdef WITH_TESTS