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

Help: Remove OpenPagesManager::instance()

Browse Source 
It's owned by the HelpWidget now, and should be accessed through that.

Task-number: QTCREATORBUG-20558
Change-Id: I99118bb966922e6b4d356cf892d7604365357785
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2019-09-11 16:05:18 +02:00
parent 4610759aed
commit 4f19046d75
5 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/help/helpwidget.cpp
View File

@@ -252,7 +252,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
if (style == ModeWidget) {
layout->addWidget(new Utils::StyledSeparator(toolBar));
layout->addWidget(OpenPagesManager::instance().openPagesComboBox(), 10);
layout->addWidget(m_openPagesManager->openPagesComboBox(), 10);
} else {
layout->addWidget(new QLabel(), 10);
}
@@ -441,7 +441,7 @@ void HelpWidget::addSideBar()
Core::SideBarItem *openPagesItem = nullptr;
if (m_style == ModeWidget) {
QWidget *openPagesWidget = OpenPagesManager::instance().openPagesWidget();
QWidget *openPagesWidget = m_openPagesManager->openPagesWidget();
openPagesWidget->setWindowTitle(HelpPlugin::tr(Constants::SB_OPENPAGES));
openPagesItem = new Core::SideBarItem(openPagesWidget, Constants::HELP_OPENPAGES);
m_openPagesAction = new QAction(tr("Activate Open Help Pages View"), this);
@@ -634,6 +634,11 @@ void HelpWidget::activateSideBarItem(const QString &id)
m_sideBar->activateItem(id);
}
OpenPagesManager *HelpWidget::openPagesManager() const
{
return m_openPagesManager;
}
void HelpWidget::setSource(const QUrl &url)
{
HelpViewer* viewer = currentViewer();