From 128bb11833d3b42cfade26fc6b4449cbce293985 Mon Sep 17 00:00:00 2001 From: smilczek Date: Sun, 14 May 2023 21:03:36 +0200 Subject: [PATCH 1/7] done --- apps/openmw/mwgui/dialogue.cpp | 2 +- apps/openmw/mwgui/journalwindow.cpp | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 1b4b11f5b6..872228eae4 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); + auto callback = [&](TypesetBook::InteractiveId link) { DialogueWindow::notifyLinkClicked(link); }; mHistory->adviseLinkClicked(callback); mMainWidget->castType()->eventWindowChangeCoord diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp index dc6ad87f1f..4bef8cb138 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); + auto callback = [&](intptr_t linkId) { JournalWindowImpl::notifyTopicClicked(linkId); }; getPage(LeftBookPage)->adviseLinkClicked(callback); getPage(RightBookPage)->adviseLinkClicked(callback); @@ -137,9 +135,7 @@ namespace } { - MWGui::BookPage::ClickCallback callback; - - callback = std::bind(&JournalWindowImpl::notifyIndexLinkClicked, this, std::placeholders::_1); + auto callback = [&](MWGui::TypesetBook::InteractiveId index) { JournalWindowImpl::notifyIndexLinkClicked(index); }; getPage(LeftTopicIndex)->adviseLinkClicked(callback); getPage(CenterTopicIndex)->adviseLinkClicked(callback); From 42cab989b1c9ab076fc11b1002fe66fa546f9715 Mon Sep 17 00:00:00 2001 From: smilczek Date: Sun, 14 May 2023 21:44:37 +0200 Subject: [PATCH 2/7] got rid of auto --- apps/openmw/mwgui/dialogue.cpp | 3 ++- apps/openmw/mwgui/journalwindow.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 872228eae4..8cdf7884a0 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -326,7 +326,8 @@ namespace MWGui mScrollBar->eventScrollChangePosition += MyGUI::newDelegate(this, &DialogueWindow::onScrollbarMoved); mHistory->eventMouseWheel += MyGUI::newDelegate(this, &DialogueWindow::onMouseWheel); - auto callback = [&](TypesetBook::InteractiveId link) { DialogueWindow::notifyLinkClicked(link); }; + BookPage::ClickCallback callback = + [&](TypesetBook::InteractiveId link) { DialogueWindow::notifyLinkClicked(link); }; mHistory->adviseLinkClicked(callback); mMainWidget->castType()->eventWindowChangeCoord diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp index 4bef8cb138..677f1df25c 100644 --- a/apps/openmw/mwgui/journalwindow.cpp +++ b/apps/openmw/mwgui/journalwindow.cpp @@ -123,7 +123,8 @@ namespace topicsList->eventItemSelected += MyGUI::newDelegate(this, &JournalWindowImpl::notifyTopicSelected); { - auto callback = [&](intptr_t linkId) { JournalWindowImpl::notifyTopicClicked(linkId); }; + MWGui::BookPage::ClickCallback callback = + [&](intptr_t linkId) { JournalWindowImpl::notifyTopicClicked(linkId); }; getPage(LeftBookPage)->adviseLinkClicked(callback); getPage(RightBookPage)->adviseLinkClicked(callback); @@ -135,7 +136,8 @@ namespace } { - auto callback = [&](MWGui::TypesetBook::InteractiveId index) { JournalWindowImpl::notifyIndexLinkClicked(index); }; + MWGui::BookPage::ClickCallback callback = + [&](MWGui::TypesetBook::InteractiveId index) { JournalWindowImpl::notifyIndexLinkClicked(index); }; getPage(LeftTopicIndex)->adviseLinkClicked(callback); getPage(CenterTopicIndex)->adviseLinkClicked(callback); From 2910e35bc2bf00816c34d34f4b4e1be2da8af0b7 Mon Sep 17 00:00:00 2001 From: smilczek Date: Sun, 14 May 2023 22:42:13 +0200 Subject: [PATCH 3/7] Clarified the lambda expressions --- apps/openmw/mwgui/dialogue.cpp | 2 +- apps/openmw/mwgui/journalwindow.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 8cdf7884a0..3580e54665 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -327,7 +327,7 @@ namespace MWGui mHistory->eventMouseWheel += MyGUI::newDelegate(this, &DialogueWindow::onMouseWheel); BookPage::ClickCallback callback = - [&](TypesetBook::InteractiveId link) { DialogueWindow::notifyLinkClicked(link); }; + [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 677f1df25c..69afbbf9e1 100644 --- a/apps/openmw/mwgui/journalwindow.cpp +++ b/apps/openmw/mwgui/journalwindow.cpp @@ -124,7 +124,7 @@ namespace { MWGui::BookPage::ClickCallback callback = - [&](intptr_t linkId) { JournalWindowImpl::notifyTopicClicked(linkId); }; + [this](intptr_t linkId) { notifyTopicClicked(linkId); }; getPage(LeftBookPage)->adviseLinkClicked(callback); getPage(RightBookPage)->adviseLinkClicked(callback); @@ -137,7 +137,7 @@ namespace { MWGui::BookPage::ClickCallback callback = - [&](MWGui::TypesetBook::InteractiveId index) { JournalWindowImpl::notifyIndexLinkClicked(index); }; + [this](MWGui::TypesetBook::InteractiveId index) { notifyTopicClicked(index); }; getPage(LeftTopicIndex)->adviseLinkClicked(callback); getPage(CenterTopicIndex)->adviseLinkClicked(callback); From 05a2dc985bea1521543915905cb3205c53468a11 Mon Sep 17 00:00:00 2001 From: smilczek Date: Sun, 14 May 2023 22:51:43 +0200 Subject: [PATCH 4/7] Clang format --- apps/openmw/mwgui/dialogue.cpp | 3 +-- apps/openmw/mwgui/journalwindow.cpp | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 3580e54665..03a5fd9b7f 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -326,8 +326,7 @@ namespace MWGui mScrollBar->eventScrollChangePosition += MyGUI::newDelegate(this, &DialogueWindow::onScrollbarMoved); mHistory->eventMouseWheel += MyGUI::newDelegate(this, &DialogueWindow::onMouseWheel); - BookPage::ClickCallback callback = - [this](TypesetBook::InteractiveId link) { notifyLinkClicked(link); }; + 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 69afbbf9e1..f265ba5165 100644 --- a/apps/openmw/mwgui/journalwindow.cpp +++ b/apps/openmw/mwgui/journalwindow.cpp @@ -123,8 +123,7 @@ namespace topicsList->eventItemSelected += MyGUI::newDelegate(this, &JournalWindowImpl::notifyTopicSelected); { - MWGui::BookPage::ClickCallback callback = - [this](intptr_t linkId) { notifyTopicClicked(linkId); }; + MWGui::BookPage::ClickCallback callback = [this](intptr_t linkId) { notifyTopicClicked(linkId); }; getPage(LeftBookPage)->adviseLinkClicked(callback); getPage(RightBookPage)->adviseLinkClicked(callback); @@ -136,8 +135,8 @@ namespace } { - MWGui::BookPage::ClickCallback callback = - [this](MWGui::TypesetBook::InteractiveId index) { notifyTopicClicked(index); }; + MWGui::BookPage::ClickCallback callback + = [this](MWGui::TypesetBook::InteractiveId index) { notifyTopicClicked(index); }; getPage(LeftTopicIndex)->adviseLinkClicked(callback); getPage(CenterTopicIndex)->adviseLinkClicked(callback); From 027d51bfc0e4acffeac5959fb9f795772bd5c3ea Mon Sep 17 00:00:00 2001 From: smilczek Date: Mon, 15 May 2023 21:06:05 +0200 Subject: [PATCH 5/7] fixed a mistake --- apps/openmw/mwgui/journalwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp index f265ba5165..46adcd977e 100644 --- a/apps/openmw/mwgui/journalwindow.cpp +++ b/apps/openmw/mwgui/journalwindow.cpp @@ -136,7 +136,7 @@ namespace { MWGui::BookPage::ClickCallback callback - = [this](MWGui::TypesetBook::InteractiveId index) { notifyTopicClicked(index); }; + = [this](MWGui::TypesetBook::InteractiveId index) { notifyIndexLinkClicked(index); }; getPage(LeftTopicIndex)->adviseLinkClicked(callback); getPage(CenterTopicIndex)->adviseLinkClicked(callback); From f27dfd3f57360ac6e249bde4acaa0a5c968bd9cc Mon Sep 17 00:00:00 2001 From: smilczek Date: Tue, 16 May 2023 20:57:34 +0200 Subject: [PATCH 6/7] Added modernize-avoid-bind to .clang-tidy --- .clang-tidy | 1 + 1 file changed, 1 insertion(+) diff --git a/.clang-tidy b/.clang-tidy index 30427c9e0e..26e80ae006 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -6,6 +6,7 @@ Checks: > -clang-analyzer-optin*, -clang-analyzer-cplusplus.NewDeleteLeaks, -clang-analyzer-core.CallAndMessage + -modernize-avoid-bind WarningsAsErrors: > -*, boost-*, From 8cf431aeb2b80907e25d941ee6078da0236720e7 Mon Sep 17 00:00:00 2001 From: smilczek Date: Tue, 16 May 2023 21:06:18 +0200 Subject: [PATCH 7/7] Added a missing comma --- .clang-tidy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index 26e80ae006..d630063315 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -5,7 +5,7 @@ Checks: > clang-analyzer-*, -clang-analyzer-optin*, -clang-analyzer-cplusplus.NewDeleteLeaks, - -clang-analyzer-core.CallAndMessage + -clang-analyzer-core.CallAndMessage, -modernize-avoid-bind WarningsAsErrors: > -*,