diff options
Diffstat (limited to 'sources/pyside2/PySide2/QtUiTools')
| -rw-r--r-- | sources/pyside2/PySide2/QtUiTools/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtUiTools/glue/uitools_loadui.cpp | 91 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml | 2 |
3 files changed, 1 insertions, 93 deletions
diff --git a/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt b/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt index bedbf74af..0040c000e 100644 --- a/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt @@ -8,7 +8,6 @@ ${QtUiTools_GEN_DIR}/qtuitools_module_wrapper.cpp set(QtUiTools_glue_sources "${QtUiTools_SOURCE_DIR}/glue/plugins.h" - "${QtUiTools_SOURCE_DIR}/glue/uitools_loadui.cpp" ) set(QtUiTools_include_dirs ${QtUiTools_SOURCE_DIR} diff --git a/sources/pyside2/PySide2/QtUiTools/glue/uitools_loadui.cpp b/sources/pyside2/PySide2/QtUiTools/glue/uitools_loadui.cpp deleted file mode 100644 index c078eacee..000000000 --- a/sources/pyside2/PySide2/QtUiTools/glue/uitools_loadui.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -/* - * Based on code provided by: - * Antonio Valentino <antonio.valentino at tiscali.it> - * Frédéric <frederic.mantegazza at gbiloba.org> - */ - -#include <shiboken.h> -#include <QUiLoader> -#include <QFile> -#include <QWidget> - -static void createChildrenNameAttributes(PyObject* root, QObject* object) -{ - foreach (QObject* child, object->children()) { - const QByteArray name = child->objectName().toLocal8Bit(); - - if (!name.isEmpty() && !name.startsWith("_") && !name.startsWith("qt_")) { - bool hasAttr = PyObject_HasAttrString(root, name.constData()); - if (!hasAttr) { - Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QObject*](child)); - PyObject_SetAttrString(root, name.constData(), pyChild); - } - createChildrenNameAttributes(root, child); - } - createChildrenNameAttributes(root, child); - } -} - -static PyObject* QUiLoadedLoadUiFromDevice(QUiLoader* self, QIODevice* dev, QWidget* parent) -{ - QWidget* wdg = self->load(dev, parent); - - if (wdg) { - PyObject* pyWdg = %CONVERTTOPYTHON[QWidget*](wdg); - createChildrenNameAttributes(pyWdg, wdg); - if (parent) { - Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QWidget*](parent)); - Shiboken::Object::setParent(pyParent, pyWdg); - } - return pyWdg; - } - - if (!PyErr_Occurred()) - PyErr_SetString(PyExc_RuntimeError, "Unable to open/read ui device"); - return 0; -} - -static PyObject* QUiLoaderLoadUiFromFileName(QUiLoader* self, const QString& uiFile, QWidget* parent) -{ - QFile fd(uiFile); - return QUiLoadedLoadUiFromDevice(self, &fd, parent); -} diff --git a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml index 648a38cd5..8086da01e 100644 --- a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml +++ b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml @@ -48,7 +48,7 @@ <extra-includes> <include file-name="glue/plugins.h" location="local"/> </extra-includes> - <inject-code class="native" position="beginning" file="glue/uitools_loadui.cpp"/> + <inject-code class="native" position="beginning" file="../glue/qtuitools.cpp" snippet="uitools-loadui"/> <inject-code file="../glue/qtuitools.cpp" snippet="quiloader"/> <add-function signature="registerCustomWidget(PyObject*)" return-type="void"> <modify-argument index="1"> |