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

diff --git a/src/plugins/scxmleditor/scxmleditorfactory.cpp b/src/plugins/scxmleditor/scxmleditorfactory.cpp
index 013ce959e7..a7120e71df 100644
--- a/src/plugins/scxmleditor/scxmleditorfactory.cpp
+++ b/src/plugins/scxmleditor/scxmleditorfactory.cpp
@@ -46,15 +46,14 @@ ScxmlEditorFactory::ScxmlEditorFactory(QObject *parent)
     addMimeType(ProjectExplorer::Constants::SCXML_MIMETYPE);
 
     Core::FileIconProvider::registerIconOverlayForSuffix(":/projectexplorer/images/fileoverlay_scxml.png", "scxml");
-}
 
-Core::IEditor *ScxmlEditorFactory::createEditor()
-{
-    if (!m_editorData) {
-        m_editorData = new ScxmlEditorData(this);
-        QGuiApplication::setOverrideCursor(Qt::WaitCursor);
-        m_editorData->fullInit();
-        QGuiApplication::restoreOverrideCursor();
-    }
-    return m_editorData->createEditor();
+    setEditorCreator([this] {
+        if (!m_editorData) {
+            m_editorData = new ScxmlEditorData(this);
+            QGuiApplication::setOverrideCursor(Qt::WaitCursor);
+            m_editorData->fullInit();
+            QGuiApplication::restoreOverrideCursor();
+        }
+        return m_editorData->createEditor();
+    });
 }
diff --git a/src/plugins/scxmleditor/scxmleditorfactory.h b/src/plugins/scxmleditor/scxmleditorfactory.h
index 8732d94acc..42135ec64b 100644
--- a/src/plugins/scxmleditor/scxmleditorfactory.h
+++ b/src/plugins/scxmleditor/scxmleditorfactory.h
@@ -32,15 +32,11 @@ namespace Internal {
 
 class ScxmlEditorData;
 
-class ScxmlEditorFactory : public Core::IEditorFactory
+class ScxmlEditorFactory final : public Core::IEditorFactory
 {
-    Q_OBJECT
-
 public:
     explicit ScxmlEditorFactory(QObject *parent);
 
-    Core::IEditor *createEditor() override;
-
 private:
     ScxmlEditorData* m_editorData = nullptr;
 };