Changeset 561 for trunk/src/corelib/kernel/qabstractitemmodel.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/kernel/qabstractitemmodel.cpp (modified) (95 diffs)

trunk/src/corelib/kernel/qabstractitemmodel.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -252 +252 @@
     Returns true if this persistent model index refers to the same location as
     the \a other model index; otherwise returns false.
-    Note that all values in the persistent model index are used when comparing
-    with another model index.
+
+    All values in the persistent model index are used when comparing with
+    another model index.
 */
 
@@ -336 +337 @@
 
 /*!
-  Returns the parent QModelIndex for this persistent index, or
-  QModelIndex() if it has no parent.
-
-  \sa child() sibling() model()
+  
+   if it has no parent.
+
+  \sa child() sibling() model()
 */
 QModelIndex QPersistentModelIndex::parent() const
@@ -349 +350 @@
 
 /*!
-  Returns the sibling at \a row and \a column or an invalid
-  QModelIndex if there is no sibling at this position.
-
-  \sa parent() child()
+  
+   there is no sibling at this position.
+
+  \sa parent() child()
 */
 
@@ -363 +364 @@
 
 /*!
-  Returns the child of the model index that is stored in the given
-  \a row and \a column.
-
-  \sa parent() sibling()
+  
+   and \a column.
+
+  \sa parent() sibling()
 */
 
@@ -377 +378 @@
 
 /*!
-  Returns the data for the given \a role for the item referred to by the index.
-
-  \sa Qt::ItemDataRole, QAbstractItemModel::setData()
+    Returns the data for the given \a role for the item referred to by the
+    index.
+
+    \sa Qt::ItemDataRole, QAbstractItemModel::setData()
 */
 QVariant QPersistentModelIndex::data(int role) const
@@ -389 +391 @@
 
 /*!
-  \since 4.2
-
-  Returns the flags for the item referred to by the index.
+  \since 4.2
+
+  Returns the flags for the item referred to by the index.
 */
 Qt::ItemFlags QPersistentModelIndex::flags() const
@@ -401 +403 @@
 
 /*!
-  Returns the model that the index belongs to.
+  Returns the model that the index belongs to.
 */
 const QAbstractItemModel *QPersistentModelIndex::model() const
@@ -415 +417 @@
     Returns true if this persistent model index is valid; otherwise returns
     false.
-    A valid index belongs to a model, and has non-negative row and column numbers.
+
+    A valid index belongs to a model, and has non-negative row and column
+    numbers.
 
     \sa model(), row(), column()
@@ -429 +433 @@
 {
 #ifndef Q_BROKEN_DEBUG_STREAM
-    dbg.nospace() << "QModelIndex(" << idx.row() << "," << idx.column()
-                  << "," << idx.internalPointer() << "," << idx.model() << ")";
+    dbg.nospace() << "QModelIndex(" << idx.row() <<  << idx.column()
+                  << ;
     return dbg.space();
 #else
@@ -466 +470 @@
 {
     return qEmptyModel();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -526 +595 @@
             persistent.insertMultiAtEnd(data->index, data);
         } else {
-            qWarning() << "QAbstractItemModel::endInsertRows:  Invalid index (" << old.row() + count << "," << old.column() << ") in model" << q_func();
+            qWarning() << "QAbstractItemModel::endInsertRows:  Invalid index (" << old.row() + count <<  << old.column() << ") in model" << q_func();
         }
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -575 +755 @@
             persistent.insertMultiAtEnd(data->index, data);
         } else {
-            qWarning() << "QAbstractItemModel::endRemoveRows:  Invalid index (" << old.row() - count << "," << old.column() << ") in model" << q_func();
+            qWarning() << "QAbstractItemModel::endRemoveRows:  Invalid index (" << old.row() - count <<  << old.column() << ") in model" << q_func();
         }
     }
@@ -620 +800 @@
             persistent.insertMultiAtEnd(data->index, data);
         } else {
-            qWarning() << "QAbstractItemModel::endInsertColumns:  Invalid index (" << old.row() << "," << old.column() + count << ") in model" << q_func();
+            qWarning() << "QAbstractItemModel::endInsertColumns:  Invalid index (" << old.row() <<  << old.column() + count << ") in model" << q_func();
         }
      }
@@ -670 +850 @@
             persistent.insertMultiAtEnd(data->index, data);
         } else {
-            qWarning() << "QAbstractItemModel::endRemoveColumns:  Invalid index (" << old.row() << "," << old.column() - count << ") in model" << q_func();
+            qWarning() << "QAbstractItemModel::endRemoveColumns:  Invalid index (" << old.row() <<  << old.column() - count << ") in model" << q_func();
         }
     }
@@ -689 +869 @@
 
     \ingroup model-view
-    \mainclass
+
 
     This class is used as an index into item models derived from
@@ -696 +876 @@
 
     New QModelIndex objects are created by the model using the
-    QAbstractItemModel::createIndex() function. An \e invalid model index
-    can be constructed with the QModelIndex constructor. Invalid indexes are
-    often used as parent indexes when referring to top-level items in a model.
+    QAbstractItemModel::createIndex() function. An \e invalid model index
+    
+    used as parent indexes when referring to top-level items in a model.
 
     Model indexes refer to items in models, and contain all the information
     required to specify their locations in those models. Each index is located
-    in a given row and column, and may have a parent index; use row(), column(),
-    and parent() to obtain this information. Each top-level item in a model is
-    represented by a model index that does not have a parent index - in this
-    case, parent() will return an invalid model index, equivalent to an index
-    constructed with the zero argument form of the QModelIndex() constructor.
+    in a given row and column, and may have a parent index; use row(),
+    column(), and parent() to obtain this information. Each top-level item in a
+    model is represented by a model index that does not have a parent index -
+    in this case, parent() will return an invalid model index, equivalent to an
+    index constructed with the zero argument form of the QModelIndex()
+    constructor.
 
     To obtain a model index that refers to an existing item in a model, call
-    QAbstractItemModel::index() with the required row and column
-    values, and the model index of the parent. When referring to
-    top-level items in a model, supply QModelIndex() as the parent index.
+    QAbstractItemModel::index() with the required row and column
+    
+    model, supply QModelIndex() as the parent index.
 
     The model() function returns the model that the index references as a
-    QAbstractItemModel.
-    The child() function is used to examine the items held beneath the index
-    in the model.
-    The sibling() function allows you to traverse items in the model on the
-    same level as the index.
+    QAbstractItemModel. The child() function is used to examine items held
+    under the index in the model. The sibling() function allows you to traverse
+    items in the model on the same level as the index.
 
     \note Model indexes should be used immediately and then discarded. You
@@ -725 +904 @@
     keep a model index over time use a QPersistentModelIndex.
 
-    \sa \link model-view-programming.html Model/View Programming\endlink QPersistentModelIndex QAbstractItemModel
+    \sa  QAbstractItemModel
 */
 
