From f80ab6a7a2fdaf58874fd44418ea98dcce94155d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 21 Jan 2015 21:49:09 +0100 Subject: ConfigData: rename header file --- src/config/ConfigData.hxx | 33 --------------------------------- src/config/ConfigFile.cxx | 2 +- src/config/ConfigGlobal.cxx | 2 +- src/config/Data.hxx | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 src/config/ConfigData.hxx create mode 100644 src/config/Data.hxx (limited to 'src') diff --git a/src/config/ConfigData.hxx b/src/config/ConfigData.hxx deleted file mode 100644 index a79836324..000000000 --- a/src/config/ConfigData.hxx +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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_DATA_HXX -#define MPD_CONFIG_DATA_HXX - -#include "ConfigOption.hxx" - -#include - -struct config_param; - -struct ConfigData { - std::array params; -}; - -#endif diff --git a/src/config/ConfigFile.cxx b/src/config/ConfigFile.cxx index da4613010..75a782bfe 100644 --- a/src/config/ConfigFile.cxx +++ b/src/config/ConfigFile.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "ConfigFile.hxx" -#include "ConfigData.hxx" +#include "Data.hxx" #include "Param.hxx" #include "ConfigTemplates.hxx" #include "util/Tokenizer.hxx" diff --git a/src/config/ConfigGlobal.cxx b/src/config/ConfigGlobal.cxx index 8efa2129d..322c800da 100644 --- a/src/config/ConfigGlobal.cxx +++ b/src/config/ConfigGlobal.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "ConfigGlobal.hxx" #include "ConfigParser.hxx" -#include "ConfigData.hxx" +#include "Data.hxx" #include "Param.hxx" #include "ConfigFile.hxx" #include "ConfigPath.hxx" diff --git a/src/config/Data.hxx b/src/config/Data.hxx new file mode 100644 index 000000000..a79836324 --- /dev/null +++ b/src/config/Data.hxx @@ -0,0 +1,33 @@ +/* + * 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_DATA_HXX +#define MPD_CONFIG_DATA_HXX + +#include "ConfigOption.hxx" + +#include + +struct config_param; + +struct ConfigData { + std::array params; +}; + +#endif -- cgit v1.2.3