diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-10-13 21:17:47 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-10-13 21:17:47 +0200 |
| commit | 5f86ee52cabf6f744dfe331539e1792877696aec (patch) | |
| tree | 21818c8b9272e2cd0d5cac088621a5dbb5b9d4cd /src/bookmarks/bookmarkprovider.cpp | |
| parent | - get rid of the selected bookmark in BookmarkOwner (diff) | |
| parent | Fix mem leak, due to kbookmarkmenu class. (diff) | |
| download | rekonq-5f86ee52cabf6f744dfe331539e1792877696aec.tar.xz | |
Merge branch 'bkmenuleak'
Diffstat (limited to 'src/bookmarks/bookmarkprovider.cpp')
| -rw-r--r-- | src/bookmarks/bookmarkprovider.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/bookmarks/bookmarkprovider.cpp b/src/bookmarks/bookmarkprovider.cpp index beca5475..ccdc3269 100644 --- a/src/bookmarks/bookmarkprovider.cpp +++ b/src/bookmarks/bookmarkprovider.cpp @@ -97,6 +97,7 @@ BookmarkProvider::BookmarkProvider(QObject *parent) BookmarkProvider::~BookmarkProvider() { + qDeleteAll(m_bookmarkMenus); delete m_manager; } @@ -109,8 +110,9 @@ KActionMenu* BookmarkProvider::bookmarkActionMenu(QWidget *parent) KActionMenu *bookmarkActionMenu = new KActionMenu(menu); bookmarkActionMenu->setMenu(menu); bookmarkActionMenu->setText(i18n("&Bookmarks")); - new BookmarkMenu(m_manager, m_owner, menu, m_actionCollection); - + BookmarkMenu *bMenu = new BookmarkMenu(m_manager, m_owner, menu, m_actionCollection); + m_bookmarkMenus.append(bMenu); + kDebug() << "new Bookmarks menu... DONE"; return bookmarkActionMenu; @@ -222,8 +224,9 @@ void BookmarkProvider::fillBookmarkBar(BookmarkToolBar *toolBar) { KBookmarkActionMenu *menuAction = new KBookmarkActionMenu(bookmark.toGroup(), this); menuAction->setDelayed(false); - new BookmarkMenu(bookmarkManager(), bookmarkOwner(), menuAction->menu(), bookmark.address()); - + BookmarkMenu *bMenu = new BookmarkMenu(bookmarkManager(), bookmarkOwner(), menuAction->menu(), bookmark.address()); + m_bookmarkMenus.append(bMenu); + connect(menuAction->menu(), SIGNAL(aboutToShow()), toolBar, SLOT(menuDisplayed())); connect(menuAction->menu(), SIGNAL(aboutToHide()), toolBar, SLOT(menuHidden())); |