diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-27 15:45:08 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-27 15:46:39 +0200 |
| commit | 7b6ca817ade050ede4a27c94f5efd0e2ddb6d8bb (patch) | |
| tree | 0a8ad8e21bae4e3cf02470c60c79883be382c1e7 | |
| parent | 171fc02a556a28257af693459f9eae0bb168a535 (diff) | |
Fix warning about deprecated QAbstractItemModel::reset().
Change-Id: I76fb3cdf072c4947d16b9fc35a71e56223a286c9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp | 3 | ||||
| -rw-r--r-- | src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp index 89763ea..1b05b35 100644 --- a/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp +++ b/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp @@ -311,7 +311,8 @@ ObjectDescriptionModelData::~ObjectDescriptionModelData() void ObjectDescriptionModelData::setModelData(const QList<QExplicitlySharedDataPointer<ObjectDescriptionData> > &newData) { d->data = newData; - d->model->reset(); + d->model->beginResetModel(); + d->model->endResetModel(); } QList<QExplicitlySharedDataPointer<ObjectDescriptionData> > ObjectDescriptionModelData::modelData() const diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h b/src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h index 2200c8d..933b5fa 100644 --- a/src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h +++ b/src/3rdparty/phonon/phonon/objectdescriptionmodel_p.h @@ -45,6 +45,8 @@ class ListModelHelper : public QAbstractListModel using QAbstractListModel::endInsertRows; using QAbstractListModel::beginRemoveRows; using QAbstractListModel::endRemoveRows; + using QAbstractListModel::beginResetModel; + using QAbstractListModel::endResetModel; }; class ObjectDescriptionModelDataPrivate |