Commit a4563751 authored by Eike Ziller's avatar Eike Ziller
Browse files

Do not put locator manager into object pool



Users should use the static interface (and they do).

Change-Id: I2b8f6a379a45975d94fc8e77f86df9a16f2c9cf1
Reviewed-by: David Schulz's avatarDavid Schulz <david.schulz@qt.io>
parent 247639d9
...@@ -107,7 +107,7 @@ void Locator::initialize(CorePlugin *corePlugin, const QStringList &, QString *) ...@@ -107,7 +107,7 @@ void Locator::initialize(CorePlugin *corePlugin, const QStringList &, QString *)
view->setPosition(StatusBarWidget::First); view->setPosition(StatusBarWidget::First);
m_corePlugin->addAutoReleasedObject(view); m_corePlugin->addAutoReleasedObject(view);
m_corePlugin->addObject(new LocatorManager(locatorWidget)); new LocatorManager(locatorWidget);
m_openDocumentsFilter = new OpenDocumentsFilter; m_openDocumentsFilter = new OpenDocumentsFilter;
m_corePlugin->addObject(m_openDocumentsFilter); m_corePlugin->addObject(m_openDocumentsFilter);
......
...@@ -39,11 +39,6 @@ LocatorManager::LocatorManager(Internal::LocatorWidget *locatorWidget) ...@@ -39,11 +39,6 @@ LocatorManager::LocatorManager(Internal::LocatorWidget *locatorWidget)
m_locatorWidget = locatorWidget; m_locatorWidget = locatorWidget;
} }
LocatorManager::~LocatorManager()
{
ExtensionSystem::PluginManager::removeObject(this);
}
void LocatorManager::show(const QString &text, void LocatorManager::show(const QString &text,
int selectionStart, int selectionLength) int selectionStart, int selectionLength)
{ {
......
...@@ -39,7 +39,6 @@ class CORE_EXPORT LocatorManager : public QObject ...@@ -39,7 +39,6 @@ class CORE_EXPORT LocatorManager : public QObject
public: public:
LocatorManager(Internal::LocatorWidget *locatorWidget); LocatorManager(Internal::LocatorWidget *locatorWidget);
~LocatorManager();
static void show(const QString &text, int selectionStart = -1, int selectionLength = 0); static void show(const QString &text, int selectionStart = -1, int selectionLength = 0);
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment