From 16c8b7284641e69aaee368b32d44b75b35fcfc85 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 31 Aug 2014 21:33:51 +0200 Subject: [PATCH] * Style fixes. --- src/libtomahawk/DropJob.cpp | 4 ---- src/tomahawk/sourcetree/SourceTreeView.cpp | 18 +++++++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/libtomahawk/DropJob.cpp b/src/libtomahawk/DropJob.cpp index 05b25a32e..8ffa7e368 100644 --- a/src/libtomahawk/DropJob.cpp +++ b/src/libtomahawk/DropJob.cpp @@ -142,7 +142,6 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType if ( !data->hasFormat( "text/uri-list" ) ) return false; - const QString url = data->data( "text/plain" ); const QString urlList = data->data( "text/uri-list" ).trimmed(); @@ -205,7 +204,6 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType if ( resolver->canParseUrl( url, ExternalResolver::Track ) ) return true; } - } if ( acceptedType.testFlag( Album ) ) @@ -223,7 +221,6 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType if ( resolver->canParseUrl( url, ExternalResolver::Album ) ) return true; } - } if ( acceptedType.testFlag( Artist ) ) @@ -241,7 +238,6 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType if ( resolver->canParseUrl( url, ExternalResolver::Artist ) ) return true; } - } // We whitelist certain url-shorteners since they do some link checking. Often playable (e.g. spotify) links hide behind them, diff --git a/src/tomahawk/sourcetree/SourceTreeView.cpp b/src/tomahawk/sourcetree/SourceTreeView.cpp index 7447364c2..9c256a7b1 100644 --- a/src/tomahawk/sourcetree/SourceTreeView.cpp +++ b/src/tomahawk/sourcetree/SourceTreeView.cpp @@ -745,15 +745,15 @@ SourceTreeView::dragEnterEvent( QDragEnterEvent* event ) tDebug( LOGVERBOSE ) << Q_FUNC_INFO; QTreeView::dragEnterEvent( event ); - if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Track | DropJob::Artist | DropJob::Album | DropJob::Playlist, DropJob::Create ) ) + if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Track | DropJob::Artist | DropJob::Album | DropJob::Playlist, DropJob::Create ) ) { - m_dragging = true; - m_dropRect = QRect(); - m_dropIndex = QPersistentModelIndex(); + m_dragging = true; + m_dropRect = QRect(); + m_dropIndex = QPersistentModelIndex(); - event->setDropAction( Qt::CopyAction ); - event->acceptProposedAction(); - } + event->setDropAction( Qt::CopyAction ); + event->acceptProposedAction(); + } } @@ -777,7 +777,7 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event ) bool accept = false; // Don't highlight the drop for a playlist, as it won't get added to the playlist but created generally - if ( DropJob::isDropType( DropJob::Playlist, event->mimeData() ) ) + if ( DropJob::isDropType( DropJob::Playlist, event->mimeData() ) ) { event->accept(); return; @@ -839,7 +839,7 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event ) event->ignore(); } } - else if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Playlist | DropJob::Artist | DropJob::Album, DropJob::Create ) ) + else if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Playlist | DropJob::Artist | DropJob::Album, DropJob::Create ) ) { event->setDropAction( Qt::CopyAction ); event->accept();