From a1f0eb97dd4226cf106362c13f07f4bfa36d5d40 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Sun, 26 Feb 2012 12:08:26 +0100
Subject: [PATCH] Assistant: Remove usage of deprecated
QAbstractItemModel::reset
Change-Id: Ibca4d3ece78e87a1a4f9065f446d9f14a1459c03
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---
src/assistant/help/qhelpcontentwidget.cpp | 8 +++++---
src/assistant/help/qhelpsearchquerywidget.cpp | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/assistant/help/qhelpcontentwidget.cpp b/src/assistant/help/qhelpcontentwidget.cpp
index 76dc2fbe1..75f9f7e7e 100644
--- a/src/assistant/help/qhelpcontentwidget.cpp
+++ b/src/assistant/help/qhelpcontentwidget.cpp
@@ -363,15 +363,18 @@ QHelpContentModel::~QHelpContentModel()
void QHelpContentModel::invalidateContents(bool onShutDown)
{
- if (onShutDown)
+ if (onShutDown) {
disconnect(this, SLOT(insertContents()));
+ } else {
+ beginResetModel();
+ }
d->qhelpContentProvider->stopCollecting();
if (d->rootItem) {
delete d->rootItem;
d->rootItem = 0;
}
if (!onShutDown)
- reset();
+ endResetModel();
}
/*!
@@ -399,7 +402,6 @@ void QHelpContentModel::insertContents()
beginInsertRows(QModelIndex(), 0, count > 0 ? count : 0);
d->rootItem = d->qhelpContentProvider->rootItem();
endInsertRows();
- reset();
emit contentsCreated();
}
diff --git a/src/assistant/help/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp
index 077a39191..875b55133 100644
--- a/src/assistant/help/qhelpsearchquerywidget.cpp
+++ b/src/assistant/help/qhelpsearchquerywidget.cpp
@@ -89,8 +89,9 @@ private:
void addTerm(const QString &term)
{
if (!termList.contains(term)) {
+ beginResetModel();
termList.append(term);
- reset();
+ endResetModel();
}
}
--
GitLab