diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-05 22:26:44 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-05 22:26:44 +0200 |
commit | 0fcce50af009f97efa2a5c5f2c74415c92830962 (patch) | |
tree | f8abf0e4f445fed9480b426b2f856b50911f1210 /src/corelib/itemmodels/qabstractitemmodel.cpp | |
parent | 74d46a669badc5bf32187686102ca4e644a3c0af (diff) | |
parent | c54f7720d09e7d00f3309736bbeaaa6a81967ec1 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/features/qt.prf
src/plugins/platforms/xcb/qxcbwindow.h
src/tools/qdoc/qdocindexfiles.cpp
src/widgets/kernel/qwidget_qpa.cpp
Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67
Diffstat (limited to 'src/corelib/itemmodels/qabstractitemmodel.cpp')
-rw-r--r-- | src/corelib/itemmodels/qabstractitemmodel.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index 3e303e529c..fd70bcddce 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -1504,10 +1504,10 @@ QAbstractItemModel::~QAbstractItemModel() */ /*! - \fn void QAbstractItemModel::rowsInserted(const QModelIndex &parent, int start, int end) + \fn void QAbstractItemModel::rowsInserted(const QModelIndex &parent, int first, int last) This signal is emitted after rows have been inserted into the - model. The new items are those between \a start and \a end + model. The new items are those between \a first and \a last inclusive, under the given \a parent item. \note Components connected to this signal use it to adapt to changes in the @@ -1532,10 +1532,10 @@ QAbstractItemModel::~QAbstractItemModel() */ /*! - \fn void QAbstractItemModel::rowsRemoved(const QModelIndex &parent, int start, int end) + \fn void QAbstractItemModel::rowsRemoved(const QModelIndex &parent, int first, int last) 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 + removed items are those between \a first and \a last inclusive, under the given \a parent item. \note Components connected to this signal use it to adapt to changes @@ -1546,10 +1546,10 @@ QAbstractItemModel::~QAbstractItemModel() */ /*! - \fn void QAbstractItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) + \fn void QAbstractItemModel::rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) 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, + items that will be removed are those between \a first and \a last inclusive, under the given \a parent item. \note Components connected to this signal use it to adapt to changes @@ -1624,10 +1624,10 @@ QAbstractItemModel::~QAbstractItemModel() */ /*! - \fn void QAbstractItemModel::columnsInserted(const QModelIndex &parent, int start, int end) + \fn void QAbstractItemModel::columnsInserted(const QModelIndex &parent, int first, int last) 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 + new items are those between \a first and \a last inclusive, under the given \a parent item. \note Components connected to this signal use it to adapt to changes in the @@ -1638,10 +1638,10 @@ QAbstractItemModel::~QAbstractItemModel() */ /*! - \fn void QAbstractItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int start, int end) + \fn void QAbstractItemModel::columnsAboutToBeInserted(const QModelIndex &parent, int first, int last) 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 + new items will be positioned between \a first and \a last inclusive, under the given \a parent item. \note Components connected to this signal use it to adapt to changes in the @@ -1652,10 +1652,10 @@ QAbstractItemModel::~QAbstractItemModel() */ /*! - \fn void QAbstractItemModel::columnsRemoved(const QModelIndex &parent, int start, int end) + \fn void QAbstractItemModel::columnsRemoved(const QModelIndex &parent, int first, int last) This signal is emitted after columns have been removed from the model. - The removed items are those between \a start and \a end inclusive, + The removed items are those between \a first and \a last inclusive, under the given \a parent item. \note Components connected to this signal use it to adapt to changes in @@ -1666,10 +1666,10 @@ QAbstractItemModel::~QAbstractItemModel() */ /*! - \fn void QAbstractItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int start, int end) + \fn void QAbstractItemModel::columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) 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 + items to be removed are those between \a first and \a last inclusive, under the given \a parent item. \note Components connected to this signal use it to adapt to changes in the |