rename a few properties and methods

Result of API review.

6 files changed, 14 insertions, 14 deletions

diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp
index 731871c..5fa1742 100644
--- a/src/corelib/statemachine/qabstracttransition.cpp
+++ b/src/corelib/statemachine/qabstracttransition.cpp
@@ -79,19 +79,19 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \property QAbstractTransition::source
+    \property QAbstractTransition::sourceState
 
     \brief the source state (parent) of this transition
 */
 
 /*!
-    \property QAbstractTransition::target
+    \property QAbstractTransition::targetState
 
     \brief the target state of this transition
 */
 
 /*!
-    \property QAbstractTransition::targets
+    \property QAbstractTransition::targetStates
 
     \brief the target states of this transition
 
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h
index 37365c5..79ab808 100644
--- a/src/corelib/statemachine/qabstracttransition.h
+++ b/src/corelib/statemachine/qabstracttransition.h
@@ -65,9 +65,9 @@ class QAbstractTransitionPrivate;
 class Q_CORE_EXPORT QAbstractTransition : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QState* source READ sourceState)
-    Q_PROPERTY(QAbstractState* target READ targetState WRITE setTargetState)
-    Q_PROPERTY(QList<QAbstractState*> targets READ targetStates WRITE setTargetStates)
+    Q_PROPERTY(QState* sourceState READ sourceState)
+    Q_PROPERTY(QAbstractState* targetState READ targetState WRITE setTargetState)
+    Q_PROPERTY(QList<QAbstractState*> targetStates READ targetStates WRITE setTargetStates)
 public:
     QAbstractTransition(QState *sourceState = 0);
     QAbstractTransition(const QList<QAbstractState*> &targets, QState *sourceState = 0);
diff --git a/src/corelib/statemachine/qeventtransition.cpp b/src/corelib/statemachine/qeventtransition.cpp
index 09b89f3..2126373 100644
--- a/src/corelib/statemachine/qeventtransition.cpp
+++ b/src/corelib/statemachine/qeventtransition.cpp
@@ -88,7 +88,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \property QEventTransition::object
+    \property QEventTransition::eventObject
 
     \brief the event source that this event transition is associated with
 */
@@ -229,7 +229,7 @@ void QEventTransition::setEventType(QEvent::Type type)
 /*!
   Returns the event source associated with this event transition.
 */
-QObject *QEventTransition::eventSource() const
+QObject *QEventTransition::eventObject() const
 {
     Q_D(const QEventTransition);
     return d->object;
@@ -239,7 +239,7 @@ QObject *QEventTransition::eventSource() const
   Sets the event source associated with this event transition to be the given
   \a object.
 */
-void QEventTransition::setEventSource(QObject *object)
+void QEventTransition::setEventObject(QObject *object)
 {
     Q_D(QEventTransition);
     if (d->object == object)
diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h
index e19b5af..82fcd36 100644
--- a/src/corelib/statemachine/qeventtransition.h
+++ b/src/corelib/statemachine/qeventtransition.h
@@ -59,7 +59,7 @@ class QEventTransitionPrivate;
 class Q_CORE_EXPORT QEventTransition : public QAbstractTransition
 {
     Q_OBJECT
-    Q_PROPERTY(QObject* object READ eventSource WRITE setEventSource)
+    Q_PROPERTY(QObject* eventObject READ eventObject WRITE setEventObject)
 #ifndef QT_STATEMACHINE_SOLUTION
     Q_PROPERTY(QEvent::Type eventType READ eventType WRITE setEventType)
 #endif
@@ -70,8 +70,8 @@ public:
                      const QList<QAbstractState*> &targets, QState *sourceState = 0);
     ~QEventTransition();
 
-    QObject *eventSource() const;
-    void setEventSource(QObject *object);
+    QObject *eventObject() const;
+    void setEventObject(QObject *object);
 
     QEvent::Type eventType() const;
     void setEventType(QEvent::Type type);
diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp
index 064ac6e..e9e248f 100644
--- a/src/corelib/statemachine/qsignaltransition.cpp
+++ b/src/corelib/statemachine/qsignaltransition.cpp
@@ -96,7 +96,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \property QSignalTransition::object
+    \property QSignalTransition::senderObject
 
     \brief the sender object that this signal transition is associated with
 */
diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h
index 4df97cf..b8e8fc6 100644
--- a/src/corelib/statemachine/qsignaltransition.h
+++ b/src/corelib/statemachine/qsignaltransition.h
@@ -58,7 +58,7 @@ class QSignalTransitionPrivate;
 class Q_CORE_EXPORT QSignalTransition : public QAbstractTransition
 {
     Q_OBJECT
-    Q_PROPERTY(QObject* object READ senderObject WRITE setSenderObject)
+    Q_PROPERTY(QObject* senderObject READ senderObject WRITE setSenderObject)
     Q_PROPERTY(QByteArray signal READ signal WRITE setSignal)
 public:
     QSignalTransition(QState *sourceState = 0);