merged master

src/CMakeLists.txt

@@ -12,6 +12,7 @@ SET( QT_USE_QTSQL TRUE )
 SET( QT_USE_QTNETWORK TRUE )
 SET( QT_USE_QTXML TRUE )
 SET( QT_USE_QTWEBKIT TRUE )
+SET( QT_USE_QTDECLARATIVE TRUE )
 
 INCLUDE( ${QT_USE_FILE} )
 INCLUDE( AddAppIconMacro )

src/libtomahawk/Album.cpp

@@ -41,6 +41,13 @@ static QMutex s_mutex;
 static QReadWriteLock s_idMutex;
 
 
+inline QString
+albumCacheKey( const Tomahawk::artist_ptr& artist, const QString& albumName )
+{
+    return QString( "%1\t\t%2" ).arg( artist->name().toLower() ).arg( albumName.toLower() );
+}
+
+
 Album::~Album()
 {
     QMutexLocker lock( &s_mutex );
@@ -57,13 +64,6 @@ Album::~Album()
 }
 
 
-inline QString
-albumCacheKey( const Tomahawk::artist_ptr& artist, const QString& albumName )
-{
-    return QString( "%1\t\t%2" ).arg( artist->name().toLower() ).arg( albumName.toLower() );
-}
-
-
 album_ptr
 Album::get( const Tomahawk::artist_ptr& artist, const QString& name, bool autoCreate )
 {
@@ -165,22 +165,6 @@ Album::Album( const QString& name, const Tomahawk::artist_ptr& artist )
 }
 
 
-Album::~Album()
-{
-    QMutexLocker lock( &s_mutex );
-    s_albumsByName.remove( albumCacheKey( artist(), name() ) );
-    s_albumsByCoverId.remove( coverId() );
-/*    if ( id() > 0 )
-        s_albumsById.remove( id() );*/
-
-    m_ownRef.clear();
-
-#ifndef ENABLE_HEADLESS
-    delete m_cover;
-#endif
-}
-
-
 void
 Album::onTracksLoaded( Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection )
 {

src/libtomahawk/CMakeLists.txt

@@ -5,6 +5,7 @@ SET( QT_USE_QTSQL TRUE )
 SET( QT_USE_QTNETWORK TRUE )
 SET( QT_USE_QTXML TRUE )
 SET( QT_USE_QTUITOOLS TRUE )
+SET( QT_USE_QTDECLARATIVE TRUE )
 
 IF( UNIX AND NOT APPLE )
   SET( QT_USE_QTDBUS TRUE )
@@ -470,6 +471,7 @@ TARGET_LINK_LIBRARIES( tomahawklib
     ${QT_QTNETWORK_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
+    ${QT_QTDECLARATIVE_LIBRARY}
     ${OS_SPECIFIC_LINK_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
     ${LINK_LIBRARIES}

src/libtomahawk/ViewManager.cpp

@@ -39,7 +39,6 @@
 #include "playlist/PlaylistLargeItemDelegate.h"
 #include "playlist/RecentlyPlayedModel.h"
 #include "playlist/dynamic/widgets/DynamicWidget.h"
-#include "CustomPlaylistView.h"
 #include "playlist/dynamic/widgets/DynamicQmlWidget.h"
 
 #include "widgets/NewReleasesWidget.h"

src/libtomahawk/playlist/dynamic/echonest/EchonestStation.cpp

@@ -1,7 +1,7 @@
 #include "EchonestStation.h"
-#include "dynamic/DynamicPlaylist.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
 
-#include "PlayableItem.h"
+#include "playlist/PlayableItem.h"
 #include "audio/AudioEngine.h"
 
 #include <echonest/Playlist.h>

src/libtomahawk/playlist/dynamic/echonest/EchonestStation.h

@@ -1,8 +1,8 @@
 #ifndef ECHONESTSTATION_H
 #define ECHONESTSTATION_H
 
-#include "PlayableProxyModel.h"
-#include "dynamic/GeneratorInterface.h"
+#include "playlist/PlayableProxyModel.h"
+#include "playlist/dynamic/GeneratorInterface.h"
 
 namespace Tomahawk
 {

src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp

@@ -1,13 +1,13 @@
 #include "DynamicQmlWidget.h"
 
-#include "dynamic/echonest/EchonestStation.h"
+#include "playlist/dynamic/echonest/EchonestStation.h"
 #include "playlist/dynamic/DynamicModel.h"
 #include "playlist/PlayableProxyModel.h"
 #include "utils/TomahawkUtilsGui.h"
-#include "dynamic/DynamicModel.h"
-#include "dynamic/echonest/EchonestControl.h"
-#include "dynamic/GeneratorInterface.h"
-#include "PlayableItem.h"
+#include "playlist/dynamic/DynamicModel.h"
+#include "playlist/dynamic/echonest/EchonestControl.h"
+#include "playlist/dynamic/GeneratorInterface.h"
+#include "playlist/PlayableItem.h"
 #include "Source.h"
 #include "widgets/DeclarativeCoverArtProvider.h"
 #include "audio/AudioEngine.h"

src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.h

@@ -78,7 +78,7 @@ private:
 
 }
 
-#include "dynamic/GeneratorInterface.h"
+#include "playlist/dynamic/GeneratorInterface.h"
 namespace Tomahawk
 {
 

src/libtomahawk/widgets/DeclarativeCoverArtProvider.cpp

@@ -1,5 +1,5 @@
 #include "DeclarativeCoverArtProvider.h"
-#include "PlayableItem.h"
+#include "playlist/PlayableItem.h"
 #include "playlist/PlayableProxyModel.h"
 #include "Query.h"
 #include "Album.h"