From 42cab989b1c9ab076fc11b1002fe66fa546f9715 Mon Sep 17 00:00:00 2001 From: smilczek Date: Sun, 14 May 2023 21:44:37 +0200 Subject: [PATCH] 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);