From 94a698046c2c00a4627607db1f7099880643e829 Mon Sep 17 00:00:00 2001 From: Yann Bodson Date: Wed, 29 Apr 2009 15:22:28 +1000 Subject: Rename the 'src' attribute 'source'. Don't need to be HTML-like anymore. --- demos/declarative/calculator/CalcButton.qml | 4 ++-- demos/declarative/calculator/calculator.qml | 2 +- .../mediabrowser/content/MediaButton.qml | 4 ++-- .../mediabrowser/content/MoviesPathView.qml | 10 +++++----- demos/declarative/mediabrowser/content/Star.qml | 2 +- demos/declarative/mediabrowser/mediabrowser.qml | 4 ++-- .../webbrowser/content/RectSoftShadow.qml | 8 ++++---- demos/declarative/webbrowser/webbrowser.qml | 22 ++++++++++----------- examples/declarative/contacts/contacts.qml | 2 +- examples/declarative/dial/DialLibrary/Dial.qml | 8 ++++---- .../declarative/listview/content/MediaButton.qml | 4 ++-- examples/declarative/listview/recipes.qml | 6 +++--- examples/declarative/minehunt/Explosion.qml | 2 +- examples/declarative/minehunt/minehunt.qml | 16 +++++++-------- .../declarative/namespaces/lib/Chronos/Clock.qml | 2 +- examples/declarative/scrollbar/display.qml | 2 +- examples/declarative/slideswitch/Switch.qml | 4 ++-- .../1_Drawing_and_Animation/RemoveButton2.qml | 2 +- .../1_Drawing_and_Animation/RemoveButton3.qml | 4 ++-- .../1_Drawing_and_Animation/RemoveButton4.qml | 6 +++--- .../1_Drawing_and_Animation/RemoveButton5.qml | 6 +++--- .../tutorials/contacts/2_Reuse/ContactField1.qml | 2 +- .../tutorials/contacts/2_Reuse/ContactField2.qml | 2 +- .../tutorials/contacts/2_Reuse/ContactField3.qml | 2 +- .../tutorials/contacts/2_Reuse/ContactField4.qml | 2 +- .../tutorials/contacts/2_Reuse/FieldText3.qml | 4 ++-- .../tutorials/contacts/2_Reuse/FieldText4.qml | 4 ++-- .../tutorials/contacts/2_Reuse/RemoveButton1.qml | 6 +++--- .../tutorials/contacts/2_Reuse/RemoveButton2.qml | 6 +++--- .../tutorials/contacts/2_Reuse/RemoveButton3.qml | 6 +++--- .../tutorials/contacts/2_Reuse/RemoveButton4.qml | 6 +++--- .../tutorials/contacts/3_Collections/Button.qml | 2 +- .../contacts/3_Collections/ContactField.qml | 2 +- .../tutorials/contacts/3_Collections/FieldText.qml | 4 ++-- .../contacts/3_Collections/RemoveButton.qml | 6 +++--- .../tutorials/contacts/Final/Button.qml | 2 +- .../tutorials/contacts/Final/ContactField.qml | 2 +- .../tutorials/contacts/Final/FieldText.qml | 4 ++-- .../tutorials/contacts/Final/RemoveButton.qml | 6 +++--- .../tutorials/contacts/Final/SearchBar.qml | 2 +- .../tutorials/contacts/shared/contacts.sqlite | Bin 12288 -> 12288 bytes examples/declarative/velocity/Day.qml | 6 +++--- examples/declarative/xmldata/daringfireball.qml | 2 +- examples/declarative/xmldata/yahoonews.qml | 2 +- src/declarative/extra/qmlxmllistmodel.cpp | 4 ++-- src/declarative/extra/qmlxmllistmodel.h | 6 +++--- src/declarative/fx/qfxhighlightfilter.h | 2 +- src/declarative/fx/qfximage.h | 2 +- src/declarative/fx/qfxparticles.cpp | 4 ++-- src/declarative/fx/qfxparticles.h | 6 +++--- src/declarative/util/qmlscript.h | 2 +- 51 files changed, 113 insertions(+), 113 deletions(-) diff --git a/demos/declarative/calculator/CalcButton.qml b/demos/declarative/calculator/CalcButton.qml index f240000..f4ccdae 100644 --- a/demos/declarative/calculator/CalcButton.qml +++ b/demos/declarative/calculator/CalcButton.qml @@ -25,13 +25,13 @@ Item { Image { id: Image - src: "pics/button.sci" + source: "pics/button.sci" width: Button.width; height: Button.height } Image { id: ImagePressed - src: "pics/button-pressed.sci" + source: "pics/button-pressed.sci" width: Button.width; height: Button.height opacity: 0 } diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml index 1e7c30a..145435b 100644 --- a/demos/declarative/calculator/calculator.qml +++ b/demos/declarative/calculator/calculator.qml @@ -2,7 +2,7 @@ Rect { id: MainWindow; width: 320; height: 270; color: "black" - Script { src: "calculator.js" } + Script { source: "calculator.js" } VerticalLayout { spacing: 2; margin: 2 diff --git a/demos/declarative/mediabrowser/content/MediaButton.qml b/demos/declarative/mediabrowser/content/MediaButton.qml index c92305a..6c672ea 100644 --- a/demos/declarative/mediabrowser/content/MediaButton.qml +++ b/demos/declarative/mediabrowser/content/MediaButton.qml @@ -7,8 +7,8 @@ - - + + {Image.width} diff --git a/demos/declarative/mediabrowser/content/MoviesPathView.qml b/demos/declarative/mediabrowser/content/MoviesPathView.qml index a13437a..abc825b 100644 --- a/demos/declarative/mediabrowser/content/MoviesPathView.qml +++ b/demos/declarative/mediabrowser/content/MoviesPathView.qml @@ -30,11 +30,11 @@ - - - - - + + + + + diff --git a/demos/declarative/mediabrowser/content/Star.qml b/demos/declarative/mediabrowser/content/Star.qml index 1db29e8..37d314b 100644 --- a/demos/declarative/mediabrowser/content/Star.qml +++ b/demos/declarative/mediabrowser/content/Star.qml @@ -8,7 +8,7 @@ - + diff --git a/demos/declarative/mediabrowser/mediabrowser.qml b/demos/declarative/mediabrowser/mediabrowser.qml index df7baa9..3e22de4 100644 --- a/demos/declarative/mediabrowser/mediabrowser.qml +++ b/demos/declarative/mediabrowser/mediabrowser.qml @@ -5,11 +5,11 @@ - + - + diff --git a/demos/declarative/webbrowser/content/RectSoftShadow.qml b/demos/declarative/webbrowser/content/RectSoftShadow.qml index 0235842..2b39422 100644 --- a/demos/declarative/webbrowser/content/RectSoftShadow.qml +++ b/demos/declarative/webbrowser/content/RectSoftShadow.qml @@ -1,10 +1,10 @@ - - - - diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 7618f4d..cf96b3f 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -18,8 +18,8 @@ - - + + @@ -30,7 +30,7 @@ ? -Flick.xPosition+Flick.viewportWidth-Flick.width : 0}" y="{Flick.yPosition < 0 ? -Flick.yPosition : progressOff*(Flick.yPosition>height?-height:-Flick.yPosition)}" - height="64" src="content/pics/header.png"> + height="64" source="content/pics/header.png"> - - + + + height="43" source="content/pics/footer.sci"> - - + + @@ -126,11 +126,11 @@ - + - - + + diff --git a/examples/declarative/contacts/contacts.qml b/examples/declarative/contacts/contacts.qml index fa50010..f9901ed 100644 --- a/examples/declarative/contacts/contacts.qml +++ b/examples/declarative/contacts/contacts.qml @@ -24,7 +24,7 @@ Rect { } Image { id: portraitPic - src: portrait + source: portrait x: 10 y: 10 } diff --git a/examples/declarative/dial/DialLibrary/Dial.qml b/examples/declarative/dial/DialLibrary/Dial.qml index 8336a70..fe8528d 100644 --- a/examples/declarative/dial/DialLibrary/Dial.qml +++ b/examples/declarative/dial/DialLibrary/Dial.qml @@ -8,14 +8,14 @@ Item { } Image { id: Background - src: "background.svg" + source: "background.svg" } Item { x: 104 y: 102 rotation: Needle.rotation Image { - src: "needle_shadow.svg" + source: "needle_shadow.svg" x: -104 y: -102 } @@ -31,12 +31,12 @@ Item { source: Math.min(Math.max(-130, value*2.2 - 130), 133) } Image { - src: "needle.svg" + source: "needle.svg" x: -102 y: -98 } } Image { - src: "overlay.svg" + source: "overlay.svg" } } diff --git a/examples/declarative/listview/content/MediaButton.qml b/examples/declarative/listview/content/MediaButton.qml index c92305a..6c672ea 100644 --- a/examples/declarative/listview/content/MediaButton.qml +++ b/examples/declarative/listview/content/MediaButton.qml @@ -7,8 +7,8 @@ - - + + {Image.width} diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml index 0f6324f..db8604e 100644 --- a/examples/declarative/listview/recipes.qml +++ b/examples/declarative/listview/recipes.qml @@ -54,7 +54,7 @@ Rect { width: parent.width Image { id: recipePic - src: picture + source: picture width: 48 height: 48 } @@ -115,13 +115,13 @@ Rect { Image { anchors.right: flick.right anchors.top: flick.top - src: "content/pics/moreUp.png" + source: "content/pics/moreUp.png" opacity: flick.atYBeginning ? 0 : 1 } Image { anchors.right: flick.right anchors.bottom: flick.bottom - src: "content/pics/moreDown.png" + source: "content/pics/moreDown.png" opacity: flick.atYEnd ? 0 : 1 } } diff --git a/examples/declarative/minehunt/Explosion.qml b/examples/declarative/minehunt/Explosion.qml index 1e4f03d..8d868bc 100644 --- a/examples/declarative/minehunt/Explosion.qml +++ b/examples/declarative/minehunt/Explosion.qml @@ -9,7 +9,7 @@ Item { height: 21 lifeSpan: 3600000 lifeSpanDeviation: 0 - src: "pics/star.png" + source: "pics/star.png" count: 200 angle: 270 angleDeviation: 360 diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml index 20c3874..0da29b4 100644 --- a/examples/declarative/minehunt/minehunt.qml +++ b/examples/declarative/minehunt/minehunt.qml @@ -10,10 +10,10 @@ - + + source="pics/flag.png" opacity="{modelData.hasFlag}"> @@ -23,12 +23,12 @@ - + + source="pics/bomb.png" opacity="{modelData.hasMine}"/> @@ -50,7 +50,7 @@ - + @@ -61,12 +61,12 @@ In play: - + - + - + diff --git a/examples/declarative/namespaces/lib/Chronos/Clock.qml b/examples/declarative/namespaces/lib/Chronos/Clock.qml index 088a45c..959d193 100644 --- a/examples/declarative/namespaces/lib/Chronos/Clock.qml +++ b/examples/declarative/namespaces/lib/Chronos/Clock.qml @@ -1,6 +1,6 @@ - + diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml index 4412d7f..42e8f25 100644 --- a/examples/declarative/scrollbar/display.qml +++ b/examples/declarative/scrollbar/display.qml @@ -7,7 +7,7 @@ Rect { anchors.fill: parent Image { id: Picture - src: "pics/niagara_falls.jpg" + source: "pics/niagara_falls.jpg" } viewportWidth: Picture.width viewportHeight: Picture.height diff --git a/examples/declarative/slideswitch/Switch.qml b/examples/declarative/slideswitch/Switch.qml index f62e4b6..a3f75e8 100644 --- a/examples/declarative/slideswitch/Switch.qml +++ b/examples/declarative/slideswitch/Switch.qml @@ -31,7 +31,7 @@ Item { } Image { id: Groove - src: "background.svg" + source: "background.svg" } MouseRegion { anchors.fill: Groove @@ -39,7 +39,7 @@ Item { } Image { id: Knob - src: "knob.svg" + source: "knob.svg" x: 1 y: 2 } diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml index 2ba488d..77ff616 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml @@ -6,5 +6,5 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/trash.png"/> + source="../shared/pics/trash.png"/> diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml index 9a364c5..0431f59 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml @@ -6,12 +6,12 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png"/> + source="../shared/pics/cancel.png"/> + source="../shared/pics/ok.png"/> - diff --git a/examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml b/examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml index 7ec3e4d..dd3e85c 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml @@ -14,7 +14,7 @@ font.bold="true" color="black" text="123123"/> - diff --git a/examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml b/examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml index cef25ce..c9be130 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml @@ -21,7 +21,7 @@ + source="{contactField.icon}"/> diff --git a/examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml b/examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml index 13ccbc0..b1c22cd 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml @@ -20,7 +20,7 @@ + source="{contactField.icon}"/> diff --git a/examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml b/examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml index 97c0772..1fa99b1 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml @@ -34,13 +34,13 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"/> + source="{contactField.icon}"/> diff --git a/examples/declarative/tutorials/contacts/3_Collections/FieldText.qml b/examples/declarative/tutorials/contacts/3_Collections/FieldText.qml index 583c73e..6573ce2 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/FieldText.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/FieldText.qml @@ -39,13 +39,13 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"/> + source="{contactField.icon}"/> diff --git a/examples/declarative/tutorials/contacts/Final/FieldText.qml b/examples/declarative/tutorials/contacts/Final/FieldText.qml index a82cecd..38ad026 100644 --- a/examples/declarative/tutorials/contacts/Final/FieldText.qml +++ b/examples/declarative/tutorials/contacts/Final/FieldText.qml @@ -39,13 +39,13 @@ width="22" height="22" anchors.right="{parent.right}" anchors.rightMargin="4" anchors.verticalCenter="{parent.verticalCenter}" - src="../shared/pics/cancel.png" + source="../shared/pics/cancel.png" opacity="0"/> + source="../shared/pics/search.png"/> - + @@ -13,13 +13,13 @@ - + - + diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml index cfd0a98..5e98d1b 100644 --- a/examples/declarative/xmldata/daringfireball.qml +++ b/examples/declarative/xmldata/daringfireball.qml @@ -1,6 +1,6 @@ - declare default element namespace 'http://www.w3.org/2005/Atom'; diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml index 80ace18..32a706e 100644 --- a/examples/declarative/xmldata/yahoonews.qml +++ b/examples/declarative/xmldata/yahoonews.qml @@ -1,6 +1,6 @@ - + diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp index 562a1c8..91c8139 100644 --- a/src/declarative/extra/qmlxmllistmodel.cpp +++ b/src/declarative/extra/qmlxmllistmodel.cpp @@ -192,13 +192,13 @@ QString QmlXmlListModel::toString(int role) const return d->roleNames.at(index); } -QString QmlXmlListModel::src() const +QString QmlXmlListModel::source() const { Q_D(const QmlXmlListModel); return d->src; } -void QmlXmlListModel::setSrc(const QString &src) +void QmlXmlListModel::setSource(const QString &src) { Q_D(QmlXmlListModel); d->src = src; diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h index a8f3087..d06cabf 100644 --- a/src/declarative/extra/qmlxmllistmodel.h +++ b/src/declarative/extra/qmlxmllistmodel.h @@ -90,7 +90,7 @@ class Q_DECLARATIVE_EXPORT QmlXmlListModel : public QListModelInterface, public Q_OBJECT Q_INTERFACES(QmlParserStatus) - Q_PROPERTY(QString src READ src WRITE setSrc) + Q_PROPERTY(QString source READ source WRITE setSource) Q_PROPERTY(QString query READ query WRITE setQuery) Q_PROPERTY(QString namespaceDeclarations READ namespaceDeclarations WRITE setNamespaceDeclarations) Q_PROPERTY(QmlList *roles READ roleObjects) @@ -106,8 +106,8 @@ public: QmlList *roleObjects(); - QString src() const; - void setSrc(const QString&); + QString source() const; + void setSource(const QString&); QString query() const; void setQuery(const QString&); diff --git a/src/declarative/fx/qfxhighlightfilter.h b/src/declarative/fx/qfxhighlightfilter.h index 6204242..218f4e1 100644 --- a/src/declarative/fx/qfxhighlightfilter.h +++ b/src/declarative/fx/qfxhighlightfilter.h @@ -56,7 +56,7 @@ class Q_DECLARATIVE_EXPORT QFxHighlightFilter : public QSimpleCanvasFilter { Q_OBJECT - Q_PROPERTY(QString src READ source WRITE setSource NOTIFY sourceChanged) + Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(bool tiled READ tiled WRITE setTiled NOTIFY tiledChanged) Q_PROPERTY(int xOffset READ xOffset WRITE setXOffset NOTIFY offsetChanged) Q_PROPERTY(int yOffset READ yOffset WRITE setYOffset NOTIFY offsetChanged) diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h index 4eed0ef..37fe5be 100644 --- a/src/declarative/fx/qfximage.h +++ b/src/declarative/fx/qfximage.h @@ -57,7 +57,7 @@ class Q_DECLARATIVE_EXPORT QFxImage : public QFxItem Q_ENUMS(Status) Q_PROPERTY(Status status READ status NOTIFY statusChanged) - Q_PROPERTY(QString src READ source WRITE setSource NOTIFY sourceChanged) + Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(QFxScaleGrid *scaleGrid READ scaleGrid) Q_PROPERTY(bool tile READ isTiled WRITE setTiled) diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp index 309ebe8..b6b4c85 100644 --- a/src/declarative/fx/qfxparticles.cpp +++ b/src/declarative/fx/qfxparticles.cpp @@ -576,7 +576,7 @@ QFxParticles::~QFxParticles() \property QFxParticles::src \brief the URL of the particle image. */ -QString QFxParticles::url() const +QString QFxParticles::source() const { Q_D(const QFxParticles); return d->source; @@ -593,7 +593,7 @@ void QFxParticles::imageLoaded() update(); } -void QFxParticles::setUrl(const QString &name) +void QFxParticles::setSource(const QString &name) { Q_D(QFxParticles); diff --git a/src/declarative/fx/qfxparticles.h b/src/declarative/fx/qfxparticles.h index d9c810d..0696e60 100644 --- a/src/declarative/fx/qfxparticles.h +++ b/src/declarative/fx/qfxparticles.h @@ -153,7 +153,7 @@ class Q_DECLARATIVE_EXPORT QFxParticles : public QFxItem { Q_OBJECT - Q_PROPERTY(QString src READ url WRITE setUrl); + 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); @@ -172,8 +172,8 @@ public: QFxParticles(QFxItem *parent=0); ~QFxParticles(); - QString url() const; - void setUrl(const QString &); + QString source() const; + void setSource(const QString &); int count() const; void setCount(int cnt); diff --git a/src/declarative/util/qmlscript.h b/src/declarative/util/qmlscript.h index fc038b4..8047a88 100644 --- a/src/declarative/util/qmlscript.h +++ b/src/declarative/util/qmlscript.h @@ -58,7 +58,7 @@ class Q_DECLARATIVE_EXPORT QmlScript : public QObject Q_DECLARE_PRIVATE(QmlScript); Q_PROPERTY(QString script READ script WRITE setScript); - Q_PROPERTY(QString src READ source WRITE setSource); + Q_PROPERTY(QString source READ source WRITE setSource); Q_CLASSINFO("DefaultProperty", "script"); public: -- cgit v0.12