diff --git a/src/plugins/invert/invert_config.cpp b/src/plugins/invert/invert_config.cpp index 78b68ddf9b..8c86a4812f 100644 --- a/src/plugins/invert/invert_config.cpp +++ b/src/plugins/invert/invert_config.cpp @@ -52,12 +52,6 @@ InvertEffectConfig::InvertEffectConfig(QObject *parent, const KPluginMetaData &d layout->addWidget(mShortcutEditor); } -InvertEffectConfig::~InvertEffectConfig() -{ - // Undo (only) unsaved changes to global key shortcuts - mShortcutEditor->undo(); -} - void InvertEffectConfig::load() { KCModule::load(); diff --git a/src/plugins/invert/invert_config.h b/src/plugins/invert/invert_config.h index e2ea73d576..b37d1596f9 100644 --- a/src/plugins/invert/invert_config.h +++ b/src/plugins/invert/invert_config.h @@ -21,7 +21,6 @@ class InvertEffectConfig : public KCModule Q_OBJECT public: explicit InvertEffectConfig(QObject *parent, const KPluginMetaData &data); - ~InvertEffectConfig() override; public Q_SLOTS: void save() override; diff --git a/src/plugins/magnifier/magnifier_config.cpp b/src/plugins/magnifier/magnifier_config.cpp index 5ad98c529e..f42a014044 100644 --- a/src/plugins/magnifier/magnifier_config.cpp +++ b/src/plugins/magnifier/magnifier_config.cpp @@ -75,12 +75,6 @@ MagnifierEffectConfig::MagnifierEffectConfig(QObject *parent, const KPluginMetaD m_ui.editor->addCollection(m_actionCollection); } -MagnifierEffectConfig::~MagnifierEffectConfig() -{ - // Undo (only) unsaved changes to global key shortcuts - m_ui.editor->undo(); -} - void MagnifierEffectConfig::save() { qDebug() << "Saving config of Magnifier"; diff --git a/src/plugins/magnifier/magnifier_config.h b/src/plugins/magnifier/magnifier_config.h index 9bac1876f6..bab274437d 100644 --- a/src/plugins/magnifier/magnifier_config.h +++ b/src/plugins/magnifier/magnifier_config.h @@ -30,7 +30,6 @@ class MagnifierEffectConfig : public KCModule Q_OBJECT public: explicit MagnifierEffectConfig(QObject *parent, const KPluginMetaData &data); - ~MagnifierEffectConfig() override; void save() override; void defaults() override; diff --git a/src/plugins/mouseclick/mouseclick_config.cpp b/src/plugins/mouseclick/mouseclick_config.cpp index 1c8d402166..ae866ef445 100644 --- a/src/plugins/mouseclick/mouseclick_config.cpp +++ b/src/plugins/mouseclick/mouseclick_config.cpp @@ -59,12 +59,6 @@ MouseClickEffectConfig::MouseClickEffectConfig(QObject *parent, const KPluginMet addConfig(MouseClickConfig::self(), &m_ui); } -MouseClickEffectConfig::~MouseClickEffectConfig() -{ - // Undo (only) unsaved changes to global key shortcuts - m_ui.editor->undo(); -} - void MouseClickEffectConfig::save() { KCModule::save(); diff --git a/src/plugins/mouseclick/mouseclick_config.h b/src/plugins/mouseclick/mouseclick_config.h index df018f3eaf..9582665712 100644 --- a/src/plugins/mouseclick/mouseclick_config.h +++ b/src/plugins/mouseclick/mouseclick_config.h @@ -30,7 +30,6 @@ class MouseClickEffectConfig : public KCModule Q_OBJECT public: explicit MouseClickEffectConfig(QObject *parent, const KPluginMetaData &data); - ~MouseClickEffectConfig() override; void save() override; diff --git a/src/plugins/mousemark/mousemark_config.cpp b/src/plugins/mousemark/mousemark_config.cpp index 782be7e1bc..ba354c6359 100644 --- a/src/plugins/mousemark/mousemark_config.cpp +++ b/src/plugins/mousemark/mousemark_config.cpp @@ -69,12 +69,6 @@ MouseMarkEffectConfig::MouseMarkEffectConfig(QObject *parent, const KPluginMetaD }); } -MouseMarkEffectConfig::~MouseMarkEffectConfig() -{ - // Undo (only) unsaved changes to global key shortcuts - m_ui.editor->undo(); -} - void MouseMarkEffectConfig::load() { KCModule::load(); diff --git a/src/plugins/mousemark/mousemark_config.h b/src/plugins/mousemark/mousemark_config.h index 05059e3e0c..670f887024 100644 --- a/src/plugins/mousemark/mousemark_config.h +++ b/src/plugins/mousemark/mousemark_config.h @@ -31,7 +31,6 @@ class MouseMarkEffectConfig : public KCModule Q_OBJECT public: explicit MouseMarkEffectConfig(QObject *parent, const KPluginMetaData &data); - ~MouseMarkEffectConfig() override; void load() override; void save() override; diff --git a/src/plugins/overview/kcm/overvieweffectkcm.cpp b/src/plugins/overview/kcm/overvieweffectkcm.cpp index f0d4b00337..e2c6f265df 100644 --- a/src/plugins/overview/kcm/overvieweffectkcm.cpp +++ b/src/plugins/overview/kcm/overvieweffectkcm.cpp @@ -68,12 +68,6 @@ OverviewEffectConfig::OverviewEffectConfig(QObject *parent, const KPluginMetaDat connect(ui.shortcutsEditor, &KShortcutsEditor::keyChange, this, &KCModule::markAsChanged); } -OverviewEffectConfig::~OverviewEffectConfig() -{ - // If save() is called, undo() has no effect. - ui.shortcutsEditor->undo(); -} - void OverviewEffectConfig::save() { KCModule::save(); diff --git a/src/plugins/overview/kcm/overvieweffectkcm.h b/src/plugins/overview/kcm/overvieweffectkcm.h index 6a044e286f..3420e1b99b 100644 --- a/src/plugins/overview/kcm/overvieweffectkcm.h +++ b/src/plugins/overview/kcm/overvieweffectkcm.h @@ -19,7 +19,6 @@ class OverviewEffectConfig : public KCModule public: explicit OverviewEffectConfig(QObject *parent, const KPluginMetaData &data); - ~OverviewEffectConfig() override; public Q_SLOTS: void save() override; diff --git a/src/plugins/showpaint/showpaint_config.cpp b/src/plugins/showpaint/showpaint_config.cpp index e51e79251e..70fffca600 100644 --- a/src/plugins/showpaint/showpaint_config.cpp +++ b/src/plugins/showpaint/showpaint_config.cpp @@ -45,12 +45,6 @@ ShowPaintEffectConfig::ShowPaintEffectConfig(QObject *parent, const KPluginMetaD connect(m_ui->shortcutsEditor, &KShortcutsEditor::keyChange, this, &KCModule::markAsChanged); } -ShowPaintEffectConfig::~ShowPaintEffectConfig() -{ - // If save() is called, undo() has no effect. - m_ui->shortcutsEditor->undo(); -} - void ShowPaintEffectConfig::save() { KCModule::save(); diff --git a/src/plugins/showpaint/showpaint_config.h b/src/plugins/showpaint/showpaint_config.h index a1a44a184b..d752f870b8 100644 --- a/src/plugins/showpaint/showpaint_config.h +++ b/src/plugins/showpaint/showpaint_config.h @@ -22,7 +22,6 @@ class ShowPaintEffectConfig : public KCModule public: explicit ShowPaintEffectConfig(QObject *parent, const KPluginMetaData &data); - ~ShowPaintEffectConfig() override; public Q_SLOTS: void save() override; diff --git a/src/plugins/thumbnailaside/thumbnailaside_config.cpp b/src/plugins/thumbnailaside/thumbnailaside_config.cpp index 9dcc109e49..f3afbc9989 100644 --- a/src/plugins/thumbnailaside/thumbnailaside_config.cpp +++ b/src/plugins/thumbnailaside/thumbnailaside_config.cpp @@ -64,12 +64,6 @@ ThumbnailAsideEffectConfig::ThumbnailAsideEffectConfig(QObject *parent, const KP m_ui.editor->addCollection(m_actionCollection); } -ThumbnailAsideEffectConfig::~ThumbnailAsideEffectConfig() -{ - // Undo (only) unsaved changes to global key shortcuts - m_ui.editor->undo(); -} - void ThumbnailAsideEffectConfig::save() { KCModule::save(); diff --git a/src/plugins/thumbnailaside/thumbnailaside_config.h b/src/plugins/thumbnailaside/thumbnailaside_config.h index 9a88317932..ec0f72c04e 100644 --- a/src/plugins/thumbnailaside/thumbnailaside_config.h +++ b/src/plugins/thumbnailaside/thumbnailaside_config.h @@ -30,7 +30,6 @@ class ThumbnailAsideEffectConfig : public KCModule Q_OBJECT public: explicit ThumbnailAsideEffectConfig(QObject *parent, const KPluginMetaData &data); - ~ThumbnailAsideEffectConfig() override; void save() override; diff --git a/src/plugins/tileseditor/kcm/tileseditoreffectkcm.cpp b/src/plugins/tileseditor/kcm/tileseditoreffectkcm.cpp index 05b5a44f98..e12e492257 100644 --- a/src/plugins/tileseditor/kcm/tileseditoreffectkcm.cpp +++ b/src/plugins/tileseditor/kcm/tileseditoreffectkcm.cpp @@ -43,12 +43,6 @@ TilesEditorEffectConfig::TilesEditorEffectConfig(QObject *parent, const KPluginM connect(ui.shortcutsEditor, &KShortcutsEditor::keyChange, this, &KCModule::markAsChanged); } -TilesEditorEffectConfig::~TilesEditorEffectConfig() -{ - // If save() is called, undo() has no effect. - ui.shortcutsEditor->undo(); -} - void TilesEditorEffectConfig::save() { KCModule::save(); diff --git a/src/plugins/tileseditor/kcm/tileseditoreffectkcm.h b/src/plugins/tileseditor/kcm/tileseditoreffectkcm.h index 5e84909df0..fea0dccbe9 100644 --- a/src/plugins/tileseditor/kcm/tileseditoreffectkcm.h +++ b/src/plugins/tileseditor/kcm/tileseditoreffectkcm.h @@ -19,7 +19,6 @@ class TilesEditorEffectConfig : public KCModule public: explicit TilesEditorEffectConfig(QObject *parent, const KPluginMetaData &data); - ~TilesEditorEffectConfig() override; public Q_SLOTS: void save() override; diff --git a/src/plugins/windowview/kcm/windowvieweffectkcm.cpp b/src/plugins/windowview/kcm/windowvieweffectkcm.cpp index ceabdaa19d..a52b7a24f6 100644 --- a/src/plugins/windowview/kcm/windowvieweffectkcm.cpp +++ b/src/plugins/windowview/kcm/windowvieweffectkcm.cpp @@ -68,12 +68,6 @@ WindowViewEffectConfig::WindowViewEffectConfig(QObject *parent, const KPluginMet connect(ui.shortcutsEditor, &KShortcutsEditor::keyChange, this, &KCModule::markAsChanged); } -WindowViewEffectConfig::~WindowViewEffectConfig() -{ - // If save() is called, undo() has no effect. - ui.shortcutsEditor->undo(); -} - void WindowViewEffectConfig::save() { KCModule::save(); diff --git a/src/plugins/windowview/kcm/windowvieweffectkcm.h b/src/plugins/windowview/kcm/windowvieweffectkcm.h index 8e9f3cbaf0..87fa341983 100644 --- a/src/plugins/windowview/kcm/windowvieweffectkcm.h +++ b/src/plugins/windowview/kcm/windowvieweffectkcm.h @@ -19,7 +19,6 @@ class WindowViewEffectConfig : public KCModule public: explicit WindowViewEffectConfig(QObject *parent, const KPluginMetaData &data); - ~WindowViewEffectConfig() override; public Q_SLOTS: void save() override; diff --git a/src/plugins/zoom/zoom_config.cpp b/src/plugins/zoom/zoom_config.cpp index dcf52c702b..7e63bc7e00 100644 --- a/src/plugins/zoom/zoom_config.cpp +++ b/src/plugins/zoom/zoom_config.cpp @@ -120,12 +120,6 @@ ZoomEffectConfig::ZoomEffectConfig(QObject *parent, const KPluginMetaData &data) m_ui->editor->addCollection(actionCollection); } -ZoomEffectConfig::~ZoomEffectConfig() -{ - // Undo (only) unsaved changes to global key shortcuts - m_ui->editor->undo(); -} - void ZoomEffectConfig::save() { m_ui->editor->save(); // undo() will restore to this state from now on diff --git a/src/plugins/zoom/zoom_config.h b/src/plugins/zoom/zoom_config.h index d2e87e7428..80d8aebfe0 100644 --- a/src/plugins/zoom/zoom_config.h +++ b/src/plugins/zoom/zoom_config.h @@ -29,7 +29,6 @@ class ZoomEffectConfig : public KCModule Q_OBJECT public: explicit ZoomEffectConfig(QObject *parent, const KPluginMetaData &data); - ~ZoomEffectConfig() override; public Q_SLOTS: void save() override;