1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 09:38:11 +00:00

AK: Make LexicalPath take String instead of StringView

This commit is contained in:
Andreas Kling 2021-04-16 23:44:06 +02:00
parent e873d27ab1
commit f7139d9422
2 changed files with 8 additions and 8 deletions

View file

@ -31,8 +31,8 @@
namespace AK { namespace AK {
LexicalPath::LexicalPath(const StringView& s) LexicalPath::LexicalPath(String s)
: m_string(s) : m_string(move(s))
{ {
canonicalize(); canonicalize();
m_is_valid = true; m_is_valid = true;
@ -114,12 +114,12 @@ bool LexicalPath::has_extension(const StringView& extension) const
return m_string.ends_with(extension, CaseSensitivity::CaseInsensitive); return m_string.ends_with(extension, CaseSensitivity::CaseInsensitive);
} }
String LexicalPath::canonicalized_path(const StringView& path) String LexicalPath::canonicalized_path(String path)
{ {
return LexicalPath(path).string(); return LexicalPath(move(path)).string();
} }
String LexicalPath::relative_path(const String absolute_path, const String& prefix) String LexicalPath::relative_path(String absolute_path, const String& prefix)
{ {
if (!LexicalPath { absolute_path }.is_absolute() || !LexicalPath { prefix }.is_absolute()) if (!LexicalPath { absolute_path }.is_absolute() || !LexicalPath { prefix }.is_absolute())
return {}; return {};

View file

@ -34,7 +34,7 @@ namespace AK {
class LexicalPath { class LexicalPath {
public: public:
LexicalPath() = default; LexicalPath() = default;
explicit LexicalPath(const StringView&); explicit LexicalPath(String);
bool is_valid() const { return m_is_valid; } bool is_valid() const { return m_is_valid; }
bool is_absolute() const { return m_is_absolute; } bool is_absolute() const { return m_is_absolute; }
@ -49,8 +49,8 @@ public:
bool has_extension(const StringView&) const; bool has_extension(const StringView&) const;
static String canonicalized_path(const StringView&); static String canonicalized_path(String);
static String relative_path(const String absolute_path, const String& prefix); static String relative_path(String absolute_path, String const& prefix);
private: private:
void canonicalize(); void canonicalize();