4 files changed, 6 insertions, 60 deletions
diff --git a/PySide/QtCore/glue/hwnd_conversions.h b/PySide/QtCore/glue/hwnd_conversions.h
deleted file mode 100644
index 6dbaa8f4e..000000000
--- a/PySide/QtCore/glue/hwnd_conversions.h
+++ /dev/null
@@ -1,54 +0,0 @@
-namespace Shiboken {
-template <>
-struct Converter<HWND>
-{
-    static bool checkType(PyObject* pyObj)
-    {
-        return false;
-    }
-
-    static bool isConvertible(PyObject* pyobj)
-    {
-        if (pyobj == Py_None)
-            return true;
-
-#ifdef IS_PY3K
-        return PyCapsule_CheckExact(pyobj);
-#else
-        return PyCObject_Check(pyobj);
-#endif
-    }
-
-    static inline PyObject* toPython(void* cppobj)
-    {
-        // not supported
-        Q_ASSERT(true);
-        return 0;
-    }
-
-    static PyObject* toPython(HWND cppobj)
-    {
-        if (!cppobj)
-            Py_RETURN_NONE;
-
-#ifdef IS_PY3K
-        return PyCapsule_New(cppobj, 0, 0);
-#else
-        return PyCObject_FromVoidPtr(cppobj, 0);
-#endif
-    }
-
-    static HWND toCpp(PyObject* pyobj)
-    {
-        if (pyobj == Py_None)
-            return 0;
-
-#ifdef IS_PY3K
-        return (HWND)PyCapsule_GetPointer(pyobj, 0);
-#else
-        return (HWND)PyCObject_AsVoidPtr(pyobj);
-#endif
-    }
-};
-
-}
diff --git a/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp b/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp
index 03ffcb4af..acc7bb93e 100644
--- a/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp
+++ b/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp
@@ -18,7 +18,7 @@ static Py_ssize_t SbkQByteArray_readbufferproc(PyObject* self, Py_ssize_t segmen
     if (segment || !Shiboken::Object::isValid(self))
         return -1;
 
-    QByteArray* cppSelf = Shiboken::Converter<QByteArray*>::toCpp(self);
+    QByteArray* cppSelf = %CONVERTTOCPP[QByteArray*](self);
     *ptrptr = reinterpret_cast<void*>(cppSelf->data());
     return cppSelf->size();
 }
diff --git a/PySide/QtCore/glue/qeasingcurve_glue.cpp b/PySide/QtCore/glue/qeasingcurve_glue.cpp
index fd2dee092..7f56315b3 100644
--- a/PySide/QtCore/glue/qeasingcurve_glue.cpp
+++ b/PySide/QtCore/glue/qeasingcurve_glue.cpp
@@ -93,7 +93,7 @@ qreal PySideEasingCurveFunctor::operator()(qreal progress)
     PyObject* result = PyObject_CallObject(m_func, args);
     qreal cppResult = 0.0;
     if (result) {
-        cppResult = Shiboken::Converter<qreal>::toCpp(result);
+        Shiboken::Conversions::pythonToCppCopy(Shiboken::Conversions::PrimitiveTypeConverter<qreal>(), result, &cppResult);
         Py_DECREF(result);
     }
     Py_DECREF(args);
diff --git a/PySide/QtCore/glue/qobject_connect.cpp b/PySide/QtCore/glue/qobject_connect.cpp
index b46cbcfbc..96bcfb227 100644
--- a/PySide/QtCore/glue/qobject_connect.cpp
+++ b/PySide/QtCore/glue/qobject_connect.cpp
@@ -13,13 +13,13 @@ static bool getReceiver(QObject *source, const char* signal, PyObject* callback,
     bool forceGlobalReceiver = false;
     if (PyMethod_Check(callback)) {
         *self = PyMethod_GET_SELF(callback);
-        if (Shiboken::Converter<QObject*>::checkType(*self))
-            *receiver = Shiboken::Converter<QObject*>::toCpp(*self);
+        if (%CHECKTYPE[QObject*](*self))
+            *receiver = %CONVERTTOCPP[QObject*](*self);
         forceGlobalReceiver = isDecorator(callback, *self);
     } else if (PyCFunction_Check(callback)) {
         *self = PyCFunction_GET_SELF(callback);
-        if (*self && Shiboken::Converter<QObject*>::checkType(*self))
-            *receiver = Shiboken::Converter<QObject*>::toCpp(*self);
+        if (*self && %CHECKTYPE[QObject*](*self))
+            *receiver = %CONVERTTOCPP[QObject*](*self);
     } else if (PyCallable_Check(callback)) {
         // Ok, just a callable object
         *receiver = 0;