@@ -731 +910 @@
     \fn QModelIndex::QModelIndex()
 
-    Creates a new empty model index.
-    This type of model index is used to indicate
-    that the position in the model is invalid.
+    Creates a new empty model index. This type of model index is used to
+    indicate that the position in the model is invalid.
 
     \sa isValid() QAbstractItemModel
@@ -796 +974 @@
 
     Returns true if this model index is valid; otherwise returns false.
-    A valid index belongs to a model, and has non-negative row and column numbers.
+
+    A valid index belongs to a model, and has non-negative row and column
+    numbers.
 
     \sa model(), row(), column()
@@ -807 +987 @@
     refers to.
 
-    You receive a const pointer to the model because calls to
-    non-const functions of the model might invalidate the model index
-    - and possibly crash your application.
+    
+    
+    crash your application.
 */
 
@@ -815 +995 @@
     \fn QModelIndex QModelIndex::sibling(int row, int column) const
 
-    Returns the sibling at \a row and \a column or an invalid
-    QModelIndex if there is no sibling at this position.
-
-    \sa parent() child()
+    Returns the sibling at \a row and \a column
+    .
+
+    \sa parent() child()
 */
 
@@ -824 +1004 @@
     \fn QModelIndex QModelIndex::child(int row, int column) const
 
-    Returns the child of the model index that is stored in the given
-    \a row and \a column.
-
-    \sa parent() sibling()
+    Returns the child of the model index that is stored in the given
+    \a column.
+
+    \sa parent() sibling()
 */
 
@@ -833 +1013 @@
     \fn QVariant QModelIndex::data(int role) const
 
-    Returns the data for the given \a role for the item referred to by the index.
+    Returns the data for the given \a role for the item referred to by the
+    index.
 */
 
@@ -846 +1027 @@
     \fn bool QModelIndex::operator==(const QModelIndex &other) const
 
-    Returns true if this model index refers to the same location as
+    Returns true if this model index refers to the same location as the
+    \a other model index; otherwise returns false.
+
+    All values in the model index are used when comparing with another model
+    index.
+*/
+
+
+/*!
+    \fn bool QModelIndex::operator!=(const QModelIndex &other) const
+
+    Returns true if this model index does not refer to the same location as
     the \a other model index; otherwise returns false.
-    Note that all values in the model index are used when comparing
-    with another model index.
-*/
-
-
-/*!
-    \fn bool QModelIndex::operator!=(const QModelIndex &other) const
-
-    Returns true if this model index does not refer to the same
-    location as the \a other model index; otherwise returns false.
-*/
-
-
-/*!
-  \fn QModelIndex QModelIndex::parent() const
-
-  Returns the parent of the model index, or QModelIndex() if it has no
-  parent.
-
-  \sa child() sibling() model()
+*/
+
+
+/*!
+    \fn QModelIndex QModelIndex::parent() const
+
+    Returns the parent of the model index, or QModelIndex() if it has no
+    parent.
+
+    \sa child(), sibling(), model()
 */
 
@@ -877 +1059 @@
 
     \ingroup model-view
-    \mainclass
+
 
     The QAbstractItemModel class defines the standard interface that item
@@ -896 +1078 @@
     a QModelIndex.
 
-    \img modelindex-no-parent.png
+    \im modelindex-no-parent.png
 
     Every item of data that can be accessed via a model has an associated model
@@ -1014 +1196 @@
     \sa {Model Classes}, {Model Subclassing Reference}, QModelIndex,
         QAbstractItemView, {Using Drag and Drop with Item Views},
-        {Simple DOM Model Example},
-        {Simple Tree Model Example}, {Editable Tree Model Example},
-        {Fetch More Example}
+        {Simple DOM Model Example}, {Simple Tree Model Example},
+        {Editable Tree Model Example}, {Fetch More Example}
 */
 
@@ -1025 +1206 @@
     \a column and \a parent index.
 
-    When reimplementing this function in a subclass, call createIndex() to generate
-    model indexes that other components can use to refer to items in your model.
+    When reimplementing this function in a subclass, call createIndex() to
+    generate model indexes that other components can use to refer to items in
+    your model.
 
     \sa createIndex()
@@ -1035 +1217 @@
 
     Inserts a single column before the given \a column in the child items of
-    the \a parent specified. Returns true if the column is inserted; otherwise
+    the \a parent specified.
+
+    Returns true if the column is inserted; otherwise returns false.
+
+    \sa insertColumns() insertRow() removeColumn()
+*/
+
+/*!
+    \fn bool QAbstractItemModel::insertRow(int row, const QModelIndex &parent)
+
+    \note The base class implementation of this function does nothing and
     returns false.
 
-    \sa insertColumns() insertRow() removeColumn()
-*/
-
-/*!
-    \fn bool QAbstractItemModel::insertRow(int row, const QModelIndex &parent)
-
     Inserts a single row before the given \a row in the child items of the
-    \a parent specified. Returns true if the row is inserted; otherwise
-    returns false.
+    \a parent specified.
+
+    Returns true if the row is inserted; otherwise returns false.
 
     \sa insertRows() insertColumn() removeRow()
@@ -1059 +1246 @@
     \fn QModelIndex QAbstractItemModel::parent(const QModelIndex &index) const = 0
 
-    Returns the parent of the model item with the given \a index, or QModelIndex()
-    if it has no parent.
+    Returns the parent of the model item with the given \a index
+    .
 
     A common convention used in models that expose tree data structures is that
-    only items in the first column have children. For that case, when reimplementing
-    this function in a subclass the column of the returned QModelIndex would be 0.
-
-    \note When reimplementing this function in a subclass, be careful to avoid
+    only items in the first column have children. For that case, when
+    reimplementing this function in a subclass the column of the returned
+    QModelIndex would be 0.
+
+    When reimplementing this function in a subclass, be careful to avoid
     calling QModelIndex member functions, such as QModelIndex::parent(), since
-    indexes belonging to your model will simply call your implementation, leading
-    to infinite recursion.
+    indexes belonging to your model will simply call your implementation,
+    to infinite recursion.
 
     \sa createIndex()
@@ -1077 +1265 @@
     \fn bool QAbstractItemModel::removeColumn(int column, const QModelIndex &parent)
 
-    Removes the given \a column from the child items of the \a parent specified.
+    Removes the given \a column from the child items of the \a parent
+    specified.
+
     Returns true if the column is removed; otherwise returns false.
 
@@ -1087 +1277 @@
 
     Removes the given \a row from the child items of the \a parent specified.
+
     Returns true if the row is removed; otherwise returns false.
 
-    The removeRow() is a convenience function that calls removeRows().
-    The QAbstractItemModel implementation of removeRows does nothing.
+    Th
+     does nothing.
 
     \sa removeRows(), removeColumn(), insertRow()
@@ -1102 +1293 @@
     sections in the header from the \a first to the \a last need to be updated.
 
-    Note that this signal must be emitted explicitly when
-    reimplementing the setHeaderData() function.
-
-    If you are changing the number of columns or rows you don't need
-    to emit this signal, but use the begin/end functions (see the
-    section on subclassing in the QAbstractItemModel class description
-    for details).
+    When reimplementing the setHeaderData() function, this signal must be
+    emitted explicitly.
+
+    If you are changing the number of columns or rows you do not need to emit
+    this signal, but use the begin/end functions (refer to the section on
+    subclassing in the QAbstractItemModel class description for details).
 
     \sa headerData(), setHeaderData(), dataChanged()
@@ -1118 +1308 @@
 
     This signal is emitted just before the layout of a model is changed.
-    Components connected to this signal use it to adapt to changes
-    in the model's layout.
+    Components connected to this signal use it to adapt to changes
+    model's layout.
 
     Subclasses should update any persistent model indexes after emitting
@@ -1131 +1321 @@
 
     This signal is emitted whenever the layout of items exposed by the model
-    has changed; for example, when the model has been sorted. When this signal is
-    received by a view, it should update the layout of items to reflect this
+    has changed; for example, when the model has been sorted. When this signal
+    received by a view, it should update the layout of items to reflect this
     change.
 
-    When subclassing QAbstractItemModel or QAbstractProxyModel, ensure that
-    you emit layoutAboutToBeChanged() before changing the order of items or
+    When subclassing QAbstractItemModel or QAbstractProxyModel, ensure that
+    emit layoutAboutToBeChanged() before changing the order of items or
     altering the structure of the data you expose to views, and emit
     layoutChanged() after changing the layout.
 
-    Subclasses should update any persistent model indexes before
-    emitting layoutChanged().
-
-    \sa layoutAboutToBeChanged(), dataChanged(), headerDataChanged(), reset(), changePersistentIndex()
+    Subclasses should update any persistent model indexes before emitting
+    layoutChanged(). In other words, when the structure changes:
+
+    \list
+        \o  Call beginLayoutChanged()
+        \o  Remember the QModelIndex that will change
+        \o  Update your internal data
+        \o  Call changePersistentIndex()
+        \o  Call endLayoutChanged()
+    \endlist
+
+
+    \sa layoutAboutToBeChanged(), dataChanged(), headerDataChanged(), modelReset(),
+        changePersistentIndex()
 */
 
