From 3d79d80557ac63b1ba0f11a3da5496ea77500bce Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 2 Feb 2018 16:08:39 +0100
Subject: [PATCH] Macros: Avoid use of global object pool

Change-Id: I84eb19e3e081fd63d390b7ae065c138bb483201f
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/macros/macrolocatorfilter.cpp | 4 ++--
 src/plugins/macros/macrolocatorfilter.h   | 4 +---
 src/plugins/macros/macrosplugin.cpp       | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp
index 99567a663c3..ddeb98ba6bb 100644
--- a/src/plugins/macros/macrolocatorfilter.cpp
+++ b/src/plugins/macros/macrolocatorfilter.cpp
@@ -37,8 +37,8 @@
 using namespace Macros;
 using namespace Macros::Internal;
 
-MacroLocatorFilter::MacroLocatorFilter():
-    m_icon(QPixmap(":/macros/images/macro.png"))
+MacroLocatorFilter::MacroLocatorFilter(QObject *parent)
+    : Core::ILocatorFilter(parent), m_icon(QPixmap(":/macros/images/macro.png"))
 {
     setId("Macros");
     setDisplayName(tr("Text Editing Macros"));
diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h
index d16553db3a7..6105122db4b 100644
--- a/src/plugins/macros/macrolocatorfilter.h
+++ b/src/plugins/macros/macrolocatorfilter.h
@@ -30,8 +30,6 @@
 #include <QIcon>
 
 namespace Macros {
-
-
 namespace Internal {
 
 class MacroLocatorFilter : public Core::ILocatorFilter
@@ -39,7 +37,7 @@ class MacroLocatorFilter : public Core::ILocatorFilter
     Q_OBJECT
 
 public:
-    MacroLocatorFilter();
+    explicit MacroLocatorFilter(QObject *parent);
     ~MacroLocatorFilter();
 
     QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp
index d24d7300c46..04c73425f24 100644
--- a/src/plugins/macros/macrosplugin.cpp
+++ b/src/plugins/macros/macrosplugin.cpp
@@ -58,8 +58,8 @@ bool MacrosPlugin::initialize(const QStringList &arguments, QString *errorMessag
     Q_UNUSED(arguments);
     Q_UNUSED(errorMessage);
 
-    addAutoReleasedObject(new MacroOptionsPage);
-    addAutoReleasedObject(new MacroLocatorFilter);
+    new MacroOptionsPage(this);
+    new MacroLocatorFilter(this);
 
     Core::Context textContext(TextEditor::Constants::C_TEXTEDITOR);
     m_macroManager = new MacroManager(this);