From e29f9b9b1ede2967031255a7bd23625aedc493c3 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 29 Oct 2014 01:09:49 +0100
Subject: work around global 'ptr' symbol clash with opencv

Issue: #89
Reported-by: @runningman84
---
 facetracknoir/ui.cpp |  4 ++--
 facetracknoir/ui.h   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'facetracknoir')

diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp
index f340b1ff..66e7c80f 100644
--- a/facetracknoir/ui.cpp
+++ b/facetracknoir/ui.cpp
@@ -330,11 +330,11 @@ void MainWindow::showHeadPose()
 }
 
 template<typename t>
-ptr<t> mk_dialog(ptr<dylib> lib)
+mem<t> mk_dialog(mem<dylib> lib)
 {
     if (lib)
     {
-        auto dialog = ptr<t>(reinterpret_cast<t*>(lib->Dialog()));
+        auto dialog = mem<t>(reinterpret_cast<t*>(lib->Dialog()));
         dialog->setWindowFlags(Qt::Dialog);
         dialog->setFixedSize(dialog->size());
         return dialog;
diff --git a/facetracknoir/ui.h b/facetracknoir/ui.h
index 4158e29e..3f607726 100644
--- a/facetracknoir/ui.h
+++ b/facetracknoir/ui.h
@@ -62,25 +62,25 @@ class MainWindow : public QMainWindow, private State
     Q_OBJECT
 
     Ui::OpentrackUI ui;
-    ptr<QSystemTrayIcon> tray;
+    mem<QSystemTrayIcon> tray;
     QTimer pose_update_timer;
-    ptr<KeyboardShortcutDialog> shortcuts_widget;
-    ptr<MapWidget> mapping_widget;
+    mem<KeyboardShortcutDialog> shortcuts_widget;
+    mem<MapWidget> mapping_widget;
     QShortcut kbd_quit;
     QPixmap no_feed_pixmap;
-    ptr<IFilterDialog> pFilterDialog;
-    ptr<IProtocolDialog> pProtocolDialog;
-    ptr<ITrackerDialog> pTrackerDialog;
+    mem<IFilterDialog> pFilterDialog;
+    mem<IProtocolDialog> pProtocolDialog;
+    mem<ITrackerDialog> pTrackerDialog;
 
-    ptr<dylib> current_tracker()
+    mem<dylib> current_tracker()
     {
         return modules.trackers().value(ui.iconcomboTrackerSource->currentIndex(), nullptr);
     }
-    ptr<dylib> current_protocol()
+    mem<dylib> current_protocol()
     {
         return modules.protocols().value(ui.iconcomboProtocol->currentIndex(), nullptr);
     }
-    ptr<dylib> current_filter()
+    mem<dylib> current_filter()
     {
         return modules.filters().value(ui.iconcomboFilter->currentIndex(), nullptr);
     }
-- 
cgit v1.2.3