Moved SaveLoadChooser class to saveload.cpp and adjusted dependencies.

svn-id: r27954

4 files changed, 36 insertions, 29 deletions

diff --git a/engines/parallaction/defs.h b/engines/parallaction/defs.h
index d7dc3388e7..c41130670e 100644
--- a/engines/parallaction/defs.h
+++ b/engines/parallaction/defs.h
@@ -28,6 +28,7 @@
 
 #include "common/stdafx.h"
 #include "common/list.h"
+#include "common/rect.h"
 
 namespace Parallaction {
 
diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp
index 6d7cb1471c..2e6d9e4820 100644
--- a/engines/parallaction/disk.cpp
+++ b/engines/parallaction/disk.cpp
@@ -26,6 +26,8 @@
 #include "common/stdafx.h"
 
 #include "graphics/iff.h"
+#include "graphics/surface.h"
+
 #include "parallaction/parallaction.h"
 
 
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 5f7ada5d68..f2143c844d 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -27,8 +27,7 @@
 #define PARALLACTION_H
 
 #include "common/str.h"
-#include "gui/dialog.h"
-#include "gui/widget.h"
+
 
 #include "engines/engine.h"
 
@@ -471,33 +470,6 @@ protected:		// members
 // FIXME: remove global
 extern Parallaction *_vm;
 
-class SaveLoadChooser : public GUI::Dialog {
-	typedef Common::String String;
-	typedef Common::StringList StringList;
-protected:
-	GUI::ListWidget		*_list;
-	GUI::ButtonWidget	*_chooseButton;
-	GUI::GraphicsWidget	*_gfxWidget;
-	GUI::StaticTextWidget	*_date;
-	GUI::StaticTextWidget	*_time;
-	GUI::StaticTextWidget	*_playtime;
-	GUI::ContainerWidget	*_container;
-	Parallaction			*_vm;
-
-	uint8 _fillR, _fillG, _fillB;
-
-public:
-	SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction *engine);
-	~SaveLoadChooser();
-
-	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
-	const String &getResultString() const;
-	void setList(const StringList& list);
-	int runModal();
-
-	virtual void reflowLayout();
-};
-
 
 } // namespace Parallaction
 
diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp
index f1dc53539d..2a9431ef94 100644
--- a/engines/parallaction/saveload.cpp
+++ b/engines/parallaction/saveload.cpp
@@ -26,6 +26,7 @@
 #include "common/stdafx.h"
 #include "common/savefile.h"
 
+#include "gui/dialog.h"
 #include "gui/widget.h"
 #include "gui/ListWidget.h"
 #include "gui/message.h"
@@ -48,6 +49,37 @@ namespace Parallaction {
 
 extern char _gameNames[][20];
 
+
+class SaveLoadChooser : public GUI::Dialog {
+	typedef Common::String String;
+	typedef Common::StringList StringList;
+protected:
+	GUI::ListWidget		*_list;
+	GUI::ButtonWidget	*_chooseButton;
+	GUI::GraphicsWidget	*_gfxWidget;
+	GUI::StaticTextWidget	*_date;
+	GUI::StaticTextWidget	*_time;
+	GUI::StaticTextWidget	*_playtime;
+	GUI::ContainerWidget	*_container;
+	Parallaction			*_vm;
+
+	uint8 _fillR, _fillG, _fillB;
+
+public:
+	SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction *engine);
+	~SaveLoadChooser();
+
+	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
+	const String &getResultString() const;
+	void setList(const StringList& list);
+	int runModal();
+
+	virtual void reflowLayout();
+};
+
+
+
+
 void Parallaction::doLoadGame(uint16 slot) {
 
 	_introSarcData3 = 200;