Remove version specific header files for KeyboardInput
The headers were identical after no longer using the abstract class for platform independence.
This commit is contained in:
@@ -30,6 +30,7 @@ HEADERS += src/overlaycontroller.h \
|
|||||||
src/tabcontrollers/UtilitiesTabController.h \
|
src/tabcontrollers/UtilitiesTabController.h \
|
||||||
src/tabcontrollers/AudioManager.h \
|
src/tabcontrollers/AudioManager.h \
|
||||||
src/tabcontrollers/PttController.h \
|
src/tabcontrollers/PttController.h \
|
||||||
|
src/tabcontrollers/keyboardinput/KeyboardInput.h \
|
||||||
src/utils/Matrix.h \
|
src/utils/Matrix.h \
|
||||||
src/utils/ChaperoneUtils.h \
|
src/utils/ChaperoneUtils.h \
|
||||||
src/quaternion/quaternion.h \
|
src/quaternion/quaternion.h \
|
||||||
@@ -47,13 +48,11 @@ HEADERS += src/overlaycontroller.h \
|
|||||||
win32 {
|
win32 {
|
||||||
SOURCES += src/tabcontrollers/audiomanager/AudioManagerWindows.cpp \
|
SOURCES += src/tabcontrollers/audiomanager/AudioManagerWindows.cpp \
|
||||||
src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp
|
src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp
|
||||||
HEADERS += src/tabcontrollers/audiomanager/AudioManagerWindows.h \
|
HEADERS += src/tabcontrollers/audiomanager/AudioManagerWindows.h
|
||||||
src/tabcontrollers/keyboardinput/KeyboardInputWindows.h
|
|
||||||
}
|
}
|
||||||
|
|
||||||
!win32 {
|
!win32 {
|
||||||
SOURCES += src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp
|
SOURCES += src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp
|
||||||
HEADERS += src/tabcontrollers/keyboardinput/KeyboardInputDummy.h
|
|
||||||
}
|
}
|
||||||
|
|
||||||
win32-msvc {
|
win32-msvc {
|
||||||
|
|||||||
@@ -4,11 +4,6 @@
|
|||||||
#include "../overlaycontroller.h"
|
#include "../overlaycontroller.h"
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#ifdef _WIN32
|
|
||||||
# include "keyboardinput/KeyboardInputWindows.h"
|
|
||||||
#else
|
|
||||||
# include "keyboardinput/KeyboardInputDummy.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// application namespace
|
// application namespace
|
||||||
namespace advsettings
|
namespace advsettings
|
||||||
|
|||||||
@@ -5,11 +5,7 @@
|
|||||||
#include <QTime>
|
#include <QTime>
|
||||||
#include <openvr.h>
|
#include <openvr.h>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#ifdef WIN32
|
#include "keyboardinput/KeyboardInput.h"
|
||||||
# include "keyboardinput/KeyboardInputWindows.h"
|
|
||||||
#else
|
|
||||||
# include "keyboardinput/KeyboardInputDummy.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class QQuickWindow;
|
class QQuickWindow;
|
||||||
// application namespace
|
// application namespace
|
||||||
|
|||||||
@@ -3,25 +3,16 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
// application namespace
|
namespace keyboardinput
|
||||||
namespace advsettings
|
|
||||||
{
|
{
|
||||||
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
|
} // namespace 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
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "KeyboardInputDummy.h"
|
#include "KeyboardInput.h"
|
||||||
|
|
||||||
// Used to get the compiler to shut up about C4100: unreferenced formal
|
// Used to get the compiler to shut up about C4100: unreferenced formal
|
||||||
// parameter. The cast is to get GCC to shut up about it.
|
// parameter. The cast is to get GCC to shut up about it.
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "KeyboardInputWindows.h"
|
#include "KeyboardInput.h"
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
#include "easylogging++.h"
|
#include "easylogging++.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
|
|
||||||
Reference in New Issue
Block a user