From 26e80a18b4aa2cb7d35e997763999ec03d12d233 Mon Sep 17 00:00:00 2001 From: lioncash Date: Mon, 31 Mar 2014 09:32:42 -0400 Subject: [PATCH] Disallow inheriting of the null and windows mouse/keyboard/pad handlers. These aren't intended to be further extended. --- rpcs3/Emu/Io/Null/NullKeyboardHandler.h | 2 +- rpcs3/Emu/Io/Null/NullMouseHandler.h | 2 +- rpcs3/Emu/Io/Null/NullPadHandler.h | 2 +- rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h | 2 +- rpcs3/Emu/Io/Windows/WindowsMouseHandler.h | 2 +- rpcs3/Emu/Io/Windows/WindowsPadHandler.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/Io/Null/NullKeyboardHandler.h b/rpcs3/Emu/Io/Null/NullKeyboardHandler.h index 4a9598a71e..4846487e1d 100644 --- a/rpcs3/Emu/Io/Null/NullKeyboardHandler.h +++ b/rpcs3/Emu/Io/Null/NullKeyboardHandler.h @@ -2,7 +2,7 @@ #include "Emu/Io/KeyboardHandler.h" -class NullKeyboardHandler : public KeyboardHandlerBase +class NullKeyboardHandler final : public KeyboardHandlerBase { public: NullKeyboardHandler() diff --git a/rpcs3/Emu/Io/Null/NullMouseHandler.h b/rpcs3/Emu/Io/Null/NullMouseHandler.h index 1abe6fe2c8..d12c89f80d 100644 --- a/rpcs3/Emu/Io/Null/NullMouseHandler.h +++ b/rpcs3/Emu/Io/Null/NullMouseHandler.h @@ -2,7 +2,7 @@ #include "Emu/Io/MouseHandler.h" -class NullMouseHandler : public MouseHandlerBase +class NullMouseHandler final : public MouseHandlerBase { public: NullMouseHandler() diff --git a/rpcs3/Emu/Io/Null/NullPadHandler.h b/rpcs3/Emu/Io/Null/NullPadHandler.h index adbd3a2dd8..2ca8e5ff16 100644 --- a/rpcs3/Emu/Io/Null/NullPadHandler.h +++ b/rpcs3/Emu/Io/Null/NullPadHandler.h @@ -2,7 +2,7 @@ #include "Emu/Io/PadHandler.h" -class NullPadHandler : public PadHandlerBase +class NullPadHandler final : public PadHandlerBase { public: NullPadHandler() diff --git a/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h b/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h index 29128e166f..f2c50f0bdd 100644 --- a/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h @@ -2,7 +2,7 @@ #include "Emu/Io/KeyboardHandler.h" -class WindowsKeyboardHandler +class WindowsKeyboardHandler final : public wxWindow , public KeyboardHandlerBase { diff --git a/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h b/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h index 194f9dae5a..101290822b 100644 --- a/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h @@ -2,7 +2,7 @@ #include "Emu/Io/MouseHandler.h" -class WindowsMouseHandler +class WindowsMouseHandler final : public wxWindow , public MouseHandlerBase { diff --git a/rpcs3/Emu/Io/Windows/WindowsPadHandler.h b/rpcs3/Emu/Io/Windows/WindowsPadHandler.h index 257db117ea..23c260c883 100644 --- a/rpcs3/Emu/Io/Windows/WindowsPadHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsPadHandler.h @@ -2,7 +2,7 @@ #include "Emu/Io/PadHandler.h" -class WindowsPadHandler +class WindowsPadHandler final : public wxWindow , public PadHandlerBase {