diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-09-20 21:24:40 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-09-20 23:24:17 +0200 |
| commit | 88e4563455ca183e1b77364b73d5e6173af513d3 (patch) | |
| tree | b63fcee5e953c876886cf6c2bdeaf2738ee0c795 /opentrack/shortcuts.h | |
| parent | 06b68ac493f06723d123db5fa23b8c0a86ca7f66 (diff) | |
api, compat: backport exports fix
Diffstat (limited to 'opentrack/shortcuts.h')
| -rw-r--r-- | opentrack/shortcuts.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/opentrack/shortcuts.h b/opentrack/shortcuts.h index 38037923..519489df 100644 --- a/opentrack/shortcuts.h +++ b/opentrack/shortcuts.h @@ -12,11 +12,7 @@ #include <vector> #include <functional> -#ifdef BUILD_api -# include "opentrack-compat/export.hpp" -#else -# include "opentrack-compat/import.hpp" -#endif +#include "export.hpp" #include "qxt-mini/QxtGlobalShortcut" #include "opentrack-compat/options.hpp" @@ -28,7 +24,7 @@ using namespace options; -struct OPENTRACK_EXPORT Shortcuts : public QObject { +struct OPENTRACK_API_EXPORT Shortcuts : public QObject { Q_OBJECT public: @@ -39,7 +35,7 @@ public: Key #endif ; - + using fun = std::function<void(void)>; using tt = std::tuple<K, fun>; std::vector<tt> keys; |