Remove version specific header files for KeyboardInput

The headers were identical after no longer using the abstract class for
platform independence.

build_scripts/qt/sources.pri

@@ -30,6 +30,7 @@ HEADERS += src/overlaycontroller.h \
     src/tabcontrollers/UtilitiesTabController.h \
     src/tabcontrollers/AudioManager.h \
     src/tabcontrollers/PttController.h \
+    src/tabcontrollers/keyboardinput/KeyboardInput.h \
     src/utils/Matrix.h \
     src/utils/ChaperoneUtils.h \
     src/quaternion/quaternion.h \
@@ -47,13 +48,11 @@ HEADERS += src/overlaycontroller.h \
 win32 {
     SOURCES += src/tabcontrollers/audiomanager/AudioManagerWindows.cpp \
         src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp
-    HEADERS += src/tabcontrollers/audiomanager/AudioManagerWindows.h \
-        src/tabcontrollers/keyboardinput/KeyboardInputWindows.h
+    HEADERS += src/tabcontrollers/audiomanager/AudioManagerWindows.h
 }
 
 !win32 {
     SOURCES += src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp
-    HEADERS += src/tabcontrollers/keyboardinput/KeyboardInputDummy.h
 }
 
 win32-msvc {

src/tabcontrollers/UtilitiesTabController.cpp

@@ -4,11 +4,6 @@
 #include "../overlaycontroller.h"
 #include <chrono>
 #include <thread>
-#ifdef _WIN32
-#    include "keyboardinput/KeyboardInputWindows.h"
-#else
-#    include "keyboardinput/KeyboardInputDummy.h"
-#endif
 
 // application namespace
 namespace advsettings

src/tabcontrollers/UtilitiesTabController.h

@@ -5,11 +5,7 @@
 #include <QTime>
 #include <openvr.h>
 #include <memory>
-#ifdef WIN32
-#    include "keyboardinput/KeyboardInputWindows.h"
-#else
-#    include "keyboardinput/KeyboardInputDummy.h"
-#endif
+#include "keyboardinput/KeyboardInput.h"
 
 class QQuickWindow;
 // application namespace

src/tabcontrollers/keyboardinput/KeyboardInput.h

@@ -3,25 +3,16 @@
 #include <vector>
 #include <QString>
 
-// application namespace
-namespace advsettings
+namespace keyboardinput
 {
-class AudioTabController;
+void sendKeyboardInput( QString input );
+void sendKeyboardEnter();
+void sendKeyboardBackspace( const int count );
+void sendKeyboardAltTab();
+void sendKeyboardAltEnter();
+void sendMediaNextSong();
+void sendMediaPreviousSong();
+void sendMediaPausePlay();
+void sendMediaStopSong();
 
-class KeyboardInput
-{
-public:
-    virtual ~KeyboardInput() {}
-
-    virtual void sendKeyboardInput( QString input ) = 0;
-    virtual void sendKeyboardEnter() = 0;
-    virtual void sendKeyboardBackspace( const int count ) = 0;
-    virtual void sendKeyboardAltTab() = 0;
-    virtual void sendKeyboardAltEnter() = 0;
-    virtual void sendMediaNextSong() = 0;
-    virtual void sendMediaPreviousSong() = 0;
-    virtual void sendMediaPausePlay() = 0;
-    virtual void sendMediaStopSong() = 0;
-};
-
-} // namespace advsettings
+} // namespace keyboardinput

src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp

@@ -1,4 +1,4 @@
-#include "KeyboardInputDummy.h"
+#include "KeyboardInput.h"
 
 // Used to get the compiler to shut up about C4100: unreferenced formal
 // parameter. The cast is to get GCC to shut up about it.

src/tabcontrollers/keyboardinput/KeyboardInputDummy.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <QString>
-
-namespace keyboardinput
-{
-void sendKeyboardInput( QString input );
-void sendKeyboardEnter();
-void sendKeyboardBackspace( const int count );
-void sendKeyboardAltTab();
-void sendKeyboardAltEnter();
-void sendMediaNextSong();
-void sendMediaPreviousSong();
-void sendMediaPausePlay();
-void sendMediaStopSong();
-
-} // namespace keyboardinput

src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp

@@ -1,4 +1,4 @@
-#include "KeyboardInputWindows.h"
+#include "KeyboardInput.h"
 #include <Windows.h>
 #include "easylogging++.h"
 

src/tabcontrollers/keyboardinput/KeyboardInputWindows.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#include <vector>
-#include <QString>
-
-namespace keyboardinput
-{
-void sendKeyboardInput( QString input );
-void sendKeyboardEnter();
-void sendKeyboardBackspace( const int count );
-void sendKeyboardAltTab();
-void sendKeyboardAltEnter();
-void sendMediaNextSong();
-void sendMediaPreviousSong();
-void sendMediaPausePlay();
-void sendMediaStopSong();
-
-} // namespace keyboardinput