@@ -1173 +1373 @@
     \fn QModelIndex QAbstractItemModel::sibling(int row, int column, const QModelIndex &index) const
 
-    Returns the sibling at \a row and \a column for the item at \a index, or
-    an invalid QModelIndex if there is no sibling at that location.
+    Returns the sibling at \a row and \a column for the item at \a index, or
+    invalid QModelIndex if there is no sibling at that location.
 
     sibling() is just a convenience function that finds the item's parent, and
-    uses it to retrieve the index of the child item in the specified \a row
-    and \a column.
+    uses it to retrieve the index of the child item in the specified \a row
+    \a column.
 
     \sa index(), QModelIndex::row(), QModelIndex::column()
@@ -1187 +1387 @@
     \fn int QAbstractItemModel::rowCount(const QModelIndex &parent) const
 
-    Returns the number of rows under the given \a parent.   When the parent
-    is valid it means that rowCount is returning the number of children of parent.
-
-    \bold{Tip:} When implementing a table based model, rowCount() should return 0 when
-    the parent is valid.
+    Returns the number of rows under the given \a parent. 
+    valid it means that rowCount is returning the number of children of parent.
+
+    \
+    the parent is valid.
 
     \sa columnCount()
@@ -1201 +1401 @@
     Returns the number of columns for the children of the given \a parent.
 
-    In most subclasses, the number of columns is independent of the
-    \a parent. For example:
+    In most subclasses, the number of columns is independent of the \a parent.
+
+    For example:
 
     \snippet examples/itemviews/simpledommodel/dommodel.cpp 2
 
-    \bold{Tip:} When implementing a table based model, columnCount() should return 0 when
-    the parent is valid.
+    \
+    the parent is valid.
 
     \sa rowCount()
@@ -1234 +1435 @@
     inclusive, under the given \a parent item.
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     \bold{Note:} Components connected to this signal use it to adapt to changes
     in the model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
-    \sa insertRows(), beginInsertRows()
-*/
-
-/*!
-    \fn void QAbstractItemModel::rowsAboutToBeInserted(const QModelIndex &parent, int start, int end)
-
-    This signal is emitted just before rows are inserted into the
-    model. The new items will be positioned between \a start and \a end
-    inclusive, under the given \a parent item.
+    \sa beginMoveRows()
+*/
+
+/*!
+    \fn void QAbstractItemModel::rowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)
+    \since 4.6
+
+    This signal is emitted just before rows are moved within the
+    model. The items that will be moved are those between \a sourceStart and \a sourceEnd
+    inclusive, under the given \a sourceParent item. They will be moved to \a destinationParent
+    starting at the row \a destinationRow.
 
     \bold{Note:} Components connected to this signal use it to adapt to changes
@@ -1252 +1513 @@
     implementation, and cannot be explicitly emitted in subclass code.
 
-    \sa insertRows(), beginInsertRows()
-*/
-
-/*!
-    \fn void QAbstractItemModel::rowsRemoved(const QModelIndex &parent, int start, int end)
-
-    This signal is emitted after rows have been removed from the
-    model. The removed items are those between \a start and \a end
-    inclusive, under the given \a parent item.
+    \sa beginMoveRows()
+*/
+
+/*!
+    \fn void QAbstractItemModel::columnsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)
+    \since 4.6
+
+    This signal is emitted after columns have been moved within the
+    model. The items between \a sourceStart and \a sourceEnd
+    inclusive, under the given \a sourceParent item have been moved to \a destinationParent
+    starting at the column \a destinationColumn.
 
     \bold{Note:} Components connected to this signal use it to adapt to changes
@@ -1266 +1529 @@
     implementation, and cannot be explicitly emitted in subclass code.
 
-    \sa removeRows(), beginRemoveRows()
-*/
-
-/*!
-    \fn void QAbstractItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
-
-    This signal is emitted just before rows are removed from the
-    model. The items that will be removed are those between \a start and \a end
-    inclusive, under the given \a parent item.
+    \sa beginMoveRows()
+*/
+
+/*!
+    \fn void QAbstractItemModel::columnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn)
+    \since 4.6
+
+    This signal is emitted just before columns are moved within the
+    model. The items that will be moved are those between \a sourceStart and \a sourceEnd
+    inclusive, under the given \a sourceParent item. They will be moved to \a destinationParent
+    starting at the column \a destinationColumn.
 
     \bold{Note:} Components connected to this signal use it to adapt to changes
@@ -1280 +1545 @@
     implementation, and cannot be explicitly emitted in subclass code.
 
-    \sa removeRows(), beginRemoveRows()
+    \sa oveRows()
 */
 
