From 9fe21fcd8883b37bdc30224822e6e42afb35b8f0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 7 Feb 2016 16:18:13 +0300 Subject: Replace most static_cast to shorter versions from defines. --- src/configmanager.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/configmanager.cpp') diff --git a/src/configmanager.cpp b/src/configmanager.cpp index b5e80e5e9..b412d1044 100644 --- a/src/configmanager.cpp +++ b/src/configmanager.cpp @@ -89,16 +89,16 @@ void ConfigManager::initConfiguration() config.setValue("hwaccel", false); #ifdef USE_OPENGL #if (defined __APPLE__) - config.setValue("opengl", static_cast(RENDER_NORMAL_OPENGL)); + config.setValue("opengl", CAST_S32(RENDER_NORMAL_OPENGL)); #elif (defined ANDROID) - config.setValue("opengl", static_cast(RENDER_GLES_OPENGL)); + config.setValue("opengl", CAST_S32(RENDER_GLES_OPENGL)); #elif (defined WIN32) - config.setValue("opengl", static_cast(RENDER_SAFE_OPENGL)); + config.setValue("opengl", CAST_S32(RENDER_SAFE_OPENGL)); #else - config.setValue("opengl", static_cast(RENDER_SOFTWARE)); + config.setValue("opengl", CAST_S32(RENDER_SOFTWARE)); #endif #else - config.setValue("opengl", static_cast(RENDER_SOFTWARE)); + config.setValue("opengl", CAST_S32(RENDER_SOFTWARE)); #endif config.setValue("screen", false); config.setValue("sound", true); @@ -174,7 +174,7 @@ void ConfigManager::storeSafeParameters() tmpOpengl = intToRenderType(config.getIntValue("opengl")); - config.setValue("opengl", static_cast(RENDER_SOFTWARE)); + config.setValue("opengl", CAST_S32(RENDER_SOFTWARE)); config.write(); @@ -185,7 +185,7 @@ void ConfigManager::storeSafeParameters() } config.setValue("safemode", false); - config.setValue("opengl", static_cast(tmpOpengl)); + config.setValue("opengl", CAST_S32(tmpOpengl)); } #elif !defined(ANDROID) void ConfigManager::storeSafeParameters() @@ -264,9 +264,9 @@ void ConfigManager::storeSafeParameters() config.setValue("screenheight", 480); } #if defined(__APPLE__) - config.setValue("opengl", static_cast(RENDER_NORMAL_OPENGL)); + config.setValue("opengl", CAST_S32(RENDER_NORMAL_OPENGL)); #else - config.setValue("opengl", static_cast(RENDER_SOFTWARE)); + config.setValue("opengl", CAST_S32(RENDER_SOFTWARE)); #endif config.write(); @@ -281,7 +281,7 @@ void ConfigManager::storeSafeParameters() if (!tmpOpengl) { config.setValue("hwaccel", tmpHwaccel); - config.setValue("opengl", static_cast(tmpOpengl)); + config.setValue("opengl", CAST_S32(tmpOpengl)); config.setValue("fpslimit", tmpFpslimit); config.setValue("altfpslimit", tmpAltFpslimit); config.setValue("sound", tmpSound); @@ -301,7 +301,7 @@ void ConfigManager::storeSafeParameters() } else { - config.setValue("opengl", static_cast(tmpOpengl)); + config.setValue("opengl", CAST_S32(tmpOpengl)); config.setValue("screenwidth", width); config.setValue("screenheight", height); } @@ -346,7 +346,7 @@ void ConfigManager::checkConfigVersion() { if (config.getIntValue("speech") == BeingSpeech::TEXT_OVERHEAD) { - config.setValue("speech", static_cast( + config.setValue("speech", CAST_S32( BeingSpeech::NO_NAME_IN_BUBBLE)); } } -- cgit v1.2.3-60-g2f50