From 5b7cfb463ac8b77ceaecfcec0ad49e31f3c92da7 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Thu, 12 Nov 2020 00:13:06 -0800 Subject: [PATCH] Qt: Clean up unique_ptr a bit --- src/platform/qt/Window.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index 899a6cb6b..6ac17c363 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -883,7 +883,7 @@ void Window::reloadDisplayDriver() { m_display->stopDrawing(); detachWidget(m_display.get()); } - m_display = std::move(std::unique_ptr(Display::create(this))); + m_display = std::unique_ptr(Display::create(this)); #if defined(BUILD_GL) || defined(BUILD_GLES2) m_shaderView.reset(); m_shaderView = std::make_unique(m_display.get(), m_config); @@ -945,7 +945,7 @@ void Window::reloadAudioDriver() { } const mCoreOptions* opts = m_config->options(); - m_audioProcessor = std::move(std::unique_ptr(AudioProcessor::create())); + m_audioProcessor = std::unique_ptr(AudioProcessor::create()); m_audioProcessor->setInput(m_controller); m_audioProcessor->setBufferSamples(opts->audioBuffers); m_audioProcessor->requestSampleRate(opts->sampleRate); @@ -1462,7 +1462,7 @@ void Window::setupMenu(QMenuBar* menubar) { m_actions.addAction(tr("Game &overrides..."), "overrideWindow", [this]() { if (!m_overrideView) { - m_overrideView = std::move(std::make_unique(m_config)); + m_overrideView = std::make_unique(m_config); if (m_controller) { m_overrideView->setController(m_controller); } @@ -1474,7 +1474,7 @@ void Window::setupMenu(QMenuBar* menubar) { m_actions.addAction(tr("Game Pak sensors..."), "sensorWindow", [this]() { if (!m_sensorView) { - m_sensorView = std::move(std::make_unique(&m_inputController)); + m_sensorView = std::make_unique(&m_inputController); if (m_controller) { m_sensorView->setController(m_controller); }