diff options
author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-22 16:13:02 -0300 |
---|---|---|
committer | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-22 16:13:02 -0300 |
commit | a745160b7a3460f25fa52f9902e306e071949346 (patch) | |
tree | 3f57894fdaae09304b7a759c8026947110743b33 /libqmenumodel/src/qstateaction.cpp | |
parent | 04391e9723278f8bb0a0985abd50aa9c3455980d (diff) | |
download | qmenumodel-a745160b7a3460f25fa52f9902e306e071949346.tar.gz qmenumodel-a745160b7a3460f25fa52f9902e306e071949346.tar.bz2 qmenumodel-a745160b7a3460f25fa52f9902e306e071949346.zip |
Removed QAction dependecy from QStateAction.
Exported activate function on QStateAction.
Diffstat (limited to 'libqmenumodel/src/qstateaction.cpp')
-rw-r--r-- | libqmenumodel/src/qstateaction.cpp | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/libqmenumodel/src/qstateaction.cpp b/libqmenumodel/src/qstateaction.cpp index dd4e541..18c3c81 100644 --- a/libqmenumodel/src/qstateaction.cpp +++ b/libqmenumodel/src/qstateaction.cpp @@ -47,11 +47,10 @@ /*! \internal */ QStateAction::QStateAction(QDBusActionGroup *group, const QString &name) - : QAction(name, group), - m_group(group) + : QObject(group), + m_group(group), + m_name(name) { - QObject::connect(this, SIGNAL(triggered()), this, SLOT(onTriggered())); - // This keep the code clean // But maybe we need move the action state control to QActionGroup to optimizations QObject::connect(m_group, SIGNAL(actionAppear(QString)), @@ -89,9 +88,19 @@ bool QStateAction::isValid() const return m_valid; } -void QStateAction::updateState(const QVariant &state) +QString QStateAction::name() const +{ + return m_name; +} + +void QStateAction::updateState(const QVariant ¶meter) { - m_group->updateActionState(text(), state); + m_group->updateActionState(m_name, parameter); +} + +void QStateAction::activate(const QVariant ¶meter) +{ + m_group->activateAction(m_name, parameter); } /*! \internal */ @@ -113,15 +122,9 @@ void QStateAction::setState(const QVariant &state) } /*! \internal */ -void QStateAction::onTriggered() -{ - m_group->activateAction(text(), QVariant()); -} - -/*! \internal */ void QStateAction::onActionAppear(const QString &name) { - if (text() == name) { + if (m_name == name) { setState(m_group->actionState(name)); setValid(true); } @@ -130,7 +133,7 @@ void QStateAction::onActionAppear(const QString &name) /*! \internal */ void QStateAction::onActionVanish(const QString &name) { - if (text() == name) { + if (m_name == name) { setState(QVariant()); setValid(false); } @@ -139,7 +142,7 @@ void QStateAction::onActionVanish(const QString &name) /*! \internal */ void QStateAction::onActionStateChanged(const QString &name, const QVariant &state) { - if (text() == name) { + if (m_name == name) { setState(state); } } |