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

Core/Help: Clean up HelpManager interface and users

Browse Source 
Change-Id: Ia6edf583f2a002d7c6f4878df670a78614ea087d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2013-08-29 19:00:34 +02:00
parent 975e1be2ab
commit d66369e21d
20 changed files with 197 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/helpitem.cpp
View File

@@ -99,7 +99,7 @@ QString HelpItem::extractContent(bool extended) const
helpLinks.insert(m_helpId, m_helpId);
}
foreach (const QUrl &url, helpLinks) {
const QString html = QString::fromUtf8(Core::HelpManager::instance()->fileData(url));
const QString html = QString::fromUtf8(Core::HelpManager::fileData(url));
switch (m_category) {
case Brief:
contents = htmlExtractor.getClassOrNamespaceBrief(html, m_docMark);
@@ -142,6 +142,6 @@ QString HelpItem::extractContent(bool extended) const
QMap<QString, QUrl> HelpItem::retrieveHelpLinks() const
{
if (m_helpLinks.isEmpty())
m_helpLinks = Core::HelpManager::instance()->linksForIdentifier(m_helpId);
m_helpLinks = Core::HelpManager::linksForIdentifier(m_helpId);
return m_helpLinks;
}