From 7c7f4d344eef80c6ee672c3c57dedcb1848f3ef4 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 27 Jul 2015 05:42:04 +0200
Subject: qfc: move division last

---
 qfunctionconfigurator/functionconfig.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 qfunctionconfigurator/functionconfig.cpp

diff --git a/qfunctionconfigurator/functionconfig.cpp b/qfunctionconfigurator/functionconfig.cpp
old mode 100644
new mode 100755
index b597a9029..c97aec168
--- a/qfunctionconfigurator/functionconfig.cpp
+++ b/qfunctionconfigurator/functionconfig.cpp
@@ -136,7 +136,7 @@ void Map::reload() {
 
                 const n y_ = std::min<n>(max_y, std::max<n>(y, 0));
 
-                data[x] = y_ / max_y * integral_max;
+                data[x] = y_ * integral_max / max_y;
             }
         }
         
-- 
cgit v1.2.3


From 6ef230ff01136a1b180fc18e7078502b89d3c23b Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 28 Jul 2015 08:31:24 +0200
Subject: shortcuts: whole is _WIN32, don't check twice nested

---
 opentrack/win32-shortcuts.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/opentrack/win32-shortcuts.cpp b/opentrack/win32-shortcuts.cpp
index 67f71f41f..15e6c66c4 100755
--- a/opentrack/win32-shortcuts.cpp
+++ b/opentrack/win32-shortcuts.cpp
@@ -116,7 +116,6 @@ bool win_key::from_qt(QKeySequence qt_, int& dik, Qt::KeyboardModifiers& mods)
 {
     auto qt = static_cast<QVariant>(qt_).toInt();
     auto our_mods = qt & Qt::KeyboardModifierMask;
-#ifdef _WIN32
     const auto our_mods_ = our_mods;
     our_mods |= Qt::ShiftModifier;
     switch (qt & ~Qt::KeyboardModifierMask)
@@ -145,7 +144,6 @@ bool win_key::from_qt(QKeySequence qt_, int& dik, Qt::KeyboardModifiers& mods)
     case Qt::Key::Key_Bar: qt = Qt::Key::Key_Backslash; break;
     default: our_mods = our_mods_; break;
     }
-#endif
 
     const auto key = qt & ~Qt::KeyboardModifierMask;
     for (auto& wk : windows_key_sequences)
-- 
cgit v1.2.3


From 149403bf828e83b91e049eca1a4e89ef5874b974 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 28 Jul 2015 08:33:04 +0200
Subject: move header to right place

---
 opentrack/win32-shortcuts.cpp | 1 -
 opentrack/win32-shortcuts.h   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 opentrack/win32-shortcuts.h

diff --git a/opentrack/win32-shortcuts.cpp b/opentrack/win32-shortcuts.cpp
index 15e6c66c4..d4107949a 100755
--- a/opentrack/win32-shortcuts.cpp
+++ b/opentrack/win32-shortcuts.cpp
@@ -6,7 +6,6 @@
 #   include <dinput.h>
 
 #include <QList>
-#include <QKeySequence>
 #include <QVariant>
 #include <QDebug>
 #include "win32-shortcuts.h"
diff --git a/opentrack/win32-shortcuts.h b/opentrack/win32-shortcuts.h
old mode 100644
new mode 100755
index 8167036db..3e824b89d
--- a/opentrack/win32-shortcuts.h
+++ b/opentrack/win32-shortcuts.h
@@ -2,6 +2,8 @@
 
 #ifdef _WIN32
 
+#include <QKeySequence>
+
 struct win_key;
 
 extern QList<win_key> windows_key_mods;
-- 
cgit v1.2.3