conf.h: move the GQuark to ConfigQuark.hxx

6 files changed, 40 insertions, 13 deletions

diff --git a/Makefile.am b/Makefile.am
index 357416a0..92c47423 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -439,6 +439,7 @@ libconf_a_SOURCES = \
 	src/ConfigGlobal.cxx src/ConfigGlobal.hxx \
 	src/ConfigFile.cxx src/ConfigFile.hxx \
 	src/ConfigTemplates.cxx src/ConfigTemplates.hxx \
+	src/ConfigQuark.hxx \
 	src/ConfigOption.hxx
 
 # tag plugins
diff --git a/src/ConfigFile.cxx b/src/ConfigFile.cxx
index 39f13c7e..aebc4dc0 100644
--- a/src/ConfigFile.cxx
+++ b/src/ConfigFile.cxx
@@ -19,6 +19,7 @@
 
 #include "config.h"
 #include "ConfigFile.hxx"
+#include "ConfigQuark.hxx"
 #include "ConfigData.hxx"
 #include "ConfigTemplates.hxx"
 #include "conf.h"
diff --git a/src/ConfigQuark.hxx b/src/ConfigQuark.hxx
new file mode 100644
index 00000000..11594f99
--- /dev/null
+++ b/src/ConfigQuark.hxx
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_CONFIG_QUARK_HXX
+#define MPD_CONFIG_QUARK_HXX
+
+#include <glib.h>
+
+/**
+ * A GQuark for GError instances, resulting from malformed
+ * configuration.
+ */
+G_GNUC_CONST
+static inline GQuark
+config_quark(void)
+{
+	return g_quark_from_static_string("config");
+}
+
+#endif
diff --git a/src/conf.h b/src/conf.h
index bc17a0c7..8eb185fa 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -25,22 +25,9 @@
 #include "ConfigData.hxx"
 #include "gcc.h"
 
-#include <glib.h>
-
 #define DEFAULT_PLAYLIST_MAX_LENGTH (1024*16)
 #define DEFAULT_PLAYLIST_SAVE_ABSOLUTE_PATHS false
 
 #define MAX_FILTER_CHAIN_LENGTH 255
 
-/**
- * A GQuark for GError instances, resulting from malformed
- * configuration.
- */
-G_GNUC_CONST
-static inline GQuark
-config_quark(void)
-{
-	return g_quark_from_static_string("config");
-}
-
 #endif
diff --git a/src/filter/route_filter_plugin.c b/src/filter/route_filter_plugin.c
index 3bf8677e..c0ecbd9c 100644
--- a/src/filter/route_filter_plugin.c
+++ b/src/filter/route_filter_plugin.c
@@ -41,6 +41,7 @@
 
 #include "config.h"
 #include "conf.h"
+#include "ConfigQuark.hxx"
 #include "audio_format.h"
 #include "audio_check.h"
 #include "filter_plugin.h"
diff --git a/src/filter_plugin.c b/src/filter_plugin.c
index 7173134b..2e3c8fec 100644
--- a/src/filter_plugin.c
+++ b/src/filter_plugin.c
@@ -22,6 +22,7 @@
 #include "filter_internal.h"
 #include "filter_registry.h"
 #include "conf.h"
+#include "ConfigQuark.hxx"
 
 #ifndef NDEBUG
 #include "audio_format.h"