config/Config*: rename files, drop "Config" prefix

2018-07-16 19:50:07 +02:00 · 2018-07-16 19:50:07 +02:00 · 816603fd9a
parent bf5f12a51f
commit 816603fd9a
65 changed files with 98 additions and 98 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1000,17 +1000,17 @@ libbasic_a_SOURCES = \
 # configuration library

 libconf_a_SOURCES = \
-	src/config/ConfigDefaults.hxx \
-	src/config/ConfigPath.cxx src/config/ConfigPath.hxx \
+	src/config/Defaults.hxx \
+	src/config/Path.cxx src/config/Path.hxx \
 	src/config/Data.cxx src/config/Data.hxx \
 	src/config/Block.cxx src/config/Block.hxx \
 	src/config/Param.cxx src/config/Param.hxx \
-	src/config/ConfigParser.cxx src/config/ConfigParser.hxx \
-	src/config/ConfigGlobal.cxx src/config/ConfigGlobal.hxx \
-	src/config/ConfigFile.cxx src/config/ConfigFile.hxx \
-	src/config/ConfigTemplates.cxx src/config/ConfigTemplates.hxx \
-	src/config/ConfigError.cxx src/config/ConfigError.hxx \
-	src/config/ConfigOption.hxx
+	src/config/Parser.cxx src/config/Parser.hxx \
+	src/config/Global.cxx src/config/Global.hxx \
+	src/config/File.cxx src/config/File.hxx \
+	src/config/Templates.cxx src/config/Templates.hxx \
+	src/config/Domain.cxx src/config/Domain.hxx \
+	src/config/Option.hxx

 # tag plugins

--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@ -22,7 +22,7 @@
 #include "ls.hxx"
 #include "LogInit.hxx"
 #include "Log.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "decoder/DecoderList.hxx"
 #include "decoder/DecoderPlugin.hxx"
 #include "output/Registry.hxx"
--- a/src/Listen.cxx
+++ b/src/Listen.cxx
@ -21,8 +21,8 @@
 #include "Listen.hxx"
 #include "client/Listener.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "system/Error.hxx"
 #include "util/RuntimeError.hxx"
 #include "fs/AllocatedPath.hxx"
--- a/src/LogInit.cxx
+++ b/src/LogInit.cxx
@ -22,8 +22,8 @@
 #include "LogBackend.hxx"
 #include "Log.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
 #include "util/Domain.hxx"
--- a/src/Main.cxx
+++ b/src/Main.cxx
@ -52,11 +52,11 @@
 #include "thread/Slack.hxx"
 #include "net/Init.hxx"
 #include "lib/icu/Init.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigDefaults.hxx"
-#include "config/ConfigOption.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Defaults.hxx"
+#include "config/Option.hxx"
+#include "config/Domain.hxx"
 #include "util/RuntimeError.hxx"

 #ifdef ENABLE_DAEMON
--- a/src/Permission.cxx
+++ b/src/Permission.cxx
@ -20,8 +20,8 @@
 #include "config.h"
 #include "Permission.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "util/RuntimeError.hxx"

 #include <algorithm>
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@ -29,9 +29,9 @@
 #include "fs/io/TextFile.hxx"
 #include "fs/io/FileOutputStream.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
-#include "config/ConfigDefaults.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
+#include "config/Defaults.hxx"
 #include "Idle.hxx"
 #include "fs/Limits.hxx"
 #include "fs/AllocatedPath.hxx"
--- a/src/ReplayGainGlobal.cxx
+++ b/src/ReplayGainGlobal.cxx
@ -21,7 +21,7 @@
 #include "ReplayGainGlobal.hxx"
 #include "ReplayGainConfig.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "util/RuntimeError.hxx"

 #include <assert.h>
--- a/src/client/ClientGlobal.cxx
+++ b/src/client/ClientGlobal.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "ClientInternal.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"

 #define CLIENT_TIMEOUT_DEFAULT			(60)
 #define CLIENT_MAX_COMMAND_LIST_DEFAULT		(2048*1024)
--- a/src/config/Block.cxx
+++ b/src/config/Block.cxx
@ -19,8 +19,8 @@

 #include "config.h"
 #include "Block.hxx"
