ModelIterator: use ctor-init-list

marc-kdab · marc-kdab · commit 5053ce129688 · 2021-07-08T17:08:37.000+02:00
Fixes cppcheck's useInitializationList. Change-Id: Id86b085bf60e83af8f02ddacd0a917ee77a338fa Reviewed-on: https://codereview.kdab.com/c/kdab/KDToolBox/+/99626 Reviewed-by: André Somers <andre.somers@kdab.com>
diff --git a/qt/model_view/ModelIterator/src/ModelIterator.cpp b/qt/model_view/ModelIterator/src/ModelIterator.cpp
@@ -28,10 +28,10 @@
 #include "ModelIterator.h"
 
 DepthFirstIterator::DepthFirstIterator(const QModelIndex &index, int column):
-    m_column(column)
+    m_index{index.siblingAtColumn(0)},
+    m_column{column},
+    m_atEnd{!index.isValid()}
 {
-    m_index = index.siblingAtColumn(0);
-    m_atEnd = !index.isValid();
 }
 
 DepthFirstIterator &DepthFirstIterator::operator++()
@@ -132,9 +132,9 @@ DepthFirstIterator DepthFirstIterator::end(QAbstractItemModel *model, int column
 ////////////// FlatIterator /////////////////
 
 FlatIterator::FlatIterator(const QModelIndex &index, int column)
+    : m_index{index.siblingAtColumn(column)},
+      m_atEnd{!index.isValid()}
 {
-    m_index = index.siblingAtColumn(column);
-    m_atEnd = !index.isValid();
 }
 
 FlatIterator &FlatIterator::operator+=(int step)

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,10 @@`
`28`	`28`	`#include "ModelIterator.h"`
`29`	`29`
`30`	`30`	`DepthFirstIterator::DepthFirstIterator(const QModelIndex &index, int column):`
`31`		`- m_column(column)`
	`31`	`+ m_index{index.siblingAtColumn(0)},`
	`32`	`+ m_column{column},`
	`33`	`+ m_atEnd{!index.isValid()}`
`32`	`34`	`{`
`33`		`- m_index = index.siblingAtColumn(0);`
`34`		`- m_atEnd = !index.isValid();`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`DepthFirstIterator &DepthFirstIterator::operator++()`
`@@ -132,9 +132,9 @@ DepthFirstIterator DepthFirstIterator::end(QAbstractItemModel *model, int column`
`132`	`132`	`////////////// FlatIterator /////////////////`
`133`	`133`
`134`	`134`	`FlatIterator::FlatIterator(const QModelIndex &index, int column)`
	`135`	`+ : m_index{index.siblingAtColumn(column)},`
	`136`	`+ m_atEnd{!index.isValid()}`
`135`	`137`	`{`
`136`		`- m_index = index.siblingAtColumn(column);`
`137`		`- m_atEnd = !index.isValid();`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`FlatIterator &FlatIterator::operator+=(int step)`