tag/Settings: convert to C++
This commit is contained in:
parent
0c19418e84
commit
2f5106c97f
|
@ -818,7 +818,7 @@ libtag_a_SOURCES =\
|
|||
src/tag/TagBuilder.cxx src/tag/TagBuilder.hxx \
|
||||
src/tag/TagItem.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/TagNames.c \
|
||||
src/tag/TagString.cxx src/tag/TagString.hxx \
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include "config.h"
|
||||
#include "TagPrint.hxx"
|
||||
#include "tag/Tag.hxx"
|
||||
#include "tag/TagSettings.h"
|
||||
#include "tag/Settings.hxx"
|
||||
#include "client/Response.hxx"
|
||||
|
||||
void
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "fs/io/BufferedOutputStream.hxx"
|
||||
#include "fs/io/TextFile.hxx"
|
||||
#include "tag/Tag.hxx"
|
||||
#include "tag/TagSettings.h"
|
||||
#include "tag/Settings.hxx"
|
||||
#include "fs/Charset.hxx"
|
||||
#include "util/StringUtil.hxx"
|
||||
#include "util/Error.hxx"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include "Set.hxx"
|
||||
#include "TagBuilder.hxx"
|
||||
#include "TagSettings.h"
|
||||
#include "Settings.hxx"
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
|
|
|
@ -17,6 +17,6 @@
|
|||
* 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);
|
|
@ -17,8 +17,8 @@
|
|||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifndef MPD_TAG_SETTINGS_H
|
||||
#define MPD_TAG_SETTINGS_H
|
||||
#ifndef MPD_TAG_SETTINGS_HXX
|
||||
#define MPD_TAG_SETTINGS_HXX
|
||||
|
||||
#include "TagType.h"
|
||||
#include "Compiler.h"
|
||||
|
@ -29,8 +29,6 @@ typedef uint_least32_t tag_mask_t;
|
|||
|
||||
extern tag_mask_t global_tag_mask;
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
gcc_const
|
||||
static inline bool
|
||||
IsTagEnabled(unsigned tag)
|
||||
|
@ -46,5 +44,3 @@ IsTagEnabled(TagType tag)
|
|||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include "config.h"
|
||||
#include "TagBuilder.hxx"
|
||||
#include "TagSettings.h"
|
||||
#include "Settings.hxx"
|
||||
#include "TagPool.hxx"
|
||||
#include "TagString.hxx"
|
||||
#include "Tag.hxx"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include "config.h"
|
||||
#include "TagConfig.hxx"
|
||||
#include "TagSettings.h"
|
||||
#include "Settings.hxx"
|
||||
#include "Tag.hxx"
|
||||
#include "config/ConfigGlobal.hxx"
|
||||
#include "config/ConfigOption.hxx"
|
||||
|
|
Loading…
Reference in New Issue