summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor/texteditorplugin.cpp
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-06-24 17:13:26 +0200
committerhjk <hjk121@nokiamail.com>2014-06-27 10:46:49 +0200
commitea7c3c74bdc3a17e8c464c496e2f6e993e5a40ea (patch)
tree7728b02818e1c4ecf01bd10f903a0e58f0068105 /src/plugins/texteditor/texteditorplugin.cpp
parentcc4943a2405777cde3ec39ea6402b6adc7cf7329 (diff)
downloadqt-creator-ea7c3c74bdc3a17e8c464c496e2f6e993e5a40ea.tar.gz
TextEditor: static-ify plugin class
Change-Id: Id795b711f08c89b6066c5269c482fea5e99dd52f Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/texteditor/texteditorplugin.cpp')
-rw-r--r--src/plugins/texteditor/texteditorplugin.cpp22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 42e493960d..4436499e6a 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -66,7 +66,7 @@ static const char kCurrentDocumentRowCount[] = "CurrentDocument:RowCount";
static const char kCurrentDocumentColumnCount[] = "CurrentDocument:ColumnCount";
static const char kCurrentDocumentFontSize[] = "CurrentDocument:FontSize";
-TextEditorPlugin *TextEditorPlugin::m_instance = 0;
+static TextEditorPlugin *m_instance = 0;
TextEditorPlugin::TextEditorPlugin()
: m_settings(0),
@@ -83,11 +83,6 @@ TextEditorPlugin::~TextEditorPlugin()
m_instance = 0;
}
-TextEditorPlugin *TextEditorPlugin::instance()
-{
- return m_instance;
-}
-
static const char wizardCategoryC[] = "U.General";
static inline QString wizardDisplayCategory()
@@ -266,6 +261,21 @@ void TextEditorPlugin::extensionsInitialized()
this, SLOT(updateCurrentSelection(QString)));
}
+PlainTextEditorFactory *TextEditorPlugin::editorFactory()
+{
+ return m_instance->m_editorFactory;
+}
+
+LineNumberFilter *TextEditorPlugin::lineNumberFilter()
+{
+ return m_instance->m_lineNumberFilter;
+}
+
+BaseTextMarkRegistry *TextEditorPlugin::baseTextMarkRegistry()
+{
+ return m_instance->m_baseTextMarkRegistry;
+}
+
void TextEditorPlugin::invokeCompletion()
{
Core::IEditor *iface = Core::EditorManager::currentEditor();