Core: Make IEditorFactory::createEditor use a function object

Also, replace or remove unneeded Q_OBJECTs, and make base
setters and adders protected.

Change-Id: I212257ef53984d8852dc8c478537199fc9483486
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

2 files changed, 1 insertions, 11 deletions

diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp
index 9944bec558..c02199c629 100644
--- a/src/plugins/diffeditor/diffeditorfactory.cpp
+++ b/src/plugins/diffeditor/diffeditorfactory.cpp
@@ -62,11 +62,8 @@ DiffEditorFactory::DiffEditorFactory(QObject *parent)
     rightHandler->setTextEditorWidgetResolver([](Core::IEditor *e) {
         return static_cast<DiffEditor *>(e)->rightEditorWidget();
     });
-}
 
-Core::IEditor *DiffEditorFactory::createEditor()
-{
-    return new DiffEditor(new DiffEditorDocument);
+    setEditorCreator([] { return new DiffEditor(new DiffEditorDocument); });
 }
 
 } // namespace Internal
diff --git a/src/plugins/diffeditor/diffeditorfactory.h b/src/plugins/diffeditor/diffeditorfactory.h
index 2f89ac6ba3..64795b1971 100644
--- a/src/plugins/diffeditor/diffeditorfactory.h
+++ b/src/plugins/diffeditor/diffeditorfactory.h
@@ -25,22 +25,15 @@
 
 #pragma once
 
-#include "diffeditor_global.h"
-
 #include <coreplugin/editormanager/ieditorfactory.h>
 
 namespace DiffEditor {
-
 namespace Internal {
 
 class DiffEditorFactory : public Core::IEditorFactory
 {
-    Q_OBJECT
-
 public:
     explicit DiffEditorFactory(QObject *parent);
-
-    Core::IEditor *createEditor() override;
 };
 
 } // namespace Internal