[共通] DirectoryWatcher コンストラクタ引数を FilePathView に #1197

Reputeless · Reputeless · commit cb9bbeb5b16b · 2024-02-01T11:45:39.000+09:00
diff --git a/Siv3D/include/Siv3D/DirectoryWatcher.hpp b/Siv3D/include/Siv3D/DirectoryWatcher.hpp
@@ -36,7 +36,7 @@ namespace s3d
 		DirectoryWatcher();
 
 		SIV3D_NODISCARD_CXX20
-		explicit DirectoryWatcher(const FilePath& directory);
+		explicit DirectoryWatcher(FilePathView directory);
 
 		~DirectoryWatcher();
 
diff --git a/Siv3D/src/Siv3D-Platform/Linux/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.cpp b/Siv3D/src/Siv3D-Platform/Linux/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.cpp
@@ -17,7 +17,7 @@
 
 namespace s3d
 {
-	DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePath& directory)
+	DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePathView directory)
 	{
 		if (directory.isEmpty()
 			|| (not FileSystem::IsDirectory(directory)))
diff --git a/Siv3D/src/Siv3D-Platform/Linux/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.hpp b/Siv3D/src/Siv3D-Platform/Linux/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.hpp
@@ -21,7 +21,7 @@ namespace s3d
 	{
 	public:
 
-		explicit DirectoryWatcherDetail(const FilePath& directory);
+		explicit DirectoryWatcherDetail(FilePathView directory);
 
 		~DirectoryWatcherDetail();
 
diff --git a/Siv3D/src/Siv3D-Platform/Web/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.cpp b/Siv3D/src/Siv3D-Platform/Web/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.cpp
@@ -17,7 +17,7 @@
 
 namespace s3d
 {
-	DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePath& directory)
+	DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePathView directory)
 	{
 		if (directory.isEmpty()
 			|| (not FileSystem::IsDirectory(directory)))
diff --git a/Siv3D/src/Siv3D-Platform/Web/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.hpp b/Siv3D/src/Siv3D-Platform/Web/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.hpp
@@ -25,7 +25,7 @@ namespace s3d
 	{
 	public:
 
-		explicit DirectoryWatcherDetail(const FilePath& directory);
+		explicit DirectoryWatcherDetail(FilePathView directory);
 
 		~DirectoryWatcherDetail();
 
diff --git a/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.cpp b/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.cpp
@@ -39,7 +39,7 @@ namespace s3d
 		}
 	}
 
-	DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePath& directory)
+	DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePathView directory)
 	{
 		if (directory.isEmpty()
 			|| (not FileSystem::IsDirectory(directory)))
diff --git a/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.hpp b/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.hpp
@@ -19,7 +19,7 @@ namespace s3d
 	{
 	public:
 
-		explicit DirectoryWatcherDetail(const FilePath& directory);
+		explicit DirectoryWatcherDetail(FilePathView directory);
 
 		~DirectoryWatcherDetail();
 
diff --git a/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/FileSystem/SivFileSystem_Windows.cpp b/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/FileSystem/SivFileSystem_Windows.cpp
@@ -419,7 +419,7 @@ namespace s3d
 		{
 			if (not path) [[unlikely]]
 			{
-				return 0;
+				return{};
 			}
 
 			if (IsResourcePath(path))
diff --git a/Siv3D/src/Siv3D-Platform/macOS/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.cpp b/Siv3D/src/Siv3D-Platform/macOS/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.cpp
@@ -27,7 +27,7 @@ namespace s3d
 		}
 	}
 
-	DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePath& directory)
+	DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePathView directory)
 	{
 		if (directory.isEmpty()
 			|| (not FileSystem::IsDirectory(directory)))
diff --git a/Siv3D/src/Siv3D-Platform/macOS/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.hpp b/Siv3D/src/Siv3D-Platform/macOS/Siv3D/DirectoryWatcher/DirectoryWatcherDetail.hpp
@@ -19,7 +19,7 @@ namespace s3d
 	{
 	public:
 
-		explicit DirectoryWatcherDetail(const FilePath& directory);
+		explicit DirectoryWatcherDetail(FilePathView directory);
 
 		~DirectoryWatcherDetail();
 
diff --git a/Siv3D/src/Siv3D/DirectoryWatcher/SivDirectoryWatcher.cpp b/Siv3D/src/Siv3D/DirectoryWatcher/SivDirectoryWatcher.cpp
@@ -19,7 +19,7 @@ namespace s3d
 		// do nothing
 	}
 
-	DirectoryWatcher::DirectoryWatcher(const FilePath& directory)
+	DirectoryWatcher::DirectoryWatcher(const FilePathView directory)
 		: pImpl{ std::make_shared<DirectoryWatcherDetail>(directory) }
 	{
 		// do nothing

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`namespace s3d`
`19`	`19`	`{`
`20`		`- DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePath& directory)`
	`20`	`+ DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePathView directory)`
`21`	`21`	`{`
`22`	`22`	`if (directory.isEmpty()`
`23`	`23`	`\|\| (not FileSystem::IsDirectory(directory)))`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace s3d`
`21`	`21`	`{`
`22`	`22`	`public:`
`23`	`23`
`24`		`- explicit DirectoryWatcherDetail(const FilePath& directory);`
	`24`	`+ explicit DirectoryWatcherDetail(FilePathView directory);`
`25`	`25`
`26`	`26`	`~DirectoryWatcherDetail();`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace s3d`
`25`	`25`	`{`
`26`	`26`	`public:`
`27`	`27`
`28`		`- explicit DirectoryWatcherDetail(const FilePath& directory);`
	`28`	`+ explicit DirectoryWatcherDetail(FilePathView directory);`
`29`	`29`
`30`	`30`	`~DirectoryWatcherDetail();`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ namespace s3d`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`- DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePath& directory)`
	`42`	`+ DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePathView directory)`
`43`	`43`	`{`
`44`	`44`	`if (directory.isEmpty()`
`45`	`45`	`\|\| (not FileSystem::IsDirectory(directory)))`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace s3d`
`19`	`19`	`{`
`20`	`20`	`public:`
`21`	`21`
`22`		`- explicit DirectoryWatcherDetail(const FilePath& directory);`
	`22`	`+ explicit DirectoryWatcherDetail(FilePathView directory);`
`23`	`23`
`24`	`24`	`~DirectoryWatcherDetail();`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ namespace s3d`
`419`	`419`	`{`
`420`	`420`	`if (not path) [[unlikely]]`
`421`	`421`	`{`
`422`		`- return 0;`
	`422`	`+ return{};`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`if (IsResourcePath(path))`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ namespace s3d`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`- DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePath& directory)`
	`30`	`+ DirectoryWatcher::DirectoryWatcherDetail::DirectoryWatcherDetail(const FilePathView directory)`
`31`	`31`	`{`
`32`	`32`	`if (directory.isEmpty()`
`33`	`33`	`\|\| (not FileSystem::IsDirectory(directory)))`