diff options
Diffstat (limited to 'sources/shiboken6/tests/libsample/blackbox.h')
-rw-r--r-- | sources/shiboken6/tests/libsample/blackbox.h | 51 |
1 files changed, 14 insertions, 37 deletions
diff --git a/sources/shiboken6/tests/libsample/blackbox.h b/sources/shiboken6/tests/libsample/blackbox.h index 629a217cc..9d32670dd 100644 --- a/sources/shiboken6/tests/libsample/blackbox.h +++ b/sources/shiboken6/tests/libsample/blackbox.h @@ -1,54 +1,32 @@ -/**************************************************************************** -** -** 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 #ifndef BLACKBOX_H #define BLACKBOX_H #include "libsamplemacros.h" -#include <map> #include "objecttype.h" #include "point.h" +#include <list> +#include <map> + class LIBSAMPLE_API BlackBox { public: - typedef std::map<int, ObjectType*> ObjectTypeMap; - typedef std::map<int, Point*> PointMap; + using ObjectTypeMap = std::map<int, ObjectType*>; + using PointMap = std::map<int, Point*>; - BlackBox() { m_ticket = -1;} + LIBMINIMAL_DEFAULT_COPY_MOVE(BlackBox) + BlackBox() noexcept = default; ~BlackBox(); - int keepObjectType(ObjectType* object); - ObjectType* retrieveObjectType(int ticket); + int keepObjectType(ObjectType *object); + ObjectType *retrieveObjectType(int ticket); void disposeObjectType(int ticket); - int keepPoint(Point* point); - Point* retrievePoint(int ticket); + int keepPoint(Point *point); + Point *retrievePoint(int ticket); void disposePoint(int ticket); std::list<ObjectType*> objects(); @@ -60,8 +38,7 @@ public: private: ObjectTypeMap m_objects; PointMap m_points; - int m_ticket; + int m_ticket = -1; }; #endif // BLACKBOX_H - |