[Scummvm-cvs-logs] SF.net SVN: scummvm:[47443] scummvm/trunk
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Fri Jan 22 20:05:06 CET 2010
Revision: 47443
http://scummvm.svn.sourceforge.net/scummvm/?rev=47443&view=rev
Author: eriktorbjorn
Date: 2010-01-22 19:05:02 +0000 (Fri, 22 Jan 2010)
Log Message:
-----------
Silenced some more cppcheck warnings. Some of these may seem silly, but the way
I figure it the changes are harmless at worst, and making them will make it
easier to find real errors in the (still quite long) list of warnings.
Modified Paths:
--------------
scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp
scummvm/trunk/backends/platform/psp/powerman.cpp
scummvm/trunk/backends/platform/wii/osystem_gfx.cpp
scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp
scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp
scummvm/trunk/backends/platform/wince/missing/missing.cpp
scummvm/trunk/backends/vkeybd/image-map.cpp
scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
scummvm/trunk/engines/kyra/gui_lol.cpp
scummvm/trunk/engines/lure/res_struct.cpp
scummvm/trunk/engines/m4/assets.cpp
scummvm/trunk/engines/m4/woodscript.cpp
scummvm/trunk/graphics/video/video_player.cpp
Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -55,12 +55,9 @@
_mouseCurState.w = w;
_mouseCurState.h = h;
- if (_mouseDataP)
- free(_mouseDataP);
+ free(_mouseDataP);
+ free(_mouseBackupP);
- if (_mouseBackupP)
- free(_mouseBackupP);
-
_mouseDataP = (byte *)malloc(w * h);
_mouseBackupP = (byte *)malloc(w * h * 2); // if 16bit = *2
}
Modified: scummvm/trunk/backends/platform/psp/powerman.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/powerman.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/backends/platform/psp/powerman.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -359,7 +359,7 @@
// Iterate
Common::List<Suspendable *>::iterator i = _suspendList.begin();
- for (; i != _suspendList.end(); i++) {
+ for (; i != _suspendList.end(); ++i) {
(*i)->suspend();
}
@@ -402,7 +402,7 @@
// Iterate
Common::List<Suspendable *>::iterator i = _suspendList.begin();
- for (; i != _suspendList.end(); i++) {
+ for (; i != _suspendList.end(); ++i) {
(*i)->resume();
}
Modified: scummvm/trunk/backends/platform/wii/osystem_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem_gfx.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/backends/platform/wii/osystem_gfx.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -258,8 +258,7 @@
}
if (update) {
- if (_gamePixels)
- free(_gamePixels);
+ free(_gamePixels);
tex_format = GFX_TF_PALETTE_RGB565;
Modified: scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/backends/platform/wince/CEgui/GUIElement.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -120,8 +120,7 @@
}
GUIElement::~GUIElement() {
- if (_background)
- delete _background;
+ delete _background;
}
}
Modified: scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/backends/platform/wince/CEgui/ItemSwitch.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -57,8 +57,7 @@
}
ItemSwitch::~ItemSwitch() {
- if (_backgroundFalse)
- delete _backgroundFalse;
+ delete _backgroundFalse;
}
bool ItemSwitch::action(int x, int y, bool pushed) {
Modified: scummvm/trunk/backends/platform/wince/missing/missing.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/missing/missing.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/backends/platform/wince/missing/missing.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -288,8 +288,7 @@
}
WideCharToMultiByte(CP_ACP, 0, wfd.cFileName, -1, nameFound, MAX_PATH, NULL, NULL);
- if (dir->dd_dir.d_name)
- free(dir->dd_dir.d_name);
+ free(dir->dd_dir.d_name);
dir->dd_dir.d_name = strdup(nameFound);
dir->dd_dir.d_namlen = strlen(nameFound);
@@ -307,8 +306,7 @@
if (dir->dd_handle)
FindClose((HANDLE)dir->dd_handle);
- if (dir->dd_dir.d_name)
- free(dir->dd_dir.d_name);
+ free(dir->dd_dir.d_name);
free(dir);
return 1;
}
Modified: scummvm/trunk/backends/vkeybd/image-map.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/image-map.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/backends/vkeybd/image-map.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -53,7 +53,7 @@
void ImageMap::removeAllAreas() {
HashMap<String, Polygon*>::iterator it;
- for (it = _areas.begin(); it != _areas.end(); it++) {
+ for (it = _areas.begin(); it != _areas.end(); ++it) {
delete it->_value;
}
_areas.clear();
@@ -61,7 +61,7 @@
String ImageMap::findMapArea(int16 x, int16 y) {
HashMap<String, Polygon*>::iterator it;
- for (it = _areas.begin(); it != _areas.end(); it++) {
+ for (it = _areas.begin(); it != _areas.end(); ++it) {
if (it->_value->contains(x, y))
return it->_key;
}
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -58,9 +58,9 @@
void VirtualKeyboard::deleteEvents() {
ModeMap::iterator it_m;
VKEventMap::iterator it_e;
- for (it_m = _modes.begin(); it_m != _modes.end(); it_m++) {
+ for (it_m = _modes.begin(); it_m != _modes.end(); ++it_m) {
VKEventMap *evt = &(it_m->_value.events);
- for (it_e = evt->begin(); it_e != evt->end(); it_e++)
+ for (it_e = evt->begin(); it_e != evt->end(); ++it_e)
delete it_e->_value;
}
}
Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -2622,7 +2622,7 @@
if (_currentMenu == &_savenameMenu) {
_vm->updateInput();
- for (Common::List<KyraEngine_v1::Event>::const_iterator evt = _vm->_eventList.begin(); evt != _vm->_eventList.end(); evt++) {
+ for (Common::List<KyraEngine_v1::Event>::const_iterator evt = _vm->_eventList.begin(); evt != _vm->_eventList.end(); ++evt) {
if (evt->event.type == Common::EVENT_KEYDOWN)
_keyPressed = evt->event.kbd;
}
Modified: scummvm/trunk/engines/lure/res_struct.cpp
===================================================================
--- scummvm/trunk/engines/lure/res_struct.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/engines/lure/res_struct.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -787,7 +787,7 @@
debugC(ERROR_DETAILED, kLureDebugScripts, "Delay List check start at time %d",
g_system->getMillis());
- for (i = begin(); i != end(); i++) {
+ for (i = begin(); i != end(); ++i) {
SequenceDelayData *entry = (*i).get();
debugC(ERROR_DETAILED, kLureDebugScripts, "Delay List check %xh at time %d", entry->sequenceOffset, entry->timeoutCtr);
Modified: scummvm/trunk/engines/m4/assets.cpp
===================================================================
--- scummvm/trunk/engines/m4/assets.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/engines/m4/assets.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -221,7 +221,7 @@
}
SpriteAsset::~SpriteAsset() {
- for (Common::Array<SpriteAssetFrame>::iterator it = _frames.begin(); it != _frames.end(); it++) {
+ for (Common::Array<SpriteAssetFrame>::iterator it = _frames.begin(); it != _frames.end(); ++it) {
delete (*it).frame;
}
}
Modified: scummvm/trunk/engines/m4/woodscript.cpp
===================================================================
--- scummvm/trunk/engines/m4/woodscript.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/engines/m4/woodscript.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -328,7 +328,7 @@
}
}
- for (Common::Array<Sequence*>::iterator it = _layers.begin(); it != _layers.end(); it++) {
+ for (Common::Array<Sequence*>::iterator it = _layers.begin(); it != _layers.end(); ++it) {
Sequence *sequence = *it;
// TODO: Use correct clipRect etc.
@@ -341,7 +341,7 @@
// Handle end-of-sequence requests
if (_endOfSequenceRequestList.size() > 0) {
- for (Common::Array<Sequence*>::iterator it = _endOfSequenceRequestList.begin(); it != _endOfSequenceRequestList.end(); it++) {
+ for (Common::Array<Sequence*>::iterator it = _endOfSequenceRequestList.begin(); it != _endOfSequenceRequestList.end(); ++it) {
Sequence *sequence = *it;
EndOfSequenceRequestItem endOfSequenceRequestItem = sequence->getEndOfSequenceRequestItem();
@@ -354,11 +354,11 @@
void WoodScript::clear() {
- for (Common::Array<Sequence*>::iterator it = _sequences.begin(); it != _sequences.end(); it++)
+ for (Common::Array<Sequence*>::iterator it = _sequences.begin(); it != _sequences.end(); ++it)
delete *it;
_sequences.clear();
- for (Common::Array<Machine*>::iterator it = _machines.begin(); it != _machines.end(); it++)
+ for (Common::Array<Machine*>::iterator it = _machines.begin(); it != _machines.end(); ++it)
delete *it;
_machines.clear();
Modified: scummvm/trunk/graphics/video/video_player.cpp
===================================================================
--- scummvm/trunk/graphics/video/video_player.cpp 2010-01-22 18:20:57 UTC (rev 47442)
+++ scummvm/trunk/graphics/video/video_player.cpp 2010-01-22 19:05:02 UTC (rev 47443)
@@ -167,7 +167,7 @@
_skipVideo = true;
}
- for (Common::List<Common::Event>::const_iterator iter = stopEvents.begin(); iter != stopEvents.end(); iter++) {
+ for (Common::List<Common::Event>::const_iterator iter = stopEvents.begin(); iter != stopEvents.end(); ++iter) {
if (curEvent.type == iter->type) {
if (iter->type == Common::EVENT_KEYDOWN || iter->type == Common::EVENT_KEYUP) {
if (curEvent.kbd.keycode == iter->kbd.keycode) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list