diff options
| author | kh1 <qt-info@nokia.com> | 2010-03-23 17:29:43 +0100 |
|---|---|---|
| committer | kh1 <qt-info@nokia.com> | 2010-03-23 18:13:09 +0100 |
| commit | 10a3699ca1ec18ee7bc266a66e7de5b87b376c5f (patch) | |
| tree | 93e07505cac429e3575ad6fc222a8b7f69213ea8 /src/shared/help/bookmarkmanager.cpp | |
| parent | 8d118d3a8d3bfe031d7822ae7d3a69e448b5ef7f (diff) | |
| download | qt-creator-10a3699ca1ec18ee7bc266a66e7de5b87b376c5f.tar.gz | |
Make use of the help manager's core help engine.
Diffstat (limited to 'src/shared/help/bookmarkmanager.cpp')
| -rw-r--r-- | src/shared/help/bookmarkmanager.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp index 1515f5e7e8..18b080ea41 100644 --- a/src/shared/help/bookmarkmanager.cpp +++ b/src/shared/help/bookmarkmanager.cpp @@ -28,7 +28,9 @@ **************************************************************************/ #include "bookmarkmanager.h" + #include "centralwidget.h" +#include "helpmanager.h" #include <QtGui/QMenu> #include <QtGui/QIcon> @@ -607,8 +609,7 @@ BookmarkManager::BookmarkManager(QHelpEngineCore* _helpEngine) : m_folderIcon(QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon)), m_bookmarkIcon(QLatin1String(":/help/images/bookmark.png")), treeModel(new BookmarkModel(0, 1, this)), - listModel(new BookmarkModel(0, 1, this)), - helpEngine(_helpEngine) + listModel(new BookmarkModel(0, 1, this)) { connect(treeModel, SIGNAL(itemChanged(QStandardItem*)), this, SLOT(itemChanged(QStandardItem*))); @@ -636,7 +637,8 @@ void BookmarkManager::saveBookmarks() QDataStream stream(&bookmarks, QIODevice::WriteOnly); readBookmarksRecursive(treeModel->invisibleRootItem(), stream, 0); - helpEngine->setCustomValue(QLatin1String("Bookmarks"), bookmarks); + (&Help::HelpManager::helpEngineCore())->setCustomValue(QLatin1String("Bookmarks"), + bookmarks); } QStringList BookmarkManager::bookmarkFolders() const @@ -754,8 +756,8 @@ void BookmarkManager::setupBookmarkModels() QList<int> lastDepths; QList<QStandardItem*> parents; - QByteArray ba = - helpEngine->customValue(QLatin1String("Bookmarks")).toByteArray(); + QByteArray ba = Help::HelpManager::helpEngineCore() + .customValue(QLatin1String("Bookmarks")).toByteArray(); QDataStream stream(ba); while (!stream.atEnd()) { stream >> depth >> name >> type >> expanded; |