ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compile warnings and errors from last commit, detected by clang.

This commit is contained in:
Stephen Anthony 2019-04-27 17:08:58 -02:30
parent 65e6aa7bc0
commit 04304fce32
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/LauncherDialog.cxx
View File

@ -55,9 +55,7 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
myPattern(nullptr), myPattern(nullptr),
myAllFiles(nullptr), myAllFiles(nullptr),
myRomInfoWidget(nullptr), myRomInfoWidget(nullptr),
mySelectedItem(0), mySelectedItem(0)
myStellaSettingsDialog(nullptr),
myOptionsDialog(nullptr)
{ {
myUseMinimalUI = instance().settings().getBool("minimal_ui"); myUseMinimalUI = instance().settings().getBool("minimal_ui");
@ -653,4 +651,4 @@ void LauncherDialog::openSettings()
Menu::AppMode::launcher); Menu::AppMode::launcher);
myOptionsDialog->open(); myOptionsDialog->open();
} }
} }

2
src/gui/StellaSettingsDialog.cxx
View File

@ -298,7 +298,7 @@ void StellaSettingsDialog::handleCommand(CommandSender* sender, int cmd,
case GuiObject::kOKCmd: case GuiObject::kOKCmd:
saveConfig(); saveConfig();
// falls through [[fallthrough]];
case GuiObject::kCloseCmd: case GuiObject::kCloseCmd:
if (myMode != Menu::AppMode::emulator) if (myMode != Menu::AppMode::emulator)
close(); close();

2
src/gui/StellaSettingsDialog.hxx
View File

@ -23,10 +23,10 @@ class PopUpWidget;
#include "Props.hxx" #include "Props.hxx"
#include "Menu.hxx" #include "Menu.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "MessageBox.hxx"
namespace GUI { namespace GUI {
class Font; class Font;
class MessageBox;
} }
class StellaSettingsDialog : public Dialog class StellaSettingsDialog : public Dialog