1 files changed, 26 insertions, 74 deletions

diff --git a/sources/shiboken6/tests/libsample/blackbox.cpp b/sources/shiboken6/tests/libsample/blackbox.cpp
index 425476672..2ac435d3d 100644
--- a/sources/shiboken6/tests/libsample/blackbox.cpp
+++ b/sources/shiboken6/tests/libsample/blackbox.cpp
@@ -1,129 +1,81 @@
-/****************************************************************************
-**
-** 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 "blackbox.h"
 
-using namespace std;
-
 BlackBox::~BlackBox()
 {
     // Free all maps.
-    while (!m_objects.empty()) {
-        delete (*m_objects.begin()).second;
-        m_objects.erase(m_objects.begin());
-    }
-    while (!m_points.empty()) {
-        delete (*m_points.begin()).second;
-        m_points.erase(m_points.begin());
-    }
+    for (const auto &p :m_objects)
+        delete p.second;
+    for (const auto &p : m_points)
+        delete p.second;
 }
 
-int
-BlackBox::keepObjectType(ObjectType* object)
+int BlackBox::keepObjectType(ObjectType *object)
 {
-    m_ticket++;
-    std::pair<int, ObjectType*> item(m_ticket, object);
-    m_objects.insert(item);
+    ++m_ticket;
+    m_objects.insert({m_ticket, object});
     object->setParent(nullptr);
 
     return m_ticket;
 }
 
-ObjectType*
-BlackBox::retrieveObjectType(int ticket)
+ObjectType *BlackBox::retrieveObjectType(int ticket)
 {
     const auto it = m_objects.find(ticket);
     if (it != m_objects.end()) {
-        ObjectType* second = it->second;
+        ObjectType *second = it->second;
         m_objects.erase(it);
         return second;
     }
     return nullptr;
 }
 
-void
-BlackBox::disposeObjectType(int ticket)
+void BlackBox::disposeObjectType(int ticket)
 {
-    ObjectType* object = retrieveObjectType(ticket);
-    if (object)
-        delete object;
+    delete retrieveObjectType(ticket);
 }
 
-int
-BlackBox::keepPoint(Point* point)
+int BlackBox::keepPoint(Point *point)
 {
-    m_ticket++;
-    std::pair<int, Point*> item(m_ticket, point);
-    m_points.insert(item);
-
+    ++m_ticket;
+    m_points.insert({m_ticket, point});
     return m_ticket;
 }
 
-Point*
-BlackBox::retrievePoint(int ticket)
+Point *BlackBox::retrievePoint(int ticket)
 {
     const auto it = m_points.find(ticket);
     if (it != m_points.end()) {
-        Point* second = it->second;
+        Point *second = it->second;
         m_points.erase(it);
         return second;
     }
     return nullptr;
 }
 
-void
-BlackBox::disposePoint(int ticket)
+void BlackBox::disposePoint(int ticket)
 {
-    Point* point = retrievePoint(ticket);
-    if (point)
-        delete point;
+    delete retrievePoint(ticket);
 }
 
-
-std::list<ObjectType*>
-BlackBox::objects()
+std::list<ObjectType*> BlackBox::objects()
 {
     std::list<ObjectType*> l;
 
-    for (auto it = m_objects.begin(), end = m_objects.end(); it != end; ++it)
-        l.push_back((*it).second);
+    for (const auto &p : m_objects)
+        l.push_back(p.second);
 
     return l;
 }
 
-std::list<Point*>
-BlackBox::points()
+std::list<Point*> BlackBox::points()
 {
     std::list<Point*> l;
 
-    for (auto it = m_points.begin(), end = m_points.end(); it != end; ++it)
-        l.push_back((*it).second);
+    for (const auto &p : m_points)
+        l.push_back(p.second);
 
     return l;
 }
-