diff options
Diffstat (limited to 'src/declarative/graphicsitems')
16 files changed, 84 insertions, 84 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp index d4542e41..b9ccb676 100644 --- a/src/declarative/graphicsitems/qdeclarativeevents.cpp +++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \instantiates QDeclarativeKeyEvent \since 4.7 \ingroup qml-event-elements - + \brief The KeyEvent object provides information about a key event. For example, the following changes the Item's state property when the Enter diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp index 8787b508..dd40fec0 100644 --- a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp +++ b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE \inherits Item Focus panels assist in keyboard focus handling when building QML - applications. All the details are covered in the + applications. All the details are covered in the \l {qmlfocus}{keyboard focus documentation}. */ diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index 1285c877..aca5828b 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -1283,7 +1283,7 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m QAbstractListModel. A GridView has a \l model, which defines the data to be displayed, and - a \l delegate, which defines how the data should be displayed. Items in a + a \l delegate, which defines how the data should be displayed. Items in a GridView are laid out horizontally or vertically. Grid views are inherently flickable as GridView inherits from \l Flickable. @@ -1317,7 +1317,7 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m The view will create a new delegate for each item in the model. Note that the delegate is able to access the model's \c name and \c portrait data directly. - An improved grid view is shown below. The delegate is visually improved and is moved + An improved grid view is shown below. The delegate is visually improved and is moved into a separate \c contactDelegate component. \clearfloat @@ -1558,10 +1558,10 @@ void QDeclarativeGridView::setDelegate(QDeclarativeComponent *delegate) \c currentItem holds the current item. Setting the currentIndex to -1 will clear the highlight and set currentItem to null. - If highlightFollowsCurrentItem is \c true, setting either of these - properties will smoothly scroll the GridView so that the current + If highlightFollowsCurrentItem is \c true, setting either of these + properties will smoothly scroll the GridView so that the current item becomes visible. - + Note that the position of the current item may only be approximate until it becomes visible in the view. */ @@ -1661,8 +1661,8 @@ void QDeclarativeGridView::setHighlight(QDeclarativeComponent *highlight) If this property is true (the default value), the highlight is moved smoothly to follow the current item. Otherwise, the highlight is not moved by the view, and any movement must be implemented - by the highlight. - + by the highlight. + Here is a highlight with its motion defined by a \l {SpringAnimation} item: \snippet doc/src/snippets/declarative/gridview/gridview.qml highlightFollowsCurrentItem @@ -1725,12 +1725,12 @@ void QDeclarativeGridView::setHighlightMoveDuration(int duration) These properties define the preferred range of the highlight (for the current item) within the view. The \c preferredHighlightBegin value must be less than the - \c preferredHighlightEnd value. + \c preferredHighlightEnd value. These properties affect the position of the current item when the view is scrolled. For example, if the currently selected item should stay in the middle of the - view when it is scrolled, set the \c preferredHighlightBegin and - \c preferredHighlightEnd values to the top and bottom coordinates of where the middle + view when it is scrolled, set the \c preferredHighlightBegin and + \c preferredHighlightEnd values to the top and bottom coordinates of where the middle item would be. If the \c currentItem is changed programmatically, the view will automatically scroll so that the current item is in the middle of the view. Furthermore, the behavior of the current item index will occur whether or not a diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp index 4e372abf..f3d0b226 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp @@ -159,7 +159,7 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) \endlist \table - + \row \li \image declarative-qtlogo-stretch.png \li Stretch (default) @@ -261,9 +261,9 @@ void QDeclarativeImage::setFillMode(FillMode mode) \qmlproperty real Image::paintedHeight These properties hold the size of the image that is actually painted. - In most cases it is the same as \c width and \c height, but when using a - \c fillMode \c PreserveAspectFit or \c fillMode \c PreserveAspectCrop - \c paintedWidth or \c paintedHeight can be smaller or larger than + In most cases it is the same as \c width and \c height, but when using a + \c fillMode \c PreserveAspectFit or \c fillMode \c PreserveAspectCrop + \c paintedWidth or \c paintedHeight can be smaller or larger than \c width and \c height of the Image element. */ qreal QDeclarativeImage::paintedWidth() const @@ -346,7 +346,7 @@ qreal QDeclarativeImage::paintedHeight() const the painting of the image, this property sets the actual number of pixels stored for the loaded image so that large images do not use more memory than necessary. For example, this ensures the image in memory is no - larger than 1024x1024 pixels, regardless of the Image's \l {Item::}{width} and + larger than 1024x1024 pixels, regardless of the Image's \l {Item::}{width} and \l {Item::}{height} values: \code @@ -379,7 +379,7 @@ qreal QDeclarativeImage::paintedHeight() const Since QtQuick 1.1 the sourceSize can be cleared to the natural size of the image by setting sourceSize to \c undefined. - + \note \e {Changing this property dynamically causes the image source to be reloaded, potentially even from the network, if it is not in the disk cache.} */ diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 0589ffdf..32e6e0fa 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2870,7 +2870,7 @@ QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeItemPrivate::transi If clipping is enabled, an item will clip its own painting, as well as the painting of its children, to its bounding rectangle. If you set - clipping during an item's paint operation, remember to re-set it to + clipping during an item's paint operation, remember to re-set it to prevent clipping the rest of your scene. Non-rectangular clipping regions are not supported for performance reasons. diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index 08e76363..54894239 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -1597,7 +1597,7 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m for its delegate. The view will create a new \l Text component for each item in the model. Notice the delegate is able to access the model's \c name and \c number data directly. - An improved list view is shown below. The delegate is visually improved and is moved + An improved list view is shown below. The delegate is visually improved and is moved into a separate \c contactDelegate component. \snippet doc/src/snippets/declarative/listview/listview.qml classdocs advanced @@ -1871,10 +1871,10 @@ void QDeclarativeListView::setDelegate(QDeclarativeComponent *delegate) \c currentItem holds the current item. Setting the currentIndex to -1 will clear the highlight and set currentItem to null. - If highlightFollowsCurrentItem is \c true, setting either of these - properties will smoothly scroll the ListView so that the current + If highlightFollowsCurrentItem is \c true, setting either of these + properties will smoothly scroll the ListView so that the current item becomes visible. - + Note that the position of the current item may only be approximate until it becomes visible in the view. */ @@ -1977,8 +1977,8 @@ void QDeclarativeListView::setHighlight(QDeclarativeComponent *highlight) If this property is true (the default value), the highlight is moved smoothly to follow the current item. Otherwise, the highlight is not moved by the view, and any movement must be implemented - by the highlight. - + by the highlight. + Here is a highlight with its motion defined by a \l {SpringAnimation} item: \snippet doc/src/snippets/declarative/listview/listview.qml highlightFollowsCurrentItem @@ -2020,12 +2020,12 @@ void QDeclarativeListView::setHighlightFollowsCurrentItem(bool autoHighlight) These properties define the preferred range of the highlight (for the current item) within the view. The \c preferredHighlightBegin value must be less than the - \c preferredHighlightEnd value. + \c preferredHighlightEnd value. These properties affect the position of the current item when the list is scrolled. For example, if the currently selected item should stay in the middle of the - list when the view is scrolled, set the \c preferredHighlightBegin and - \c preferredHighlightEnd values to the top and bottom coordinates of where the middle + list when the view is scrolled, set the \c preferredHighlightBegin and + \c preferredHighlightEnd values to the top and bottom coordinates of where the middle item would be. If the \c currentItem is changed programmatically, the list will automatically scroll so that the current item is in the middle of the view. Furthermore, the behavior of the current item index will occur whether or not a @@ -2228,7 +2228,7 @@ Qt::LayoutDirection QDeclarativeListView::effectiveLayoutDirection() const /*! \qmlproperty bool ListView::keyNavigationWraps - This property holds whether the list wraps key navigation. + This property holds whether the list wraps key navigation. If this is true, key navigation that would move the current item selection past the end of the list instead wraps around and moves the selection to @@ -2299,7 +2299,7 @@ void QDeclarativeListView::setCacheBuffer(int b) The \l section attached property enables a ListView to be visually separated into different parts. These properties determine how sections are created. - + \c section.property holds the name of the property that is the basis of each section. @@ -2310,7 +2310,7 @@ void QDeclarativeListView::setCacheBuffer(int b) \li ViewSection.FullString (default) - sections are created based on the \c section.property value. \li ViewSection.FirstCharacter - sections are created based on the first - character of the \c section.property value (for example, 'A', 'B', 'C' + character of the \c section.property value (for example, 'A', 'B', 'C' sections, etc. for an address book) \endlist @@ -2320,13 +2320,13 @@ void QDeclarativeListView::setCacheBuffer(int b) \c ListView.previousSection and \c ListView.nextSection. These may be used to place a section header for related items. - For example, here is a ListView that displays a list of animals, separated - into sections. Each item in the ListView is placed in a different section + For example, here is a ListView that displays a list of animals, separated + into sections. Each item in the ListView is placed in a different section depending on the "size" property of the model item. The \c sectionHeading delegate component provides the light blue bar that marks the beginning of each section. - + \snippet examples/declarative/modelviews/listview/sections.qml 0 \image qml-listview-sections-example.png diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp index d934f6a3..f0d26170 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader.cpp +++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp @@ -127,13 +127,13 @@ void QDeclarativeLoaderPrivate::initResize() subtree from a URL or Component. Loader is used to dynamically load visual QML components. It can load a - QML file (using the \l source property) or a \l Component object (using - the \l sourceComponent property). It is useful for delaying the creation - of a component until it is required: for example, when a component should - be created on demand, or when a component should not be created + QML file (using the \l source property) or a \l Component object (using + the \l sourceComponent property). It is useful for delaying the creation + of a component until it is required: for example, when a component should + be created on demand, or when a component should not be created unnecessarily for performance reasons. - Here is a Loader that loads "Page1.qml" as a component when the + Here is a Loader that loads "Page1.qml" as a component when the \l MouseArea is clicked: \snippet doc/src/snippets/declarative/loader/simple.qml 0 @@ -178,13 +178,13 @@ void QDeclarativeLoaderPrivate::initResize() \section2 Receiving signals from loaded items - Any signals emitted from the loaded item can be received using the + Any signals emitted from the loaded item can be received using the \l Connections element. For example, the following \c application.qml loads \c MyItem.qml, and is able to receive the \c message signal from the loaded item through a \l Connections object: \table - \row + \row \li application.qml \li MyItem.qml \row @@ -199,19 +199,19 @@ void QDeclarativeLoaderPrivate::initResize() \section2 Focus and key events - Loader is a focus scope. Its \l {Item::}{focus} property must be set to - \c true for any of its children to get the \e {active focus}. (See - \l{qmlfocus#Acquiring Focus and Focus Scopes}{the focus documentation page} + Loader is a focus scope. Its \l {Item::}{focus} property must be set to + \c true for any of its children to get the \e {active focus}. (See + \l{qmlfocus#Acquiring Focus and Focus Scopes}{the focus documentation page} for more details.) Any key events received in the loaded item should likely also be \l {KeyEvent::}{accepted} so they are not propagated to the Loader. For example, the following \c application.qml loads \c KeyReader.qml when - the \l MouseArea is clicked. Notice the \l {Item::}{focus} property is - set to \c true for the Loader as well as the \l Item in the dynamically + the \l MouseArea is clicked. Notice the \l {Item::}{focus} property is + set to \c true for the Loader as well as the \l Item in the dynamically loaded object: \table - \row + \row \li application.qml \li KeyReader.qml \row @@ -219,7 +219,7 @@ void QDeclarativeLoaderPrivate::initResize() \li \snippet doc/src/snippets/declarative/loader/KeyReader.qml 0 \endtable - Once \c KeyReader.qml is loaded, it accepts key events and sets + Once \c KeyReader.qml is loaded, it accepts key events and sets \c event.accepted to \c true so that the event is not propagated to the parent \l Rectangle. diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index 4752ec32..4534090f 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp @@ -965,10 +965,10 @@ QDeclarativeDrag *QDeclarativeMouseArea::drag() \snippet doc/src/snippets/declarative/mousearea/mousearea.qml drag - \note Items cannot be dragged if they are anchored for the requested + \note Items cannot be dragged if they are anchored for the requested \c drag.axis. For example, if \c anchors.left or \c anchors.right was set for \c rect in the above example, it cannot be dragged along the X-axis. - This can be avoided by settng the anchor value to \c undefined in + This can be avoided by settng the anchor value to \c undefined in an \l onPressed handler. If \c drag.filterChildren is set to true, a drag can override descendant MouseAreas. This diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 9dec9e25..91becae7 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -360,7 +360,7 @@ void QDeclarativePathViewPrivate::regenerate() QAbstractListModel. The view has a \l model, which defines the data to be displayed, and - a \l delegate, which defines how the data should be displayed. + a \l delegate, which defines how the data should be displayed. The \l delegate is instantiated for each item on the \l path. The items may be flicked to move them along the path. diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index bca94ebd..8854fa02 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -497,7 +497,7 @@ void QDeclarativeColumn::reportConflictingAnchors() \inherits Item The Row item positions its child items so that they are horizontally - aligned and not overlapping. + aligned and not overlapping. Use \l spacing to set the spacing between items in a Row, and use the \l add and \l move properties to set the transitions that should be applied @@ -712,7 +712,7 @@ void QDeclarativeRow::reportConflictingAnchors() \inherits Item The Grid item positions its child items so that they are - aligned in a grid and are not overlapping. + aligned in a grid and are not overlapping. The grid positioner calculates a grid of rectangular cells of sufficient size to hold all items, placing the items in the cells, from left to right diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index 8d01e773..64d03c36 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -100,14 +100,14 @@ QDeclarativeTextPrivate::QDeclarativeTextPrivate() QGraphicsItemPrivate::flags = QGraphicsItemPrivate::flags & ~QGraphicsItem::ItemHasNoContents; } -QTextDocumentWithImageResources::QTextDocumentWithImageResources(QDeclarativeText *parent) +QTextDocumentWithImageResources::QTextDocumentWithImageResources(QDeclarativeText *parent) : QTextDocument(parent), outstanding(0) { } QTextDocumentWithImageResources::~QTextDocumentWithImageResources() { - if (!m_resources.isEmpty()) + if (!m_resources.isEmpty()) qDeleteAll(m_resources); } @@ -489,7 +489,7 @@ QPixmap QDeclarativeTextPrivate::textLayoutImage(bool drawStyle) } /*! - Paints the QDeclarativeTextPrivate::layout QTextLayout into \a painter at \a pos. If + Paints the QDeclarativeTextPrivate::layout QTextLayout into \a painter at \a pos. If \a drawStyle is true, the style color overrides all colors in the document. */ void QDeclarativeTextPrivate::drawTextLayout(QPainter *painter, const QPointF &pos, bool drawStyle) @@ -544,7 +544,7 @@ QPixmap QDeclarativeTextPrivate::textDocumentImage(bool drawStyle) /*! Mark the image cache as dirty. */ -void QDeclarativeTextPrivate::invalidateImageCache() +void QDeclarativeTextPrivate::invalidateImageCache() { Q_Q(QDeclarativeText); @@ -601,13 +601,13 @@ void QDeclarativeTextPrivate::checkImageCache() break; } - } + } imageCacheDirty = false; } -/*! - Ensures the QDeclarativeTextPrivate::doc variable is set to a valid text document +/*! + Ensures the QDeclarativeTextPrivate::doc variable is set to a valid text document */ void QDeclarativeTextPrivate::ensureDoc() { @@ -743,15 +743,15 @@ QDeclarativeText::~QDeclarativeText() \qmlsignal Text::onLinkActivated(string link) This handler is called when the user clicks on a link embedded in the text. - The link must be in rich text or HTML format and the - \a link string provides access to the particular link. + The link must be in rich text or HTML format and the + \a link string provides access to the particular link. \snippet doc/src/snippets/declarative/text/onLinkActivated.qml 0 - The example code will display the text + The example code will display the text "The main website is at \l{http://qt.nokia.com}{Nokia Qt DF}." - Clicking on the highlighted link will output + Clicking on the highlighted link will output \tt{http://qt.nokia.com link activated} to the console. */ @@ -1053,7 +1053,7 @@ void QDeclarativeText::setStyleColor(const QColor &color) Note that for a single line of text, the size of the text is the area of the text. In this common case, all alignments are equivalent. If you want the text to be, say, centered in its parent, then you will - need to either modify the Item::anchors, or set horizontalAlignment to Text.AlignHCenter and bind the width to + need to either modify the Item::anchors, or set horizontalAlignment to Text.AlignHCenter and bind the width to that of the parent. When using the attached property \l {LayoutMirroring::enabled} to mirror application @@ -1185,7 +1185,7 @@ void QDeclarativeText::setWrapMode(WrapMode mode) d->wrapMode = mode; d->updateLayout(); - + emit wrapModeChanged(); } @@ -1269,7 +1269,7 @@ void QDeclarativeText::resetMaximumLineCount() The way the text property should be displayed. Supported text formats are: - + \list \li Text.AutoText (default) \li Text.PlainText @@ -1382,7 +1382,7 @@ void QDeclarativeText::setElideMode(QDeclarativeText::TextElideMode mode) d->elideMode = mode; d->updateLayout(); - + emit elideModeChanged(d->elideMode); } diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index a2e8e65c..f2b72599 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -473,7 +473,7 @@ void QDeclarativeTextEdit::setSelectedTextColor(const QColor &color) \li TextEdit.AlignHCenter \li TextEdit.AlignJustify \endlist - + Valid values for \c verticalAlignment are: \list \li TextEdit.AlignTop (default) diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h index 4ce11e01..8421da8a 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h @@ -273,7 +273,7 @@ private: void updateTotalLines(); protected: - virtual void geometryChanged(const QRectF &newGeometry, + virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); bool event(QEvent *); diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 787424e4..0369c051 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE On Mac OS X, the Up/Down key bindings for Home/End are explicitly disabled. If you want such bindings (on any platform), you will need to construct them in QML. - + \sa TextEdit, Text, {declarative/text/textselection}{Text Selection example} */ QDeclarativeTextInput::QDeclarativeTextInput(QDeclarativeItem* parent) @@ -740,7 +740,7 @@ void QDeclarativeTextInput::setAutoScroll(bool b) This property holds the notation of how a string can describe a number. The possible values for this property are: - + \list \li DoubleValidator.StandardNotation \li DoubleValidator.ScientificNotation (default) diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp index 9e03bfe3..895f1107 100644 --- a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QDeclarativeTextLayoutPrivate { public: - QDeclarativeTextLayoutPrivate() + QDeclarativeTextLayoutPrivate() : cached(false) {} QPointF position; @@ -103,7 +103,7 @@ class DrawTextItemRecorder: public QPaintEngine last.numChars += ti.num_chars; } - } + } if (needFreshCurrentItem) { QStaticTextItem currentItem; @@ -257,10 +257,10 @@ Q_GLOBAL_STATIC(InertTextPainter, inertTextPainter); This class is basically a copy of the QStaticText code, but it is adapted to source its text from QTextLayout. -It is also considerably faster to create a QDeclarativeTextLayout than a QStaticText because it uses +It is also considerably faster to create a QDeclarativeTextLayout than a QStaticText because it uses a single, shared QPainter instance. QStaticText by comparison creates a new QPainter per instance. -As a consequence this means that QDeclarativeTextLayout is not re-enterant. Adding a lock around -the shared painter solves this, and only introduces a minor performance penalty, but is unnecessary +As a consequence this means that QDeclarativeTextLayout is not re-enterant. Adding a lock around +the shared painter solves this, and only introduces a minor performance penalty, but is unnecessary for QDeclarativeTextLayout's current use (QDeclarativeText is already tied to the GUI thread). */ @@ -309,7 +309,7 @@ void QDeclarativeTextLayout::prepare() { if (!d || !d->cached) { - if (!d) + if (!d) d = new QDeclarativeTextLayoutPrivate; InertTextPainter *itp = inertTextPainter(); diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp index caa79f16..3df13a6b 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -651,9 +651,9 @@ QDeclarativeVisualDataModelData *QDeclarativeVisualDataModelPrivate::data(QObjec be instantiated for items in the model. It is usually not necessary to create VisualDataModel elements. - However, it can be useful for manipulating and accessing the \l modelIndex - when a QAbstractItemModel subclass is used as the - model. Also, VisualDataModel is used together with \l Package to + However, it can be useful for manipulating and accessing the \l modelIndex + when a QAbstractItemModel subclass is used as the + model. Also, VisualDataModel is used together with \l Package to provide delegates to multiple views. The example below illustrates using a VisualDataModel with a ListView. @@ -843,7 +843,7 @@ void QDeclarativeVisualDataModel::setDelegate(QDeclarativeComponent *delegate) any node in a QAbstractItemModel to be provided by this model. This property only affects models of type QAbstractItemModel that - are hierarchical (e.g, a tree model). + are hierarchical (e.g, a tree model). For example, here is a simple interactive file system browser. When a directory name is clicked, the view's \c rootIndex is set to the @@ -852,13 +852,13 @@ void QDeclarativeVisualDataModel::setDelegate(QDeclarativeComponent *delegate) \c main.cpp: \snippet doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp 0 - + \c view.qml: \snippet doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml 0 If the \l model is a QAbstractItemModel subclass, the delegate can also reference a \c hasModelChildren property (optionally qualified by a - \e model. prefix) that indicates whether the delegate's model item has + \e model. prefix) that indicates whether the delegate's model item has any child nodes. |