From 79aa5c60b38da8403ec2550247143c8f4b45d323 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 24 Jan 2019 20:04:14 +0100
Subject: gui, opentrack: simplify std::function/unique_ptr usage

Reported by: ElDesalmado
---
 gui/init.cpp | 4 ++--
 gui/init.hpp | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'gui')

diff --git a/gui/init.cpp b/gui/init.cpp
index 07f6c6b1..77d90212 100644
--- a/gui/init.cpp
+++ b/gui/init.cpp
@@ -238,7 +238,7 @@ static int run_window(std::unique_ptr<QWidget> main_window)
     return status;
 }
 
-int otr_main(int argc, char** argv, std::function<QWidget*()> const& make_main_window)
+int otr_main(int argc, char** argv, std::function<std::unique_ptr<QWidget>()> const& make_main_window)
 {
     set_fp_mask();
 #ifdef OTR_X11_THREADS
@@ -286,7 +286,7 @@ int otr_main(int argc, char** argv, std::function<QWidget*()> const& make_main_w
         }
     }
 
-    int ret = run_window(std::unique_ptr<QWidget>(make_main_window()));
+    int ret = run_window(make_main_window());
 
 #if 0
     // msvc crashes in Qt plugin system's dtor
diff --git a/gui/init.hpp b/gui/init.hpp
index 7c437bcb..4274f437 100644
--- a/gui/init.hpp
+++ b/gui/init.hpp
@@ -3,9 +3,10 @@
 #include "export.hpp"
 
 #include <functional>
+#include <memory>
 #include <QWidget>
 
-OTR_GUI_EXPORT int otr_main(int argc, char** argv, std::function<QWidget*()> const& make_main_window);
+OTR_GUI_EXPORT int otr_main(int argc, char** argv, std::function<std::unique_ptr<QWidget>()> const& make_main_window);
 
 // XXX TODO need split MainWindow into mixins each implementing part of the functionality
 
-- 
cgit v1.2.3