diff options
| author | hjk <hjk@qt.io> | 2020-06-26 13:59:38 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-07-06 11:15:18 +0000 |
| commit | e1c88116b397ecac2ef0f0678a419790a3e40402 (patch) | |
| tree | 830be4b2f1aabad0522c7e01287ec9197b55e4cf /src/plugins/help | |
| parent | c9eedbe0f387f33e5e455af03a795d2114528543 (diff) | |
Core/Utils: Migrate further to Utils::Id
The coreplugin/id.h header is kept for downstream for now.
Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/help')
| -rw-r--r-- | src/plugins/help/helpplugin.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/help/helpwidget.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 6ec180e09d..209703c607 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -51,7 +51,6 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/id.h> #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> @@ -108,7 +107,7 @@ class HelpPluginPrivate : public QObject public: HelpPluginPrivate(); - void modeChanged(Core::Id mode, Core::Id old); + void modeChanged(Utils::Id mode, Utils::Id old); void requestContextHelp(); void showContextHelp(const HelpItem &contextHelp); @@ -451,7 +450,7 @@ void HelpPluginPrivate::showLinksInCurrentViewer(const QMultiMap<QString, QUrl> widget->showLinks(links, key); } -void HelpPluginPrivate::modeChanged(Core::Id mode, Core::Id old) +void HelpPluginPrivate::modeChanged(Utils::Id mode, Utils::Id old) { Q_UNUSED(old) if (mode == m_mode.id()) { diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index 608a4ddbb5..7d25d631a9 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -238,7 +238,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget if (style == ExternalWindow) { static int windowId = 0; Core::ICore::registerWindow(this, - Core::Context(Core::Id("Help.Window.").withSuffix(++windowId))); + Core::Context(Utils::Id("Help.Window.").withSuffix(++windowId))); setAttribute(Qt::WA_QuitOnClose, false); // don't prevent Qt Creator from closing } if (style != SideBarWidget) { |