summaryrefslogtreecommitdiffhomepage
path: root/gui/main-window.hpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-10-10 09:22:20 +0200
committerStanislaw Halik <sthalik@misaki.pl>2017-10-10 09:22:25 +0200
commit50a78e613567c44c415c2ebc294089ff1e60493f (patch)
tree7872f8a43231cbcebd8f235b4a910adc67069b9e /gui/main-window.hpp
parent2a1392281193183c39dbd4f1d4a1cb5d1d529ad4 (diff)
compat/util: remove macro and typedefs
Diffstat (limited to 'gui/main-window.hpp')
-rw-r--r--gui/main-window.hpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/gui/main-window.hpp b/gui/main-window.hpp
index 75f58db1..3fde4301 100644
--- a/gui/main-window.hpp
+++ b/gui/main-window.hpp
@@ -49,17 +49,17 @@ class MainWindow : public QMainWindow, private State
Shortcuts global_shortcuts;
module_settings m;
- ptr<QSystemTrayIcon> tray;
+ std::unique_ptr<QSystemTrayIcon> tray;
QMenu tray_menu;
QTimer pose_update_timer;
QTimer det_timer;
QTimer config_list_timer;
- ptr<OptionsDialog> options_widget;
- ptr<MapWidget> mapping_widget;
+ std::unique_ptr<OptionsDialog> options_widget;
+ std::unique_ptr<MapWidget> mapping_widget;
QShortcut kbd_quit;
- ptr<IFilterDialog> pFilterDialog;
- ptr<IProtocolDialog> pProtocolDialog;
- ptr<ITrackerDialog> pTrackerDialog;
+ std::unique_ptr<IFilterDialog> pFilterDialog;
+ std::unique_ptr<IProtocolDialog> pProtocolDialog;
+ std::unique_ptr<ITrackerDialog> pTrackerDialog;
process_detector_worker det;
QMenu profile_menu;
@@ -100,15 +100,15 @@ class MainWindow : public QMainWindow, private State
// only use in impl file since no definition in header!
template<typename t>
- bool mk_dialog(std::shared_ptr<dylib> lib, ptr<t>& d);
+ bool mk_dialog(std::shared_ptr<dylib> lib, std::unique_ptr<t>& d);
// idem
template<typename t, typename... Args>
- inline bool mk_window(ptr<t>& place, Args&&... params);
+ inline bool mk_window(std::unique_ptr<t>& place, Args&&... params);
// idem
template<typename t, typename F>
- bool mk_window_common(ptr<t>& d, F&& ctor);
+ bool mk_window_common(std::unique_ptr<t>& d, F&& ctor);
private slots:
void save_modules();