diff options
author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-23 15:10:42 +0000 |
---|---|---|
committer | Tarmac <> | 2012-11-23 15:10:42 +0000 |
commit | 7cfd1a4cececa6a44aaa3c7c6b35f1886808467e (patch) | |
tree | ce1737ac7431963279409530ca9f6fec7f812eae /libqmenumodel/src/qstateaction.h | |
parent | de8eea63b919b81132895dfe04ed676778c53f6f (diff) | |
parent | 5d755f40091afb5e1f2c4db1c7ba75c36e2d4a74 (diff) | |
download | qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.tar.gz qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.tar.bz2 qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.zip |
Removed QAction dependency from QStateAction.
Exported activate function on QStateAction.
Approved by Ugo Riboni, PS Jenkins bot.
Diffstat (limited to 'libqmenumodel/src/qstateaction.h')
-rw-r--r-- | libqmenumodel/src/qstateaction.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libqmenumodel/src/qstateaction.h b/libqmenumodel/src/qstateaction.h index 85f207a..0fc68c2 100644 --- a/libqmenumodel/src/qstateaction.h +++ b/libqmenumodel/src/qstateaction.h @@ -20,21 +20,23 @@ #ifndef QDBUSACTION_H #define QDBUSACTION_H -#include <QAction> +#include <QObject> #include <QVariant> class QDBusActionGroup; -class QStateAction : public QAction +class QStateAction : public QObject { Q_OBJECT - Q_PROPERTY(QVariant state READ state WRITE setState NOTIFY stateChanged) + Q_PROPERTY(QString name READ name) + Q_PROPERTY(QVariant state READ state NOTIFY stateChanged) Q_PROPERTY(bool valid READ isValid NOTIFY validChanged) public: QVariant state() const; bool isValid() const; - Q_INVOKABLE void updateState(const QVariant &state); + Q_INVOKABLE void activate(const QVariant ¶meter = QVariant()); + Q_INVOKABLE void updateState(const QVariant ¶meter); Q_SIGNALS: void stateChanged(QVariant state); @@ -44,16 +46,18 @@ private Q_SLOTS: void onActionAppear(const QString &name); void onActionVanish(const QString &name); void onActionStateChanged(const QString &name, const QVariant &state); - void onTriggered(); private: QDBusActionGroup *m_group; QVariant m_state; bool m_valid; + QString m_name; QStateAction(QDBusActionGroup *group, const QString &name); + void setValid(bool valid); void setState(const QVariant &state); + QString name() const; friend class QDBusActionGroup; }; |