summaryrefslogtreecommitdiffstats
path: root/src/widgets/util/qcompleter.cpp
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-09-27 17:25:45 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-27 18:35:55 +0200
commit764c4fa8fec7bcfadec79c65319946d0c2ab292c (patch)
treea66c831c32dafb4fc35f5425840b777e662d262e /src/widgets/util/qcompleter.cpp
parent1f2a2898348c19e78281f639aeed32b0abb3dd1f (diff)
Fix resetting of the QCompletionModel.
This model apparently pre-dates the API required to do resetting properly. Change-Id: I0ea903cef87077ca4a3d8ca2b53eba213e77cc26 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/util/qcompleter.cpp')
-rw-r--r--src/widgets/util/qcompleter.cpp23
1 files changed, 4 insertions, 19 deletions
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index d6a4162272..a2bce693fc 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -364,8 +364,9 @@ void QCompletionModel::setFiltered(bool filtered)
{
if (showAll == !filtered)
return;
+ beginResetModel();
showAll = !filtered;
- resetModel();
+ endResetModel();
}
bool QCompletionModel::hasChildren(const QModelIndex &parent) const
@@ -410,30 +411,14 @@ void QCompletionModel::invalidate()
void QCompletionModel::filter(const QStringList& parts)
{
Q_D(QCompletionModel);
+ beginResetModel();
engine->filter(parts);
- resetModel();
+ endResetModel();
if (d->model->canFetchMore(engine->curParent))
d->model->fetchMore(engine->curParent);
}
-void QCompletionModel::resetModel()
-{
- if (rowCount() == 0) {
- beginResetModel();
- endResetModel();
- return;
- }
-
- emit layoutAboutToBeChanged();
- QModelIndexList piList = persistentIndexList();
- QModelIndexList empty;
- for (int i = 0; i < piList.size(); i++)
- empty.append(QModelIndex());
- changePersistentIndexList(piList, empty);
- emit layoutChanged();
-}
-
//////////////////////////////////////////////////////////////////////////////
void QCompletionEngine::filter(const QStringList& parts)
{