From 4ae491dd6c39ae5c6a6589e51858ff27c473e463 Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Sun, 16 Jun 2019 17:47:52 -0230
Subject: [PATCH] Refactoring: remove obsolete 'myEvent' from PKeyboardHandler.

---
 src/common/PKeyboardHandler.cxx | 10 ++++------
 src/common/PKeyboardHandler.hxx |  4 +---
 src/emucore/EventHandler.cxx    |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index b973d0bac..68556a7e4 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -42,14 +42,12 @@ static constexpr int MOD3 = KBDM_ALT;
 #endif
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-PhysicalKeyboardHandler::PhysicalKeyboardHandler(
-      OSystem& system, EventHandler& handler, Event& event)
+PhysicalKeyboardHandler::PhysicalKeyboardHandler(OSystem& system, EventHandler& handler)
   : myOSystem(system),
-    myHandler(handler),
-#ifdef BSPF_UNIX
-    myAltKeyCounter(0),
+    myHandler(handler)
+#ifdef BSPF_UNIX  // FIXME - this may no longer be relevant
+    , myAltKeyCounter(0)
 #endif
-    myEvent(event)
 {
   Int32 version = myOSystem.settings().getInt("event_ver");
 
diff --git a/src/common/PKeyboardHandler.hxx b/src/common/PKeyboardHandler.hxx
index a3d71dc30..d4a833a30 100644
--- a/src/common/PKeyboardHandler.hxx
+++ b/src/common/PKeyboardHandler.hxx
@@ -23,7 +23,6 @@
 
 class OSystem;
 class EventHandler;
-class Event;
 
 #include "bspf.hxx"
 #include "EventHandlerConstants.hxx"
@@ -46,7 +45,7 @@ class PhysicalKeyboardHandler
 {
   public:
 
-    PhysicalKeyboardHandler(OSystem& system, EventHandler& handler, Event& event);
+    PhysicalKeyboardHandler(OSystem& system, EventHandler& handler);
 
     void setDefaultMapping(Event::Type type, EventMode mode, bool updateDefaults = false);
 
@@ -108,7 +107,6 @@ class PhysicalKeyboardHandler
 
     OSystem& myOSystem;
     EventHandler& myHandler;
-    Event& myEvent;
 
     // Hashmap of key events
     KeyMap myKeyMap;
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index bd316c2a2..7275e88e3 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -70,7 +70,7 @@ EventHandler::EventHandler(OSystem& osystem)
     myIs7800(false)
 {
   // Create keyboard handler (to handle all physical keyboard functionality)
-  myPKeyHandler = make_unique<PhysicalKeyboardHandler>(osystem, *this, myEvent);
+  myPKeyHandler = make_unique<PhysicalKeyboardHandler>(osystem, *this);
 
   // Create joystick handler (to handle all physical joystick functionality)
   myPJoyHandler = make_unique<PhysicalJoystickHandler>(osystem, *this, myEvent);