fix forward decs again :)

and some sql fixes

src/collection.cpp

@@ -31,6 +31,11 @@ Collection::name() const
     return m_name;
 }
 
+const 
+source_ptr& Collection::source() const
+{
+    return m_source;
+}
 
 void
 Collection::addPlaylist( const Tomahawk::playlist_ptr& p )

src/playlist.cpp

@@ -13,6 +13,8 @@
 
 using namespace Tomahawk;
 
+PlaylistEntry::PlaylistEntry() {}
+PlaylistEntry::~PlaylistEntry() {}
 
 void
 PlaylistEntry::setQueryvariant( const QVariant& v )
@@ -27,6 +29,30 @@ PlaylistEntry::queryvariant() const
     return m_query->toVariant();
 }
 
+void 
+PlaylistEntry::setQuery( const Tomahawk::query_ptr& q )
+{
+    m_query = q;
+}
+
+const Tomahawk::query_ptr& 
+PlaylistEntry::query() const
+{
+    return m_query;
+}
+
+
+source_ptr 
+PlaylistEntry::lastsource() const
+{
+    return m_lastsource;
+}
+
+void 
+PlaylistEntry::setLastsource( source_ptr s )
+{
+    m_lastsource = s;
+}
 
 Playlist::Playlist( const source_ptr& author )
     : m_source( author )
@@ -76,6 +102,7 @@ Playlist::Playlist( const source_ptr& author,
     qDebug() << Q_FUNC_INFO << "2";
 }
 
+Playlist::~Playlist() {}
 
 playlist_ptr
 Playlist::create( const source_ptr& author,
@@ -322,6 +349,12 @@ Playlist::setNewRevision( const QString& rev,
         return pr;
 }
 
+const source_ptr&
+Playlist::author()
+{ 
+    return m_source; 
+}
+
 void Playlist::resolve()
 {
     QList< query_ptr > qlist;

src/playlist/plitem.cpp

@@ -2,6 +2,7 @@
 
 #include "utils/tomahawkutils.h"
 #include "tomahawk/playlist.h"
+#include "tomahawk/query.h"
 
 #include <QDebug>
 

src/tomahawkapp.cpp

@@ -17,7 +17,6 @@
 #include "sip/SipHandler.h"
 #include "dynamic/generatorfactory.h"
 #include "dynamic/echonest/echonestgenerator.h"
-#include "jabber/jabber.h"
 #include "utils/tomahawkutils.h"
 #include "xmppbot/xmppbot.h"
 #include "web/api_v1.h"