From 8f2558dc89c323f090ccd48db9408b8ae76bd4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 14 Sep 2017 17:01:43 +0200 Subject: [PATCH] Qt: Simplify AboutDialog creation Just create the AboutDialog on the stack -- the actual object lives on the heap anyway, since Qt uses the pimpl idiom. Removes the need for an explicit new and a special delete on close attribute. --- Source/Core/DolphinQt2/AboutDialog.cpp | 1 - Source/Core/DolphinQt2/MainWindow.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinQt2/AboutDialog.cpp b/Source/Core/DolphinQt2/AboutDialog.cpp index 898237dc82..7f6f4f380a 100644 --- a/Source/Core/DolphinQt2/AboutDialog.cpp +++ b/Source/Core/DolphinQt2/AboutDialog.cpp @@ -14,7 +14,6 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("About Dolphin")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - setAttribute(Qt::WA_DeleteOnClose); QString text = QStringLiteral(""); QString small = QStringLiteral("

"); diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp index ce710b6ce0..e93c6c2f29 100644 --- a/Source/Core/DolphinQt2/MainWindow.cpp +++ b/Source/Core/DolphinQt2/MainWindow.cpp @@ -553,8 +553,8 @@ void MainWindow::ShowAudioWindow() void MainWindow::ShowAboutDialog() { - AboutDialog* about = new AboutDialog(this); - about->show(); + AboutDialog about{this}; + about.exec(); } void MainWindow::ShowHotkeyDialog()