diff options
Diffstat (limited to 'sources/shiboken6/tests/libother/otherderived.cpp')
-rw-r--r-- | sources/shiboken6/tests/libother/otherderived.cpp | 45 |
1 files changed, 7 insertions, 38 deletions
diff --git a/sources/shiboken6/tests/libother/otherderived.cpp b/sources/shiboken6/tests/libother/otherderived.cpp index d23f6ad23..93a18876e 100644 --- a/sources/shiboken6/tests/libother/otherderived.cpp +++ b/sources/shiboken6/tests/libother/otherderived.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** 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 "otherderived.h" @@ -32,30 +7,24 @@ OtherDerived::OtherDerived(int id) : Abstract(id) { } -OtherDerived::~OtherDerived() -{ -} +OtherDerived::~OtherDerived() = default; -Abstract* -OtherDerived::createObject() +Abstract *OtherDerived::createObject() { static int id = 100; return new OtherDerived(id++); } -void -OtherDerived::pureVirtual() +void OtherDerived::pureVirtual() { } -void* -OtherDerived::pureVirtualReturningVoidPtr() +void *OtherDerived::pureVirtualReturningVoidPtr() { return nullptr; } -void -OtherDerived::unpureVirtual() +void OtherDerived::unpureVirtual() { } |