mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 03:10:12 +02:00
Code Issues Releases Wiki Activity

* Style fixes.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-08-31 21:33:51 +02:00
parent 07851d7eda
commit 16c8b72846
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/DropJob.cpp
View File

@@ -142,7 +142,6 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
if ( !data->hasFormat( "text/uri-list" ) ) if ( !data->hasFormat( "text/uri-list" ) )
return false; return false;
const QString url = data->data( "text/plain" ); const QString url = data->data( "text/plain" );
const QString urlList = data->data( "text/uri-list" ).trimmed(); 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 ) ) if ( resolver->canParseUrl( url, ExternalResolver::Track ) )
return true; return true;
} }
} }
if ( acceptedType.testFlag( Album ) ) if ( acceptedType.testFlag( Album ) )
@@ -223,7 +221,6 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
if ( resolver->canParseUrl( url, ExternalResolver::Album ) ) if ( resolver->canParseUrl( url, ExternalResolver::Album ) )
return true; return true;
} }
} }
if ( acceptedType.testFlag( Artist ) ) if ( acceptedType.testFlag( Artist ) )
@@ -241,7 +238,6 @@ DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType
if ( resolver->canParseUrl( url, ExternalResolver::Artist ) ) if ( resolver->canParseUrl( url, ExternalResolver::Artist ) )
return true; return true;
} }
} }
// We whitelist certain url-shorteners since they do some link checking. Often playable (e.g. spotify) links hide behind them, // We whitelist certain url-shorteners since they do some link checking. Often playable (e.g. spotify) links hide behind them,

18
src/tomahawk/sourcetree/SourceTreeView.cpp
View File

@@ -745,15 +745,15 @@ SourceTreeView::dragEnterEvent( QDragEnterEvent* event )
tDebug( LOGVERBOSE ) << Q_FUNC_INFO; tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
QTreeView::dragEnterEvent( event ); 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_dragging = true;
m_dropRect = QRect(); m_dropRect = QRect();
m_dropIndex = QPersistentModelIndex(); m_dropIndex = QPersistentModelIndex();
event->setDropAction( Qt::CopyAction ); event->setDropAction( Qt::CopyAction );
event->acceptProposedAction(); event->acceptProposedAction();
} }
} }
@@ -777,7 +777,7 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
bool accept = false; bool accept = false;
// Don't highlight the drop for a playlist, as it won't get added to the playlist but created generally // 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(); event->accept();
return; return;
@@ -839,7 +839,7 @@ SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
event->ignore(); 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->setDropAction( Qt::CopyAction );
event->accept(); event->accept();