diff options
| author | Glenn Rice <glennricster@gmail.com> | 2011-03-01 03:06:14 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2011-03-01 03:06:14 +0000 |
| commit | a5b471f4903646e44d03ea8ca6a830002342198c (patch) | |
| tree | 8c969652f59077466ed74ca9af10cf9ceaf37290 /Source/Core/VideoCommon | |
| parent | ba54fac9eb74be6f73e20e2de953cf6f355be57f (diff) | |
More conversion from char * to std::string.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7266 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/Debugger.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/HiresTextures.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/Src/Debugger.cpp b/Source/Core/VideoCommon/Src/Debugger.cpp index 13a8138c46..c6c1d21a23 100644 --- a/Source/Core/VideoCommon/Src/Debugger.cpp +++ b/Source/Core/VideoCommon/Src/Debugger.cpp @@ -120,7 +120,7 @@ void GFXDebuggerBase::DumpPixelShader(const char* path) } File::CreateEmptyFile(filename); - File::WriteStringToFile(true, output.c_str(), filename); + File::WriteStringToFile(true, output, filename); } void GFXDebuggerBase::DumpVertexShader(const char* path) diff --git a/Source/Core/VideoCommon/Src/HiresTextures.cpp b/Source/Core/VideoCommon/Src/HiresTextures.cpp index 76405ded0a..50e8a194af 100644 --- a/Source/Core/VideoCommon/Src/HiresTextures.cpp +++ b/Source/Core/VideoCommon/Src/HiresTextures.cpp @@ -45,7 +45,7 @@ void Init(const char *gameCode) for (u32 i = 0; i < Directories.size(); i++) { File::FSTEntry FST_Temp; - File::ScanDirectoryTree(Directories.at(i).c_str(), FST_Temp); + File::ScanDirectoryTree(Directories[i], FST_Temp); for (u32 j = 0; j < FST_Temp.children.size(); j++) { if (FST_Temp.children.at(j).isDirectory) @@ -53,7 +53,7 @@ void Init(const char *gameCode) bool duplicate = false; for (u32 k = 0; k < Directories.size(); k++) { - if (strcmp(Directories.at(k).c_str(), FST_Temp.children.at(j).physicalName.c_str()) == 0) + if (strcmp(Directories[k].c_str(), FST_Temp.children.at(j).physicalName.c_str()) == 0) { duplicate = true; break; diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index ce47676437..d3b7ca14ba 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -399,7 +399,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int stage, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID; // make sure that the directory exists - if (false == File::Exists(szDir.c_str()) || false == File::IsDirectory(szDir.c_str())) + if (false == File::Exists(szDir) || false == File::IsDirectory(szDir)) File::CreateDir(szDir.c_str()); sprintf(szTemp, "%s/%s_%08x_%i.png", szDir.c_str(), |