From b9864c1f2f8d8b33e5260c3d71ebaf9adf9f9325 Mon Sep 17 00:00:00 2001
From: Matthias Krebs <makrebs@student.ethz.ch>
Date: Mon, 19 Nov 2012 20:41:52 +0100
Subject: [PATCH] Fixed syntax for Windows. Fertig!
3DMouse working on Windows and Ubuntu
---
src/input/Mouse6dofInput.cpp | 2 +-
src/ui/MainWindow.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/input/Mouse6dofInput.cpp b/src/input/Mouse6dofInput.cpp
index 1e12178142..cadf98b733 100644
--- a/src/input/Mouse6dofInput.cpp
+++ b/src/input/Mouse6dofInput.cpp
@@ -237,7 +237,7 @@ void Mouse6dofInput::button3DMouseDown(int button)
case 2:
{
translationActive = !translationActive;
- emit mouseTranslationEnabledChanged(translationActive);
+ emit mouseTranslationActiveChanged(translationActive);
qDebug() << "Changed 3DMouse Translation to" << (bool)translationActive;
break;
}
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index 387ea2491b..8b71dbf841 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -235,8 +235,10 @@ public slots:
signals:
void initStatusChanged(const QString& message);
+#ifdef MOUSE_ENABLED_LINUX
/** @brief Forward X11Event to catch 3DMouse inputs */
void x11EventOccured(XEvent *event);
+#endif //MOUSE_ENABLED_LINUX
public:
QGCMAVLinkLogPlayer* getLogPlayer()
--
GitLab