summaryrefslogtreecommitdiffstats
path: root/libshiboken
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2011-10-06 20:44:40 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2011-10-07 20:03:44 -0300
commit0a84cb53f6aad95d8f215e3867ddbff37da92f23 (patch)
treeaf4af321012b70cb211ef0ae39ed4e588283ba16 /libshiboken
parent3428c8399f27a34890a3ffc92842f37450017f94 (diff)
downloadshiboken-0a84cb53f6aad95d8f215e3867ddbff37da92f23.tar.gz
shiboken-0a84cb53f6aad95d8f215e3867ddbff37da92f23.tar.xz
shiboken-0a84cb53f6aad95d8f215e3867ddbff37da92f23.zip
String::convertible renamed to String::isConvertible.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org> Renato Ara├║jo <renato.filho@openbossa.org>
Diffstat (limited to 'libshiboken')
-rw-r--r--libshiboken/conversions.h2
-rw-r--r--libshiboken/sbkstring.cpp2
-rw-r--r--libshiboken/sbkstring.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h
index da640798..08f6679a 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 2ff9d511..de6842dc 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 34a56c8b..d6bc6502 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);