From 8a6cd3806081ea91d2c9432a2650775e1b6be97e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Mon, 23 Jul 2012 08:21:31 +0200 Subject: [PATCH] Settingsdialog: Use QPointer [krazy 8/37] by Mikko Rapeli --- src/kdenlivesettingsdialog.cpp | 35 ++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp index 89ba2b11..b91654ea 100644 --- a/src/kdenlivesettingsdialog.cpp +++ b/src/kdenlivesettingsdialog.cpp @@ -480,34 +480,45 @@ void KdenliveSettingsDialog::showPage(int page, int option) void KdenliveSettingsDialog::slotEditVideoApplication() { KService::Ptr service; - KOpenWithDialog dlg(KUrl::List(), i18n("Select default video player"), m_configEnv.kcfg_defaultplayerapp->text(), this); - if (dlg.exec() != QDialog::Accepted) + QPointer dlg = new KOpenWithDialog(KUrl::List(), i18n("Select default video player"), m_configEnv.kcfg_defaultplayerapp->text(), this); + if (dlg->exec() != QDialog::Accepted) + { + delete dlg; return; + } - service = dlg.service(); + service = dlg->service(); m_configEnv.kcfg_defaultplayerapp->setText(service->exec()); + delete dlg; } void KdenliveSettingsDialog::slotEditAudioApplication() { KService::Ptr service; - KOpenWithDialog dlg(KUrl::List(), i18n("Select default audio editor"), m_configEnv.kcfg_defaultaudioapp->text(), this); - if (dlg.exec() != QDialog::Accepted) + QPointer dlg = new KOpenWithDialog(KUrl::List(), i18n("Select default audio editor"), m_configEnv.kcfg_defaultaudioapp->text(), this); + if (dlg->exec() != QDialog::Accepted) + { + delete dlg; return; + } - service = dlg.service(); + service = dlg->service(); m_configEnv.kcfg_defaultaudioapp->setText(service->exec()); + delete dlg; } void KdenliveSettingsDialog::slotEditImageApplication() { KService::Ptr service; - KOpenWithDialog dlg(KUrl::List(), i18n("Select default image editor"), m_configEnv.kcfg_defaultimageapp->text(), this); - if (dlg.exec() != QDialog::Accepted) + QPointer dlg = new KOpenWithDialog(KUrl::List(), i18n("Select default image editor"), m_configEnv.kcfg_defaultimageapp->text(), this); + if (dlg->exec() != QDialog::Accepted) + { + delete dlg; return; - - service = dlg.service(); + } + service = dlg->service(); m_configEnv.kcfg_defaultimageapp->setText(service->exec()); + delete dlg; } #ifdef USE_JOGSHUTTLE @@ -988,7 +999,7 @@ void KdenliveSettingsDialog::slotManageEncodingProfile() if (m_configCapture.tabWidget->currentIndex() == 1) type = 1; else if (m_configCapture.tabWidget->currentIndex() == 3) type = 2; } - EncodingProfilesDialog *d = new EncodingProfilesDialog(type); + QPointer d = new EncodingProfilesDialog(type); d->exec(); delete d; loadEncodingProfiles(); @@ -1076,7 +1087,7 @@ void KdenliveSettingsDialog::slotUpdateProxyProfile(int ix) void KdenliveSettingsDialog::slotEditVideo4LinuxProfile() { QString vl4ProfilePath = KStandardDirs::locateLocal("appdata", "profiles/video4linux"); - ProfilesDialog *w = new ProfilesDialog(vl4ProfilePath); + QPointer w = new ProfilesDialog(vl4ProfilePath); if (w->exec() == QDialog::Accepted) { // save and update profile loadCurrentV4lProfileInfo(); -- 2.39.2