From 724b1d9950c5784f8335ce028981c8b1fcf72d54 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 18 Mar 2019 05:47:44 +0300 Subject: Remove deprecated std::mem_fun --- src/gui/windows/setupwindow.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index 0c380362a..ccf83f999 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -189,7 +189,10 @@ void SetupWindow::action(const ActionEvent &event) if (eventId == "Apply") { setVisible(Visible_false); - for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::apply)); + FOR_EACH (std::list::iterator, it, mTabs) + { + (*it)->apply(); + } } else if (eventId == "Cancel") { @@ -297,7 +300,10 @@ void SetupWindow::hideWindows() void SetupWindow::doCancel() { setVisible(Visible_false); - for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::cancel)); + FOR_EACH (std::list::iterator, it, mTabs) + { + (*it)->cancel(); + } } void SetupWindow::activateTab(const std::string &name) -- cgit v1.2.3-60-g2f50