Fix memory leak

svn path=/trunk/KDE/kdebase/apps/; revision=1119153
This commit is contained in:
David Faure 2010-04-26 17:29:02 +00:00
parent cd385e2828
commit 3b5ccaacf5
7 changed files with 12 additions and 13 deletions

View file

@ -255,8 +255,8 @@ void KEBApp::createActions() {
ActionsImpl::ActionsImpl(QObject* parent, KBookmarkModel* model)
: QObject(parent), m_model(model),
m_testLinkHolder(new TestLinkItrHolder(model)),
m_favIconHolder(new FavIconsItrHolder(model))
m_testLinkHolder(new TestLinkItrHolder(this, model)),
m_favIconHolder(new FavIconsItrHolder(this, model))
{
Q_ASSERT(m_model);
}

View file

@ -26,7 +26,7 @@
#include <QtCore/QTimer>
BookmarkIterator::BookmarkIterator(BookmarkIteratorHolder* holder, const QList<KBookmark>& bks)
: m_bookmarkList(bks), m_holder(holder)
: QObject(holder), m_bookmarkList(bks), m_holder(holder)
{
delayedEmitNextOne();
}
@ -72,8 +72,8 @@ KBookmarkModel* BookmarkIterator::model()
/* --------------------------- */
BookmarkIteratorHolder::BookmarkIteratorHolder(KBookmarkModel* model)
: m_model(model)
BookmarkIteratorHolder::BookmarkIteratorHolder(QObject* parent, KBookmarkModel* model)
: QObject(parent), m_model(model)
{
Q_ASSERT(m_model);
}

View file

@ -76,7 +76,7 @@ Q_SIGNALS:
void setCancelEnabled(bool canCancel);
protected:
BookmarkIteratorHolder(KBookmarkModel* model);
BookmarkIteratorHolder(QObject* parent, KBookmarkModel* model);
virtual ~BookmarkIteratorHolder() {}
void doIteratorListChanged();
int count() const { return m_iterators.count(); }

View file

@ -27,10 +27,9 @@
#include <kdebug.h>
#include <klocale.h>
FavIconsItrHolder::FavIconsItrHolder(KBookmarkModel* model)
: BookmarkIteratorHolder(model)
FavIconsItrHolder::FavIconsItrHolder(QObject* parent, KBookmarkModel* model)
: BookmarkIteratorHolder(parent, model)
{
// do stuff
}
/* -------------------------- */

View file

@ -26,7 +26,7 @@
class FavIconsItrHolder : public BookmarkIteratorHolder {
public:
FavIconsItrHolder(KBookmarkModel* model);
FavIconsItrHolder(QObject* parent, KBookmarkModel* model);
};
class KBookmarkModel;

View file

@ -30,8 +30,8 @@
#include "bookmarkiterator.h"
#include "kbookmarkmodel/model.h"
TestLinkItrHolder::TestLinkItrHolder(KBookmarkModel* model)
: BookmarkIteratorHolder(model)
TestLinkItrHolder::TestLinkItrHolder(QObject* parent, KBookmarkModel* model)
: BookmarkIteratorHolder(parent, model)
{
}

View file

@ -29,7 +29,7 @@ class KBookmarkModel;
class TestLinkItrHolder : public BookmarkIteratorHolder {
public:
TestLinkItrHolder(KBookmarkModel* model);
TestLinkItrHolder(QObject* parent, KBookmarkModel* model);
};
class TestLinkItr : public BookmarkIterator