@@ -1286 +1551 @@
     \fn void QAbstractItemModel::columnsInserted(const QModelIndex &parent, int start, int end)
 
-    This signal is emitted after columns have been inserted into the
-    model. The new items are those between \a start and \a end
-    inclusive, under the given \a parent item.
-
-    \bold{Note:} Components connected to this signal use it to adapt to changes
-    in the model's dimensions. It can only be emitted by the QAbstractItemModel
+    This signal is emitted after columns have been inserted into the
+    
+    \a parent item.
+
+    \
+    model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
@@ -1300 +1565 @@
     \fn void QAbstractItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int start, int end)
 
-    This signal is emitted just before columns are inserted into the
-    model. The new items will be positioned between \a start and \a end
-    inclusive, under the given \a parent item.
-
-    \bold{Note:} Components connected to this signal use it to adapt to changes
-    in the model's dimensions. It can only be emitted by the QAbstractItemModel
+    This signal is emitted just before columns are inserted into the
+    
+    the given \a parent item.
+
+    \
+    model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
@@ -1314 +1579 @@
     \fn void QAbstractItemModel::columnsRemoved(const QModelIndex &parent, int start, int end)
 
-    This signal is emitted after columns have been removed from the
-    model. The removed items are those between \a start and \a end
-    inclusive, under the given \a parent item.
-
-    \bold{Note:} Components connected to this signal use it to adapt to changes
-    in the model's dimensions. It can only be emitted by the QAbstractItemModel
+    This signal is emitted after columns have been removed from the
+    
+    under the given \a parent item.
+
+    \
+    the model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
@@ -1328 +1593 @@
     \fn void QAbstractItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
 
-    This signal is emitted just before columns are removed
-    from the model. The items to be removed are those between \a start and
-    \a end inclusive, under the given \a parent item.
-
-    \bold{Note:} Components connected to this signal use it to adapt to changes
-    in the model's dimensions. It can only be emitted by the QAbstractItemModel
+    This signal is emitted just before columns are removed
+    
+    the given \a parent item.
+
+    \
+    model's dimensions. It can only be emitted by the QAbstractItemModel
     implementation, and cannot be explicitly emitted in subclass code.
 
@@ -1340 +1605 @@
 
 /*!
-  Returns true if the model returns a valid QModelIndex for \a row and
-  \a column with \a parent, otherwise returns false.
+  Returns true if the model returns a valid QModelIndex for \a row and
+  \a column with \a parent, otherwise returns false.
 */
 bool QAbstractItemModel::hasIndex(int row, int column, const QModelIndex &parent) const
@@ -1352 +1617 @@
 
 /*!
-  Returns true if \a parent has any children; otherwise returns false.
-  Use rowCount() on the parent to find out the number of children.
-
-  \sa parent() index()
+    Returns true if \a parent has any children; otherwise returns false.
+
+    Use rowCount() on the parent to find out the number of children.
+
+    \sa parent() index()
 */
 bool QAbstractItemModel::hasChildren(const QModelIndex &parent) const
@@ -1364 +1630 @@
 
 /*!
-    Returns a map with values for all predefined roles in the model
-    for the item at the given \a index.
-
-    Reimplemented this function if you want to extend the default behavior
-    of this function to include custom roles in the map.
+    Returns a map with values for all predefined roles in the model
+    item at the given \a index.
+
+    Reimplement
+    this function to include custom roles in the map.
 
     \sa Qt::ItemDataRole, data()
@@ -1377 +1643 @@
     for (int i = 0; i < Qt::UserRole; ++i) {
         QVariant variantData = data(index, i);
-        if (variantData.type() != QVariant::Invalid)
+        if (variantData.)
             roles.insert(i, variantData);
     }
@@ -1385 +1651 @@
 /*!
     Sets the \a role data for the item at \a index to \a value.
+
     Returns true if successful; otherwise returns false.
 
-    The dataChanged() signal should be emitted if the data was successfully set.
-
-    The base class implementation returns false. This function and
-    data() must be reimplemented for editable models. Note that the
-    dataChanged() signal must be emitted explicitly when
-    reimplementing this function.
+    The dataChanged() signal should be emitted if the data was successfully
+    set.
+
+    The base class implementation returns false. This function and data() must
+    be reimplemented for editable models.
 
     \sa Qt::ItemDataRole, data(), itemData()
@@ -1411 +1677 @@
 
     \note If you do not have a value to return, return an \bold invalid
-    QVariant() instead of returning 0.
+    QVariant instead of returning 0.
 
     \sa Qt::ItemDataRole, setData(), headerData()
@@ -1418 +1684 @@
 /*!
     Sets the role data for the item at \a index to the associated value in
-    \a roles, for every Qt::ItemDataRole. Returns true if successful; otherwise
-    returns false.
+    \a roles, for every Qt::ItemDataRole.
+
+    Returns true if successful; otherwise returns false.
 
     Roles that are not in \a roles will not be modified.
@@ -1434 +1701 @@
 
 /*!
-    Returns a list of MIME types that can be used to describe a list of
-    model indexes.
+    Returns a list of MIME types that can be used to describe a list of
+    indexes.
 
     \sa mimeData()
@@ -1447 +1714 @@
 
 /*!
-    Returns an object that contains serialized items of data corresponding to the
-    list of \a indexes specified. The formats used to describe the encoded data
-    is obtained from the mimeTypes() function.
-
-    If the list of indexes is empty, or there are no supported MIME types,
-    0 is returned rather than a serialized empty list.
+    Returns an object that contains serialized items of data corresponding to
+    
+    is obtained from the mimeTypes() function.
+
+    If the list of indexes is empty, or there are no supported MIME types,
+    returned rather than a serialized empty list.
 
     \sa mimeTypes(), dropMimeData()
@@ -1474 +1741 @@
 /*!
     Handles the \a data supplied by a drag and drop operation that ended with
-    the given \a action. Returns true if the data and action can be handled
-    by the model; otherwise returns false.
-
-    Although the specified \a row, \a column and \a parent indicate the location of
-    an item in the model where the operation ended, it is the responsibility of the
-    view to provide a suitable location for where the data should be inserted.
-
-    For instance, a drop action on an item in a QTreeView can result in new items
-    either being inserted as children of the item specified by \a row, \a column,
-    and \a parent, or as siblings of the item.
+    the given \a action.
+
+    Returns true if the data and action can be handled by the model; otherwise
+    returns false.
+
+    Although the specified \a row, \a column and \a parent indicate the
+    location of an item in the model where the operation ended, it is the
+    responsibility of the view to provide a suitable location for where the
+    data should be inserted.
+
+    For instance, a drop action on an item in a QTreeView can result in new
+    items either being inserted as children of the item specified by \a row,
+    \a column, and \a parent, or as siblings of the item.
 
     When row and column are -1 it means that it is up to the model to decide
-    where to place the data.  This can occur in a tree when data is dropped
-    on a parent.  Models will usually append the data to the parent in this case.
-
-    Returns true if the dropping was successful otherwise false.
+    where to place the data. This can occur in a tree when data is dropped on
+    a parent. Models will usually append the data to the parent in this case.
 
     \sa supportedDropActions(), {Using Drag and Drop with Item Views}
@@ -1519 +1787 @@
 
 /*!
-  \since 4.2
-
-  Returns the drop actions supported by this model.
-
-  The default implementation returns Qt::CopyAction. Reimplement this
-  function if you wish to support additional actions. Note that you
-  must also reimplement the dropMimeData() function to handle the
-  additional operations.
-
-  \sa dropMimeData(), Qt::DropActions, {Using Drag and Drop with Item
-  Views}
+  \since 4.2
+
+  Returns the drop actions supported by this model.
+
+  The default implementation returns Qt::CopyAction. Reimplement this
+  
+  
+   operations.
+
+  \sa dropMimeData(), Qt::DropActions, {Using Drag and Drop with Item
+  Views}
 */
 Qt::DropActions QAbstractItemModel::supportedDropActions() const
