[Scummvm-cvs-logs] SF.net SVN: scummvm:[34959] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 34959
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34959&view=rev
Author:   fingolfin
Date:     2008-11-09 15:14:01 +0000 (Sun, 09 Nov 2008)

Log Message:
-----------
Removed many unnecessary #includes

Modified Paths:
--------------
    scummvm/trunk/common/xmlparser.h
    scummvm/trunk/gui/ThemeEngine.cpp
    scummvm/trunk/gui/ThemeEval.cpp
    scummvm/trunk/gui/ThemeEval.h
    scummvm/trunk/gui/ThemeParser.cpp
    scummvm/trunk/gui/ThemeParser.h

Modified: scummvm/trunk/common/xmlparser.h
===================================================================
--- scummvm/trunk/common/xmlparser.h	2008-11-09 14:35:45 UTC (rev 34958)
+++ scummvm/trunk/common/xmlparser.h	2008-11-09 15:14:01 UTC (rev 34959)
@@ -29,7 +29,6 @@
 #include "common/scummsys.h"
 #include "common/archive.h"
 #include "common/system.h"
-#include "common/xmlparser.h"
 #include "common/stream.h"
 #include "common/file.h"
 #include "common/fs.h"

Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp	2008-11-09 14:35:45 UTC (rev 34958)
+++ scummvm/trunk/gui/ThemeEngine.cpp	2008-11-09 15:14:01 UTC (rev 34959)
@@ -24,27 +24,27 @@
  */
 
 #include "common/util.h"
-#include "graphics/surface.h"
-#include "graphics/colormasks.h"
 #include "common/system.h"
 #include "common/events.h"
 #include "common/config-manager.h"
 #include "common/fs.h"
 #include "common/unzip.h"
+
+#include "graphics/surface.h"
+#include "graphics/colormasks.h"
 #include "graphics/imageman.h"
 #include "graphics/cursorman.h"
+#include "graphics/VectorRenderer.h"
+
 #include "gui/launcher.h"
-
 #include "gui/ThemeEngine.h"
 #include "gui/ThemeEval.h"
-#include "graphics/VectorRenderer.h"
+#include "gui/ThemeParser.h"
 
 #define GUI_ENABLE_BUILTIN_THEME
 
 namespace GUI {
 
-using namespace Graphics;
-
 struct TextDrawData {
 	const Graphics::Font *_fontPtr;
 
@@ -456,12 +456,12 @@
 
 	if (backBuffer) {
 		freeBackbuffer();
-		_backBuffer = new Surface;
+		_backBuffer = new Graphics::Surface;
 		_backBuffer->create(width, height, sizeof(PixelType));
 	}
 
 	freeScreen();
-	_screen = new Surface;
+	_screen = new Graphics::Surface;
 	_screen->create(width, height, sizeof(PixelType));
 	_system->clearOverlay();
 }
@@ -481,7 +481,7 @@
 	}
 
 	freeRenderer();
-	_vectorRenderer = createRenderer(mode);
+	_vectorRenderer = Graphics::createRenderer(mode);
 	_vectorRenderer->setSurface(_screen);
 }
 
@@ -1152,7 +1152,7 @@
 		return true;
 
 	// Try to locate the specified file among all loaded bitmaps
-	const Surface *cursor = _bitmaps[filename];
+	const Graphics::Surface *cursor = _bitmaps[filename];
 	if (!cursor)
 		return false;
 

Modified: scummvm/trunk/gui/ThemeEval.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEval.cpp	2008-11-09 14:35:45 UTC (rev 34958)
+++ scummvm/trunk/gui/ThemeEval.cpp	2008-11-09 15:14:01 UTC (rev 34959)
@@ -23,20 +23,11 @@
  *
  */
 
