diff --git a/.clang-tidy b/.clang-tidy index 30427c9e0e..d630063315 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -5,7 +5,8 @@ Checks: > clang-analyzer-*, -clang-analyzer-optin*, -clang-analyzer-cplusplus.NewDeleteLeaks, - -clang-analyzer-core.CallAndMessage + -clang-analyzer-core.CallAndMessage, + -modernize-avoid-bind WarningsAsErrors: > -*, boost-*, diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 1b4b11f5b6..03a5fd9b7f 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -326,7 +326,7 @@ namespace MWGui mScrollBar->eventScrollChangePosition += MyGUI::newDelegate(this, &DialogueWindow::onScrollbarMoved); mHistory->eventMouseWheel += MyGUI::newDelegate(this, &DialogueWindow::onMouseWheel); - BookPage::ClickCallback callback = std::bind(&DialogueWindow::notifyLinkClicked, this, std::placeholders::_1); + BookPage::ClickCallback callback = [this](TypesetBook::InteractiveId link) { notifyLinkClicked(link); }; mHistory->adviseLinkClicked(callback); mMainWidget->castType()->eventWindowChangeCoord diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp index dc6ad87f1f..46adcd977e 100644 --- a/apps/openmw/mwgui/journalwindow.cpp +++ b/apps/openmw/mwgui/journalwindow.cpp @@ -123,9 +123,7 @@ namespace topicsList->eventItemSelected += MyGUI::newDelegate(this, &JournalWindowImpl::notifyTopicSelected); { - MWGui::BookPage::ClickCallback callback; - - callback = std::bind(&JournalWindowImpl::notifyTopicClicked, this, std::placeholders::_1); + MWGui::BookPage::ClickCallback callback = [this](intptr_t linkId) { notifyTopicClicked(linkId); }; getPage(LeftBookPage)->adviseLinkClicked(callback); getPage(RightBookPage)->adviseLinkClicked(callback); @@ -137,9 +135,8 @@ namespace } { - MWGui::BookPage::ClickCallback callback; - - callback = std::bind(&JournalWindowImpl::notifyIndexLinkClicked, this, std::placeholders::_1); + MWGui::BookPage::ClickCallback callback + = [this](MWGui::TypesetBook::InteractiveId index) { notifyIndexLinkClicked(index); }; getPage(LeftTopicIndex)->adviseLinkClicked(callback); getPage(CenterTopicIndex)->adviseLinkClicked(callback);