diff options
| author | Nick Dedekind <nicholas.dedekind@gmail.com> | 2014-06-30 18:42:42 +0100 |
|---|---|---|
| committer | Nick Dedekind <nicholas.dedekind@gmail.com> | 2014-06-30 18:42:42 +0100 |
| commit | 6d8d26d0dc8b7c48dc494b25c4c8ee721125378b (patch) | |
| tree | 1dcec2694b80554bd88a36ba99c635800c7e7f25 /libqmenumodel/src/unitymenuaction.cpp | |
| parent | c7955b4f04e5a9a2530ad340b1801a81e37ea72c (diff) | |
| download | qmenumodel-6d8d26d0dc8b7c48dc494b25c4c8ee721125378b.tar.gz qmenumodel-6d8d26d0dc8b7c48dc494b25c4c8ee721125378b.tar.bz2 qmenumodel-6d8d26d0dc8b7c48dc494b25c4c8ee721125378b.zip | |
unset actions model in destructor
Diffstat (limited to 'libqmenumodel/src/unitymenuaction.cpp')
| -rw-r--r-- | libqmenumodel/src/unitymenuaction.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libqmenumodel/src/unitymenuaction.cpp b/libqmenumodel/src/unitymenuaction.cpp index 46edf16..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 @@ -59,9 +57,7 @@ UnityMenuModel* UnityMenuAction::model() const void UnityMenuAction::setModel(UnityMenuModel* model) { if (m_model != model) { - if (!model) { - unregisterAction(); - } + unregisterAction(); m_model = model; registerAction(); Q_EMIT modelChanged(model); @@ -107,7 +103,7 @@ void UnityMenuAction::setValid(bool valid) } } -int UnityMenuAction::index() const +int UnityMenuAction::index() const { return m_index; } |