diff options
| author | Nick Dedekind <nicholas.dedekind@gmail.com> | 2014-07-04 07:38:02 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-07-04 07:38:02 +0000 |
| commit | 2ec6160a767750525f567ed3c1cc49c6bbe84e05 (patch) | |
| tree | 33ce61334463ae2fdae55e4325cdde93f3ef526a /libqmenumodel/src/unitymenuaction.cpp | |
| parent | d83588e3e3ba9a3410e4e122f6a06f61d68c7a09 (diff) | |
| parent | 4f4fde02f90abeb1d20a842b2a7578a84fe75f51 (diff) | |
| download | qmenumodel-2ec6160a767750525f567ed3c1cc49c6bbe84e05.tar.gz qmenumodel-2ec6160a767750525f567ed3c1cc49c6bbe84e05.tar.bz2 qmenumodel-2ec6160a767750525f567ed3c1cc49c6bbe84e05.zip | |
Unset the UnityMenuActions::model when destroying UnityMenuModel Fixes: 1334203
Diffstat (limited to 'libqmenumodel/src/unitymenuaction.cpp')
| -rw-r--r-- | libqmenumodel/src/unitymenuaction.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libqmenumodel/src/unitymenuaction.cpp b/libqmenumodel/src/unitymenuaction.cpp index 6f564d1..5de3cf8 100644 --- a/libqmenumodel/src/unitymenuaction.cpp +++ b/libqmenumodel/src/unitymenuaction.cpp @@ -33,9 +33,7 @@ UnityMenuAction::UnityMenuAction(QObject* parent) UnityMenuAction::~UnityMenuAction() { - if (m_model) { - m_model->unregisterAction(this); - } + unregisterAction(); } QString UnityMenuAction::name() const @@ -105,7 +103,7 @@ void UnityMenuAction::setValid(bool valid) } } -int UnityMenuAction::index() const +int UnityMenuAction::index() const { return m_index; } |