From e93410897cf28185b9eda75fc0cb3ca7faf2e004 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 31 Jul 2009 17:11:42 +0200
Subject: [PATCH] Fixed warnings about removing null-objects from
Plugin-Manager.
---
src/plugins/cpaster/cpasterplugin.cpp | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index f8744e74d0d..8c8f09118d6 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -68,13 +68,6 @@ CodepasterPlugin::CodepasterPlugin()
CodepasterPlugin::~CodepasterPlugin()
{
- if (m_settingsPage) {
- removeObject(m_settingsPage);
- delete m_settingsPage;
- m_settingsPage = 0;
- }
- foreach(Protocol* item, m_protocols)
- removeObject(item->settingsPage());
}
bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_message)
@@ -88,7 +81,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
// Create the settings Page
m_settingsPage = new SettingsPage();
- addObject(m_settingsPage);
+ addAutoReleasedObject(m_settingsPage);
// Create the protocols and append them to the Settings
Protocol *protos[] = { new CodePasterProtocol(),
@@ -101,7 +94,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
this, SLOT(finishFetch(QString,QString,bool)));
m_settingsPage->addProtocol(protos[i]->name());
if (protos[i]->hasSettings())
- addObject(protos[i]->settingsPage());
+ addAutoReleasedObject(protos[i]->settingsPage());
m_protocols.append(protos[i]);
}
--
GitLab