tag/Settings: convert to C++

7 files changed, 8 insertions, 12 deletions

diff --git a/src/TagPrint.cxx b/src/TagPrint.cxx
index 4a97d851e..d938d8fa5 100644
--- a/src/TagPrint.cxx
+++ b/src/TagPrint.cxx
@@ -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
diff --git a/src/db/plugins/simple/DatabaseSave.cxx b/src/db/plugins/simple/DatabaseSave.cxx
index 02690dcf8..d2953b048 100644
--- a/src/db/plugins/simple/DatabaseSave.cxx
+++ b/src/db/plugins/simple/DatabaseSave.cxx
@@ -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"
diff --git a/src/tag/Set.cxx b/src/tag/Set.cxx
index 24ca30ee3..30e4efe2d 100644
--- a/src/tag/Set.cxx
+++ b/src/tag/Set.cxx
@@ -19,7 +19,7 @@
 
 #include "Set.hxx"
 #include "TagBuilder.hxx"
-#include "TagSettings.h"
+#include "Settings.hxx"
 
 #include <assert.h>
 
diff --git a/src/tag/TagSettings.c b/src/tag/Settings.cxx
index 905265913..83c626db8 100644
--- a/src/tag/TagSettings.c
+++ b/src/tag/Settings.cxx
@@ -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);
diff --git a/src/tag/TagSettings.h b/src/tag/Settings.hxx
index 708517a08..42d0dc684 100644
--- a/src/tag/TagSettings.h
+++ b/src/tag/Settings.hxx
@@ -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
diff --git a/src/tag/TagBuilder.cxx b/src/tag/TagBuilder.cxx
index 4e810475f..4ce50cc4c 100644
--- a/src/tag/TagBuilder.cxx
+++ b/src/tag/TagBuilder.cxx
@@ -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"
diff --git a/src/tag/TagConfig.cxx b/src/tag/TagConfig.cxx
index de5faff32..b0e7b8ff0 100644
--- a/src/tag/TagConfig.cxx
+++ b/src/tag/TagConfig.cxx
@@ -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"