summaryrefslogtreecommitdiffhomepage
path: root/facetracknoir
diff options
context:
space:
mode:
Diffstat (limited to 'facetracknoir')
-rw-r--r--facetracknoir/ui.cpp4
-rw-r--r--facetracknoir/ui.h18
2 files changed, 11 insertions, 11 deletions
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);
}