tag/Mask: wrap in class

This commit is contained in:
Max Kellermann
2017-02-07 16:57:16 +01:00
parent 17097d96b7
commit 2f3f075e4f
16 changed files with 114 additions and 42 deletions

View File

@@ -33,6 +33,7 @@
#include "config/Block.hxx"
#include "tag/Builder.hxx"
#include "tag/Tag.hxx"
#include "tag/Mask.hxx"
#include "util/ScopeExit.hxx"
#include "util/RuntimeError.hxx"
#include "protocol/Ack.hxx"
@@ -120,7 +121,7 @@ public:
VisitPlaylist visit_playlist) const override;
void VisitUniqueTags(const DatabaseSelection &selection,
TagType tag_type, tag_mask_t group_mask,
TagType tag_type, TagMask group_mask,
VisitTag visit_tag) const override;
DatabaseStats GetStats(const DatabaseSelection &selection) const override;
@@ -756,7 +757,7 @@ ProxyDatabase::Visit(const DatabaseSelection &selection,
void
ProxyDatabase::VisitUniqueTags(const DatabaseSelection &selection,
TagType tag_type,
gcc_unused tag_mask_t group_mask,
gcc_unused TagMask group_mask,
VisitTag visit_tag) const
{
// TODO: eliminate the const_cast

View File

@@ -31,6 +31,7 @@
#include "DatabaseSave.hxx"
#include "db/DatabaseLock.hxx"
#include "db/DatabaseError.hxx"
#include "tag/Mask.hxx"
#include "fs/io/TextFile.hxx"
#include "fs/io/BufferedOutputStream.hxx"
#include "fs/io/FileOutputStream.hxx"
@@ -301,7 +302,7 @@ SimpleDatabase::Visit(const DatabaseSelection &selection,
void
SimpleDatabase::VisitUniqueTags(const DatabaseSelection &selection,
TagType tag_type, tag_mask_t group_mask,
TagType tag_type, TagMask group_mask,
VisitTag visit_tag) const
{
::VisitUniqueTags(*this, selection, tag_type, group_mask, visit_tag);

View File

@@ -120,7 +120,7 @@ public:
VisitPlaylist visit_playlist) const override;
void VisitUniqueTags(const DatabaseSelection &selection,
TagType tag_type, tag_mask_t group_mask,
TagType tag_type, TagMask group_mask,
VisitTag visit_tag) const override;
DatabaseStats GetStats(const DatabaseSelection &selection) const override;

View File

@@ -35,6 +35,7 @@
#include "config/Block.hxx"
#include "tag/Builder.hxx"
#include "tag/Table.hxx"
#include "tag/Mask.hxx"
#include "fs/Traits.hxx"
#include "Log.hxx"
#include "SongFilter.hxx"
@@ -88,7 +89,7 @@ public:
VisitPlaylist visit_playlist) const override;
void VisitUniqueTags(const DatabaseSelection &selection,
TagType tag_type, tag_mask_t group_mask,
TagType tag_type, TagMask group_mask,
VisitTag visit_tag) const override;
DatabaseStats GetStats(const DatabaseSelection &selection) const override;
@@ -605,7 +606,7 @@ UpnpDatabase::Visit(const DatabaseSelection &selection,
void
UpnpDatabase::VisitUniqueTags(const DatabaseSelection &selection,
TagType tag, gcc_unused tag_mask_t group_mask,
TagType tag, gcc_unused TagMask group_mask,
VisitTag visit_tag) const
{
// TODO: use group_mask