context:use restore() provided function

containment() is not accessible during the containment actions constructor. We now use the provided ::restore() function in order to load the actions BUG:441448
KDE · Aug 27, 2021 · 5e55abb · 5e55abb
1 parent 5c9dc95
commit 5e55abb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp
@@ -56,7 +56,6 @@ enum LatteConfigPage
 Menu::Menu(QObject *parent, const QVariantList &args)
     : Plasma::ContainmentActions(parent, args)
 {
-    makeActions();
 }
 
 Menu::~Menu()
@@ -75,8 +74,12 @@ Menu::~Menu()
     m_actions.clear();
 }
 
-void Menu::makeActions()
+void Menu::restore(const KConfigGroup &config)
 {
+    if (!m_actions.isEmpty()) {
+        return;
+    }
+
     m_actions[Latte::Data::ContextMenu::SECTIONACTION] = new QAction(this);
     m_actions[Latte::Data::ContextMenu::SECTIONACTION]->setSeparator(true);
     m_actions[Latte::Data::ContextMenu::SECTIONACTION]->setText("Latte");

diff --git a/containmentactions/contextmenu/menu.h b/containmentactions/contextmenu/menu.h
@@ -30,10 +30,10 @@ class Menu : public Plasma::ContainmentActions
     ~Menu() override;
 
     QList<QAction *> contextualActions() override;
+    void restore(const KConfigGroup &) override;
 
     QAction *action(const QString &name);
 private Q_SLOTS:
-    void makeActions();
     void populateLayouts();
     void populateMoveToLayouts();
     void populateViewTemplates();