summaryrefslogtreecommitdiffhomepage
path: root/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-11-22 15:50:46 +0100
committerStanislaw Halik <sthalik@misaki.pl>2015-11-22 15:55:45 +0100
commit119671e4e7f4dc07c1fb20eb999a0a7fcfbbdba8 (patch)
tree0b90e43ed648217dd75a15e73dee93e477103903 /tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
parent86f1df90b405b56b46d698b4059ed2c6b10df8b3 (diff)
api/shortcuts, tracker/joy: adapt to synchronized joy api
Diffstat (limited to 'tracker-joystick/ftnoir_tracker_joystick_dialog.cpp')
-rw-r--r--tracker-joystick/ftnoir_tracker_joystick_dialog.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
index 28846809..1ca1441c 100644
--- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -10,20 +10,21 @@ TrackerControls::TrackerControls() : tracker(nullptr)
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
{
- win32_joy_ctx joy_ctx;
+ win32_joy_ctx& joy_ctx(win32_joy_ctx::make());
_joys = QList<joys>();
- for (auto& j : joy_ctx.joys())
- _joys.push_back(joys { j.second->name, j.first });
+ for (auto j : joy_ctx.get_joy_info())
+ _joys.push_back(joys { j.name, j.guid });
}
{
+ const QString guid = s.guid;
int idx = 0;
for (int i = 0; i < _joys.size(); i++)
{
const joys& j = _joys[i];
- if (j.guid == s.guid && j.name == s.joyid)
+ if (j.guid == guid)
idx = i;
ui.joylist->addItem(j.name + " " + j.guid);
}