mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-07 12:54:00 +00:00
Code Issues Projects Releases Wiki Activity

replace boost::bind

Browse Source
This commit is contained in:
Bret Curtis 2017-05-06 15:12:06 +02:00
parent b7c27e5e96
commit 98752a9702
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwgui/dialogue.cpp
View File

@ -1,7 +1,5 @@
#include "dialogue.hpp"
#include <boost/bind.hpp>
#include <MyGUI_LanguageManager.h>
#include <MyGUI_Window.h>
#include <MyGUI_ProgressBar.h>
@ -281,7 +279,7 @@ namespace MWGui
mScrollBar->eventScrollChangePosition += MyGUI::newDelegate(this, &DialogueWindow::onScrollbarMoved);
mHistory->eventMouseWheel += MyGUI::newDelegate(this, &DialogueWindow::onMouseWheel);
BookPage::ClickCallback callback = boost::bind (&DialogueWindow::notifyLinkClicked, this, _1);
BookPage::ClickCallback callback = std::bind (&DialogueWindow::notifyLinkClicked, this, std::placeholders::_1);
mHistory->adviseLinkClicked(callback);
mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &DialogueWindow::onWindowResize);

5
apps/openmw/mwgui/journalwindow.cpp
View File

@ -9,7 +9,6 @@
#include <MyGUI_TextBox.h>
#include <MyGUI_Button.h>
#include <boost/bind.hpp>
#include <boost/function.hpp>
#include <components/misc/stringops.hpp>
@ -124,7 +123,7 @@ namespace
{
MWGui::BookPage::ClickCallback callback;
callback = boost::bind (&JournalWindowImpl::notifyTopicClicked, this, _1);
callback = std::bind (&JournalWindowImpl::notifyTopicClicked, this, std::placeholders::_1);
getPage (LeftBookPage)->adviseLinkClicked (callback);
getPage (RightBookPage)->adviseLinkClicked (callback);
@ -136,7 +135,7 @@ namespace
{
MWGui::BookPage::ClickCallback callback;
callback = boost::bind (&JournalWindowImpl::notifyIndexLinkClicked, this, _1);
callback = std::bind(&JournalWindowImpl::notifyIndexLinkClicked, this, std::placeholders::_1);
getPage (LeftTopicIndex)->adviseLinkClicked (callback);
getPage (RightTopicIndex)->adviseLinkClicked (callback);

3
components/files/configurationmanager.cpp
View File

@ -7,7 +7,6 @@
#include <components/files/escape.hpp>
#include <boost/bind.hpp>
#include <boost/algorithm/string/erase.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/filesystem/fstream.hpp>
@ -130,7 +129,7 @@ void ConfigurationManager::processPaths(Files::PathContainer& dataDirs, bool cre
}
dataDirs.erase(std::remove_if(dataDirs.begin(), dataDirs.end(),
boost::bind(&boost::filesystem::path::empty, _1)), dataDirs.end());
std::bind(&boost::filesystem::path::empty, std::placeholders::_1)), dataDirs.end());
}
bool ConfigurationManager::loadConfig(const boost::filesystem::path& path,