[Gemrb-commits] SF.net SVN: gemrb:[5536] gemrb/trunk/gemrb/plugins/Core

[<wjp...@us...>]

Revision: 5536
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5536&view=rev
Author:   wjpalenstijn
Date:     2009-01-25 20:55:07 +0000 (Sun, 25 Jan 2009)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/Control.cpp
    gemrb/trunk/gemrb/plugins/Core/Window.cpp

Modified: gemrb/trunk/gemrb/plugins/Core/Control.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Control.cpp	2009-01-25 20:43:23 UTC (rev 5535)
+++ gemrb/trunk/gemrb/plugins/Core/Control.cpp	2009-01-25 20:55:07 UTC (rev 5536)
@@ -55,13 +55,9 @@
 		printMessage("Control","Destroying control inside event handler, crash may occur!\n", LIGHT_RED);
 	}
 	core->DisplayTooltip( 0, 0, NULL );
-	if (Tooltip) {
-		free (Tooltip);
-	}
+	free (Tooltip);
 
-	if (animation) {
-		delete animation;
-	}
+	delete animation;
 
 	core->GetVideoDriver()->FreeSprite(AnimPicture);
 }
@@ -69,8 +65,7 @@
 /** Sets the Tooltip text of the current control */
 int Control::SetTooltip(const char* string)
 {
-	if (Tooltip)
-		free(Tooltip);
+	free(Tooltip);
 
 	if ((string == NULL) || (string[0] == 0)) {
 		Tooltip = NULL;

Modified: gemrb/trunk/gemrb/plugins/Core/Window.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Window.cpp	2009-01-25 20:43:23 UTC (rev 5535)
+++ gemrb/trunk/gemrb/plugins/Core/Window.cpp	2009-01-25 20:55:07 UTC (rev 5536)
@@ -53,13 +53,11 @@
 	std::vector< Control*>::iterator m = Controls.begin();
 	while (Controls.size() != 0) {
 		Control* ctrl = ( *m );
-		delete( ctrl );
+		delete ctrl;
 		Controls.erase( m );
 		m = Controls.begin();
 	}
-	if (BackGround) {
-		core->GetVideoDriver()->FreeSprite( BackGround );
-	}
+	core->GetVideoDriver()->FreeSprite( BackGround );
 	BackGround = NULL;
 }
 /** Add a Control in the Window */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.