diff options
Diffstat (limited to 'sources/shiboken6/tests/libsample/pairuser.cpp')
-rw-r--r-- | sources/shiboken6/tests/libsample/pairuser.cpp | 49 |
1 files changed, 8 insertions, 41 deletions
diff --git a/sources/shiboken6/tests/libsample/pairuser.cpp b/sources/shiboken6/tests/libsample/pairuser.cpp index 661988445..5b7eb4d8c 100644 --- a/sources/shiboken6/tests/libsample/pairuser.cpp +++ b/sources/shiboken6/tests/libsample/pairuser.cpp @@ -1,57 +1,24 @@ -/**************************************************************************** -** -** 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 <iostream> #include "pairuser.h" -using namespace std; - -std::pair<int, int> -PairUser::callCreatePair() +std::pair<int, int> PairUser::callCreatePair() { return createPair(); } -std::pair<int, int> -PairUser::createPair() +std::pair<int, int> PairUser::createPair() { - return std::pair<int, int>(10, 20); + return {10, 20}; } -std::pair<Complex, Complex> -PairUser::createComplexPair(Complex cpx0, Complex cpx1) +std::pair<Complex, Complex> PairUser::createComplexPair(Complex cpx0, Complex cpx1) { - return std::pair<Complex, Complex>(cpx0, cpx1); + return {cpx0, cpx1}; } -double -PairUser::sumPair(std::pair<int, double> pair) +double PairUser::sumPair(std::pair<int, double> pair) { return ((double) pair.first) + pair.second; } - |