diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 16:37:16 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-09-02 16:37:16 +0200 |
commit | 41c7700350e2609219bf1e6798e6f4e6cf91c8f2 (patch) | |
tree | 5947a12e45de523cf5e45c14e31a1e6520f3eba9 /src | |
parent | Fix wrong highlights in the search strings (diff) | |
parent | Make sure the model is only created ones (diff) | |
download | rekonq-41c7700350e2609219bf1e6798e6f4e6cf91c8f2.tar.xz |
Merge commit 'refs/merge-requests/196' of git://gitorious.org/rekonq/mainline into m196
Diffstat (limited to 'src')
-rw-r--r-- | src/bookmarks/bookmarkspanel.cpp | 4 | ||||
-rw-r--r-- | src/bookmarks/bookmarkspanel.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp index e88d3060..d082b557 100644 --- a/src/bookmarks/bookmarkspanel.cpp +++ b/src/bookmarks/bookmarkspanel.cpp @@ -43,10 +43,12 @@ BookmarksPanel::BookmarksPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags) : UrlPanel(title, parent, flags) + , model(new BookmarksTreeModel(this)) , m_loadingState(false) { setObjectName("bookmarksPanel"); setVisible(ReKonfig::showBookmarksPanel()); + connect(model, SIGNAL(bookmarksUpdated()), this, SLOT(startLoadFoldedState())); } @@ -177,7 +179,5 @@ KBookmark BookmarksPanel::bookmarkForIndex(const QModelIndex &index) QAbstractItemModel* BookmarksPanel::getModel() { - BookmarksTreeModel *model = new BookmarksTreeModel(this); - connect(model, SIGNAL(bookmarksUpdated()), this, SLOT(startLoadFoldedState())); return model; } diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h index 2418ae81..6ee2dc85 100644 --- a/src/bookmarks/bookmarkspanel.h +++ b/src/bookmarks/bookmarkspanel.h @@ -37,6 +37,8 @@ #include "urlpanel.h" // Forward Declarations +class BookmarksTreeModel; + class KBookmark; class QModelIndex; @@ -71,6 +73,7 @@ private: virtual QAbstractItemModel* getModel(); + BookmarksTreeModel *model; bool m_loadingState; }; |