-#include "ConfigParser.hxx"
-#include "ConfigPath.hxx"
+#include "Parser.hxx"
+#include "Path.hxx"
 #include "system/FatalError.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/config/Data.hxx
+++ b/src/config/Data.hxx
@ -20,7 +20,7 @@
 #ifndef MPD_CONFIG_DATA_HXX
 #define MPD_CONFIG_DATA_HXX

-#include "ConfigOption.hxx"
+#include "Option.hxx"

 #include <array>

--- a/src/config/ConfigDefaults.hxx
+++ b/src/config/ConfigDefaults.hxx
--- a/src/config/ConfigError.cxx
+++ b/src/config/ConfigError.cxx
@ -17,7 +17,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "ConfigError.hxx"
+#include "Domain.hxx"
 #include "util/Domain.hxx"

 const Domain config_domain("config");
--- a/src/config/ConfigError.hxx
+++ b/src/config/ConfigError.hxx
@ -17,8 +17,8 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_CONFIG_ERROR_HXX
-#define MPD_CONFIG_ERROR_HXX
+#ifndef MPD_CONFIG_DOMAIN_HXX
+#define MPD_CONFIG_DOMAIN_HXX

 extern const class Domain config_domain;

--- a/src/config/ConfigFile.cxx
+++ b/src/config/ConfigFile.cxx
@ -18,11 +18,11 @@
 */

 #include "config.h"
-#include "ConfigFile.hxx"
+#include "File.hxx"
 #include "Data.hxx"
 #include "Param.hxx"
 #include "Block.hxx"
-#include "ConfigTemplates.hxx"
+#include "Templates.hxx"
 #include "util/Tokenizer.hxx"
 #include "util/StringStrip.hxx"
 #include "util/Domain.hxx"
--- a/src/config/ConfigFile.hxx
+++ b/src/config/ConfigFile.hxx
--- a/src/config/ConfigGlobal.cxx
+++ b/src/config/ConfigGlobal.cxx
@ -18,14 +18,14 @@
 */

 #include "config.h"
-#include "ConfigGlobal.hxx"
-#include "ConfigParser.hxx"
+#include "Global.hxx"
+#include "Parser.hxx"
 #include "Data.hxx"
 #include "Param.hxx"
 #include "Block.hxx"
-#include "ConfigFile.hxx"
-#include "ConfigPath.hxx"
-#include "ConfigError.hxx"
+#include "File.hxx"
+#include "Path.hxx"
+#include "Domain.hxx"
 #include "fs/Path.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "system/FatalError.hxx"
--- a/src/config/ConfigGlobal.hxx
+++ b/src/config/ConfigGlobal.hxx
@ -20,7 +20,7 @@
 #ifndef MPD_CONFIG_GLOBAL_HXX
 #define MPD_CONFIG_GLOBAL_HXX

-#include "ConfigOption.hxx"
+#include "Option.hxx"
 #include "Compiler.h"

 #include <chrono>
--- a/src/config/ConfigOption.hxx
+++ b/src/config/ConfigOption.hxx
--- a/src/config/Param.cxx
+++ b/src/config/Param.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "Param.hxx"
-#include "ConfigPath.hxx"
+#include "Path.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/RuntimeError.hxx"

--- a/src/config/ConfigParser.cxx
+++ b/src/config/ConfigParser.cxx
@ -17,7 +17,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "ConfigParser.hxx"
+#include "Parser.hxx"
 #include "util/StringUtil.hxx"

 bool
--- a/src/config/ConfigParser.hxx
+++ b/src/config/ConfigParser.hxx
--- a/src/config/ConfigPath.cxx
+++ b/src/config/ConfigPath.cxx
@ -18,13 +18,13 @@
 */

 #include "config.h"
-#include "ConfigPath.hxx"
+#include "Path.hxx"
+#include "Global.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
 #include "fs/Domain.hxx"
 #include "fs/StandardDirectory.hxx"
 #include "util/RuntimeError.hxx"
-#include "ConfigGlobal.hxx"

 #include <assert.h>
 #include <string.h>
