Remove multiple inheritance and make SDLFrame inherit from GNUFrame.

See sh95014#37 Signed-off-by: Andrea Odetti <[email protected]>
audetto · Jan 4, 2024 · f05741b · f05741b
1 parent 5679f19
commit f05741b
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 20 deletions.
diff --git a/source/frontends/common2/gnuframe.cpp b/source/frontends/common2/gnuframe.cpp
@@ -78,8 +78,9 @@ namespace
 namespace common2
 {
 
-  GNUFrame::GNUFrame()
-  : myHomeDir(GetHomeDir())
+  GNUFrame::GNUFrame(const EmulatorOptions & options)
+  : CommonFrame(options)
+  , myHomeDir(GetHomeDir())
   , myResourceFolder(getResourceFolder("/resource/"))
   {
     // should this go down to LinuxFrame (maybe Initialisation?)

diff --git a/source/frontends/common2/gnuframe.h b/source/frontends/common2/gnuframe.h
@@ -6,10 +6,10 @@
 namespace common2
 {
 
-  class GNUFrame : public virtual CommonFrame
+  class GNUFrame : public CommonFrame
   {
   public:
-    GNUFrame();
+    GNUFrame(const common2::EmulatorOptions & option);
 
     std::string Video_GetScreenShotFolder() const override;
     std::string getResourcePath(const std::string & filename) override;

diff --git a/source/frontends/libretro/retroframe.cpp b/source/frontends/libretro/retroframe.cpp
@@ -1,5 +1,4 @@
 #include "StdAfx.h"
-#include "frontends/common2/commonframe.h"
 #include "frontends/libretro/retroframe.h"
 #include "frontends/libretro/environment.h"
 
@@ -79,7 +78,7 @@ namespace ra2
 {
 
   RetroFrame::RetroFrame(const common2::EmulatorOptions & options)
-  : common2::CommonFrame(options)
+  : common2::GNUFrame(options)
   {
   }
 

diff --git a/source/frontends/libretro/retroframe.h b/source/frontends/libretro/retroframe.h
@@ -1,14 +1,13 @@
 #pragma once
 
-#include "frontends/common2/commonframe.h"
 #include "frontends/common2/gnuframe.h"
 
 #include <vector>
 
 namespace ra2
 {
 
-  class RetroFrame : public virtual common2::CommonFrame, public common2::GNUFrame
+  class RetroFrame : public common2::GNUFrame
   {
   public:
     RetroFrame(const common2::EmulatorOptions & options);

diff --git a/source/frontends/ncurses/nframe.cpp b/source/frontends/ncurses/nframe.cpp
@@ -43,7 +43,7 @@ namespace na2
   };
 
   NFrame::NFrame(const common2::EmulatorOptions & options, const std::shared_ptr<EvDevPaddle> & paddle)
-    : common2::CommonFrame(options)
+    : common2::GNUFrame(options)
     , myPaddle(paddle)
     , myRows(-1)
     , myColumns(-1)

diff --git a/source/frontends/ncurses/nframe.h b/source/frontends/ncurses/nframe.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "frontends/common2/commonframe.h"
 #include "frontends/common2/gnuframe.h"
 
 #include <memory>
@@ -14,7 +13,7 @@ namespace na2
   class EvDevPaddle;
   struct NCurses;
 
-  class NFrame : public virtual common2::CommonFrame, public common2::GNUFrame
+  class NFrame : public common2::GNUFrame
   {
   public:
     NFrame(const common2::EmulatorOptions & options, const std::shared_ptr<EvDevPaddle> & paddle);

diff --git a/source/frontends/sdl/imgui/sdlimguiframe.cpp b/source/frontends/sdl/imgui/sdlimguiframe.cpp
@@ -51,7 +51,6 @@ namespace sa2
 
   SDLImGuiFrame::SDLImGuiFrame(const common2::EmulatorOptions & options)
     : SDLFrame(options)
-    , CommonFrame(options)
     , myPresenting(false)
   {
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SA2_CONTEXT_FLAGS);

diff --git a/source/frontends/sdl/imgui/sdlimguiframe.h b/source/frontends/sdl/imgui/sdlimguiframe.h
@@ -3,12 +3,11 @@
 #include "frontends/sdl/sdlframe.h"
 #include "frontends/sdl/imgui/sdlsettings.h"
 #include "frontends/sdl/imgui/glselector.h"
-#include "frontends/common2/gnuframe.h"
 
 namespace sa2
 {
 
-  class SDLImGuiFrame : public SDLFrame, public common2::GNUFrame
+  class SDLImGuiFrame : public SDLFrame
   {
   public:
     SDLImGuiFrame(const common2::EmulatorOptions & options);

diff --git a/source/frontends/sdl/renderer/sdlrendererframe.cpp b/source/frontends/sdl/renderer/sdlrendererframe.cpp
@@ -13,7 +13,6 @@ namespace sa2
 
   SDLRendererFrame::SDLRendererFrame(const common2::EmulatorOptions & options)
     : SDLFrame(options)
-    , CommonFrame(options)
   {
     const common2::Geometry geometry = getGeometryOrDefault(options.geometry);
 

diff --git a/source/frontends/sdl/renderer/sdlrendererframe.h b/source/frontends/sdl/renderer/sdlrendererframe.h
@@ -1,13 +1,12 @@
 #pragma once
 
 #include "frontends/sdl/sdlframe.h"
-#include "frontends/common2/gnuframe.h"
 #include <memory>
 
 namespace sa2
 {
 
-  class SDLRendererFrame : public SDLFrame, public common2::GNUFrame
+  class SDLRendererFrame : public SDLFrame
   {
   public:
     SDLRendererFrame(const common2::EmulatorOptions & options);

diff --git a/source/frontends/sdl/sdlframe.cpp b/source/frontends/sdl/sdlframe.cpp
@@ -125,7 +125,7 @@ namespace sa2
 {
 
   SDLFrame::SDLFrame(const common2::EmulatorOptions & options)
-    : CommonFrame(options)
+    : common2::GNUFrame(options)
     , myTargetGLSwap(options.glSwapInterval)
     , myPreserveAspectRatio(options.aspectRatio)
     , myForceCapsLock(true)

diff --git a/source/frontends/sdl/sdlframe.h b/source/frontends/sdl/sdlframe.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "frontends/common2/commonframe.h"
+#include "frontends/common2/gnuframe.h"
 #include "frontends/common2/controllerquit.h"
 #include "frontends/common2/programoptions.h"
 #include "linux/network/portfwds.h"
@@ -9,7 +9,7 @@
 namespace sa2
 {
 
-  class SDLFrame : public virtual common2::CommonFrame
+  class SDLFrame : public common2::GNUFrame
   {
   public:
     SDLFrame(const common2::EmulatorOptions & options);