diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-29 01:09:49 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-29 01:09:49 +0100 |
| commit | e29f9b9b1ede2967031255a7bd23625aedc493c3 (patch) | |
| tree | dfb9ce531ec84db3b251d15bfa800d05abfef272 /opentrack/shortcuts.h | |
| parent | a084a26275c1b5b0ddc5547ed230fa0b244598d6 (diff) | |
work around global 'ptr' symbol clash with opencv
Issue: #89
Reported-by: @runningman84
Diffstat (limited to 'opentrack/shortcuts.h')
| -rw-r--r-- | opentrack/shortcuts.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/opentrack/shortcuts.h b/opentrack/shortcuts.h index 523bc7b2..a588b482 100644 --- a/opentrack/shortcuts.h +++ b/opentrack/shortcuts.h @@ -79,7 +79,7 @@ signals: struct Shortcuts { using K = #ifndef _WIN32 - ptr<QxtGlobalShortcut> + mem<QxtGlobalShortcut> #else Key #endif @@ -90,7 +90,7 @@ struct Shortcuts { WId handle; #ifdef _WIN32 - ptr<KeybindingWorker> keybindingWorker; + mem<KeybindingWorker> keybindingWorker; #endif struct settings { @@ -120,7 +120,7 @@ public: private: Ui::UICKeyboardShortcutDialog ui; Shortcuts::settings s; - ptr<Shortcuts> sc; + mem<Shortcuts> sc; signals: void reload(); private slots: |