From 781bdbe6321298e7bb567a717a8b0fca4cd0e7e2 Mon Sep 17 00:00:00 2001
From: Hugo Lima <hugo.lima@openbossa.org>
Date: Mon, 15 Mar 2010 14:46:30 -0300
Subject: Fixed PySide custom conversions to work with newer versions of
 shiboken generator.

---
 PySide/QtCore/qmap_conversions.h | 45 ++--------------------------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

(limited to 'PySide/QtCore/qmap_conversions.h')

diff --git a/PySide/QtCore/qmap_conversions.h b/PySide/QtCore/qmap_conversions.h
index f7cd2c85b..3153fae92 100644
--- a/PySide/QtCore/qmap_conversions.h
+++ b/PySide/QtCore/qmap_conversions.h
@@ -1,46 +1,5 @@
 namespace Shiboken {
-template <typename qmap>
-struct Converter_qmap
-{
-    static bool isConvertible(PyObject* pyobj) {
-        return PyDict_Check(pyobj);
-    }
-
-    static PyObject* toPython(const qmap& map)
-    {
-        PyObject* result = PyDict_New();
-
-        QMapIterator<typename qmap::key_type, typename qmap::mapped_type> it(map);
-        while (it.hasNext()) {
-            it.next();
-            PyDict_SetItem(result,
-                           Converter<typename qmap::key_type>::toPython(it.key()),
-                           Converter<typename qmap::mapped_type>::toPython(it.value()));
-        }
-
-        return result;
-    }
-    static qmap toCpp(PyObject* pyobj)
-    {
-        qmap result;
-
-        PyObject* key;
-        PyObject* value;
-        Py_ssize_t pos = 0;
-
-        Py_INCREF(pyobj);
-
-        while (PyDict_Next(pyobj, &pos, &key, &value)) {
-            result.insert(Converter<typename qmap::key_type>::toCpp(key),
-                          Converter<typename qmap::mapped_type>::toCpp(value));
-        }
-
-        Py_DECREF(pyobj);
-
-        return result;
-    }
-};
-
 template<typename KT, typename VT>
-struct Converter<QMap<KT, VT> > : Converter_qmap<QMap<KT, VT> > {};
+struct Converter<QMap<KT, VT> > : QtDictConverter<QMap<KT, VT> > {
+};
 }
-- 
cgit v1.2.3