Transform as singleton

messagelist/src/core/filtersavedmanager.cpp

@@ -19,6 +19,12 @@ FilterSavedManager::~FilterSavedManager()
 {
 }
 
+FilterSavedManager *FilterSavedManager::self()
+{
+    static FilterSavedManager s_self;
+    return &s_self;
+}
+
 void FilterSavedManager::saveFilter(MessageList::Core::Filter *filter, const QString &filtername)
 {
     filter->save(KSharedConfig::openConfig(), filtername);

messagelist/src/core/filtersavedmanager.h

@@ -21,6 +21,9 @@ public:
 
     void saveFilter(MessageList::Core::Filter *filter, const QString &filtername);
     void loadMenu(QMenu *menu);
+
+    static FilterSavedManager *self();
+
 Q_SIGNALS:
     void activateFilter(const QString &identifier);
 };

messagelist/src/core/widgets/filtersavedmenu.cpp

@@ -15,7 +15,6 @@ FilterSavedMenu::FilterSavedMenu(QWidget *parent)
     : QMenu(parent)
     , mSaveAction(new QAction(QIcon::fromTheme(QStringLiteral("document-save-as")), i18n("Save Filter..."), this))
     , mConfigureAction(new QAction(i18n("Configure..."), this))
-    , mFilterSaveManager(new FilterSavedManager(this))
 {
     connect(this, &FilterSavedMenu::aboutToShow, this, &FilterSavedMenu::slotShowMenu);
     connect(mSaveAction, &QAction::triggered, this, &FilterSavedMenu::saveFilter);
@@ -30,6 +29,7 @@ void FilterSavedMenu::slotShowMenu()
 {
     // TODO load current Filter saved action
     mListAction.clear();
+    FilterSavedManager::self()->loadMenu(this);
     if (isEmpty()) {
         addSeparator();
         addAction(mSaveAction);

messagelist/src/core/widgets/filtersavedmenu.h

@@ -14,7 +14,6 @@ namespace MessageList
 {
 namespace Core
 {
-class FilterSavedManager;
 class MESSAGELIST_TESTS_EXPORT FilterSavedMenu : public QMenu
 {
     Q_OBJECT
@@ -32,7 +31,6 @@ private:
     QAction *const mSaveAction;
     QAction *const mConfigureAction;
     QList<QAction *> mListAction;
-    FilterSavedManager *const mFilterSaveManager;
 };
 }
 }