diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2016-05-15 12:49:06 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-05-15 12:49:06 +0200 |
commit | e55842f6aed77738d34134c38ec571c397ea04f9 (patch) | |
tree | 3b42fc7f8a0a2a0cefcb9f754d08cae62bbd95d3 /opentrack | |
parent | 386b0884f19b5d05cbbbce2bda1be6f4dc437ece (diff) |
api/shortcuts: appease pointless compiler warnings
Diffstat (limited to 'opentrack')
-rw-r--r-- | opentrack/keybinding-worker.cpp | 2 | ||||
-rw-r--r-- | opentrack/shortcuts.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/opentrack/keybinding-worker.cpp b/opentrack/keybinding-worker.cpp index 8bb99b8c..a0c7178c 100644 --- a/opentrack/keybinding-worker.cpp +++ b/opentrack/keybinding-worker.cpp @@ -16,7 +16,7 @@ bool Key::should_process() { - if (!enabled || keycode == 0 && guid == "") + if (!enabled || (keycode == 0 && guid == "")) return false; bool ret = timer.elapsed_ms() > 100; timer.start(); diff --git a/opentrack/shortcuts.cpp b/opentrack/shortcuts.cpp index e1087008..4488065f 100644 --- a/opentrack/shortcuts.cpp +++ b/opentrack/shortcuts.cpp @@ -112,10 +112,10 @@ void Shortcuts::reload(const std::vector<std::tuple<key_opts&, fun, bool>> &keys K k; bind_keyboard_shortcut(k, opts, held); keys.push_back(tt(k, [=](bool) -> void { fun(true); }, held)); +#ifndef _WIN32 const int idx = keys.size() - 1; tt& kk_ = keys[idx]; auto& fn = std::get<1>(kk_); -#ifndef _WIN32 connect(k.get(), &QxtGlobalShortcut::activated, [=]() -> void { fn(true); }); #endif } |