updated custom conversions to use Converter<T>::isConvertible properly

6 files changed, 16 insertions, 16 deletions

diff --git a/PySide/QtCore/qhash_conversions.h b/PySide/QtCore/qhash_conversions.h
index 49b4c461b..53863e840 100644
--- a/PySide/QtCore/qhash_conversions.h
+++ b/PySide/QtCore/qhash_conversions.h
@@ -1,8 +1,8 @@
 template <typename qhash>
 struct Converter_qhash
 {
-    static bool isConvertible(const PyObject* pyObj) {
-        return PyDict_Check(const_cast<PyObject*>(pyObj));
+    static bool isConvertible(PyObject* pyObj) {
+        return PyDict_Check(pyObj);
     }
 
     static PyObject* toPython(qhash hash)
diff --git a/PySide/QtCore/qlist_conversions.h b/PySide/QtCore/qlist_conversions.h
index 8662305dd..8da6edcce 100644
--- a/PySide/QtCore/qlist_conversions.h
+++ b/PySide/QtCore/qlist_conversions.h
@@ -1,11 +1,11 @@
 template <typename qlist>
 struct Converter_qlist
 {
-    static bool isConvertible(const PyObject* pyObj) {
-        return PySequence_Check(const_cast<PyObject*>(pyObj));
+    static bool isConvertible(PyObject* pyObj) {
+        return PySequence_Check(pyObj);
     }
 
-    static PyObject* toPython(const qlist holder)
+    static PyObject* toPython(qlist holder)
     {
         PyObject* result = PyList_New(holder.size());
         for (int i = 0; i < holder.size(); i++) {
diff --git a/PySide/QtCore/qmap_conversions.h b/PySide/QtCore/qmap_conversions.h
index a3067f679..3977c81a9 100644
--- a/PySide/QtCore/qmap_conversions.h
+++ b/PySide/QtCore/qmap_conversions.h
@@ -1,8 +1,8 @@
 template <typename qmap>
 struct Converter_qmap
 {
-    static bool isConvertible(const PyObject* pyObj) {
-        return PyDict_Check(const_cast<PyObject*>(pyObj));
+    static bool isConvertible(PyObject* pyObj) {
+        return PyDict_Check(pyObj);
     }
 
     static PyObject* toPython(qmap map)
diff --git a/PySide/QtCore/qpair_conversions.h b/PySide/QtCore/qpair_conversions.h
index c3be87826..27a9936a6 100644
--- a/PySide/QtCore/qpair_conversions.h
+++ b/PySide/QtCore/qpair_conversions.h
@@ -1,8 +1,8 @@
 template <typename qpair>
 struct Converter_qpair
 {
-    static bool isConvertible(const PyObject* pyObj) {
-        return PySequence_Check(const_cast<PyObject*>(pyObj));
+    static bool isConvertible(PyObject* pyObj) {
+        return PySequence_Check(pyObj);
     }
     static PyObject* toPython(qpair holder)
     {
diff --git a/PySide/QtCore/qstring_conversions.h b/PySide/QtCore/qstring_conversions.h
index 760800038..a9a11ba28 100644
--- a/PySide/QtCore/qstring_conversions.h
+++ b/PySide/QtCore/qstring_conversions.h
@@ -1,9 +1,9 @@
-inline bool Converter< QString >::isConvertible(const PyObject* pyObj)
+inline bool Converter< QString >::isConvertible(PyObject* pyObj)
 {
     return PyObject_TypeCheck(pyObj, &PyQString_Type) || PyUnicode_Check(pyObj) || PyString_Check(pyObj);
 }
 
-inline PyObject* Converter< QString >::toPython(const QString cppobj)
+inline PyObject* Converter< QString >::toPython(QString cppobj)
 {
     PyObject* pyobj;
     void* holder = (void*) new QString(cppobj);
@@ -13,11 +13,11 @@ inline PyObject* Converter< QString >::toPython(const QString cppobj)
 
 inline QString Converter< QString >::toCpp(PyObject* pyobj)
 {
-    if (Converter<QChar>::isConvertible(pyobj)) {
+    if (PyQChar_Check(pyobj)) {
         return QString(Converter< QChar >::toCpp(pyobj));
-    } else if (Converter<QByteArray>::isConvertible(pyobj)) {
+    } else if (PyQByteArray_Check(pyobj)) {
         return QString(Converter< QByteArray >::toCpp(pyobj));
-    } else if (Converter<QLatin1String>::isConvertible(pyobj)) {
+    } else if (PyQLatin1String_Check(pyobj)) {
         return QString(Converter< QLatin1String >::toCpp(pyobj));
     } else if (PyUnicode_Check(pyobj)) {
 #if defined(Py_UNICODE_WIDE)
diff --git a/PySide/QtCore/qvector_conversions.h b/PySide/QtCore/qvector_conversions.h
index 5b4a10f60..4d82900c7 100644
--- a/PySide/QtCore/qvector_conversions.h
+++ b/PySide/QtCore/qvector_conversions.h
@@ -1,8 +1,8 @@
 template <typename qvector>
 struct Converter_qvector
 {
-    static bool isConvertible(const PyObject* pyObj) {
-        return PySequence_Check(const_cast<PyObject*>(pyObj));
+    static bool isConvertible(PyObject* pyObj) {
+        return PySequence_Check(pyObj);
     }
     static PyObject* toPython(qvector vector)
     {