mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-27 15:50:40 +02:00
Code Issues Releases Wiki Activity

* Query::equals() can now ignore album names.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-08-19 13:45:07 +02:00
parent 8af8de9f4b
commit 03d774b9e7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/Query.cpp
View File

@@ -490,18 +490,18 @@ Query::checkResults()
bool bool
Query::equals( const Tomahawk::query_ptr& other, bool ignoreCase ) const Query::equals( const Tomahawk::query_ptr& other, bool ignoreCase, bool ignoreAlbum ) const
{ {
if ( other.isNull() ) if ( other.isNull() )
return false; return false;
if ( ignoreCase ) if ( ignoreCase )
return ( queryTrack()->artist().toLower() == other->queryTrack()->artist().toLower() && return ( queryTrack()->artist().toLower() == other->queryTrack()->artist().toLower() &&
queryTrack()->album().toLower() == other->queryTrack()->album().toLower() && ( ignoreAlbum || queryTrack()->album().toLower() == other->queryTrack()->album().toLower() ) &&
queryTrack()->track().toLower() == other->queryTrack()->track().toLower() ); queryTrack()->track().toLower() == other->queryTrack()->track().toLower() );
else else
return ( queryTrack()->artist() == other->queryTrack()->artist() && return ( queryTrack()->artist() == other->queryTrack()->artist() &&
queryTrack()->album() == other->queryTrack()->album() && ( ignoreAlbum || queryTrack()->album() == other->queryTrack()->album() ) &&
queryTrack()->track() == other->queryTrack()->track() ); queryTrack()->track() == other->queryTrack()->track() );
} }

2
src/libtomahawk/Query.h
View File

@@ -51,7 +51,7 @@ public:
virtual ~Query(); virtual ~Query();
bool equals( const Tomahawk::query_ptr& other, bool ignoreCase = false ) const; bool equals( const Tomahawk::query_ptr& other, bool ignoreCase = false, bool ignoreAlbum = false ) const;
float howSimilar( const Tomahawk::result_ptr& r ); float howSimilar( const Tomahawk::result_ptr& r );
QVariant toVariant() const; QVariant toVariant() const;