diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2016-12-23 11:52:47 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals@canonical.com> | 2017-01-02 10:31:25 +0000 |
| commit | 59ae55e12e075005ceae6e353ef1ee00817ec751 (patch) | |
| tree | 83dcec3230d244aeb3b7b8aaf4a01147f6c4f887 /src/widgets/kernel | |
| parent | 92f6a4588f6bfc78e9b8b536ec7895d048c3aa30 (diff) | |
Q_ENUMS -> Q_ENUM and Q_FLAGS -> Q_FLAG
Change-Id: I3cdc7338354da40ab20bdaeb9d5745264ea27228
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qgesture.h | 3 | ||||
| -rw-r--r-- | src/widgets/kernel/qsizepolicy.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index 034d1d88c1..4dd6e82fd1 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -135,7 +135,6 @@ class Q_WIDGETS_EXPORT QPinchGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QPinchGesture) - Q_FLAGS(ChangeFlags ChangeFlag) public: enum ChangeFlag { @@ -143,7 +142,9 @@ public: RotationAngleChanged = 0x2, CenterPointChanged = 0x4 }; + Q_FLAG(ChangeFlag) Q_DECLARE_FLAGS(ChangeFlags, ChangeFlag) + Q_FLAG(ChangeFlags) Q_PROPERTY(ChangeFlags totalChangeFlags READ totalChangeFlags WRITE setTotalChangeFlags) Q_PROPERTY(ChangeFlags changeFlags READ changeFlags WRITE setChangeFlags) diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index 63b578fbf3..3934c0f1d0 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -54,7 +54,6 @@ Q_DECL_CONST_FUNCTION inline uint qHash(QSizePolicy key, uint seed = 0) Q_DECL_N class Q_WIDGETS_EXPORT QSizePolicy { Q_GADGET - Q_FLAGS(ControlTypes) public: enum PolicyFlag { @@ -93,6 +92,7 @@ public: ToolButton = 0x00004000 }; Q_DECLARE_FLAGS(ControlTypes, ControlType) + Q_FLAG(ControlTypes) QSizePolicy() : data(0) { } |