summaryrefslogtreecommitdiffhomepage
path: root/tracker-joystick/ftnoir_tracker_joystick.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tracker-joystick/ftnoir_tracker_joystick.cpp')
-rw-r--r--tracker-joystick/ftnoir_tracker_joystick.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/tracker-joystick/ftnoir_tracker_joystick.cpp b/tracker-joystick/ftnoir_tracker_joystick.cpp
index 27a5408d..940abfd1 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick.cpp
@@ -11,10 +11,10 @@
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,9 +22,7 @@ joystick::joystick()
}
}
-joystick::~joystick()
-{
-}
+joystick::~joystick() = default;
void joystick::data(double *data)
{
@@ -58,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]);
}
}
}