[Scummvm-cvs-logs] SF.net SVN: scummvm:[35017] scummvm/trunk/engines

[fingolfin at users.sourceforge.net]

Revision: 35017
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35017&view=rev
Author:   fingolfin
Date:     2008-11-12 12:50:21 +0000 (Wed, 12 Nov 2008)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/dialogs.cpp
    scummvm/trunk/engines/dialogs.h
    scummvm/trunk/engines/scumm/dialogs.cpp

Modified: scummvm/trunk/engines/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/dialogs.cpp	2008-11-12 12:39:18 UTC (rev 35016)
+++ scummvm/trunk/engines/dialogs.cpp	2008-11-12 12:50:21 UTC (rev 35017)
@@ -48,10 +48,6 @@
 
 using GUI::CommandSender;
 using GUI::StaticTextWidget;
-using GUI::kButtonWidth;
-using GUI::kButtonHeight;
-using GUI::kBigButtonWidth;
-using GUI::kBigButtonHeight;
 using GUI::kCloseCmd;
 using GUI::kTextAlignCenter;
 using GUI::kTextAlignLeft;
@@ -60,8 +56,6 @@
 typedef GUI::OptionsDialog GUI_OptionsDialog;
 typedef GUI::Dialog GUI_Dialog;
 
-GlobalDialog::GlobalDialog(Common::String name) : GUI::Dialog(name) {}
-
 enum {
 	kSaveCmd = 'SAVE',
 	kLoadCmd = 'LOAD',
@@ -75,7 +69,7 @@
 };
 
 MainMenuDialog::MainMenuDialog(Engine *engine)
-	: GlobalDialog("GlobalMenu"), _engine(engine) {
+	: GUI::Dialog("GlobalMenu"), _engine(engine) {
 	_backgroundType = GUI::ThemeEngine::kDialogBackgroundSpecial;
 
 #ifndef DISABLE_FANCY_THEMES
@@ -202,7 +196,7 @@
 		}
 		break;
 	default:
-		GlobalDialog::handleCommand(sender, cmd, data);
+		GUI::Dialog::handleCommand(sender, cmd, data);
 	}
 }
 

Modified: scummvm/trunk/engines/dialogs.h
===================================================================
--- scummvm/trunk/engines/dialogs.h	2008-11-12 12:39:18 UTC (rev 35016)
+++ scummvm/trunk/engines/dialogs.h	2008-11-12 12:50:21 UTC (rev 35017)
@@ -34,14 +34,8 @@
 #include "engines/engine.h"
 
 
-class GlobalDialog : public GUI::Dialog {
+class MainMenuDialog : public GUI::Dialog {
 public:
-	GlobalDialog(Common::String name);
-};
-
-
-class MainMenuDialog : public GlobalDialog {
-public:
 	MainMenuDialog(Engine *engine);
 	~MainMenuDialog();
 

Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp	2008-11-12 12:39:18 UTC (rev 35016)
+++ scummvm/trunk/engines/scumm/dialogs.cpp	2008-11-12 12:50:21 UTC (rev 35017)
@@ -61,10 +61,6 @@
 
 using GUI::CommandSender;
 using GUI::StaticTextWidget;
-using GUI::kButtonWidth;
-using GUI::kButtonHeight;
-using GUI::kBigButtonWidth;
-using GUI::kBigButtonHeight;
 using GUI::kCloseCmd;
 using GUI::kTextAlignCenter;
 using GUI::kTextAlignLeft;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.