[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim/KDE/4.11] kalarm: Fix edit dialog memory leak when it is closed by clicking Cancel
From:       David Jarvie <djarvie () kde ! org>
Date:       2013-07-31 22:54:01
Message-ID: E1V4fHN-0005o5-89 () scm ! kde ! org
[Download RAW message or body]

Git commit 4137f24d10c3122613f975ac898ac0d4b55e0b34 by David Jarvie.
Committed on 31/07/2013 at 22:50.
Pushed by djarvie into branch 'KDE/4.11'.

Fix edit dialog memory leak when it is closed by clicking Cancel

M  +9    -0    kalarm/functions.cpp
M  +1    -0    kalarm/functions_p.h

http://commits.kde.org/kdepim/4137f24d10c3122613f975ac898ac0d4b55e0b34

diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index fd80506..6b0082c 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -1243,6 +1243,7 @@ PrivateNewAlarmDlg::PrivateNewAlarmDlg(EditAlarmDlg* =
dlg)
     : QObject(dlg)
 {
     connect(dlg, SIGNAL(accepted()), SLOT(okClicked()));
+    connect(dlg, SIGNAL(rejected()), SLOT(cancelClicked()));
 }
 =

 /*************************************************************************=
*****
@@ -1293,6 +1294,14 @@ void PrivateNewAlarmDlg::accept(EditAlarmDlg* editDl=
g)
 }
 =

 /*************************************************************************=
*****
+* Called when the dialogue is rejected (e.g. by clicking the Cancel button=
).
+*/
+void PrivateNewAlarmDlg::cancelClicked()
+{
+    static_cast<EditAlarmDlg*>(parent())->deleteLater();
+}
+
+/*************************************************************************=
*****
 * Display the alarm edit dialog to edit a new alarm, preset with a templat=
e.
 */
 bool editNewAlarm(const QString& templateName, QWidget* parent)
diff --git a/kalarm/functions_p.h b/kalarm/functions_p.h
index 7ae73f5..d37ca0c 100644
--- a/kalarm/functions_p.h
+++ b/kalarm/functions_p.h
@@ -65,6 +65,7 @@ class PrivateNewAlarmDlg : public QObject
 =

     private slots:
         void okClicked();
+        void cancelClicked();
 };
 =

 } // namespace KAlarm
[prev in list] [next in list] [prev in thread] [next in thread]