From 63a0225ea989fb607821a1747eba0f9f526703b9 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Wed, 3 Jun 2009 13:53:45 +0200
Subject: [PATCH] Fix some insignificant memory leaks.
Reviewed-By: hjk
---
src/plugins/coreplugin/welcomemode.cpp | 1 +
src/plugins/debugger/debuggeractions.h | 3 +--
src/plugins/debugger/debuggerplugin.cpp | 1 +
src/plugins/fakevim/fakevimactions.h | 3 +--
src/plugins/fakevim/fakevimplugin.cpp | 1 +
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index 4234b600d38..e39d64d3616 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -206,6 +206,7 @@ WelcomeMode::~WelcomeMode()
{
QSettings *settings = ICore::instance()->settings();
settings->setValue("General/WelcomeTab", m_d->btnGrp->checkedId());
+ delete m_d->m_widget;
delete m_d;
}
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h
index b65981957bf..c6a11a26d62 100644
--- a/src/plugins/debugger/debuggeractions.h
+++ b/src/plugins/debugger/debuggeractions.h
@@ -43,11 +43,10 @@ namespace Internal {
class DebuggerSettings : public QObject
{
Q_OBJECT
-
public:
DebuggerSettings(QObject *parent = 0);
~DebuggerSettings();
-
+
void insertItem(int code, Core::Utils::SavedAction *item);
Core::Utils::SavedAction *item(int code) const;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 4c09fe9d1d0..d252b2482da 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -418,6 +418,7 @@ void DebuggerPlugin::shutdown()
m_manager->shutdown();
writeSettings();
+ delete DebuggerSettings::instance();
//qDebug() << "DebuggerPlugin::~DebuggerPlugin";
removeObject(m_debugMode);
diff --git a/src/plugins/fakevim/fakevimactions.h b/src/plugins/fakevim/fakevimactions.h
index 45b3f9fb059..43ec20ed7a0 100644
--- a/src/plugins/fakevim/fakevimactions.h
+++ b/src/plugins/fakevim/fakevimactions.h
@@ -66,7 +66,6 @@ class FakeVimSettings : public QObject
public:
FakeVimSettings();
~FakeVimSettings();
-
void insertItem(int code, Core::Utils::SavedAction *item,
const QString &longname = QString(),
const QString &shortname = QString());
@@ -77,7 +76,7 @@ public:
void readSettings(QSettings *settings);
void writeSettings(QSettings *settings);
-public:
+private:
QHash<int, Core::Utils::SavedAction *> m_items;
QHash<QString, int> m_nameToCode;
QHash<int, QString> m_codeToName;
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 50bdb9dd9d8..1910b4905b9 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -280,6 +280,7 @@ void FakeVimPluginPrivate::shutdown()
delete m_fakeVimOptionsPage;
m_fakeVimOptionsPage = 0;
theFakeVimSettings()->writeSettings(Core::ICore::instance()->settings());
+ delete theFakeVimSettings();
}
bool FakeVimPluginPrivate::initialize()
--
GitLab