Reduce (indirect) dependencies on gui/eval.h (and thus common/assocarray.h) to a minimum

svn-id: r21426

engines/scumm/dialogs.cpp

@@ -29,6 +29,7 @@
 
 #include "gui/about.h"
 #include "gui/chooser.h"
+#include "gui/eval.h"
 #include "gui/newgui.h"
 #include "gui/ListWidget.h"
 

gui/ListWidget.cpp

@@ -24,6 +24,7 @@
 #include "gui/ListWidget.h"
 #include "gui/ScrollBarWidget.h"
 #include "gui/dialog.h"
+#include "gui/eval.h"
 #include "gui/newgui.h"
 
 namespace GUI {

gui/about.cpp

@@ -25,6 +25,7 @@
 #include "common/system.h"
 #include "common/util.h"
 #include "gui/about.h"
+#include "gui/eval.h"
 #include "gui/newgui.h"
 #include "gui/widget.h"
 

gui/dialog.cpp

@@ -45,7 +45,7 @@ Dialog::Dialog(int x, int y, int w, int h)
 	_drawingHints = THEME_HINT_FIRST_DRAW | THEME_HINT_SAVE_BACKGROUND;
 }
 
-Dialog::Dialog(String name)
+Dialog::Dialog(Common::String name)
 	: GuiObject(name),
 	  _mouseWidget(0), _focusedWidget(0), _dragWidget(0), _visible(false), _drawingHints(0) {
 	_drawingHints = THEME_HINT_FIRST_DRAW | THEME_HINT_SAVE_BACKGROUND;

gui/eval.cpp

@@ -37,7 +37,8 @@ static bool isdelim(char c) {
 	return false;
 }
 
-Eval::Eval() {
+Eval::Eval()
+ : _aliases(Common::String::emptyString), _vars(0) {
 	loadConstants();
 }
 

gui/launcher.cpp

@@ -35,6 +35,7 @@
 #include "gui/about.h"
 #include "gui/browser.h"
 #include "gui/chooser.h"
+#include "gui/eval.h"
 #include "gui/launcher.h"
 #include "gui/message.h"
 #include "gui/newgui.h"

gui/module.mk

@@ -18,6 +18,7 @@ MODULE_OBJS := \
 	ScrollBarWidget.o \
 	TabWidget.o \
 	widget.o \
+	theme.o \
 	ThemeClassic.o \
 	ThemeNew.o \
 	theme-config.o

gui/newgui.cpp

@@ -24,6 +24,7 @@
 #include "common/util.h"
 #include "gui/newgui.h"
 #include "gui/dialog.h"
+#include "gui/eval.h"
 
 #include "common/config-manager.h"
 
@@ -309,4 +310,9 @@ void NewGui::animateCursor() {
 	}
 }
 
+WidgetSize NewGui::getWidgetSize() {
+	return (WidgetSize)(_theme->_evaluator->getVar("widgetSize"));
+}
+
+
 } // End of namespace GUI

gui/newgui.h

@@ -78,9 +78,7 @@ public:
 	int getStringWidth(const Common::String &str) const { return _theme->getStringWidth(str); }
 	int getCharWidth(byte c) const { return _theme->getCharWidth(c); }
 
-	WidgetSize getWidgetSize() {
+	WidgetSize getWidgetSize();
-		return (WidgetSize)(_theme->_evaluator->getVar("widgetSize"));
-	}
 
 
 protected:

gui/options.cpp

@@ -22,6 +22,7 @@
 #include "common/stdafx.h"
 #include "gui/browser.h"
 #include "gui/chooser.h"
+#include "gui/eval.h"
 #include "gui/newgui.h"
 #include "gui/options.h"
 #include "gui/PopUpWidget.h"

gui/theme.cpp

@@ -0,0 +1,38 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2006 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id: theme.h 21268 2006-03-14 02:19:38Z sev $
+ */
+
+#include "gui/theme.h"
+#include "gui/eval.h"
+
+namespace GUI {
+
+Theme::Theme() : _drawArea(), _configFile(), _loadedThemeX(0), _loadedThemeY(0) {
+	Common::MemoryReadStream s((const byte *)_defaultConfigINI, strlen(_defaultConfigINI));
+	_defaultConfig.loadFromStream(s);
+
+	_evaluator = new Eval();
+}
+	
+Theme::~Theme() {
+	delete _evaluator;
+}
+
+} // End of namespace GUI

gui/theme.h

@@ -32,10 +32,11 @@
 #include "graphics/fontman.h"
 
 #include "gui/widget.h"
-#include "gui/eval.h"
 
 namespace GUI {
 
+class Eval;
+
 // Hints to the theme engine that the widget is used in a non-standard way.
 
 enum {
@@ -61,14 +62,9 @@ enum {
 class Theme {
 	typedef Common::String String;
 public:
-	Theme() : _drawArea(), _configFile(), _loadedThemeX(0), _loadedThemeY(0) {
+	Theme();
-		Common::MemoryReadStream s((const byte *)_defaultConfigINI, strlen(_defaultConfigINI));
-		_defaultConfig.loadFromStream(s);
-
-		_evaluator = new Eval();
-	}
 		
-	virtual ~Theme() { delete _evaluator;}
+	virtual ~Theme();
 
 	enum kTextAlign {
 		kTextAlignLeft,

gui/widget.cpp

@@ -24,6 +24,7 @@
 #include "graphics/fontman.h"
 #include "gui/widget.h"
 #include "gui/dialog.h"
+#include "gui/eval.h"
 #include "gui/newgui.h"
 
 namespace GUI {