From 6f50961e69406a17d6ec998956a6b33208b1001b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Oct 2018 12:06:00 +0200 Subject: remove more rtl::OUString and OString prefixes which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/opengl/OpenGLHelper.cxx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'vcl/source/opengl/OpenGLHelper.cxx') diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 0ae68ec86c13..6ae47184ae2e 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -104,8 +104,8 @@ OString& getShaderSource(const OUString& rFilename) } namespace { - int LogCompilerError(GLuint nId, const rtl::OUString &rDetail, - const rtl::OUString &rName, bool bShaderNotProgram) + int LogCompilerError(GLuint nId, const OUString &rDetail, + const OUString &rName, bool bShaderNotProgram) { OpenGLZone aZone; @@ -248,14 +248,14 @@ namespace osl::Directory::create(url); - return rtl::OUStringToOString(url, RTL_TEXTENCODING_UTF8); + return OUStringToOString(url, RTL_TEXTENCODING_UTF8); } bool writeProgramBinary( const OString& rBinaryFileName, const std::vector& rBinary ) { - osl::File aFile(rtl::OStringToOUString(rBinaryFileName, RTL_TEXTENCODING_UTF8)); + osl::File aFile(OStringToOUString(rBinaryFileName, RTL_TEXTENCODING_UTF8)); osl::FileBase::RC eStatus = aFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); @@ -284,7 +284,7 @@ namespace bool readProgramBinary( const OString& rBinaryFileName, std::vector& rBinary ) { - osl::File aFile( rtl::OStringToOUString( rBinaryFileName, RTL_TEXTENCODING_UTF8 ) ); + osl::File aFile( OStringToOUString( rBinaryFileName, RTL_TEXTENCODING_UTF8 ) ); if(aFile.open( osl_File_OpenFlag_Read ) == osl::FileBase::E_None) { sal_uInt64 nSize = 0; @@ -311,10 +311,10 @@ namespace { OString aFileName; aFileName += getCacheFolder(); - aFileName += rtl::OUStringToOString( rVertexShaderName, RTL_TEXTENCODING_UTF8 ) + "-"; - aFileName += rtl::OUStringToOString( rFragmentShaderName, RTL_TEXTENCODING_UTF8 ) + "-"; + aFileName += OUStringToOString( rVertexShaderName, RTL_TEXTENCODING_UTF8 ) + "-"; + aFileName += OUStringToOString( rFragmentShaderName, RTL_TEXTENCODING_UTF8 ) + "-"; if (!rGeometryShaderName.isEmpty()) - aFileName += rtl::OUStringToOString( rGeometryShaderName, RTL_TEXTENCODING_UTF8 ) + "-"; + aFileName += OUStringToOString( rGeometryShaderName, RTL_TEXTENCODING_UTF8 ) + "-"; aFileName += rDigest + ".bin"; return aFileName; } @@ -374,7 +374,7 @@ namespace } } -rtl::OString OpenGLHelper::GetDigest( const OUString& rVertexShaderName, +OString OpenGLHelper::GetDigest( const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OString& rPreamble ) { -- cgit