summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-03-18 05:47:44 +0300
committerAndrei Karas <akaras@inbox.ru>2019-03-18 05:47:44 +0300
commit724b1d9950c5784f8335ce028981c8b1fcf72d54 (patch)
tree2b47b4a70837ba31c6c25588aae1595307967d84
parent2727755de87b17e66a2ea02a379f11f72cb3fd97 (diff)
downloadmv-724b1d9950c5784f8335ce028981c8b1fcf72d54.tar.gz
mv-724b1d9950c5784f8335ce028981c8b1fcf72d54.tar.bz2
mv-724b1d9950c5784f8335ce028981c8b1fcf72d54.tar.xz
mv-724b1d9950c5784f8335ce028981c8b1fcf72d54.zip
Remove deprecated std::mem_fun
-rw-r--r--src/gui/windows/setupwindow.cpp10
1 files 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<SetupTab*>::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<SetupTab*>::iterator, it, mTabs)
+ {
+ (*it)->cancel();
+ }
}
void SetupWindow::activateTab(const std::string &name)