From 4f56186d1b239d17a2a7a521c9d60682313beb60 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 16 Oct 2018 19:31:33 +0200 Subject: [PATCH] remove unused shiboken wrapper for Base::Quantity --- src/Gui/View3DInventorViewer.h | 3 +- src/Gui/WidgetFactory.cpp | 82 ---------------------------------- 2 files changed, 2 insertions(+), 83 deletions(-) diff --git a/src/Gui/View3DInventorViewer.h b/src/Gui/View3DInventorViewer.h index bdef962a6b..c8809e83fc 100644 --- a/src/Gui/View3DInventorViewer.h +++ b/src/Gui/View3DInventorViewer.h @@ -43,7 +43,6 @@ class SoTranslation; class SoTransform; class SoText2; -namespace Quarter = SIM::Coin3D::Quarter; class SoSeparator; class SoShapeHints; @@ -57,6 +56,8 @@ class QImage; class SoGroup; class NaviCube; +namespace Quarter = SIM::Coin3D::Quarter; + namespace Gui { class ViewProvider; diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp index 625a7e7811..b77333c502 100644 --- a/src/Gui/WidgetFactory.cpp +++ b/src/Gui/WidgetFactory.cpp @@ -114,81 +114,6 @@ PyTypeObject** SbkPySide2_QtWidgetsTypes=NULL; using namespace Gui; -#if defined (HAVE_SHIBOKEN) - -PyObject* toPythonFuncQuantityTyped(Base::Quantity cpx) { - return new Base::QuantityPy(new Base::Quantity(cpx)); -} - -PyObject* toPythonFuncQuantity(const void* cpp) -{ - return toPythonFuncQuantityTyped(*reinterpret_cast(cpp)); -} - -void toCppPointerConvFuncQuantity(PyObject* pyobj,void* cpp) -{ - *((Base::Quantity*)cpp) = *static_cast(pyobj)->getQuantityPtr(); -} - -PythonToCppFunc toCppPointerCheckFuncQuantity(PyObject* obj) -{ - if (PyObject_TypeCheck(obj, &(Base::QuantityPy::Type))) - return toCppPointerConvFuncQuantity; - else - return 0; -} - -void BaseQuantity_PythonToCpp_QVariant(PyObject* pyIn, void* cppOut) -{ - Base::Quantity* q = static_cast(pyIn)->getQuantityPtr(); - *((QVariant*)cppOut) = QVariant::fromValue(*q); -} - -PythonToCppFunc isBaseQuantity_PythonToCpp_QVariantConvertible(PyObject* obj) -{ - if (PyObject_TypeCheck(obj, &(Base::QuantityPy::Type))) - return BaseQuantity_PythonToCpp_QVariant; - return 0; -} - -#if QT_VERSION >= 0x050200 -Base::Quantity convertWrapperToQuantity(const PySide::PyObjectWrapper &w) -{ - PyObject* pyIn = static_cast(w); - if (PyObject_TypeCheck(pyIn, &(Base::QuantityPy::Type))) { - return *static_cast(pyIn)->getQuantityPtr(); - } - - return Base::Quantity(std::numeric_limits::quiet_NaN()); -} -#endif - -void registerTypes() -{ - SbkConverter* convert = Shiboken::Conversions::createConverter(&Base::QuantityPy::Type, - toPythonFuncQuantity); - Shiboken::Conversions::setPythonToCppPointerFunctions(convert, - toCppPointerConvFuncQuantity, - toCppPointerCheckFuncQuantity); - Shiboken::Conversions::registerConverterName(convert, "Base::Quantity"); - - SbkConverter* qvariant_conv = Shiboken::Conversions::getConverter("QVariant"); - if (qvariant_conv) { - // The type QVariant already has a converter from PyBaseObject_Type which will - // come before our own converter. - Shiboken::Conversions::addPythonToCppValueConversion(qvariant_conv, - BaseQuantity_PythonToCpp_QVariant, - isBaseQuantity_PythonToCpp_QVariantConvertible); - } - -#if QT_VERSION >= 0x050200 - QMetaType::registerConverter(&convertWrapperToQuantity); -#endif -} -#endif - -// -------------------------------------------------------- - namespace Gui { template Py::Object qt_wrapInstance(qttype object, const char* className, @@ -248,13 +173,6 @@ void* qt_getCppPointer(const Py::Object& pyobject, const char* shiboken, const c PythonWrapper::PythonWrapper() { -#if defined (HAVE_SHIBOKEN) - static bool init = false; - if (!init) { - init = true; - registerTypes(); - } -#endif } bool PythonWrapper::toCString(const Py::Object& pyobject, std::string& str)