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

Use std::string for File and FileScanner

Browse Source
This commit is contained in:
Ted John
2017-01-05 18:13:48 +00:00
parent 11477c5869
commit e1ace9528d
5 changed files with 53 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/ride/TrackDesignRepository.cpp
View File

@@ -151,7 +151,7 @@ public:
const TrackRepositoryItem * item = &_items[index];
if (!(item->Flags & TRIF_READ_ONLY))
{
if (File::Delete(path.c_str()))
if (File::Delete(path))
{
_items.erase(_items.begin() + index);
result = true;
@@ -172,7 +172,7 @@ public:
{
std::string directory = Path::GetDirectory(path);
std::string newPath = Path::Combine(directory, newName + Path::GetExtension(path));
if (File::Move(path.c_str(), newPath.c_str()))
if (File::Move(path, newPath))
{
item->Name = newName;
item->Path = newPath;
@@ -191,7 +191,7 @@ public:
std::string installDir = _env->GetDirectoryPath(DIRBASE::USER, DIRID::TRACK);
std::string newPath = Path::Combine(installDir, fileName);
if (File::Copy(path.c_str(), newPath.c_str(), false))
if (File::Copy(path, newPath, false))
{
AddTrack(path);
SortItems();