From 7de618befff8168bf89f22f9e9ecc885264ad6e5 Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sun, 29 May 2011 14:08:55 +0000
Subject: [PATCH] Fix registration of metatypes for list handlers on Qt 4.7

---
 src/core/song.h                | 2 +-
 src/covers/albumcoverfetcher.h | 2 +-
 src/main.cpp                   | 6 +++---
 src/playlist/playlistitem.h    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/song.h b/src/core/song.h
index 263ef7bcb..69e30cea3 100644
--- a/src/core/song.h
+++ b/src/core/song.h
@@ -381,6 +381,6 @@ class Song {
 Q_DECLARE_METATYPE(Song);
 
 typedef QList<Song> SongList;
-Q_DECLARE_METATYPE(SongList);
+Q_DECLARE_METATYPE(QList<Song>);
 
 #endif // SONG_H
diff --git a/src/covers/albumcoverfetcher.h b/src/covers/albumcoverfetcher.h
index 1f3a72a21..0c39ec8ce 100644
--- a/src/covers/albumcoverfetcher.h
+++ b/src/covers/albumcoverfetcher.h
@@ -59,7 +59,7 @@ Q_DECLARE_METATYPE(CoverSearchResult);
 // This is a complete result of a single search request (a list of results, each
 // describing one image, actually).
 typedef QList<CoverSearchResult> CoverSearchResults;
-Q_DECLARE_METATYPE(CoverSearchResults);
+Q_DECLARE_METATYPE(QList<CoverSearchResult>);
 
 // This class searches for album covers for a given query or artist/album and
 // returns URLs. It's NOT thread-safe.
diff --git a/src/main.cpp b/src/main.cpp
index 1980f4499..091e3c8e3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -190,18 +190,18 @@ int main(int argc, char *argv[]) {
   g_set_application_name(QCoreApplication::applicationName().toLocal8Bit());
 
   qRegisterMetaType<CoverSearchResult>("CoverSearchResult");
-  qRegisterMetaType<CoverSearchResults>("CoverSearchResults");
   qRegisterMetaType<QList<CoverSearchResult> >("QList<CoverSearchResult>");
+  qRegisterMetaType<CoverSearchResults>("CoverSearchResults");
   qRegisterMetaType<Directory>("Directory");
   qRegisterMetaType<DirectoryList>("DirectoryList");
   qRegisterMetaType<Subdirectory>("Subdirectory");
   qRegisterMetaType<SubdirectoryList>("SubdirectoryList");
   qRegisterMetaType<Song>("Song");
-  qRegisterMetaType<SongList>("SongList");
   qRegisterMetaType<QList<Song> >("QList<Song>");
+  qRegisterMetaType<SongList>("SongList");
   qRegisterMetaType<PlaylistItemPtr>("PlaylistItemPtr");
-  qRegisterMetaType<PlaylistItemList>("PlaylistItemList");
   qRegisterMetaType<QList<PlaylistItemPtr> >("QList<PlaylistItemPtr>");
+  qRegisterMetaType<PlaylistItemList>("PlaylistItemList");
   qRegisterMetaType<Engine::State>("Engine::State");
   qRegisterMetaType<Engine::SimpleMetaBundle>("Engine::SimpleMetaBundle");
   qRegisterMetaType<Equalizer::Params>("Equalizer::Params");
diff --git a/src/playlist/playlistitem.h b/src/playlist/playlistitem.h
index 3366372f9..31ea62b04 100644
--- a/src/playlist/playlistitem.h
+++ b/src/playlist/playlistitem.h
@@ -107,7 +107,7 @@ typedef boost::shared_ptr<PlaylistItem> PlaylistItemPtr;
 typedef QList<PlaylistItemPtr> PlaylistItemList;
 
 Q_DECLARE_METATYPE(PlaylistItemPtr)
-Q_DECLARE_METATYPE(PlaylistItemList)
+Q_DECLARE_METATYPE(QList<PlaylistItemPtr>)
 Q_DECLARE_OPERATORS_FOR_FLAGS(PlaylistItem::Options)
 
 #endif // PLAYLISTITEM_H