-#include "common/util.h"
-#include "common/system.h"
-#include "common/events.h"
-#include "common/hashmap.h"
-#include "common/hash-str.h"
-#include "common/xmlparser.h"
-#include "graphics/scaler.h"
-
-#include "gui/ThemeEngine.h"
-#include "gui/ThemeParser.h"
 #include "gui/ThemeEval.h"
-
 #include "gui/widget.h"
 
+#include "graphics/scaler.h"
+
 namespace GUI {
 
 ThemeEval::~ThemeEval() {

Modified: scummvm/trunk/gui/ThemeEval.h
===================================================================
--- scummvm/trunk/gui/ThemeEval.h	2008-11-09 14:35:45 UTC (rev 34958)
+++ scummvm/trunk/gui/ThemeEval.h	2008-11-09 15:14:01 UTC (rev 34959)
@@ -26,16 +26,11 @@
 #ifndef GUI_THEME_EVAL
 #define GUI_THEME_EVAL
 
-#include "common/util.h"
-#include "common/system.h"
-#include "common/events.h"
+#include "common/scummsys.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
-#include "common/xmlparser.h"
+#include "common/stack.h"
 
-#include "gui/ThemeEngine.h"
-#include "gui/ThemeParser.h"
-#include "gui/ThemeEval.h"
 #include "gui/ThemeLayout.h"
 
 namespace GUI {
@@ -43,7 +38,7 @@
 class ThemeEval {
 
 	typedef Common::HashMap<Common::String, int> VariablesMap;
-	typedef Common::HashMap<Common::String, ThemeLayout*> LayoutsMap;
+	typedef Common::HashMap<Common::String, ThemeLayout *> LayoutsMap;
 	
 public:
 	ThemeEval() {
@@ -105,7 +100,7 @@
 	VariablesMap _builtin;
 	
 	LayoutsMap _layouts;
-	Common::Stack<ThemeLayout*> _curLayout;
+	Common::Stack<ThemeLayout *> _curLayout;
 	Common::String _curDialog;
 };
 

Modified: scummvm/trunk/gui/ThemeParser.cpp
===================================================================
--- scummvm/trunk/gui/ThemeParser.cpp	2008-11-09 14:35:45 UTC (rev 34958)
+++ scummvm/trunk/gui/ThemeParser.cpp	2008-11-09 15:14:01 UTC (rev 34959)
@@ -60,6 +60,13 @@
 	_theme = parent;
 }
 
+ThemeParser::~ThemeParser() {
+	delete _defaultStepGlobal;
+	delete _defaultStepLocal;
+	_palette.clear();
+	_drawFunctions.clear();
+}
+
 void ThemeParser::cleanup() {
 	delete _defaultStepGlobal;
 	delete _defaultStepLocal;

Modified: scummvm/trunk/gui/ThemeParser.h
===================================================================
--- scummvm/trunk/gui/ThemeParser.h	2008-11-09 14:35:45 UTC (rev 34958)
+++ scummvm/trunk/gui/ThemeParser.h	2008-11-09 15:14:01 UTC (rev 34959)
@@ -27,17 +27,9 @@
 #define THEME_PARSER_H
 
 #include "common/scummsys.h"
-#include "graphics/surface.h"
 #include "common/system.h"
-
-#include "common/hashmap.h"
-#include "common/hash-str.h"
-#include "common/stack.h"
 #include "common/xmlparser.h"
 
-#include "graphics/VectorRenderer.h"
-#include "gui/ThemeEngine.h"
-
 namespace GUI {
 
 class ThemeEngine;	
@@ -48,12 +40,7 @@
 public:
 	ThemeParser(GUI::ThemeEngine *parent);
 	
-	virtual ~ThemeParser() {
-		delete _defaultStepGlobal;
-		delete _defaultStepLocal;
-		_palette.clear();
-		_drawFunctions.clear();
-	}
+	virtual ~ThemeParser();
 	
 	bool getPaletteColor(const Common::String &name, int &r, int &g, int &b) {
 		if (!_palette.contains(name))


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