diff options
Diffstat (limited to 'tracker-joystick/ftnoir_tracker_joystick.cpp')
| -rw-r--r-- | tracker-joystick/ftnoir_tracker_joystick.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/tracker-joystick/ftnoir_tracker_joystick.cpp b/tracker-joystick/ftnoir_tracker_joystick.cpp index 498b4e42..940abfd1 100644 --- a/tracker-joystick/ftnoir_tracker_joystick.cpp +++ b/tracker-joystick/ftnoir_tracker_joystick.cpp @@ -5,16 +5,16 @@ * copyright notice and this permission notice appear in all copies. */ #include "ftnoir_tracker_joystick.h" -#include "compat/util.hpp" #include "api/plugin-api.hpp" +#include "compat/math.hpp" #include <QMutexLocker> joystick::joystick() { - if (static_cast<QString>(s.guid) == "") + if (s.guid->isEmpty()) { std::vector<win32_joy_ctx::joy_info> info = joy_ctx.get_joy_info(); - if (info.size()) + if (!info.empty()) { s.guid = info[0].guid; s.b->save(); @@ -22,13 +22,7 @@ joystick::joystick() } } -joystick::~joystick() -{ -} - -void joystick::start_tracker(QFrame*) -{ -} +joystick::~joystick() = default; void joystick::data(double *data) { @@ -62,8 +56,8 @@ void joystick::data(double *data) if (k < 0 || k >= 8) data[i] = 0; else - data[i] = clamp(axes[k] * limits[i] / AXIS_MAX, - -limits[i], limits[i]); + data[i] = std::clamp(axes[k] * limits[i] / AXIS_MAX, + -limits[i], limits[i]); } } } |