qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Q_ENUM instead of Q_ENUMS 

Change-Id: I01d6a9bcb097ae9a3f3946b388e3d15dfda07f6f
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
This commit is contained in:
J-P Nurmi 2015-02-08 12:05:56 +01:00 committed by Jari-Pekka Nurmi
parent 8b2a1ec431
commit 52a76539ff
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/controls/qquickabstractslider_p.h
View File

@ -57,7 +57,6 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractSlider : public QQuickControl
Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged FINAL)
Q_PROPERTY(QQuickItem *handle READ handle WRITE setHandle NOTIFY handleChanged FINAL)
Q_PROPERTY(QQuickItem *track READ track WRITE setTrack NOTIFY trackChanged FINAL)
Q_ENUMS(SnapMode)
public:
explicit QQuickAbstractSlider(QQuickItem *parent = Q_NULLPTR);
@ -77,6 +76,7 @@ public:
SnapAlways,
SnapOnRelease
};
Q_ENUM(SnapMode)
SnapMode snapMode() const;
void setSnapMode(SnapMode mode);

2
src/controls/qquickabstractspinbox_p.h
View File

@ -55,7 +55,6 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractSpinBox : public QQuickControl
Q_PROPERTY(QQuickItem *upButton READ upButton WRITE setUpButton NOTIFY upButtonChanged FINAL)
Q_PROPERTY(QQuickItem *downButton READ downButton WRITE setDownButton NOTIFY downButtonChanged FINAL)
Q_PROPERTY(SubControl pressed READ pressed WRITE setPressed NOTIFY pressedChanged FINAL)
Q_ENUMS(SubControl)
public:
explicit QQuickAbstractSpinBox(QQuickItem *parent = Q_NULLPTR);
@ -83,6 +82,7 @@ public:
UpButton,
DownButton
};
Q_ENUM(SubControl)
SubControl pressed() const;
void setPressed(SubControl control);

4
src/controls/qquickabstractstackview_p.h
View File

@ -51,7 +51,6 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractStackView : public QQuickAbstractCont
Q_PROPERTY(int depth READ depth WRITE setDepth NOTIFY depthChanged FINAL) // TODO: hide setDepth
Q_PROPERTY(QQuickItem *currentItem READ currentItem WRITE setCurrentItem NOTIFY currentItemChanged FINAL) // TODO: hide setCurrentItem
Q_PROPERTY(QVariant initialItem READ initialItem WRITE setInitialItem FINAL)
Q_ENUMS(Operation)
public:
explicit QQuickAbstractStackView(QQuickItem *parent = Q_NULLPTR);
@ -73,6 +72,7 @@ public:
Transition,
Immediate
};
Q_ENUM(Operation)
Q_INVOKABLE QQuickItem *qpush(QQmlV4Function *args);
Q_INVOKABLE QQuickItem *qpop(QQmlV4Function *args);
@ -99,7 +99,6 @@ class Q_QUICKCONTROLS_EXPORT QQuickStackAttached : public QObject
{
Q_OBJECT
Q_PROPERTY(Status status READ status WRITE setStatus NOTIFY statusChanged)
Q_ENUMS(Status)
public:
explicit QQuickStackAttached(QObject *parent = Q_NULLPTR);
@ -112,6 +111,7 @@ public:
Activating = 2,
Active = 3
};
Q_ENUM(Status)
Status status() const;
void setStatus(Status status);