--- a/src/config/ConfigPath.hxx
+++ b/src/config/ConfigPath.hxx
--- a/src/config/ConfigTemplates.cxx
+++ b/src/config/ConfigTemplates.cxx
@ -17,8 +17,8 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "ConfigTemplates.hxx"
-#include "ConfigOption.hxx"
+#include "Templates.hxx"
+#include "Option.hxx"
 #include "util/Macros.hxx"

 #include <string.h>
--- a/src/config/ConfigTemplates.hxx
+++ b/src/config/ConfigTemplates.hxx
--- a/src/db/Configured.cxx
+++ b/src/db/Configured.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "Configured.hxx"
 #include "DatabaseGlue.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Param.hxx"
 #include "config/Block.hxx"
 #include "fs/AllocatedPath.hxx"
--- a/src/db/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@ -30,8 +30,8 @@
 #include "storage/StorageInterface.hxx"
 #include "playlist/PlaylistRegistry.hxx"
 #include "ExcludeList.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/Traits.hxx"
 #include "fs/FileSystem.hxx"
--- a/src/decoder/DecoderList.cxx
+++ b/src/decoder/DecoderList.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "DecoderList.hxx"
 #include "DecoderPlugin.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Block.hxx"
 #include "plugins/AudiofileDecoderPlugin.hxx"
 #include "plugins/PcmDecoderPlugin.hxx"
--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/src/decoder/plugins/MadDecoderPlugin.cxx
@ -21,7 +21,7 @@
 #include "MadDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "tag/Id3Scan.hxx"
 #include "tag/Rva2.hxx"
 #include "tag/Handler.hxx"
--- a/src/encoder/plugins/FlacEncoderPlugin.cxx
+++ b/src/encoder/plugins/FlacEncoderPlugin.cxx
@ -22,7 +22,7 @@
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
 #include "pcm/PcmBuffer.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/DynamicFifoBuffer.hxx"
 #include "util/RuntimeError.hxx"

--- a/src/encoder/plugins/LameEncoderPlugin.cxx
+++ b/src/encoder/plugins/LameEncoderPlugin.cxx
@ -21,7 +21,7 @@
 #include "LameEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/NumberParser.hxx"
 #include "util/ReusableArray.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/encoder/plugins/OpusEncoderPlugin.cxx
+++ b/src/encoder/plugins/OpusEncoderPlugin.cxx
@ -21,7 +21,7 @@
 #include "OpusEncoderPlugin.hxx"
 #include "OggEncoder.hxx"
 #include "AudioFormat.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/Alloc.hxx"
 #include "system/ByteOrder.hxx"
 #include "util/StringUtil.hxx"
--- a/src/encoder/plugins/ShineEncoderPlugin.cxx
+++ b/src/encoder/plugins/ShineEncoderPlugin.cxx
@ -21,7 +21,7 @@
 #include "config.h"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/DynamicFifoBuffer.hxx"
 #include "util/RuntimeError.hxx"

--- a/src/encoder/plugins/TwolameEncoderPlugin.cxx
+++ b/src/encoder/plugins/TwolameEncoderPlugin.cxx
@ -21,7 +21,7 @@
 #include "TwolameEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/NumberParser.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/Domain.hxx"
--- a/src/encoder/plugins/VorbisEncoderPlugin.cxx
+++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx
@ -22,7 +22,7 @@
 #include "OggEncoder.hxx"
 #include "lib/xiph/VorbisComment.hxx"
 #include "AudioFormat.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/StringUtil.hxx"
 #include "util/NumberParser.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/filter/LoadChain.cxx
+++ b/src/filter/LoadChain.cxx
@ -23,9 +23,9 @@
 #include "Prepared.hxx"
 #include "plugins/ChainFilterPlugin.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigOption.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Option.hxx"
+#include "config/Global.hxx"
+#include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "util/RuntimeError.hxx"

--- a/src/filter/plugins/RouteFilterPlugin.cxx
+++ b/src/filter/plugins/RouteFilterPlugin.cxx
@ -40,7 +40,7 @@
 */

 #include "config.h"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "AudioFormat.hxx"
 #include "filter/FilterPlugin.hxx"
