From 44802d754ebc40af24d4a2fcc1d9412fbe4fe814 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 21 Feb 2017 10:04:31 +0100 Subject: [PATCH] Delete QMessageBox after usage Change-Id: Icba5fddb5596f263f2cbb19f91b6ce95ca7785c6 Reviewed-by: Orgad Shaneh --- src/plugins/projectexplorer/session.cpp | 14 +++++++------- src/plugins/texteditor/fontsettingspage.cpp | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 9e8fea12ded..3b68746c8ae 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -894,18 +894,18 @@ void SessionManagerPrivate::askUserAboutFailedProjects() if (!failedProjects.isEmpty()) { QString fileList = QDir::toNativeSeparators(failedProjects.join(QLatin1String("
"))); - auto box = new QMessageBox(QMessageBox::Warning, + QMessageBox box(QMessageBox::Warning, SessionManager::tr("Failed to restore project files"), SessionManager::tr("Could not restore the following project files:
%1"). arg(fileList)); - auto keepButton = new QPushButton(SessionManager::tr("Keep projects in Session"), box); - auto removeButton = new QPushButton(SessionManager::tr("Remove projects from Session"), box); - box->addButton(keepButton, QMessageBox::AcceptRole); - box->addButton(removeButton, QMessageBox::DestructiveRole); + auto keepButton = new QPushButton(SessionManager::tr("Keep projects in Session"), &box); + auto removeButton = new QPushButton(SessionManager::tr("Remove projects from Session"), &box); + box.addButton(keepButton, QMessageBox::AcceptRole); + box.addButton(removeButton, QMessageBox::DestructiveRole); - box->exec(); + box.exec(); - if (box->clickedButton() == removeButton) + if (box.clickedButton() == removeButton) m_failedProjects.clear(); } } diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index 7357510abda..d51e139c5fa 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -554,7 +554,7 @@ void FontSettingsPage::maybeSaveColorScheme() if (d_ptr->m_value.colorScheme() == d_ptr->m_ui->schemeEdit->colorScheme()) return; - QMessageBox *messageBox = new QMessageBox(QMessageBox::Warning, + QMessageBox messageBox(QMessageBox::Warning, tr("Color Scheme Changed"), tr("The color scheme \"%1\" was modified, do you want to save the changes?") .arg(d_ptr->m_ui->schemeEdit->colorScheme().displayName()), @@ -562,12 +562,12 @@ void FontSettingsPage::maybeSaveColorScheme() d_ptr->m_ui->schemeComboBox->window()); // Change the text of the discard button - QPushButton *discardButton = static_cast(messageBox->button(QMessageBox::Discard)); + QPushButton *discardButton = static_cast(messageBox.button(QMessageBox::Discard)); discardButton->setText(tr("Discard")); - messageBox->addButton(discardButton, QMessageBox::DestructiveRole); - messageBox->setDefaultButton(QMessageBox::Save); + messageBox.addButton(discardButton, QMessageBox::DestructiveRole); + messageBox.setDefaultButton(QMessageBox::Save); - if (messageBox->exec() == QMessageBox::Save) { + if (messageBox.exec() == QMessageBox::Save) { const ColorScheme &scheme = d_ptr->m_ui->schemeEdit->colorScheme(); scheme.save(d_ptr->m_value.colorSchemeFileName(), Core::ICore::mainWindow()); }