From 16d50b29d854b0bc95b45ba1aecce62cbb3415e7 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Tue, 3 Aug 2010 19:40:54 +0000
Subject: [PATCH] Nice typedefs.

---
 src/playlist/playlist.cpp      | 12 +++++++-----
 src/playlist/playlistbackend.h |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 1dc2f942e..274f46ad4 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -880,6 +880,10 @@ void Playlist::Save() const {
   backend_->SavePlaylistAsync(id_, items_, last_played_index());
 }
 
+namespace {
+typedef QFutureWatcher<shared_ptr<PlaylistItem> > PlaylistItemFutureWatcher;
+}
+
 void Playlist::Restore() {
   if (!backend_)
     return;
@@ -888,16 +892,14 @@ void Playlist::Restore() {
   virtual_items_.clear();
   library_items_by_id_.clear();
 
-  QFuture<shared_ptr<PlaylistItem> > future = backend_->GetPlaylistItems(id_);
-  QFutureWatcher<shared_ptr<PlaylistItem> >* watcher =
-      new QFutureWatcher<shared_ptr<PlaylistItem> >(this);
+  PlaylistBackend::PlaylistItemFuture future = backend_->GetPlaylistItems(id_);
+  PlaylistItemFutureWatcher* watcher = new PlaylistItemFutureWatcher(this);
   watcher->setFuture(future);
   connect(watcher, SIGNAL(finished()), SLOT(ItemsLoaded()));
 }
 
 void Playlist::ItemsLoaded() {
-  QFutureWatcher<shared_ptr<PlaylistItem> >* watcher =
-      static_cast<QFutureWatcher<shared_ptr<PlaylistItem> >*>(sender());
+  PlaylistItemFutureWatcher* watcher = static_cast<PlaylistItemFutureWatcher*>(sender());
   watcher->deleteLater();
 
   items_ = watcher->future().results();
diff --git a/src/playlist/playlistbackend.h b/src/playlist/playlistbackend.h
index 7755a03d7..9200b9aa6 100644
--- a/src/playlist/playlistbackend.h
+++ b/src/playlist/playlistbackend.h
@@ -40,10 +40,11 @@ class PlaylistBackend : public QObject {
     int last_played;
   };
   typedef QList<Playlist> PlaylistList;
+  typedef QFuture<boost::shared_ptr<PlaylistItem> > PlaylistItemFuture;
 
   PlaylistList GetAllPlaylists();
   Playlist GetPlaylist(int id);
-  QFuture<boost::shared_ptr<PlaylistItem> > GetPlaylistItems(int playlist);
+  PlaylistItemFuture GetPlaylistItems(int playlist);
   void SavePlaylistAsync(int playlist, const PlaylistItemList& items,
                          int last_played);
   void SetPlaylistOrder(const QList<int>& ids);