[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.114,1.115 options.cpp,1.75,1.76 options.h,1.28,1.29

Max Horn fingolfin at users.sourceforge.net
Fri Apr 22 14:20:46 CEST 2005


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10386

Modified Files:
	launcher.cpp options.cpp options.h 
Log Message:
GameDetector isn't actually used here

Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- launcher.cpp	16 Apr 2005 17:55:08 -0000	1.114
+++ launcher.cpp	22 Apr 2005 21:20:22 -0000	1.115
@@ -704,7 +704,7 @@
 		editGame(item);
 		break;
 	case kOptionsCmd: {
-		GlobalOptionsDialog options(_detector);
+		GlobalOptionsDialog options;
 		options.runModal();
 		}
 		break;

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- options.cpp	16 Apr 2005 17:55:09 -0000	1.75
+++ options.cpp	22 Apr 2005 21:20:22 -0000	1.76
@@ -26,7 +26,6 @@
 #include "gui/PopUpWidget.h"
 #include "gui/TabWidget.h"
 
-#include "base/gameDetector.h"
 #include "backends/fs/fs.h"
 #include "common/config-manager.h"
 #include "common/scaler.h"
@@ -433,7 +432,7 @@
 #pragma mark -
 
 
-GlobalOptionsDialog::GlobalOptionsDialog(GameDetector &detector)
+GlobalOptionsDialog::GlobalOptionsDialog()
 	: OptionsDialog(Common::ConfigManager::kApplicationDomain, 10, 20, 320 - 2 * 10, 200 - 1 * 20) {
 
 	const int vBorder = 4;

Index: options.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- options.h	16 Apr 2005 17:55:09 -0000	1.28
+++ options.h	22 Apr 2005 21:20:22 -0000	1.29
@@ -28,8 +28,6 @@
 #include "backends/wince/CEKeysDialog.h"
 #endif
 
-class GameDetector;
-
 namespace GUI {
 
 class BrowserDialog;
@@ -111,7 +109,7 @@
 class GlobalOptionsDialog : public OptionsDialog {
 	typedef Common::String String;
 public:
-	GlobalOptionsDialog(GameDetector &detector);
+	GlobalOptionsDialog();
 	~GlobalOptionsDialog();
 
 	void open();





More information about the Scummvm-git-logs mailing list