From ed4389b055bd2a3b735fc846a27091b29e72a398 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 21 Aug 2012 11:05:33 +0200 Subject: [PATCH] Minor documentation fixes in item views. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I986662ba48840e0195f0cfd4264e4d5d8b186c51 Reviewed-by: Jan-Arve Sæther --- .../doc/src/widgets-and-layouts/stylesheet.qdoc | 2 +- src/widgets/itemviews/qabstractitemdelegate.cpp | 10 +++++----- src/widgets/itemviews/qabstractitemview.cpp | 7 +++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc index 41b256b4c5..bc1eb76cab 100644 --- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -554,7 +554,7 @@ \image designer-stylesheet-options.png - In Qt 4.2 and later, \l{Qt Designer}{Qt Designer} also includes a + In Qt 4.2 and later, \l{Qt Designer} also includes a style sheet syntax highlighter and validator. The validator indicates if the syntax is valid or invalid, at the bottom left of the \uicontrol{Edit Style Sheet} dialog. diff --git a/src/widgets/itemviews/qabstractitemdelegate.cpp b/src/widgets/itemviews/qabstractitemdelegate.cpp index 6c02147c1d..e943edf5d1 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.cpp +++ b/src/widgets/itemviews/qabstractitemdelegate.cpp @@ -243,12 +243,12 @@ QWidget *QAbstractItemDelegate::createEditor(QWidget *, /*! + Called when the \a editor is no longer needed for editing the data item + with the given \a index and should be destroyed. The default behavior is a + call to deleteLater on the editor. It is possible e.g. to avoid this delete by + reimplementing this function. + \since 5.0 - - A function called when the \a editor is no longer needed for \a index and should be - destroyed. The default behavior is a call to deleteLater on the editor. - It possible e.g. to avoid this delete by reimplementing this function. - \sa createEditor() */ void QAbstractItemDelegate::destroyEditor(QWidget *editor, const QModelIndex &index) const diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 3402b4f3fe..37617acac2 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -3218,10 +3218,9 @@ void QAbstractItemView::update(const QModelIndex &index) } /*! - This slot is called when items are changed in the model. The - changed items are those from \a topLeft to \a bottomRight - inclusive. If just one item is changed \a topLeft == \a - bottomRight. + This slot is called when items with the given \a roles are changed in the + model. The changed items are those from \a topLeft to \a bottomRight + inclusive. If just one item is changed \a topLeft == \a bottomRight. The \a roles which have been changed can either be an empty container (meaning everything has changed), or a non-empty container with the subset of roles which have changed.