diff options
Diffstat (limited to 'libshiboken/sbkconverter.cpp')
| -rw-r--r-- | libshiboken/sbkconverter.cpp | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/libshiboken/sbkconverter.cpp b/libshiboken/sbkconverter.cpp index 17af66e..e7e9995 100644 --- a/libshiboken/sbkconverter.cpp +++ b/libshiboken/sbkconverter.cpp @@ -169,12 +169,12 @@ void addPythonToCppValueConversion(SbkObjectType* type, addPythonToCppValueConversion(type->d->converter, pythonToCppFunc, isConvertibleToCppFunc); } -PyObject* pointerToPython(SbkObjectType* type, const void* cppIn) +PyObject* pointerToPython(const SbkObjectType *type, const void *cppIn) { return pointerToPython(type->d->converter, cppIn); } -PyObject* pointerToPython(SbkConverter* converter, const void* cppIn) +PyObject* pointerToPython(const SbkConverter *converter, const void *cppIn) { assert(converter); if (!cppIn) @@ -187,12 +187,12 @@ PyObject* pointerToPython(SbkConverter* converter, const void* cppIn) return converter->pointerToPython(cppIn); } -PyObject* referenceToPython(SbkObjectType* type, const void* cppIn) +PyObject* referenceToPython(const SbkObjectType *type, const void *cppIn) { return referenceToPython(type->d->converter, cppIn); } -PyObject* referenceToPython(SbkConverter* converter, const void* cppIn) +PyObject* referenceToPython(const SbkConverter *converter, const void *cppIn) { assert(cppIn); @@ -209,7 +209,7 @@ PyObject* referenceToPython(SbkConverter* converter, const void* cppIn) return converter->pointerToPython(cppIn); } -static inline PyObject* CopyCppToPython(SbkConverter* converter, const void* cppIn) +static inline PyObject* CopyCppToPython(const SbkConverter *converter, const void *cppIn) { if (!cppIn) Py_RETURN_NONE; @@ -220,42 +220,42 @@ static inline PyObject* CopyCppToPython(SbkConverter* converter, const void* cpp } return converter->copyToPython(cppIn); } -PyObject* copyToPython(SbkObjectType* type, const void* cppIn) +PyObject* copyToPython(const SbkObjectType *type, const void *cppIn) { return CopyCppToPython(type->d->converter, cppIn); } -PyObject* copyToPython(SbkConverter* converter, const void* cppIn) +PyObject* copyToPython(const SbkConverter *converter, const void *cppIn) { return CopyCppToPython(converter, cppIn); } -PythonToCppFunc isPythonToCppPointerConvertible(SbkObjectType* type, PyObject* pyIn) +PythonToCppFunc isPythonToCppPointerConvertible(const SbkObjectType *type, PyObject *pyIn) { assert(pyIn); return type->d->converter->toCppPointerConversion.first(pyIn); } -static inline PythonToCppFunc IsPythonToCppConvertible(SbkConverter* converter, PyObject* pyIn) +static inline PythonToCppFunc IsPythonToCppConvertible(const SbkConverter *converter, PyObject *pyIn) { assert(pyIn); - ToCppConversionList& convs = converter->toCppConversions; - for (ToCppConversionList::iterator conv = convs.begin(); conv != convs.end(); ++conv) { + const ToCppConversionList& convs = converter->toCppConversions; + for (ToCppConversionList::const_iterator conv = convs.begin(), end = convs.end(); conv != end; ++conv) { PythonToCppFunc toCppFunc = 0; if ((toCppFunc = (*conv).first(pyIn))) return toCppFunc; } return 0; } -PythonToCppFunc isPythonToCppValueConvertible(SbkObjectType* type, PyObject* pyIn) +PythonToCppFunc isPythonToCppValueConvertible(const SbkObjectType *type, PyObject *pyIn) { return IsPythonToCppConvertible(type->d->converter, pyIn); } -PythonToCppFunc isPythonToCppConvertible(SbkConverter* converter, PyObject* pyIn) +PythonToCppFunc isPythonToCppConvertible(const SbkConverter *converter, PyObject *pyIn) { return IsPythonToCppConvertible(converter, pyIn); } -PythonToCppFunc isPythonToCppReferenceConvertible(SbkObjectType* type, PyObject* pyIn) +PythonToCppFunc isPythonToCppReferenceConvertible(const SbkObjectType *type, PyObject *pyIn) { if (pyIn != Py_None) { PythonToCppFunc toCpp = isPythonToCppPointerConvertible(type, pyIn); @@ -292,7 +292,7 @@ void pythonToCppPointer(SbkObjectType* type, PyObject* pyIn, void* cppOut) : cppPointer(reinterpret_cast<PyTypeObject *>(type), reinterpret_cast<SbkObject *>(pyIn)); } -void pythonToCppPointer(SbkConverter* converter, PyObject* pyIn, void* cppOut) +void pythonToCppPointer(const SbkConverter *converter, PyObject *pyIn, void *cppOut) { assert(converter); assert(pyIn); @@ -302,7 +302,7 @@ void pythonToCppPointer(SbkConverter* converter, PyObject* pyIn, void* cppOut) : cppPointer(reinterpret_cast<PyTypeObject *>(converter->pythonType), reinterpret_cast<SbkObject *>(pyIn)); } -static void _pythonToCppCopy(SbkConverter* converter, PyObject* pyIn, void* cppOut) +static void _pythonToCppCopy(const SbkConverter *converter, PyObject *pyIn, void *cppOut) { assert(converter); assert(pyIn); @@ -312,18 +312,18 @@ static void _pythonToCppCopy(SbkConverter* converter, PyObject* pyIn, void* cppO toCpp(pyIn, cppOut); } -void pythonToCppCopy(SbkObjectType* type, PyObject* pyIn, void* cppOut) +void pythonToCppCopy(const SbkObjectType *type, PyObject *pyIn, void *cppOut) { assert(type); _pythonToCppCopy(type->d->converter, pyIn, cppOut); } -void pythonToCppCopy(SbkConverter* converter, PyObject* pyIn, void* cppOut) +void pythonToCppCopy(const SbkConverter *converter, PyObject *pyIn, void *cppOut) { _pythonToCppCopy(converter, pyIn, cppOut); } -bool isImplicitConversion(SbkObjectType* type, PythonToCppFunc toCppFunc) +bool isImplicitConversion(const SbkObjectType *type, PythonToCppFunc toCppFunc) { // This is the Object Type or Value Type conversion that only // retrieves the C++ pointer held in the Python wrapper. @@ -381,7 +381,7 @@ bool checkSequenceTypes(PyTypeObject* type, PyObject* pyIn) } return true; } -bool convertibleSequenceTypes(SbkConverter* converter, PyObject* pyIn) +bool convertibleSequenceTypes(const SbkConverter *converter, PyObject *pyIn) { assert(converter); assert(pyIn); @@ -394,7 +394,7 @@ bool convertibleSequenceTypes(SbkConverter* converter, PyObject* pyIn) } return true; } -bool convertibleSequenceTypes(SbkObjectType* type, PyObject* pyIn) +bool convertibleSequenceTypes(const SbkObjectType *type, PyObject *pyIn) { assert(type); return convertibleSequenceTypes(type->d->converter, pyIn); @@ -415,7 +415,9 @@ bool checkPairTypes(PyTypeObject* firstType, PyTypeObject* secondType, PyObject* return false; return true; } -bool convertiblePairTypes(SbkConverter* firstConverter, bool firstCheckExact, SbkConverter* secondConverter, bool secondCheckExact, PyObject* pyIn) +bool convertiblePairTypes(const SbkConverter *firstConverter, bool firstCheckExact, + const SbkConverter *secondConverter, bool secondCheckExact, + PyObject *pyIn) { assert(firstConverter); assert(secondConverter); @@ -462,7 +464,8 @@ bool checkDictTypes(PyTypeObject* keyType, PyTypeObject* valueType, PyObject* py return true; } -bool convertibleDictTypes(SbkConverter* keyConverter, bool keyCheckExact, SbkConverter* valueConverter, bool valueCheckExact, PyObject* pyIn) +bool convertibleDictTypes(const SbkConverter * keyConverter, bool keyCheckExact, const SbkConverter *valueConverter, + bool valueCheckExact, PyObject *pyIn) { assert(keyConverter); assert(valueConverter); @@ -489,7 +492,7 @@ bool convertibleDictTypes(SbkConverter* keyConverter, bool keyCheckExact, SbkCon return true; } -PyTypeObject* getPythonTypeObject(SbkConverter* converter) +PyTypeObject* getPythonTypeObject(const SbkConverter *converter) { if (converter) return converter->pythonType; @@ -501,18 +504,18 @@ PyTypeObject* getPythonTypeObject(const char* typeName) return getPythonTypeObject(getConverter(typeName)); } -bool pythonTypeIsValueType(SbkConverter* converter) +bool pythonTypeIsValueType(const SbkConverter *converter) { assert(converter); return converter->pointerToPython && converter->copyToPython; } -bool pythonTypeIsObjectType(SbkConverter* converter) +bool pythonTypeIsObjectType(const SbkConverter *converter) { return converter->pointerToPython && !converter->copyToPython; } -bool pythonTypeIsWrapperType(SbkConverter* converter) +bool pythonTypeIsWrapperType(const SbkConverter *converter) { return converter->pointerToPython; } |