From 10a3699ca1ec18ee7bc266a66e7de5b87b376c5f Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Tue, 23 Mar 2010 17:29:43 +0100
Subject: [PATCH] Make use of the help manager's core help engine.
---
src/shared/help/bookmarkmanager.cpp | 12 +++++++-----
src/shared/help/bookmarkmanager.h | 1 -
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index 1515f5e7e8f..18b080ea412 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;
diff --git a/src/shared/help/bookmarkmanager.h b/src/shared/help/bookmarkmanager.h
index 73ad5c4ab7a..07dfe8f61b8 100644
--- a/src/shared/help/bookmarkmanager.h
+++ b/src/shared/help/bookmarkmanager.h
@@ -190,7 +190,6 @@ private:
BookmarkModel *treeModel;
BookmarkModel *listModel;
QStandardItem *renameItem;
- QHelpEngineCore *helpEngine;
};
#endif
--
GitLab