shiboken6: Brush up the test code with regards to iterators

Use algorithms, range-based for and auto to streamline some of
the test code.

Change-Id: I312ebc340ce0d02dd4ed3e0fca8e2cf6b645b69a
Reviewed-by: Christian Tismer <tismer@stackless.com>

4 files changed, 17 insertions, 22 deletions

diff --git a/sources/shiboken6/tests/libminimal/listuser.cpp b/sources/shiboken6/tests/libminimal/listuser.cpp
index 4ce00f39c..0d7721c3c 100644
--- a/sources/shiboken6/tests/libminimal/listuser.cpp
+++ b/sources/shiboken6/tests/libminimal/listuser.cpp
@@ -30,22 +30,21 @@
 #include <cstdlib>
 #include "listuser.h"
 
+#include <algorithm>
+#include <numeric>
+
 std::list<int>
 ListUser::createIntList(int num)
 {
-    std::list<int> retval;
-    for (int i = 0; i < num; ++i)
-        retval.push_back(i);
+    std::list<int> retval(num);
+    std::iota(retval.begin(), retval.end(), 0);
     return retval;
 }
 
 int
 ListUser::sumIntList(std::list<int> intList)
 {
-    int total = 0;
-    for (std::list<int>::iterator iter = intList.begin(); iter != intList.end(); iter++)
-        total += *iter;
-    return total;
+    return std::accumulate(intList.begin(), intList.end(), 0);
 }
 
 std::list<MinBool>
@@ -61,8 +60,8 @@ MinBool
 ListUser::oredMinBoolList(std::list<MinBool> minBoolList)
 {
     MinBool result(false);
-    for (std::list<MinBool>::iterator iter = minBoolList.begin(); iter != minBoolList.end(); iter++)
-        result |= *iter;
+    for (const auto &m : minBoolList)
+        result |= m;
     return result;
 }
 
@@ -79,8 +78,8 @@ int
 ListUser::sumValList(std::list<Val> valList)
 {
     int total = 0;
-    for (std::list<Val>::iterator iter = valList.begin(); iter != valList.end(); iter++)
-        total += iter->valId();
+    for (const auto &v : valList)
+        total += v.valId();
     return total;
 }
 
@@ -97,8 +96,8 @@ int
 ListUser::sumObjList(std::list<Obj*> objList)
 {
     int total = 0;
-    for (std::list<Obj*>::iterator iter = objList.begin(); iter != objList.end(); iter++)
-        total += (*iter)->objId();
+    for (const auto *obj : objList)
+        total += obj->objId();
     return total;
 }
 
@@ -115,10 +114,8 @@ int
 ListUser::sumListOfIntLists(std::list<std::list<int> > intListList)
 {
     int total = 0;
-    for (std::list<std::list<int> >::iterator it0 = intListList.begin(); it0 != intListList.end(); it0++) {
-        for (std::list<int>::iterator it1 = (*it0).begin(); it1 != (*it0).end(); it1++)
-            total += *it1;
-    }
+    for (const auto &list : intListList)
+        total += std::accumulate(list.begin(), list.end(), 0);
     return total;
 }
 
diff --git a/sources/shiboken6/tests/libminimal/obj.cpp b/sources/shiboken6/tests/libminimal/obj.cpp
index fd6e9f7d9..eb7af3a74 100644
--- a/sources/shiboken6/tests/libminimal/obj.cpp
+++ b/sources/shiboken6/tests/libminimal/obj.cpp
@@ -32,9 +32,7 @@ Obj::Obj(int objId) : m_objId(objId)
 {
 }
 
-Obj::~Obj()
-{
-}
+Obj::~Obj() = default;
 
 bool
 Obj::virtualMethod(int val)
diff --git a/sources/shiboken6/tests/libminimal/obj.h b/sources/shiboken6/tests/libminimal/obj.h
index a5e20d496..b868bbcbf 100644
--- a/sources/shiboken6/tests/libminimal/obj.h
+++ b/sources/shiboken6/tests/libminimal/obj.h
@@ -37,7 +37,7 @@ public:
     explicit Obj(int objId);
     virtual ~Obj();
 
-    int objId() { return m_objId; }
+    int objId() const { return m_objId; }
     void setObjId(int objId) { m_objId = objId; }
 
     virtual bool virtualMethod(int val);
diff --git a/sources/shiboken6/tests/libminimal/val.h b/sources/shiboken6/tests/libminimal/val.h
index 9af7ab70a..c43302317 100644
--- a/sources/shiboken6/tests/libminimal/val.h
+++ b/sources/shiboken6/tests/libminimal/val.h
@@ -37,7 +37,7 @@ public:
     explicit Val(int valId) : m_valId(valId) {}
     virtual ~Val() {}
 
-    int valId() { return m_valId; }
+    int valId() const { return m_valId; }
     void setValId(int valId) { m_valId = valId; }
 
     virtual Val passValueType(Val val) { return val; }