aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/designer
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-01-25 15:04:50 +0100
committerEike Ziller <eike.ziller@qt.io>2019-01-29 07:57:19 +0000
commit418dcfbcbbd15a63ed261b22da3391e43e7ab8aa (patch)
tree7b176df3b7b48527fdb53d1caaa964de63800607 /src/plugins/designer
parentc04c5c1575e4ee425e6d2383e52a2b44e9c20fd2 (diff)
Help: Avoid multiple lookups of help id for context help
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>
Diffstat (limited to 'src/plugins/designer')
-rw-r--r--src/plugins/designer/designercontext.cpp2
-rw-r--r--src/plugins/designer/designercontext.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/designer/designercontext.cpp b/src/plugins/designer/designercontext.cpp
index bff77559b1..edc7c09829 100644
--- a/src/plugins/designer/designercontext.cpp
+++ b/src/plugins/designer/designercontext.cpp
@@ -45,7 +45,7 @@ DesignerContext::DesignerContext(const Core::Context &context,
setWidget(widget);
}
-void DesignerContext::contextHelpId(const HelpIdCallback &callback) const
+void DesignerContext::contextHelp(const HelpIdCallback &callback) const
{
const QDesignerFormEditorInterface *core = FormEditorW::designerEditor();
callback(core->integration()->contextHelpId());
diff --git a/src/plugins/designer/designercontext.h b/src/plugins/designer/designercontext.h
index 3259951e7d..b9a892097f 100644
--- a/src/plugins/designer/designercontext.h
+++ b/src/plugins/designer/designercontext.h
@@ -37,7 +37,7 @@ public:
QWidget *widget,
QObject *parent = nullptr);
- void contextHelpId(const HelpIdCallback &callback) const override;
+ void contextHelp(const HelpIdCallback &callback) const override;
};
} // namespace Internal