From bfbcce94c54ec1f322e40b9b81bedf954a8fe09c Mon Sep 17 00:00:00 2001 From: Aki Koskinen Date: Tue, 6 Jan 2015 21:07:18 +0200 Subject: [PATCH] Fix a few memory leaks Some raw pointers never got released. These errors were found by running QtCreator via Valgrind. Change-Id: I9c5b2862b98597f3e468d573e7126d7d9ec46b05 Reviewed-by: Orgad Shaneh Reviewed-by: Eike Ziller --- src/plugins/coreplugin/designmode.cpp | 1 + .../qmldesigner/components/componentcore/crumblebar.cpp | 5 +++++ .../qmldesigner/components/componentcore/crumblebar.h | 1 + src/plugins/qnx/qnxconfigurationmanager.cpp | 1 + 4 files changed, 8 insertions(+) diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp index 49f99650fae..9436c1c3b34 100644 --- a/src/plugins/coreplugin/designmode.cpp +++ b/src/plugins/coreplugin/designmode.cpp @@ -189,6 +189,7 @@ void DesignMode::unregisterDesignWidget(QWidget *widget) foreach (DesignEditorInfo *info, d->m_editors) { if (info->widget == widget) { d->m_editors.removeAll(info); + delete info; break; } } diff --git a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp b/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp index e12725a5ee5..776e2892bc3 100644 --- a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp +++ b/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp @@ -84,6 +84,11 @@ CrumbleBar::CrumbleBar(QObject *parent) : updateVisibility(); } +CrumbleBar::~CrumbleBar() +{ + delete m_crumblePath; +} + void CrumbleBar::pushFile(const QString &fileName) { if (m_isInternalCalled == false) { diff --git a/src/plugins/qmldesigner/components/componentcore/crumblebar.h b/src/plugins/qmldesigner/components/componentcore/crumblebar.h index 7586087c37f..8d24be13563 100644 --- a/src/plugins/qmldesigner/components/componentcore/crumblebar.h +++ b/src/plugins/qmldesigner/components/componentcore/crumblebar.h @@ -42,6 +42,7 @@ class CrumbleBar : public QObject Q_OBJECT public: explicit CrumbleBar(QObject *parent = 0); + ~CrumbleBar(); void pushFile(const QString &fileName); void pushInFileComponent(const ModelNode &modelNode); diff --git a/src/plugins/qnx/qnxconfigurationmanager.cpp b/src/plugins/qnx/qnxconfigurationmanager.cpp index 8c2ca184ad7..826d2ad5a69 100644 --- a/src/plugins/qnx/qnxconfigurationmanager.cpp +++ b/src/plugins/qnx/qnxconfigurationmanager.cpp @@ -71,6 +71,7 @@ QnxConfigurationManager::~QnxConfigurationManager() { m_instance = 0; qDeleteAll(m_configurations); + delete m_writer; } QList QnxConfigurationManager::configurations() const