Ticket #8305: options_dialog.rev2.diff

scummvm/scumm/dialogs.cpp

@@ -55 +55 @@
 using GUI::kTextAlignLeft;
 using GUI::WIDGET_ENABLED;
 
+typedef GUI::OptionsDialog GUI_OptionsDialog;
+
 namespace Scumm {
 
 struct ResString {
@@ -409 +411 @@
 };
 
 #ifndef _WIN32_WCE
-OptionsDialog::OptionsDialog(ScummEngine *scumm)
+ConfigDialog::ConfigDialog(ScummEngine *scumm)
         : GUI::OptionsDialog("", 40, 30, 240, 124), _scumm(scumm) {
 #else
-OptionsDialog::OptionsDialog(ScummEngine *scumm)
+ConfigDialog::ConfigDialog(ScummEngine *scumm)
         : GUI::OptionsDialog("", 40, 30, 240, 124 + kButtonHeight + 4), _scumm(scumm) {
 #endif
         //
@@ -447 +449 @@
 #endif
 }
 
-OptionsDialog::~OptionsDialog() {
+ConfigDialog::~ConfigDialog() {
 #ifdef _WIN32_WCE
         delete _keysDialog;
 #endif
 }
 
-void OptionsDialog::open() {
-        GUI::OptionsDialog::open();
+void ConfigDialog::open() {
+        GUI_OptionsDialog::open();
 
         // update checkboxes, too
         subtitlesCheckbox->setState(_scumm->_noSubtitles == false);
 }
 
-void OptionsDialog::close() {
+void ConfigDialog::close() {
         
         if (getResult()) {
                 // Subtitles
                 ConfMan.set("nosubtitles", !subtitlesCheckbox->getState(), _domain);
         }
 
-        GUI::OptionsDialog::close();
-
+        GUI_OptionsDialog::close();
 
         // Sync the engine with the config manager
         int soundVolumeMaster = ConfMan.getInt("master_volume");
@@ -490 +491 @@
 }
 
 
-void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
+void ConfigDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
         switch (cmd) {
         case kKeysCmd:
 #ifdef _WIN32_WCE
@@ -498 +499 @@
 #endif
                 break;
         default:
-                GUI::OptionsDialog::handleCommand(sender, cmd, data);
+                GUI_OptionsDialog::handleCommand (sender, cmd, data);
         }
 }
 

scummvm/scumm/dialogs.h

@@ -101 +101 @@
 
 #endif
 
-class OptionsDialog : public GUI::OptionsDialog {
+class ConfigDialog : public GUI::OptionsDialog {
 protected:
         ScummEngine *_scumm;
 #ifdef _WIN32_WCE
@@ -109 +109 @@
 #endif
 
 public:
-        OptionsDialog(ScummEngine *scumm);
-        ~OptionsDialog();
+        ConfigDialog(ScummEngine *scumm);
+        ~ConfigDialog();
 
         virtual void open();
         virtual void close();

scummvm/scumm/scummvm.cpp

@@ -2519 +2519 @@
 
 void ScummEngine::optionsDialog() {
         if (!_optionsDialog)
-                _optionsDialog = new OptionsDialog(this);
+                _optionsDialog = new ConfigDialog(this);
         runDialog(*_optionsDialog);
 }