ConfigData: move struct config_param to Param.hxx

5 files changed, 108 insertions, 79 deletions

diff --git a/src/config/ConfigData.hxx b/src/config/ConfigData.hxx
index 1f7e61b6f..a79836324 100644
--- a/src/config/ConfigData.hxx
+++ b/src/config/ConfigData.hxx
@@ -20,88 +20,11 @@
 #ifndef MPD_CONFIG_DATA_HXX
 #define MPD_CONFIG_DATA_HXX
 
-#include "Block.hxx"
 #include "ConfigOption.hxx"
-#include "Compiler.h"
 
-#include <string>
 #include <array>
-#include <vector>
 
-class AllocatedPath;
-class Error;
-
-struct config_param {
-	/**
-	 * The next config_param with the same name.  The destructor
-	 * deletes the whole chain.
-	 */
-	struct config_param *next;
-
-	std::string value;
-
-	unsigned int line;
-
-	std::vector<BlockParam> block_params;
-
-	/**
-	 * This flag is false when nobody has queried the value of
-	 * this option yet.
-	 */
-	bool used;
-
-	config_param(int _line=-1)
-		:next(nullptr), line(_line), used(false) {}
-
-	gcc_nonnull_all
-	config_param(const char *_value, int _line=-1);
-
-	config_param(const config_param &) = delete;
-
-	~config_param();
-
-	config_param &operator=(const config_param &) = delete;
-
-	/**
-	 * Determine if this is a "null" instance, i.e. an empty
-	 * object that was synthesized and not loaded from a
-	 * configuration file.
-	 */
-	bool IsNull() const {
-		return line == unsigned(-1);
-	}
-
-	gcc_nonnull_all
-	void AddBlockParam(const char *_name, const char *_value,
-			   int _line=-1) {
-		block_params.emplace_back(_name, _value, _line);
-	}
-
-	gcc_nonnull_all gcc_pure
-	const BlockParam *GetBlockParam(const char *_name) const;
-
-	gcc_pure
-	const char *GetBlockValue(const char *name,
-				  const char *default_value=nullptr) const;
-
-	/**
-	 * Same as config_get_path(), but looks up the setting in the
-	 * specified block.
-	 */
-	AllocatedPath GetBlockPath(const char *name, const char *default_value,
-				   Error &error) const;
-
-	AllocatedPath GetBlockPath(const char *name, Error &error) const;
-
-	gcc_pure
-	int GetBlockValue(const char *name, int default_value) const;
-
-	gcc_pure
-	unsigned GetBlockValue(const char *name, unsigned default_value) const;
-
-	gcc_pure
-	bool GetBlockValue(const char *name, bool default_value) const;
-};
+struct config_param;
 
 struct ConfigData {
 	std::array<config_param *, std::size_t(CONF_MAX)> params;
diff --git a/src/config/ConfigFile.cxx b/src/config/ConfigFile.cxx
index 605adb430..da4613010 100644
--- a/src/config/ConfigFile.cxx
+++ b/src/config/ConfigFile.cxx
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "ConfigFile.hxx"
 #include "ConfigData.hxx"
+#include "Param.hxx"
 #include "ConfigTemplates.hxx"
 #include "util/Tokenizer.hxx"
 #include "util/StringUtil.hxx"
diff --git a/src/config/ConfigGlobal.cxx b/src/config/ConfigGlobal.cxx
index 281c841a4..8efa2129d 100644
--- a/src/config/ConfigGlobal.cxx
+++ b/src/config/ConfigGlobal.cxx
@@ -21,6 +21,7 @@
 #include "ConfigGlobal.hxx"
 #include "ConfigParser.hxx"
 #include "ConfigData.hxx"
+#include "Param.hxx"
 #include "ConfigFile.hxx"
 #include "ConfigPath.hxx"
 #include "ConfigError.hxx"
diff --git a/src/config/ConfigData.cxx b/src/config/Param.cxx
index 5d0b61df0..376f50ee7 100644
--- a/src/config/ConfigData.cxx
+++ b/src/config/Param.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "ConfigData.hxx"
+#include "Param.hxx"
 #include "ConfigPath.hxx"
 #include "util/Error.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/config/Param.hxx b/src/config/Param.hxx
new file mode 100644
index 000000000..66700044c
--- /dev/null
+++ b/src/config/Param.hxx
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2003-2015 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_PARAM_HXX
+#define MPD_CONFIG_PARAM_HXX
+
+#include "Block.hxx"
+#include "Compiler.h"
+
+#include <string>
+#include <vector>
+
+class AllocatedPath;
+class Error;
+
+struct config_param {
+	/**
+	 * The next config_param with the same name.  The destructor
+	 * deletes the whole chain.
+	 */
+	struct config_param *next;
+
+	std::string value;
+
+	unsigned int line;
+
+	std::vector<BlockParam> block_params;
+
+	/**
+	 * This flag is false when nobody has queried the value of
+	 * this option yet.
+	 */
+	bool used;
+
+	config_param(int _line=-1)
+		:next(nullptr), line(_line), used(false) {}
+
+	gcc_nonnull_all
+	config_param(const char *_value, int _line=-1);
+
+	config_param(const config_param &) = delete;
+
+	~config_param();
+
+	config_param &operator=(const config_param &) = delete;
+
+	/**
+	 * Determine if this is a "null" instance, i.e. an empty
+	 * object that was synthesized and not loaded from a
+	 * configuration file.
+	 */
+	bool IsNull() const {
+		return line == unsigned(-1);
+	}
+
+	gcc_nonnull_all
+	void AddBlockParam(const char *_name, const char *_value,
+			   int _line=-1) {
+		block_params.emplace_back(_name, _value, _line);
+	}
+
+	gcc_nonnull_all gcc_pure
+	const BlockParam *GetBlockParam(const char *_name) const;
+
+	gcc_pure
+	const char *GetBlockValue(const char *name,
+				  const char *default_value=nullptr) const;
+
+	/**
+	 * Same as config_get_path(), but looks up the setting in the
+	 * specified block.
+	 */
+	AllocatedPath GetBlockPath(const char *name, const char *default_value,
+				   Error &error) const;
+
+	AllocatedPath GetBlockPath(const char *name, Error &error) const;
+
+	gcc_pure
+	int GetBlockValue(const char *name, int default_value) const;
+
+	gcc_pure
+	unsigned GetBlockValue(const char *name, unsigned default_value) const;
+
+	gcc_pure
+	bool GetBlockValue(const char *name, bool default_value) const;
+};
+
+#endif