diff options
Diffstat (limited to 'sources/pyside6/libpysideqml/pysideqmlextended.cpp')
| -rw-r--r-- | sources/pyside6/libpysideqml/pysideqmlextended.cpp | 47 |
1 files changed, 5 insertions, 42 deletions
diff --git a/sources/pyside6/libpysideqml/pysideqmlextended.cpp b/sources/pyside6/libpysideqml/pysideqmlextended.cpp index 2ae4afd83..23543d589 100644 --- a/sources/pyside6/libpysideqml/pysideqmlextended.cpp +++ b/sources/pyside6/libpysideqml/pysideqmlextended.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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) 2022 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 #include "pysideqmlextended_p.h" #include "pysideqmltypeinfo_p.h" @@ -48,7 +12,6 @@ #include <signature.h> #include <sbkstring.h> -#include <QtCore/QtGlobal> #include <QtQml/qqml.h> // The QmlExtended decorator modifies QmlElement to register an extension. @@ -128,7 +91,7 @@ static QObject *extensionFactory(QObject *o) auto *pyObjType = Py_TYPE(pyObj); const auto info = qmlTypeInfo(reinterpret_cast<PyObject *>(pyObjType)); - if (info.isNull() || info->extensionType == nullptr) { + if (!info || info->extensionType == nullptr) { qWarning("QmlExtended: Cannot find extension of %s.", pyObjType->tp_name); return nullptr; } @@ -164,10 +127,10 @@ void initQmlExtended(PyObject *module) } PySide::Qml::QmlExtensionInfo qmlExtendedInfo(PyObject *t, - const QSharedPointer<QmlTypeInfo> &info) + const std::shared_ptr<QmlTypeInfo> &info) { PySide::Qml::QmlExtensionInfo result{nullptr, nullptr}; - if (!info.isNull() && info->extensionType) { + if (info && info->extensionType) { result.metaObject = PySide::retrieveMetaObject(info->extensionType); if (result.metaObject) { result.factory = extensionFactory; |