Skip to content

Commit

Permalink
Refactor CStringView out of os.h
Browse files Browse the repository at this point in the history
  • Loading branch information
adamkewley committed Jan 8, 2025
1 parent 22f9a27 commit b3ad1a9
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 112 deletions.
4 changes: 2 additions & 2 deletions src/oscar/Platform/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,8 @@ namespace

// computes the user's data directory and also logs it to the console for user-facing feedback
std::filesystem::path get_current_user_dir_and_log_it(
CStringView organization_name,
CStringView application_name)
std::string_view organization_name,
std::string_view application_name)
{
auto rv = user_data_directory(organization_name, application_name);
log_info("user data directory: %s", rv.string().c_str());
Expand Down
2 changes: 1 addition & 1 deletion src/oscar/Platform/AppSettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ R"(# configuration options
std::string_view application_name,
std::string_view application_config_file_name)
{
const auto user_data_dir = user_data_directory(std::string{organization_name}, std::string{application_name});
const auto user_data_dir = user_data_directory(organization_name, application_name);
auto full_path = user_data_dir / application_config_file_name;

if (std::filesystem::exists(full_path)) {
Expand Down
Loading

0 comments on commit b3ad1a9

Please sign in to comment.