From 3b108dcdeb3cd864581d0d590f45cb3a85ff9a66 Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Sun, 5 May 2019 11:43:31 -0230
Subject: [PATCH] Fix warnings from clang.

---
 src/gui/Dialog.cxx               |  4 ++--
 src/gui/R77HelpDialog.cxx        |  7 +++++--
 src/gui/StellaSettingsDialog.cxx | 14 ++------------
 src/gui/StellaSettingsDialog.hxx |  3 ---
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/gui/Dialog.cxx b/src/gui/Dialog.cxx
index 9c3873241..e50ef7c9c 100644
--- a/src/gui/Dialog.cxx
+++ b/src/gui/Dialog.cxx
@@ -60,12 +60,12 @@ Dialog::Dialog(OSystem& instance, DialogContainer& parent, const GUI::Font& font
     _processCancel(false),
     _title(title),
     _th(0),
+    _layer(0),
     _surface(nullptr),
     _tabID(0),
     _flags(Widget::FLAG_ENABLED | Widget::FLAG_BORDER | Widget::FLAG_CLEARBG),
     _max_w(0),
-    _max_h(0),
-    _layer(0)
+    _max_h(0)
 {
   setTitle(title);
   setDirty();
diff --git a/src/gui/R77HelpDialog.cxx b/src/gui/R77HelpDialog.cxx
index 5147b5582..9c5336d23 100644
--- a/src/gui/R77HelpDialog.cxx
+++ b/src/gui/R77HelpDialog.cxx
@@ -97,10 +97,13 @@ void R77HelpDialog::loadConfig()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void R77HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title)
 {
+// FIXME - this currently isn't used
+#if 0
 #ifdef BSPF_MACOS
-#define ALT_ "Cmd"
+  #define ALT_ "Cmd"
 #else
-#define ALT_ "Alt"
+  #define ALT_ "Alt"
+#endif
 #endif
 
   int i = 0;
diff --git a/src/gui/StellaSettingsDialog.cxx b/src/gui/StellaSettingsDialog.cxx
index 3c87744a9..71c42fc9b 100644
--- a/src/gui/StellaSettingsDialog.cxx
+++ b/src/gui/StellaSettingsDialog.cxx
@@ -24,23 +24,13 @@
 #include "PopUpWidget.hxx"
 #include "MessageBox.hxx"
 
-// FIXME - use the R77 define in the final release
-//         use the '1' define for testing
-#if defined(RETRON77)
-// #if 1
-#include "R77HelpDialog.hxx"
-#else
-#include "HelpDialog.hxx"
-#endif
-
 #include "StellaSettingsDialog.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 StellaSettingsDialog::StellaSettingsDialog(OSystem& osystem, DialogContainer& parent,
   const GUI::Font& font, int max_w, int max_h, Menu::AppMode mode)
   : Dialog(osystem, parent, font, "Basic settings"),
-    myMode(mode),
-    myHelpDialog(nullptr)
+    myMode(mode)
 {
   const int VBORDER = 8;
   const int HBORDER = 10;
@@ -516,4 +506,4 @@ void StellaSettingsDialog::openHelp()
     myHelpDialog = make_unique<HelpDialog>(instance(), parent(), _font);
   #endif
   myHelpDialog->open();
-}
\ No newline at end of file
+}
diff --git a/src/gui/StellaSettingsDialog.hxx b/src/gui/StellaSettingsDialog.hxx
index bff738c7b..75918cebe 100644
--- a/src/gui/StellaSettingsDialog.hxx
+++ b/src/gui/StellaSettingsDialog.hxx
@@ -68,9 +68,6 @@ class StellaSettingsDialog : public Dialog
     void openHelp();
 
   private:
-    // advanced settings mode:
-    ButtonWidget*     myAdvancedSettings;
-
     // UI theme
     PopUpWidget*      myThemePopup;
     PopUpWidget*      myPositionPopup;