Path: move to fs subdirectory

22 files changed, 24 insertions, 24 deletions

diff --git a/Makefile.am b/Makefile.am
index 26b678526..adcc21e15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,6 +151,7 @@ src_mpd_SOURCES = \
 	src/thread/PosixCond.hxx \
 	src/thread/WindowsCond.hxx \
 	src/thread/GLibCond.hxx \
+	src/fs/Path.cxx src/fs/Path.hxx \
 	src/fs/FileSystem.cxx src/fs/FileSystem.hxx \
 	src/fs/DirectoryReader.hxx \
 	src/glib_socket.h \
@@ -239,7 +240,6 @@ src_mpd_SOURCES = \
 	src/MusicBuffer.cxx src/MusicBuffer.hxx \
 	src/MusicPipe.cxx src/MusicPipe.hxx \
 	src/MusicChunk.cxx src/MusicChunk.hxx \
-	src/Path.cxx src/Path.hxx \
 	src/Mapper.cxx src/Mapper.hxx \
 	src/page.c \
 	src/Partition.hxx \
@@ -1060,7 +1060,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
 	src/DatabaseLock.cxx src/DatabaseSave.cxx \
 	src/Song.cxx src/song_sort.c src/SongSave.cxx \
 	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
-	src/Path.cxx \
+	src/fs/Path.cxx \
 	src/SongFilter.cxx \
 	src/TextFile.cxx \
 	src/ConfigFile.cxx src/tokenizer.c src/utils.c src/string_util.c
diff --git a/src/ConfigFile.cxx b/src/ConfigFile.cxx
index ce71b21d2..614bb4f91 100644
--- a/src/ConfigFile.cxx
+++ b/src/ConfigFile.cxx
@@ -26,7 +26,7 @@ extern "C" {
 #include "tokenizer.h"
 }
 
-#include "Path.hxx"
+#include "fs/Path.hxx"
 #include "mpd_error.h"
 
 #include <glib.h>
diff --git a/src/DatabaseSave.cxx b/src/DatabaseSave.cxx
index 029189ae5..2c46f4a5b 100644
--- a/src/DatabaseSave.cxx
+++ b/src/DatabaseSave.cxx
@@ -26,7 +26,7 @@
 #include "TextFile.hxx"
 #include "TagInternal.hxx"
 #include "tag.h"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 #include <glib.h>
 
diff --git a/src/DecoderThread.cxx b/src/DecoderThread.cxx
index 4c493304b..b821c6d7a 100644
--- a/src/DecoderThread.cxx
+++ b/src/DecoderThread.cxx
@@ -26,7 +26,7 @@
 #include "song.h"
 #include "mpd_error.h"
 #include "Mapper.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 #include "decoder_api.h"
 #include "tag.h"
 #include "input_stream.h"
diff --git a/src/ExcludeList.cxx b/src/ExcludeList.cxx
index 3f929b93c..69a04d5a8 100644
--- a/src/ExcludeList.cxx
+++ b/src/ExcludeList.cxx
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include "ExcludeList.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/InotifyUpdate.cxx b/src/InotifyUpdate.cxx
index a1c3e0393..bd018f5a3 100644
--- a/src/InotifyUpdate.cxx
+++ b/src/InotifyUpdate.cxx
@@ -23,7 +23,7 @@
 #include "InotifyQueue.hxx"
 #include "Mapper.hxx"
 #include "Main.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 #include <glib.h>
 #include <assert.h>
diff --git a/src/Main.cxx b/src/Main.cxx
index 6d4fc82d2..44adf2e28 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -47,7 +47,7 @@
 #include "InputInit.hxx"
 #include "event/Loop.hxx"
 #include "IOThread.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 extern "C" {
 #include "daemon.h"
diff --git a/src/Mapper.cxx b/src/Mapper.cxx
index 09fa190f3..5a28874de 100644
--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -25,7 +25,7 @@
 #include "Mapper.hxx"
 #include "Directory.hxx"
 #include "song.h"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 #include <glib.h>
 
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index ea81540cf..34f04df77 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -30,7 +30,7 @@
 #include "TextFile.hxx"
 #include "conf.h"
 #include "Idle.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 extern "C" {
 #include "uri.h"
diff --git a/src/PlaylistMapper.cxx b/src/PlaylistMapper.cxx
index e6b8ee439..96106a4cf 100644
--- a/src/PlaylistMapper.cxx
+++ b/src/PlaylistMapper.cxx
@@ -21,7 +21,7 @@
 #include "PlaylistMapper.hxx"
 #include "PlaylistFile.hxx"
 #include "Mapper.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 extern "C" {
 #include "playlist_list.h"
