From a82675b7d581421fa80d5d5c53253cf1d5c1a26d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 12 Mar 2014 15:33:41 -0400 Subject: 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). --- Source/Core/VideoBackends/OGL/GLUtil.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/GLUtil.cpp') diff --git a/Source/Core/VideoBackends/OGL/GLUtil.cpp b/Source/Core/VideoBackends/OGL/GLUtil.cpp index 9c5226309d..cafc157145 100644 --- a/Source/Core/VideoBackends/OGL/GLUtil.cpp +++ b/Source/Core/VideoBackends/OGL/GLUtil.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include "Common/IniFile.h" +#include "Common/StringUtil.h" #include "Core/ConfigManager.h" #include "Core/Core.h" @@ -27,11 +28,9 @@ unsigned int VideoBackend::PeekMessages() } // Show the current FPS -void VideoBackend::UpdateFPSDisplay(const char *text) +void VideoBackend::UpdateFPSDisplay(const std::string& text) { - char temp[100]; - snprintf(temp, sizeof temp, "%s | %s | %s", scm_rev_str, GetDisplayName().c_str(), text); - return GLInterface->UpdateFPSDisplay(temp); + return GLInterface->UpdateFPSDisplay(StringFromFormat("%s | %s | %s", scm_rev_str, GetDisplayName().c_str(), text.c_str())); } } @@ -48,7 +47,7 @@ void InitInterface() #endif } -GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentShader ) +GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShader) { // generate objects GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER); -- cgit v1.2.3