diff options
author | Hugo Lima <hugo.lima@openbossa.org> | 2010-03-15 14:46:30 -0300 |
---|---|---|
committer | Hugo Lima <hugo.lima@openbossa.org> | 2010-03-17 18:17:13 -0300 |
commit | 781bdbe6321298e7bb567a717a8b0fca4cd0e7e2 (patch) | |
tree | 6eb7b4ab029f566d6aba94113cc16a579a9cdfef /PySide/QtCore/qmap_conversions.h | |
parent | b53b9e49ba3b277913b970df758b75b36cc253a4 (diff) |
Fixed PySide custom conversions to work with newer versions of shiboken generator.
Diffstat (limited to 'PySide/QtCore/qmap_conversions.h')
-rw-r--r-- | PySide/QtCore/qmap_conversions.h | 45 |
1 files changed, 2 insertions, 43 deletions
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> > { +}; } |