ConfigFile: move code to ConfigGlobal.cxx

1 files changed, 1 insertions, 73 deletions

diff --git a/src/conf.h b/src/conf.h
index b81b9ccdc..bc17a0c79 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -20,11 +20,11 @@
 #ifndef MPD_CONF_H
 #define MPD_CONF_H
 
+#include "ConfigGlobal.hxx"
 #include "ConfigOption.hxx"
 #include "ConfigData.hxx"
 #include "gcc.h"
 
-#include <stdbool.h>
 #include <glib.h>
 
 #define DEFAULT_PLAYLIST_MAX_LENGTH (1024*16)
@@ -32,10 +32,6 @@
 
 #define MAX_FILTER_CHAIN_LENGTH 255
 
-#ifdef __cplusplus
-class Path;
-#endif
-
 /**
  * A GQuark for GError instances, resulting from malformed
  * configuration.
@@ -47,72 +43,4 @@ config_quark(void)
 	return g_quark_from_static_string("config");
 }
 
-void config_global_init(void);
-void config_global_finish(void);
-
-/**
- * Call this function after all configuration has been evaluated.  It
- * checks for unused parameters, and logs warnings.
- */
-void config_global_check(void);
-
-#ifdef __cplusplus
-
-bool
-ReadConfigFile(const Path &path, GError **error_r);
-
-#endif
-
-G_BEGIN_DECLS
-
-/* don't free the returned value
-   set _last_ to NULL to get first entry */
-G_GNUC_PURE
-const struct config_param *
-config_get_next_param(enum ConfigOption option,
-		      const struct config_param *last);
-
-G_GNUC_PURE
-static inline const struct config_param *
-config_get_param(enum ConfigOption option)
-{
-	return config_get_next_param(option, NULL);
-}
-
-/* Note on G_GNUC_PURE: Some of the functions declared pure are not
-   really pure in strict sense.  They have side effect such that they
-   validate parameter's value and signal an error if it's invalid.
-   However, if the argument was already validated or we don't care
-   about the argument at all, this may be ignored so in the end, we
-   should be fine with calling those functions pure.  */
-
-G_GNUC_PURE
-const char *
-config_get_string(enum ConfigOption option, const char *default_value);
-
-/**
- * Returns an optional configuration variable which contains an
- * absolute path.  If there is a tilde prefix, it is expanded.
- * Returns NULL if the value is not present.  If the path could not be
- * parsed, returns NULL and sets the error.
- *
- * The return value must be freed with g_free().
- */
-G_GNUC_MALLOC
-char *
-config_dup_path(enum ConfigOption option, GError **error_r);
-
-G_GNUC_PURE
-unsigned
-config_get_unsigned(enum ConfigOption option, unsigned default_value);
-
-G_GNUC_PURE
-unsigned
-config_get_positive(enum ConfigOption option, unsigned default_value);
-
-G_GNUC_PURE
-bool config_get_bool(enum ConfigOption option, bool default_value);
-
-G_END_DECLS
-
 #endif