@@ -1537 +1805 @@
 
 /*!
-  Returns the actions supported by the data in this model.
-
-  The default implementation returns supportedDropActions() unless
-  specific values have been set with setSupportedDragActions().
-
-  supportedDragActions() is used by QAbstractItemView::startDrag() as
-  the default values when a drag occurs.
-
-  \sa Qt::DropActions, {Using Drag and Drop with Item Views}
+  Returns the actions supported by the data in this model.
+
+  
+   values have been set with setSupportedDragActions().
+
+  
+   default values when a drag occurs.
+
+  \sa Qt::DropActions, {Using Drag and Drop with Item Views}
 */
 Qt::DropActions QAbstractItemModel::supportedDragActions() const
@@ -1570 +1838 @@
 
 /*!
-  On models that support this, inserts \a count rows into the model before the
-  given \a row.  The items in the new row will be children of the item
-  represented by the \a parent model index.
-
-  If \a row is 0, the rows are prepended to any existing rows in the parent.
-  If \a row is rowCount(), the rows are appended to any existing rows in the
-  parent.
-  If \a parent has no children, a single column with \a count rows is inserted.
-
-  Returns true if the rows were successfully inserted; otherwise returns
-  false.
-
-  The base class implementation does nothing and returns false.
-
-  If you implement your own model, you can reimplement this function
-  if you want to support insertions. Alternatively, you can provide
-  you own API for altering the data.
-
-  \sa insertColumns(), removeRows(), beginInsertRows(), endInsertRows()
+    \note The base class implementation of this function does nothing and
+    returns false.
+
+    On models that support this, inserts \a count rows into the model before
+    the given \a row. Items in the new row will be children of the item
+    represented by the \a parent model index.
+
+    If \a row is 0, the rows are prepended to any existing rows in the parent.
+
+    If \a row is rowCount(), the rows are appended to any existing rows in the
+    parent.
+
+    If \a parent has no children, a single column with \a count rows is
+    inserted.
+
+    Returns true if the rows were successfully inserted; otherwise returns
+    false.
+
+    If you implement your own model, you can reimplement this function if you
+    want to support insertions. Alternatively, you can provide your own API for
+    altering the data. In either case, you will need to call
+    beginInsertRows() and endInsertRows() to notify other components that the
+    model has changed.
+
+    \sa insertColumns(), removeRows(), beginInsertRows(), endInsertRows()
 */
 bool QAbstractItemModel::insertRows(int, int, const QModelIndex &)
@@ -1596 +1870 @@
 
 /*!
-  On models that support this, inserts \a count new columns into the model
-  before the given \a column.  The items in each new column will be children
-  of the item represented by the \a parent model index.
-
-  If \a column is 0, the columns are prepended to any existing columns.
-  If \a column is columnCount(), the columns are appended to any existing
-  columns.
-  If \a parent has no children, a single row with \a count columns is inserted.
-
-  Returns true if the columns were successfully inserted; otherwise returns
-  false.
-
-  The base class implementation does nothing and returns false.
-
-  If you implement your own model, you can reimplement this function
-  if you want to support insertions. Alternatively, you can provide
-  you own API for altering the data.
-
-  \sa insertRows(), removeColumns(), beginInsertColumns(), endInsertColumns()
+    On models that support this, inserts \a count new columns into the model
+    before the given \a column. The items in each new column will be children
+    of the item represented by the \a parent model index.
+
+    If \a column is 0, the columns are prepended to any existing columns.
+
+    If \a column is columnCount(), the columns are appended to any existing
+    columns.
+
+    If \a parent has no children, a single row with \a count columns is
+    inserted.
+
+    Returns true if the columns were successfully inserted; otherwise returns
+    false.
+
+    The base class implementation does nothing and returns false.
+
+    If you implement your own model, you can reimplement this function if you
+    want to support insertions. Alternatively, you can provide your own API for
+    altering the data.
+
+    \sa insertRows(), removeColumns(), beginInsertColumns(), endInsertColumns()
 */
 bool QAbstractItemModel::insertColumns(int, int, const QModelIndex &)
@@ -1623 +1900 @@
 /*!
     On models that support this, removes \a count rows starting with the given
-    \a row under parent \a parent from the model. Returns true if the rows
-    were successfully removed; otherwise returns false.
+    \a row under parent \a parent from the model.
+
+    Returns true if the rows were successfully removed; otherwise returns
+    false.
 
     The base class implementation does nothing and returns false.
 
-    If you implement your own model, you can reimplement this function
-    if you want to support removing. Alternatively, you can provide
-    you own API for altering the data.
-
-    \sa removeRow(), removeColumns(), insertColumns(), beginRemoveRows(), endRemoveRows()
+    If you implement your own model, you can reimplement this function if you
+    want to support removing. Alternatively, you can provide your own API for
+    altering the data.
+
+    \sa removeRow(), removeColumns(), insertColumns(), beginRemoveRows(),
+        endRemoveRows()
 */
 bool QAbstractItemModel::removeRows(int, int, const QModelIndex &)
