Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace tabs with whitespaces.

Browse source
This commit is contained in:
Marcel Verhagen 2015-07-29 14:56:24 +02:00
parent 34d63cdb43
commit 1d29fb9d7f
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
interface/src/devices/3Dconnexion.cpp
View file

@ -165,11 +165,11 @@ static ConnexionClient* gMouseInput = 0;
void ConnexionClient::toggleConnexion(bool shouldEnable) void ConnexionClient::toggleConnexion(bool shouldEnable)
{ {
ConnexionData& connexiondata = ConnexionData::getInstance(); ConnexionData& connexiondata = ConnexionData::getInstance();
if (shouldEnable && connexiondata.getDeviceID() == 0) { if (shouldEnable && connexiondata.getDeviceID() == 0) {
ConnexionClient::init(); ConnexionClient::init();
} }
if (!shouldEnable && connexiondata.getDeviceID() != 0) { if (!shouldEnable && connexiondata.getDeviceID() != 0) {
ConnexionClient::destroy(); ConnexionClient::destroy();
} }
@ -177,24 +177,24 @@ void ConnexionClient::toggleConnexion(bool shouldEnable)
void ConnexionClient::init() { void ConnexionClient::init() {
if (Menu::getInstance()->isOptionChecked(MenuOption::Connexion)) { if (Menu::getInstance()->isOptionChecked(MenuOption::Connexion)) {
ConnexionClient& cclient = ConnexionClient::getInstance(); ConnexionClient& cclient = ConnexionClient::getInstance();
cclient.fLast3dmouseInputTime = 0; cclient.fLast3dmouseInputTime = 0;
cclient.InitializeRawInput(GetActiveWindow()); cclient.InitializeRawInput(GetActiveWindow());
gMouseInput = &cclient; gMouseInput = &cclient;
QAbstractEventDispatcher::instance()->installNativeEventFilter(&cclient); QAbstractEventDispatcher::instance()->installNativeEventFilter(&cclient);
} }
} }
void ConnexionClient::destroy() { void ConnexionClient::destroy() {
ConnexionClient& cclient = ConnexionClient::getInstance(); ConnexionClient& cclient = ConnexionClient::getInstance();
QAbstractEventDispatcher::instance()->removeNativeEventFilter(&cclient); QAbstractEventDispatcher::instance()->removeNativeEventFilter(&cclient);
ConnexionData& connexiondata = ConnexionData::getInstance(); ConnexionData& connexiondata = ConnexionData::getInstance();
int deviceid = connexiondata.getDeviceID(); int deviceid = connexiondata.getDeviceID();
connexiondata.setDeviceID(0); connexiondata.setDeviceID(0);
Application::getUserInputMapper()->removeDevice(deviceid); Application::getUserInputMapper()->removeDevice(deviceid);
} }
#define LOGITECH_VENDOR_ID 0x46d #define LOGITECH_VENDOR_ID 0x46d
@ -305,9 +305,9 @@ bool ConnexionClient::RawInputEventFilter(void* msg, long* result) {
connexiondata.assignDefaultInputMapping(*Application::getUserInputMapper()); connexiondata.assignDefaultInputMapping(*Application::getUserInputMapper());
UserActivityLogger::getInstance().connectedDevice("controller", "3Dconnexion"); UserActivityLogger::getInstance().connectedDevice("controller", "3Dconnexion");
} else if (!ConnexionClient::Is3dmouseAttached() && connexiondata.getDeviceID() != 0) { } else if (!ConnexionClient::Is3dmouseAttached() && connexiondata.getDeviceID() != 0) {
int deviceid = connexiondata.getDeviceID(); int deviceid = connexiondata.getDeviceID();
connexiondata.setDeviceID(0); connexiondata.setDeviceID(0);
Application::getUserInputMapper()->removeDevice(deviceid); Application::getUserInputMapper()->removeDevice(deviceid);
} }
if (!ConnexionClient::Is3dmouseAttached()) { if (!ConnexionClient::Is3dmouseAttached()) {
@ -332,8 +332,8 @@ ConnexionClient::ConnexionClient() {
} }
ConnexionClient::~ConnexionClient() { ConnexionClient::~ConnexionClient() {
ConnexionClient& cclient = ConnexionClient::getInstance(); ConnexionClient& cclient = ConnexionClient::getInstance();
QAbstractEventDispatcher::instance()->removeNativeEventFilter(&cclient); QAbstractEventDispatcher::instance()->removeNativeEventFilter(&cclient);
} }
// Access the mouse parameters structure // Access the mouse parameters structure