Fix coding style of the shiboken tests

- Place star/reference correctly
- Fix include order
- Streamline code, wrap long lines
- Use member initialization and default special methods

Change-Id: I7b7e7d8e8c9562cd932bee8144bc44d6b2dda0a5
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>

4 files changed, 16 insertions, 25 deletions

diff --git a/sources/shiboken6/tests/libminimal/listuser.cpp b/sources/shiboken6/tests/libminimal/listuser.cpp
index 14ac1c7ee..54acc6e05 100644
--- a/sources/shiboken6/tests/libminimal/listuser.cpp
+++ b/sources/shiboken6/tests/libminimal/listuser.cpp
@@ -8,22 +8,19 @@
 #include <algorithm>
 #include <numeric>
 
-std::list<int>
-ListUser::createIntList(int num)
+std::list<int> ListUser::createIntList(int num)
 {
     std::list<int> retval(num);
     std::iota(retval.begin(), retval.end(), 0);
     return retval;
 }
 
-int
-ListUser::sumIntList(std::list<int> intList)
+int ListUser::sumIntList(std::list<int> intList)
 {
     return std::accumulate(intList.begin(), intList.end(), 0);
 }
 
-std::list<MinBool>
-ListUser::createMinBoolList(MinBool mb1, MinBool mb2)
+std::list<MinBool> ListUser::createMinBoolList(MinBool mb1, MinBool mb2)
 {
     std::list<MinBool> retval;
     retval.push_back(mb1);
@@ -31,8 +28,7 @@ ListUser::createMinBoolList(MinBool mb1, MinBool mb2)
     return retval;
 }
 
-MinBool
-ListUser::oredMinBoolList(std::list<MinBool> minBoolList)
+MinBool ListUser::oredMinBoolList(std::list<MinBool> minBoolList)
 {
     MinBool result(false);
     for (const auto &m : minBoolList)
@@ -40,8 +36,7 @@ ListUser::oredMinBoolList(std::list<MinBool> minBoolList)
     return result;
 }
 
-std::list<Val>
-ListUser::createValList(int num)
+std::list<Val> ListUser::createValList(int num)
 {
     std::list<Val> retval;
     for (int i = 0; i < num; ++i)
@@ -49,17 +44,14 @@ ListUser::createValList(int num)
     return retval;
 }
 
-int
-ListUser::sumValList(std::list<Val> valList)
+int ListUser::sumValList(std::list<Val> valList)
 {
     int total = 0;
     for (const auto &v : valList)
         total += v.valId();
     return total;
 }
-
-std::list<Obj*>
-ListUser::createObjList(Obj* o1, Obj* o2)
+std::list<Obj*> ListUser::createObjList(Obj* o1, Obj* o2)
 {
     std::list<Obj*> retval;
     retval.push_back(o1);
@@ -67,8 +59,7 @@ ListUser::createObjList(Obj* o1, Obj* o2)
     return retval;
 }
 
-int
-ListUser::sumObjList(std::list<Obj*> objList)
+int ListUser::sumObjList(std::list<Obj*> objList)
 {
     int total = 0;
     for (const auto *obj : objList)
@@ -76,8 +67,7 @@ ListUser::sumObjList(std::list<Obj*> objList)
     return total;
 }
 
-std::list<std::list<int> >
-ListUser::createListOfIntLists(int num)
+std::list<std::list<int> > ListUser::createListOfIntLists(int num)
 {
     std::list<std::list<int> > retval;
     for (int i = 0; i < num; ++i)
@@ -85,8 +75,7 @@ ListUser::createListOfIntLists(int num)
     return retval;
 }
 
-int
-ListUser::sumListOfIntLists(std::list<std::list<int> > intListList)
+int ListUser::sumListOfIntLists(std::list<std::list<int> > intListList)
 {
     int total = 0;
     for (const auto &list : intListList)
diff --git a/sources/shiboken6/tests/libminimal/listuser.h b/sources/shiboken6/tests/libminimal/listuser.h
index 2254cb138..8d16927ea 100644
--- a/sources/shiboken6/tests/libminimal/listuser.h
+++ b/sources/shiboken6/tests/libminimal/listuser.h
@@ -4,13 +4,14 @@
 #ifndef LISTUSER_H
 #define LISTUSER_H
 
-#include <list>
 #include "obj.h"
 #include "val.h"
 #include "minbool.h"
 
 #include "libminimalmacros.h"
 
+#include <list>
+
 struct LIBMINIMAL_API ListUser
 {
     virtual ~ListUser() {}
diff --git a/sources/shiboken6/tests/libminimal/minbool.h b/sources/shiboken6/tests/libminimal/minbool.h
index f75e458da..4473df975 100644
--- a/sources/shiboken6/tests/libminimal/minbool.h
+++ b/sources/shiboken6/tests/libminimal/minbool.h
@@ -16,6 +16,7 @@ public:
         m_value = m_value | other.m_value;
         return *this;
     }
+
 private:
     bool m_value;
 };
@@ -31,11 +32,12 @@ class LIBMINIMAL_API MinBoolUser
 {
 public:
     MinBoolUser() : m_minbool(MinBool(false)) {}
-    virtual ~MinBoolUser() {}
+    virtual ~MinBoolUser() = default;
     inline MinBool minBool() { return m_minbool; }
     inline void setMinBool(MinBool minBool) { m_minbool = minBool; }
     virtual MinBool invertedMinBool() { return !m_minbool; }
     inline MinBool callInvertedMinBool() { return invertedMinBool(); }
+
 private:
     MinBool m_minbool;
 };
diff --git a/sources/shiboken6/tests/libminimal/obj.cpp b/sources/shiboken6/tests/libminimal/obj.cpp
index 0e49fee8b..f21fb5454 100644
--- a/sources/shiboken6/tests/libminimal/obj.cpp
+++ b/sources/shiboken6/tests/libminimal/obj.cpp
@@ -9,8 +9,7 @@ Obj::Obj(int objId) : m_objId(objId)
 
 Obj::~Obj() = default;
 
-bool
-Obj::virtualMethod(int val)
+bool Obj::virtualMethod(int val)
 {
     return !bool(val%2);
 }