From fc97e4bb8ce52a2ff464bdad717a8a26abd37ad2 Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sun, 22 May 2011 14:10:54 +0000
Subject: [PATCH] Convert CoverSearchResult lists correctly

---
 src/main.cpp                          |  1 +
 src/scripting/python/pythonengine.cpp | 34 +++++++++++++--------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index a67e824bf..2fd5d652c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -191,6 +191,7 @@ int main(int argc, char *argv[]) {
 
   qRegisterMetaType<CoverSearchResult>("CoverSearchResult");
   qRegisterMetaType<CoverSearchResults>("CoverSearchResults");
+  qRegisterMetaType<QList<CoverSearchResult> >("QList<CoverSearchResult>");
   qRegisterMetaType<Directory>("Directory");
   qRegisterMetaType<DirectoryList>("DirectoryList");
   qRegisterMetaType<Subdirectory>("Subdirectory");
diff --git a/src/scripting/python/pythonengine.cpp b/src/scripting/python/pythonengine.cpp
index 20ee8e7be..4d0bdcd42 100644
--- a/src/scripting/python/pythonengine.cpp
+++ b/src/scripting/python/pythonengine.cpp
@@ -72,6 +72,20 @@ PythonEngine::~PythonEngine() {
   PythonQt::cleanup();
 }
 
+template <typename T>
+static void RegisterListConverter(const char* other_class_name) {
+  typedef QList<T> L;
+  PythonQtConv::registerMetaTypeToPythonConverter(qMetaTypeId<L>(),
+      PythonQtConvertListOfValueTypeToPythonList<L, T>);
+  PythonQtConv::registerMetaTypeToPythonConverter(QMetaType::type(other_class_name),
+      PythonQtConvertListOfValueTypeToPythonList<L, T>);
+
+  PythonQtConv::registerPythonToMetaTypeConverter(qMetaTypeId<L>(),
+      PythonQtConvertPythonListToListOfValueType<L, T>);
+  PythonQtConv::registerPythonToMetaTypeConverter(QMetaType::type(other_class_name),
+      PythonQtConvertPythonListToListOfValueType<L, T>);
+}
+
 bool PythonEngine::EnsureInitialised() {
   if (initialised_)
     return true;
@@ -92,23 +106,9 @@ bool PythonEngine::EnsureInitialised() {
   python_qt->addDecorators(new ObjectDecorators);
 
   // Register converters for list types
-  PythonQtConv::registerMetaTypeToPythonConverter(qMetaTypeId<SongList>(),
-      PythonQtConvertListOfValueTypeToPythonList<SongList, Song>);
-  PythonQtConv::registerMetaTypeToPythonConverter(QMetaType::type("QList<Song>"),
-      PythonQtConvertListOfValueTypeToPythonList<SongList, Song>);
-  PythonQtConv::registerMetaTypeToPythonConverter(qMetaTypeId<DirectoryList>(),
-      PythonQtConvertListOfValueTypeToPythonList<DirectoryList, Directory>);
-  PythonQtConv::registerMetaTypeToPythonConverter(qMetaTypeId<CoverSearchResults>(),
-      PythonQtConvertListOfValueTypeToPythonList<CoverSearchResults, CoverSearchResult>);
-
-  PythonQtConv::registerPythonToMetaTypeConverter(qMetaTypeId<SongList>(),
-      PythonQtConvertPythonListToListOfValueType<SongList, Song>);
-  PythonQtConv::registerPythonToMetaTypeConverter(QMetaType::type("QList<Song>"),
-      PythonQtConvertPythonListToListOfValueType<SongList, Song>);
-  PythonQtConv::registerPythonToMetaTypeConverter(qMetaTypeId<DirectoryList>(),
-      PythonQtConvertPythonListToListOfValueType<DirectoryList, Directory>);
-  PythonQtConv::registerPythonToMetaTypeConverter(qMetaTypeId<CoverSearchResults>(),
-      PythonQtConvertPythonListToListOfValueType<CoverSearchResults, CoverSearchResult>);
+  RegisterListConverter<Song>("QList<Song>");
+  RegisterListConverter<Directory>("QList<Directory>");
+  RegisterListConverter<CoverSearchResult>("QList<CoverSearchResult>");
 
   // Connect stdout, stderr
   connect(python_qt, SIGNAL(pythonStdOut(QString)), SLOT(PythonStdOut(QString)));