From 8d77afaa945eddc1681ad1228092d409973ba0ae Mon Sep 17 00:00:00 2001 From: Sam Gondelman Date: Thu, 30 Jul 2015 13:19:05 -0700 Subject: [PATCH] more work on cleaning up connexion --- cmake/modules/Find3DConnexionClient.cmake | 2 +- interface/src/devices/3DConnexionClient.cpp | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cmake/modules/Find3DConnexionClient.cmake b/cmake/modules/Find3DConnexionClient.cmake index 7f38824a81..2b5508cfcc 100644 --- a/cmake/modules/Find3DConnexionClient.cmake +++ b/cmake/modules/Find3DConnexionClient.cmake @@ -24,7 +24,7 @@ if (APPLE) set(3DCONNEXIONCLIENT_INCLUDE_DIRS ${3DConnexionClient}) set(3DCONNEXIONCLIENT_LIBRARY ${3DConnexionClient}) set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS "-weak_framework 3DConnexionClient") - message(STATUS "Found 3DConnexion " + ${3DConnexionClient}) + message(STATUS "Found 3DConnexion at " ${3DConnexionClient}) mark_as_advanced(3DCONNEXIONCLIENT_INCLUDE_DIR CONNEXIONCLIENT_LIBRARY) else () message(STATUS "Could NOT find 3DConnexionClient") diff --git a/interface/src/devices/3DConnexionClient.cpp b/interface/src/devices/3DConnexionClient.cpp index 6028c4c6de..4743370778 100755 --- a/interface/src/devices/3DConnexionClient.cpp +++ b/interface/src/devices/3DConnexionClient.cpp @@ -175,20 +175,18 @@ void ConnexionClient::toggleConnexion(bool shouldEnable) { void ConnexionClient::init() { if (Menu::getInstance()->isOptionChecked(MenuOption::Connexion)) { - ConnexionClient& cclient = ConnexionClient::getInstance(); - cclient.fLast3dmouseInputTime = 0; + fLast3dmouseInputTime = 0; - cclient.InitializeRawInput(GetActiveWindow()); + InitializeRawInput(GetActiveWindow()); - gMouseInput = &cclient; + gMouseInput = &this; QAbstractEventDispatcher::instance()->installNativeEventFilter(&cclient); } } void ConnexionClient::destroy() { - ConnexionClient& cclient = ConnexionClient::getInstance(); - QAbstractEventDispatcher::instance()->removeNativeEventFilter(&cclient); + QAbstractEventDispatcher::instance()->removeNativeEventFilter(&this); ConnexionData& connexiondata = ConnexionData::getInstance(); int deviceid = connexiondata.getDeviceID(); connexiondata.setDeviceID(0); @@ -328,8 +326,7 @@ ConnexionClient::ConnexionClient() { } ConnexionClient::~ConnexionClient() { - ConnexionClient& cclient = ConnexionClient::getInstance(); - QAbstractEventDispatcher::instance()->removeNativeEventFilter(&cclient); + QAbstractEventDispatcher::instance()->removeNativeEventFilter(&this); } // Access the mouse parameters structure