diff --git a/src/PlaylistSave.cxx b/src/PlaylistSave.cxx
index 89feebbde..e5b2a8f69 100644
--- a/src/PlaylistSave.cxx
+++ b/src/PlaylistSave.cxx
@@ -24,7 +24,7 @@
 #include "song.h"
 #include "Mapper.hxx"
 #include "Idle.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 extern "C" {
 #include "uri.h"
diff --git a/src/PlaylistSong.cxx b/src/PlaylistSong.cxx
index 0d60c1413..6c59600f6 100644
--- a/src/PlaylistSong.cxx
+++ b/src/PlaylistSong.cxx
@@ -24,7 +24,7 @@
 #include "DatabaseGlue.hxx"
 #include "ls.hxx"
 #include "tag.h"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 extern "C" {
 #include "song.h"
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index ed7293f14..120aaf537 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -26,7 +26,7 @@ extern "C" {
 
 #include "Directory.hxx"
 #include "Mapper.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 #include "tag.h"
 #include "input_stream.h"
 
diff --git a/src/StateFile.hxx b/src/StateFile.hxx
index 72d71e105..bb1c382f4 100644
--- a/src/StateFile.hxx
+++ b/src/StateFile.hxx
@@ -21,7 +21,7 @@
 #define MPD_STATE_FILE_HXX
 
 #include "event/TimeoutMonitor.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 #include "gcc.h"
 
 #include <string>
diff --git a/src/TextFile.hxx b/src/TextFile.hxx
index b24889f61..c4822aaf8 100644
--- a/src/TextFile.hxx
+++ b/src/TextFile.hxx
@@ -21,7 +21,7 @@
 #define MPD_TEXT_FILE_HXX
 
 #include "gcc.h"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 #include <glib.h>
 
diff --git a/src/UpdateArchive.cxx b/src/UpdateArchive.cxx
index c45e1b733..0765b1ba7 100644
--- a/src/UpdateArchive.cxx
+++ b/src/UpdateArchive.cxx
@@ -24,7 +24,7 @@
 #include "Directory.hxx"
 #include "song.h"
 #include "Mapper.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 extern "C" {
 #include "archive_list.h"
diff --git a/src/UpdateContainer.cxx b/src/UpdateContainer.cxx
index d59fa96c0..f24a1848a 100644
--- a/src/UpdateContainer.cxx
+++ b/src/UpdateContainer.cxx
@@ -26,7 +26,7 @@
 #include "song.h"
 #include "decoder_plugin.h"
 #include "Mapper.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 extern "C" {
 #include "tag_handler.h"
diff --git a/src/UpdateIO.cxx b/src/UpdateIO.cxx
index cbf05b6fc..eca5688a1 100644
--- a/src/UpdateIO.cxx
+++ b/src/UpdateIO.cxx
@@ -21,7 +21,7 @@
 #include "UpdateIO.hxx"
 #include "Directory.hxx"
 #include "Mapper.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 #include "glib_compat.h"
 
 #include <glib.h>
diff --git a/src/UpdateWalk.cxx b/src/UpdateWalk.cxx
index d0e9281a7..fb6618111 100644
--- a/src/UpdateWalk.cxx
+++ b/src/UpdateWalk.cxx
@@ -31,7 +31,7 @@
 #include "Mapper.hxx"
 #include "ExcludeList.hxx"
 #include "conf.h"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 
 extern "C" {
 #include "uri.h"
diff --git a/src/db/SimpleDatabasePlugin.hxx b/src/db/SimpleDatabasePlugin.hxx
index 3549aa98c..888f9c33e 100644
--- a/src/db/SimpleDatabasePlugin.hxx
+++ b/src/db/SimpleDatabasePlugin.hxx
@@ -21,7 +21,7 @@
 #define MPD_SIMPLE_DATABASE_PLUGIN_HXX
 
 #include "DatabasePlugin.hxx"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 #include "gcc.h"
 
 #include <cassert>
diff --git a/src/Path.cxx b/src/fs/Path.cxx
index ab8a4e3cc..80b41cbaa 100644
--- a/src/Path.cxx
+++ b/src/fs/Path.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "Path.hxx"
+#include "fs/Path.hxx"
 #include "conf.h"
 #include "mpd_error.h"
 #include "gcc.h"
diff --git a/src/Path.hxx b/src/fs/Path.hxx
index 5c76e4b87..24f1d5e19 100644
--- a/src/Path.hxx
+++ b/src/fs/Path.hxx
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_PATH_HXX
-#define MPD_PATH_HXX
+#ifndef MPD_FS_PATH_HXX
+#define MPD_FS_PATH_HXX
 
 #include "check.h"
 #include "gcc.h"