diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-26 15:32:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-26 15:33:40 +0100 |
| commit | 513fc2916053db5ee7ffaf9f53c271a05cef8981 (patch) | |
| tree | 7f24849841f33f3e1b2737762548c8525bca780e /vcl/opengl | |
| parent | 41982607d0c9b69efd5789762bbdae6c7301ee8b (diff) | |
const_cast: convert some C-style casts and remove some redundant ones
Change-Id: I17c57a85bcda98ef36ddefd6562d4681d0c7d5fc
Diffstat (limited to 'vcl/opengl')
| -rw-r--r-- | vcl/opengl/program.cxx | 4 | ||||
| -rw-r--r-- | vcl/opengl/x11/X11DeviceInfo.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx index 3504b06847ff..d40aa30695f9 100644 --- a/vcl/opengl/program.cxx +++ b/vcl/opengl/program.cxx @@ -87,7 +87,7 @@ bool OpenGLProgram::Clean() void OpenGLProgram::SetVertexAttrib( GLuint& rAttrib, const OString& rName, const GLvoid* pData ) { if( rAttrib == SAL_MAX_UINT32 ) - rAttrib = glGetAttribLocation( mnId, (char*) rName.getStr() ); + rAttrib = glGetAttribLocation( mnId, rName.getStr() ); if( (mnEnabledAttribs & ( 1 << rAttrib )) == 0 ) { glEnableVertexAttribArray( rAttrib ); @@ -116,7 +116,7 @@ GLuint OpenGLProgram::GetUniformLocation( const OString& rName ) auto it = maUniformLocations.find( rName ); if( it == maUniformLocations.end() ) { - GLuint nLocation = glGetUniformLocation( mnId, (char*) rName.getStr() ); + GLuint nLocation = glGetUniformLocation( mnId, rName.getStr() ); maUniformLocations[rName] = nLocation; return nLocation; } diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx index e7e4b6b10849..74e84c607bd4 100644 --- a/vcl/opengl/x11/X11DeviceInfo.cxx +++ b/vcl/opengl/x11/X11DeviceInfo.cxx @@ -60,7 +60,7 @@ char* strtok_wrapper(const char* aDelims, char** aStr) return nullptr; } - char* ret = (char*)strspnp_wrapper(aDelims, *aStr); + char* ret = const_cast<char*>(strspnp_wrapper(aDelims, *aStr)); if (!*ret) { *aStr = ret; |