Re-order revision 3 members and add explanatory comments

We've come to realize that even though it's tempting to group similar
properties together, organizing the API so that revisions are grouped
together makes future maintenance more pleasant. It's a lot easier to
to see what was added and when.

The same was done for earlier revisions in 5.9 in commit 430fe83.

Change-Id: I738d7fdadd348c21737228c37d0f31e39b37f8e7
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

1 files changed, 21 insertions, 19 deletions

diff --git a/src/quicktemplates2/qquickpopup_p.h b/src/quicktemplates2/qquickpopup_p.h
index 9dc4115e..ada4b649 100644
--- a/src/quicktemplates2/qquickpopup_p.h
+++ b/src/quicktemplates2/qquickpopup_p.h
@@ -96,9 +96,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopup : public QObject, public QQml
     Q_PROPERTY(qreal rightPadding READ rightPadding WRITE setRightPadding RESET resetRightPadding NOTIFY rightPaddingChanged FINAL)
     Q_PROPERTY(qreal bottomPadding READ bottomPadding WRITE setBottomPadding RESET resetBottomPadding NOTIFY bottomPaddingChanged FINAL)
     Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL)
-    Q_PROPERTY(bool mirrored READ isMirrored NOTIFY mirroredChanged FINAL REVISION 3)
     Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL)
-    Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3)
     Q_PROPERTY(QQuickItem *parent READ parentItem WRITE setParentItem RESET resetParentItem NOTIFY parentChanged FINAL)
     Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
     Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL)
@@ -110,8 +108,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopup : public QObject, public QQml
     Q_PROPERTY(bool modal READ isModal WRITE setModal NOTIFY modalChanged FINAL)
     Q_PROPERTY(bool dim READ dim WRITE setDim RESET resetDim NOTIFY dimChanged FINAL)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL)
-    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL REVISION 3)
-    Q_PROPERTY(bool opened READ isOpened NOTIFY openedChanged FINAL REVISION 3)
     Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged FINAL)
     Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged FINAL)
     Q_PROPERTY(ClosePolicy closePolicy READ closePolicy WRITE setClosePolicy RESET resetClosePolicy NOTIFY closePolicyChanged FINAL)
@@ -120,6 +116,11 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopup : public QObject, public QQml
     Q_PROPERTY(QQuickTransition *exit READ exit WRITE setExit NOTIFY exitChanged FINAL)
     // 2.1 (Qt 5.8)
     Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL REVISION 1)
+    // 2.3 (Qt 5.10)
+    Q_PROPERTY(bool opened READ isOpened NOTIFY openedChanged FINAL REVISION 3)
+    Q_PROPERTY(bool mirrored READ isMirrored NOTIFY mirroredChanged FINAL REVISION 3)
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL REVISION 3)
+    Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3)
     Q_CLASSINFO("DefaultProperty", "contentData")
 
 public:
@@ -205,16 +206,10 @@ public:
     void setLocale(const QLocale &locale);
     void resetLocale();
 
-    bool isMirrored() const;
-
     QFont font() const;
     void setFont(const QFont &font);
     void resetFont();
 
-    QPalette palette() const;
-    void setPalette(const QPalette &palette);
-    void resetPalette();
-
     QQuickWindow *window() const;
     QQuickItem *popupItem() const;
 
@@ -249,11 +244,6 @@ public:
     bool isVisible() const;
     virtual void setVisible(bool visible);
 
-    bool isEnabled() const;
-    void setEnabled(bool enabled);
-
-    bool isOpened() const;
-
     qreal opacity() const;
     void setOpacity(qreal opacity);
 
@@ -302,6 +292,17 @@ public:
     void setSpacing(qreal spacing);
     void resetSpacing();
 
+    // 2.3 (Qt 5.10)
+    bool isOpened() const;
+    bool isMirrored() const;
+
+    bool isEnabled() const;
+    void setEnabled(bool enabled);
+
+    QPalette palette() const;
+    void setPalette(const QPalette &palette);
+    void resetPalette();
+
 public Q_SLOTS:
     void open();
     void close();
@@ -334,8 +335,6 @@ Q_SIGNALS:
     void bottomPaddingChanged();
     void fontChanged();
     void localeChanged();
-    Q_REVISION(3) void mirroredChanged();
-    Q_REVISION(3) void paletteChanged();
     void parentChanged();
     void backgroundChanged();
     void contentItemChanged();
@@ -346,8 +345,6 @@ Q_SIGNALS:
     void modalChanged();
     void dimChanged();
     void visibleChanged();
-    Q_REVISION(3) void enabledChanged();
-    Q_REVISION(3) void openedChanged();
     void opacityChanged();
     void scaleChanged();
     void closePolicyChanged();
@@ -356,6 +353,11 @@ Q_SIGNALS:
     void windowChanged(QQuickWindow *window);
     // 2.1 (Qt 5.8)
     Q_REVISION(1) void spacingChanged();
+    // 2.3 (Qt 5.10)
+    Q_REVISION(3) void openedChanged();
+    Q_REVISION(3) void mirroredChanged();
+    Q_REVISION(3) void enabledChanged();
+    Q_REVISION(3) void paletteChanged();
 
 protected:
     QQuickPopup(QQuickPopupPrivate &dd, QObject *parent);