1 files changed, 62 insertions, 50 deletions

diff --git a/sources/shiboken6/tests/libminimal/listuser.cpp b/sources/shiboken6/tests/libminimal/listuser.cpp
index 0d7721c3c..93c399542 100644
--- a/sources/shiboken6/tests/libminimal/listuser.cpp
+++ b/sources/shiboken6/tests/libminimal/listuser.cpp
@@ -1,54 +1,35 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of Qt for Python.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include <numeric>
-#include <cstdlib>
 #include "listuser.h"
 
 #include <algorithm>
+#include <cstdlib>
 #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)
+int ListUser::sumIntListDefaultParamConstRef(const std::list<int> &intList)
+{
+    return sumIntList(intList);
+}
+
+int ListUser::sumIntListDefaultParam(std::list<int> intList)
+{
+    return sumIntList(intList);
+}
+
+std::list<MinBool> ListUser::createMinBoolList(MinBool mb1, MinBool mb2)
 {
     std::list<MinBool> retval;
     retval.push_back(mb1);
@@ -56,8 +37,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)
@@ -65,8 +45,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)
@@ -74,17 +53,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);
@@ -92,8 +68,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)
@@ -101,8 +76,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)
@@ -110,8 +84,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)
@@ -119,3 +92,42 @@ ListUser::sumListOfIntLists(std::list<std::list<int> > intListList)
     return total;
 }
 
+void ListUser::setStdIntList(const std::list<int> &l)
+{
+    m_stdIntList = l;
+}
+
+std::list<int> &ListUser::getIntList()
+{
+    return m_stdIntList;
+}
+
+const std::list<int> &ListUser::getConstIntList() const
+{
+    return m_stdIntList;
+}
+
+int ListUser::modifyIntListPtr(std::list<int> *list) const
+{
+    const int oldSize = int(list->size());
+    list->push_back(42);
+    return oldSize;
+}
+
+std::list<int> *ListUser::returnIntListByPtr() const
+{
+    return nullptr;
+}
+
+int ListUser::callReturnIntListByPtr() const
+{
+    auto *list = returnIntListByPtr();
+    return list != nullptr ? int(list->size()) : 0;
+}
+
+int ListUser::modifyDoubleListPtr(std::list<double> *list) const
+{
+    const int oldSize = int(list->size());
+    list->push_back(42);
+    return oldSize;
+}