diff options
Diffstat (limited to 'src/widgets/kernel/qactiongroup.h')
-rw-r--r-- | src/widgets/kernel/qactiongroup.h | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h index 90f488bedb..6ec2fc09ef 100644 --- a/src/widgets/kernel/qactiongroup.h +++ b/src/widgets/kernel/qactiongroup.h @@ -41,6 +41,7 @@ #define QACTIONGROUP_H #include <QtWidgets/qtwidgetsglobal.h> +#include <QtGui/qguiactiongroup.h> #include <QtWidgets/qaction.h> QT_BEGIN_NAMESPACE @@ -50,45 +51,22 @@ QT_BEGIN_NAMESPACE class QActionGroupPrivate; -class Q_WIDGETS_EXPORT QActionGroup : public QObject +class Q_WIDGETS_EXPORT QActionGroup : public QGuiActionGroup { Q_OBJECT Q_DECLARE_PRIVATE(QActionGroup) - Q_PROPERTY(QActionGroup::ExclusionPolicy exclusionPolicy READ exclusionPolicy WRITE setExclusionPolicy) - Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled) - Q_PROPERTY(bool visible READ isVisible WRITE setVisible) - public: - enum class ExclusionPolicy { - None, - Exclusive, - ExclusiveOptional - }; - Q_ENUM(ExclusionPolicy) - explicit QActionGroup(QObject* parent); ~QActionGroup(); - QAction *addAction(QAction* a); - QAction *addAction(const QString &text); - QAction *addAction(const QIcon &icon, const QString &text); - void removeAction(QAction *a); - QList<QAction*> actions() const; - QAction *checkedAction() const; - bool isExclusive() const; - bool isEnabled() const; - bool isVisible() const; - ExclusionPolicy exclusionPolicy() const; + QAction *addAction(QAction *a); + QAction *addAction(const QString &text); + QAction *addAction(const QIcon &icon, const QString &text); -public Q_SLOTS: - void setEnabled(bool); - inline void setDisabled(bool b) { setEnabled(!b); } - void setVisible(bool); - void setExclusive(bool); - void setExclusionPolicy(ExclusionPolicy policy); + QList<QAction*> actions() const; Q_SIGNALS: void triggered(QAction *); @@ -96,9 +74,6 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QActionGroup) - Q_PRIVATE_SLOT(d_func(), void _q_actionTriggered()) - Q_PRIVATE_SLOT(d_func(), void _q_actionChanged()) - Q_PRIVATE_SLOT(d_func(), void _q_actionHovered()) }; #endif // QT_NO_ACTION |