From 2adb5d55990c56d27b638cbc77dae3137ff55684 Mon Sep 17 00:00:00 2001 From: con Date: Thu, 15 Oct 2009 15:39:43 +0200 Subject: [PATCH] QuickOpenManager --> LocatorManager --- .../{quickopenmanager.cpp => locatormanager.cpp} | 10 +++++----- .../{quickopenmanager.h => locatormanager.h} | 16 ++++++++-------- src/plugins/quickopen/quickopen.pro | 4 ++-- src/plugins/quickopen/quickopenplugin.cpp | 4 ++-- .../texteditor/texteditoractionhandler.cpp | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) rename src/plugins/quickopen/{quickopenmanager.cpp => locatormanager.cpp} (88%) rename src/plugins/quickopen/{quickopenmanager.h => locatormanager.h} (82%) diff --git a/src/plugins/quickopen/quickopenmanager.cpp b/src/plugins/quickopen/locatormanager.cpp similarity index 88% rename from src/plugins/quickopen/quickopenmanager.cpp rename to src/plugins/quickopen/locatormanager.cpp index 1d5ef2b51bb..2c1e552baed 100644 --- a/src/plugins/quickopen/quickopenmanager.cpp +++ b/src/plugins/quickopen/locatormanager.cpp @@ -27,7 +27,7 @@ ** **************************************************************************/ -#include "quickopenmanager.h" +#include "locatormanager.h" #include "locatorwidget.h" #include @@ -36,22 +36,22 @@ using namespace QuickOpen; using namespace QuickOpen::Internal; -QuickOpenManager *QuickOpenManager::m_instance = 0; +LocatorManager *LocatorManager::m_instance = 0; -QuickOpenManager::QuickOpenManager(LocatorWidget *locatorWidget) +LocatorManager::LocatorManager(LocatorWidget *locatorWidget) : QObject(locatorWidget), m_locatorWidget(locatorWidget) { m_instance = this; } -QuickOpenManager::~QuickOpenManager() +LocatorManager::~LocatorManager() { ExtensionSystem::PluginManager::instance()->removeObject(this); m_instance = 0; } -void QuickOpenManager::show(const QString &text, +void LocatorManager::show(const QString &text, int selectionStart, int selectionLength) { QTC_ASSERT(m_locatorWidget, return); diff --git a/src/plugins/quickopen/quickopenmanager.h b/src/plugins/quickopen/locatormanager.h similarity index 82% rename from src/plugins/quickopen/quickopenmanager.h rename to src/plugins/quickopen/locatormanager.h index b76ca5fb2c9..12e3f89712d 100644 --- a/src/plugins/quickopen/quickopenmanager.h +++ b/src/plugins/quickopen/locatormanager.h @@ -27,8 +27,8 @@ ** **************************************************************************/ -#ifndef QUICKOPENMANAGER_H -#define QUICKOPENMANAGER_H +#ifndef LOCATORMANAGER_H +#define LOCATORMANAGER_H #include "quickopen_global.h" @@ -40,23 +40,23 @@ namespace Internal { class LocatorWidget; } -class QUICKOPEN_EXPORT QuickOpenManager : public QObject +class QUICKOPEN_EXPORT LocatorManager : public QObject { Q_OBJECT public: - QuickOpenManager(Internal::LocatorWidget *locatorWidget); - ~QuickOpenManager(); + LocatorManager(Internal::LocatorWidget *locatorWidget); + ~LocatorManager(); - static QuickOpenManager* instance() { return m_instance; } + static LocatorManager* instance() { return m_instance; } void show(const QString &text, int selectionStart = -1, int selectionLength = 0); private: Internal::LocatorWidget *m_locatorWidget; - static QuickOpenManager *m_instance; + static LocatorManager *m_instance; }; } // namespace QuickOpen -#endif // QUICKOPENMANAGER_H +#endif // LOCATORMANAGER_H diff --git a/src/plugins/quickopen/quickopen.pro b/src/plugins/quickopen/quickopen.pro index 8c80040e0c0..08bd1c376e6 100644 --- a/src/plugins/quickopen/quickopen.pro +++ b/src/plugins/quickopen/quickopen.pro @@ -12,7 +12,7 @@ HEADERS += quickopenplugin.h \ filesystemfilter.h \ quickopenconstants.h \ directoryfilter.h \ - quickopenmanager.h \ + locatormanager.h \ basefilefilter.h \ quickopen_global.h SOURCES += quickopenplugin.cpp \ @@ -22,7 +22,7 @@ SOURCES += quickopenplugin.cpp \ filesystemfilter.cpp \ settingspage.cpp \ directoryfilter.cpp \ - quickopenmanager.cpp \ + locatormanager.cpp \ basefilefilter.cpp \ ilocatorfilter.cpp FORMS += settingspage.ui \ diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp index a83334e3947..7d0ffb38db9 100644 --- a/src/plugins/quickopen/quickopenplugin.cpp +++ b/src/plugins/quickopen/quickopenplugin.cpp @@ -30,7 +30,7 @@ #include "quickopenplugin.h" #include "quickopenconstants.h" #include "quickopenfiltersfilter.h" -#include "quickopenmanager.h" +#include "locatormanager.h" #include "locatorwidget.h" #include "opendocumentsfilter.h" #include "filesystemfilter.h" @@ -112,7 +112,7 @@ bool QuickOpenPlugin::initialize(const QStringList &, QString *) Core::ActionContainer *mtools = core->actionManager()->actionContainer(Core::Constants::M_TOOLS); mtools->addAction(cmd); - addObject(new QuickOpenManager(m_locatorWidget)); + addObject(new LocatorManager(m_locatorWidget)); m_openDocumentsFilter = new OpenDocumentsFilter(core->editorManager()); addObject(m_openDocumentsFilter); diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 018a8f44f77..11050285ff6 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -33,7 +33,7 @@ #include "texteditorplugin.h" #include "linenumberfilter.h" -#include +#include #include #include #include @@ -360,7 +360,7 @@ void TextEditorActionHandler::updateCopyAction() void TextEditorActionHandler::gotoAction() { - QuickOpen::QuickOpenManager *quickopen = QuickOpen::QuickOpenManager::instance(); + QuickOpen::LocatorManager *quickopen = QuickOpen::LocatorManager::instance(); QTC_ASSERT(quickopen, return); const QString shortcut = TextEditorPlugin::instance()->lineNumberFilter()->shortcutString(); const QString text = tr(" ");