feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make use of the help manager's core help engine.

Browse Source
This commit is contained in:
kh1
2010-03-23 17:29:43 +01:00
parent 8d118d3a8d
commit 10a3699ca1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/help/bookmarkmanager.cpp
View File

@@ -28,7 +28,9 @@
**************************************************************************/ **************************************************************************/
#include "bookmarkmanager.h" #include "bookmarkmanager.h"
#include "centralwidget.h" #include "centralwidget.h"
#include "helpmanager.h"
#include <QtGui/QMenu> #include <QtGui/QMenu>
#include <QtGui/QIcon> #include <QtGui/QIcon>
@@ -607,8 +609,7 @@ BookmarkManager::BookmarkManager(QHelpEngineCore* _helpEngine) :
m_folderIcon(QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon)), m_folderIcon(QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon)),
m_bookmarkIcon(QLatin1String(":/help/images/bookmark.png")), m_bookmarkIcon(QLatin1String(":/help/images/bookmark.png")),
treeModel(new BookmarkModel(0, 1, this)), treeModel(new BookmarkModel(0, 1, this)),
listModel(new BookmarkModel(0, 1, this)), listModel(new BookmarkModel(0, 1, this))
helpEngine(_helpEngine)
{ {
connect(treeModel, SIGNAL(itemChanged(QStandardItem*)), this, connect(treeModel, SIGNAL(itemChanged(QStandardItem*)), this,
SLOT(itemChanged(QStandardItem*))); SLOT(itemChanged(QStandardItem*)));
@@ -636,7 +637,8 @@ void BookmarkManager::saveBookmarks()
QDataStream stream(&bookmarks, QIODevice::WriteOnly); QDataStream stream(&bookmarks, QIODevice::WriteOnly);
readBookmarksRecursive(treeModel->invisibleRootItem(), stream, 0); readBookmarksRecursive(treeModel->invisibleRootItem(), stream, 0);
helpEngine->setCustomValue(QLatin1String("Bookmarks"), bookmarks); (&Help::HelpManager::helpEngineCore())->setCustomValue(QLatin1String("Bookmarks"),
bookmarks);
} }
QStringList BookmarkManager::bookmarkFolders() const QStringList BookmarkManager::bookmarkFolders() const
@@ -754,8 +756,8 @@ void BookmarkManager::setupBookmarkModels()
QList<int> lastDepths; QList<int> lastDepths;
QList<QStandardItem*> parents; QList<QStandardItem*> parents;
QByteArray ba = QByteArray ba = Help::HelpManager::helpEngineCore()
helpEngine->customValue(QLatin1String("Bookmarks")).toByteArray(); .customValue(QLatin1String("Bookmarks")).toByteArray();
QDataStream stream(ba); QDataStream stream(ba);
while (!stream.atEnd()) { while (!stream.atEnd()) {
stream >> depth >> name >> type >> expanded; stream >> depth >> name >> type >> expanded;

1
src/shared/help/bookmarkmanager.h
View File

@@ -190,7 +190,6 @@ private:
BookmarkModel *treeModel; BookmarkModel *treeModel;
BookmarkModel *listModel; BookmarkModel *listModel;
QStandardItem *renameItem; QStandardItem *renameItem;
QHelpEngineCore *helpEngine;
}; };
#endif #endif