From b3611524f45c2a478f9decd6d22ecd1dbbbb64b9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 17 Oct 2013 23:23:25 +0200 Subject: fs/Path: move definitions to struct PathTraits --- src/Mapper.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/Mapper.cxx') diff --git a/src/Mapper.cxx b/src/Mapper.cxx index b89f83cd7..8a6bd2201 100644 --- a/src/Mapper.cxx +++ b/src/Mapper.cxx @@ -26,6 +26,7 @@ #include "Directory.hxx" #include "Song.hxx" #include "fs/Path.hxx" +#include "fs/Traits.hxx" #include "fs/Charset.hxx" #include "fs/FileSystem.hxx" #include "fs/DirectoryReader.hxx" @@ -147,7 +148,7 @@ map_to_relative_path(const char *path_utf8) return !music_dir_utf8.empty() && memcmp(path_utf8, music_dir_utf8.c_str(), music_dir_utf8_length) == 0 && - Path::IsSeparatorUTF8(path_utf8[music_dir_utf8_length]) + PathTraits::IsSeparatorUTF8(path_utf8[music_dir_utf8_length]) ? path_utf8 + music_dir_utf8_length + 1 : path_utf8; } @@ -231,7 +232,7 @@ map_song_fs(const Song *song) std::string map_fs_to_utf8(const char *path_fs) { - if (Path::IsSeparatorFS(path_fs[0])) { + if (PathTraits::IsSeparatorFS(path_fs[0])) { path_fs = music_dir_fs.RelativeFS(path_fs); if (path_fs == nullptr || *path_fs == 0) return std::string(); -- cgit v1.2.3