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, 2 insertions, 10 deletions

diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp
index ae4d38c3ac1..5d0cc0438b5 100644
--- a/src/plugins/designer/formeditorfactory.cpp
+++ b/src/plugins/designer/formeditorfactory.cpp
@@ -45,14 +45,10 @@ FormEditorFactory::FormEditorFactory()
     setId(K_DESIGNER_XML_EDITOR_ID);
     setDisplayName(QCoreApplication::translate("Designer", C_DESIGNER_XML_DISPLAY_NAME));
     addMimeType(FORM_MIMETYPE);
+    setEditorCreator([] { return  FormEditorW::createEditor(); });
 
     FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_UI, "ui");
 }
 
-IEditor *FormEditorFactory::createEditor()
-{
-    return FormEditorW::createEditor();
-}
-
 } // namespace Internal
 } // namespace Designer
diff --git a/src/plugins/designer/formeditorfactory.h b/src/plugins/designer/formeditorfactory.h
index 8c8b898a7e9..bf7fb8e868e 100644
--- a/src/plugins/designer/formeditorfactory.h
+++ b/src/plugins/designer/formeditorfactory.h
@@ -30,14 +30,10 @@
 namespace Designer {
 namespace Internal {
 
-class FormEditorFactory : public Core::IEditorFactory
+class FormEditorFactory final : public Core::IEditorFactory
 {
-    Q_OBJECT
-
 public:
     FormEditorFactory();
-
-    Core::IEditor *createEditor() override;
 };
 
 } // namespace Internal