Remane private QQuickAction into QQuickStateAction

This avoid symbol conflicts when statically linking with Qt Quick
Controls, that has its own QQuickAction class and which may become
public some day. (QQuickPropertyAction might be a more apt name, but
it's already taken).

Change-Id: Ia9514d63d38295603a89d8ec5a88815a651380f7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/quick/util/qquickstate_p_p.h b/src/quick/util/qquickstate_p_p.h
index 8dfc6eb68a..c559c8163c 100644
--- a/src/quick/util/qquickstate_p_p.h
+++ b/src/quick/util/qquickstate_p_p.h
@@ -70,7 +70,7 @@ class QQuickSimpleAction
 {
 public:
     enum State { StartState, EndState };
-    QQuickSimpleAction(const QQuickAction &a, State state = StartState)
+    QQuickSimpleAction(const QQuickStateAction &a, State state = StartState)
     {
         m_property = a.property;
         m_specifiedObject = a.specifiedObject;
@@ -157,7 +157,7 @@ public:
         return m_specifiedProperty;
     }
 
-    QQuickActionEvent *event() const
+    QQuickStateActionEvent *event() const
     {
         return m_event;
     }
@@ -173,7 +173,7 @@ private:
     QQmlAbstractBinding::Pointer m_binding;
     QObject *m_specifiedObject;
     QString m_specifiedProperty;
-    QQuickActionEvent *m_event;
+    QQuickStateActionEvent *m_event;
     bool m_reverseEvent;
 };
 
@@ -182,9 +182,9 @@ class QQuickRevertAction
 public:
     QQuickRevertAction() : event(0) {}
     QQuickRevertAction(const QQmlProperty &prop) : property(prop), event(0) {}
-    QQuickRevertAction(QQuickActionEvent *e) : event(e) {}
+    QQuickRevertAction(QQuickStateActionEvent *e) : event(e) {}
     QQmlProperty property;
-    QQuickActionEvent *event;
+    QQuickStateActionEvent *event;
 };
 
 class QQuickStateOperationPrivate : public QObjectPrivate