@@ -1641 +1921 @@
 /*!
     On models that support this, removes \a count columns starting with the
-    given \a column under parent \a parent from the model. Returns true if the
-    columns were successfully removed; otherwise returns false.
+    given \a column under parent \a parent from the model.
+
+    Returns true if the columns were successfully removed; otherwise returns
+    false.
 
     The base class implementation does nothing and returns false.
 
-    If you implement your own model, you can reimplement this function
-    if you want to support removing. Alternatively, you can provide
-    you own API for altering the data.
-
-    \sa removeColumn(), removeRows(), insertColumns(), beginRemoveColumns(), endRemoveColumns()
+    If you implement your own model, you can reimplement this function if you
+    want to support removing. Alternatively, you can provide your own API for
+    altering the data.
+
+    \sa removeColumn(), removeRows(), insertColumns(), beginRemoveColumns(),
+        endRemoveColumns()
 */
 bool QAbstractItemModel::removeColumns(int, int, const QModelIndex &)
@@ -1673 +1956 @@
 
 /*!
-    Returns true if there is more data available for \a parent; otherwise returns
-    false.
-    
+    Returns true if there is more data available for \a parent; otherwise
+    false.
+
     The default implementation always returns false.
 
@@ -1692 +1975 @@
     Returns the item flags for the given \a index.
 
-    The base class implementation returns a combination of flags that
-    enables the item (\c ItemIsEnabled) and allows it to be
-    selected (\c ItemIsSelectable).
+    The base class implementation returns a combination of flags that
+    
+    (\c ItemIsSelectable).
 
     \sa Qt::ItemFlags
@@ -1720 +2003 @@
 
 /*!
-  Returns a model index for the buddy of the item represented by \a index.
-  When the user wants to edit an item, the view will call this function to
-  check whether another item in the model should be edited instead, and
-  construct a delegate using the model index returned by the buddy item.
-
-  In the default implementation each item is its own buddy.
+    Returns a model index for the buddy of the item represented by \a index.
+    When the user wants to edit an item, the view will call this function to
+    check whether another item in the model should be edited instead. Then, the
+    view will construct a delegate using the model index returned by the buddy
+    item.
+
+    The default implementation of this function has each item as its own buddy.
 */
 QModelIndex QAbstractItemModel::buddy(const QModelIndex &index) const
