ModelEditor: Simplify setup of some plugin singletons

Change-Id: Ica4d10155160d06be52daf4b56b714d07ad92290
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: hjk <hjk@qt.io>

src/plugins/modeleditor/actionhandler.cpp

@@ -45,7 +45,7 @@ namespace Internal {
 
 class ActionHandler::ActionHandlerPrivate {
 public:
-    Core::Context context;
+    Core::Context context{Constants::MODEL_EDITOR_ID};
     QAction *undoAction = nullptr;
     QAction *redoAction = nullptr;
     QAction *cutAction = nullptr;
@@ -60,11 +60,9 @@ public:
     QAction *exportSelectedElementsAction = nullptr;
 };
 
-ActionHandler::ActionHandler(const Core::Context &context, QObject *parent)
+ActionHandler::ActionHandler()
-    : QObject(parent),
+    : d(new ActionHandlerPrivate)
-      d(new ActionHandlerPrivate)
 {
-    d->context = context;
 }
 
 ActionHandler::~ActionHandler()

src/plugins/modeleditor/actionhandler.h

@@ -52,7 +52,7 @@ class ActionHandler :
     class ActionHandlerPrivate;
 
 public:
-    ActionHandler(const Core::Context &context, QObject *parent = nullptr);
+    ActionHandler();
     ~ActionHandler();
 
 public:

src/plugins/modeleditor/modeleditor_plugin.cpp

@@ -32,6 +32,7 @@
 #include "modelsmanager.h"
 #include "settingscontroller.h"
 #include "uicontroller.h"
+#include "actionhandler.h"
 
 #include "qmt/infrastructure/uid.h"
 
@@ -59,7 +60,8 @@ class ModelEditorPluginPrivate final
 public:
     ModelsManager modelsManager;
     UiController uiController;
-    ModelEditorFactory modelFactory{&uiController};
+    ActionHandler actionHandler;
+    ModelEditorFactory modelFactory{&uiController, &actionHandler};
     SettingsController settingsController;
 };
 
@@ -93,10 +95,7 @@ bool ModelEditorPlugin::initialize(const QStringList &arguments, QString *errorS
 
 void ModelEditorPlugin::extensionsInitialized()
 {
-    // Retrieve objects from the plugin manager's object pool
+    d->actionHandler.createActions();
-    // In the extensionsInitialized method, a plugin can be sure that all
-    // plugins that depend on it are completely initialized.
-    d->modelFactory.extensionsInitialized();
     d->settingsController.load(Core::ICore::settings());
 }
 

src/plugins/modeleditor/modeleditorfactory.cpp

@@ -34,24 +34,12 @@
 namespace ModelEditor {
 namespace Internal {
 
-ModelEditorFactory::ModelEditorFactory(UiController *uiController)
+ModelEditorFactory::ModelEditorFactory(UiController *uiController, ActionHandler *actionHandler)
 {
     setId(Constants::MODEL_EDITOR_ID);
     setDisplayName(QCoreApplication::translate("OpenWith::Editors", Constants::MODEL_EDITOR_DISPLAY_NAME));
     addMimeType(Constants::MIME_TYPE_MODEL);
-    m_uiController = uiController;
+    setEditorCreator([uiController, actionHandler] { return new ModelEditor(uiController, actionHandler); });
-    m_actionHandler = new ActionHandler(Core::Context(Constants::MODEL_EDITOR_ID), this);
-    setEditorCreator([this] { return new ModelEditor(m_uiController, m_actionHandler); });
-}
-
-ModelEditorFactory::~ModelEditorFactory()
-{
-    delete m_actionHandler;
-}
-
-void ModelEditorFactory::extensionsInitialized()
-{
-    m_actionHandler->createActions();
 }
 
 } // namespace Internal

src/plugins/modeleditor/modeleditorfactory.h

@@ -37,14 +37,7 @@ class UiController;
 class ModelEditorFactory : public Core::IEditorFactory
 {
 public:
-    explicit ModelEditorFactory(UiController *uiController);
+    ModelEditorFactory(UiController *uiController, ActionHandler *actionHandler);
-    ~ModelEditorFactory();
-
-    void extensionsInitialized();
-
-private:
-    UiController *m_uiController = nullptr;
-    ActionHandler *m_actionHandler = nullptr;
 };
 
 } // namespace Internal