Use Q_ENUM and Q_FLAG for types in QtCore

Change-Id: I33590a9c4c6d87c5bbba1d201e32c6bf1bd3e00b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

9 files changed, 16 insertions, 12 deletions

diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h
index 43190cc9e2..152a914475 100644
--- a/src/corelib/animation/qabstractanimation.h
+++ b/src/corelib/animation/qabstractanimation.h
@@ -49,8 +49,7 @@ class QAbstractAnimationPrivate;
 class Q_CORE_EXPORT QAbstractAnimation : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(State)
-    Q_ENUMS(Direction)
+
     Q_PROPERTY(State state READ state NOTIFY stateChanged)
     Q_PROPERTY(int loopCount READ loopCount WRITE setLoopCount)
     Q_PROPERTY(int currentTime READ currentTime WRITE setCurrentTime)
@@ -63,12 +62,14 @@ public:
         Forward,
         Backward
     };
+    Q_ENUM(Direction)
 
     enum State {
         Stopped,
         Paused,
         Running
     };
+    Q_ENUM(State)
 
     enum DeletionPolicy {
         KeepWhenStopped = 0,
diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h
index 7699611408..7d8c1ff113 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.h
+++ b/src/corelib/itemmodels/qabstractitemmodel.h
@@ -155,7 +155,6 @@ template <class Key, class T> class QMap;
 class Q_CORE_EXPORT QAbstractItemModel : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(LayoutChangeHint)
 
     friend class QPersistentModelIndexData;
     friend class QAbstractItemViewPrivate;
@@ -239,6 +238,7 @@ public:
         VerticalSortHint,
         HorizontalSortHint
     };
+    Q_ENUM(LayoutChangeHint)
 
 Q_SIGNALS:
     void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>());
diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h
index f02149b2b7..58b52901cb 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.h
+++ b/src/corelib/itemmodels/qitemselectionmodel.h
@@ -148,7 +148,6 @@ class Q_CORE_EXPORT QItemSelectionModel : public QObject
     Q_PROPERTY(QModelIndex currentIndex READ currentIndex NOTIFY currentChanged STORED false DESIGNABLE false)
 
     Q_DECLARE_PRIVATE(QItemSelectionModel)
-    Q_FLAGS(SelectionFlags)
 
 public:
 
@@ -167,6 +166,7 @@ public:
     };
 
     Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag)
