From 19241fe177c531e2af9ed69ac02aaf4003ccca4a Mon Sep 17 00:00:00 2001 From: Daniel Kristjansson Date: Tue, 11 Sep 2012 12:49:03 -0400 Subject: [PATCH] Fix partial virtual overrides in mythgame settings ui usage. --- mythplugins/mythgame/mythgame/gamesettings.cpp | 4 ++-- mythplugins/mythgame/mythgame/gamesettings.h | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mythplugins/mythgame/mythgame/gamesettings.cpp b/mythplugins/mythgame/mythgame/gamesettings.cpp index a901eba0bfc..456578e2cf7 100644 --- a/mythplugins/mythgame/mythgame/gamesettings.cpp +++ b/mythplugins/mythgame/mythgame/gamesettings.cpp @@ -333,9 +333,9 @@ MythGamePlayerEditor::MythGamePlayerEditor() : listbox(new ListBoxSetting(this)) addChild(listbox); } -DialogCode MythGamePlayerEditor::exec(void) +DialogCode MythGamePlayerEditor::exec(bool saveOnExec, bool doLoad) { - while (ConfigurationDialog::exec() == kDialogCodeAccepted) + while (ConfigurationDialog::exec(saveOnExec, doLoad) == kDialogCodeAccepted) edit(); return kDialogCodeRejected; diff --git a/mythplugins/mythgame/mythgame/gamesettings.h b/mythplugins/mythgame/mythgame/gamesettings.h index f411351782a..995e81c308c 100644 --- a/mythplugins/mythgame/mythgame/gamesettings.h +++ b/mythplugins/mythgame/mythgame/gamesettings.h @@ -86,7 +86,9 @@ class MythGamePlayerSettings : public QObject, public ConfigurationWizard { if (name) ConfigurationWizard::Save(); - }; + } + + virtual void Save(QString /*destination*/) { } private: class ID : public AutoIncrementDBSetting @@ -128,10 +130,11 @@ class MPUBLIC MythGamePlayerEditor : public QObject, public ConfigurationDialog virtual MythDialog *dialogWidget(MythMainWindow *parent, const char *widgetName=0); - virtual DialogCode exec(void); + virtual DialogCode exec(bool saveOnExec = true, bool doLoad = true); virtual void Load(void); virtual void Save(void) { } + virtual void Save(QString /*destination*/) { } public slots: void menu();