From 2fd5c2241edc3625098a274cdbf9882c0170f723 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 17 May 2013 04:06:39 +0000 Subject: [PATCH] code cleanup based on cppcheck results --- source/glest_game/menu/menu_state_options.cpp | 4 ++-- source/glest_game/menu/menu_state_options_graphics.cpp | 2 +- source/glest_game/menu/menu_state_options_network.cpp | 2 +- source/glest_game/menu/menu_state_options_sound.cpp | 2 +- source/shared_lib/sources/platform/common/platform_common.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/glest_game/menu/menu_state_options.cpp index 25e33c4f2..9115e9e14 100644 --- a/source/glest_game/menu/menu_state_options.cpp +++ b/source/glest_game/menu/menu_state_options.cpp @@ -50,10 +50,10 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu, Program int leftLabelStart=50; int leftColumnStart=leftLabelStart+280; int rightLabelStart=450; - int rightColumnStart=rightLabelStart+280; + //int rightColumnStart=rightLabelStart+280; int buttonRowPos=50; int buttonStartPos=170; - int captionOffset=75; + //int captionOffset=75; int currentLabelStart=leftLabelStart; int currentColumnStart=leftColumnStart; int currentLine=700; diff --git a/source/glest_game/menu/menu_state_options_graphics.cpp b/source/glest_game/menu/menu_state_options_graphics.cpp index 212889732..2a40206ad 100644 --- a/source/glest_game/menu/menu_state_options_graphics.cpp +++ b/source/glest_game/menu/menu_state_options_graphics.cpp @@ -50,7 +50,7 @@ MenuStateOptionsGraphics::MenuStateOptionsGraphics(Program *program, MainMenu *m int leftLabelStart=50; int leftColumnStart=leftLabelStart+180; - int rightLabelStart=450; + //int rightLabelStart=450; //int rightColumnStart=rightLabelStart+280; int buttonRowPos=50; int buttonStartPos=170; diff --git a/source/glest_game/menu/menu_state_options_network.cpp b/source/glest_game/menu/menu_state_options_network.cpp index cdfddeb39..c42f09122 100644 --- a/source/glest_game/menu/menu_state_options_network.cpp +++ b/source/glest_game/menu/menu_state_options_network.cpp @@ -47,7 +47,7 @@ MenuStateOptionsNetwork::MenuStateOptionsNetwork(Program *program, MainMenu *mai //modeinfos=list (); int leftLabelStart=50; int leftColumnStart=leftLabelStart+280; - int rightLabelStart=450; + //int rightLabelStart=450; //int rightColumnStart=rightLabelStart+280; int buttonRowPos=50; int buttonStartPos=170; diff --git a/source/glest_game/menu/menu_state_options_sound.cpp b/source/glest_game/menu/menu_state_options_sound.cpp index addbf856a..facc4a670 100644 --- a/source/glest_game/menu/menu_state_options_sound.cpp +++ b/source/glest_game/menu/menu_state_options_sound.cpp @@ -150,7 +150,7 @@ MenuStateOptionsSound::MenuStateOptionsSound(Program *program, MainMenu *mainMen listBoxVolumeAmbient.setSelectedItem(intToStr(config.getInt("SoundVolumeAmbient")/5*5)); listBoxVolumeMusic.setSelectedItem(intToStr(config.getInt("SoundVolumeMusic")/5*5)); - currentLine-=lineOffset/2; + //currentLine-=lineOffset/2; diff --git a/source/shared_lib/sources/platform/common/platform_common.cpp b/source/shared_lib/sources/platform/common/platform_common.cpp index 9acc70f1f..68fffe472 100644 --- a/source/shared_lib/sources/platform/common/platform_common.cpp +++ b/source/shared_lib/sources/platform/common/platform_common.cpp @@ -812,7 +812,7 @@ time_t getFolderTreeContentsCheckSumRecursivelyLastGenerated(vector path if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"-------------- In [%s::%s Line: %d] Calculating CRC for [%s] -----------\n",__FILE__,__FUNCTION__,__LINE__,pathSearchString.c_str()); std::pair cacheKeys = getFolderTreeContentsCheckSumCacheKey(paths, pathSearchString, filterFileExt); - string cacheLookupId = cacheKeys.first; + //string cacheLookupId = cacheKeys.first; //std::map &crcTreeCache = CacheManager::getCachedItem< std::map >(cacheLookupId); string cacheKey = cacheKeys.second;