Merge branch 'master' into gfw

Conflicts:
	src/libtomahawk/CMakeLists.txt

thirdparty/liblastfm2/src/types/Artist.cpp

@@ -116,6 +116,13 @@ Artist::getTopTags() const
 }
 
 
+QNetworkReply* 
+Artist::getTopTracks() const
+{
+    return ws::get( params("getTopTracks") );
+}
+
+
 QNetworkReply* 
 Artist::getSimilar() const
 {
@@ -154,6 +161,25 @@ Artist::getSimilar( QNetworkReply* r )
 }
 
 
+QStringList /* static */
+Artist::getTopTracks( QNetworkReply* r )
+{
+    QStringList tracks;
+    try
+    {
+        XmlQuery lfm = ws::parse(r);        
+        foreach (XmlQuery e, lfm.children( "track" ))
+        {
+            tracks << e["name"].text();
+        }
+    }
+    catch (ws::ParseError& e)
+    {
+        qWarning() << e.what();
+    }
+    return tracks;
+}
+
 
 QList<Artist> /* static */
 Artist::list( QNetworkReply* r )

thirdparty/liblastfm2/src/types/Artist.h

@@ -86,6 +86,9 @@ namespace lastfm
         /** use Tag::list to get the tag list out of the finished reply */
         QNetworkReply* getTags() const;
         QNetworkReply* getTopTags() const;
+        
+        QNetworkReply* getTopTracks() const;
+        static QStringList getTopTracks( QNetworkReply* );
     
         /** Last.fm dictates that you may submit at most 10 of these */
         QNetworkReply* addTags( const QStringList& ) const;

thirdparty/qtweetlib/CMakeLists.txt

@@ -94,17 +94,14 @@ set(TOMAHAWK_QTWEETLIB_HEADERS
     QTweetLib/src/oauth.h
     QTweetLib/src/oauthtwitter.h
     QTweetLib/src/qtweetfriendstimeline.h
-    QTweetLib/src/qtweetlib_global.h
     QTweetLib/src/qtweethometimeline.h
     QTweetLib/src/qtweetmentions.h
     QTweetLib/src/qtweetnetbase.h
     QTweetLib/src/qtweetretweetbyme.h
     QTweetLib/src/qtweetretweetsofme.h
     QTweetLib/src/qtweetretweettome.h
-    QTweetLib/src/qtweetstatus.h
     QTweetLib/src/qtweetstatusshow.h
     QTweetLib/src/qtweetstatusupdate.h
-    QTweetLib/src/qtweetuser.h
     QTweetLib/src/qtweetusertimeline.h
     QTweetLib/src/qtweetstatusdestroy.h
     QTweetLib/src/qtweetstatusretweet.h
@@ -113,11 +110,9 @@ set(TOMAHAWK_QTWEETLIB_HEADERS
     QTweetLib/src/qtweetuserlookup.h
     QTweetLib/src/qtweetdirectmessages.h
     QTweetLib/src/qtweetuserstream.h
-    QTweetLib/src/qtweetdmstatus.h
     QTweetLib/src/qtweetusersearch.h
     QTweetLib/src/qtweetuserstatusesfriends.h
     QTweetLib/src/qtweetuserstatusesfollowers.h
-    QTweetLib/src/qtweetlist.h
     QTweetLib/src/qtweetlistcreate.h
     QTweetLib/src/qtweetlistupdate.h
     QTweetLib/src/qtweetlistgetlists.h
@@ -145,20 +140,11 @@ set(TOMAHAWK_QTWEETLIB_HEADERS
     QTweetLib/src/qtweetfavoritescreate.h
     QTweetLib/src/qtweetfavoritesdestroy.h
     QTweetLib/src/qtweetsearch.h
-    QTweetLib/src/qtweetsearchresult.h
-    QTweetLib/src/qtweetsearchpageresults.h
-    QTweetLib/src/qtweetplace.h
     QTweetLib/src/qtweetgeoreversegeocode.h
     QTweetLib/src/qtweetgeosearch.h
     QTweetLib/src/qtweetgeosimilarplaces.h
     QTweetLib/src/qtweetgeoplaceid.h
     QTweetLib/src/qtweetgeoplacecreate.h
-    QTweetLib/src/qtweetgeocoord.h
-    QTweetLib/src/qtweetgeoboundingbox.h
-    QTweetLib/src/qtweetconvert.h
-    QTweetLib/src/qtweetentityurl.h
-    QTweetLib/src/qtweetentityhashtag.h
-    QTweetLib/src/qtweetentityusermentions.h
     QTweetLib/src/qtweetblocksblocking.h
     QTweetLib/src/qtweetblocksblockingids.h
     QTweetLib/src/qtweetblockscreate.h