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

Help: Avoid multiple lookups of help id for context help

Browse Source 
Context help would first query the database with potential IDs, and
afterwards the help plugin would look up the links for the resulting ID
again.
Pass the HelpItem (which potentially contains the cached links) directly
to context help.

Change-Id: I73bddcd3cd4eacaea412b98d53c5e5354a31f3d5
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2019-01-25 15:04:50 +01:00
parent c04c5c1575
commit 418dcfbcbb
17 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/coreplugin/helpitem.cpp
View File

@@ -32,6 +32,14 @@ using namespace Core;
HelpItem::HelpItem() = default;
HelpItem::HelpItem(const char *helpId)
: m_helpId(QString::fromUtf8(helpId))
{}
HelpItem::HelpItem(const QString &helpId)
: m_helpId(helpId)
{}
HelpItem::HelpItem(const QString &helpId, Category category) :
m_helpId(helpId), m_docMark(helpId), m_category(category)
{}
@@ -70,7 +78,7 @@ bool HelpItem::isValid() const
{
if (m_helpId.isEmpty())
return false;
if (!retrieveHelpLinks().isEmpty())
if (!links().isEmpty())
return true;
if (QUrl(m_helpId).isValid())
return true;
@@ -86,7 +94,7 @@ QString HelpItem::extractContent(bool extended) const
htmlExtractor.setMode(Utils::HtmlDocExtractor::FirstParagraph);
QString contents;
QMap<QString, QUrl> helpLinks = retrieveHelpLinks();
QMap<QString, QUrl> helpLinks = links();
if (helpLinks.isEmpty()) {
// Maybe this is already an URL...
QUrl url(m_helpId);
@@ -134,7 +142,7 @@ QString HelpItem::extractContent(bool extended) const
return contents;
}
QMap<QString, QUrl> HelpItem::retrieveHelpLinks() const
QMap<QString, QUrl> HelpItem::links() const
{
if (m_helpLinks.isEmpty())
m_helpLinks = Core::HelpManager::linksForIdentifier(m_helpId);