From 50a78e613567c44c415c2ebc294089ff1e60493f Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 10 Oct 2017 09:22:20 +0200
Subject: compat/util: remove macro and typedefs

---
 gui/main-window.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gui/main-window.cpp')

diff --git a/gui/main-window.cpp b/gui/main-window.cpp
index 010fd1d0..51e22861 100644
--- a/gui/main-window.cpp
+++ b/gui/main-window.cpp
@@ -574,7 +574,7 @@ void MainWindow::show_pose()
 }
 
 template<typename t, typename F>
-bool MainWindow::mk_window_common(ptr<t>& d, F&& ctor)
+bool MainWindow::mk_window_common(std::unique_ptr<t>& d, F&& ctor)
 {
     if (d)
     {
@@ -583,7 +583,7 @@ bool MainWindow::mk_window_common(ptr<t>& d, F&& ctor)
 
         return false;
     }
-    else if ((d = ptr<t>(ctor())))
+    else if ((d = std::unique_ptr<t>(ctor())))
     {
         QWidget& w = *d;
 
@@ -602,13 +602,13 @@ bool MainWindow::mk_window_common(ptr<t>& d, F&& ctor)
 }
 
 template<typename t, typename... Args>
-inline bool MainWindow::mk_window(ptr<t>& place, Args&&... params)
+inline bool MainWindow::mk_window(std::unique_ptr<t>& place, Args&&... params)
 {
     return mk_window_common(place, [&]() { return new t(std::forward<Args>(params)...); });
 }
 
 template<typename t>
-bool MainWindow::mk_dialog(std::shared_ptr<dylib> lib, ptr<t>& d)
+bool MainWindow::mk_dialog(std::shared_ptr<dylib> lib, std::unique_ptr<t>& d)
 {
     const bool just_created = mk_window_common(d, [&]() -> t* {
         if (lib && lib->Dialog)
-- 
cgit v1.2.3