From ea7c3c74bdc3a17e8c464c496e2f6e993e5a40ea Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 24 Jun 2014 17:13:26 +0200 Subject: [PATCH] TextEditor: static-ify plugin class Change-Id: Id795b711f08c89b6066c5269c482fea5e99dd52f Reviewed-by: David Schulz Reviewed-by: Eike Ziller --- src/plugins/texteditor/basetextmark.cpp | 4 ++-- .../texteditor/generichighlighter/manager.cpp | 2 +- .../texteditor/texteditoractionhandler.cpp | 2 +- src/plugins/texteditor/texteditorplugin.cpp | 22 ++++++++++++++----- src/plugins/texteditor/texteditorplugin.h | 9 +++----- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/plugins/texteditor/basetextmark.cpp b/src/plugins/texteditor/basetextmark.cpp index 12e947414f3..45eba8de4b1 100644 --- a/src/plugins/texteditor/basetextmark.cpp +++ b/src/plugins/texteditor/basetextmark.cpp @@ -135,13 +135,13 @@ BaseTextMark::BaseTextMark(const QString &fileName, int lineNumber) // which might be set in the derived constructor void BaseTextMark::init() { - Internal::TextEditorPlugin::instance()->baseTextMarkRegistry()->add(this); + Internal::TextEditorPlugin::baseTextMarkRegistry()->add(this); } BaseTextMark::~BaseTextMark() { // oha we are deleted - bool b = Internal::TextEditorPlugin::instance()->baseTextMarkRegistry()->remove(this); + bool b = Internal::TextEditorPlugin::baseTextMarkRegistry()->remove(this); // If you get a assertion in this line, init() was never called QTC_CHECK(b); } diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp index d5f63db28da..49363cd7af6 100644 --- a/src/plugins/texteditor/generichighlighter/manager.cpp +++ b/src/plugins/texteditor/generichighlighter/manager.cpp @@ -321,7 +321,7 @@ void Manager::registerMimeTypesFinished() const QPair > &result = m_registeringWatcher.result(); m_register = result.first; - PlainTextEditorFactory *factory = TextEditorPlugin::instance()->editorFactory(); + PlainTextEditorFactory *factory = TextEditorPlugin::editorFactory(); const QSet &inFactory = factory->mimeTypes().toSet(); foreach (const MimeType &mimeType, result.second) { MimeDatabase::addMimeType(mimeType); diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 0c823fe1618..5ea1d31e052 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -442,7 +442,7 @@ void TextEditorActionHandler::updateCopyAction() void TextEditorActionHandler::gotoAction() { - QString locatorString = TextEditorPlugin::instance()->lineNumberFilter()->shortcutString(); + QString locatorString = TextEditorPlugin::lineNumberFilter()->shortcutString(); locatorString += QLatin1Char(' '); const int selectionStart = locatorString.size(); locatorString += tr(":"); diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index 42e493960d7..4436499e6ad 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(); diff --git a/src/plugins/texteditor/texteditorplugin.h b/src/plugins/texteditor/texteditorplugin.h index dcbdc843770..82075b989cc 100644 --- a/src/plugins/texteditor/texteditorplugin.h +++ b/src/plugins/texteditor/texteditorplugin.h @@ -56,15 +56,13 @@ public: TextEditorPlugin(); virtual ~TextEditorPlugin(); - static TextEditorPlugin *instance(); - // ExtensionSystem::PluginInterface bool initialize(const QStringList &arguments, QString *errorMessage); void extensionsInitialized(); - PlainTextEditorFactory *editorFactory() { return m_editorFactory; } - LineNumberFilter *lineNumberFilter() { return m_lineNumberFilter; } - BaseTextMarkRegistry *baseTextMarkRegistry() { return m_baseTextMarkRegistry; } + static PlainTextEditorFactory *editorFactory(); + static LineNumberFilter *lineNumberFilter(); + static BaseTextMarkRegistry *baseTextMarkRegistry(); private slots: void invokeCompletion(); @@ -73,7 +71,6 @@ private slots: void updateCurrentSelection(const QString &text); private: - static TextEditorPlugin *m_instance; TextEditorSettings *m_settings; PlainTextEditorFactory *m_editorFactory; LineNumberFilter *m_lineNumberFilter;