From 1da72c7792e4f68fd44579a713288f6772c193b4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 2 May 2021 02:34:40 -0400 Subject: file_sys: Resolve cases of variable shadowing Brings us closer to enabling -Wshadow as an error in the core code. --- src/core/file_sys/vfs_layered.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/core/file_sys/vfs_layered.h') diff --git a/src/core/file_sys/vfs_layered.h b/src/core/file_sys/vfs_layered.h index 6d7513ac6..cb4b32e91 100644 --- a/src/core/file_sys/vfs_layered.h +++ b/src/core/file_sys/vfs_layered.h @@ -23,8 +23,8 @@ public: VirtualFile GetFileRelative(std::string_view path) const override; VirtualDir GetDirectoryRelative(std::string_view path) const override; - VirtualFile GetFile(std::string_view name) const override; - VirtualDir GetSubdirectory(std::string_view name) const override; + VirtualFile GetFile(std::string_view file_name) const override; + VirtualDir GetSubdirectory(std::string_view subdir_name) const override; std::string GetFullPath() const override; std::vector GetFiles() const override; @@ -33,11 +33,11 @@ public: bool IsReadable() const override; std::string GetName() const override; VirtualDir GetParentDirectory() const override; - VirtualDir CreateSubdirectory(std::string_view name) override; - VirtualFile CreateFile(std::string_view name) override; - bool DeleteSubdirectory(std::string_view name) override; - bool DeleteFile(std::string_view name) override; - bool Rename(std::string_view name) override; + VirtualDir CreateSubdirectory(std::string_view subdir_name) override; + VirtualFile CreateFile(std::string_view file_name) override; + bool DeleteSubdirectory(std::string_view subdir_name) override; + bool DeleteFile(std::string_view file_name) override; + bool Rename(std::string_view new_name) override; private: std::vector dirs; -- cgit v1.2.3