aboutsummaryrefslogtreecommitdiff
path: root/libqmenumodel/src/unitymenuaction.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libqmenumodel/src/unitymenuaction.cpp')
-rw-r--r--libqmenumodel/src/unitymenuaction.cpp10
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;
}