[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.88,1.89 saveload.cpp,1.120,1.121

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv14624/scummvm/scumm

Modified Files:
	dialogs.cpp saveload.cpp 
Log Message:
Changed notation involving more than one set of double colons ::
MSVC6 can't handle such notation, so simplification or
notation tricks must be employed to keep it happy.

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- dialogs.cpp	1 Dec 2003 22:16:29 -0000	1.88
+++ dialogs.cpp	9 Dec 2003 08:55:32 -0000	1.89
@@ -454,7 +454,12 @@
 }
 
 void OptionsDialog::open() {
-	GUI::OptionsDialog::open();
+	// MSVC6 FIX (Jamieson630):
+	// Simple notation would be GUI::OptionsDialog::open(), but
+	// MSVC6 has a problem with any notation that involves
+	// more than one set of double colons ::
+	// Hence the more convoluted notation.
+	((GUI::OptionsDialog *) this)->open();
 
 	// update checkboxes, too
 	subtitlesCheckbox->setState(_scumm->_noSubtitles == false);
@@ -466,7 +471,13 @@
 		// Subtitles
 		ConfMan.set("nosubtitles", !subtitlesCheckbox->getState(), _domain);
 	}
-	GUI::OptionsDialog::close();
+
+	// MSVC6 FIX (Jamieson630):
+	// Simple notation would be GUI::OptionsDialog::close(), but
+	// MSVC6 has a problem with any notation that involves
+	// more than one set of double colons ::
+	// Hence the more convoluted notation.
+	((GUI::OptionsDialog *) this)->close();
 
 
 	// Sync the engine with the config manager
@@ -497,7 +508,12 @@
 #endif
 		break;
 	default:
-		GUI::OptionsDialog::handleCommand(sender, cmd, data);
+		// MSVC6 FIX (Jamieson630):
+		// Simple notation would be GUI::OptionsDialog::handleCommand(), but
+		// MSVC6 has a problem with any notation that involves
+		// more than one set of double colons ::
+		// Hence the more convoluted notation.
+		((GUI::OptionsDialog *) this)->handleCommand(sender, cmd, data);
 	}
 }
 

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- saveload.cpp	29 Nov 2003 14:37:47 -0000	1.120
+++ saveload.cpp	9 Dec 2003 08:55:32 -0000	1.121
@@ -544,12 +544,20 @@
 		MKEND()
 	};
 
+	// MSVC6 FIX (Jamieson630):
+	// MSVC6 has a problem with any notation that involves
+	// more than one set of double colons ::
+	// The following MKLINE macros expand to such things
+	// as AudioCDManager::Status::playing, and MSVC6 has
+	// a fit with that. This typedef simplifies the notation
+	// to something MSVC6 can grasp.
+	typedef AudioCDManager::Status AudioCDManager_Status;
 	const SaveLoadEntry audioCDEntries[] = {
-		MKLINE(AudioCDManager::Status, playing, sleUint32, VER(24)),
-		MKLINE(AudioCDManager::Status, track, sleInt32, VER(24)),
-		MKLINE(AudioCDManager::Status, start, sleUint32, VER(24)),
-		MKLINE(AudioCDManager::Status, duration, sleUint32, VER(24)),
-		MKLINE(AudioCDManager::Status, numLoops, sleInt32, VER(24)),
+		MKLINE(AudioCDManager_Status, playing, sleUint32, VER(24)),
+		MKLINE(AudioCDManager_Status, track, sleInt32, VER(24)),
+		MKLINE(AudioCDManager_Status, start, sleUint32, VER(24)),
+		MKLINE(AudioCDManager_Status, duration, sleUint32, VER(24)),
+		MKLINE(AudioCDManager_Status, numLoops, sleInt32, VER(24)),
 		MKEND()
 	};