summaryrefslogtreecommitdiffhomepage
path: root/opentrack
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-05-04 08:20:02 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-05-04 08:20:02 +0200
commit01b3ff0709003f4191760f53b14bebea4d88c3d9 (patch)
tree36a333fc995765f9f68fdddf274bfe81b8c7368d /opentrack
parentfcf5b49d4fe4201909843a373579731605f330f6 (diff)
api: fix shortcuts for OSX and Linux
Diffstat (limited to 'opentrack')
-rw-r--r--opentrack/shortcuts.cpp4
-rw-r--r--opentrack/shortcuts.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/opentrack/shortcuts.cpp b/opentrack/shortcuts.cpp
index aa1006c4..3773179f 100644
--- a/opentrack/shortcuts.cpp
+++ b/opentrack/shortcuts.cpp
@@ -85,7 +85,7 @@ void Shortcuts::receiver(const Key& k)
}
#endif
-void Shortcuts::reload(const std::vector<std::tuple<key_opts&, fun, bool>> &keys_)
+void Shortcuts::reload(std::vector<std::tuple<key_opts&, fun, bool>> &keys_)
{
const int sz = keys_.size();
keys = std::vector<tt>();
@@ -100,7 +100,7 @@ void Shortcuts::reload(const std::vector<std::tuple<key_opts&, fun, bool>> &keys
bind_keyboard_shortcut(k, opts, held);
keys.push_back(tt(k, fun, held));
#ifndef _WIN32
- connect(k.get(), &QxtGlobalShortcut::activated, fun);
+ connect(k.get(), &QxtGlobalShortcut::activated, [&]() -> void { fun(true); });
#endif
}
}
diff --git a/opentrack/shortcuts.h b/opentrack/shortcuts.h
index 40d41957..fd732f89 100644
--- a/opentrack/shortcuts.h
+++ b/opentrack/shortcuts.h
@@ -59,7 +59,7 @@ public:
#endif
{}
- void reload(const std::vector<std::tuple<key_opts &, fun, bool>> &keys);
+ void reload(std::vector<std::tuple<key_opts&, fun, bool>> &keys_);
private:
void bind_keyboard_shortcut(K &key, const key_opts& k, bool held);
#ifdef _WIN32