From c65b02f1faec11f2a841929acc86c4668ab65e65 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 7 Feb 2020 13:59:23 +0100
Subject: [PATCH] TextEditor/Vcs: Remove use of QObject parent for editor
 factories

Change-Id: I1b3d8b49649401c7bb03c0415f886530416afa2c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/texteditor/texteditor.cpp        | 4 ++--
 src/plugins/texteditor/texteditor.h          | 2 +-
 src/plugins/vcsbase/basevcseditorfactory.cpp | 3 +--
 src/plugins/vcsbase/basevcseditorfactory.h   | 3 +--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 9909ef8d508..2d1683bd92e 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -8538,8 +8538,8 @@ public:
 
 } /// namespace Internal
 
-TextEditorFactory::TextEditorFactory(QObject *parent)
-    : IEditorFactory(parent), d(new TextEditorFactoryPrivate(this))
+TextEditorFactory::TextEditorFactory()
+    : d(new TextEditorFactoryPrivate(this))
 {
     setEditorCreator([]() { return new BaseTextEditor; });
 }
diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h
index 63c1ecee44a..a2512384da1 100644
--- a/src/plugins/texteditor/texteditor.h
+++ b/src/plugins/texteditor/texteditor.h
@@ -636,7 +636,7 @@ class TEXTEDITOR_EXPORT TextEditorFactory : public Core::IEditorFactory
     Q_OBJECT
 
 public:
-    TextEditorFactory(QObject *parent = nullptr);
+    TextEditorFactory();
     ~TextEditorFactory() override;
 
     using EditorCreator = std::function<BaseTextEditor *()>;
diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp
index 7f28f031be1..7502e536372 100644
--- a/src/plugins/vcsbase/basevcseditorfactory.cpp
+++ b/src/plugins/vcsbase/basevcseditorfactory.cpp
@@ -52,8 +52,7 @@ namespace VcsBase {
 VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters *parameters,
                                    // Force copy, see QTCREATORBUG-13218
                                    const EditorWidgetCreator editorWidgetCreator,
-                                   std::function<void(const QString &, const QString &)> describeFunc, QObject *parent)
-    : TextEditorFactory(parent)
+                                   std::function<void(const QString &, const QString &)> describeFunc)
 {
     setProperty("VcsEditorFactoryName", QByteArray(parameters->id));
     setId(parameters->id);
diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h
index 362e2bf8db4..8c2b8cbdf67 100644
--- a/src/plugins/vcsbase/basevcseditorfactory.h
+++ b/src/plugins/vcsbase/basevcseditorfactory.h
@@ -42,8 +42,7 @@ class VCSBASE_EXPORT VcsEditorFactory : public TextEditor::TextEditorFactory
 public:
     VcsEditorFactory(const VcsBaseEditorParameters *parameters,
                      const EditorWidgetCreator editorWidgetCreator,
-                     std::function<void(const QString &, const QString &)> describeFunc,
-                     QObject *parent = nullptr);
+                     std::function<void(const QString &, const QString &)> describeFunc);
 
     static VcsBaseEditor *createEditorById(const char *id);
 };