From f4bb18b05e203dcf9bced252d4c385565dcb1d2f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 10 Nov 2016 12:49:23 +0100 Subject: [PATCH] fs/AllocatedPath: remove the obsolete class Error overload --- src/fs/AllocatedPath.cxx | 13 ------------- src/fs/AllocatedPath.hxx | 5 ----- 2 files changed, 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 @@ -53,18 +52,6 @@ AllocatedPath::FromUTF8Throw(const char *path_utf8) #endif } -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 { 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 #include -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. */