forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user