From f69da8e77015037cfd803484bdd89adc35d35ae4 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 29 Jul 2013 17:02:08 +0200 Subject: [PATCH] Fix some memory leaks. Change-Id: Iba9d32aacbfe11d9542f629fca0571998b4fadfb Reviewed-by: Daniel Teske --- .../kitinformationconfigwidget.cpp | 25 ++++++++++++++++++- .../kitinformationconfigwidget.h | 4 +++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index 18327f8fd40..1cef6d3054a 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -65,6 +65,11 @@ SysRootInformationConfigWidget::SysRootInformationConfigWidget(Kit *k, bool stic connect(m_chooser, SIGNAL(changed(QString)), this, SLOT(pathWasChanged())); } +SysRootInformationConfigWidget::~SysRootInformationConfigWidget() +{ + delete m_chooser; +} + QString SysRootInformationConfigWidget::displayName() const { return tr("Sysroot:"); @@ -73,7 +78,7 @@ QString SysRootInformationConfigWidget::displayName() const QString SysRootInformationConfigWidget::toolTip() const { return tr("The root directory of the system image to use.
" - "Leave empty when building for the desktop."); + "Leave empty when building for the desktop."); } void SysRootInformationConfigWidget::refresh() @@ -137,6 +142,12 @@ ToolChainInformationConfigWidget::ToolChainInformationConfigWidget(Kit *k, bool this, SLOT(toolChainUpdated(ProjectExplorer::ToolChain*))); } +ToolChainInformationConfigWidget::~ToolChainInformationConfigWidget() +{ + delete m_comboBox; + delete m_manageButton; +} + QString ToolChainInformationConfigWidget::displayName() const { return tr("Compiler:"); @@ -249,6 +260,11 @@ DeviceTypeInformationConfigWidget::DeviceTypeInformationConfigWidget(Kit *workin connect(m_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(currentTypeChanged(int))); } +DeviceTypeInformationConfigWidget::~DeviceTypeInformationConfigWidget() +{ + delete m_comboBox; +} + QWidget *DeviceTypeInformationConfigWidget::mainWidget() const { return m_comboBox; @@ -312,6 +328,13 @@ DeviceInformationConfigWidget::DeviceInformationConfigWidget(Kit *workingCopy, b connect(m_manageButton, SIGNAL(clicked()), this, SLOT(manageDevices())); } +DeviceInformationConfigWidget::~DeviceInformationConfigWidget() +{ + delete m_comboBox; + delete m_model; + delete m_manageButton; +} + QWidget *DeviceInformationConfigWidget::mainWidget() const { return m_comboBox; diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.h b/src/plugins/projectexplorer/kitinformationconfigwidget.h index 5847a9de8b1..b3d81d03a91 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.h +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.h @@ -58,6 +58,7 @@ class SysRootInformationConfigWidget : public KitConfigWidget public: explicit SysRootInformationConfigWidget(Kit *k, bool sticky); + ~SysRootInformationConfigWidget(); QString displayName() const; void refresh(); @@ -84,6 +85,7 @@ class ToolChainInformationConfigWidget : public KitConfigWidget public: explicit ToolChainInformationConfigWidget(Kit *k, bool sticky); + ~ToolChainInformationConfigWidget(); QString displayName() const; void refresh(); @@ -118,6 +120,7 @@ class DeviceTypeInformationConfigWidget : public KitConfigWidget public: explicit DeviceTypeInformationConfigWidget(Kit *workingCopy, bool sticky); + ~DeviceTypeInformationConfigWidget(); QWidget *mainWidget() const; QString displayName() const; @@ -143,6 +146,7 @@ class DeviceInformationConfigWidget : public KitConfigWidget public: explicit DeviceInformationConfigWidget(Kit *workingCopy, bool sticky); + ~DeviceInformationConfigWidget(); QWidget *mainWidget() const; QWidget *buttonWidget() const;