diff options
Diffstat (limited to 'sources/pyside6/libpyside/pysideclassinfo_p.h')
-rw-r--r-- | sources/pyside6/libpyside/pysideclassinfo_p.h | 48 |
1 files changed, 5 insertions, 43 deletions
diff --git a/sources/pyside6/libpyside/pysideclassinfo_p.h b/sources/pyside6/libpyside/pysideclassinfo_p.h index 90de8101b..4ef456f76 100644 --- a/sources/pyside6/libpyside/pysideclassinfo_p.h +++ b/sources/pyside6/libpyside/pysideclassinfo_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** 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 LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef PYSIDE_CLASSINFO_P_H #define PYSIDE_CLASSINFO_P_H @@ -44,7 +8,6 @@ #include "pysideclassdecorator_p.h" #include "pysideclassinfo.h" -#include "pysideclassinfo.h" #include <QtCore/QMetaObject> @@ -56,7 +19,7 @@ extern PYSIDE_API PyTypeObject *PySideClassInfo_TypeF(void); } // extern "C" -namespace PySide { namespace ClassInfo { +namespace PySide::ClassInfo { class ClassInfoPrivate : public PySide::ClassDecorator::DecoratorPrivate { @@ -65,7 +28,7 @@ public: int tp_init(PyObject *self, PyObject *args, PyObject *kwds) override; const char *name() const override; - QMap<QByteArray, QByteArray> m_data; + ClassInfoList m_data; bool m_alreadyWrapped = false; }; @@ -75,7 +38,6 @@ public: void init(PyObject* module); -} // namespace ClassInfo -} // namespace PySide +} // namespace PySide::ClassInfo #endif |