diff options
author | Max Kellermann <max@musicpd.org> | 2016-11-10 12:49:23 +0100 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2016-11-10 12:55:08 +0100 |
commit | f4bb18b05e203dcf9bced252d4c385565dcb1d2f (patch) | |
tree | f6475e54fd963aab098b78976f3c8d38964e6ba0 | |
parent | 14885f25b47948ef2857ccaffbf5309bf9b51e96 (diff) |
fs/AllocatedPath: remove the obsolete class Error overload
-rw-r--r-- | src/fs/AllocatedPath.cxx | 13 | ||||
-rw-r--r-- | src/fs/AllocatedPath.hxx | 5 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/fs/AllocatedPath.cxx b/src/fs/AllocatedPath.cxx index 1421a08f7..3d9cd30fa 100644 --- a/src/fs/AllocatedPath.cxx +++ b/src/fs/AllocatedPath.cxx @@ -21,7 +21,6 @@ #include "AllocatedPath.hxx" #include "Domain.hxx" #include "Charset.hxx" -#include "util/Error.hxx" #include "Compiler.h" #include <stdexcept> @@ -54,18 +53,6 @@ AllocatedPath::FromUTF8Throw(const char *path_utf8) } AllocatedPath -AllocatedPath::FromUTF8(const char *path_utf8, Error &error) -{ - AllocatedPath path = FromUTF8(path_utf8); - if (path.IsNull()) - error.Format(path_domain, - "Failed to convert to file system charset: %s", - path_utf8); - - return path; -} - -AllocatedPath AllocatedPath::GetDirectoryName() const { return FromFS(PathTraitsFS::GetParent(c_str())); diff --git a/src/fs/AllocatedPath.hxx b/src/fs/AllocatedPath.hxx index c1407e8f4..e4817c48b 100644 --- a/src/fs/AllocatedPath.hxx +++ b/src/fs/AllocatedPath.hxx @@ -29,8 +29,6 @@ #include <utility> #include <string> -class Error; - /** * A path name in the native file system character set. * @@ -164,9 +162,6 @@ public: gcc_pure gcc_nonnull_all static AllocatedPath FromUTF8Throw(const char *path_utf8); - gcc_pure gcc_nonnull_all - static AllocatedPath FromUTF8(const char *path_utf8, Error &error); - /** * Copy an #AllocatedPath object. */ |