@@ -1733 +2017 @@
 
 /*!
-    Returns a list of indexes for the items in the column of the \a
-    start index where the data stored under the given \a role matches
-    the specified \a value. The way the search is performed is defined
-    by the \a flags given. The list that is returned may be empty.
-
-    The search starts from the \a start index, and continues until the
-    number of matching data items equals \a hits, the search reaches
-    the last row, or the search reaches \a start again, depending on
-    whether \c MatchWrap is specified in \a flags. If you want to search
-    for all matching items, use \a hits = -1.
+    Returns a list of indexes for the items in the column of the \a
+    
+    
+    that is returned may be empty.
+
+    The search 
+    
+    the 
+    
+    \a hits = -1.
 
     By default, this function will perform a wrapping, string-based comparison
     on all items, searching for items that begin with the search term specified
     by \a value.
-    
-    \note The default implementation of this function only searches columns,
-    This function can be reimplemented to include other search behavior.
+
+    \note The default implementation of this function only searches columns
+     search behavior.
 */
 QModelIndexList QAbstractItemModel::match(const QModelIndex &start, int role,
@@ -1824 +2108 @@
     Returns the row and column span of the item represented by \a index.
 
-    Note: span is not used currently, but will be in the future.
+    .
 */
 
@@ -1833 +2117 @@
 
 /*!
-  Called to let the model know that it should submit whatever it has cached
-  to the permanent storage. Typically used for row editing.
-
-  Returns false on error, otherwise true.
+    \since 4.6
+
+    Sets the model's role names to \a roleNames.
+
+    This function allows mapping of role identifiers to role property names in
+    Declarative UI.  This function must be called before the model is used.
+    Modifying the role names after the model has been set may result in
+    undefined behaviour.
+
+    \sa roleNames()
+*/
+void QAbstractItemModel::setRoleNames(const QHash<int,QByteArray> &roleNames)
+{
+    Q_D(QAbstractItemModel);
+    d->roleNames = roleNames;
+}
+
+/*!
+    \since 4.6
+
+    Returns the model's role names.
+
+    \sa setRoleNames()
+*/
+const QHash<int,QByteArray> &QAbstractItemModel::roleNames() const
+{
+    Q_D(const QAbstractItemModel);
+    return d->roleNames;
+}
+
+/*!
+    Lets the model know that it should submit cached information to permanent
+    storage. This function is typically used for row editing.
+
+    Returns true if there is no error; otherwise returns false.
+
+    \sa revert()
 */
 
@@ -1845 +2162 @@
 
 /*!
-  Called to let the model know that it should discard whatever it has cached.
-  Typically used for row editing.
+    Lets the model know that it should discard cached information. This
+    function is typically used for row editing.
+
+    \sa submit()
 */
 
@@ -1855 +2174 @@
 
 /*!
-  Returns the data for the given \a role and \a section in the header
-  with the specified \a orientation.
-
-  For horizontal headers, the section number corresponds to the column
-  number of items shown beneath it. For vertical headers, the section
-  number typically to the row number of items shown alongside it.
-
-  \sa Qt::ItemDataRole, setHeaderData(), QHeaderView
+  
+   the specified \a orientation.
+
+  For horizontal headers, the section number corresponds to the column
+  
+  .
+
+  \sa Qt::ItemDataRole, setHeaderData(), QHeaderView
 */
 
@@ -1874 +2193 @@
 
 /*!
-  Sets the data for the given \a role and \a section in the header with
-  the specified \a orientation to the \a value supplied.
-  Returns true if the header's data was updated; otherwise returns false.
-
-  Note that the headerDataChanged() signal must be emitted explicitly
-  when reimplementing this function.
-
-  \sa Qt::ItemDataRole, headerData()
+    Sets the data for the given \a role and \a section in the header with the
+    specified \a orientation to the \a value supplied.
+
+    Returns true if the header's data was updated; otherwise returns false.
+
+    When reimplementing this function, the headerDataChanged() signal must be
+    emitted explicitly.
+
+    \sa Qt::ItemDataRole, headerData()
 */
 
@@ -1897 +2217 @@
     \fn QModelIndex QAbstractItemModel::createIndex(int row, int column, void *ptr) const
 
-    Creates a model index for the given \a row and \a column with the internal pointer \a ptr.
-
-    Note that when you are using a QSortFilterProxyModel its indexes have their own
-    internal pointer.  It is not advisable to access the internal pointer in the index
-    outside of the model.  Use the data() function instead.
+    Creates a model index for the given \a row and \a column with the internal
+    pointer \a ptr.
+
+    When using a QSortFilterProxyModel, its indexes have their own internal
+    pointer. It is not advisable to access this internal pointer outside of the
+    model. Use the data() function instead.
 
     This function provides a consistent interface that model subclasses must
@@ -1911 +2232 @@
     \obsolete
 
-    Use QModelIndex QAbstractItemModel::createIndex(int row, int column, quint32 id) instead.
+    Use QModelIndex
+    QAbstractItemModel::createIndex(int row, int column, quint32 id) instead.
 */
 
@@ -1922 +2244 @@
     This function provides a consistent interface that model subclasses must
     use to create model indexes.
+
     \sa QModelIndex::internalId()
 */
@@ -2025 +2348 @@
     Begins a row insertion operation.
 
-    When reimplementing insertRows() in a subclass, you must call this
-    function \e before inserting data into the model's underlying data
-    store.
-
-    The \a parent index corresponds to the parent into which the new
-    rows are inserted; \a first and \a last are the row numbers that the
-    new rows will have after they have been inserted.
+    When reimplementing insertRows() in a subclass, you must call this function
+    \e before inserting data into the model's underlying data store.
+
+    The \a parent index corresponds to the parent into which the new rows are
+    inserted; \a first and \a last are the row numbers that the new rows will
+    have after they have been inserted.
 
     \table 80%
-    \row \o \inlineimage modelview-begin-insert-rows.png Inserting rows
-    \o Specify the first and last row numbers for the span of rows
-       you want to insert into an item in a model.
-
-    For example, as shown in the diagram, we insert three rows before
-    row 2, so \a first is 2 and \a last is 4:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 0
-    This inserts the three new rows as rows 2, 3, and 4.
     \row
-    \o \inlineimage modelview-begin-append-rows.png Appending rows
-    \o To append rows, insert them after the last row.
-
-    For example, as shown in the diagram, we append two rows to a
-    collection of 4 existing rows (ending in row 3), so \a first is 4
-    and \a last is 5:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 1
-    This appends the two new rows as rows 4 and 5.
+        \o  \inlineimage modelview-begin-insert-rows.png Inserting rows
+        \o  Specify the first and last row numbers for the span of rows you
+            want to insert into an item in a model.
+
+            For example, as shown in the diagram, we insert three rows before
+            row 2, so \a first is 2 and \a last is 4:
+
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 0
+
+            This inserts the three new rows as rows 2, 3, and 4.
+    \row
+        \o  \inlineimage modelview-begin-append-rows.png Appending rows
+        \o  To append rows, insert them after the last row.
+
+            For example, as shown in the diagram, we append two rows to a
+            collection of 4 existing rows (ending in row 3), so \a first is 4
+            and \a last is 5:
+
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 1
+
+            This appends the two new rows as rows 4 and 5.
     \endtable
 
+
+
+
     \sa endInsertRows()
 */
@@ -2068 +2398 @@
     Ends a row insertion operation.
 
-    When reimplementing insertRows() in a subclass, you must call this
-    function \e after inserting data into the model's underlying data
-    store.
+    When reimplementing insertRows() in a subclass, you must call this function
+    \e after inserting data into the model's underlying data store.
 
     \sa beginInsertRows()
@@ -2086 +2415 @@
 
     When reimplementing removeRows() in a subclass, you must call this
-    function \e before removing data from the model's underlying data
-    store.
-
-    The \a parent index corresponds to the parent from which the new
-    rows are removed; \a first and \a last are the row numbers of the
-    rows to be removed.
+    function \e before removing data from the model's underlying data store.
+
+    The \a parent index corresponds to the parent from which the new rows are
+    removed; \a first and \a last are the row numbers of the rows to be
+    removed.
 
     \table 80%
-    \row \o \inlineimage modelview-begin-remove-rows.png Removing rows
-    \o Specify the first and last row numbers for the span of rows
-       you want to remove from an item in a model.
-
-    For example, as shown in the diagram, we remove the two rows from
-    row 2 to row 3, so \a first is 2 and \a last is 3:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 2
+    \row
+        \o  \inlineimage modelview-begin-remove-rows.png Removing rows
+        \o  Specify the first and last row numbers for the span of rows you
+            want to remove from an item in a model.
+
+            For example, as shown in the diagram, we remove the two rows from
+            row 2 to row 3, so \a first is 2 and \a last is 3:
+
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 2
     \endtable
+
+
+
+
 
     \sa endRemoveRows()
@@ -2118 +2452 @@
     Ends a row removal operation.
 
-    When reimplementing removeRows() in a subclass, you must call this
-    function \e after removing data from the model's underlying data
-    store.
+    When reimplementing removeRows() in a subclass, you must call this function
+    \e after removing data from the model's underlying data store.
 
     \sa beginRemoveRows()
@@ -2133 +2466 @@
 
 /*!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     Begins a column insertion operation.
 
     When reimplementing insertColumns() in a subclass, you must call this
-    function \e before inserting data into the model's underlying data
-    store.
-
-    The \a parent index corresponds to the parent into which the new
-    columns are inserted; \a first and \a last are the column numbers of
-    the new columns will have after they have been inserted.
+    function \e before inserting data into the model's underlying data store.
+
+    The \a parent index corresponds to the parent into which the new columns
+    are inserted; \a first and \a last are the column numbers of the new
+    columns will have after they have been inserted.
 
     \table 80%
-    \row \o \inlineimage modelview-begin-insert-columns.png Inserting columns
-    \o Specify the first and last column numbers for the span of columns
-       you want to insert into an item in a model.
-
-    For example, as shown in the diagram, we insert three columns before
-    column 4, so \a first is 4 and \a last is 6:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 3
-    This inserts the three new columns as columns 4, 5, and 6.
     \row
-    \o \inlineimage modelview-begin-append-columns.png Appending columns
-    \o To append columns, insert them after the last column.
-
-    For example, as shown in the diagram, we append three columns to a
-    collection of six existing columns (ending in column 5), so \a first
-    is 6 and \a last is 8:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 4
-    This appends the two new columns as columns 6, 7, and 8.
+        \o  \inlineimage modelview-begin-insert-columns.png Inserting columns
+        \o  Specify the first and last column numbers for the span of columns
+            you want to insert into an item in a model.
+
+            For example, as shown in the diagram, we insert three columns
+            before column 4, so \a first is 4 and \a last is 6:
+
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 3
+
+            This inserts the three new columns as columns 4, 5, and 6.
+    \row
+        \o  \inlineimage modelview-begin-append-columns.png Appending columns
+        \o  To append columns, insert them after the last column.
+
+            For example, as shown in the diagram, we append three columns to a
+            collection of six existing columns (ending in column 5), so
+            \a first is 6 and \a last is 8:
+
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 4
+
+            This appends the two new columns as columns 6, 7, and 8.
     \endtable
+
+
+
+
 
     \sa endInsertColumns()
@@ -2196 +2651 @@
 
     When reimplementing removeColumns() in a subclass, you must call this
-    function \e before removing data from the model's underlying data
-    store.
-
-    The \a parent index corresponds to the parent from which the new
-    columns are removed; \a first and \a last are the column numbers of
-    the first and last columns to be removed.
+    function \e before removing data from the model's underlying data store.
+
+    The \a parent index corresponds to the parent from which the new columns
+    are removed; \a first and \a last are the column numbers of the first and
+    last columns to be removed.
 
     \table 80%
-    \row \o \inlineimage modelview-begin-remove-columns.png Removing columns
-    \o Specify the first and last column numbers for the span of columns
-       you want to remove from an item in a model.
-
-    For example, as shown in the diagram, we remove the three columns
-    from column 4 to column 6, so \a first is 4 and \a last is 6:
-    \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 5
+    \row
+        \o  \inlineimage modelview-begin-remove-columns.png Removing columns
+        \o  Specify the first and last column numbers for the span of columns
+            you want to remove from an item in a model.
+
+            For example, as shown in the diagram, we remove the three columns
+            from column 4 to column 6, so \a first is 4 and \a last is 6:
+
+            \snippet doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp 5
     \endtable
+
+
+
+
 
     \sa endRemoveColumns()
@@ -2229 +2689 @@
 
     When reimplementing removeColumns() in a subclass, you must call this
-    function \e after removing data from the model's underlying data
-    store.
+    function \e after removing data from the model's underlying data store.
 
     \sa beginRemoveColumns()
@@ -2243 +2702 @@
 
 /*!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     Resets the model to its original state in any attached views.
 
-    \note The view to which the model is attached to will be reset as well.
-
-    When a model is reset it means that any previous data reported from the
-    model is now invalid and has to be queried for again.
-
-    When a model radically changes its data it can sometimes be easier to just
-    call this function rather than emit dataChanged() to inform other
-    components when the underlying data source, or its structure, has changed.
-
-    \sa modelAboutToBeReset(), modelReset()
+    \note Use beginResetModel() and endResetModel() instead whenever possible.
+    Use this method only if there is no way to call beginResetModel() before invalidating the model.
+    Otherwise it could lead to unexcpected behaviour, especially when used with proxy models.
 */
 void QAbstractItemModel::reset()
@@ -2265 +2799 @@
 
 /*!
-  Changes the QPersistentModelIndex that is equal to the given \a from
-  model index to the given \a to model index.
-
-  If no persistent model index equal to the given \a from model index was
-  found, nothing is changed.
-
-  \sa persistentIndexList(), changePersistentIndexList()
+    Begins a model reset operation.
+
+    A reset operation resets the model to its current state in any attached views.
+
+    \note Any views attached to this model will be reset as well.
+
+    When a model is reset it means that any previous data reported from the
+    model is now invalid and has to be queried for again. This also means that
+    the current item and any selected items will become invalid.
+
+    When a model radically changes its data it can sometimes be easier to just
+    call this function rather than emit dataChanged() to inform other
+    components when the underlying data source, or its structure, has changed.
+
+    You must call this function before resetting any internal data structures in your model
+    or proxy model.
+
+    \sa modelAboutToBeReset(), modelReset(), endResetModel()
+    \since 4.6
+*/
+void QAbstractItemModel::beginResetModel()
+{
+    emit modelAboutToBeReset();
+}
+
+/*!
+    Completes a model reset operation.
+
+    You must call this function after resetting any internal data structure in your model
+    or proxy model.
+
+    \sa beginResetModel()
+    \since 4.6
+*/
+void QAbstractItemModel::endResetModel()
+{
+    Q_D(QAbstractItemModel);
+    d->invalidatePersistentIndexes();
+    emit modelReset();
+}
+
+/*!
+    Changes the QPersistentModelIndex that is equal to the given \a from model
+    index to the given \a to model index.
+
+    If no persistent model index equal to the given \a from model index was
+    found, nothing is changed.
+
+    \sa persistentIndexList(), changePersistentIndexList()
 */
 void QAbstractItemModel::changePersistentIndex(const QModelIndex &from, const QModelIndex &to)
@@ -2292 +2868 @@
 
 /*!
-  \since 4.1
-
-  Changes the QPersistentModelIndexes that is equal to the indexes in the given \a from
-  model index list to the given \a to model index list.
-
-  If no persistent model indexes equal to the indexes in the given \a from model index list
-  was found, nothing is changed.
-
-  \sa persistentIndexList(), changePersistentIndex()
+  \since 4.1
+
+  
+  model index list to the given \a to model index list.
+
+  
+  was found, nothing is changed.
+
+  \sa persistentIndexList(), changePersistentIndex()
 */
 void QAbstractItemModel::changePersistentIndexList(const QModelIndexList &from,
@@ -2333 +2909 @@
 
 /*!
-  \since 4.2
-
-  Returns the list of indexes stored as persistent indexes in the model.
+  \since 4.2
+
+  Returns the list of indexes stored as persistent indexes in the model.
 */
 QModelIndexList QAbstractItemModel::persistentIndexList() const
@@ -2362 +2938 @@
 
     Since the model provides a more specialized interface than
-    QAbstractItemModel, it is not suitable for use with tree views, although
-    it can be used to provide data to a QListView. If you need to represent
-    a simple list of items, and only need a model to contain a single column
-    of data, subclassing the QAbstractListModel may be more appropriate.
+    QAbstractItemModel, it is not suitable for use with tree views, although
+    
+    
+    data, subclassing the QAbstractListModel may be more appropriate.
 
     The rowCount() and columnCount() functions return the dimensions of the
@@ -2372 +2948 @@
 
     \section1 Subclassing
-
-    \bold{Note:} Some general guidelines for subclassing models are
-    available in the \l{Model Subclassing Reference}.
 
     When subclassing QAbstractTableModel, you must implement rowCount(),
@@ -2406 +2979 @@
     \endlist
 
-    \sa {Model Classes}, {Model Subclassing Reference}, QAbstractItemModel,
-        QAbstractListModel,
-        {Pixelator Example}
+    \note Some general guidelines for subclassing models are available in the
+    \l{Model Subclassing Reference}.
+
+    \note
+
+    \sa {Model Classes}, QAbstractItemModel, QAbstractListModel,
+    {Pixelator Example}
 */
 
@@ -2505 +3082 @@
 
     \section1 Subclassing
-
-    \bold{Note:} Some general guidelines for subclassing models are
-    available in the \l{Model Subclassing Reference}.
 
     When subclassing QAbstractListModel, you must provide implementations
@@ -2534 +3108 @@
        call endRemoveRows() \e{immediately afterwards}.
     \endlist
+
+
+
 
     \sa {Model Classes}, {Model Subclassing Reference}, QAbstractItemView,
@@ -2730 +3307 @@
     state (e.g. persistent model indexes) has been invalidated.
 
-    \sa reset(), modelReset()
+    \sa (), modelReset()
 */
 
@@ -2740 +3317 @@
     state (e.g. persistent model indexes) has been invalidated.
 
-    \sa reset(), modelAboutToBeReset()
+    \sa (), modelAboutToBeReset()
 */