diff options
Diffstat (limited to 'sources/pyside6/plugins/uitools/customwidget.cpp')
| -rw-r--r-- | sources/pyside6/plugins/uitools/customwidget.cpp | 64 |
1 files changed, 14 insertions, 50 deletions
diff --git a/sources/pyside6/plugins/uitools/customwidget.cpp b/sources/pyside6/plugins/uitools/customwidget.cpp index 8b7a61238..976754feb 100644 --- a/sources/pyside6/plugins/uitools/customwidget.cpp +++ b/sources/pyside6/plugins/uitools/customwidget.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2020 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 "customwidget.h" #include <QtCore/qdebug.h> @@ -60,22 +24,22 @@ bool PyCustomWidget::isInitialized() const QIcon PyCustomWidget::icon() const { - return QIcon(); + return {}; } QString PyCustomWidget::domXml() const { - return QString(); + return {}; } QString PyCustomWidget::group() const { - return QString(); + return {}; } QString PyCustomWidget::includeFile() const { - return QString(); + return {}; } QString PyCustomWidget::name() const @@ -85,12 +49,12 @@ QString PyCustomWidget::name() const QString PyCustomWidget::toolTip() const { - return QString(); + return {}; } QString PyCustomWidget::whatsThis() const { - return QString(); + return {}; } // A copy of this code exists in PyDesignerCustomWidget::createWidget() @@ -100,9 +64,9 @@ QWidget *PyCustomWidget::createWidget(QWidget *parent) // Create a python instance and return cpp object PyObject *pyParent = nullptr; bool unknownParent = false; - if (parent) { + if (parent != nullptr) { pyParent = reinterpret_cast<PyObject *>(Shiboken::BindingManager::instance().retrieveWrapper(parent)); - if (pyParent) { + if (pyParent != nullptr) { Py_INCREF(pyParent); } else { static Shiboken::Conversions::SpecificConverter converter("QWidget*"); @@ -115,11 +79,11 @@ QWidget *PyCustomWidget::createWidget(QWidget *parent) } Shiboken::AutoDecRef pyArgs(PyTuple_New(1)); - PyTuple_SET_ITEM(pyArgs, 0, pyParent); // tuple will keep pyParent reference + PyTuple_SET_ITEM(pyArgs.object(), 0, pyParent); // tuple will keep pyParent reference // Call python constructor - auto result = reinterpret_cast<SbkObject *>(PyObject_CallObject(m_pyObject, pyArgs)); - if (!result) { + auto *result = reinterpret_cast<SbkObject *>(PyObject_CallObject(m_pyObject, pyArgs)); + if (result == nullptr) { qWarning("Unable to create a Python custom widget of type \"%s\".", qPrintable(m_name)); PyErr_Print(); @@ -134,7 +98,7 @@ QWidget *PyCustomWidget::createWidget(QWidget *parent) return reinterpret_cast<QWidget *>(Shiboken::Object::cppPointer(result, Py_TYPE(result))); } -void PyCustomWidget::initialize(QDesignerFormEditorInterface *core) +void PyCustomWidget::initialize(QDesignerFormEditorInterface *) { m_initialized = true; } |