aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/libpyside
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2017-09-05 13:41:43 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2017-11-02 12:04:19 +0000
commit8c9037dc83fbdbb0b9913961fbe7f84066630e18 (patch)
treec68ca10add975adf4dadf669ea5a96b9c5c0f07d /sources/pyside2/libpyside
parente30e0c161b2b4d50484314bf006e9e5e8ff6b380 (diff)
Remove dead / unused code regarding conversions
There's a lot of code that was previously used for doing conversions between C++ / Python types (apparently relying on extensive RTTI / typeid manipulations), which got superseded by a cleaner templated approach. The old code was left behind, and there were a few instances where it was still used even though it wasn't needed, like in QtScript typesystem XML and shiboken's enum handling. Remove the old code, apply the small changes needed to make it work with new the code. This is cleanup to reduce the confusion regarding conversion behavior, and also preparation for a proper implementation of handling "void*" types. Change-Id: I8f16bb31436f9a677bb2d64c7197c4375005b656 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2/libpyside')
-rw-r--r--sources/pyside2/libpyside/CMakeLists.txt1
-rw-r--r--sources/pyside2/libpyside/globalreceiver.cpp1
-rw-r--r--sources/pyside2/libpyside/globalreceiverv2.cpp1
-rw-r--r--sources/pyside2/libpyside/pyside.cpp5
-rw-r--r--sources/pyside2/libpyside/pysideconversions.h275
-rw-r--r--sources/pyside2/libpyside/signalmanager.cpp.in28
6 files changed, 5 insertions, 306 deletions
diff --git a/sources/pyside2/libpyside/CMakeLists.txt b/sources/pyside2/libpyside/CMakeLists.txt
index 05e38330..1cddebc0 100644
--- a/sources/pyside2/libpyside/CMakeLists.txt
+++ b/sources/pyside2/libpyside/CMakeLists.txt
@@ -120,7 +120,6 @@ set(libpyside_HEADERS
dynamicqmetaobject.h
globalreceiver.h
pysideclassinfo.h
- pysideconversions.h
pysidemacros.h
signalmanager.h
pyside.h
diff --git a/sources/pyside2/libpyside/globalreceiver.cpp b/sources/pyside2/libpyside/globalreceiver.cpp
index e183e09b..5e0aa0d6 100644
--- a/sources/pyside2/libpyside/globalreceiver.cpp
+++ b/sources/pyside2/libpyside/globalreceiver.cpp
@@ -49,7 +49,6 @@
#include <sbkconverter.h>
#include <gilstate.h>
-#include "typeresolver.h"
#include "signalmanager.h"
#define RECEIVER_DESTROYED_SLOT_NAME "__receiverDestroyed__(QObject*)"
diff --git a/sources/pyside2/libpyside/globalreceiverv2.cpp b/sources/pyside2/libpyside/globalreceiverv2.cpp
index a79d43c2..9e9bccba 100644
--- a/sources/pyside2/libpyside/globalreceiverv2.cpp
+++ b/sources/pyside2/libpyside/globalreceiverv2.cpp
@@ -48,7 +48,6 @@
#include <autodecref.h>
#include <gilstate.h>
-#include "typeresolver.h"
#include "signalmanager.h"
#define RECEIVER_DESTROYED_SLOT_NAME "__receiverDestroyed__(QObject*)"
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp
index d4e867c6..17366ce6 100644
--- a/sources/pyside2/libpyside/pyside.cpp
+++ b/sources/pyside2/libpyside/pyside.cpp
@@ -50,14 +50,15 @@
#include "dynamicqmetaobject.h"
#include "destroylistener.h"
+#include <autodecref.h>
#include <qapp_macro.h>
#include <basewrapper.h>
-#include <conversions.h>
#include <sbkconverter.h>
+#include <sbkstring.h>
#include <gilstate.h>
-#include <typeresolver.h>
#include <bindingmanager.h>
#include <algorithm>
+#include <typeinfo>
#include <cstring>
#include <cctype>
#include <QStack>
diff --git a/sources/pyside2/libpyside/pysideconversions.h b/sources/pyside2/libpyside/pysideconversions.h
deleted file mode 100644
index ed8002fa..00000000
--- a/sources/pyside2/libpyside/pysideconversions.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of PySide2.
-**
-** $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$
-**
-****************************************************************************/
-
-#ifndef PYSIDECONVERSIONS_H
-#define PYSIDECONVERSIONS_H
-
-#include <sbkpython.h>
-#include <QFlag>
-#include <conversions.h>
-#include <pysideqflags.h>
-
-template <typename QtDict>
-struct QtDictConverter
-{
- static inline bool checkType(PyObject* pyObj)
- {
- return isConvertible(pyObj);
- }
-
- static inline bool isConvertible(PyObject* pyObj)
- {
- if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<QtDict>()))
- return true;
-
- if ((Shiboken::SbkType<QtDict>() && Shiboken::Object::checkType(pyObj)) || !PyDict_Check(pyObj))
- return false;
-
- PyObject* key;
- PyObject* value;
- Py_ssize_t pos = 0;
-
- while (PyDict_Next(pyObj, &pos, &key, &value)) {
- if (!Shiboken::Converter<typename QtDict::key_type>::isConvertible(key)
- && !Shiboken::Converter<typename QtDict::mapped_type>::isConvertible(value)) {
- return false;
- }
- }
- return true;
- }
-
- static inline PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<QtDict*>(cppObj)); }
- static inline PyObject* toPython(const QtDict& cppobj)
- {
- PyObject* result = PyDict_New();
- typename QtDict::const_iterator it = cppobj.begin();
-
- for (; it != cppobj.end(); ++it) {
- Shiboken::AutoDecRef keyObj(Shiboken::Converter<typename QtDict::key_type>::toPython(it.key()));
- Shiboken::AutoDecRef valueObj(Shiboken::Converter<typename QtDict::mapped_type>::toPython(it.value()));
- PyDict_SetItem(result, keyObj, valueObj);
- }
-
- return result;
- }
- static inline QtDict toCpp(PyObject* pyobj)
- {
- if (PyObject_TypeCheck(pyobj, Shiboken::SbkType<QtDict>()))
- return *reinterpret_cast<QtDict *>(Shiboken::Object::cppPointer(reinterpret_cast<SbkObject *>(pyobj), Shiboken::SbkType<QtDict>()));
-
- QtDict result;
-
- PyObject* key;
- PyObject* value;
- Py_ssize_t pos = 0;
-
- while (PyDict_Next(pyobj, &pos, &key, &value))
- result[Shiboken::Converter<typename QtDict::key_type>::toCpp(key)] = Shiboken::Converter<typename QtDict::mapped_type>::toCpp(value);
- return result;
- }
-};
-
-template <typename MultiMap>
-struct QtMultiMapConverter
-{
- static inline bool checkType(PyObject* pyObj)
- {
- return isConvertible(pyObj);
- }
-
- static inline bool isConvertible(PyObject* pyObj)
- {
- if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<MultiMap>()))
- return true;
-
- if ((Shiboken::SbkType<MultiMap>() && Shiboken::Object::checkType(pyObj)) || !PyDict_Check(pyObj))
- return false;
-
- PyObject* key;
- PyObject* value;
- Py_ssize_t pos = 0;
-
- while (PyDict_Next(pyObj, &pos, &key, &value)) {
- if (!Shiboken::Converter<typename MultiMap::key_type>::isConvertible(key)) {
- if (PySequence_Check(value)) {
- for (int i = 0, max = PySequence_Length(value); i < max; ++i) {
- Shiboken::AutoDecRef item(PySequence_GetItem(value, i));
- if (!Shiboken::Converter<typename MultiMap::mapped_type>::isConvertible(value))
- return false;
- }
- } else if (!Shiboken::Converter<typename MultiMap::mapped_type>::isConvertible(value)) {
- return false;
- }
- }
- }
- return true;
- }
-
- static inline PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<MultiMap*>(cppObj)); }
- static inline PyObject* toPython(const MultiMap& cppObj)
- {
- PyObject* result = PyDict_New();
- typename MultiMap::const_iterator it = cppObj.begin();
-
- for (; it != cppObj.end(); ++it) {
- Shiboken::AutoDecRef key(Shiboken::Converter<typename MultiMap::key_type>::toPython(it.key()));
- Shiboken::AutoDecRef value(Shiboken::Converter<typename MultiMap::mapped_type>::toPython(it.value()));
-
- PyObject* values = PyDict_GetItem(result, key);
- bool decRefValues = !values;
- if (!values)
- values = PyList_New(0);
- PyList_Append(values, value);
- PyDict_SetItem(result, key, values);
- if (decRefValues) {
- Py_DECREF(values);
- }
- }
-
- return result;
- }
-
- static inline MultiMap toCpp(PyObject* pyObj)
- {
- if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<MultiMap>()))
- return *reinterpret_cast<MultiMap *>(Shiboken::Object::cppPointer(reinterpret_cast<SbkObject *>(pyObj), Shiboken::SbkType<MultiMap>()));
-
- MultiMap result;
-
- PyObject* key;
- PyObject* value;
- Py_ssize_t pos = 0;
-
- while (PyDict_Next(pyObj, &pos, &key, &value))
- result[Shiboken::Converter<typename MultiMap::key_type>::toCpp(key)] = Shiboken::Converter<typename MultiMap::mapped_type>::toCpp(value);
- return result;
- }
-};
-
-template <typename T>
-struct QSequenceConverter
-{
- static inline bool checkType(PyObject* pyObj)
- {
- return isConvertible(pyObj);
- }
-
- static inline bool isConvertible(PyObject* pyObj)
- {
- if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>()))
- return true;
- if ((Shiboken::SbkType<T>() && Shiboken::Object::checkType(pyObj)) || !PySequence_Check(pyObj))
- return false;
- for (int i = 0, max = PySequence_Length(pyObj); i < max; ++i) {
- Shiboken::AutoDecRef item(PySequence_GetItem(pyObj, i));
- if (!Shiboken::Converter<typename T::value_type>::isConvertible(item))
- return false;
- }
- return true;
- }
- static inline PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<T*>(cppObj)); }
- static PyObject* toPython(const T& cppobj)
- {
- PyObject* result = PyList_New((int) cppobj.size());
- typename T::const_iterator it = cppobj.begin();
- for (int idx = 0; it != cppobj.end(); ++it, ++idx) {
- typename T::value_type vh(*it);
- PyList_SET_ITEM(result, idx, Shiboken::Converter<typename T::value_type>::toPython(vh));
- }
- return result;
- }
- static T toCpp(PyObject* pyobj)
- {
- if (PyObject_TypeCheck(pyobj, Shiboken::SbkType<T>()))
- return *reinterpret_cast<T *>(Shiboken::Object::cppPointer(reinterpret_cast<SbkObject *>(pyobj), Shiboken::SbkType<T>()));
-
- Shiboken::AutoDecRef fastSequence(PySequence_Fast(pyobj, "Invalid sequence object"));
- T result;
- for (int i = 0; i < PySequence_Size(pyobj); i++) {
- PyObject* pyItem = PySequence_Fast_GET_ITEM(fastSequence.object(), i);
- result << Shiboken::Converter<typename T::value_type>::toCpp(pyItem);
- }
- return result;
- }
-};
-
-
-template <typename T>
-struct QFlagsConverter
-{
- static inline bool checkType(PyObject* pyObj)
- {
- return PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>());
- }
-
- static inline bool isConvertible(PyObject* pyObj)
- {
- return PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>())
- || PyObject_TypeCheck(pyObj, Shiboken::SbkType<typename T::enum_type>());
- }
-
- static inline PyObject* toPython(void* cppObj)
- {
- return toPython(*reinterpret_cast<T*>(cppObj));
- }
-
- static inline PyObject* toPython(const T& cppObj)
- {
- return reinterpret_cast<PyObject*>(PySide::QFlags::newObject(cppObj, Shiboken::SbkType<T>()));
- }
-
- static inline T toCpp(PyObject* pyObj)
- {
- /* this was long. Needed int in Qt5 */
- int val = 0;
- if (Shiboken::Enum::check(pyObj)) {
- val = Shiboken::Enum::getValue(pyObj);
- } else if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>())) {
- val = PySide::QFlags::getValue(reinterpret_cast<PySideQFlagsObject*>(pyObj));
- } else if (PyNumber_Check(pyObj)) {
- Shiboken::AutoDecRef pyLong(PyNumber_Long(pyObj));
- val = PyLong_AsLong(pyLong.object());
- } else {
- PyErr_BadArgument();
- }
- return T(QFlag(val));
- }
-};
-
-#endif
diff --git a/sources/pyside2/libpyside/signalmanager.cpp.in b/sources/pyside2/libpyside/signalmanager.cpp.in
index 473057cb..8ede0961 100644
--- a/sources/pyside2/libpyside/signalmanager.cpp.in
+++ b/sources/pyside2/libpyside/signalmanager.cpp.in
@@ -55,10 +55,10 @@
#include <QDebug>
#include <limits>
#include <algorithm>
-#include <typeresolver.h>
#include <basewrapper.h>
+#include <bindingmanager.h>
#include <sbkconverter.h>
-#include <conversions.h>
+#include <sbkstring.h>
// These private headers are needed to throw JavaScript exceptions
#if @QML_PRIVATE_API_SUPPORT@
@@ -214,30 +214,6 @@ QDataStream &operator>>(QDataStream& in, PyObjectWrapper& myObj)
};
-namespace Shiboken {
-
-template<>
-struct Converter<PySide::PyObjectWrapper>
-{
- static PySide::PyObjectWrapper toCpp(PyObject* obj)
- {
- return PySide::PyObjectWrapper(obj);
- }
-
- static PyObject* toPython(void* obj)
- {
- return toPython(*reinterpret_cast<PySide::PyObjectWrapper*>(obj));
- }
-
- static PyObject* toPython(const PySide::PyObjectWrapper& obj)
- {
- Py_INCREF((PyObject*)obj);
- return obj;
- }
-};
-
-};
-
using namespace PySide;
struct SignalManager::SignalManagerPrivate