diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-05-26 23:05:28 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-05-26 23:05:28 (GMT) |
commit | d15db788de792815a35547059921d3305d48c119 (patch) | |
tree | cc599d805ac076fa0a67c00c4e1cd27da0307cde /src/declarative/fx | |
parent | a43ea2e6f5feffa44119a54e25a9fffdd435c389 (diff) | |
download | Qt-d15db788de792815a35547059921d3305d48c119.zip Qt-d15db788de792815a35547059921d3305d48c119.tar.gz Qt-d15db788de792815a35547059921d3305d48c119.tar.bz2 |
Remove more unneeded semicolons.
Diffstat (limited to 'src/declarative/fx')
-rw-r--r-- | src/declarative/fx/qfxanchors.h | 30 | ||||
-rw-r--r-- | src/declarative/fx/qfxcomponentinstance.h | 2 | ||||
-rw-r--r-- | src/declarative/fx/qfxflickable.h | 26 | ||||
-rw-r--r-- | src/declarative/fx/qfxflipable.h | 2 | ||||
-rw-r--r-- | src/declarative/fx/qfxgridview.h | 30 | ||||
-rw-r--r-- | src/declarative/fx/qfxitem.h | 4 | ||||
-rw-r--r-- | src/declarative/fx/qfxlistview.h | 36 | ||||
-rw-r--r-- | src/declarative/fx/qfxpainteditem.h | 4 | ||||
-rw-r--r-- | src/declarative/fx/qfxparticles.h | 34 | ||||
-rw-r--r-- | src/declarative/fx/qfxtext.h | 2 |
10 files changed, 85 insertions, 85 deletions
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<QObject *>* flickableData READ flickableData); - Q_PROPERTY(QmlList<QFxItem *>* 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<QObject *>* flickableData READ flickableData) + Q_PROPERTY(QmlList<QFxItem *>* 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: |