oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

tag/Settings: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2015-08-24 11:19:19 +02:00
parent 0c19418e84
commit 2f5106c97f
8 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -818,7 +818,7 @@ libtag_a_SOURCES =\
src/tag/TagBuilder.cxx src/tag/TagBuilder.hxx \ src/tag/TagBuilder.cxx src/tag/TagBuilder.hxx \
src/tag/TagItem.hxx \ src/tag/TagItem.hxx \
src/tag/TagHandler.cxx src/tag/TagHandler.hxx \ src/tag/TagHandler.cxx src/tag/TagHandler.hxx \
src/tag/TagSettings.c src/tag/TagSettings.h \ src/tag/Settings.cxx src/tag/Settings.hxx \
src/tag/TagConfig.cxx src/tag/TagConfig.hxx \ src/tag/TagConfig.cxx src/tag/TagConfig.hxx \
src/tag/TagNames.c \ src/tag/TagNames.c \
src/tag/TagString.cxx src/tag/TagString.hxx \ src/tag/TagString.cxx src/tag/TagString.hxx \

2
src/TagPrint.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "TagPrint.hxx" #include "TagPrint.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "tag/TagSettings.h" #include "tag/Settings.hxx"
#include "client/Response.hxx" #include "client/Response.hxx"
void void

2
src/db/plugins/simple/DatabaseSave.cxx
View File

@ -26,7 +26,7 @@
#include "fs/io/BufferedOutputStream.hxx" #include "fs/io/BufferedOutputStream.hxx"
#include "fs/io/TextFile.hxx" #include "fs/io/TextFile.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "tag/TagSettings.h" #include "tag/Settings.hxx"
#include "fs/Charset.hxx" #include "fs/Charset.hxx"
#include "util/StringUtil.hxx" #include "util/StringUtil.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"

2
src/tag/Set.cxx
View File

@ -19,7 +19,7 @@
#include "Set.hxx" #include "Set.hxx"
#include "TagBuilder.hxx" #include "TagBuilder.hxx"
#include "TagSettings.h" #include "Settings.hxx"
#include <assert.h> #include <assert.h>

2
src/tag/TagSettings.c → src/tag/Settings.cxx
View File

@ -17,6 +17,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "TagSettings.h" #include "Settings.hxx"
tag_mask_t global_tag_mask = (tag_mask_t)-1 & ~(1 << TAG_COMMENT); tag_mask_t global_tag_mask = (tag_mask_t)-1 & ~(1 << TAG_COMMENT);

8
src/tag/TagSettings.h → src/tag/Settings.hxx
View File

@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_TAG_SETTINGS_H #ifndef MPD_TAG_SETTINGS_HXX
#define MPD_TAG_SETTINGS_H #define MPD_TAG_SETTINGS_HXX
#include "TagType.h" #include "TagType.h"
#include "Compiler.h" #include "Compiler.h"
@ -29,8 +29,6 @@ typedef uint_least32_t tag_mask_t;
extern tag_mask_t global_tag_mask; extern tag_mask_t global_tag_mask;
#ifdef __cplusplus
gcc_const gcc_const
static inline bool static inline bool
IsTagEnabled(unsigned tag) IsTagEnabled(unsigned tag)
@ -46,5 +44,3 @@ IsTagEnabled(TagType tag)
} }
#endif #endif
#endif

2
src/tag/TagBuilder.cxx
View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "TagBuilder.hxx" #include "TagBuilder.hxx"
#include "TagSettings.h" #include "Settings.hxx"
#include "TagPool.hxx" #include "TagPool.hxx"
#include "TagString.hxx" #include "TagString.hxx"
#include "Tag.hxx" #include "Tag.hxx"

2
src/tag/TagConfig.cxx
View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "TagConfig.hxx" #include "TagConfig.hxx"
#include "TagSettings.h" #include "Settings.hxx"
#include "Tag.hxx" #include "Tag.hxx"
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx" #include "config/ConfigOption.hxx"