From aafff8fd5c60476702466ba06281236222455167 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 7 Aug 2014 18:35:57 +0200 Subject: [PATCH] fs/output, fs/TextFile: move to fs/io/ --- Makefile.am | 12 ++++++------ src/PlaylistDatabase.cxx | 4 ++-- src/PlaylistFile.cxx | 2 +- src/SongSave.cxx | 4 ++-- src/StateFile.cxx | 6 +++--- src/TagSave.cxx | 2 +- src/db/plugins/simple/DatabaseSave.cxx | 4 ++-- src/db/plugins/simple/DirectorySave.cxx | 4 ++-- src/db/plugins/simple/SimpleDatabasePlugin.cxx | 6 +++--- src/fs/StandardDirectory.cxx | 2 +- src/fs/{output => io}/BufferedOutputStream.cxx | 0 src/fs/{output => io}/BufferedOutputStream.hxx | 0 src/fs/{output => io}/FileOutputStream.cxx | 0 src/fs/{output => io}/FileOutputStream.hxx | 0 src/fs/{output => io}/GzipOutputStream.cxx | 0 src/fs/{output => io}/GzipOutputStream.hxx | 0 src/fs/{output => io}/OutputStream.hxx | 0 src/fs/{output => io}/StdioOutputStream.hxx | 0 src/fs/{ => io}/TextFile.cxx | 0 src/fs/{ => io}/TextFile.hxx | 0 src/mixer/Volume.cxx | 2 +- src/output/OutputState.cxx | 2 +- src/queue/PlaylistState.cxx | 4 ++-- src/queue/QueueSave.cxx | 4 ++-- test/dump_playlist.cxx | 4 ++-- test/run_gzip.cxx | 4 ++-- test/run_input.cxx | 4 ++-- 27 files changed, 35 insertions(+), 35 deletions(-) rename src/fs/{output => io}/BufferedOutputStream.cxx (100%) rename src/fs/{output => io}/BufferedOutputStream.hxx (100%) rename src/fs/{output => io}/FileOutputStream.cxx (100%) rename src/fs/{output => io}/FileOutputStream.hxx (100%) rename src/fs/{output => io}/GzipOutputStream.cxx (100%) rename src/fs/{output => io}/GzipOutputStream.hxx (100%) rename src/fs/{output => io}/OutputStream.hxx (100%) rename src/fs/{output => io}/StdioOutputStream.hxx (100%) rename src/fs/{ => io}/TextFile.cxx (100%) rename src/fs/{ => io}/TextFile.hxx (100%) diff --git a/Makefile.am b/Makefile.am index 11329223f..0a4288280 100644 --- a/Makefile.am +++ b/Makefile.am @@ -506,10 +506,11 @@ endif FS_LIBS = libfs.a libfs_a_SOURCES = \ - src/fs/output/OutputStream.hxx \ - src/fs/output/StdoutOutputStream.hxx \ - src/fs/output/FileOutputStream.cxx src/fs/output/FileOutputStream.hxx \ - src/fs/output/BufferedOutputStream.cxx src/fs/output/BufferedOutputStream.hxx \ + src/fs/io/TextFile.cxx src/fs/io/TextFile.hxx \ + src/fs/io/OutputStream.hxx \ + src/fs/io/StdoutOutputStream.hxx \ + src/fs/io/FileOutputStream.cxx src/fs/io/FileOutputStream.hxx \ + src/fs/io/BufferedOutputStream.cxx src/fs/io/BufferedOutputStream.hxx \ src/fs/Domain.cxx src/fs/Domain.hxx \ src/fs/Limits.hxx \ src/fs/Traits.cxx src/fs/Traits.hxx \ @@ -517,7 +518,6 @@ libfs_a_SOURCES = \ src/fs/Charset.cxx src/fs/Charset.hxx \ src/fs/Path.cxx src/fs/Path.hxx \ src/fs/AllocatedPath.cxx src/fs/AllocatedPath.hxx \ - src/fs/TextFile.cxx src/fs/TextFile.hxx \ src/fs/FileSystem.cxx src/fs/FileSystem.hxx \ src/fs/StandardDirectory.cxx src/fs/StandardDirectory.hxx \ src/fs/CheckFile.cxx src/fs/CheckFile.hxx \ @@ -526,7 +526,7 @@ libfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) if HAVE_ZLIB libfs_a_SOURCES += \ - src/fs/output/GzipOutputStream.cxx src/fs/output/GzipOutputStream.hxx + src/fs/io/GzipOutputStream.cxx src/fs/io/GzipOutputStream.hxx FS_LIBS += $(ZLIB_LIBS) endif diff --git a/src/PlaylistDatabase.cxx b/src/PlaylistDatabase.cxx index e4fd3ff28..3421ecb02 100644 --- a/src/PlaylistDatabase.cxx +++ b/src/PlaylistDatabase.cxx @@ -20,8 +20,8 @@ #include "config.h" #include "PlaylistDatabase.hxx" #include "db/PlaylistVector.hxx" -#include "fs/TextFile.hxx" -#include "fs/output/BufferedOutputStream.hxx" +#include "fs/io/TextFile.hxx" +#include "fs/io/BufferedOutputStream.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx index f5ac2735f..2fb28aadf 100644 --- a/src/PlaylistFile.cxx +++ b/src/PlaylistFile.cxx @@ -25,7 +25,7 @@ #include "DetachedSong.hxx" #include "SongLoader.hxx" #include "Mapper.hxx" -#include "fs/TextFile.hxx" +#include "fs/io/TextFile.hxx" #include "config/ConfigGlobal.hxx" #include "config/ConfigOption.hxx" #include "config/ConfigDefaults.hxx" diff --git a/src/SongSave.cxx b/src/SongSave.cxx index bf6194a4f..93613e938 100644 --- a/src/SongSave.cxx +++ b/src/SongSave.cxx @@ -22,8 +22,8 @@ #include "db/plugins/simple/Song.hxx" #include "DetachedSong.hxx" #include "TagSave.hxx" -#include "fs/TextFile.hxx" -#include "fs/output/BufferedOutputStream.hxx" +#include "fs/io/TextFile.hxx" +#include "fs/io/BufferedOutputStream.hxx" #include "tag/Tag.hxx" #include "tag/TagBuilder.hxx" #include "util/StringUtil.hxx" diff --git a/src/StateFile.cxx b/src/StateFile.cxx index e8df1ec0a..408b19426 100644 --- a/src/StateFile.cxx +++ b/src/StateFile.cxx @@ -21,9 +21,9 @@ #include "StateFile.hxx" #include "output/OutputState.hxx" #include "queue/PlaylistState.hxx" -#include "fs/TextFile.hxx" -#include "fs/output/FileOutputStream.hxx" -#include "fs/output/BufferedOutputStream.hxx" +#include "fs/io/TextFile.hxx" +#include "fs/io/FileOutputStream.hxx" +#include "fs/io/BufferedOutputStream.hxx" #include "Partition.hxx" #include "Instance.hxx" #include "mixer/Volume.hxx" diff --git a/src/TagSave.cxx b/src/TagSave.cxx index 6ec562ec5..c47d778d3 100644 --- a/src/TagSave.cxx +++ b/src/TagSave.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "TagSave.hxx" #include "tag/Tag.hxx" -#include "fs/output/BufferedOutputStream.hxx" +#include "fs/io/BufferedOutputStream.hxx" #define SONG_TIME "Time: " diff --git a/src/db/plugins/simple/DatabaseSave.cxx b/src/db/plugins/simple/DatabaseSave.cxx index e10d79d60..c766843b6 100644 --- a/src/db/plugins/simple/DatabaseSave.cxx +++ b/src/db/plugins/simple/DatabaseSave.cxx @@ -23,8 +23,8 @@ #include "db/DatabaseError.hxx" #include "Directory.hxx" #include "DirectorySave.hxx" -#include "fs/output/BufferedOutputStream.hxx" -#include "fs/TextFile.hxx" +#include "fs/io/BufferedOutputStream.hxx" +#include "fs/io/TextFile.hxx" #include "tag/Tag.hxx" #include "tag/TagSettings.h" #include "fs/Charset.hxx" diff --git a/src/db/plugins/simple/DirectorySave.cxx b/src/db/plugins/simple/DirectorySave.cxx index 7e7cbc3ba..e1650cbe8 100644 --- a/src/db/plugins/simple/DirectorySave.cxx +++ b/src/db/plugins/simple/DirectorySave.cxx @@ -24,8 +24,8 @@ #include "SongSave.hxx" #include "DetachedSong.hxx" #include "PlaylistDatabase.hxx" -#include "fs/TextFile.hxx" -#include "fs/output/BufferedOutputStream.hxx" +#include "fs/io/TextFile.hxx" +#include "fs/io/BufferedOutputStream.hxx" #include "util/StringUtil.hxx" #include "util/NumberParser.hxx" #include "util/Error.hxx" diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.cxx b/src/db/plugins/simple/SimpleDatabasePlugin.cxx index fe712b90b..ae34a523f 100644 --- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx +++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx @@ -31,9 +31,9 @@ #include "DatabaseSave.hxx" #include "db/DatabaseLock.hxx" #include "db/DatabaseError.hxx" -#include "fs/TextFile.hxx" -#include "fs/output/BufferedOutputStream.hxx" -#include "fs/output/FileOutputStream.hxx" +#include "fs/io/TextFile.hxx" +#include "fs/io/BufferedOutputStream.hxx" +#include "fs/io/FileOutputStream.hxx" #include "config/ConfigData.hxx" #include "fs/FileSystem.hxx" #include "util/CharUtil.hxx" diff --git a/src/fs/StandardDirectory.cxx b/src/fs/StandardDirectory.cxx index ea91399d1..7a8666501 100644 --- a/src/fs/StandardDirectory.cxx +++ b/src/fs/StandardDirectory.cxx @@ -41,7 +41,7 @@ #ifdef USE_XDG #include "util/StringUtil.hxx" -#include "TextFile.hxx" +#include "io/TextFile.hxx" #include #include #endif diff --git a/src/fs/output/BufferedOutputStream.cxx b/src/fs/io/BufferedOutputStream.cxx similarity index 100% rename from src/fs/output/BufferedOutputStream.cxx rename to src/fs/io/BufferedOutputStream.cxx diff --git a/src/fs/output/BufferedOutputStream.hxx b/src/fs/io/BufferedOutputStream.hxx similarity index 100% rename from src/fs/output/BufferedOutputStream.hxx rename to src/fs/io/BufferedOutputStream.hxx diff --git a/src/fs/output/FileOutputStream.cxx b/src/fs/io/FileOutputStream.cxx similarity index 100% rename from src/fs/output/FileOutputStream.cxx rename to src/fs/io/FileOutputStream.cxx diff --git a/src/fs/output/FileOutputStream.hxx b/src/fs/io/FileOutputStream.hxx similarity index 100% rename from src/fs/output/FileOutputStream.hxx rename to src/fs/io/FileOutputStream.hxx diff --git a/src/fs/output/GzipOutputStream.cxx b/src/fs/io/GzipOutputStream.cxx similarity index 100% rename from src/fs/output/GzipOutputStream.cxx rename to src/fs/io/GzipOutputStream.cxx diff --git a/src/fs/output/GzipOutputStream.hxx b/src/fs/io/GzipOutputStream.hxx similarity index 100% rename from src/fs/output/GzipOutputStream.hxx rename to src/fs/io/GzipOutputStream.hxx diff --git a/src/fs/output/OutputStream.hxx b/src/fs/io/OutputStream.hxx similarity index 100% rename from src/fs/output/OutputStream.hxx rename to src/fs/io/OutputStream.hxx diff --git a/src/fs/output/StdioOutputStream.hxx b/src/fs/io/StdioOutputStream.hxx similarity index 100% rename from src/fs/output/StdioOutputStream.hxx rename to src/fs/io/StdioOutputStream.hxx diff --git a/src/fs/TextFile.cxx b/src/fs/io/TextFile.cxx similarity index 100% rename from src/fs/TextFile.cxx rename to src/fs/io/TextFile.cxx diff --git a/src/fs/TextFile.hxx b/src/fs/io/TextFile.hxx similarity index 100% rename from src/fs/TextFile.hxx rename to src/fs/io/TextFile.hxx diff --git a/src/mixer/Volume.cxx b/src/mixer/Volume.cxx index 86ebbf422..abb01fb40 100644 --- a/src/mixer/Volume.cxx +++ b/src/mixer/Volume.cxx @@ -24,7 +24,7 @@ #include "util/StringUtil.hxx" #include "util/Domain.hxx" #include "system/PeriodClock.hxx" -#include "fs/output/BufferedOutputStream.hxx" +#include "fs/io/BufferedOutputStream.hxx" #include "Log.hxx" #include diff --git a/src/output/OutputState.cxx b/src/output/OutputState.cxx index 0c1424404..fb01b1c65 100644 --- a/src/output/OutputState.cxx +++ b/src/output/OutputState.cxx @@ -28,7 +28,7 @@ #include "Internal.hxx" #include "Domain.hxx" #include "Log.hxx" -#include "fs/output/BufferedOutputStream.hxx" +#include "fs/io/BufferedOutputStream.hxx" #include "util/StringUtil.hxx" #include diff --git a/src/queue/PlaylistState.cxx b/src/queue/PlaylistState.cxx index 56adb2a9b..18d8c9dc5 100644 --- a/src/queue/PlaylistState.cxx +++ b/src/queue/PlaylistState.cxx @@ -27,8 +27,8 @@ #include "PlaylistError.hxx" #include "Playlist.hxx" #include "queue/QueueSave.hxx" -#include "fs/TextFile.hxx" -#include "fs/output/BufferedOutputStream.hxx" +#include "fs/io/TextFile.hxx" +#include "fs/io/BufferedOutputStream.hxx" #include "PlayerControl.hxx" #include "config/ConfigGlobal.hxx" #include "config/ConfigOption.hxx" diff --git a/src/queue/QueueSave.cxx b/src/queue/QueueSave.cxx index eca906421..6d871ac19 100644 --- a/src/queue/QueueSave.cxx +++ b/src/queue/QueueSave.cxx @@ -25,8 +25,8 @@ #include "SongSave.hxx" #include "SongLoader.hxx" #include "playlist/PlaylistSong.hxx" -#include "fs/TextFile.hxx" -#include "fs/output/BufferedOutputStream.hxx" +#include "fs/io/TextFile.hxx" +#include "fs/io/BufferedOutputStream.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" #include "fs/Traits.hxx" diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx index 1d497535c..1262979e9 100644 --- a/test/dump_playlist.cxx +++ b/test/dump_playlist.cxx @@ -29,8 +29,8 @@ #include "playlist/PlaylistRegistry.hxx" #include "playlist/PlaylistPlugin.hxx" #include "fs/Path.hxx" -#include "fs/output/BufferedOutputStream.hxx" -#include "fs/output/StdioOutputStream.hxx" +#include "fs/io/BufferedOutputStream.hxx" +#include "fs/io/StdioOutputStream.hxx" #include "util/Error.hxx" #include "thread/Cond.hxx" #include "Log.hxx" diff --git a/test/run_gzip.cxx b/test/run_gzip.cxx index 11382a9fc..c52b32ac7 100644 --- a/test/run_gzip.cxx +++ b/test/run_gzip.cxx @@ -18,8 +18,8 @@ */ #include "config.h" -#include "fs/output/GzipOutputStream.hxx" -#include "fs/output/StdioOutputStream.hxx" +#include "fs/io/GzipOutputStream.hxx" +#include "fs/io/StdioOutputStream.hxx" #include "util/Error.hxx" #include diff --git a/test/run_input.cxx b/test/run_input.cxx index f53711cc9..1d8cf3a28 100644 --- a/test/run_input.cxx +++ b/test/run_input.cxx @@ -28,8 +28,8 @@ #include "util/Error.hxx" #include "thread/Cond.hxx" #include "Log.hxx" -#include "fs/output/BufferedOutputStream.hxx" -#include "fs/output/StdioOutputStream.hxx" +#include "fs/io/BufferedOutputStream.hxx" +#include "fs/io/StdioOutputStream.hxx" #ifdef ENABLE_ARCHIVE #include "archive/ArchiveList.hxx"