summaryrefslogtreecommitdiffhomepage
path: root/gui/main-window.cpp
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.cpp
parent2a1392281193183c39dbd4f1d4a1cb5d1d529ad4 (diff)
compat/util: remove macro and typedefs
Diffstat (limited to 'gui/main-window.cpp')
-rw-r--r--gui/main-window.cpp8
1 files changed, 4 insertions, 4 deletions
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)