Port from Q_ENUMS to new macro Q_ENUM.

Remove Q_ENUMS in favor of the new Q_ENUM macro which provides registration
as meta enum and a debug stream operator.

QQuickXmlListModel::Status is left unmodified as porting it creates
a link error in tst_qquickxmllistmodel.

Change-Id: Id5e6192c9f85e7c94332508fbd91873ddda31e1a
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h
index bcb4e18751..7f64e12bba 100644
--- a/src/quick/items/qquicklistview_p.h
+++ b/src/quick/items/qquicklistview_p.h
@@ -47,8 +47,6 @@ class Q_AUTOTEST_EXPORT QQuickViewSection : public QObject
     Q_PROPERTY(SectionCriteria criteria READ criteria WRITE setCriteria NOTIFY criteriaChanged)
     Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_PROPERTY(int labelPositioning READ labelPositioning WRITE setLabelPositioning NOTIFY labelPositioningChanged)
-    Q_ENUMS(SectionCriteria)
-    Q_ENUMS(LabelPositioning)
 public:
     QQuickViewSection(QQuickListView *parent=0);
 
@@ -56,6 +54,7 @@ public:
     void setProperty(const QString &);
 
     enum SectionCriteria { FullString, FirstCharacter };
+    Q_ENUM(SectionCriteria)
     SectionCriteria criteria() const { return m_criteria; }
     void setCriteria(SectionCriteria);
 
@@ -65,6 +64,7 @@ public:
     QString sectionString(const QString &value);
 
     enum LabelPositioning { InlineLabels = 0x01, CurrentLabelAtStart = 0x02, NextLabelAtEnd = 0x04 };
+    Q_ENUM(LabelPositioning)
     int labelPositioning() { return m_labelPositioning; }
     void setLabelPositioning(int pos);
 
@@ -106,10 +106,6 @@ class Q_AUTOTEST_EXPORT QQuickListView : public QQuickItemView
     Q_PROPERTY(HeaderPositioning headerPositioning READ headerPositioning WRITE setHeaderPositioning NOTIFY headerPositioningChanged REVISION 2)
     Q_PROPERTY(FooterPositioning footerPositioning READ footerPositioning WRITE setFooterPositioning NOTIFY footerPositioningChanged REVISION 2)
 
-    Q_ENUMS(Orientation)
-    Q_ENUMS(SnapMode)
-    Q_ENUMS(HeaderPositioning)
-    Q_ENUMS(FooterPositioning)
     Q_CLASSINFO("DefaultProperty", "data")
 
 public:
@@ -120,6 +116,7 @@ public:
     void setSpacing(qreal spacing);
 
     enum Orientation { Horizontal = Qt::Horizontal, Vertical = Qt::Vertical };
+    Q_ENUM(Orientation)
     Orientation orientation() const;
     void setOrientation(Orientation);
 
@@ -140,14 +137,17 @@ public:
     void setHighlightMoveDuration(int) Q_DECL_OVERRIDE;
 
     enum SnapMode { NoSnap, SnapToItem, SnapOneItem };
+    Q_ENUM(SnapMode)
     SnapMode snapMode() const;
     void setSnapMode(SnapMode mode);
 
     enum HeaderPositioning { InlineHeader, OverlayHeader, PullBackHeader };
+    Q_ENUM(HeaderPositioning)
     HeaderPositioning headerPositioning() const;
     void setHeaderPositioning(HeaderPositioning positioning);
 
     enum FooterPositioning { InlineFooter, OverlayFooter, PullBackFooter };
+    Q_ENUM(FooterPositioning)
     FooterPositioning footerPositioning() const;
     void setFooterPositioning(FooterPositioning positioning);