diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp index 244f00b63..760112ea0 100644 --- a/src/libtomahawk/GlobalActionManager.cpp +++ b/src/libtomahawk/GlobalActionManager.cpp @@ -1110,10 +1110,10 @@ GlobalActionManager::playSpotify( const QUrl& url ) return true; } + void GlobalActionManager::playNow( const query_ptr& q ) { - Pipeline::instance()->resolve( q, true ); m_waitingToPlay = q; @@ -1270,10 +1270,8 @@ GlobalActionManager::postShortenFinished() QNetworkReply* reply = qobject_cast( sender() ); Q_ASSERT( reply ); const QByteArray raw = reply->readAll(); - qDebug() << "GOT REPLYL" << raw; const QUrl url = QUrl::fromUserInput( raw ); - qDebug() << "GOT POSTED SHORT URL:" << url.toString(); QClipboard* cb = QApplication::clipboard(); const QByteArray data = percentEncode( url ); @@ -1288,8 +1286,7 @@ GlobalActionManager::postShortenFinished() void GlobalActionManager::shortenLinkRequestError( QNetworkReply::NetworkError error ) { - qDebug() << Q_FUNC_INFO; - qDebug() << "Network Error: " << error; + tDebug() << Q_FUNC_INFO << "Network Error:" << error; QNetworkReply *reply = qobject_cast( sender() ); @@ -1417,7 +1414,7 @@ GlobalActionManager::hostname() const QByteArray -GlobalActionManager::percentEncode (const QUrl &url ) const +GlobalActionManager::percentEncode( const QUrl& url ) const { QByteArray data = url.toEncoded(); diff --git a/src/libtomahawk/GlobalActionManager.h b/src/libtomahawk/GlobalActionManager.h index c04290d15..643832b5f 100644 --- a/src/libtomahawk/GlobalActionManager.h +++ b/src/libtomahawk/GlobalActionManager.h @@ -51,7 +51,7 @@ public: public slots: void shortenLink( const QUrl& url, const QVariant &callbackObj = QVariant() ); - + #ifndef ENABLE_HEADLESS /// Takes a spotify link and performs the default open action on it @@ -96,7 +96,7 @@ private slots: void playlistReadyToShow(); void xspfCreated( const QByteArray& xspf ); - + void playOrQueueNow( const Tomahawk::query_ptr& ); void playNow( const Tomahawk::query_ptr& ); #endif @@ -115,7 +115,7 @@ private: bool handleAutoPlaylistCommand( const QUrl& url ); bool handleImportCommand( const QUrl& url ); bool doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems ); - + bool playSpotify( const QUrl& url ); bool queueSpotify( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems ); bool playRdio( const QUrl& url );