--- a/src/fs/CheckFile.cxx
+++ b/src/fs/CheckFile.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "CheckFile.hxx"
 #include "Log.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "FileInfo.hxx"
 #include "Path.hxx"
 #include "AllocatedPath.hxx"
--- a/src/fs/Config.cxx
+++ b/src/fs/Config.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "Config.hxx"
 #include "Charset.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"

 void
 ConfigureFS()
--- a/src/input/Init.cxx
+++ b/src/input/Init.cxx
@ -21,8 +21,8 @@
 #include "Init.hxx"
 #include "Registry.hxx"
 #include "InputPlugin.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "config/Block.hxx"
 #include "Log.hxx"
 #include "PluginUnavailable.hxx"
--- a/src/input/plugins/CdioParanoiaInputPlugin.cxx
+++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx
@ -33,7 +33,7 @@
 #include "fs/AllocatedPath.hxx"
 #include "Log.hxx"
 #include "config/Block.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"

 #include <stdio.h>
 #include <stdint.h>
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@ -31,7 +31,7 @@
 #include "../IcyInputStream.hxx"
 #include "IcyMetaDataParser.hxx"
 #include "../InputPlugin.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Block.hxx"
 #include "tag/Builder.hxx"
 #include "tag/Tag.hxx"
--- a/src/neighbor/Glue.cxx
+++ b/src/neighbor/Glue.cxx
@ -23,8 +23,8 @@
 #include "Explorer.hxx"
 #include "NeighborPlugin.hxx"
 #include "Info.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Global.hxx"
+#include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "util/RuntimeError.hxx"

--- a/src/output/Init.cxx
+++ b/src/output/Init.cxx
@ -35,8 +35,8 @@
 #include "filter/plugins/ChainFilterPlugin.hxx"
 #include "filter/plugins/VolumeFilterPlugin.hxx"
 #include "filter/plugins/NormalizeFilterPlugin.hxx"
-#include "config/ConfigError.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Domain.hxx"
+#include "config/Global.hxx"
 #include "config/Block.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/StringFormat.hxx"
--- a/src/output/MultipleOutputs.cxx
+++ b/src/output/MultipleOutputs.cxx
@ -24,8 +24,8 @@
 #include "MusicPipe.hxx"
 #include "MusicChunk.hxx"
 #include "config/Block.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "util/RuntimeError.hxx"

 #include <stdexcept>
--- a/src/output/plugins/JackOutputPlugin.cxx
+++ b/src/output/plugins/JackOutputPlugin.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "JackOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Domain.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/IterableSplitString.hxx"
--- a/src/output/plugins/RecorderOutputPlugin.cxx
+++ b/src/output/plugins/RecorderOutputPlugin.cxx
@ -24,8 +24,8 @@
 #include "encoder/ToOutputStream.hxx"
 #include "encoder/EncoderInterface.hxx"
 #include "encoder/Configured.hxx"
-#include "config/ConfigError.hxx"
-#include "config/ConfigPath.hxx"
+#include "config/Domain.hxx"
+#include "config/Path.hxx"
 #include "Log.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/io/FileOutputStream.hxx"
--- a/src/pcm/ConfiguredResampler.cxx
+++ b/src/pcm/ConfiguredResampler.cxx
@ -20,9 +20,9 @@
 #include "config.h"
 #include "ConfiguredResampler.hxx"
 #include "FallbackResampler.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
+#include "config/Domain.hxx"
 #include "config/Block.hxx"
 #include "config/Param.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/playlist/PlaylistRegistry.cxx
+++ b/src/playlist/PlaylistRegistry.cxx
@ -36,7 +36,7 @@
 #include "util/UriUtil.hxx"
 #include "util/StringUtil.hxx"
 #include "util/Macros.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Block.hxx"

 #include <assert.h>
--- a/src/queue/PlaylistState.cxx
+++ b/src/queue/PlaylistState.cxx
@ -31,8 +31,8 @@
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
 #include "player/Control.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "util/CharUtil.hxx"
 #include "util/StringAPI.hxx"
 #include "util/StringCompare.hxx"
