Use u8string in Path/File; replace Path::Append with Path::Combine #16521
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
src/openrct2/core/File.cpp
Outdated
| { | ||
| #if defined(_WIN32) && !defined(__MINGW32__) | ||
| auto pathW = String::ToWideChar(path); | ||
| std::ifstream fs(pathW, std::ios::in | std::ios::binary); | ||
| #else | ||
| std::ifstream fs(std::string(path), std::ios::in | std::ios::binary); | ||
| std::ifstream fs(u8string(path), std::ios::in | std::ios::binary); |
There was a problem hiding this comment.
we don't need this ifdef anymore since we have the fs::path just create an fs::path from the path and pass it to ifstream that will handle the wide char internally.
| if (b.empty()) | ||
| return std::string(a); | ||
| return u8string(a); | ||
| auto aEnd = a.back(); | ||
| auto bBegin = b.front(); | ||
| if (Platform::IsPathSeparator(aEnd)) |
There was a problem hiding this comment.
Future refactor to replace this function with return (fs::path(u8path(a)) / fs::path(u8path(b))).u8string()
There was a problem hiding this comment.
Hmm just reading all the in's and out's of fs::path /operator and it might not be as simple as that. Will need to check all calling sites to ensure above change makes sense.
Gymnasiast
force-pushed
the
refactor/path-u8string
branch
from
3148745
to
e87beb8
Compare
Gymnasiast
force-pushed
the
refactor/path-u8string
branch
from
e87beb8
to
3ea0e2f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.