diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2012-09-20 10:31:34 +0200 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2012-09-20 11:11:45 +0200 |
commit | 938612c35e82bec69868e1bf6490c1b331085d82 (patch) | |
tree | 695b915720cc20a6524e0ea2f28a54a9fb24af7f /src/plugins/debugger/registerhandler.cpp | |
parent | 1b3d637c1ba12cb9b8880000d05d1c864f81ce86 (diff) | |
download | qt-creator-938612c35e82bec69868e1bf6490c1b331085d82.tar.gz |
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>
Diffstat (limited to 'src/plugins/debugger/registerhandler.cpp')
-rw-r--r-- | src/plugins/debugger/registerhandler.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
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 ®isters) { + 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 ®isters) @@ -544,9 +546,10 @@ void RegisterHandler::calculateWidth() void RegisterHandler::setNumberBase(int base) { if (m_base != base) { + beginResetModel(); m_base = base; calculateWidth(); - emit reset(); + endResetModel(); } } |