diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-10-06 20:44:40 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:18:22 -0300 |
commit | b63fb5b842459170647eba9036fda522ef251b23 (patch) | |
tree | 13fe3c2d75c8e1606eb1614deff8aa57308bfac9 | |
parent | 251284d5be98d3648df76933b8155e7ab3a80198 (diff) |
String::convertible renamed to String::isConvertible.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Renato Araújo <renato.filho@openbossa.org>
-rw-r--r-- | libshiboken/conversions.h | 2 | ||||
-rw-r--r-- | libshiboken/sbkstring.cpp | 2 | ||||
-rw-r--r-- | libshiboken/sbkstring.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h index da6407985..08f6679a7 100644 --- a/libshiboken/conversions.h +++ b/libshiboken/conversions.h @@ -487,7 +487,7 @@ struct Converter_CString return Shiboken::String::check(pyObj); } static inline bool isConvertible(PyObject* pyObj) { - return Shiboken::String::convertible(pyObj); + return Shiboken::String::isConvertible(pyObj); } static inline PyObject* toPython(void* cppobj) { return toPython(reinterpret_cast<CString>(cppobj)); } static inline PyObject* toPython(CString cppobj) diff --git a/libshiboken/sbkstring.cpp b/libshiboken/sbkstring.cpp index 2ff9d5115..de6842dce 100644 --- a/libshiboken/sbkstring.cpp +++ b/libshiboken/sbkstring.cpp @@ -54,7 +54,7 @@ bool checkChar(PyObject* pyobj) return false; } -bool convertible(PyObject* obj) +bool isConvertible(PyObject* obj) { return check(obj); } diff --git a/libshiboken/sbkstring.h b/libshiboken/sbkstring.h index 34a56c8b4..d6bc6502f 100644 --- a/libshiboken/sbkstring.h +++ b/libshiboken/sbkstring.h @@ -39,7 +39,7 @@ namespace String LIBSHIBOKEN_API bool check(PyObject* obj); LIBSHIBOKEN_API bool checkType(PyTypeObject* obj); LIBSHIBOKEN_API bool checkChar(PyObject* obj); - LIBSHIBOKEN_API bool convertible(PyObject* obj); + LIBSHIBOKEN_API bool isConvertible(PyObject* obj); LIBSHIBOKEN_API PyObject* fromCString(const char* value); LIBSHIBOKEN_API const char* toCString(PyObject* str); LIBSHIBOKEN_API bool concat(PyObject** val1, PyObject* val2); |