From 8abc08c5a925dd28a6799f7645ac90c83fadc184 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Tue, 19 Jun 2012 01:21:22 +0200 Subject: [PATCH] Copy shortened track link from page context menu. Slipped in in the big IdThreadWorker revert in previous commit --- src/libtomahawk/GlobalActionManager.cpp | 14 -------------- src/libtomahawk/GlobalActionManager.h | 1 - src/sourcetree/items/TemporaryPageItem.cpp | 2 +- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp index ec1756b49..a7553202c 100644 --- a/src/libtomahawk/GlobalActionManager.cpp +++ b/src/libtomahawk/GlobalActionManager.cpp @@ -97,20 +97,6 @@ GlobalActionManager::openLinkFromQuery( const query_ptr& query ) const } -QUrl -GlobalActionManager::copyOpenLink( const query_ptr& query ) const -{ - const QUrl link = openLinkFromQuery( query ); - - QClipboard* cb = QApplication::clipboard(); - QByteArray data = link.toEncoded(); - data.replace( "'", "%27" ); // QUrl doesn't encode ', which it doesn't have to. Some apps don't like ' though, and want %27. Both are valid. - cb->setText( data ); - - return link; -} - - QUrl GlobalActionManager::copyOpenLink( const artist_ptr& artist ) const { diff --git a/src/libtomahawk/GlobalActionManager.h b/src/libtomahawk/GlobalActionManager.h index 9c43503f4..0b26ac954 100644 --- a/src/libtomahawk/GlobalActionManager.h +++ b/src/libtomahawk/GlobalActionManager.h @@ -46,7 +46,6 @@ public: QUrl copyOpenLink( const Tomahawk::artist_ptr& artist ) const; QUrl copyOpenLink( const Tomahawk::album_ptr& album ) const; - QUrl copyOpenLink( const Tomahawk::query_ptr& query ) const; QUrl openLink( const QString& title, const QString& artist, const QString& album ) const; diff --git a/src/sourcetree/items/TemporaryPageItem.cpp b/src/sourcetree/items/TemporaryPageItem.cpp index 8b9ea3a04..25bd2413c 100644 --- a/src/sourcetree/items/TemporaryPageItem.cpp +++ b/src/sourcetree/items/TemporaryPageItem.cpp @@ -165,7 +165,7 @@ TemporaryPageItem::linkActionTriggered( QAction* action ) { TrackInfoWidget* tPage = dynamic_cast< TrackInfoWidget* >( m_page ); Q_ASSERT( tPage ); - GlobalActionManager::instance()->copyOpenLink( tPage->query() ); + GlobalActionManager::instance()->copyToClipboard( tPage->query() ); break; }