From b2faf3e63511405f57a85fddb21949adcd2cc25f Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Thu, 3 Sep 2020 20:44:41 -0230
Subject: [PATCH] Fix a few compiler warning and errors from the latest g++ and
 clang compilers.

---
 src/emucore/QuadTari.hxx   | 13 +++++++------
 src/gui/GameInfoDialog.cxx |  5 +++++
 src/gui/GameInfoDialog.hxx |  2 +-
 src/gui/QuadTariDialog.cxx |  3 +--
 src/gui/module.mk          |  1 +
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/emucore/QuadTari.hxx b/src/emucore/QuadTari.hxx
index bfaf1b5d8..449a43dff 100644
--- a/src/emucore/QuadTari.hxx
+++ b/src/emucore/QuadTari.hxx
@@ -26,23 +26,24 @@ class Event;
 
   @author  Thomas Jentzsch
 */
-class QuadTari: public Controller
+class QuadTari : public Controller
 {
   friend class QuadTariWidget;
   public:
     /**
       Create a QuadTari controller plugged into the specified jack
 
-      @param jack        The jack the controller is plugged into
-      @param event       The event object to use for events
-      @param system      The system using this controller
-      @param firstType   The type of the first, plugged-in controller
-      @param secondType  The type of the second, plugged-in controller
+      @param jack       The jack the controller is plugged into
+      @param osystem    The OSystem object to use
+      @param system     The system using this controller
+      @param properties The properties to use for the current ROM
     */
     QuadTari(Jack jack, OSystem& osystem, const System& system, const Properties& properties);
     ~QuadTari() override = default;
 
   public:
+     using Controller::read;
+
     /**
       Read the value of the specified digital pin for this controller.
 
diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx
index e5eb1162c..7e6e247f2 100644
--- a/src/gui/GameInfoDialog.cxx
+++ b/src/gui/GameInfoDialog.cxx
@@ -394,6 +394,11 @@ GameInfoDialog::GameInfoDialog(
   addBGroupToFocusList(wid);
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+GameInfoDialog::~GameInfoDialog()
+{
+}
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void GameInfoDialog::loadConfig()
 {
diff --git a/src/gui/GameInfoDialog.hxx b/src/gui/GameInfoDialog.hxx
index 19d1c29e3..72e3df1a7 100644
--- a/src/gui/GameInfoDialog.hxx
+++ b/src/gui/GameInfoDialog.hxx
@@ -37,7 +37,7 @@ class GameInfoDialog : public Dialog, public CommandSender
   public:
     GameInfoDialog(OSystem& osystem, DialogContainer& parent,
                    const GUI::Font& font, GuiObject* boss, int max_w, int max_h);
-    ~GameInfoDialog() override = default;
+    ~GameInfoDialog() override;
 
   private:
     void loadConfig() override;
diff --git a/src/gui/QuadTariDialog.cxx b/src/gui/QuadTariDialog.cxx
index dda63853b..3db0a6a65 100644
--- a/src/gui/QuadTariDialog.cxx
+++ b/src/gui/QuadTariDialog.cxx
@@ -33,8 +33,7 @@ QuadTariDialog::QuadTariDialog(GuiObject* boss, const GUI::Font& font, int max_w
 {
   const int lineHeight = font.getLineHeight(),
     fontHeight = font.getFontHeight(),
-    fontWidth = font.getMaxCharWidth(),
-    buttonHeight = font.getLineHeight() * 1.25;
+    fontWidth = font.getMaxCharWidth();
   const int VBORDER = fontHeight / 2;
   const int HBORDER = fontWidth * 1.25;
   const int VGAP = fontHeight / 4;
diff --git a/src/gui/module.mk b/src/gui/module.mk
index 4b52d3996..d7412d2a2 100644
--- a/src/gui/module.mk
+++ b/src/gui/module.mk
@@ -36,6 +36,7 @@ MODULE_OBJS := \
 	src/gui/OptionsDialog.o \
 	src/gui/PopUpWidget.o \
 	src/gui/ProgressDialog.o \
+	src/gui/QuadTariDialog.o \
 	src/gui/R77HelpDialog.o \
 	src/gui/RadioButtonWidget.o \
 	src/gui/RomAuditDialog.o \