TextFile: move to fs subsystem

12 files changed, 11 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index c916f9b4d..2b41df1d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -200,7 +200,6 @@ src_mpd_SOURCES = \
 	src/TagPrint.cxx src/TagPrint.hxx \
 	src/TagSave.cxx src/TagSave.hxx \
 	src/TagFile.cxx src/TagFile.hxx \
-	src/TextFile.cxx src/TextFile.hxx \
 	src/TextInputStream.cxx \
 	src/Volume.cxx src/Volume.hxx \
 	src/SongFilter.cxx src/SongFilter.hxx \
@@ -379,6 +378,7 @@ 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/DirectoryReader.hxx
 
@@ -1163,8 +1163,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
 	src/DatabaseLock.cxx src/DatabaseSave.cxx \
 	src/Song.cxx src/SongSave.cxx src/SongSort.cxx \
 	src/TagSave.cxx \
-	src/SongFilter.cxx \
-	src/TextFile.cxx
+	src/SongFilter.cxx
 
 test_run_input_LDADD = \
 	$(INPUT_LIBS) \
diff --git a/src/DatabaseSave.cxx b/src/DatabaseSave.cxx
index a9ec281ce..67357a9a9 100644
--- a/src/DatabaseSave.cxx
+++ b/src/DatabaseSave.cxx
@@ -23,7 +23,7 @@
 #include "DatabaseError.hxx"
 #include "Directory.hxx"
 #include "DirectorySave.hxx"
-#include "TextFile.hxx"
+#include "fs/TextFile.hxx"
 #include "tag/Tag.hxx"
 #include "tag/TagSettings.h"
 #include "fs/Charset.hxx"
diff --git a/src/DirectorySave.cxx b/src/DirectorySave.cxx
index 507f5ba47..709184289 100644
--- a/src/DirectorySave.cxx
+++ b/src/DirectorySave.cxx
@@ -23,7 +23,7 @@
 #include "Song.hxx"
 #include "SongSave.hxx"
 #include "PlaylistDatabase.hxx"
-#include "TextFile.hxx"
+#include "fs/TextFile.hxx"
 #include "util/StringUtil.hxx"
 #include "util/NumberParser.hxx"
 #include "util/Error.hxx"
diff --git a/src/PlaylistDatabase.cxx b/src/PlaylistDatabase.cxx
index a6d15e755..e6cdb922b 100644
--- a/src/PlaylistDatabase.cxx
+++ b/src/PlaylistDatabase.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "PlaylistDatabase.hxx"
 #include "PlaylistVector.hxx"
-#include "TextFile.hxx"
+#include "fs/TextFile.hxx"
 #include "util/StringUtil.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index c3209db0a..3f9845166 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -26,7 +26,7 @@
 #include "DatabaseGlue.hxx"
 #include "Song.hxx"
 #include "Mapper.hxx"
-#include "TextFile.hxx"
+#include "fs/TextFile.hxx"
 #include "ConfigGlobal.hxx"
 #include "ConfigOption.hxx"
 #include "ConfigDefaults.hxx"
diff --git a/src/PlaylistState.cxx b/src/PlaylistState.cxx
index 83f4b1143..bb776dce7 100644
--- a/src/PlaylistState.cxx
+++ b/src/PlaylistState.cxx
@@ -27,7 +27,7 @@
 #include "PlaylistError.hxx"
 #include "Playlist.hxx"
 #include "QueueSave.hxx"
-#include "TextFile.hxx"
+#include "fs/TextFile.hxx"
 #include "PlayerControl.hxx"
 #include "ConfigGlobal.hxx"
 #include "ConfigOption.hxx"
diff --git a/src/QueueSave.cxx b/src/QueueSave.cxx
index 829a91de5..f3fc7c6d1 100644
--- a/src/QueueSave.cxx
+++ b/src/QueueSave.cxx
@@ -25,7 +25,7 @@
 #include "SongSave.hxx"
 #include "DatabasePlugin.hxx"
 #include "DatabaseGlue.hxx"
-#include "TextFile.hxx"
+#include "fs/TextFile.hxx"
 #include "util/StringUtil.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
diff --git a/src/SongSave.cxx b/src/SongSave.cxx
index c4acccc87..9682bf650 100644
--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@@ -21,7 +21,7 @@
 #include "SongSave.hxx"
 #include "Song.hxx"
 #include "TagSave.hxx"
-#include "TextFile.hxx"
+#include "fs/TextFile.hxx"
 #include "tag/Tag.hxx"
 #include "tag/TagBuilder.hxx"
 #include "util/StringUtil.hxx"
diff --git a/src/StateFile.cxx b/src/StateFile.cxx
index e2e72c8ce..7ca8b8946 100644
--- a/src/StateFile.cxx
+++ b/src/StateFile.cxx
@@ -21,7 +21,7 @@
 #include "StateFile.hxx"
 #include "OutputState.hxx"
 #include "PlaylistState.hxx"
-#include "TextFile.hxx"
+#include "fs/TextFile.hxx"
 #include "Partition.hxx"
 #include "Volume.hxx"
 
diff --git a/src/db/SimpleDatabasePlugin.cxx b/src/db/SimpleDatabasePlugin.cxx
index d0075ebb4..7fc66ed67 100644
--- a/src/db/SimpleDatabasePlugin.cxx
+++ b/src/db/SimpleDatabasePlugin.cxx
@@ -26,7 +26,7 @@
 #include "DatabaseSave.hxx"
 #include "DatabaseLock.hxx"
 #include "DatabaseError.hxx"
-#include "TextFile.hxx"
+#include "fs/TextFile.hxx"
 #include "ConfigData.hxx"
 #include "fs/FileSystem.hxx"
 #include "util/Error.hxx"
diff --git a/src/TextFile.cxx b/src/fs/TextFile.cxx
index 4a64ee963..4a64ee963 100644
--- a/src/TextFile.cxx
+++ b/src/fs/TextFile.cxx
diff --git a/src/TextFile.hxx b/src/fs/TextFile.hxx
index 9d8608711..9d8608711 100644
--- a/src/TextFile.hxx
+++ b/src/fs/TextFile.hxx