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>

5 files changed, 7 insertions, 7 deletions

diff --git a/src/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h
index 7d7d98dab6..16832d76dc 100644
--- a/src/particles/qquickimageparticle_p.h
+++ b/src/particles/qquickimageparticle_p.h
@@ -175,13 +175,12 @@ class QQuickImageParticle : public QQuickParticlePainter
     Q_PROPERTY(bool spritesInterpolate READ spritesInterpolate WRITE setSpritesInterpolate NOTIFY spritesInterpolateChanged)
 
     Q_PROPERTY(EntryEffect entryEffect READ entryEffect WRITE setEntryEffect NOTIFY entryEffectChanged)
-    Q_ENUMS(EntryEffect)
-    Q_ENUMS(Status)
 public:
     explicit QQuickImageParticle(QQuickItem *parent = 0);
     virtual ~QQuickImageParticle();
 
     enum Status { Null, Ready, Loading, Error };
+    Q_ENUM(Status)
 
     QQmlListProperty<QQuickSprite> sprites();
     QQuickStochasticEngine* spriteEngine() {return m_spriteEngine;}
@@ -191,6 +190,7 @@ public:
         Fade = 1,
         Scale = 2
     };
+    Q_ENUM(EntryEffect)
 
     enum PerformanceLevel{//TODO: Expose?
         Unknown = 0,
diff --git a/src/particles/qquickparticleemitter_p.h b/src/particles/qquickparticleemitter_p.h
index 65e2a34aa7..68f01e3f6a 100644
--- a/src/particles/qquickparticleemitter_p.h
+++ b/src/particles/qquickparticleemitter_p.h
@@ -67,7 +67,6 @@ class QQuickParticleEmitter : public QQuickItem
     Q_PROPERTY(QQuickDirection *acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged)
     Q_PROPERTY(qreal velocityFromMovement READ velocityFromMovement WRITE setVelocityFromMovement NOTIFY velocityFromMovementChanged)
 
-    Q_ENUMS(Lifetime)
 public:
     explicit QQuickParticleEmitter(QQuickItem *parent = 0);
     virtual ~QQuickParticleEmitter();
@@ -76,6 +75,7 @@ public:
     enum Lifetime {
         InfiniteLife = QQuickParticleSystem::maxLife
     };
+    Q_ENUM(Lifetime)
 
     bool enabled() const
     {
diff --git a/src/particles/qquickpointattractor_p.h b/src/particles/qquickpointattractor_p.h
index aa2c9f2083..31038aeba4 100644
--- a/src/particles/qquickpointattractor_p.h
+++ b/src/particles/qquickpointattractor_p.h
@@ -45,8 +45,6 @@ class QQuickAttractorAffector : public QQuickParticleAffector
     Q_PROPERTY(qreal pointY READ pointY WRITE setPointY NOTIFY pointYChanged)
     Q_PROPERTY(AffectableParameters affectedParameter READ affectedParameter WRITE setAffectedParameter NOTIFY affectedParameterChanged)
     Q_PROPERTY(Proportion proportionalToDistance READ proportionalToDistance WRITE setProportionalToDistance NOTIFY proportionalToDistanceChanged)
-    Q_ENUMS(AffectableParameters)
-    Q_ENUMS(Proportion)
 
 public:
     enum Proportion{
@@ -56,12 +54,14 @@ public:
         InverseLinear,
         InverseQuadratic
     };
+    Q_ENUM(Proportion)
 
     enum AffectableParameters {
         Position,
         Velocity,
         Acceleration
     };
+    Q_ENUM(AffectableParameters)
 
     explicit QQuickAttractorAffector(QQuickItem *parent = 0);
 
diff --git a/src/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h
index d1213158d8..fd11a07056 100644
--- a/src/particles/qquicktrailemitter_p.h
+++ b/src/particles/qquicktrailemitter_p.h
@@ -48,11 +48,11 @@ class QQuickTrailEmitter : public QQuickParticleEmitter
     Q_PROPERTY(qreal emitHeight READ emitterYVariation WRITE setEmitterYVariation NOTIFY emitterYVariationChanged)
     Q_PROPERTY(qreal emitWidth READ emitterXVariation WRITE setEmitterXVariation NOTIFY emitterXVariationChanged)
 
-    Q_ENUMS(EmitSize)
 public:
     enum EmitSize {
         ParticleSize = -2//Anything less than 0 will do
     };
+    Q_ENUM(EmitSize)
     explicit QQuickTrailEmitter(QQuickItem *parent = 0);
     virtual void emitWindow(int timeStamp);
     virtual void reset();
diff --git a/src/particles/qquickwander_p.h b/src/particles/qquickwander_p.h
index 49c49c560e..93ad8516a7 100644
--- a/src/particles/qquickwander_p.h
+++ b/src/particles/qquickwander_p.h
@@ -54,7 +54,6 @@ class QQuickWanderAffector : public QQuickParticleAffector
     Q_PROPERTY(qreal xVariance READ xVariance WRITE setXVariance NOTIFY xVarianceChanged)
     Q_PROPERTY(qreal yVariance READ yVariance WRITE setYVariance NOTIFY yVarianceChanged)
     Q_PROPERTY(AffectableParameters affectedParameter READ affectedParameter WRITE setAffectedParameter NOTIFY affectedParameterChanged)
-    Q_ENUMS(AffectableParameters)
 
 public:
     enum AffectableParameters {
@@ -62,6 +61,7 @@ public:
         Velocity,
         Acceleration
     };
+    Q_ENUM(AffectableParameters)
 
     explicit QQuickWanderAffector(QQuickItem *parent = 0);
     ~QQuickWanderAffector();