From 868b2fd7cbdfecfd737d47967c2dcc43b4937fbc Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Wed, 14 Jun 2023 19:47:17 -0230
Subject: [PATCH] Minor fixes for suggestions from clang-tidy.

---
 src/common/PJoystickHandler.hxx | 12 ++++++------
 src/emucore/CartGL.cxx          |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/PJoystickHandler.hxx b/src/common/PJoystickHandler.hxx
index cbba9b0c0..bf3d6ee28 100644
--- a/src/common/PJoystickHandler.hxx
+++ b/src/common/PJoystickHandler.hxx
@@ -79,16 +79,11 @@ class PhysicalJoystickHandler
     void setDefaultMapping(Event::Type event, EventMode mode);
 
     /** define mappings for current controllers */
-    void defineControllerMappings(const Controller::Type type, Controller::Jack port, 
+    void defineControllerMappings(const Controller::Type type, Controller::Jack port,
                                   const Properties& properties);
     /** enable mappings for emulation mode */
     void enableEmulationMappings();
 
-    /** return event mode for given property */
-    EventMode getMode(const Properties& properties, const PropType propType);
-    /** return event mode for given controller type */
-    EventMode getMode(const Controller::Type type);
-
     void eraseMapping(Event::Type event, EventMode mode);
     void saveMapping();
     string getMappingDesc(Event::Type, EventMode mode) const;
@@ -185,6 +180,11 @@ class PhysicalJoystickHandler
                           EventMode mode = EventMode::kEmulationMode,
                           bool updateDefaults = false);
 
+    /** return event mode for given property */
+    static EventMode getMode(const Properties& properties, const PropType propType);
+    /** return event mode for given controller type */
+    static EventMode getMode(const Controller::Type type);
+
     /** returns the event's controller mode */
     static EventMode getEventMode(const Event::Type event, const EventMode mode);
     /** Checks event type. */
diff --git a/src/emucore/CartGL.cxx b/src/emucore/CartGL.cxx
index bf9d9c496..a884f434a 100644
--- a/src/emucore/CartGL.cxx
+++ b/src/emucore/CartGL.cxx
@@ -63,7 +63,7 @@ void CartridgeGL::install(System& system)
 {
   CartridgeEnhanced::install(system);
 
-  System::PageAccess access(this, System::PageAccessType::READ);
+  const System::PageAccess access(this, System::PageAccessType::READ);
 
   mySystem->setPageAccess(0x480, access);
   mySystem->setPageAccess(0x580, access);