libshiboken: Code cleanup

Remove apparently unused/deprecated code.

Change-Id: I566014bafdcbf0b3b46e9dc836c451c64d409511
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>

2 files changed, 0 insertions, 47 deletions

diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp
index d697d0732..d7d37971c 100644
--- a/sources/shiboken2/libshiboken/basewrapper.cpp
+++ b/sources/shiboken2/libshiboken/basewrapper.cpp
@@ -679,14 +679,6 @@ bool canCallConstructor(PyTypeObject* myType, PyTypeObject* ctorType)
     return true;
 }
 
-
-bool hasExternalCppConversions(SbkObjectType*) { return false; }                    // DEPRECATED.
-bool isExternalConvertible(SbkObjectType *, PyObject *) { return false; }           // DEPRECATED.
-void setExternalCppConversionFunction(SbkObjectType*, ExtendedToCppFunc) {}         // DEPRECATED.
-void setExternalIsConvertibleFunction(SbkObjectType*, ExtendedIsConvertibleFunc) {} // DEPRECATED.
-void* callExternalCppConversion(SbkObjectType*, PyObject*) { return 0; }            // DEPRECATED.
-
-
 bool hasCast(SbkObjectType* type)
 {
     return type->d->mi_specialcast != 0;
@@ -719,18 +711,6 @@ void setTypeDiscoveryFunctionV2(SbkObjectType* self, TypeDiscoveryFuncV2 func)
     self->d->type_discovery = func;
 }
 
-void setTypeDiscoveryFunction(SbkObjectType* self, TypeDiscoveryFunc func)
-{
-    self->d->type_discovery = (TypeDiscoveryFuncV2)func;
-}
-
-TypeDiscoveryFunc getTypeDiscoveryFunction(SbkObjectType* self)
-{
-    // This is an illegal cast because the return value is different,
-    // but nobody ever used this function, so... =]
-    return (TypeDiscoveryFunc)self->d->type_discovery;
-}
-
 void copyMultimpleheritance(SbkObjectType* self, SbkObjectType* other)
 {
     self->d->mi_init = other->d->mi_init;
@@ -1053,11 +1033,6 @@ void makeValid(SbkObject* self)
     }
 }
 
-bool hasParentInfo(SbkObject* pyObj)
-{
-    return pyObj->d->parentInfo != 0;
-}
-
 void* cppPointer(SbkObject* pyObj, PyTypeObject* desiredType)
 {
     PyTypeObject* type = Py_TYPE(pyObj);
diff --git a/sources/shiboken2/libshiboken/basewrapper.h b/sources/shiboken2/libshiboken/basewrapper.h
index bd2d6820f..f6a7352f7 100644
--- a/sources/shiboken2/libshiboken/basewrapper.h
+++ b/sources/shiboken2/libshiboken/basewrapper.h
@@ -151,14 +151,6 @@ LIBSHIBOKEN_API bool        isUserType(PyTypeObject* pyObj);
 */
 LIBSHIBOKEN_API bool        canCallConstructor(PyTypeObject* myType, PyTypeObject* ctorType);
 
-
-LIBSHIBOKEN_API bool        hasExternalCppConversions(SbkObjectType*);                                   // DEPRECATED.
-LIBSHIBOKEN_API bool        isExternalConvertible(SbkObjectType*, PyObject*);                            // DEPRECATED.
-LIBSHIBOKEN_API void        setExternalCppConversionFunction(SbkObjectType*, ExtendedToCppFunc);         // DEPRECATED.
-LIBSHIBOKEN_API void        setExternalIsConvertibleFunction(SbkObjectType*, ExtendedIsConvertibleFunc); // DEPRECATED.
-LIBSHIBOKEN_API void*       callExternalCppConversion(SbkObjectType*, PyObject*);                        // DEPRECATED.
-
-
 /**
  *  Tells if the \p type represents an object of a class with multiple inheritance in C++.
  *  When this occurs, the C++ pointer held by the Python wrapper will need to be cast when
@@ -180,9 +172,6 @@ LIBSHIBOKEN_API void        setOriginalName(SbkObjectType* self, const char* nam
 LIBSHIBOKEN_API const char* getOriginalName(SbkObjectType* self);
 
 LIBSHIBOKEN_API void setTypeDiscoveryFunctionV2(SbkObjectType* self, TypeDiscoveryFuncV2 func);
-LIBSHIBOKEN_API SBK_DEPRECATED(void setTypeDiscoveryFunction(SbkObjectType* self, TypeDiscoveryFunc func));
-LIBSHIBOKEN_API SBK_DEPRECATED(TypeDiscoveryFunc getTypeDiscoveryFunction(SbkObjectType* self));
-
 LIBSHIBOKEN_API void        copyMultimpleheritance(SbkObjectType* self, SbkObjectType* other);
 LIBSHIBOKEN_API void        setMultipleIheritanceFunction(SbkObjectType* self, MultipleInheritanceInitFunction func);
 LIBSHIBOKEN_API MultipleInheritanceInitFunction getMultipleIheritanceFunction(SbkObjectType* self);
@@ -333,11 +322,6 @@ LIBSHIBOKEN_API void        releaseOwnership(PyObject* pyObj);
 LIBSHIBOKEN_API void        releaseOwnership(SbkObject* pyObj);
 
 /**
- *  Returns true if the pyObj holds information about their parents.
- */
-LIBSHIBOKEN_API bool        hasParentInfo(SbkObject* pyObj);
-
-/**
  *   Get the C++ pointer of type \p desiredType from a Python object.
  */
 LIBSHIBOKEN_API void*       cppPointer(SbkObject* pyObj, PyTypeObject* desiredType);
@@ -387,12 +371,6 @@ LIBSHIBOKEN_API void        setParent(PyObject* parent, PyObject* child);
 LIBSHIBOKEN_API void        removeParent(SbkObject* child, bool giveOwnershipBack = true, bool keepReferenc = false);
 
 /**
-* \internal This is an internal function called by tp_dealloc, it's exported just for technical reasons.
-* \note Do not call this function inside your bindings.
-*/
-LIBSHIBOKEN_API void        destroyParentInfo(SbkObject* obj, bool removeFromParent = true);
-
-/**
  * Mark the object as invalid
  */
 LIBSHIBOKEN_API void        invalidate(SbkObject* self);