kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fix compliation against shiboken2 head

Browse Source 
shiboken2 changed type conversion and removed a wrapper.
This just deleted the class definition that is not longer valid and inlines
code in a few places.

fixes #3287
This commit is contained in:
Daniel Rogers
2018-01-23 23:25:45 -08:00
committed by wmayer
parent 19efb5e099
commit d59a2c2817
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Gui/WidgetFactory.cpp
View File

@@ -77,7 +77,6 @@ PyTypeObject** SbkPySide_QtGuiTypes=NULL;
# include <basewrapper.h>
# include <sbkconverter.h>
# include <sbkmodule.h>
# include <typeresolver.h>
# include <shiboken.h>
# ifdef HAVE_PYSIDE2
# define HAVE_PYSIDE
@@ -114,40 +113,24 @@ PyTypeObject** SbkPySide2_QtWidgetsTypes=NULL;
using namespace Gui;
#if defined (HAVE_SHIBOKEN)
namespace Shiboken {
template<> struct Converter<Base::Quantity>
{
static inline bool checkType(PyObject* pyObj) {
return PyObject_TypeCheck(pyObj, &(Base::QuantityPy::Type));
}
static inline bool isConvertible(PyObject* pyObj) {
return PyObject_TypeCheck(pyObj, &(Base::QuantityPy::Type));
}
static inline PyObject* toPython(void* cppobj) {
return toPython(*reinterpret_cast<Base::Quantity*>(cppobj));
}
static inline PyObject* toPython(Base::Quantity cpx) {
return new Base::QuantityPy(new Base::Quantity(cpx));
}
static inline Base::Quantity toCpp(PyObject* pyobj) {
Base::Quantity q = *static_cast<Base::QuantityPy*>(pyobj)->getQuantityPtr();
return q;
}
};
PyObject* toPythonFuncQuantityTyped(Base::Quantity cpx) {
return new Base::QuantityPy(new Base::Quantity(cpx));
}
PyObject* toPythonFuncQuantity(const void* cpp)
{
return Shiboken::Converter<Base::Quantity>::toPython(const_cast<void*>(cpp));
return toPythonFuncQuantityTyped(*reinterpret_cast<const Base::Quantity*>(cpp));
}
void toCppPointerConvFuncQuantity(PyObject*,void*)
void toCppPointerConvFuncQuantity(PyObject* pyobj,void* cpp)
{
*((Base::Quantity*)cpp) = *static_cast<Base::QuantityPy*>(pyobj)->getQuantityPtr();
}
PythonToCppFunc toCppPointerCheckFuncQuantity(PyObject* obj)
{
if (Shiboken::Converter<Base::Quantity>::isConvertible(obj))
if (PyObject_TypeCheck(obj, &(Base::QuantityPy::Type)))
return toCppPointerConvFuncQuantity;
else
return 0;
@@ -297,7 +280,9 @@ QObject* PythonWrapper::toQObject(const Py::Object& pyobject)
Py::Object PythonWrapper::fromQIcon(const QIcon* icon)
{
#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
PyObject* pyobj = Shiboken::createWrapper<QIcon>(icon, true);
const char* typeName = typeid(icon).name();
PyObject* pyobj = Shiboken::Object::newObject(reinterpret_cast<SbkObjectType*>(Shiboken::SbkType<QIcon>()),
const_cast<QIcon*>(icon), true, false, typeName);
if (pyobj)
return Py::asObject(pyobj);
#else