[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [Amarok] 5014d74: Remove unneeded Meta::Data::addMatchTo
From: Ralf Engels <ralf.engels () nokia ! com>
Date: 2010-12-03 19:22:36
Message-ID: 20101203192236.96C16A60A6 () git ! kde ! org
[Download RAW message or body]
commit 5014d74a04ce9c5cfa3258fb7a127da95a4cc8c9
branch master
Author: Ralf Engels <ralf.engels@nokia.com>
Date: Wed Dec 1 16:30:58 2010 +0100
Remove unneeded Meta::Data::addMatchTo
diff --git a/src/browsers/CollectionTreeItem.cpp \
b/src/browsers/CollectionTreeItem.cpp index 770c8fe..b7c4520 100644
--- a/src/browsers/CollectionTreeItem.cpp
+++ b/src/browsers/CollectionTreeItem.cpp
@@ -273,6 +273,31 @@ CollectionTreeItem::queryMaker() const
return 0;
}
+void
+CollectionTreeItem::addMatch( Collections::QueryMaker *qm ) const
+{
+ if( !m_data || m_type != Data )
+ return;
+ if( !qm )
+ return;
+
+ if( Meta::TrackPtr track = Meta::TrackPtr::dynamicCast( m_data ) )
+ qm->addMatch( track );
+ else if( Meta::ArtistPtr artist = Meta::ArtistPtr::dynamicCast( m_data ) )
+ qm->addMatch( artist );
+ else if( Meta::AlbumPtr album = Meta::AlbumPtr::dynamicCast( m_data ) )
+ qm->addMatch( album );
+ else if( Meta::ComposerPtr composer = Meta::ComposerPtr::dynamicCast( m_data ) )
+ qm->addMatch( composer );
+ else if( Meta::GenrePtr genre = Meta::GenrePtr::dynamicCast( m_data ) )
+ qm->addMatch( genre );
+ else if( Meta::YearPtr year = Meta::YearPtr::dynamicCast( m_data ) )
+ qm->addMatch( year );
+ else if( Meta::LabelPtr label = Meta::LabelPtr::dynamicCast( m_data ) )
+ qm->addMatch( label );
+}
+
+
KUrl::List
CollectionTreeItem::urls() const
{
diff --git a/src/browsers/CollectionTreeItem.h b/src/browsers/CollectionTreeItem.h
index c7748d1..959d4c2 100644
--- a/src/browsers/CollectionTreeItem.h
+++ b/src/browsers/CollectionTreeItem.h
@@ -90,6 +90,9 @@ class CollectionTreeItem : public QObject
Collections::QueryMaker* queryMaker() const;
+ /** Call addMatch for this objects data and it's query maker */
+ void addMatch( Collections::QueryMaker *qm ) const;
+
bool operator<( const CollectionTreeItem& other ) const;
const Meta::DataPtr data() const { return m_data; }
diff --git a/src/browsers/CollectionTreeItemModelBase.cpp \
b/src/browsers/CollectionTreeItemModelBase.cpp index 6f76380..7e76866 100644
--- a/src/browsers/CollectionTreeItemModelBase.cpp
+++ b/src/browsers/CollectionTreeItemModelBase.cpp
@@ -438,7 +438,7 @@ CollectionTreeItemModelBase::mimeData(const \
QList<CollectionTreeItem*> & items) {
if( levelCategory( tmpItem->level() - 1 ) == \
CategoryId::AlbumArtist )
qm->setArtistQueryMode( \
Collections::QueryMaker::AlbumArtists );
- qm->addMatch( tmpItem->data() );
+ tmpItem->addMatch( qm );
}
else
qm->setAlbumQueryMode( Collections::QueryMaker::OnlyCompilations \
); @@ -580,7 +580,7 @@ void CollectionTreeItemModelBase::listForLevel(int level, \
Collections::QueryMake {
if( levelCategory( tmpItem->level() - 1 ) == CategoryId::AlbumArtist \
)
qm->setArtistQueryMode( Collections::QueryMaker::AlbumArtists );
- qm->addMatch( tmpItem->data() );
+ tmpItem->addMatch( qm );
}
}
addFilters( qm );
@@ -1180,11 +1180,8 @@ CollectionTreeItemModelBase::handleCompilations( \
CollectionTreeItem *parent ) co qm->setAlbumQueryMode( \
Collections::QueryMaker::OnlyCompilations ); qm->setQueryType( \
Collections::QueryMaker::Album );
for( CollectionTreeItem *tmpItem = parent; tmpItem->parent(); tmpItem = \
tmpItem->parent() )
- {
- //ignore special nodes that do not have a data pointer
- if( tmpItem->data() )
- qm->addMatch( tmpItem->data() );
- }
+ tmpItem->addMatch( qm );
+
addFilters( qm );
qm->setReturnResultAsDataPtrs( true );
connect( qm, SIGNAL( newResultReady( QString, Meta::DataList ) ), SLOT( \
newResultReady( QString, Meta::DataList ) ), Qt::QueuedConnection ); @@ -1203,11 \
+1200,8 @@ CollectionTreeItemModelBase::handleTracksWithoutLabels( \
Collections::QueryMaker: qm->setLabelQueryMode( \
Collections::QueryMaker::OnlyWithoutLabels ); qm->setReturnResultAsDataPtrs( true );
for( CollectionTreeItem *tmpItem = parent; tmpItem->parent(); tmpItem = \
tmpItem->parent() )
- {
- //ignore special nodes that do not have a data pointer
- if( tmpItem->data() )
- qm->addMatch( tmpItem->data() );
- }
+ tmpItem->addMatch( qm );
+
addFilters( qm );
connect( qm, SIGNAL( newResultReady( QString, Meta::DataList ) ), SLOT( \
newResultReady( QString, Meta::DataList ) ), Qt::QueuedConnection );
connect( qm, SIGNAL( queryDone() ), SLOT( queryDone() ), Qt::QueuedConnection );
diff --git a/src/browsers/CollectionTreeView.cpp \
b/src/browsers/CollectionTreeView.cpp index cc4d93e..a14aa2a 100644
--- a/src/browsers/CollectionTreeView.cpp
+++ b/src/browsers/CollectionTreeView.cpp
@@ -1222,7 +1222,7 @@ CollectionTreeView::createMetaQueryFromItems( const \
QSet<CollectionTreeItem*> &i {
if( m_treeModel->levelCategory( tmp->data() - 1 ) == \
CategoryId::AlbumArtist )
qm->setArtistQueryMode( Collections::QueryMaker::AlbumArtists );
- qm->addMatch( tmp->data() );
+ tmp->addMatch( qm );
}
tmp = tmp->parent();
}
diff --git a/src/core-impl/collections/db/sql/SqlMeta.cpp \
b/src/core-impl/collections/db/sql/SqlMeta.cpp index a4a2ec8..1272d77 100644
--- a/src/core-impl/collections/db/sql/SqlMeta.cpp
+++ b/src/core-impl/collections/db/sql/SqlMeta.cpp
@@ -1320,7 +1320,7 @@ SqlTrack::labels() const
{
Collections::SqlQueryMaker *qm = static_cast< Collections::SqlQueryMaker* >( \
m_collection->queryMaker() ); qm->setQueryType( Collections::QueryMaker::Label );
- const_cast<SqlTrack*>( this )->addMatchTo( qm );
+ qm->addMatch( Meta::TrackPtr( const_cast<SqlTrack*>(this) ) );
qm->setBlocking( true );
qm->run();
@@ -1404,7 +1404,7 @@ SqlArtist::tracks()
Collections::SqlQueryMaker *qm = static_cast< Collections::SqlQueryMaker* >( \
m_collection->queryMaker() ); qm->setQueryType( Collections::QueryMaker::Track );
- addMatchTo( qm );
+ qm->addMatch( Meta::ArtistPtr( this ) );
qm->setBlocking( true );
qm->run();
m_tracks = qm->tracks( m_collection->collectionId() );
@@ -1422,7 +1422,7 @@ SqlArtist::albums()
Collections::SqlQueryMaker *qm = static_cast< Collections::SqlQueryMaker* >( \
m_collection->queryMaker() ); qm->setQueryType( Collections::QueryMaker::Album );
- addMatchTo( qm );
+ qm->addMatch( Meta::ArtistPtr( this ) );
qm->setBlocking( true );
qm->run();
m_albums = qm->albums( m_collection->collectionId() );
@@ -1509,7 +1509,7 @@ SqlAlbum::tracks()
Collections::SqlQueryMaker *qm = static_cast< Collections::SqlQueryMaker* >( \
m_collection->queryMaker() ); qm->setQueryType( Collections::QueryMaker::Track );
- addMatchTo( qm );
+ qm->addMatch( Meta::AlbumPtr( this ) );
qm->orderBy( Meta::valDiscNr );
qm->orderBy( Meta::valTrackNr );
qm->orderBy( Meta::valTitle );
@@ -2086,7 +2086,7 @@ SqlComposer::tracks()
{
Collections::SqlQueryMaker *qm = static_cast< Collections::SqlQueryMaker* >( \
m_collection->queryMaker() ); qm->setQueryType( Collections::QueryMaker::Track );
- addMatchTo( qm );
+ qm->addMatch( Meta::ComposerPtr( this ) );
qm->setBlocking( true );
qm->run();
m_tracks = qm->tracks( m_collection->collectionId() );
@@ -2127,7 +2127,7 @@ SqlGenre::tracks()
Collections::SqlQueryMaker *qm = static_cast< Collections::SqlQueryMaker* >( \
m_collection->queryMaker() ); qm->setQueryType( Collections::QueryMaker::Track );
- addMatchTo( qm );
+ qm->addMatch( Meta::GenrePtr( this ) );
qm->setBlocking( true );
qm->run();
m_tracks = qm->tracks( m_collection->collectionId() );
@@ -2165,7 +2165,7 @@ SqlYear::tracks()
Collections::SqlQueryMaker *qm = static_cast< Collections::SqlQueryMaker* >( \
m_collection->queryMaker() ); qm->setQueryType( Collections::QueryMaker::Track );
- addMatchTo( qm );
+ qm->addMatch( Meta::YearPtr( this ) );
qm->setBlocking( true );
qm->run();
m_tracks = qm->tracks( m_collection->collectionId() );
@@ -2203,7 +2203,7 @@ SqlLabel::tracks()
Collections::SqlQueryMaker *qm = static_cast< Collections::SqlQueryMaker* >( \
m_collection->queryMaker() ); qm->setQueryType( Collections::QueryMaker::Track );
- addMatchTo( qm );
+ qm->addMatch( Meta::LabelPtr( this ) );
qm->setBlocking( true );
qm->run();
m_tracks = qm->tracks();
diff --git a/src/core-impl/collections/db/sql/SqlQueryMaker.cpp \
b/src/core-impl/collections/db/sql/SqlQueryMaker.cpp index ff03431..3d795e6 100644
--- a/src/core-impl/collections/db/sql/SqlQueryMaker.cpp
+++ b/src/core-impl/collections/db/sql/SqlQueryMaker.cpp
@@ -498,13 +498,6 @@ SqlQueryMaker::addMatch( const Meta::LabelPtr &label )
}
QueryMaker*
-SqlQueryMaker::addMatch( const Meta::DataPtr &data )
-{
- ( const_cast<Meta::DataPtr&>(data) )->addMatchTo( this );
- return this;
-}
-
-QueryMaker*
SqlQueryMaker::addFilter( qint64 value, const QString &filter, bool matchBegin, bool \
matchEnd ) {
// special case for albumartist...
diff --git a/src/core-impl/collections/db/sql/SqlQueryMaker.h \
b/src/core-impl/collections/db/sql/SqlQueryMaker.h index 3fdf8f4..027840d 100644
--- a/src/core-impl/collections/db/sql/SqlQueryMaker.h
+++ b/src/core-impl/collections/db/sql/SqlQueryMaker.h
@@ -51,7 +51,6 @@ class AMAROK_SQLCOLLECTION_EXPORT_TESTS SqlQueryMaker : public \
QueryMaker
virtual QueryMaker* addMatch( const Meta::ComposerPtr &composer );
virtual QueryMaker* addMatch( const Meta::GenrePtr &genre );
virtual QueryMaker* addMatch( const Meta::YearPtr &year );
- virtual QueryMaker* addMatch( const Meta::DataPtr &data );
virtual QueryMaker* addMatch( const Meta::LabelPtr &label );
virtual QueryMaker* addFilter( qint64 value, const QString &filter, bool \
matchBegin, bool matchEnd );
diff --git a/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.cpp \
b/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.cpp index \
9a2bbbe..e38b625 100644
--- a/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.cpp
+++ b/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.cpp
@@ -288,14 +288,6 @@ NepomukQueryMaker::addMatch( const YearPtr &year )
}
QueryMaker*
-NepomukQueryMaker::addMatch( const DataPtr &data )
-{
- debug() << "addMatch(data)" << endl;
- ( const_cast<DataPtr&>(data) )->addMatchTo( this );
- return this;
-}
-
-QueryMaker*
NepomukQueryMaker::addMatch( const KUrl &url )
{
m_queryMatch += QString(
diff --git a/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.h \
b/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.h index \
307a5c6..e7f6f85 100644
--- a/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.h
+++ b/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.h
@@ -56,8 +56,7 @@ class NepomukQueryMaker : public QueryMaker
virtual QueryMaker* addMatch( const Meta::GenrePtr &genre );
virtual QueryMaker* addMatch( const Meta::ComposerPtr &composer );
virtual QueryMaker* addMatch( const Meta::YearPtr &year );
- virtual QueryMaker* addMatch( const Meta::DataPtr &data );
-
+
virtual QueryMaker* addFilter( qint64 value, const QString &filter, bool \
matchBegin = false, bool matchEnd = false );
virtual QueryMaker* excludeFilter( qint64 value, const QString &filter, bool \
matchBegin = false, bool matchEnd = false );
diff --git a/src/core-impl/collections/playdarcollection/PlaydarQueryMaker.cpp \
b/src/core-impl/collections/playdarcollection/PlaydarQueryMaker.cpp index \
2e913e4..aff9627 100644
--- a/src/core-impl/collections/playdarcollection/PlaydarQueryMaker.cpp
+++ b/src/core-impl/collections/playdarcollection/PlaydarQueryMaker.cpp
@@ -348,17 +348,7 @@ namespace Collections
return this;
}
-
- QueryMaker*
- PlaydarQueryMaker::addMatch( const Meta::DataPtr &data )
- {
- DEBUG_BLOCK
-
- ( const_cast<Meta::DataPtr&>(data) )->addMatchTo( this );
-
- return this;
- }
-
+
QueryMaker*
PlaydarQueryMaker::addMatch( const Meta::LabelPtr &label )
{
diff --git a/src/core-impl/collections/playdarcollection/PlaydarQueryMaker.h \
b/src/core-impl/collections/playdarcollection/PlaydarQueryMaker.h index \
fdd62c0..d90ec60 100644
--- a/src/core-impl/collections/playdarcollection/PlaydarQueryMaker.h
+++ b/src/core-impl/collections/playdarcollection/PlaydarQueryMaker.h
@@ -65,9 +65,8 @@ namespace Collections
QueryMaker* addMatch( const Meta::ComposerPtr &composer );
QueryMaker* addMatch( const Meta::GenrePtr &genre );
QueryMaker* addMatch( const Meta::YearPtr &year );
- QueryMaker* addMatch( const Meta::DataPtr &data );
QueryMaker* addMatch( const Meta::LabelPtr &label );
-
+
QueryMaker* addFilter( qint64 value, const QString &filter, bool \
matchBegin = false, bool matchEnd = false );
QueryMaker* excludeFilter( qint64 value, const QString &filter, bool \
matchBegin = false, bool matchEnd = false );
diff --git a/src/core-impl/collections/proxycollection/ProxyCollectionQueryMaker.cpp \
b/src/core-impl/collections/proxycollection/ProxyCollectionQueryMaker.cpp index \
e8a26dd..6669f68 100644
--- a/src/core-impl/collections/proxycollection/ProxyCollectionQueryMaker.cpp
+++ b/src/core-impl/collections/proxycollection/ProxyCollectionQueryMaker.cpp
@@ -266,15 +266,6 @@ ProxyQueryMaker::addMatch( const Meta::YearPtr &year )
}
QueryMaker*
-ProxyQueryMaker::addMatch( const Meta::DataPtr &data )
-{
- Meta::DataPtr tmp = const_cast<Meta::DataPtr&>( data );
- foreach( QueryMaker *b, m_builders )
- tmp->addMatchTo( b );
- return this;
-}
-
-QueryMaker*
ProxyQueryMaker::addMatch( const Meta::LabelPtr &label )
{
foreach( QueryMaker *b, m_builders )
diff --git a/src/core-impl/collections/proxycollection/ProxyCollectionQueryMaker.h \
b/src/core-impl/collections/proxycollection/ProxyCollectionQueryMaker.h index \
c825f65..01bd29f 100644
--- a/src/core-impl/collections/proxycollection/ProxyCollectionQueryMaker.h
+++ b/src/core-impl/collections/proxycollection/ProxyCollectionQueryMaker.h
@@ -64,7 +64,6 @@ class AMAROK_EXPORT_TESTS ProxyQueryMaker : public QueryMaker
virtual QueryMaker* addMatch( const Meta::ComposerPtr &composer );
virtual QueryMaker* addMatch( const Meta::GenrePtr &genre );
virtual QueryMaker* addMatch( const Meta::YearPtr &year );
- virtual QueryMaker* addMatch( const Meta::DataPtr &data );
virtual QueryMaker* addMatch( const Meta::LabelPtr &label );
virtual QueryMaker* addFilter( qint64 value, const QString &filter, bool \
matchBegin, bool matchEnd );
diff --git a/src/core-impl/collections/support/MemoryQueryMaker.cpp \
b/src/core-impl/collections/support/MemoryQueryMaker.cpp index d413d18..182501d \
100644
--- a/src/core-impl/collections/support/MemoryQueryMaker.cpp
+++ b/src/core-impl/collections/support/MemoryQueryMaker.cpp
@@ -422,13 +422,6 @@ MemoryQueryMaker::addMatch( const Meta::YearPtr &year )
}
QueryMaker*
-MemoryQueryMaker::addMatch( const Meta::DataPtr &data )
-{
- ( const_cast<Meta::DataPtr&>(data) )->addMatchTo( this );
- return this;
-}
-
-QueryMaker*
MemoryQueryMaker::addMatch( const Meta::LabelPtr &label )
{
MemoryMatcher *labelMatcher = new LabelMatcher( label );
diff --git a/src/core-impl/collections/support/MemoryQueryMaker.h \
b/src/core-impl/collections/support/MemoryQueryMaker.h index 1d11435..027498a 100644
--- a/src/core-impl/collections/support/MemoryQueryMaker.h
+++ b/src/core-impl/collections/support/MemoryQueryMaker.h
@@ -68,7 +68,6 @@ class AMAROK_EXPORT MemoryQueryMaker : public QueryMaker
virtual QueryMaker* addMatch( const Meta::ComposerPtr &composer );
virtual QueryMaker* addMatch( const Meta::GenrePtr &genre );
virtual QueryMaker* addMatch( const Meta::YearPtr &year );
- virtual QueryMaker* addMatch( const Meta::DataPtr &data );
virtual QueryMaker* addMatch( const Meta::LabelPtr &label );
virtual QueryMaker* addFilter( qint64 value, const QString &filter, bool \
matchBegin, bool matchEnd );
diff --git a/src/core-impl/collections/support/XmlQueryWriter.cpp \
b/src/core-impl/collections/support/XmlQueryWriter.cpp index ec75198..76e8bdf 100644
--- a/src/core-impl/collections/support/XmlQueryWriter.cpp
+++ b/src/core-impl/collections/support/XmlQueryWriter.cpp
@@ -272,13 +272,6 @@ XmlQueryWriter::addMatch( const Meta::LabelPtr &label )
}
QueryMaker*
-XmlQueryWriter::addMatch( const Meta::DataPtr &data )
-{
- m_qm->addMatch( data );
- return this;
-}
-
-QueryMaker*
XmlQueryWriter::addFilter( qint64 value, const QString &filter, bool matchBegin, \
bool matchEnd ) {
DEBUG_BLOCK
diff --git a/src/core-impl/collections/support/XmlQueryWriter.h \
b/src/core-impl/collections/support/XmlQueryWriter.h index e3d2c35..38d7b96 100644
--- a/src/core-impl/collections/support/XmlQueryWriter.h
+++ b/src/core-impl/collections/support/XmlQueryWriter.h
@@ -62,7 +62,6 @@ class XmlQueryWriter : public QueryMaker
QueryMaker* addMatch( const Meta::ComposerPtr &composer );
QueryMaker* addMatch( const Meta::GenrePtr &genre );
QueryMaker* addMatch( const Meta::YearPtr &year );
- QueryMaker* addMatch( const Meta::DataPtr &data );
QueryMaker* addMatch( const Meta::LabelPtr &label );
QueryMaker* addFilter( qint64 value, const QString &filter, bool matchBegin \
= false, bool matchEnd = false );
diff --git a/src/core-impl/collections/upnpcollection/UpnpQueryMaker.cpp \
b/src/core-impl/collections/upnpcollection/UpnpQueryMaker.cpp index 68c11dd..734e486 \
100644
--- a/src/core-impl/collections/upnpcollection/UpnpQueryMaker.cpp
+++ b/src/core-impl/collections/upnpcollection/UpnpQueryMaker.cpp
@@ -316,14 +316,6 @@ DEBUG_BLOCK
return this;
}
-QueryMaker* UpnpQueryMaker::addMatch( const Meta::DataPtr &data )
-{
-DEBUG_BLOCK
- debug() << this << "Adding dataptr match" << data->name();
- ( const_cast<Meta::DataPtr&>(data) )->addMatchTo( this );
- return this;
-}
-
QueryMaker* UpnpQueryMaker::addMatch( const Meta::LabelPtr &label )
{
DEBUG_BLOCK
diff --git a/src/core-impl/collections/upnpcollection/UpnpQueryMaker.h \
b/src/core-impl/collections/upnpcollection/UpnpQueryMaker.h index 234f337..dc27caf \
100644
--- a/src/core-impl/collections/upnpcollection/UpnpQueryMaker.h
+++ b/src/core-impl/collections/upnpcollection/UpnpQueryMaker.h
@@ -68,7 +68,6 @@ class UpnpQueryMaker : public QueryMaker
QueryMaker* addMatch( const Meta::ComposerPtr &composer ) ;
QueryMaker* addMatch( const Meta::GenrePtr &genre ) ;
QueryMaker* addMatch( const Meta::YearPtr &year ) ;
- QueryMaker* addMatch( const Meta::DataPtr &data ) ;
QueryMaker* addMatch( const Meta::LabelPtr &label );
QueryMaker* addFilter( qint64 value, const QString &filter, bool matchBegin \
= false, bool matchEnd = false ) ;
diff --git a/src/core/collections/MetaQueryMaker.cpp \
b/src/core/collections/MetaQueryMaker.cpp index d09950f..0ef3cab 100644
--- a/src/core/collections/MetaQueryMaker.cpp
+++ b/src/core/collections/MetaQueryMaker.cpp
@@ -231,15 +231,6 @@ MetaQueryMaker::addMatch( const Meta::YearPtr &year )
}
QueryMaker*
-MetaQueryMaker::addMatch( const Meta::DataPtr &data )
-{
- Meta::DataPtr tmp = const_cast<Meta::DataPtr&>( data );
- foreach( QueryMaker *b, builders )
- tmp->addMatchTo( b );
- return this;
-}
-
-QueryMaker*
MetaQueryMaker::addMatch( const Meta::LabelPtr &label )
{
foreach( QueryMaker *b, builders )
diff --git a/src/core/collections/MetaQueryMaker.h \
b/src/core/collections/MetaQueryMaker.h index 9c1d0ba..dd870ad 100644
--- a/src/core/collections/MetaQueryMaker.h
+++ b/src/core/collections/MetaQueryMaker.h
@@ -53,7 +53,6 @@ class AMAROK_CORE_EXPORT MetaQueryMaker : public QueryMaker
virtual QueryMaker* addMatch( const Meta::ComposerPtr &composer );
virtual QueryMaker* addMatch( const Meta::GenrePtr &genre );
virtual QueryMaker* addMatch( const Meta::YearPtr &year );
- virtual QueryMaker* addMatch( const Meta::DataPtr &data );
virtual QueryMaker* addMatch( const Meta::LabelPtr &label );
virtual QueryMaker* addFilter( qint64 value, const QString &filter, bool \
matchBegin, bool matchEnd );
diff --git a/src/core/collections/QueryMaker.h b/src/core/collections/QueryMaker.h
index 409dc85..47baa80 100644
--- a/src/core/collections/QueryMaker.h
+++ b/src/core/collections/QueryMaker.h
@@ -157,7 +157,6 @@ class AMAROK_CORE_EXPORT QueryMaker : public QObject
virtual QueryMaker* addMatch( const Meta::ComposerPtr &composer ) = 0;
virtual QueryMaker* addMatch( const Meta::GenrePtr &genre ) = 0;
virtual QueryMaker* addMatch( const Meta::YearPtr &year ) = 0;
- virtual QueryMaker* addMatch( const Meta::DataPtr &data ) = 0;
virtual QueryMaker* addMatch( const Meta::LabelPtr &label );
/**
diff --git a/src/core/meta/Meta.cpp b/src/core/meta/Meta.cpp
index b5f4002..bd91f45 100644
--- a/src/core/meta/Meta.cpp
+++ b/src/core/meta/Meta.cpp
@@ -289,12 +289,6 @@ Meta::Track::removeLabel( const Meta::LabelPtr &label )
Q_UNUSED( label )
}
-void
-Meta::Track::addMatchTo( Collections::QueryMaker *qm )
-{
- qm->addMatch( TrackPtr( this ) );
-}
-
QDateTime
Meta::Track::createDate() const
{
@@ -395,12 +389,6 @@ Meta::Track::lessThan( const Meta::TrackPtr& left, const \
Meta::TrackPtr& right )
//Meta::Artist
-void
-Meta::Artist::addMatchTo( Collections::QueryMaker *qm )
-{
- qm->addMatch( ArtistPtr( this ) );
-}
-
QString
Meta::Artist::prettyName() const
{
@@ -446,12 +434,6 @@ Meta::Artist::sortableName() const
//Meta::Album
-void
-Meta::Album::addMatchTo( Collections::QueryMaker *qm )
-{
- qm->addMatch( AlbumPtr( this ) );
-}
-
QString
Meta::Album::prettyName() const
{
@@ -518,12 +500,6 @@ Meta::Genre::prettyName() const
}
void
-Meta::Genre::addMatchTo( Collections::QueryMaker *qm )
-{
- qm->addMatch( GenrePtr( this ) );
-}
-
-void
Meta::Genre::notifyObservers() const
{
foreach( Observer *observer, m_observers )
@@ -543,12 +519,6 @@ Meta::Genre::operator==( const Meta::Genre &genre ) const
//Meta::Composer
-void
-Meta::Composer::addMatchTo( Collections::QueryMaker *qm )
-{
- qm->addMatch( ComposerPtr( this ) );
-}
-
QString
Meta::Composer::prettyName() const
{
@@ -576,12 +546,6 @@ Meta::Composer::operator==( const Meta::Composer &composer ) \
const //Meta::Year
void
-Meta::Year::addMatchTo( Collections::QueryMaker *qm )
-{
- qm->addMatch( YearPtr( this ) );
-}
-
-void
Meta::Year::notifyObservers() const
{
foreach( Observer *observer, m_observers )
@@ -598,12 +562,6 @@ Meta::Year::operator==( const Meta::Year &year ) const
}
void
-Meta::Label::addMatchTo( Collections::QueryMaker *qm )
-{
- qm->addMatch( Meta::LabelPtr( this ) );
-}
-
-void
Meta::Label::notifyObservers() const
{
//TODO: not sure if labels have to be observable, or whether it makes sense for \
them to notify observers
diff --git a/src/core/meta/Meta.h b/src/core/meta/Meta.h
index de9d193..e8d7d76 100644
--- a/src/core/meta/Meta.h
+++ b/src/core/meta/Meta.h
@@ -181,10 +181,6 @@ namespace Meta
*/
virtual QString fixedName() const { return prettyName(); }
- virtual void addMatchTo( Collections::QueryMaker *qm ) = 0;
-
-
-
protected:
virtual void subscribe( Observer *observer );
virtual void unsubscribe( Observer *observer );
@@ -287,8 +283,6 @@ namespace Meta
The argument is the percentage of the track which was played, in the \
range 0 to 1*/ virtual void finishedPlaying( double playedFraction );
- virtual void addMatchTo( Collections::QueryMaker* qm );
-
/** returns true if the track is part of a collection false otherwise */
virtual bool inCollection() const;
/**
@@ -346,8 +340,6 @@ namespace Meta
/** returns all albums by this artist */
virtual AlbumList albums() = 0;
- virtual void addMatchTo( Collections::QueryMaker* qm );
-
virtual bool operator==( const Meta::Artist &artist ) const;
virtual QString sortableName() const;
@@ -415,8 +407,6 @@ namespace Meta
/** should automatic artwork retrieval be suppressed? */
virtual bool suppressImageAutoFetch() const { return false; }
- virtual void addMatchTo( Collections::QueryMaker* qm );
-
virtual bool operator==( const Meta::Album &album ) const;
protected:
@@ -433,8 +423,6 @@ namespace Meta
/** returns all tracks by this composer */
virtual TrackList tracks() = 0;
- virtual void addMatchTo( Collections::QueryMaker* qm );
-
virtual bool operator==( const Meta::Composer &composer ) const;
protected:
@@ -451,8 +439,6 @@ namespace Meta
/** returns all tracks which belong to the genre */
virtual TrackList tracks() = 0;
- virtual void addMatchTo( Collections::QueryMaker* qm );
-
virtual bool operator==( const Meta::Genre &genre ) const;
protected:
@@ -474,8 +460,6 @@ namespace Meta
/** returns all tracks which are tagged with this year */
virtual TrackList tracks() = 0;
- virtual void addMatchTo( Collections::QueryMaker* qm );
-
virtual bool operator==( const Meta::Year &year ) const;
protected:
@@ -497,8 +481,6 @@ namespace Meta
*/
virtual ~ Label() {}
- virtual void addMatchTo( Collections::QueryMaker* qm );
-
protected:
virtual void notifyObservers() const;
};
diff --git a/src/services/DynamicServiceQueryMaker.cpp \
b/src/services/DynamicServiceQueryMaker.cpp index f47a6f9..aaa704c 100644
--- a/src/services/DynamicServiceQueryMaker.cpp
+++ b/src/services/DynamicServiceQueryMaker.cpp
@@ -114,13 +114,6 @@ QueryMaker * DynamicServiceQueryMaker::addMatch(const \
Meta::LabelPtr & label) return this;
}
-QueryMaker * DynamicServiceQueryMaker::addMatch(const Meta::DataPtr & data)
-{
- DEBUG_BLOCK
- ( const_cast<Meta::DataPtr&>(data) )->addMatchTo( this );
- return this;
-}
-
QueryMaker * DynamicServiceQueryMaker::addFilter(qint64 value, const QString & \
filter, bool matchBegin, bool matchEnd) {
Q_UNUSED( value );
diff --git a/src/services/DynamicServiceQueryMaker.h \
b/src/services/DynamicServiceQueryMaker.h index 7a8a9e8..a931752 100644
--- a/src/services/DynamicServiceQueryMaker.h
+++ b/src/services/DynamicServiceQueryMaker.h
@@ -72,9 +72,6 @@ public:
virtual QueryMaker* addMatch ( const Meta::YearPtr &year );
virtual QueryMaker* addMatch ( const Meta::LabelPtr &label );
- //this function must be reimplemented if the QueryMaker accepts any kind of \
qualifiers
- virtual QueryMaker* addMatch ( const Meta::DataPtr &data );
-
virtual QueryMaker* addFilter ( qint64 value, const QString &filter, bool \
matchBegin, bool matchEnd );
virtual QueryMaker* excludeFilter ( qint64 value, const QString &filter, bool \
matchBegin, bool matchEnd );
diff --git a/src/services/ServiceSqlQueryMaker.cpp \
b/src/services/ServiceSqlQueryMaker.cpp index 93a3cef..2cb1242 100644
--- a/src/services/ServiceSqlQueryMaker.cpp
+++ b/src/services/ServiceSqlQueryMaker.cpp
@@ -435,14 +435,6 @@ ServiceSqlQueryMaker::addMatch( const Meta::LabelPtr &label )
}
QueryMaker*
-ServiceSqlQueryMaker::addMatch( const Meta::DataPtr &data )
-{
- ( const_cast<Meta::DataPtr&>(data) )->addMatchTo( this );
- //TODO needed at all?
- return this;
-}
-
-QueryMaker*
ServiceSqlQueryMaker::addFilter( qint64 value, const QString &filter, bool \
matchBegin, bool matchEnd ) {
if( !isValidValue( value ) )
diff --git a/src/services/ServiceSqlQueryMaker.h \
b/src/services/ServiceSqlQueryMaker.h index dc586f0..4eaccbb 100644
--- a/src/services/ServiceSqlQueryMaker.h
+++ b/src/services/ServiceSqlQueryMaker.h
@@ -53,7 +53,6 @@ class ServiceSqlQueryMaker : public QueryMaker
virtual QueryMaker* addMatch( const Meta::GenrePtr &genre );
virtual QueryMaker* addMatch( const Meta::YearPtr &year );
virtual QueryMaker* addMatch( const Meta::LabelPtr &label );
- virtual QueryMaker* addMatch( const Meta::DataPtr &data );
virtual QueryMaker* addFilter( qint64 value, const QString &filter, bool \
matchBegin, bool matchEnd );
virtual QueryMaker* excludeFilter( qint64 value, const QString &filter, bool \
matchBegin, bool matchEnd );
diff --git a/src/services/scriptable/ScriptableServiceQueryMaker.cpp \
b/src/services/scriptable/ScriptableServiceQueryMaker.cpp index f4c7333..91d1e07 \
100644
--- a/src/services/scriptable/ScriptableServiceQueryMaker.cpp
+++ b/src/services/scriptable/ScriptableServiceQueryMaker.cpp
@@ -466,11 +466,4 @@ QueryMaker * ScriptableServiceQueryMaker::addFilter( qint64 \
value, const QString
}
-QueryMaker * ScriptableServiceQueryMaker::addMatch( const Meta::DataPtr & data )
-{
- //DEBUG_BLOCK
- ( const_cast<Meta::DataPtr&>(data) )->addMatchTo( this );
- return this;
-}
-
#include "ScriptableServiceQueryMaker.moc"
diff --git a/src/services/scriptable/ScriptableServiceQueryMaker.h \
b/src/services/scriptable/ScriptableServiceQueryMaker.h index d68e303..e35e56b 100644
--- a/src/services/scriptable/ScriptableServiceQueryMaker.h
+++ b/src/services/scriptable/ScriptableServiceQueryMaker.h
@@ -48,7 +48,6 @@ public:
virtual QueryMaker* addMatch ( const Meta::GenrePtr &genre );
virtual QueryMaker* addMatch ( const Meta::ArtistPtr &artist );
virtual QueryMaker* addMatch ( const Meta::AlbumPtr &album );
- virtual QueryMaker* addMatch ( const Meta::DataPtr & data );
virtual QueryMaker* setAlbumQueryMode( AlbumQueryMode mode );
diff --git a/tests/core-impl/collections/db/sql/TestSqlQueryMaker.cpp \
b/tests/core-impl/collections/db/sql/TestSqlQueryMaker.cpp index 98990d5..4defe5a \
100644
--- a/tests/core-impl/collections/db/sql/TestSqlQueryMaker.cpp
+++ b/tests/core-impl/collections/db/sql/TestSqlQueryMaker.cpp
@@ -724,46 +724,6 @@ Meta::DataList asList( const Meta::YearPtr &year )
#undef PointerToDataList
void
-TestSqlQueryMaker::testMatch_data()
-{
- QTest::addColumn<Collections::QueryMaker::QueryType>( "type" );
- QTest::addColumn<Meta::DataList>( "dataList" );
- QTest::addColumn<int>( "count" );
-
- SqlRegistry *r = m_collection->registry();
-
- QTest::newRow( "track matches artist" ) << Collections::QueryMaker::Track << \
asList( r->getArtist( "artist1" ) ) << 3;
- QTest::newRow( "track matches album" ) << Collections::QueryMaker::Track << \
asList( r->getAlbum( "album1", "artist1" ) ) << 1;
- QTest::newRow( "track matches genre" ) << Collections::QueryMaker::Track << \
asList( r->getGenre( "genre1" ) ) << 3;
- QTest::newRow( "track matches composer" ) << Collections::QueryMaker::Track << \
asList( r->getComposer( "composer1" ) ) << 3;
- QTest::newRow( "track matches year" ) << Collections::QueryMaker::Track << \
asList( r->getYear(1)) << 3;
- QTest::newRow( "artist matches album" ) << Collections::QueryMaker::Artist << \
asList(r->getAlbum("album1", "artist1" )) << 1;
- QTest::newRow( "artist matches genre" ) << Collections::QueryMaker::Artist << \
asList(r->getGenre("genre1")) << 2;
-}
-
-void
-TestSqlQueryMaker::testMatch()
-{
- QFETCH( Collections::QueryMaker::QueryType, type );
- QFETCH( Meta::DataList, dataList );
- QFETCH( int, count );
-
- Collections::SqlQueryMaker qm( m_collection );
- qm.setBlocking( true );
- qm.setQueryType( type );
- qm.setReturnResultAsDataPtrs( true );
-
- foreach( const Meta::DataPtr &data, dataList )
- {
- qm.addMatch( data );
- }
-
- qm.run();
-
- QCOMPARE( qm.data( "testId" ).count(), count );
-}
-
-void
TestSqlQueryMaker::testDynamicCollection()
{
//this will not crash as we reset the correct mock in cleanup()
diff --git a/tests/core-impl/collections/db/sql/TestSqlQueryMaker.h \
b/tests/core-impl/collections/db/sql/TestSqlQueryMaker.h index f3c3d2c..e3f4cd6 \
100644
--- a/tests/core-impl/collections/db/sql/TestSqlQueryMaker.h
+++ b/tests/core-impl/collections/db/sql/TestSqlQueryMaker.h
@@ -62,9 +62,6 @@ private slots:
void testFilter();
void testFilter_data();
- void testMatch();
- void testMatch_data();
-
void testDynamicCollection();
void testSpecialCharacters_data();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic