Moved (In/Out)SaveFile(Manager) and Timer to namespace Common

svn-id: r18038

2 files changed, 11 insertions, 9 deletions

diff --git a/sword1/control.cpp b/sword1/control.cpp
index a572aaee4a..616a03db0a 100644
--- a/sword1/control.cpp
+++ b/sword1/control.cpp
@@ -157,7 +157,7 @@ void ControlButton::setSelected(uint8 selected) {
 	draw();
 }
 
-Control::Control(SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic) {
+Control::Control(Common::SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic) {
 	_saveFileMan = saveFileMan;
 	_resMan = pResMan;
 	_objMan = pObjMan;
@@ -669,7 +669,7 @@ bool Control::restoreFromFile(void) {
 }
 
 void Control::readSavegameDescriptions(void) {
-	InSaveFile *inf;
+	Common::InSaveFile *inf;
 	inf = _saveFileMan->openForLoading("SAVEGAME.INF");
 	_saveScrollPos = _saveFiles = 0;
 	_selectedSavegame = 255;
@@ -712,7 +712,7 @@ int Control::displayMessage(const char *altButton, const char *message, ...) {
 }
 
 void Control::writeSavegameDescriptions(void) {
-	OutSaveFile *outf;
+	Common::OutSaveFile *outf;
 	outf = _saveFileMan->openForSaving("SAVEGAME.INF");
 	
 	if (!outf) {
@@ -737,7 +737,7 @@ void Control::writeSavegameDescriptions(void) {
 
 bool Control::savegamesExist(void) {
 	bool retVal = false;
-	InSaveFile *inf;
+	Common::InSaveFile *inf;
 	inf = _saveFileMan->openForLoading("SAVEGAME.INF");
 	if (inf)
 		retVal = true;
@@ -894,7 +894,7 @@ void Control::saveGameToFile(uint8 slot) {
 	uint16 cnt;
 	sprintf(fName, "SAVEGAME.%03d", slot);
 	uint16 liveBuf[TOTAL_SECTIONS];
-	OutSaveFile *outf;
+	Common::OutSaveFile *outf;
 	outf = _saveFileMan->openForSaving(fName);
 	if (!outf) {
 		// Display an error message, and do nothing
@@ -927,7 +927,7 @@ bool Control::restoreGameFromFile(uint8 slot) {
 	char fName[15];
 	uint16 cnt;
 	sprintf(fName, "SAVEGAME.%03d", slot);
-	InSaveFile *inf;
+	Common::InSaveFile *inf;
 	inf = _saveFileMan->openForLoading(fName);
 	if (!inf) {
 		// Display an error message, and do nothing
diff --git a/sword1/control.h b/sword1/control.h
index 68bf176326..cda29b5ae2 100644
--- a/sword1/control.h
+++ b/sword1/control.h
@@ -26,7 +26,9 @@
 #include "sword1/sworddefs.h"
 
 class OSystem;
-class SaveFileManager;
+namespace Common {
+	class SaveFileManager;
+}
 
 namespace Sword1 {
 
@@ -68,7 +70,7 @@ struct ButtonInfo {
 
 class Control {
 public:
-	Control(SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic);
+	Control(Common::SaveFileManager *saveFileMan, ResMan *pResMan, ObjectMan *pObjMan, OSystem *system, Mouse *pMouse, Sound *pSound, Music *pMusic);
 	uint8 runPanel(void);
 	void doRestore(void);
 	void askForCd(void);
@@ -119,7 +121,7 @@ private:
 	static const ButtonInfo _deathButtons[3], _panelButtons[7], _saveButtons[16], _volumeButtons[4];
 	static const uint8 _languageStrings[8 * 20][43];
 	const uint8 (*_lStrings)[43];
-	SaveFileManager *_saveFileMan;
+	Common::SaveFileManager *_saveFileMan;
 	ObjectMan *_objMan;
 	ResMan *_resMan;
 	OSystem *_system;