From 082243fd96ddec2f461d13f9947bbe2e29aea501 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 28 Oct 2011 13:22:45 +0200 Subject: [PATCH] Fix memory leaks (lacking destructors for uis) Change-Id: I07c2708d727d59286b0d625a4c0c318f18b03b93 Reviewed-by: Tobias Hunger Reviewed-by: hjk --- src/plugins/debugger/debuggerdialogs.cpp | 1 + src/plugins/git/remotedialog.cpp | 5 +++++ src/plugins/git/remotedialog.h | 1 + src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp | 5 +++++ src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h | 1 + src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp | 5 +++++ src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h | 1 + src/plugins/valgrind/suppressiondialog.cpp | 5 +++++ src/plugins/valgrind/suppressiondialog.h | 1 + 9 files changed, 25 insertions(+) diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index e13502c351f..8915590bc84 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -1040,6 +1040,7 @@ StartRemoteEngineDialog::StartRemoteEngineDialog(QWidget *parent) : StartRemoteEngineDialog::~StartRemoteEngineDialog() { + delete m_ui; } QString StartRemoteEngineDialog::host() const diff --git a/src/plugins/git/remotedialog.cpp b/src/plugins/git/remotedialog.cpp index 1c388305f78..06d02cb5007 100644 --- a/src/plugins/git/remotedialog.cpp +++ b/src/plugins/git/remotedialog.cpp @@ -60,6 +60,11 @@ RemoteAdditionDialog::RemoteAdditionDialog(QWidget *parent) : setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); } +RemoteAdditionDialog::~RemoteAdditionDialog() +{ + delete m_ui; +} + QString RemoteAdditionDialog::remoteName() const { return m_ui->nameEdit->text(); diff --git a/src/plugins/git/remotedialog.h b/src/plugins/git/remotedialog.h index 4458bf544c7..12e367b9bc2 100644 --- a/src/plugins/git/remotedialog.h +++ b/src/plugins/git/remotedialog.h @@ -56,6 +56,7 @@ class RemoteAdditionDialog : public QDialog public: explicit RemoteAdditionDialog(QWidget *parent = 0); + ~RemoteAdditionDialog(); QString remoteName() const; QString remoteUrl() const; diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp index 52083b859cf..60468138dc3 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp @@ -409,6 +409,11 @@ RvctToolChainConfigWidget::RvctToolChainConfigWidget(RvctToolChain *tc) : setFromToolChain(); } +RvctToolChainConfigWidget::~RvctToolChainConfigWidget() +{ + delete m_ui; +} + void RvctToolChainConfigWidget::apply() { RvctToolChain *tc = static_cast(toolChain()); diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h index 6580afe5d4b..b134f721d40 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h +++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h @@ -143,6 +143,7 @@ class RvctToolChainConfigWidget : public ProjectExplorer::ToolChainConfigWidget public: RvctToolChainConfigWidget(RvctToolChain *tc); + ~RvctToolChainConfigWidget(); void apply(); void discard() { setFromToolChain(); } diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp index 367d6f52c05..0d93c8a4ac7 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp @@ -319,6 +319,11 @@ WinscwToolChainConfigWidget::WinscwToolChainConfigWidget(WinscwToolChain *tc) : discard(); } +WinscwToolChainConfigWidget::~WinscwToolChainConfigWidget() +{ + delete m_ui; +} + void WinscwToolChainConfigWidget::apply() { WinscwToolChain *tc = static_cast(toolChain()); diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h index 198b36bacfd..aa8c13818ae 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h +++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h @@ -105,6 +105,7 @@ class WinscwToolChainConfigWidget : public ProjectExplorer::ToolChainConfigWidge public: WinscwToolChainConfigWidget(WinscwToolChain *); + ~WinscwToolChainConfigWidget(); void apply(); void discard(); diff --git a/src/plugins/valgrind/suppressiondialog.cpp b/src/plugins/valgrind/suppressiondialog.cpp index e5e3470534b..cdd78e45e65 100644 --- a/src/plugins/valgrind/suppressiondialog.cpp +++ b/src/plugins/valgrind/suppressiondialog.cpp @@ -170,6 +170,11 @@ SuppressionDialog::SuppressionDialog(MemcheckErrorView *view) setWindowTitle(tr("Save Suppression")); } +SuppressionDialog::~SuppressionDialog() +{ + delete m_ui; +} + bool SuppressionDialog::shouldShow() const { return !m_errors.isEmpty(); diff --git a/src/plugins/valgrind/suppressiondialog.h b/src/plugins/valgrind/suppressiondialog.h index 3dc6ff70137..f5d65c05849 100644 --- a/src/plugins/valgrind/suppressiondialog.h +++ b/src/plugins/valgrind/suppressiondialog.h @@ -58,6 +58,7 @@ class SuppressionDialog : public QDialog public: SuppressionDialog(MemcheckErrorView *view); + ~SuppressionDialog(); virtual void accept(); virtual void reject();