diff options
author | Max Kellermann <max@duempel.org> | 2015-01-21 21:14:25 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2015-01-21 21:23:02 +0100 |
commit | fe85fa3bea023df887811d4dc28dc51b7894525a (patch) | |
tree | f279de257c0b447c78fa5f11c152639dfb7182e1 /src/config/ConfigData.hxx | |
parent | 76b7882f3324bb892a9ccc874e1bdacfd72e7b98 (diff) | |
download | mpd-fe85fa3bea023df887811d4dc28dc51b7894525a.tar.gz mpd-fe85fa3bea023df887811d4dc28dc51b7894525a.tar.xz mpd-fe85fa3bea023df887811d4dc28dc51b7894525a.zip |
ConfigData: move struct config_param to Param.hxx
Diffstat (limited to 'src/config/ConfigData.hxx')
-rw-r--r-- | src/config/ConfigData.hxx | 79 |
1 files changed, 1 insertions, 78 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; |