From 1fe28714cbd1117df496fea5760c365badddb725 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sun, 17 Jun 2012 16:51:56 +0200 Subject: [PATCH] Remove duplicate function, and fix copy link from sidebar track page --- src/libtomahawk/GlobalActionManager.cpp | 14 -------------- src/libtomahawk/GlobalActionManager.h | 4 +++- src/sourcetree/items/TemporaryPageItem.cpp | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp index e83f738ea..551f4bf42 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 4505d94eb..8223ccafe 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; @@ -61,7 +60,10 @@ public slots: /// Takes a spotify link and performs the default open action on it bool openRdioLink( const QString& link ); + /// Creates a link from the requested data and copies it to the clipboard void copyToClipboard( const Tomahawk::query_ptr& query ); + + QString copyPlaylistToClipboard( const Tomahawk::dynplaylist_ptr& playlist ); void savePlaylistToFile( const Tomahawk::playlist_ptr& playlist, const QString& filename ); 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; }