Resolve C++20 deprecation warnings #10949
Merged
+29
−23
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Zopolis4
force-pushed
the
reprecated
branch
4 times, most recently
from
cf14354
to
d0faa39
Compare
phire
requested changes
Aug 5, 2022
| @@ -85,7 +85,7 @@ MenuBar::MenuBar(QWidget* parent) : QMenuBar(parent) | |||
| AddHelpMenu(); | |||
|
|
|||
| connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, | |||
| [=](Core::State state) { OnEmulationStateChanged(state); }); | |||
| [=, this](Core::State state) { OnEmulationStateChanged(state); }); | |||
There was a problem hiding this comment.
The lambda is unnecessary; we can replace it with &MenuBar::OnEmulationStateChanged.
Source/Core/DolphinQt/MainWindow.cpp
Outdated
| [=, this](Core::State state) { | ||
| if (state == Core::State::Uninitialized) | ||
| OnStopComplete(); | ||
| if (state != Core::State::Uninitialized && NetPlay::IsNetPlayRunning() && | ||
| m_controllers_window) | ||
| m_controllers_window->reject(); | ||
|
|
||
| if (state == Core::State::Running && m_fullscreen_requested) | ||
| { | ||
| FullScreen(); | ||
| m_fullscreen_requested = false; | ||
| } | ||
| }); |
There was a problem hiding this comment.
We should create MainWindow::OnEmulationStateChange and put the contents of this lambda there.
| [=, this](Core::State state) { | ||
| if (isVisible()) | ||
| { | ||
| GameStatusChanged(state != Core::State::Uninitialized); | ||
| if ((state == Core::State::Uninitialized || state == Core::State::Stopping) && | ||
| !m_got_stop_request) | ||
| { | ||
| Settings::Instance().GetNetPlayClient()->RequestStopGame(); | ||
| } | ||
| if (state == Core::State::Uninitialized) | ||
| DisplayMessage(tr("Stopped game"), "red"); | ||
| } | ||
| }); |
There was a problem hiding this comment.
Extract lambda to new OnEmulationStateChange function
phire
approved these changes
Aug 8, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Now that all builds are on C++20 a couple of new deprecation warnings are generated.
The
QKeySequencewarning is an upstream issue, in the way that you are intended to call it, from what I can tell.