summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/declarative/extra/qfxanimatedimageitem.cpp2
-rw-r--r--src/declarative/extra/qfxparticles.cpp4
-rw-r--r--src/declarative/extra/qmlbehaviour.cpp2
-rw-r--r--src/declarative/fx/qfxcomponentinstance.cpp2
-rw-r--r--src/declarative/fx/qfxflickable.cpp2
-rw-r--r--src/declarative/fx/qfxgridview.cpp2
-rw-r--r--src/declarative/fx/qfxitem.cpp46
-rw-r--r--src/declarative/fx/qfxmouseregion.cpp4
-rw-r--r--src/declarative/fx/qfxpositioners.cpp22
-rw-r--r--src/declarative/fx/qfxrect.cpp68
-rw-r--r--src/declarative/fx/qfxvisualitemmodel.cpp6
-rw-r--r--src/declarative/qml/qmlcomponent.cpp2
-rw-r--r--src/declarative/qml/qmldom.cpp100
-rw-r--r--src/declarative/qml/qmlengine.cpp2
-rw-r--r--src/declarative/util/qmlanimation.cpp8
-rw-r--r--src/declarative/util/qmlfollow.cpp4
-rw-r--r--src/declarative/util/qmlpalette.cpp2
17 files changed, 139 insertions, 139 deletions
diff --git a/src/declarative/extra/qfxanimatedimageitem.cpp b/src/declarative/extra/qfxanimatedimageitem.cpp
index daacdac..d366111 100644
--- a/src/declarative/extra/qfxanimatedimageitem.cpp
+++ b/src/declarative/extra/qfxanimatedimageitem.cpp
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
Item {
width: anim.width; height: anim.height+8
AnimatedImage { id: anim; source: "pics/games-anim.gif" }
- Rect { color: "red"; width: 4; height: 8; y: anim.height
+ Rectangle { color: "red"; width: 4; height: 8; y: anim.height
x: (anim.width-width)*anim.currentFrame/(anim.frameCount-1)
}
}
diff --git a/src/declarative/extra/qfxparticles.cpp b/src/declarative/extra/qfxparticles.cpp
index 2380655..ec15099 100644
--- a/src/declarative/extra/qfxparticles.cpp
+++ b/src/declarative/extra/qfxparticles.cpp
@@ -238,7 +238,7 @@ void QFxParticleMotionGravity::advance(QFxParticle &p, int interval)
The code below produces an effect similar to falling snow.
\qml
-Rect {
+Rectangle {
width: 240
height: 320
color: "black"
@@ -546,7 +546,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Particles,QFxParticles)
the lower one has particles expelled up like a fountain.
\qml
-Rect {
+Rectangle {
width: 240
height: 320
color: "black"
diff --git a/src/declarative/extra/qmlbehaviour.cpp b/src/declarative/extra/qmlbehaviour.cpp
index 052225a..767f1ed 100644
--- a/src/declarative/extra/qmlbehaviour.cpp
+++ b/src/declarative/extra/qmlbehaviour.cpp
@@ -107,7 +107,7 @@ public:
In example below, the rect will use a bounce easing curve over 200 millisecond for any changes to its y property:
\code
- Rect {
+ Rectangle {
width: 20; height: 20
color: "#00ff00"
y: 200 //initial value
diff --git a/src/declarative/fx/qfxcomponentinstance.cpp b/src/declarative/fx/qfxcomponentinstance.cpp
index f38d170..def7a9f 100644
--- a/src/declarative/fx/qfxcomponentinstance.cpp
+++ b/src/declarative/fx/qfxcomponentinstance.cpp
@@ -63,7 +63,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ComponentInstance,QFxComponentIn
Item {
Component {
id: RedSquare
- Rect { color: "red"; width: 10; height: 10 }
+ Rectangle { color: "red"; width: 10; height: 10 }
}
ComponentInstance { component: RedSquare }
diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp
index 1cb8336..428815a 100644
--- a/src/declarative/fx/qfxflickable.cpp
+++ b/src/declarative/fx/qfxflickable.cpp
@@ -445,7 +445,7 @@ bool QFxFlickable::isAtYBeginning() const
These properties are typically used to draw a scrollbar, for example:
\code
- Rect {
+ Rectangle {
opacity: 0.5; anchors.right: MyListView.right-2; width: 6
y: MyListView.pageYPosition * MyListView.height
height: MyListView.pageHeight * MyListView.height
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index 28f2219..b445e49 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qfxgridview.cpp
@@ -878,7 +878,7 @@ void QFxGridView::setHighlight(QmlComponent *highlight)
\code
Component {
id: Highlight
- Rect {
+ Rectangle {
id: Wrapper; color: "lightsteelblue"; radius: 4; width: 320; height: 60 >
y: Follow { source: Wrapper.GridView.view.current.y; spring: 3; damping: 0.2 }
x: Follow { source: Wrapper.GridView.view.current.x; spring: 3; damping: 0.2 }
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 4ec0a85..83b4eb5 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -90,7 +90,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation,QGraphicsRotation)
The following example scales the X axis of the Rect, relative to its interior point 25, 25:
\qml
- Rect {
+ Rectangle {
width: 100; height: 100
color: "blue"
transform: Scale { origin.x: 25; origin.y: 25; xScale: 3}
@@ -123,7 +123,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation,QGraphicsRotation)
The following example rotates a Rect around its interior point 25, 25:
\qml
- Rect {
+ Rectangle {
width: 100; height: 100
color: "blue"
transform: Rotation { origin.x: 25; origin.y: 25; angle: 45}
@@ -1026,7 +1026,7 @@ QFxItem *QFxItem::parentItem() const
Item {
children: [
Text {},
- Rect {}
+ Rectangle {}
]
resources: [
Component {
@@ -1230,7 +1230,7 @@ void QFxItemPrivate::transform_clear()
\qml
Item {
Text {}
- Rect {}
+ Rectangle {}
Script {}
}
\endqml
@@ -1240,7 +1240,7 @@ void QFxItemPrivate::transform_clear()
Item {
children: [
Text {},
- Rect {}
+ Rectangle {}
]
resources: [
Script {}
@@ -1339,11 +1339,11 @@ void QFxItem::setClip(bool c)
\o Same \c z - later children above earlier children:
\qml
Item {
- Rect {
+ Rectangle {
color: "red"
width: 100; height: 100
}
- Rect {
+ Rectangle {
color: "blue"
x: 50; y: 50; width: 100; height: 100
}
@@ -1354,12 +1354,12 @@ void QFxItem::setClip(bool c)
\o Higher \c z on top:
\qml
Item {
- Rect {
+ Rectangle {
z: 1
color: "red"
width: 100; height: 100
}
- Rect {
+ Rectangle {
color: "blue"
x: 50; y: 50; width: 100; height: 100
}
@@ -1370,10 +1370,10 @@ void QFxItem::setClip(bool c)
\o Same \c z - children above parents:
\qml
Item {
- Rect {
+ Rectangle {
color: "red"
width: 100; height: 100
- Rect {
+ Rectangle {
color: "blue"
x: 50; y: 50; width: 100; height: 100
}
@@ -1385,10 +1385,10 @@ void QFxItem::setClip(bool c)
\o Lower \c z below:
\qml
Item {
- Rect {
+ Rectangle {
color: "red"
width: 100; height: 100
- Rect {
+ Rectangle {
z: -1
color: "blue"
x: 50; y: 50; width: 100; height: 100
@@ -1717,14 +1717,14 @@ void QFxItem::setBaselineOffset(qreal offset)
\o \image declarative-rotation.png
\o
\qml
- Rect {
+ Rectangle {
color: "blue"
width: 100; height: 100
- Rect {
+ Rectangle {
color: "green"
width: 25; height: 25
}
- Rect {
+ Rectangle {
color: "red"
x: 25; y: 25; width: 50; height: 50
rotation: 30
@@ -1753,14 +1753,14 @@ void QFxItem::setBaselineOffset(qreal offset)
\o \image declarative-scale.png
\o
\qml
- Rect {
+ Rectangle {
color: "blue"
width: 100; height: 100
- Rect {
+ Rectangle {
color: "green"
width: 25; height: 25
}
- Rect {
+ Rectangle {
color: "red"
x: 25; y: 25; width: 50; height: 50
scale: 1.4
@@ -1787,10 +1787,10 @@ void QFxItem::setBaselineOffset(qreal offset)
\o
\qml
Item {
- Rect {
+ Rectangle {
color: "red"
width: 100; height: 100
- Rect {
+ Rectangle {
color: "blue"
x: 50; y: 50; width: 100; height: 100
}
@@ -1802,11 +1802,11 @@ void QFxItem::setBaselineOffset(qreal offset)
\o
\qml
Item {
- Rect {
+ Rectangle {
opacity: 0.5
color: "red"
width: 100; height: 100
- Rect {
+ Rectangle {
color: "blue"
x: 50; y: 50; width: 100; height: 100
}
diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp
index 858764a..011ee43 100644
--- a/src/declarative/fx/qfxmouseregion.cpp
+++ b/src/declarative/fx/qfxmouseregion.cpp
@@ -126,8 +126,8 @@ void QFxDrag::setYmax(qreal m)
A MouseRegion is typically used in conjunction with a visible item,
where the MouseRegion effectively 'proxies' mouse handling for that
- item. For example, we can put a MouseRegion in a Rect that changes
- the Rect color to red when clicked:
+ item. For example, we can put a MouseRegion in a Rectangle that changes
+ the Rectangle color to red when clicked:
\snippet doc/src/snippets/declarative/mouseregion.qml 0
Many MouseRegion signals pass a \l {MouseEvent}{mouse} parameter that contains
diff --git a/src/declarative/fx/qfxpositioners.cpp b/src/declarative/fx/qfxpositioners.cpp
index 1eb88fe..7f731cf 100644
--- a/src/declarative/fx/qfxpositioners.cpp
+++ b/src/declarative/fx/qfxpositioners.cpp
@@ -335,9 +335,9 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,VerticalPositioner,QFxVerticalPo
\qml
VerticalPositioner {
spacing: 2
- Rect { color: "red"; width: 50; height: 50 }
- Rect { color: "green"; width: 20; height: 50 }
- Rect { color: "blue"; width: 50; height: 20 }
+ Rectangle { color: "red"; width: 50; height: 50 }
+ Rectangle { color: "green"; width: 20; height: 50 }
+ Rectangle { color: "blue"; width: 50; height: 20 }
}
\endqml
\endtable
@@ -519,9 +519,9 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,HorizontalPositioner,QFxHorizont
\qml
HorizontalPositioner {
spacing: 2
- Rect { color: "red"; width: 50; height: 50 }
- Rect { color: "green"; width: 20; height: 50 }
- Rect { color: "blue"; width: 50; height: 20 }
+ Rectangle { color: "red"; width: 50; height: 50 }
+ Rectangle { color: "green"; width: 20; height: 50 }
+ Rectangle { color: "blue"; width: 50; height: 20 }
}
\endqml
\image horizontalpositioner_example.png
@@ -684,11 +684,11 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,GridPositioner,QFxGridPositioner
GridPositioner {
columns: 3
spacing: 2
- Rect { color: "red"; width: 50; height: 50 }
- Rect { color: "green"; width: 20; height: 50 }
- Rect { color: "blue"; width: 50; height: 20 }
- Rect { color: "cyan"; width: 50; height: 50 }
- Rect { color: "magenta"; width: 10; height: 10 }
+ Rectangle { color: "red"; width: 50; height: 50 }
+ Rectangle { color: "green"; width: 20; height: 50 }
+ Rectangle { color: "blue"; width: 50; height: 20 }
+ Rectangle { color: "cyan"; width: 50; height: 50 }
+ Rectangle { color: "magenta"; width: 10; height: 10 }
}
\endqml
\endtable
diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp
index 3a7e350..a9418e2 100644
--- a/src/declarative/fx/qfxrect.cpp
+++ b/src/declarative/fx/qfxrect.cpp
@@ -52,7 +52,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Gradient,QFxGradient)
/*!
\internal
\class QFxPen
- \brief The QFxPen class provides a pen used for drawing rect borders on a QFxView.
+ \brief The QFxPen class provides a pen used for drawing rectangle borders on a QFxView.
By default, the pen is invalid and nothing is drawn. You must either set a color (then the default
width is 1) or a width (then the default color is black).
@@ -61,7 +61,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Gradient,QFxGradient)
Example:
\qml
- Rect { border.width: 2; border.color: "red" ... }
+ Rectangle { border.width: 2; border.color: "red" ... }
\endqml
*/
@@ -107,8 +107,8 @@ void QFxGradientStop::updateGradient()
A gradient is defined by two or more colors, which will be blended seemlessly. The
colors are specified at their position in the range 0.0 - 1.0 via
the GradientStop item. For example, the following code paints a
- Rect with a gradient starting with red, blending to yellow at 1/3 of the
- size of the Rect, and ending with Green:
+ rectangle with a gradient starting with red, blending to yellow at 1/3 of the
+ size of the rectangle, and ending with Green:
\table
\row
@@ -145,18 +145,18 @@ void QFxGradient::doUpdate()
emit updated();
}
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rect,QFxRect)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rectangle,QFxRect)
/*!
- \qmlclass Rect QFxRect
- \brief The Rect item allows you to add rectangles to a scene.
+ \qmlclass Rectangle QFxRect
+ \brief The Rectangle item allows you to add rectangles to a scene.
\inherits Item
- A Rect is painted having a solid fill (color) and an optional border (pen).
+ A Rectangle is painted having a solid fill (color) and an optional border.
You can also create rounded rectangles using the radius property.
\qml
- Rect {
+ Rectangle {
width: 100
height: 100
color: "red"
@@ -172,7 +172,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rect,QFxRect)
/*!
\internal
\class QFxRect
- \brief The QFxRect class provides a rect item that you can add to a QFxView.
+ \brief The QFxRect class provides a rectangle item that you can add to a QFxView.
*/
QFxRect::QFxRect(QFxItem *parent)
: QFxItem(*(new QFxRectPrivate), parent)
@@ -200,14 +200,14 @@ void QFxRect::doUpdate()
}
/*!
- \qmlproperty int Rect::border.width
- \qmlproperty color Rect::border.color
+ \qmlproperty int Rectangle::border.width
+ \qmlproperty color Rectangle::border.color
- The width and color used to draw the border of the rect.
+ The width and color used to draw the border of the rectangle.
A width of 1 creates a thin line. For no line, use a width of 0 or a transparent color.
- To keep the border smooth (rather than blurry), odd widths cause the rect to be painted at
+ To keep the border smooth (rather than blurry), odd widths cause the rectangle to be painted at
a half-pixel offset;
*/
QFxPen *QFxRect::border()
@@ -217,26 +217,26 @@ QFxPen *QFxRect::border()
}
/*!
- \qmlproperty Gradient Rect::gradient
+ \qmlproperty Gradient Rectangle::gradient
- The gradient to use to fill the rect.
+ The gradient to use to fill the rectangle.
This property allows for the construction of simple vertical gradients.
- Other gradients may by formed by adding rotation to the rect.
+ Other gradients may by formed by adding rotation to the rectangle.
\table
\row
\o \image declarative-rect_gradient.png
\o
\qml
- Rect { y: 0; width: 80; height: 80; color: "lightsteelblue" }
- Rect { y: 100; width: 80; height: 80
+ Rectangle { y: 0; width: 80; height: 80; color: "lightsteelblue" }
+ Rectangle { y: 100; width: 80; height: 80
gradient: Gradient {
GradientStop { position: 0.0; color: "lightsteelblue" }
GradientStop { position: 1.0; color: "blue" }
}
}
- Rect { rotation: 90; x: 80; y: 200; width: 80; height: 80
+ Rectangle { rotation: 90; x: 80; y: 200; width: 80; height: 80
gradient: Gradient {
GradientStop { position: 0.0; color: "lightsteelblue" }
GradientStop { position: 1.0; color: "blue" }
@@ -271,10 +271,10 @@ void QFxRect::setGradient(QFxGradient *gradient)
/*!
- \qmlproperty real Rect::radius
- This property holds the corner radius used to draw a rounded rect.
+ \qmlproperty real Rectangle::radius
+ This property holds the corner radius used to draw a rounded rectangle.
- If radius is non-zero, the rect will be painted as a rounded rectangle, otherwise it will be
+ If radius is non-zero, the rectangle will be painted as a rounded rectangle, otherwise it will be
painted as a normal rectangle. The same radius is used by all 4 corners; there is currently
no way to specify different radii for different corners.
*/
@@ -296,15 +296,15 @@ void QFxRect::setRadius(qreal radius)
}
/*!
- \qmlproperty color Rect::color
- This property holds the color used to fill the rect.
+ \qmlproperty color Rectangle::color
+ This property holds the color used to fill the rectangle.
\qml
- // green rect using hexidecimal notation
- Rect { color: "#00FF00" }
+ // green rectangle using hexidecimal notation
+ Rectangle { color: "#00FF00" }
- // steelblue rect using SVG color name
- Rect { color: "steelblue" }
+ // steelblue rectangle using SVG color name
+ Rectangle { color: "steelblue" }
\endqml
The default color is white.
@@ -329,14 +329,14 @@ void QFxRect::setColor(const QColor &c)
}
/*!
- \qmlproperty color Rect::tintColor
+ \qmlproperty color Rectangle::tintColor
This property holds The color to tint the rectangle.
- This color will be drawn over the rect's color when the rect is painted. The tint color should usually be mostly transparent, or you will not be able to see the underlying color. The below example provides a slight red tint by having the tint color be pure red which is only 1/16th opaque.
+ This color will be drawn over the rectangle's color when the rectangle is painted. The tint color should usually be mostly transparent, or you will not be able to see the underlying color. The below example provides a slight red tint by having the tint color be pure red which is only 1/16th opaque.
\qml
- Rect { x: 0; width: 80; height: 80; color: "lightsteelblue" }
- Rect { x: 100; width: 80; height: 80; color: "lightsteelblue"; tintColor: "#10FF0000" }
+ Rectangle { x: 0; width: 80; height: 80; color: "lightsteelblue" }
+ Rectangle { x: 100; width: 80; height: 80; color: "lightsteelblue"; tintColor: "#10FF0000" }
\endqml
\image declarative-rect_tint.png
@@ -553,7 +553,7 @@ void QFxRect::drawRect(QPainter &p)
}
/*!
- \qmlproperty bool Rect::smooth
+ \qmlproperty bool Rectangle::smooth
Set this property if you want the item to be smoothly scaled or
transformed. Smooth filtering gives better visual quality, but is slower. If
diff --git a/src/declarative/fx/qfxvisualitemmodel.cpp b/src/declarative/fx/qfxvisualitemmodel.cpp
index fdeece9..fd2796c 100644
--- a/src/declarative/fx/qfxvisualitemmodel.cpp
+++ b/src/declarative/fx/qfxvisualitemmodel.cpp
@@ -139,9 +139,9 @@ public:
Item {
VisualItemModel {
id: ItemModel
- Rect { height: 30; width: 80; color: "red" }
- Rect { height: 30; width: 80; color: "green" }
- Rect { height: 30; width: 80; color: "blue" }
+ Rectangle { height: 30; width: 80; color: "red" }
+ Rectangle { height: 30; width: 80; color: "green" }
+ Rectangle { height: 30; width: 80; color: "blue" }
}
ListView {
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index c30efca..0e141da 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -85,7 +85,7 @@ int statusId = qRegisterMetaType<QmlComponent::Status>("QmlComponent::Status");
Item {
Component {
id: RedSquare
- Rect {
+ Rectangle {
color: "red"
width: 10
height: 10
diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 2000e51..22a8e49 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -76,14 +76,14 @@ QmlDomDocumentPrivate::~QmlDomDocumentPrivate()
\brief The QmlDomDocument class represents the root of a QML document
A QML document is a self-contained snippet of QML, usually contained in a
- single file. Each document has a version number, accessible through
- QmlDomDocument::version(), and a root object, accessible through
+ single file. Each document has a version number, accessible through
+ QmlDomDocument::version(), and a root object, accessible through
QmlDomDocument::rootObject().
The QmlDomDocument class allows the programmer to load a QML document, by
calling QmlDomDocument::load(), manipulate it and save it to textual form
by calling QmlDomDocument::save(). By using the QML DOM API, editors can
- non-destructively modify a QML document even if they only understand a
+ non-destructively modify a QML document even if they only understand a
subset of the total QML functionality.
The following example loads a QML file from disk, and prints out its root
@@ -179,7 +179,7 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl
d->errors << error;
td->release();
return false;
- }
+ }
compiler.compile(engine, td, &component);
@@ -213,7 +213,7 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl
}
/*!
- Returns the last load errors. The load errors will be reset after a
+ Returns the last load errors. The load errors will be reset after a
successful call to load().
\sa load()
@@ -292,7 +292,7 @@ QmlDomDynamicPropertyPrivate::~QmlDomDynamicPropertyPrivate()
/*!
\class QmlDomProperty
\internal
- \brief The QmlDomProperty class represents one property assignment in the
+ \brief The QmlDomProperty class represents one property assignment in the
QML DOM tree
Properties in QML can be assigned QML \l {QmlDomValue}{values}.
@@ -627,7 +627,7 @@ QmlDomObjectPrivate::properties() const
{
Properties rv;
- for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter =
+ for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter =
object->properties.begin();
iter != object->properties.end();
++iter) {
@@ -645,7 +645,7 @@ QmlDomObjectPrivate::properties(QmlParser::Property *property) const
if (property->value) {
- for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter =
+ for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter =
property->value->properties.begin();
iter != property->value->properties.end();
++iter) {
@@ -655,7 +655,7 @@ QmlDomObjectPrivate::properties(QmlParser::Property *property) const
}
QByteArray name(property->name + ".");
- for (Properties::Iterator iter = rv.begin(); iter != rv.end(); ++iter)
+ for (Properties::Iterator iter = rv.begin(); iter != rv.end(); ++iter)
iter->second.prepend(name);
} else {
@@ -672,8 +672,8 @@ QmlDomObjectPrivate::properties(QmlParser::Property *property) const
Each object instantiated in a QML file has a corresponding QmlDomObject
node in the QML DOM.
-
- In addition to the type information that determines the object to
+
+ In addition to the type information that determines the object to
instantiate, QmlDomObject's also have a set of associated QmlDomProperty's.
Each QmlDomProperty represents a QML property assignment on the instantiated
object. For example,
@@ -687,12 +687,12 @@ QGraphicsWidget {
describes a single QmlDomObject - "QGraphicsWidget" - with two properties,
"opacity" and "size". Obviously QGraphicsWidget has many more properties than just
- these two, but the QML DOM representation only contains those assigned
+ these two, but the QML DOM representation only contains those assigned
values (or bindings) in the QML file.
The DOM tree can be modified to include new property assignments by calling
QmlDomObject::addProperty(). Existing property assignments can be modified
- through the QmlDomProperty::setValue() method, or removed entirely by
+ through the QmlDomProperty::setValue() method, or removed entirely by
calling QmlDomObject::removeProperty().
*/
@@ -749,9 +749,9 @@ bool QmlDomObject::isValid() const
/*!
Returns the fully-qualified type name of this object.
- For example, the type of this object would be "Qt/4.6/Rect".
+ For example, the type of this object would be "Qt/4.6/Rectangle".
\qml
-Rect { }
+Rectangle { }
\endqml
*/
QByteArray QmlDomObject::objectType() const
@@ -763,9 +763,9 @@ QByteArray QmlDomObject::objectType() const
/*!
Returns the type name as referenced in the qml file.
- For example, the type of this object would be "Rect".
+ For example, the type of this object would be "Rectangle".
\qml
-Rect { }
+Rectangle { }
\endqml
*/
QByteArray QmlDomObject::objectClassName() const
@@ -804,7 +804,7 @@ void QmlDomObject::setObjectId(const QByteArray &id)
/*!
- Returns the list of assigned properties on this object.
+ Returns the list of assigned properties on this object.
In the following example, "text" and "x" properties would be returned.
\qml
@@ -920,8 +920,8 @@ QmlDomDynamicProperty QmlDomObject::dynamicProperty(const QByteArray &name) cons
}
/*!
- Returns true if this object is a custom type. Custom types are special
- types that allow embeddeding non-QML data, such as SVG or HTML data,
+ Returns true if this object is a custom type. Custom types are special
+ types that allow embeddeding non-QML data, such as SVG or HTML data,
directly into QML files.
\note Currently this method will always return false, and is a placekeeper
@@ -935,7 +935,7 @@ bool QmlDomObject::isCustomType() const
}
/*!
- Sets the custom type \a data. If this type is not a custom type, this
+ Sets the custom type \a data. If this type is not a custom type, this
method does nothing.
\sa QmlDomObject::isCustomType() QmlDomObject::customTypeData()
@@ -947,8 +947,8 @@ void QmlDomObject::setCustomTypeData(const QByteArray &data)
}
/*!
- If this object represents a custom type, returns the data associated with
- the custom type, otherwise returns an empty QByteArray().
+ If this object represents a custom type, returns the data associated with
+ the custom type, otherwise returns an empty QByteArray().
QmlDomObject::isCustomType() can be used to check if this object represents
a custom type.
*/
@@ -958,20 +958,20 @@ QByteArray QmlDomObject::customTypeData() const
}
/*!
- Returns true if this object is a sub-component object. Sub-component
- objects can be converted into QmlDomComponent instances by calling
+ Returns true if this object is a sub-component object. Sub-component
+ objects can be converted into QmlDomComponent instances by calling
QmlDomObject::toComponent().
\sa QmlDomObject::toComponent()
*/
bool QmlDomObject::isComponent() const
{
- return d->isVirtualComponent ||
+ return d->isVirtualComponent ||
(d->object && d->object->typeName == "Qt/Component");
}
/*!
- Returns a QmlDomComponent for this object if it is a sub-component, or
+ Returns a QmlDomComponent for this object if it is a sub-component, or
an invalid QmlDomComponent if not. QmlDomObject::isComponent() can be used
to check if this object represents a sub-component.
@@ -1046,7 +1046,7 @@ QmlDomBasicValuePrivate::~QmlDomBasicValuePrivate()
literal values.
\qml
-Rect {
+Rectangle {
x: 10
y: 10
color: "red"
@@ -1062,7 +1062,7 @@ QmlDomValueLiteral::QmlDomValueLiteral():
{
}
-/*!
+/*!
Create a copy of \a other QmlDomValueLiteral.
*/
QmlDomValueLiteral::QmlDomValueLiteral(const QmlDomValueLiteral &other)
@@ -1091,7 +1091,7 @@ QmlDomValueLiteral &QmlDomValueLiteral::operator=(const QmlDomValueLiteral &othe
In the example below, the literal value will be the string "10".
\qml
-Rect { x: 10 }
+Rectangle { x: 10 }
\endqml
*/
QString QmlDomValueLiteral::literal() const
@@ -1118,7 +1118,7 @@ void QmlDomValueLiteral::setLiteral(const QString &value)
the example below, the "x" property is being assigned a property binding.
\qml
-Rect { x: Other.x }
+Rectangle { x: Other.x }
\endqml
*/
@@ -1159,14 +1159,14 @@ QmlDomValueBinding &QmlDomValueBinding::operator=(const QmlDomValueBinding &othe
In the example below, the string "Other.x" will be returned.
\qml
-Rect { x: Other.x }
+Rectangle { x: Other.x }
\endqml
*/
QString QmlDomValueBinding::binding() const
{
- if (d->value)
+ if (d->value)
return d->value->value.asScript();
- else
+ else
return QString();
}
@@ -1184,13 +1184,13 @@ void QmlDomValueBinding::setBinding(const QString &expression)
\internal
\brief The QmlDomValueValueSource class represents a value source assignment value.
- In QML, value sources are special value generating types that may be
+ In QML, value sources are special value generating types that may be
assigned to properties. Value sources inherit the QmlPropertyValueSource
- class. In the example below, the "x" property is being assigned the
+ class. In the example below, the "x" property is being assigned the
NumberAnimation value source.
\qml
-Rect {
+Rectangle {
x: NumberAnimation {
from: 0
to: 100
@@ -1239,7 +1239,7 @@ QmlDomValueValueSource &QmlDomValueValueSource::operator=(const QmlDomValueValue
In the example below, an object representing the NumberAnimation will be
returned.
\qml
-Rect {
+Rectangle {
x: NumberAnimation {
from: 0
to: 100
@@ -1255,7 +1255,7 @@ QmlDomObject QmlDomValueValueSource::object() const
if (d->value) {
rv.d->object = d->value->object;
rv.d->object->addref();
- }
+ }
return rv;
}
@@ -1293,11 +1293,11 @@ QmlDomValuePrivate::~QmlDomValuePrivate()
\internal
\brief The QmlDomValue class represents a generic Qml value.
- QmlDomValue's can be assigned to QML \l {QmlDomProperty}{properties}. In
+ QmlDomValue's can be assigned to QML \l {QmlDomProperty}{properties}. In
QML, properties can be assigned various different values, including basic
literals, property bindings, property value sources, objects and lists of
values. The QmlDomValue class allows a programmer to determine the specific
- value type being assigned and access more detailed information through a
+ value type being assigned and access more detailed information through a
corresponding value type class.
For example, in the following example,
@@ -1382,7 +1382,7 @@ QmlDomValue &QmlDomValue::operator=(const QmlDomValue &other)
QmlDomValue::Type QmlDomValue::type() const
{
if (d->property)
- if (QmlMetaType::isList(d->property->type) ||
+ if (QmlMetaType::isList(d->property->type) ||
QmlMetaType::isQmlList(d->property->type) ||
(d->property && d->property->values.count() > 1))
return List;
@@ -1477,7 +1477,7 @@ QmlDomValueLiteral QmlDomValue::toLiteral() const
}
/*!
- Returns a QmlDomValueBinding if this value is a property binding type,
+ Returns a QmlDomValueBinding if this value is a property binding type,
otherwise returns an invalid QmlDomValueBinding.
\sa QmlDomValue::type()
@@ -1525,7 +1525,7 @@ QmlDomObject QmlDomValue::toObject() const
}
/*!
- Returns a QmlDomList if this value is a list type, otherwise returns an
+ Returns a QmlDomList if this value is a list type, otherwise returns an
invalid QmlDomList.
\sa QmlDomValue::type()
@@ -1574,12 +1574,12 @@ int QmlDomValue::length() const
Item {
children: [
Text { },
- Rect { }
+ Rectangle { }
]
}
\endqml
- Lists can also be implicitly created by assigning multiple
+ Lists can also be implicitly created by assigning multiple
\l {QmlDomValueValueSource}{value sources} or constants to a property.
\qml
Item {
@@ -1643,7 +1643,7 @@ QList<QmlDomValue> QmlDomList::values() const
return rv;
}
-/*!
+/*!
Set the list of QmlDomValue's to \a values.
*/
void QmlDomList::setValues(const QList<QmlDomValue> &values)
@@ -1692,8 +1692,8 @@ QList<int> QmlDomList:: commaPositions() const
\internal
\brief The QmlDomComponent class represents sub-component within a QML document.
- Sub-components are QmlComponents defined within a QML document. The
- following example shows the definition of a sub-component with the id
+ Sub-components are QmlComponents defined within a QML document. The
+ following example shows the definition of a sub-component with the id
"ListDelegate".
\qml
@@ -1764,7 +1764,7 @@ QmlDomObject QmlDomComponent::componentRoot() const
rv.d->object->addref();
} else if (d->object) {
QmlParser::Object *obj = 0;
- if (d->object->defaultProperty &&
+ if (d->object->defaultProperty &&
d->object->defaultProperty->values.count() == 1 &&
d->object->defaultProperty->values.at(0)->object)
obj = d->object->defaultProperty->values.at(0)->object;
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 0a05094..84c9553 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -630,7 +630,7 @@ QScriptValue QmlEnginePrivate::createComponent(QScriptContext *ctxt,
Example (where targetItem is the id of an existing QML item):
\code
- newObject = createQmlObject('Rect {color: "red"; width: 20; height: 20}',
+ newObject = createQmlObject('Rectangle {color: "red"; width: 20; height: 20}',
targetItem, "dynamicSnippet1");
\endcode
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 5632dc0..7faddee 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -176,7 +176,7 @@ QmlAbstractAnimation::QmlAbstractAnimation(QmlAbstractAnimationPrivate &dd, QObj
whenever the \l MouseRegion is pressed.
\code
- Rect {
+ Rectangle {
width: 100; height: 100
x: NumberAnimation {
running: MyMouse.pressed
@@ -362,7 +362,7 @@ void QmlAbstractAnimation::setAlwaysRunToEnd(bool f)
In the following example, the rectangle will spin indefinately.
\code
- Rect {
+ Rectangle {
rotation: NumberAnimation { running: true; repeat: true; from: 0 to: 360 }
}
\endcode
@@ -541,7 +541,7 @@ void QmlAbstractAnimation::resume()
Normally \c stop() stops the animation immediately, and the animation has
no further influence on property values. In this example animation
\code
- Rect {
+ Rectangle {
x: NumberAnimation { from: 0; to: 100; duration: 500 }
}
\endcode
@@ -579,7 +579,7 @@ void QmlAbstractAnimation::restart()
Unlike \c stop(), \c complete() immediately fast-forwards the animation to
its end. In the following example,
\code
- Rect {
+ Rectangle {
x: NumberAnimation { from: 0; to: 100; duration: 500 }
}
\endcode
diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp
index 1fb321c..c48684b 100644
--- a/src/declarative/util/qmlfollow.cpp
+++ b/src/declarative/util/qmlfollow.cpp
@@ -212,7 +212,7 @@ void QmlFollowPrivate::stop()
In example below, Rect2 will follow Rect1 moving with a velocity of up to 200:
\code
- Rect {
+ Rectangle {
id: Rect1
width: 20; height: 20
color: "#00ff00"
@@ -228,7 +228,7 @@ void QmlFollowPrivate::stop()
PauseAnimation { duration: 1000 }
}
}
- Rect {
+ Rectangle {
id: Rect2
x: Rect1.width
width: 20; height: 20
diff --git a/src/declarative/util/qmlpalette.cpp b/src/declarative/util/qmlpalette.cpp
index d500986..d86f98f 100644
--- a/src/declarative/util/qmlpalette.cpp
+++ b/src/declarative/util/qmlpalette.cpp
@@ -64,7 +64,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Palette,QmlPalette)
\code
Palette { id: MyPalette; colorGroup: Qt.Active }
- Rect {
+ Rectangle {
width: 640; height: 480
color: MyPalette.window
Text {
generated by cgit v0.12 at 2024-10-26 22:31:29 (GMT)