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, 21 insertions, 26 deletions

diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 81de2b5690..06506cd8bc 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -471,33 +471,32 @@ BinEditorFactory::BinEditorFactory()
     setId(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID);
     setDisplayName(QCoreApplication::translate("OpenWith::Editors", Constants::C_BINEDITOR_DISPLAY_NAME));
     addMimeType(Constants::C_BINEDITOR_MIMETYPE);
-}
 
-IEditor *BinEditorFactory::createEditor()
-{
-    auto widget = new BinEditorWidget();
-    auto editor = new BinEditor(widget);
+    setEditorCreator([] {
+        auto widget = new BinEditorWidget();
+        auto editor = new BinEditor(widget);
 
-    connect(dd->m_undoAction, &QAction::triggered, widget, &BinEditorWidget::undo);
-    connect(dd->m_redoAction, &QAction::triggered, widget, &BinEditorWidget::redo);
-    connect(dd->m_copyAction, &QAction::triggered, widget, &BinEditorWidget::copy);
-    connect(dd->m_selectAllAction, &QAction::triggered, widget, &BinEditorWidget::selectAll);
+        connect(dd->m_undoAction, &QAction::triggered, widget, &BinEditorWidget::undo);
+        connect(dd->m_redoAction, &QAction::triggered, widget, &BinEditorWidget::redo);
+        connect(dd->m_copyAction, &QAction::triggered, widget, &BinEditorWidget::copy);
+        connect(dd->m_selectAllAction, &QAction::triggered, widget, &BinEditorWidget::selectAll);
 
-    auto updateActions = [widget] {
-        dd->m_selectAllAction->setEnabled(true);
-        dd->m_undoAction->setEnabled(widget->isUndoAvailable());
-        dd->m_redoAction->setEnabled(widget->isRedoAvailable());
-    };
+        auto updateActions = [widget] {
+            dd->m_selectAllAction->setEnabled(true);
+            dd->m_undoAction->setEnabled(widget->isUndoAvailable());
+            dd->m_redoAction->setEnabled(widget->isRedoAvailable());
+        };
 
-    connect(widget, &BinEditorWidget::undoAvailable, widget, updateActions);
-    connect(widget, &BinEditorWidget::redoAvailable, widget, updateActions);
+        connect(widget, &BinEditorWidget::undoAvailable, widget, updateActions);
+        connect(widget, &BinEditorWidget::redoAvailable, widget, updateActions);
 
-    auto aggregate = new Aggregation::Aggregate;
-    auto binEditorFind = new BinEditorFind(widget);
-    aggregate->add(binEditorFind);
-    aggregate->add(widget);
+        auto aggregate = new Aggregation::Aggregate;
+        auto binEditorFind = new BinEditorFind(widget);
+        aggregate->add(binEditorFind);
+        aggregate->add(widget);
 
-    return editor;
+        return editor;
+    });
 }
 
 ///////////////////////////////// BinEditor Services //////////////////////////////////
diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h
index 14460d8287..e17fedfa17 100644
--- a/src/plugins/bineditor/bineditorplugin.h
+++ b/src/plugins/bineditor/bineditorplugin.h
@@ -44,14 +44,10 @@ class BinEditorPlugin : public ExtensionSystem::IPlugin
     void extensionsInitialized() final {}
 };
 
-class BinEditorFactory : public Core::IEditorFactory
+class BinEditorFactory final : public Core::IEditorFactory
 {
-    Q_OBJECT
-
 public:
     BinEditorFactory();
-
-    Core::IEditor *createEditor() final;
 };
 
 class FactoryServiceImpl : public QObject, public FactoryService