+    Q_FLAG(SelectionFlags)
 
     explicit QItemSelectionModel(QAbstractItemModel *model = 0);
     explicit QItemSelectionModel(QAbstractItemModel *model, QObject *parent);
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index 0807721432..b57690198e 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -46,7 +46,6 @@ class Q_CORE_EXPORT QEvent           // event base class
 {
     Q_GADGET
     QDOC_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
-    Q_ENUMS(Type)
 public:
     enum Type {
         /*
@@ -283,6 +282,7 @@ public:
         User = 1000,                            // first user event id
         MaxUser = 65535                         // last user event id
     };
+    Q_ENUM(Type)
 
     explicit QEvent(Type type);
     QEvent(const QEvent &other);
diff --git a/src/corelib/plugin/qlibrary.h b/src/corelib/plugin/qlibrary.h
index 327af8aada..9f5aa421d8 100644
--- a/src/corelib/plugin/qlibrary.h
+++ b/src/corelib/plugin/qlibrary.h
@@ -47,7 +47,6 @@ class Q_CORE_EXPORT QLibrary : public QObject
     Q_OBJECT
     Q_PROPERTY(QString fileName READ fileName WRITE setFileName)
     Q_PROPERTY(LoadHints loadHints READ loadHints WRITE setLoadHints)
-    Q_FLAGS(LoadHint LoadHints)
 public:
     enum LoadHint {
         ResolveAllSymbolsHint = 0x01,
@@ -57,6 +56,8 @@ public:
         DeepBindHint = 0x10
     };
     Q_DECLARE_FLAGS(LoadHints, LoadHint)
+    Q_FLAG(LoadHint)
+    Q_FLAG(LoadHints)
 
     explicit QLibrary(QObject *parent = 0);
     explicit QLibrary(const QString& fileName, QObject *parent = 0);
diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h
index ee80a0bc15..cccf5430a8 100644
--- a/src/corelib/statemachine/qhistorystate.h
+++ b/src/corelib/statemachine/qhistorystate.h
@@ -47,12 +47,12 @@ class Q_CORE_EXPORT QHistoryState : public QAbstractState
     Q_OBJECT
     Q_PROPERTY(QAbstractState* defaultState READ defaultState WRITE setDefaultState NOTIFY defaultStateChanged)
     Q_PROPERTY(HistoryType historyType READ historyType WRITE setHistoryType NOTIFY historyTypeChanged)
-    Q_ENUMS(HistoryType)
 public:
     enum HistoryType {
         ShallowHistory,
         DeepHistory
     };
+    Q_ENUM(HistoryType)
 
     QHistoryState(QState *parent = 0);
     QHistoryState(HistoryType type, QState *parent = 0);
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index 8a308cf38e..65e927e07a 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -53,17 +53,18 @@ class Q_CORE_EXPORT QState : public QAbstractState
     Q_PROPERTY(QAbstractState* initialState READ initialState WRITE setInitialState NOTIFY initialStateChanged)
     Q_PROPERTY(QAbstractState* errorState READ errorState WRITE setErrorState NOTIFY errorStateChanged)
     Q_PROPERTY(ChildMode childMode READ childMode WRITE setChildMode NOTIFY childModeChanged)
-    Q_ENUMS(ChildMode RestorePolicy)
 public:
     enum ChildMode {
         ExclusiveStates,
         ParallelStates
     };
+    Q_ENUM(ChildMode)
 
     enum RestorePolicy {
         DontRestoreProperties,
         RestoreProperties
     };
+    Q_ENUM(RestorePolicy)
 
     QState(QState *parent = 0);
     QState(ChildMode childMode, QState *parent = 0);
diff --git a/src/corelib/tools/qeasingcurve.h b/src/corelib/tools/qeasingcurve.h
index 702842eb68..a3866c72a2 100644
--- a/src/corelib/tools/qeasingcurve.h
+++ b/src/corelib/tools/qeasingcurve.h
@@ -50,7 +50,6 @@ class QPointF;
 class Q_CORE_EXPORT QEasingCurve
 {
     Q_GADGET
-    Q_ENUMS(Type)
 public:
     enum Type {
         Linear,
@@ -67,6 +66,7 @@ public:
         InCurve, OutCurve, SineCurve, CosineCurve,
         BezierSpline, TCBSpline, Custom, NCurveTypes
     };
+    Q_ENUM(Type)
 
     QEasingCurve(Type type = Linear);
     QEasingCurve(const QEasingCurve &other);
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index f965ae6562..145b67f9f1 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -55,9 +55,6 @@ class QLocalePrivate;
 class Q_CORE_EXPORT QLocale
 {
     Q_GADGET
-    Q_ENUMS(Language)
-    Q_ENUMS(Country)
-    Q_ENUMS(MeasurementSystem)
     friend class QString;
     friend class QStringRef;
     friend class QByteArray;
@@ -781,12 +778,16 @@ public:
     };
 // GENERATED PART ENDS HERE
 
+    Q_ENUM(Language)
+    Q_ENUM(Country)
+
     enum MeasurementSystem {
         MetricSystem,
         ImperialUSSystem,
         ImperialUKSystem,
         ImperialSystem = ImperialUSSystem // Qt 4 compatibility
     };
+    Q_ENUM(MeasurementSystem)
 
     enum FormatType { LongFormat, ShortFormat, NarrowFormat };
     enum NumberOption {