Kill off some usages of c_str.

Also changes some function params, but this is ok.
Some simplifications were also able to be made (ie. killing off strcmps with ==, etc).
This commit is contained in:
Lioncash
2014-03-12 15:33:41 -04:00
parent dccc6d8b47
commit a82675b7d5
170 changed files with 812 additions and 704 deletions

View File

@ -2,10 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <string>
#include "Common/Atomic.h"
#include "Common/Common.h"
#include "Common/FileUtil.h"
#include "Common/LogManager.h"
#include "Common/StringUtil.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
@ -284,9 +287,9 @@ u32 VideoSoftware::Video_GetQueryResult(PerfQueryType type)
return 0;
}
bool VideoSoftware::Video_Screenshot(const char *_szFilename)
bool VideoSoftware::Video_Screenshot(const std::string& filename)
{
SWRenderer::SetScreenshot(_szFilename);
SWRenderer::SetScreenshot(filename.c_str());
return true;
}
@ -336,7 +339,7 @@ void VideoSoftware::Video_ExitLoop()
// TODO : could use the OSD class in video common, we would need to implement the Renderer class
// however most of it is useless for the SW backend so we could as well move it to its own class
void VideoSoftware::Video_AddMessage(const char* pstr, u32 milliseconds)
void VideoSoftware::Video_AddMessage(const std::string& msg, u32 milliseconds)
{
}
void VideoSoftware::Video_ClearMessages()
@ -385,11 +388,9 @@ unsigned int VideoSoftware::PeekMessages()
}
// Show the current FPS
void VideoSoftware::UpdateFPSDisplay(const char *text)
void VideoSoftware::UpdateFPSDisplay(const std::string& text)
{
char temp[100];
snprintf(temp, sizeof temp, "%s | Software | %s", scm_rev_str, text);
GLInterface->UpdateFPSDisplay(temp);
GLInterface->UpdateFPSDisplay(StringFromFormat("%s | Software | %s", scm_rev_str, text.c_str()));
}
}