Remove redundant code on containers custom conversions.

3 files changed, 3 insertions, 80 deletions

diff --git a/PySide/QtCore/qlist_conversions.h b/PySide/QtCore/qlist_conversions.h
index 7430c615d..4ccfbe5cf 100644
--- a/PySide/QtCore/qlist_conversions.h
+++ b/PySide/QtCore/qlist_conversions.h
@@ -1,28 +1,2 @@
-template <typename qlist>
-struct Converter_qlist
-{
-    static bool isConvertible(PyObject* pyobj) {
-        return PySequence_Check(pyobj);
-    }
-
-    static PyObject* toPython(const qlist& list)
-    {
-        PyObject* result = PyList_New(list.size());
-        for (int i = 0; i < list.size(); i++) {
-            PyList_SET_ITEM(result, i, Converter<typename qlist::value_type>::toPython(list.at(i)));
-        }
-        return result;
-    }
-    static qlist toCpp(PyObject* pyobj)
-    {
-        qlist result;
-        for (int i = 0; i < PySequence_Size(pyobj); i++) {
-            PyObject* pyItem = PySequence_GetItem(pyobj, i);
-            result.append(Converter<typename qlist::value_type>::toCpp(pyItem));
-        }
-        return result;
-    }
-};
-
 template<typename T>
-struct Converter<QList<T> > : Converter_qlist<QList<T> > {};
+struct Converter<QList<T> > : Converter_std_list<QList<T> > {};
diff --git a/PySide/QtCore/qpair_conversions.h b/PySide/QtCore/qpair_conversions.h
index 667ae04fe..54eaaa61f 100644
--- a/PySide/QtCore/qpair_conversions.h
+++ b/PySide/QtCore/qpair_conversions.h
@@ -1,28 +1,2 @@
-template <typename qpair>
-struct Converter_qpair
-{
-    static bool isConvertible(PyObject* pyobj) {
-        return PySequence_Check(pyobj);
-    }
-    static PyObject* toPython(const qpair& pair)
-    {
-        typename qpair::first_type first(pair.first);
-        typename qpair::second_type second(pair.second);
-        PyObject* tuple = PyTuple_New(2);
-        PyTuple_SET_ITEM(tuple, 0, Converter<typename qpair::first_type>::toPython(first));
-        PyTuple_SET_ITEM(tuple, 1, Converter<typename qpair::second_type>::toPython(second));
-        return tuple;
-    }
-    static qpair toCpp(PyObject* pyobj)
-    {
-        qpair result;
-        PyObject* pyFirst = PySequence_GetItem(pyobj, 0);
-        PyObject* pySecond = PySequence_GetItem(pyobj, 1);
-        result.first = Converter<typename qpair::first_type>::toCpp(pyFirst);
-        result.second = Converter<typename qpair::second_type>::toCpp(pySecond);
-        return result;
-    }
-};
-
 template<typename FT, typename ST>
-struct Converter<QPair<FT, ST> > : Converter_qpair<QPair<FT, ST> > {};
+struct Converter<QPair<FT, ST> > : Converter_std_pair<QPair<FT, ST> > {};
diff --git a/PySide/QtCore/qvector_conversions.h b/PySide/QtCore/qvector_conversions.h
index 645689ef2..df70713f2 100644
--- a/PySide/QtCore/qvector_conversions.h
+++ b/PySide/QtCore/qvector_conversions.h
@@ -1,27 +1,2 @@
-template <typename qvector>
-struct Converter_qvector
-{
-    static bool isConvertible(PyObject* pyobj) {
-        return PySequence_Check(pyobj);
-    }
-    static PyObject* toPython(const qvector& vector)
-    {
-        PyObject* result = PyList_New(vector.size());
-        for (int i = 0; i < vector.size(); i++) {
-            PyList_SET_ITEM(result, i, Converter<typename qvector::value_type>::toPython(vector.at(i)));
-        }
-        return result;
-    }
-    static qvector toCpp(PyObject* pyobj)
-    {
-        qvector result;
-        for (int i = 0; i < PySequence_Size(pyobj); i++) {
-            PyObject* pyItem = PySequence_GetItem(pyobj, i);
-            result.append(Converter<typename qvector::value_type>::toCpp(pyItem));
-        }
-        return result;
-    }
-};
-
 template<typename T>
-struct Converter<QVector<T> > : Converter_qvector<QVector<T> > {};
+struct Converter<QVector<T> > : Converter_std_list<QVector<T> > {};