summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qmlanimation.h88
-rw-r--r--src/declarative/util/qmlbehaviour.h8
-rw-r--r--src/declarative/util/qmlbind.h2
-rw-r--r--src/declarative/util/qmlconnection.h10
-rw-r--r--src/declarative/util/qmlfollow.h16
-rw-r--r--src/declarative/util/qmlpackage.h4
-rw-r--r--src/declarative/util/qmlscript.h8
-rw-r--r--src/declarative/util/qmlsetproperties.h6
-rw-r--r--src/declarative/util/qmlstate.h10
-rw-r--r--src/declarative/util/qmlstategroup.h8
-rw-r--r--src/declarative/util/qmlstateoperations.h14
11 files changed, 87 insertions, 87 deletions
diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h
index 74cf1b4..e0ff167 100644
--- a/src/declarative/util/qmlanimation.h
+++ b/src/declarative/util/qmlanimation.h
@@ -63,13 +63,13 @@ class QmlAbstractAnimation : public QmlPropertyValueSource, public QmlParserStat
Q_OBJECT
Q_DECLARE_PRIVATE(QmlAbstractAnimation)
- Q_INTERFACES(QmlParserStatus);
- Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged);
- Q_PROPERTY(bool finishPlaying READ finishPlaying WRITE setFinishPlaying NOTIFY finishPlayingChanged());
- Q_PROPERTY(bool repeat READ repeat WRITE setRepeat NOTIFY repeatChanged);
- Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged);
- Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged);
- Q_CLASSINFO("DefaultMethod", "start()");
+ Q_INTERFACES(QmlParserStatus)
+ Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)
+ Q_PROPERTY(bool finishPlaying READ finishPlaying WRITE setFinishPlaying NOTIFY finishPlayingChanged())
+ Q_PROPERTY(bool repeat READ repeat WRITE setRepeat NOTIFY repeatChanged)
+ Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
+ Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged)
+ Q_CLASSINFO("DefaultMethod", "start()")
Q_INTERFACES(QmlParserStatus)
public:
@@ -130,9 +130,9 @@ class QmlPauseAnimationPrivate;
class QmlPauseAnimation : public QmlAbstractAnimation
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlPauseAnimation);
+ Q_DECLARE_PRIVATE(QmlPauseAnimation)
- Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged);
+ Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
public:
QmlPauseAnimation(QObject *parent=0);
@@ -154,13 +154,13 @@ class QmlColorAnimationPrivate;
class QmlColorAnimation : public QmlAbstractAnimation
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlColorAnimation);
- Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged);
- Q_PROPERTY(QColor from READ from WRITE setFrom NOTIFY fromChanged);
- Q_PROPERTY(QColor to READ to WRITE setTo NOTIFY toChanged);
- Q_PROPERTY(QString easing READ easing WRITE setEasing NOTIFY easingChanged);
- Q_PROPERTY(QList<QObject *>* filter READ filter);
- Q_PROPERTY(QList<QObject *>* exclude READ exclude);
+ Q_DECLARE_PRIVATE(QmlColorAnimation)
+ Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
+ Q_PROPERTY(QColor from READ from WRITE setFrom NOTIFY fromChanged)
+ Q_PROPERTY(QColor to READ to WRITE setTo NOTIFY toChanged)
+ Q_PROPERTY(QString easing READ easing WRITE setEasing NOTIFY easingChanged)
+ Q_PROPERTY(QList<QObject *>* filter READ filter)
+ Q_PROPERTY(QList<QObject *>* exclude READ exclude)
public:
QmlColorAnimation(QObject *parent=0);
@@ -201,10 +201,10 @@ class QmlRunScriptActionPrivate;
class QmlRunScriptAction : public QmlAbstractAnimation
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlRunScriptAction);
+ Q_DECLARE_PRIVATE(QmlRunScriptAction)
- Q_PROPERTY(QString script READ script WRITE setScript NOTIFY scriptChanged);
- Q_PROPERTY(QString file READ file WRITE setFile NOTIFY fileChanged);
+ Q_PROPERTY(QString script READ script WRITE setScript NOTIFY scriptChanged)
+ Q_PROPERTY(QString file READ file WRITE setFile NOTIFY fileChanged)
public:
QmlRunScriptAction(QObject *parent=0);
@@ -229,12 +229,12 @@ class QmlSetPropertyActionPrivate;
class QmlSetPropertyAction : public QmlAbstractAnimation
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlSetPropertyAction);
+ Q_DECLARE_PRIVATE(QmlSetPropertyAction)
- Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged);
- Q_PROPERTY(QList<QObject *>* filter READ filter);
- Q_PROPERTY(QList<QObject *>* exclude READ exclude);
- Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged);
+ Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged)
+ Q_PROPERTY(QList<QObject *>* filter READ filter)
+ Q_PROPERTY(QList<QObject *>* exclude READ exclude)
+ Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
public:
QmlSetPropertyAction(QObject *parent=0);
@@ -287,15 +287,15 @@ class QmlNumericAnimationPrivate;
class QmlNumericAnimation : public QmlAbstractAnimation
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlNumericAnimation);
+ Q_DECLARE_PRIVATE(QmlNumericAnimation)
- Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged);
- Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged);
- Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged);
- Q_PROPERTY(QString easing READ easing WRITE setEasing NOTIFY easingChanged);
- Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged);
- Q_PROPERTY(QList<QObject *>* filter READ filter);
- Q_PROPERTY(QList<QObject *>* exclude READ exclude);
+ Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
+ Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged)
+ Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged)
+ Q_PROPERTY(QString easing READ easing WRITE setEasing NOTIFY easingChanged)
+ Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged)
+ Q_PROPERTY(QList<QObject *>* filter READ filter)
+ Q_PROPERTY(QList<QObject *>* exclude READ exclude)
public:
QmlNumericAnimation(QObject *parent=0);
@@ -346,10 +346,10 @@ class QmlAnimationGroupPrivate;
class QmlAnimationGroup : public QmlAbstractAnimation
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlAnimationGroup);
+ Q_DECLARE_PRIVATE(QmlAnimationGroup)
- Q_CLASSINFO("DefaultProperty", "animations");
- Q_PROPERTY(QmlList<QmlAbstractAnimation *> *animations READ animations);
+ Q_CLASSINFO("DefaultProperty", "animations")
+ Q_PROPERTY(QmlList<QmlAbstractAnimation *> *animations READ animations)
public:
QmlAnimationGroup(QObject *parent);
@@ -398,15 +398,15 @@ class QmlVariantAnimationPrivate;
class QmlVariantAnimation : public QmlAbstractAnimation
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlVariantAnimation);
-
- Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged);
- Q_PROPERTY(QVariant from READ from WRITE setFrom NOTIFY fromChanged);
- Q_PROPERTY(QVariant to READ to WRITE setTo NOTIFY toChanged);
- Q_PROPERTY(QString easing READ easing WRITE setEasing NOTIFY easingChanged);
- Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged);
- Q_PROPERTY(QList<QObject *>* filter READ filter);
- Q_PROPERTY(QList<QObject *>* exclude READ exclude);
+ Q_DECLARE_PRIVATE(QmlVariantAnimation)
+
+ Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
+ Q_PROPERTY(QVariant from READ from WRITE setFrom NOTIFY fromChanged)
+ Q_PROPERTY(QVariant to READ to WRITE setTo NOTIFY toChanged)
+ Q_PROPERTY(QString easing READ easing WRITE setEasing NOTIFY easingChanged)
+ Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged)
+ Q_PROPERTY(QList<QObject *>* filter READ filter)
+ Q_PROPERTY(QList<QObject *>* exclude READ exclude)
public:
QmlVariantAnimation(QObject *parent=0);
diff --git a/src/declarative/util/qmlbehaviour.h b/src/declarative/util/qmlbehaviour.h
index 584b96d..aef53a3 100644
--- a/src/declarative/util/qmlbehaviour.h
+++ b/src/declarative/util/qmlbehaviour.h
@@ -60,10 +60,10 @@ class Q_DECLARATIVE_EXPORT QmlBehaviour : public QmlPropertyValueSource,
Q_DECLARE_PRIVATE(QmlBehaviour)
Q_INTERFACES(QmlParserStatus)
- Q_PROPERTY(QVariant from READ fromValue WRITE setFromValue);
- Q_PROPERTY(QVariant to READ toValue WRITE setToValue);
- Q_CLASSINFO("DefaultProperty", "operations");
- Q_PROPERTY(QmlList<QmlAbstractAnimation *>* operations READ operations);
+ Q_PROPERTY(QVariant from READ fromValue WRITE setFromValue)
+ Q_PROPERTY(QVariant to READ toValue WRITE setToValue)
+ Q_CLASSINFO("DefaultProperty", "operations")
+ Q_PROPERTY(QmlList<QmlAbstractAnimation *>* operations READ operations)
public:
QmlBehaviour(QObject *parent=0);
diff --git a/src/declarative/util/qmlbind.h b/src/declarative/util/qmlbind.h
index 8ff4152..706e202 100644
--- a/src/declarative/util/qmlbind.h
+++ b/src/declarative/util/qmlbind.h
@@ -60,12 +60,12 @@ class Q_DECLARATIVE_EXPORT QmlBind : public QObject
Q_PROPERTY(QObject *target READ object WRITE setObject)
Q_PROPERTY(QString property READ property WRITE setProperty)
Q_PROPERTY(QVariant value READ value WRITE setValue)
+ Q_PROPERTY(bool when READ when WRITE setWhen)
public:
QmlBind(QObject *parent=0);
~QmlBind();
- Q_PROPERTY(bool when READ when WRITE setWhen);
bool when() const;
void setWhen(bool);
diff --git a/src/declarative/util/qmlconnection.h b/src/declarative/util/qmlconnection.h
index c776dac..57a406b 100644
--- a/src/declarative/util/qmlconnection.h
+++ b/src/declarative/util/qmlconnection.h
@@ -59,11 +59,11 @@ class Q_DECLARATIVE_EXPORT QmlConnection : public QObject, public QmlParserStatu
Q_OBJECT
Q_DECLARE_PRIVATE(QmlConnection)
- Q_INTERFACES(QmlParserStatus);
- Q_CLASSINFO("DefaultProperty", "script");
- Q_PROPERTY(QObject *sender READ signalSender WRITE setSignalSender);
- Q_PROPERTY(QString script READ script WRITE setScript);
- Q_PROPERTY(QString signal READ signal WRITE setSignal);
+ Q_INTERFACES(QmlParserStatus)
+ Q_CLASSINFO("DefaultProperty", "script")
+ Q_PROPERTY(QObject *sender READ signalSender WRITE setSignalSender)
+ Q_PROPERTY(QString script READ script WRITE setScript)
+ Q_PROPERTY(QString signal READ signal WRITE setSignal)
public:
QmlConnection(QObject *parent=0);
diff --git a/src/declarative/util/qmlfollow.h b/src/declarative/util/qmlfollow.h
index 1c7275d..d210592 100644
--- a/src/declarative/util/qmlfollow.h
+++ b/src/declarative/util/qmlfollow.h
@@ -59,14 +59,14 @@ class Q_DECLARATIVE_EXPORT QmlFollow : public QmlPropertyValueSource,
Q_DECLARE_PRIVATE(QmlFollow)
Q_INTERFACES(QmlParserStatus)
- Q_PROPERTY(qreal source READ sourceValue WRITE setSourceValue);
- Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity);
- Q_PROPERTY(qreal spring READ spring WRITE setSpring);
- Q_PROPERTY(qreal damping READ damping WRITE setDamping);
- Q_PROPERTY(qreal epsilon READ epsilon WRITE setEpsilon);
- Q_PROPERTY(bool enabled READ enabled WRITE setEnabled);
-
- Q_PROPERTY(qreal followValue READ value NOTIFY valueChanged);
+ Q_PROPERTY(qreal source READ sourceValue WRITE setSourceValue)
+ Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity)
+ Q_PROPERTY(qreal spring READ spring WRITE setSpring)
+ Q_PROPERTY(qreal damping READ damping WRITE setDamping)
+ Q_PROPERTY(qreal epsilon READ epsilon WRITE setEpsilon)
+ Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
+ Q_PROPERTY(qreal followValue READ value NOTIFY valueChanged)
+
public:
QmlFollow(QObject *parent=0);
~QmlFollow();
diff --git a/src/declarative/util/qmlpackage.h b/src/declarative/util/qmlpackage.h
index 763ba6a..cc77b6c 100644
--- a/src/declarative/util/qmlpackage.h
+++ b/src/declarative/util/qmlpackage.h
@@ -63,8 +63,8 @@ class QmlPackage : public QObject
Q_OBJECT
Q_DECLARE_PRIVATE(QmlPackage)
- Q_CLASSINFO("DefaultProperty", "data");
- Q_PROPERTY(QmlList<QObject *> *data READ data SCRIPTABLE false);
+ Q_CLASSINFO("DefaultProperty", "data")
+ Q_PROPERTY(QmlList<QObject *> *data READ data SCRIPTABLE false)
public:
QmlPackage(QObject *parent=0);
diff --git a/src/declarative/util/qmlscript.h b/src/declarative/util/qmlscript.h
index 35a935b..dc090bc 100644
--- a/src/declarative/util/qmlscript.h
+++ b/src/declarative/util/qmlscript.h
@@ -55,11 +55,11 @@ class QmlScriptPrivate;
class Q_DECLARATIVE_EXPORT QmlScript : public QObject
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlScript);
+ Q_DECLARE_PRIVATE(QmlScript)
- Q_PROPERTY(QString script READ script WRITE setScript);
- Q_PROPERTY(QString source READ source WRITE setSource);
- Q_CLASSINFO("DefaultProperty", "script");
+ Q_PROPERTY(QString script READ script WRITE setScript)
+ Q_PROPERTY(QString source READ source WRITE setSource)
+ Q_CLASSINFO("DefaultProperty", "script")
public:
QmlScript(QObject *parent=0);
diff --git a/src/declarative/util/qmlsetproperties.h b/src/declarative/util/qmlsetproperties.h
index 6dc5993..da5fcf2 100644
--- a/src/declarative/util/qmlsetproperties.h
+++ b/src/declarative/util/qmlsetproperties.h
@@ -55,10 +55,10 @@ class QmlSetPropertiesPrivate;
class Q_DECLARATIVE_EXPORT QmlSetProperties : public QmlStateOperation
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlSetProperties);
+ Q_DECLARE_PRIVATE(QmlSetProperties)
- Q_PROPERTY(QObject *target READ object WRITE setObject);
- Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues);
+ Q_PROPERTY(QObject *target READ object WRITE setObject)
+ Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues)
public:
QmlSetProperties();
~QmlSetProperties();
diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h
index 39a9f19..0b8d82a 100644
--- a/src/declarative/util/qmlstate.h
+++ b/src/declarative/util/qmlstate.h
@@ -127,11 +127,11 @@ class Q_DECLARATIVE_EXPORT QmlState : public QObject
{
Q_OBJECT
- Q_PROPERTY(QString name READ name WRITE setName);
- Q_PROPERTY(QmlBindableValue *when READ when WRITE setWhen);
- Q_PROPERTY(QString extends READ extends WRITE setExtends);
- Q_PROPERTY(QmlList<QmlStateOperation *>* operations READ operations);
- Q_CLASSINFO("DefaultProperty", "operations");
+ Q_PROPERTY(QString name READ name WRITE setName)
+ Q_PROPERTY(QmlBindableValue *when READ when WRITE setWhen)
+ Q_PROPERTY(QString extends READ extends WRITE setExtends)
+ Q_PROPERTY(QmlList<QmlStateOperation *>* operations READ operations)
+ Q_CLASSINFO("DefaultProperty", "operations")
public:
QmlState(QObject *parent=0);
diff --git a/src/declarative/util/qmlstategroup.h b/src/declarative/util/qmlstategroup.h
index ac9b8c3..ac1d917 100644
--- a/src/declarative/util/qmlstategroup.h
+++ b/src/declarative/util/qmlstategroup.h
@@ -55,11 +55,11 @@ class QmlStateGroup : public QObject, public QmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QmlParserStatus)
- Q_DECLARE_PRIVATE(QmlStateGroup);
+ Q_DECLARE_PRIVATE(QmlStateGroup)
- Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged);
- Q_PROPERTY(QmlList<QmlState *>* states READ statesProperty DESIGNABLE false);
- Q_PROPERTY(QmlList<QmlTransition *>* transitions READ transitionsProperty DESIGNABLE false);
+ Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged)
+ Q_PROPERTY(QmlList<QmlState *>* states READ statesProperty DESIGNABLE false)
+ Q_PROPERTY(QmlList<QmlTransition *>* transitions READ transitionsProperty DESIGNABLE false)
public:
QmlStateGroup(QObject * = 0);
diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h
index ef36ab2..72296e4 100644
--- a/src/declarative/util/qmlstateoperations.h
+++ b/src/declarative/util/qmlstateoperations.h
@@ -78,8 +78,8 @@ class Q_DECLARATIVE_EXPORT QmlRunScript : public QmlStateOperation, public Actio
Q_OBJECT
Q_DECLARE_PRIVATE(QmlRunScript)
- Q_PROPERTY(QString script READ script WRITE setScript);
- Q_PROPERTY(QString name READ name WRITE setName);
+ Q_PROPERTY(QString script READ script WRITE setScript)
+ Q_PROPERTY(QString name READ name WRITE setName)
public:
QmlRunScript(QObject *parent=0);
@@ -101,12 +101,12 @@ class QmlSetPropertyPrivate;
class Q_DECLARATIVE_EXPORT QmlSetProperty : public QmlStateOperation
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlSetProperty);
+ Q_DECLARE_PRIVATE(QmlSetProperty)
- Q_PROPERTY(QObject *target READ object WRITE setObject);
- Q_PROPERTY(QString property READ property WRITE setProperty);
- Q_PROPERTY(QVariant value READ value WRITE setValue);
- Q_PROPERTY(QString binding READ binding WRITE setBinding);
+ Q_PROPERTY(QObject *target READ object WRITE setObject)
+ Q_PROPERTY(QString property READ property WRITE setProperty)
+ Q_PROPERTY(QVariant value READ value WRITE setValue)
+ Q_PROPERTY(QString binding READ binding WRITE setBinding)
public:
QmlSetProperty(QObject *parent=0);