From d5cad4eceb5f6924d662fbe460482bc236f94d9f Mon Sep 17 00:00:00 2001 From: Bas Pape Date: Sat, 20 Apr 2013 13:46:29 +0200 Subject: [PATCH] reset is deprecated since Qt 5.0 --- src/qtui/settingspages/aliasesmodel.cpp | 9 ++++++--- src/qtui/settingspages/ignorelistmodel.cpp | 9 ++++++--- src/uisupport/flatproxymodel.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/qtui/settingspages/aliasesmodel.cpp b/src/qtui/settingspages/aliasesmodel.cpp index f689a99c..d909b479 100644 --- a/src/qtui/settingspages/aliasesmodel.cpp +++ b/src/qtui/settingspages/aliasesmodel.cpp @@ -238,7 +238,8 @@ void AliasesModel::revert() _configChanged = false; emit configChanged(false); - reset(); + beginResetModel(); + endResetModel(); } @@ -255,7 +256,8 @@ void AliasesModel::commit() void AliasesModel::initDone() { _modelReady = true; - reset(); + beginResetModel(); + endResetModel(); emit modelReady(true); } @@ -275,6 +277,7 @@ void AliasesModel::clientDisconnected() // clear _clonedAliasManager = ClientAliasManager(); _modelReady = false; - reset(); + beginResetModel(); + endResetModel(); emit modelReady(false); } diff --git a/src/qtui/settingspages/ignorelistmodel.cpp b/src/qtui/settingspages/ignorelistmodel.cpp index 5dec6cc6..a6ce4df1 100644 --- a/src/qtui/settingspages/ignorelistmodel.cpp +++ b/src/qtui/settingspages/ignorelistmodel.cpp @@ -262,7 +262,8 @@ void IgnoreListModel::revert() _configChanged = false; emit configChanged(false); - reset(); + beginResetModel(); + endResetModel(); } @@ -279,7 +280,8 @@ void IgnoreListModel::commit() void IgnoreListModel::initDone() { _modelReady = true; - reset(); + beginResetModel(); + endResetModel(); emit modelReady(true); } @@ -299,7 +301,8 @@ void IgnoreListModel::clientDisconnected() // clear _clonedIgnoreListManager = ClientIgnoreListManager(); _modelReady = false; - reset(); + beginResetModel(); + endResetModel(); emit modelReady(false); } diff --git a/src/uisupport/flatproxymodel.h b/src/uisupport/flatproxymodel.h index e0c5f5b5..90c1a5dd 100644 --- a/src/uisupport/flatproxymodel.h +++ b/src/uisupport/flatproxymodel.h @@ -60,7 +60,7 @@ private slots: void on_layoutAboutToBeChanged(); void on_layoutChanged(); - inline void on_modelAboutToBeReset() { reset(); } + inline void on_modelAboutToBeReset() { beginResetModel(); endResetModel(); } // void on_modelReset(); void on_rowsAboutToBeInserted(const QModelIndex &parent, int start, int end); -- 2.20.1