From 26d92c80ed1c1cca8b3cb1c9793c09a330c25623 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 5 Sep 2013 08:47:10 +0200 Subject: conf.h: remove obsolete header Use only ConfigData.hxx in plugin sources to reduce header dependencies. --- test/DumpDatabase.cxx | 3 ++- test/dump_playlist.cxx | 2 +- test/dump_rva2.cxx | 2 +- test/dump_text_file.cxx | 2 +- test/read_conf.cxx | 2 +- test/run_convert.cxx | 2 +- test/run_encoder.cxx | 2 +- test/run_filter.cxx | 3 ++- test/run_input.cxx | 2 +- test/run_output.cxx | 4 +++- test/test_vorbis_encoder.cxx | 2 +- test/visit_archive.cxx | 2 +- 12 files changed, 16 insertions(+), 12 deletions(-) (limited to 'test') diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx index cf86d91ff..03ea37ee6 100644 --- a/test/DumpDatabase.cxx +++ b/test/DumpDatabase.cxx @@ -24,7 +24,8 @@ #include "Directory.hxx" #include "Song.hxx" #include "PlaylistVector.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigData.hxx" #include "Tag.hxx" #include "fs/Path.hxx" #include "util/Error.hxx" diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx index 10cecf73d..c42a2c52b 100644 --- a/test/dump_playlist.cxx +++ b/test/dump_playlist.cxx @@ -22,7 +22,7 @@ #include "Song.hxx" #include "Directory.hxx" #include "InputStream.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "DecoderAPI.hxx" #include "DecoderList.hxx" #include "InputInit.hxx" diff --git a/test/dump_rva2.cxx b/test/dump_rva2.cxx index 2bc8e0a85..711786869 100644 --- a/test/dump_rva2.cxx +++ b/test/dump_rva2.cxx @@ -21,7 +21,7 @@ #include "tag/TagId3.hxx" #include "tag/TagRva2.hxx" #include "replay_gain_info.h" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "Tag.hxx" #include "util/Error.hxx" diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx index 11ac8b3d0..286c63c93 100644 --- a/test/dump_text_file.cxx +++ b/test/dump_text_file.cxx @@ -21,7 +21,7 @@ #include "IOThread.hxx" #include "InputInit.hxx" #include "InputStream.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "stdbin.h" #include "TextInputStream.hxx" #include "util/Error.hxx" diff --git a/test/read_conf.cxx b/test/read_conf.cxx index 55ff8c068..d5eacec67 100644 --- a/test/read_conf.cxx +++ b/test/read_conf.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "fs/Path.hxx" #include "util/Error.hxx" diff --git a/test/run_convert.cxx b/test/run_convert.cxx index 72e457338..939e279d0 100644 --- a/test/run_convert.cxx +++ b/test/run_convert.cxx @@ -27,7 +27,7 @@ #include "AudioParser.hxx" #include "AudioFormat.hxx" #include "pcm/PcmConvert.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "util/fifo_buffer.h" #include "util/Error.hxx" #include "stdbin.h" diff --git a/test/run_encoder.cxx b/test/run_encoder.cxx index 46edc9618..838ee708e 100644 --- a/test/run_encoder.cxx +++ b/test/run_encoder.cxx @@ -22,7 +22,7 @@ #include "EncoderPlugin.hxx" #include "AudioFormat.hxx" #include "AudioParser.hxx" -#include "conf.h" +#include "ConfigData.hxx" #include "util/Error.hxx" #include "stdbin.h" diff --git a/test/run_filter.cxx b/test/run_filter.cxx index 62f8dde31..085fc256b 100644 --- a/test/run_filter.cxx +++ b/test/run_filter.cxx @@ -18,7 +18,8 @@ */ #include "config.h" -#include "conf.h" +#include "ConfigData.hxx" +#include "ConfigGlobal.hxx" #include "fs/Path.hxx" #include "AudioParser.hxx" #include "AudioFormat.hxx" diff --git a/test/run_input.cxx b/test/run_input.cxx index 051c3a803..9f44276f3 100644 --- a/test/run_input.cxx +++ b/test/run_input.cxx @@ -21,7 +21,7 @@ #include "TagSave.hxx" #include "stdbin.h" #include "Tag.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "InputStream.hxx" #include "InputInit.hxx" #include "IOThread.hxx" diff --git a/test/run_output.cxx b/test/run_output.cxx index 59c1a543e..91cffbaf8 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -21,7 +21,9 @@ #include "OutputControl.hxx" #include "OutputInternal.hxx" #include "OutputPlugin.hxx" -#include "conf.h" +#include "ConfigData.hxx" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include "Idle.hxx" #include "Main.hxx" #include "event/Loop.hxx" diff --git a/test/test_vorbis_encoder.cxx b/test/test_vorbis_encoder.cxx index 3d1ac535b..676237ccb 100644 --- a/test/test_vorbis_encoder.cxx +++ b/test/test_vorbis_encoder.cxx @@ -21,7 +21,7 @@ #include "EncoderList.hxx" #include "EncoderPlugin.hxx" #include "AudioFormat.hxx" -#include "conf.h" +#include "ConfigData.hxx" #include "stdbin.h" #include "Tag.hxx" #include "util/Error.hxx" diff --git a/test/visit_archive.cxx b/test/visit_archive.cxx index b059f16f9..68dfd1988 100644 --- a/test/visit_archive.cxx +++ b/test/visit_archive.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "stdbin.h" #include "Tag.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "IOThread.hxx" #include "InputInit.hxx" #include "ArchiveList.hxx" -- cgit v1.2.3