From d15db788de792815a35547059921d3305d48c119 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 27 May 2009 09:05:28 +1000 Subject: Remove more unneeded semicolons. --- src/declarative/canvas/qsimplecanvasfilter.h | 2 +- src/declarative/canvas/qsimplecanvasitem.h | 2 +- src/declarative/extra/qmlsqlconnection.h | 20 +++---- src/declarative/extra/qnumberformat.h | 16 ++--- src/declarative/fx/qfxanchors.h | 30 +++++----- src/declarative/fx/qfxcomponentinstance.h | 2 +- src/declarative/fx/qfxflickable.h | 26 ++++---- src/declarative/fx/qfxflipable.h | 2 +- src/declarative/fx/qfxgridview.h | 30 +++++----- src/declarative/fx/qfxitem.h | 4 +- src/declarative/fx/qfxlistview.h | 36 ++++++------ src/declarative/fx/qfxpainteditem.h | 4 +- src/declarative/fx/qfxparticles.h | 34 +++++------ src/declarative/fx/qfxtext.h | 2 +- src/declarative/qml/qmlbindablevalue.h | 4 +- src/declarative/util/qmlanimation.h | 88 ++++++++++++++-------------- src/declarative/util/qmlbehaviour.h | 8 +-- src/declarative/util/qmlbind.h | 2 +- src/declarative/util/qmlconnection.h | 10 ++-- src/declarative/util/qmlfollow.h | 16 ++--- src/declarative/util/qmlpackage.h | 4 +- src/declarative/util/qmlscript.h | 8 +-- src/declarative/util/qmlsetproperties.h | 6 +- src/declarative/util/qmlstate.h | 10 ++-- src/declarative/util/qmlstategroup.h | 8 +-- src/declarative/util/qmlstateoperations.h | 14 ++--- 26 files changed, 194 insertions(+), 194 deletions(-) diff --git a/src/declarative/canvas/qsimplecanvasfilter.h b/src/declarative/canvas/qsimplecanvasfilter.h index d05dc7e..14bb765 100644 --- a/src/declarative/canvas/qsimplecanvasfilter.h +++ b/src/declarative/canvas/qsimplecanvasfilter.h @@ -70,7 +70,7 @@ public: ChildrenAboveItem = 0x04, All = 0x07 }; - Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged); + Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged) bool enabled() const; void setEnabled(bool); diff --git a/src/declarative/canvas/qsimplecanvasitem.h b/src/declarative/canvas/qsimplecanvasitem.h index cf23fc6..e8f1ee8 100644 --- a/src/declarative/canvas/qsimplecanvasitem.h +++ b/src/declarative/canvas/qsimplecanvasitem.h @@ -74,7 +74,7 @@ class Q_DECLARATIVE_EXPORT QSimpleCanvasItem : public QObject Q_CAST_INTERFACES(QmlDebuggerStatus) Q_DECLARE_PRIVATE(QSimpleCanvasItem) Q_ENUMS(TransformOrigin) - Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin); + Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin) public: enum ClipType { NoClip = 0x00, diff --git a/src/declarative/extra/qmlsqlconnection.h b/src/declarative/extra/qmlsqlconnection.h index dd0e5b5..306db8d 100644 --- a/src/declarative/extra/qmlsqlconnection.h +++ b/src/declarative/extra/qmlsqlconnection.h @@ -57,16 +57,16 @@ class Q_DECLARATIVE_EXPORT QmlSqlConnection : public QObject, public QmlParserSt Q_OBJECT Q_INTERFACES(QmlParserStatus) - Q_PROPERTY(QString name READ name WRITE setName); - Q_PROPERTY(QStringList tables READ tables); - Q_PROPERTY(QString databaseName READ databaseName WRITE setDatabaseName); - Q_PROPERTY(QString driver READ driver WRITE setDriver); - Q_PROPERTY(QString connectOptions READ connectOptions WRITE setConnectOptions); - Q_PROPERTY(QString hostName READ hostName WRITE setHostName); - Q_PROPERTY(int port READ port WRITE setPort); - Q_PROPERTY(QString userName READ userName WRITE setUserName); - Q_PROPERTY(QString password READ password WRITE setPassword); - Q_PROPERTY(QString lastError READ lastError); + Q_PROPERTY(QString name READ name WRITE setName) + Q_PROPERTY(QStringList tables READ tables) + Q_PROPERTY(QString databaseName READ databaseName WRITE setDatabaseName) + Q_PROPERTY(QString driver READ driver WRITE setDriver) + Q_PROPERTY(QString connectOptions READ connectOptions WRITE setConnectOptions) + Q_PROPERTY(QString hostName READ hostName WRITE setHostName) + Q_PROPERTY(int port READ port WRITE setPort) + Q_PROPERTY(QString userName READ userName WRITE setUserName) + Q_PROPERTY(QString password READ password WRITE setPassword) + Q_PROPERTY(QString lastError READ lastError) Q_CLASSINFO("DefaultProperty", "name") public: QmlSqlConnection(QObject *parent = 0); diff --git a/src/declarative/extra/qnumberformat.h b/src/declarative/extra/qnumberformat.h index aa1e447..fba9872 100644 --- a/src/declarative/extra/qnumberformat.h +++ b/src/declarative/extra/qnumberformat.h @@ -74,18 +74,18 @@ public: }; //external property, only visible - Q_PROPERTY(QString text READ text NOTIFY textChanged); + Q_PROPERTY(QString text READ text NOTIFY textChanged) //mutatable properties to modify the output (text) - Q_PROPERTY(qreal number READ number WRITE setNumber); - Q_PROPERTY(QString format READ format WRITE setFormat); - Q_PROPERTY(QLocale locale READ locale WRITE setLocale); + Q_PROPERTY(qreal number READ number WRITE setNumber) + Q_PROPERTY(QString format READ format WRITE setFormat) + Q_PROPERTY(QLocale locale READ locale WRITE setLocale) //Format specific settings - Q_PROPERTY(unsigned short groupingSeparator READ groupingSeparator WRITE setGroupingSeparator); - Q_PROPERTY(unsigned short decimalSeperator READ decimalSeparator WRITE setDecimalSeparator); - Q_PROPERTY(unsigned int groupingSize READ groupingSize WRITE setGroupingSize); - Q_PROPERTY(unsigned short currencySymbol READ currencySymbol WRITE setCurrencySymbol); + Q_PROPERTY(unsigned short groupingSeparator READ groupingSeparator WRITE setGroupingSeparator) + Q_PROPERTY(unsigned short decimalSeperator READ decimalSeparator WRITE setDecimalSeparator) + Q_PROPERTY(unsigned int groupingSize READ groupingSize WRITE setGroupingSize) + Q_PROPERTY(unsigned short currencySymbol READ currencySymbol WRITE setCurrencySymbol) QString text() const { return _text; } diff --git a/src/declarative/fx/qfxanchors.h b/src/declarative/fx/qfxanchors.h index 8c3fe89..b3f2d3f 100644 --- a/src/declarative/fx/qfxanchors.h +++ b/src/declarative/fx/qfxanchors.h @@ -85,21 +85,21 @@ class Q_DECLARATIVE_EXPORT QFxAnchors : public QObject { Q_OBJECT - Q_PROPERTY(QFxAnchorLine left READ left WRITE setLeft RESET resetLeft); - Q_PROPERTY(QFxAnchorLine right READ right WRITE setRight RESET resetRight); - Q_PROPERTY(QFxAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter); - Q_PROPERTY(QFxAnchorLine top READ top WRITE setTop RESET resetTop); - Q_PROPERTY(QFxAnchorLine bottom READ bottom WRITE setBottom RESET resetBottom); - Q_PROPERTY(QFxAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter); - Q_PROPERTY(QFxAnchorLine baseline READ baseline WRITE setBaseline RESET resetBaseline); - Q_PROPERTY(int leftMargin READ leftMargin WRITE setLeftMargin NOTIFY leftMarginChanged); - Q_PROPERTY(int rightMargin READ rightMargin WRITE setRightMargin NOTIFY rightMarginChanged); - Q_PROPERTY(int horizontalCenterOffset READ horizontalCenterOffset WRITE setHorizontalCenterOffset NOTIFY horizontalCenterOffsetChanged()); - Q_PROPERTY(int topMargin READ topMargin WRITE setTopMargin NOTIFY topMarginChanged); - Q_PROPERTY(int bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged); - Q_PROPERTY(int verticalCenterOffset READ verticalCenterOffset WRITE setVerticalCenterOffset NOTIFY verticalCenterOffsetChanged()); - Q_PROPERTY(QFxItem *fill READ fill WRITE setFill); - Q_PROPERTY(QFxItem *centeredIn READ centeredIn WRITE setCenteredIn); + Q_PROPERTY(QFxAnchorLine left READ left WRITE setLeft RESET resetLeft) + Q_PROPERTY(QFxAnchorLine right READ right WRITE setRight RESET resetRight) + Q_PROPERTY(QFxAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter) + Q_PROPERTY(QFxAnchorLine top READ top WRITE setTop RESET resetTop) + Q_PROPERTY(QFxAnchorLine bottom READ bottom WRITE setBottom RESET resetBottom) + Q_PROPERTY(QFxAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter) + Q_PROPERTY(QFxAnchorLine baseline READ baseline WRITE setBaseline RESET resetBaseline) + Q_PROPERTY(int leftMargin READ leftMargin WRITE setLeftMargin NOTIFY leftMarginChanged) + Q_PROPERTY(int rightMargin READ rightMargin WRITE setRightMargin NOTIFY rightMarginChanged) + Q_PROPERTY(int horizontalCenterOffset READ horizontalCenterOffset WRITE setHorizontalCenterOffset NOTIFY horizontalCenterOffsetChanged()) + Q_PROPERTY(int topMargin READ topMargin WRITE setTopMargin NOTIFY topMarginChanged) + Q_PROPERTY(int bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged) + Q_PROPERTY(int verticalCenterOffset READ verticalCenterOffset WRITE setVerticalCenterOffset NOTIFY verticalCenterOffsetChanged()) + Q_PROPERTY(QFxItem *fill READ fill WRITE setFill) + Q_PROPERTY(QFxItem *centeredIn READ centeredIn WRITE setCenteredIn) public: QFxAnchors(QObject *parent=0); diff --git a/src/declarative/fx/qfxcomponentinstance.h b/src/declarative/fx/qfxcomponentinstance.h index 4b8c142..e749272 100644 --- a/src/declarative/fx/qfxcomponentinstance.h +++ b/src/declarative/fx/qfxcomponentinstance.h @@ -55,7 +55,7 @@ class Q_DECLARATIVE_EXPORT QFxComponentInstance : public QFxItem { Q_OBJECT Q_PROPERTY(QmlComponent *component READ component WRITE setComponent) - Q_PROPERTY(QFxItem *instance READ instance); + Q_PROPERTY(QFxItem *instance READ instance) Q_CLASSINFO("DefaultProperty", "component") public: QFxComponentInstance(QFxItem *parent=0); diff --git a/src/declarative/fx/qfxflickable.h b/src/declarative/fx/qfxflickable.h index dcbc6bb..77aaf50 100644 --- a/src/declarative/fx/qfxflickable.h +++ b/src/declarative/fx/qfxflickable.h @@ -58,8 +58,8 @@ class Q_DECLARATIVE_EXPORT QFxFlickable : public QFxItem Q_PROPERTY(bool overShoot READ overShoot WRITE setOverShoot) Q_PROPERTY(int viewportWidth READ viewportWidth WRITE setViewportWidth NOTIFY viewportWidthChanged) Q_PROPERTY(int viewportHeight READ viewportHeight WRITE setViewportHeight NOTIFY viewportHeightChanged) - Q_PROPERTY(qreal xPosition READ xPosition WRITE setXPosition NOTIFY positionChanged); - Q_PROPERTY(qreal yPosition READ yPosition WRITE setYPosition NOTIFY positionChanged); + Q_PROPERTY(qreal xPosition READ xPosition WRITE setXPosition NOTIFY positionChanged) + Q_PROPERTY(qreal yPosition READ yPosition WRITE setYPosition NOTIFY positionChanged) Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged) Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged) Q_PROPERTY(int velocityDecay READ velocityDecay WRITE setVelocityDecay NOTIFY velocityDecayChanged) @@ -68,17 +68,17 @@ class Q_DECLARATIVE_EXPORT QFxFlickable : public QFxItem Q_PROPERTY(DragMode dragMode READ dragMode WRITE setDragMode) Q_PROPERTY(qreal xVelocity READ xVelocity NOTIFY velocityChanged) Q_PROPERTY(qreal yVelocity READ yVelocity NOTIFY velocityChanged) - Q_PROPERTY(bool atXEnd READ isAtXEnd NOTIFY isAtBoundaryChanged); - Q_PROPERTY(bool atYEnd READ isAtYEnd NOTIFY isAtBoundaryChanged); - Q_PROPERTY(bool atXBeginning READ isAtXBeginning NOTIFY isAtBoundaryChanged); - Q_PROPERTY(bool atYBeginning READ isAtYBeginning NOTIFY isAtBoundaryChanged); - Q_PROPERTY(qreal pageXPosition READ pageXPosition NOTIFY pageChanged); - Q_PROPERTY(qreal pageYPosition READ pageYPosition NOTIFY pageChanged); - Q_PROPERTY(qreal pageWidth READ pageWidth NOTIFY pageChanged); - Q_PROPERTY(qreal pageHeight READ pageHeight NOTIFY pageChanged); - - Q_PROPERTY(QmlList* flickableData READ flickableData); - Q_PROPERTY(QmlList* flickableChildren READ flickableChildren); + Q_PROPERTY(bool atXEnd READ isAtXEnd NOTIFY isAtBoundaryChanged) + Q_PROPERTY(bool atYEnd READ isAtYEnd NOTIFY isAtBoundaryChanged) + Q_PROPERTY(bool atXBeginning READ isAtXBeginning NOTIFY isAtBoundaryChanged) + Q_PROPERTY(bool atYBeginning READ isAtYBeginning NOTIFY isAtBoundaryChanged) + Q_PROPERTY(qreal pageXPosition READ pageXPosition NOTIFY pageChanged) + Q_PROPERTY(qreal pageYPosition READ pageYPosition NOTIFY pageChanged) + Q_PROPERTY(qreal pageWidth READ pageWidth NOTIFY pageChanged) + Q_PROPERTY(qreal pageHeight READ pageHeight NOTIFY pageChanged) + + Q_PROPERTY(QmlList* flickableData READ flickableData) + Q_PROPERTY(QmlList* flickableChildren READ flickableChildren) Q_CLASSINFO("DefaultProperty", "flickableData") public: diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qfxflipable.h index be9e755..6630633 100644 --- a/src/declarative/fx/qfxflipable.h +++ b/src/declarative/fx/qfxflipable.h @@ -61,7 +61,7 @@ class Q_DECLARATIVE_EXPORT QFxFlipable : public QFxItem { Q_OBJECT - Q_ENUMS(Side); + Q_ENUMS(Side) Q_PROPERTY(QFxItem *front READ front WRITE setFront) Q_PROPERTY(QFxItem *back READ back WRITE setBack) Q_PROPERTY(QFxAxis *axis READ axis WRITE setAxis) diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h index 73f3046..1514451 100644 --- a/src/declarative/fx/qfxgridview.h +++ b/src/declarative/fx/qfxgridview.h @@ -54,21 +54,21 @@ class QFxGridViewPrivate; class Q_DECLARATIVE_EXPORT QFxGridView : public QFxFlickable { Q_OBJECT - Q_DECLARE_PRIVATE(QFxGridView); - - Q_PROPERTY(QVariant model READ model WRITE setModel); - Q_CLASSINFO("DefaultProperty", "delegate"); - Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate); - Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged); - Q_PROPERTY(QFxItem *current READ currentItem NOTIFY currentIndexChanged); - Q_PROPERTY(int count READ count NOTIFY countChanged); - Q_PROPERTY(QmlComponent *highlight READ highlight WRITE setHighlight); - Q_PROPERTY(bool autoHighlight READ autoHighlight WRITE setAutoHighlight); - Q_PROPERTY(Flow flow READ flow WRITE setFlow); - Q_PROPERTY(bool wrap READ isWrapEnabled WRITE setWrapEnabled); - Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer); - Q_PROPERTY(int cellWidth READ cellWidth WRITE setCellWidth NOTIFY cellSizeChanged); - Q_PROPERTY(int cellHeight READ cellHeight WRITE setCellHeight NOTIFY cellSizeChanged); + Q_DECLARE_PRIVATE(QFxGridView) + + Q_PROPERTY(QVariant model READ model WRITE setModel) + Q_CLASSINFO("DefaultProperty", "delegate") + Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate) + Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) + Q_PROPERTY(QFxItem *current READ currentItem NOTIFY currentIndexChanged) + Q_PROPERTY(int count READ count NOTIFY countChanged) + Q_PROPERTY(QmlComponent *highlight READ highlight WRITE setHighlight) + Q_PROPERTY(bool autoHighlight READ autoHighlight WRITE setAutoHighlight) + Q_PROPERTY(Flow flow READ flow WRITE setFlow) + Q_PROPERTY(bool wrap READ isWrapEnabled WRITE setWrapEnabled) + Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer) + Q_PROPERTY(int cellWidth READ cellWidth WRITE setCellWidth NOTIFY cellSizeChanged) + Q_PROPERTY(int cellHeight READ cellHeight WRITE setCellHeight NOTIFY cellSizeChanged) public: QFxGridView(QFxItem *parent=0); diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h index 778c10f..8ca1f9e 100644 --- a/src/declarative/fx/qfxitem.h +++ b/src/declarative/fx/qfxitem.h @@ -63,8 +63,8 @@ QT_MODULE(Declarative) class Q_DECLARATIVE_EXPORT QFxContents : public QObject { Q_OBJECT - Q_PROPERTY(int height READ height NOTIFY heightChanged); - Q_PROPERTY(int width READ width NOTIFY widthChanged); + Q_PROPERTY(int height READ height NOTIFY heightChanged) + Q_PROPERTY(int width READ width NOTIFY widthChanged) public: QFxContents(); diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h index 4aa9810..5dfb0e4 100644 --- a/src/declarative/fx/qfxlistview.h +++ b/src/declarative/fx/qfxlistview.h @@ -55,24 +55,24 @@ class QFxListViewPrivate; class Q_DECLARATIVE_EXPORT QFxListView : public QFxFlickable { Q_OBJECT - Q_DECLARE_PRIVATE(QFxListView); - - Q_ENUMS(CurrentItemPositioning); - Q_PROPERTY(QVariant model READ model WRITE setModel); - Q_CLASSINFO("DefaultProperty", "delegate"); - Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate); - Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged); - Q_PROPERTY(QFxItem *current READ currentItem NOTIFY currentIndexChanged); - Q_PROPERTY(int count READ count NOTIFY countChanged); - Q_PROPERTY(QmlComponent *highlight READ highlight WRITE setHighlight); - Q_PROPERTY(bool autoHighlight READ autoHighlight WRITE setAutoHighlight); - Q_PROPERTY(CurrentItemPositioning currentItemPositioning READ currentItemPositioning WRITE setCurrentItemPositioning); - Q_PROPERTY(int snapPosition READ snapPosition WRITE setSnapPosition); - Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation); - Q_PROPERTY(bool wrap READ isWrapEnabled WRITE setWrapEnabled); - Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer); - Q_PROPERTY(QString sectionExpression READ sectionExpression WRITE setSectionExpression NOTIFY sectionExpressionChanged); - Q_PROPERTY(QString currentSection READ currentSection NOTIFY currentSectionChanged); + Q_DECLARE_PRIVATE(QFxListView) + + Q_ENUMS(CurrentItemPositioning) + Q_PROPERTY(QVariant model READ model WRITE setModel) + Q_CLASSINFO("DefaultProperty", "delegate") + Q_PROPERTY(QmlComponent *delegate READ delegate WRITE setDelegate) + Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) + Q_PROPERTY(QFxItem *current READ currentItem NOTIFY currentIndexChanged) + Q_PROPERTY(int count READ count NOTIFY countChanged) + Q_PROPERTY(QmlComponent *highlight READ highlight WRITE setHighlight) + Q_PROPERTY(bool autoHighlight READ autoHighlight WRITE setAutoHighlight) + Q_PROPERTY(CurrentItemPositioning currentItemPositioning READ currentItemPositioning WRITE setCurrentItemPositioning) + Q_PROPERTY(int snapPosition READ snapPosition WRITE setSnapPosition) + Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation) + Q_PROPERTY(bool wrap READ isWrapEnabled WRITE setWrapEnabled) + Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer) + Q_PROPERTY(QString sectionExpression READ sectionExpression WRITE setSectionExpression NOTIFY sectionExpressionChanged) + Q_PROPERTY(QString currentSection READ currentSection NOTIFY currentSectionChanged) public: QFxListView(QFxItem *parent=0); diff --git a/src/declarative/fx/qfxpainteditem.h b/src/declarative/fx/qfxpainteditem.h index 997c324..e086894 100644 --- a/src/declarative/fx/qfxpainteditem.h +++ b/src/declarative/fx/qfxpainteditem.h @@ -60,8 +60,8 @@ public: QFxPaintedItem(QFxItem *parent=0); ~QFxPaintedItem(); - Q_PROPERTY(QSize contentsSize READ contentsSize WRITE setContentsSize); - Q_PROPERTY(bool smooth READ isSmooth WRITE setSmooth); + Q_PROPERTY(QSize contentsSize READ contentsSize WRITE setContentsSize) + Q_PROPERTY(bool smooth READ isSmooth WRITE setSmooth) #if defined(QFX_RENDER_QPAINTER) void paintContents(QPainter &painter); diff --git a/src/declarative/fx/qfxparticles.h b/src/declarative/fx/qfxparticles.h index 9f0d04c..6ef2582 100644 --- a/src/declarative/fx/qfxparticles.h +++ b/src/declarative/fx/qfxparticles.h @@ -128,15 +128,15 @@ public: qreal y_var; }; - Q_PROPERTY(int xvariance READ xVariance WRITE setXVariance); + Q_PROPERTY(int xvariance READ xVariance WRITE setXVariance) int xVariance() const { return int(_xvariance * 1000); } void setXVariance(int var) { _xvariance = var / 1000.0; } - Q_PROPERTY(int yvariance READ yVariance WRITE setYVariance); + Q_PROPERTY(int yvariance READ yVariance WRITE setYVariance) int yVariance() const { return int(_yvariance * 1000); } void setYVariance(int var) { _yvariance = var / 1000.0; } - Q_PROPERTY(int pace READ pace WRITE setPace); + Q_PROPERTY(int pace READ pace WRITE setPace) int pace() const { return int(_pace * 1000); } void setPace(int pace) { _pace = pace / 1000.0; } @@ -153,20 +153,20 @@ class Q_DECLARATIVE_EXPORT QFxParticles : public QFxItem { Q_OBJECT - Q_PROPERTY(QString source READ source WRITE setSource); - Q_PROPERTY(int count READ count WRITE setCount); - Q_PROPERTY(int lifeSpan READ lifeSpan WRITE setLifeSpan); - Q_PROPERTY(int lifeSpanDeviation READ lifeSpanDeviation WRITE setLifeSpanDeviation); - Q_PROPERTY(int fadeInDuration READ fadeInDuration WRITE setFadeInDuration); - Q_PROPERTY(int fadeOutDuration READ fadeOutDuration WRITE setFadeOutDuration); - Q_PROPERTY(qreal angle READ angle WRITE setAngle); - Q_PROPERTY(qreal angleDeviation READ angleDeviation WRITE setAngleDeviation); - Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity); - Q_PROPERTY(qreal velocityDeviation READ velocityDeviation WRITE setVelocityDeviation); - Q_PROPERTY(bool streamIn READ streamIn WRITE setStreamIn); - Q_PROPERTY(bool emitting READ emitting WRITE setEmitting); - Q_PROPERTY(QFxParticleMotion *motion READ motion WRITE setMotion); - Q_CLASSINFO("DefaultProperty", "motion"); + Q_PROPERTY(QString source READ source WRITE setSource) + Q_PROPERTY(int count READ count WRITE setCount) + Q_PROPERTY(int lifeSpan READ lifeSpan WRITE setLifeSpan) + Q_PROPERTY(int lifeSpanDeviation READ lifeSpanDeviation WRITE setLifeSpanDeviation) + Q_PROPERTY(int fadeInDuration READ fadeInDuration WRITE setFadeInDuration) + Q_PROPERTY(int fadeOutDuration READ fadeOutDuration WRITE setFadeOutDuration) + Q_PROPERTY(qreal angle READ angle WRITE setAngle) + Q_PROPERTY(qreal angleDeviation READ angleDeviation WRITE setAngleDeviation) + Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity) + Q_PROPERTY(qreal velocityDeviation READ velocityDeviation WRITE setVelocityDeviation) + Q_PROPERTY(bool streamIn READ streamIn WRITE setStreamIn) + Q_PROPERTY(bool emitting READ emitting WRITE setEmitting) + Q_PROPERTY(QFxParticleMotion *motion READ motion WRITE setMotion) + Q_CLASSINFO("DefaultProperty", "motion") public: QFxParticles(QFxItem *parent=0); diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h index 158aece..99ab2be 100644 --- a/src/declarative/fx/qfxtext.h +++ b/src/declarative/fx/qfxtext.h @@ -68,7 +68,7 @@ class Q_DECLARATIVE_EXPORT QFxText : public QFxItem Q_PROPERTY(VAlignment vAlign READ vAlign WRITE setVAlign) Q_PROPERTY(bool wrap READ wrap WRITE setWrap) Q_PROPERTY(Qt::TextElideMode elide READ elideMode WRITE setElideMode) - Q_PROPERTY(QString activeLink READ activeLink); + Q_PROPERTY(QString activeLink READ activeLink) Q_CLASSINFO("DefaultProperty", "text") public: diff --git a/src/declarative/qml/qmlbindablevalue.h b/src/declarative/qml/qmlbindablevalue.h index e50c154..c5bb97b 100644 --- a/src/declarative/qml/qmlbindablevalue.h +++ b/src/declarative/qml/qmlbindablevalue.h @@ -70,8 +70,8 @@ public: virtual void setTarget(const QmlMetaProperty &); QmlMetaProperty property() const; - Q_CLASSINFO("DefaultProperty", "expression"); - Q_PROPERTY(QString expression READ expression WRITE setExpression); + Q_CLASSINFO("DefaultProperty", "expression") + Q_PROPERTY(QString expression READ expression WRITE setExpression) virtual void setExpression(const QString &); void init(); 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* filter READ filter); - Q_PROPERTY(QList* 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* filter READ filter) + Q_PROPERTY(QList* 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* filter READ filter); - Q_PROPERTY(QList* 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* filter READ filter) + Q_PROPERTY(QList* 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* filter READ filter); - Q_PROPERTY(QList* 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* filter READ filter) + Q_PROPERTY(QList* 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 *animations READ animations); + Q_CLASSINFO("DefaultProperty", "animations") + Q_PROPERTY(QmlList *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* filter READ filter); - Q_PROPERTY(QList* 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* filter READ filter) + Q_PROPERTY(QList* 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* 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* 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 *data READ data SCRIPTABLE false); + Q_CLASSINFO("DefaultProperty", "data") + Q_PROPERTY(QmlList *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* 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* 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* states READ statesProperty DESIGNABLE false); - Q_PROPERTY(QmlList* transitions READ transitionsProperty DESIGNABLE false); + Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged) + Q_PROPERTY(QmlList* states READ statesProperty DESIGNABLE false) + Q_PROPERTY(QmlList* 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); -- cgit v0.12