--- a/src/storage/Configured.cxx
+++ b/src/storage/Configured.cxx
@ -22,8 +22,8 @@
 #include "Registry.hxx"
 #include "StorageInterface.hxx"
 #include "plugins/LocalStorage.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigError.hxx"
+#include "config/Global.hxx"
+#include "config/Domain.hxx"
 #include "fs/StandardDirectory.hxx"
 #include "fs/CheckFile.hxx"
 #include "util/UriUtil.hxx"
--- a/src/tag/Config.cxx
+++ b/src/tag/Config.cxx
@ -21,8 +21,8 @@
 #include "Config.hxx"
 #include "Settings.hxx"
 #include "ParseName.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "util/Alloc.hxx"
 #include "util/ASCII.hxx"
 #include "util/StringStrip.hxx"
--- a/src/zeroconf/ZeroconfGlue.cxx
+++ b/src/zeroconf/ZeroconfGlue.cxx
@ -21,8 +21,8 @@
 #include "ZeroconfGlue.hxx"
 #include "ZeroconfAvahi.hxx"
 #include "ZeroconfBonjour.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "Listen.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
--- a/test/DumpDatabase.cxx
+++ b/test/DumpDatabase.cxx
@ -26,7 +26,7 @@
 #include "db/LightDirectory.hxx"
 #include "db/LightSong.hxx"
 #include "db/PlaylistVector.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "config/Param.hxx"
 #include "config/Block.hxx"
 #include "tag/Config.hxx"
--- a/test/dump_playlist.cxx
+++ b/test/dump_playlist.cxx
@ -22,7 +22,7 @@
 #include "DetachedSong.hxx"
 #include "playlist/SongEnumerator.hxx"
 #include "input/InputStream.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "decoder/DecoderList.hxx"
 #include "input/Init.hxx"
 #include "event/Thread.hxx"
--- a/test/dump_rva2.cxx
+++ b/test/dump_rva2.cxx
@ -21,7 +21,7 @@
 #include "tag/Id3Load.hxx"
 #include "tag/Rva2.hxx"
 #include "ReplayGainInfo.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "thread/Mutex.hxx"
 #include "fs/Path.hxx"
 #include "input/InputStream.hxx"
--- a/test/dump_text_file.cxx
+++ b/test/dump_text_file.cxx
@ -22,7 +22,7 @@
 #include "input/Init.hxx"
 #include "input/InputStream.hxx"
 #include "input/TextInputStream.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "Log.hxx"

 #ifdef ENABLE_ARCHIVE
--- a/test/read_conf.cxx
+++ b/test/read_conf.cxx
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "fs/Path.hxx"
 #include "Log.hxx"

--- a/test/run_decoder.cxx
+++ b/test/run_decoder.cxx
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "event/Thread.hxx"
 #include "decoder/DecoderList.hxx"
 #include "decoder/DecoderPlugin.hxx"
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "fs/Path.hxx"
 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
--- a/test/run_input.cxx
+++ b/test/run_input.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "TagSave.hxx"
 #include "tag/Tag.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "input/InputStream.hxx"
 #include "input/Init.hxx"
 #include "input/Registry.hxx"
--- a/test/run_neighbor_explorer.cxx
+++ b/test/run_neighbor_explorer.cxx
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "neighbor/Listener.hxx"
 #include "neighbor/Info.hxx"
 #include "neighbor/Glue.hxx"
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
@ -22,8 +22,8 @@
 #include "output/Registry.hxx"
 #include "output/OutputPlugin.hxx"
 #include "config/Param.hxx"
-#include "config/ConfigGlobal.hxx"
-#include "config/ConfigOption.hxx"
+#include "config/Global.hxx"
+#include "config/Option.hxx"
 #include "config/Block.hxx"
 #include "event/Thread.hxx"
 #include "fs/Path.hxx"
--- a/test/visit_archive.cxx
+++ b/test/visit_archive.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "tag/Tag.hxx"
-#include "config/ConfigGlobal.hxx"
+#include "config/Global.hxx"
 #include "event/Thread.hxx"
 #include "input/Init.hxx"
 #include "archive/ArchiveList.hxx"