mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Use emplace_back() instead of push_back()

Browse Source
This commit is contained in:
Gymnasiast
2022-01-29 13:56:20 +01:00
parent 55591b1b2f
commit fd6b327adb
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2-ui/windows/LoadSave.cpp
View File

@@ -364,34 +364,34 @@ static bool Browse(bool isSave, char* path, size_t pathSize)
extension = ".park";
fileType = FileExtension::PARK;
title = isSave ? STR_FILE_DIALOG_TITLE_SAVE_GAME : STR_FILE_DIALOG_TITLE_LOAD_GAME;
desc.Filters.push_back({ language_get_string(STR_OPENRCT2_SAVED_GAME), GetFilterPatternByType(_type, isSave) });
desc.Filters.emplace_back(language_get_string(STR_OPENRCT2_SAVED_GAME), GetFilterPatternByType(_type, isSave));
break;
case LOADSAVETYPE_LANDSCAPE:
extension = ".park";
fileType = FileExtension::PARK;
title = isSave ? STR_FILE_DIALOG_TITLE_SAVE_LANDSCAPE : STR_FILE_DIALOG_TITLE_LOAD_LANDSCAPE;
desc.Filters.push_back({ language_get_string(STR_OPENRCT2_LANDSCAPE_FILE), GetFilterPatternByType(_type, isSave) });
desc.Filters.emplace_back(language_get_string(STR_OPENRCT2_LANDSCAPE_FILE), GetFilterPatternByType(_type, isSave));
break;
case LOADSAVETYPE_SCENARIO:
extension = ".park";
fileType = FileExtension::PARK;
title = STR_FILE_DIALOG_TITLE_SAVE_SCENARIO;
desc.Filters.push_back({ language_get_string(STR_OPENRCT2_SCENARIO_FILE), GetFilterPatternByType(_type, isSave) });
desc.Filters.emplace_back(language_get_string(STR_OPENRCT2_SCENARIO_FILE), GetFilterPatternByType(_type, isSave));
break;
case LOADSAVETYPE_TRACK:
extension = ".td6";
fileType = FileExtension::TD6;
title = isSave ? STR_FILE_DIALOG_TITLE_SAVE_TRACK : STR_FILE_DIALOG_TITLE_INSTALL_NEW_TRACK_DESIGN;
desc.Filters.push_back(
{ language_get_string(STR_OPENRCT2_TRACK_DESIGN_FILE), GetFilterPatternByType(_type, isSave) });
desc.Filters.emplace_back(
language_get_string(STR_OPENRCT2_TRACK_DESIGN_FILE), GetFilterPatternByType(_type, isSave));
break;
case LOADSAVETYPE_HEIGHTMAP:
title = STR_FILE_DIALOG_TITLE_LOAD_HEIGHTMAP;
desc.Filters.push_back({ language_get_string(STR_OPENRCT2_HEIGHTMAP_FILE), GetFilterPatternByType(_type, isSave) });
desc.Filters.emplace_back(language_get_string(STR_OPENRCT2_HEIGHTMAP_FILE), GetFilterPatternByType(_type, isSave));
break;
}
@@ -421,7 +421,7 @@ static bool Browse(bool isSave, char* path, size_t pathSize)
desc.DefaultFilename = isSave ? path : "";
// Add 'all files' filter. If the number of filters is increased, this code will need to be adjusted.
desc.Filters.push_back({ language_get_string(STR_ALL_FILES), "*" });
desc.Filters.emplace_back(language_get_string(STR_ALL_FILES), "*");
desc.Title = language_get_string(title);
if (platform_open_common_file_dialog(path, desc, pathSize))

4
src/openrct2/config/Config.cpp
View File

@@ -719,8 +719,8 @@ namespace Config
FileDialogDesc desc{};
desc.Type = FileDialogType::Open;
desc.Title = language_get_string(STR_SELECT_GOG_INSTALLER);
desc.Filters.push_back({ language_get_string(STR_GOG_INSTALLER), "*.exe" });
desc.Filters.push_back({ language_get_string(STR_ALL_FILES), "*" });
desc.Filters.emplace_back(language_get_string(STR_GOG_INSTALLER), "*.exe");
desc.Filters.emplace_back(language_get_string(STR_ALL_FILES), "*");
const auto userHomePath = Platform::GetFolderPath(SPECIAL_FOLDER::USER_HOME);
desc.InitialDirectory = userHomePath.c_str();

6
src/openrct2/ui/UiContext.h
View File

@@ -77,6 +77,12 @@ namespace OpenRCT2
{
std::string Name; // E.g. "Image Files"
std::string Pattern; // E.g. "*.png;*.jpg;*.gif"
Filter(u8string_view name, u8string_view pattern)
: Name(name)
, Pattern(pattern)
{
}
};
FileDialogType Type = FileDialogType::Open;