QtWidgets: use Q_ENUM instead of Q_ENUMS

Change-Id: Id5280c1d9feab95e1506569f3d0eb23eeb74935f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

4 files changed, 12 insertions, 4 deletions

diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h
index 28c43633ea..c76d8f4b2f 100644
--- a/src/widgets/itemviews/qabstractitemview.h
+++ b/src/widgets/itemviews/qabstractitemview.h
@@ -52,7 +52,6 @@ class QAbstractItemViewPrivate;
 class Q_WIDGETS_EXPORT QAbstractItemView : public QAbstractScrollArea
 {
     Q_OBJECT
-    Q_ENUMS(SelectionMode SelectionBehavior ScrollHint ScrollMode DragDropMode)
     Q_FLAGS(EditTriggers)
     Q_PROPERTY(bool autoScroll READ hasAutoScroll WRITE setAutoScroll)
     Q_PROPERTY(int autoScrollMargin READ autoScrollMargin WRITE setAutoScrollMargin)
@@ -81,12 +80,14 @@ public:
         ExtendedSelection,
         ContiguousSelection
     };
+    Q_ENUM(SelectionMode)
 
     enum SelectionBehavior {
         SelectItems,
         SelectRows,
         SelectColumns
     };
+    Q_ENUM(SelectionBehavior)
 
     enum ScrollHint {
         EnsureVisible,
@@ -94,6 +95,7 @@ public:
         PositionAtBottom,
         PositionAtCenter
     };
+    Q_ENUM(ScrollHint)
 
     enum EditTrigger {
         NoEditTriggers = 0,
@@ -111,6 +113,7 @@ public:
         ScrollPerItem,
         ScrollPerPixel
     };
+    Q_ENUM(ScrollMode)
 
     explicit QAbstractItemView(QWidget *parent = 0);
     ~QAbstractItemView();
@@ -168,6 +171,7 @@ public:
         DragDrop,
         InternalMove
     };
+    Q_ENUM(DragDropMode)
 
     void setDragDropMode(DragDropMode behavior);
     DragDropMode dragDropMode() const;
diff --git a/src/widgets/itemviews/qdatawidgetmapper.h b/src/widgets/itemviews/qdatawidgetmapper.h
index 2afbd0ae87..b5e495a28a 100644
--- a/src/widgets/itemviews/qdatawidgetmapper.h
+++ b/src/widgets/itemviews/qdatawidgetmapper.h
@@ -50,7 +50,6 @@ class Q_WIDGETS_EXPORT QDataWidgetMapper: public QObject
 {
     Q_OBJECT
 
-    Q_ENUMS(SubmitPolicy)
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
     Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
     Q_PROPERTY(SubmitPolicy submitPolicy READ submitPolicy WRITE setSubmitPolicy)
@@ -72,6 +71,7 @@ public:
     Qt::Orientation orientation() const;
 
     enum SubmitPolicy { AutoSubmit, ManualSubmit };
+    Q_ENUM(SubmitPolicy)
     void setSubmitPolicy(SubmitPolicy policy);
     SubmitPolicy submitPolicy() const;
 
diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h
index 0163243cdf..7c08ccc86a 100644
--- a/src/widgets/itemviews/qheaderview.h
+++ b/src/widgets/itemviews/qheaderview.h
@@ -55,7 +55,6 @@ class Q_WIDGETS_EXPORT QHeaderView : public QAbstractItemView
     Q_PROPERTY(int minimumSectionSize READ minimumSectionSize WRITE setMinimumSectionSize)
     Q_PROPERTY(int maximumSectionSize READ maximumSectionSize WRITE setMaximumSectionSize)
     Q_PROPERTY(Qt::Alignment defaultAlignment READ defaultAlignment WRITE setDefaultAlignment)
-    Q_ENUMS(ResizeMode)
 
 public:
 
@@ -67,6 +66,7 @@ public:
         ResizeToContents,
         Custom = Fixed
     };
+    Q_ENUM(ResizeMode)
 
     explicit QHeaderView(Qt::Orientation orientation, QWidget *parent = 0);
     virtual ~QHeaderView();
diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h
index 8e4cc7ff41..7a4637ed75 100644
--- a/src/widgets/itemviews/qlistview.h
+++ b/src/widgets/itemviews/qlistview.h
@@ -46,7 +46,6 @@ class QListViewPrivate;
 class Q_WIDGETS_EXPORT QListView : public QAbstractItemView
 {
     Q_OBJECT
-    Q_ENUMS(Movement Flow ResizeMode LayoutMode ViewMode)
     Q_PROPERTY(Movement movement READ movement WRITE setMovement)
     Q_PROPERTY(Flow flow READ flow WRITE setFlow)
     Q_PROPERTY(bool isWrapping READ isWrapping WRITE setWrapping)
@@ -63,10 +62,15 @@ class Q_WIDGETS_EXPORT QListView : public QAbstractItemView
 
 public:
     enum Movement { Static, Free, Snap };
+    Q_ENUM(Movement)
     enum Flow { LeftToRight, TopToBottom };
+    Q_ENUM(Flow)
     enum ResizeMode { Fixed, Adjust };
+    Q_ENUM(ResizeMode)
     enum LayoutMode { SinglePass, Batched };
+    Q_ENUM(LayoutMode)
     enum ViewMode { ListMode, IconMode };
+    Q_ENUM(ViewMode)
 
     explicit QListView(QWidget *parent = 0);
     ~QListView();