diff options
Diffstat (limited to 'sources/pyside6/tests/pysidetest/testobject.h')
-rw-r--r-- | sources/pyside6/tests/pysidetest/testobject.h | 55 |
1 files changed, 21 insertions, 34 deletions
diff --git a/sources/pyside6/tests/pysidetest/testobject.h b/sources/pyside6/tests/pysidetest/testobject.h index 2795cec5c..a095a382e 100644 --- a/sources/pyside6/tests/pysidetest/testobject.h +++ b/sources/pyside6/tests/pysidetest/testobject.h @@ -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 #ifndef TESTOBJECT_H #define TESTOBJECT_H @@ -33,12 +8,15 @@ #include <QtWidgets/QApplication> +#include <QtCore/QList> #include <QtCore/QObject> #include <QtCore/QMetaType> #include <QtCore/QVariant> QT_FORWARD_DECLARE_CLASS(QDebug) +using IntList = QList<int>; + class IntValue { public: @@ -48,16 +26,16 @@ public: int value; }; -typedef IntValue TypedefValue; +using TypedefValue = IntValue; class PYSIDETEST_API TestObject : public QObject { Q_OBJECT public: - static void createApp() { int argc=0; new QApplication(argc, 0); }; + static void createApp() { int argc=0; new QApplication(argc, nullptr); }; static int checkType(const QVariant& var) { return var.metaType().id(); } - TestObject(int idValue, QObject* parent = 0) : QObject(parent), m_idValue(idValue) {} + TestObject(int idValue, QObject* parent = nullptr) : QObject(parent), m_idValue(idValue) {} int idValue() const { return m_idValue; } static int staticMethodDouble(int value) { return value * 2; } void addChild(QObject* c) { m_children.append(c); emit childrenChanged(m_children); } @@ -69,6 +47,14 @@ public: void emitSignalWithDefaultValue_bool(); void emitSignalWithTypedefValue(int value); + void emitSignalWithContainerTypedefValue(const IntList &il); + + void emitFlagsSignal(Qt::Alignment alignment); + + static constexpr auto LATIN1_TEST_FIELD = QLatin1StringView("test"); + + void setQLatin1String(QLatin1String v); + QString qLatin1String() const; signals: void idValue(int newValue); @@ -77,16 +63,18 @@ signals: void childrenChanged(const QList<QObject*>&); void signalWithDefaultValue(bool value = false); void signalWithTypedefValue(TypedefValue value); + void signalWithContainerTypedefValue(const IntList &il); + void flagsSignal(Qt::Alignment alignment); private: int m_idValue; QList<QObject*> m_children; + QString m_qLatin1String; }; PYSIDETEST_API QDebug operator<<(QDebug dbg, TestObject &testObject); -typedef int PySideInt; - +using PySideInt = int; namespace PySideCPP { @@ -125,8 +113,7 @@ namespace PySideCPP2 { enum Enum1 { Option1 = 1, Option2 = 2 }; - -typedef long PySideLong; +using PySideLong = long; class PYSIDETEST_API TestObjectWithoutNamespace : public QObject { |