From 938612c35e82bec69868e1bf6490c1b331085d82 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Thu, 20 Sep 2012 10:31:34 +0200
Subject: Do not use QAbstractItemModel::reset().

Change-Id: Ie49bdf576a6d3543aef6df133b27c8827775c935
Rationale:
    a) It is conceptually cleaner to do the changes to the model
       in between calls to beginResetModel() and endResetModel,
       respectively.
    b) The function is deprecated in Qt 5, for exactly that reason.
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/plugins/debugger/registerhandler.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/plugins/debugger/registerhandler.cpp')

diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index cd9a11b5ee..57d0a1f9b7 100644
--- a/src/plugins/debugger/registerhandler.cpp
+++ b/src/plugins/debugger/registerhandler.cpp
@@ -480,8 +480,9 @@ Qt::ItemFlags RegisterHandler::flags(const QModelIndex &idx) const
 
 void RegisterHandler::removeAll()
 {
+    beginResetModel();
     m_registers.clear();
-    reset();
+    endResetModel();
 }
 
 bool RegisterHandler::isEmpty() const
@@ -503,12 +504,13 @@ static inline bool compareRegisterSet(const Registers &r1, const Registers &r2)
 
 void RegisterHandler::setRegisters(const Registers &registers)
 {
+    beginResetModel();
     m_registers = registers;
     const int size = m_registers.size();
     for (int r = 0; r < size; r++)
         m_registers[r].changed = false;
     calculateWidth();
-    reset();
+    endResetModel();
 }
 
 void RegisterHandler::setAndMarkRegisters(const Registers &registers)
@@ -544,9 +546,10 @@ void RegisterHandler::calculateWidth()
 void RegisterHandler::setNumberBase(int base)
 {
     if (m_base != base) {
+        beginResetModel();
         m_base = base;
         calculateWidth();
-        emit reset();
+        endResetModel();
     }
 }
 
-- 
cgit v1.2.1