From 03c5a15199b34b564314ac222d51ab687fc97a93 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 6 May 2017 13:23:44 +0200 Subject: get rid of the silly mem -> shared_ptr alias --- 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 96be298e..aa8e16f3 100644 --- a/gui/main-window.cpp +++ b/gui/main-window.cpp @@ -74,13 +74,13 @@ MainWindow::MainWindow() : { modules.filters().push_front(std::make_shared("", dylib::Filter)); - for (mem& x : modules.trackers()) + for (std::shared_ptr& x : modules.trackers()) ui.iconcomboTrackerSource->addItem(x->icon, x->name); - for (mem& x : modules.protocols()) + for (std::shared_ptr& x : modules.protocols()) ui.iconcomboProtocol->addItem(x->icon, x->name); - for (mem& x : modules.filters()) + for (std::shared_ptr& x : modules.filters()) ui.iconcomboFilter->addItem(x->icon, x->name); } @@ -601,7 +601,7 @@ inline bool MainWindow::mk_window(ptr& place, Args&&... params) } template -bool MainWindow::mk_dialog(mem lib, ptr& d) +bool MainWindow::mk_dialog(std::shared_ptr lib, ptr& d) { const bool just_created = mk_window_common(d, [&]() -> t* { if (lib && lib->Dialog) -- cgit v1.2.3