mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

* Style cleanup for GlobalActionManager.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-11-14 07:26:25 +01:00
parent f5ff0c4558
commit 7a64565511
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libtomahawk/GlobalActionManager.cpp
View File

@@ -1110,10 +1110,10 @@ GlobalActionManager::playSpotify( const QUrl& url )
return true; return true;
} }
void void
GlobalActionManager::playNow( const query_ptr& q ) GlobalActionManager::playNow( const query_ptr& q )
{ {
Pipeline::instance()->resolve( q, true ); Pipeline::instance()->resolve( q, true );
m_waitingToPlay = q; m_waitingToPlay = q;
@@ -1270,10 +1270,8 @@ GlobalActionManager::postShortenFinished()
QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() ); QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
Q_ASSERT( reply ); Q_ASSERT( reply );
const QByteArray raw = reply->readAll(); const QByteArray raw = reply->readAll();
qDebug() << "GOT REPLYL" << raw;
const QUrl url = QUrl::fromUserInput( raw ); const QUrl url = QUrl::fromUserInput( raw );
qDebug() << "GOT POSTED SHORT URL:" << url.toString();
QClipboard* cb = QApplication::clipboard(); QClipboard* cb = QApplication::clipboard();
const QByteArray data = percentEncode( url ); const QByteArray data = percentEncode( url );
@@ -1288,8 +1286,7 @@ GlobalActionManager::postShortenFinished()
void void
GlobalActionManager::shortenLinkRequestError( QNetworkReply::NetworkError error ) GlobalActionManager::shortenLinkRequestError( QNetworkReply::NetworkError error )
{ {
qDebug() << Q_FUNC_INFO; tDebug() << Q_FUNC_INFO << "Network Error:" << error;
qDebug() << "Network Error: " << error;
QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() ); QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
@@ -1417,7 +1414,7 @@ GlobalActionManager::hostname() const
QByteArray QByteArray
GlobalActionManager::percentEncode (const QUrl &url ) const GlobalActionManager::percentEncode( const QUrl& url ) const
{ {
QByteArray data = url.toEncoded(); QByteArray data = url.toEncoded();

6
src/libtomahawk/GlobalActionManager.h
View File

@@ -51,7 +51,7 @@ public:
public slots: public slots:
void shortenLink( const QUrl& url, const QVariant &callbackObj = QVariant() ); void shortenLink( const QUrl& url, const QVariant &callbackObj = QVariant() );
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
/// Takes a spotify link and performs the default open action on it /// Takes a spotify link and performs the default open action on it
@@ -96,7 +96,7 @@ private slots:
void playlistReadyToShow(); void playlistReadyToShow();
void xspfCreated( const QByteArray& xspf ); void xspfCreated( const QByteArray& xspf );
void playOrQueueNow( const Tomahawk::query_ptr& ); void playOrQueueNow( const Tomahawk::query_ptr& );
void playNow( const Tomahawk::query_ptr& ); void playNow( const Tomahawk::query_ptr& );
#endif #endif
@@ -115,7 +115,7 @@ private:
bool handleAutoPlaylistCommand( const QUrl& url ); bool handleAutoPlaylistCommand( const QUrl& url );
bool handleImportCommand( const QUrl& url ); bool handleImportCommand( const QUrl& url );
bool doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems ); bool doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
bool playSpotify( const QUrl& url ); bool playSpotify( const QUrl& url );
bool queueSpotify( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems ); bool queueSpotify( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
bool playRdio( const QUrl& url ); bool playRdio( const QUrl& url );