Help: Move OpenPagesManager::createPage to HelpWidget

Removes some unneeded indirection.

Task-number: QTCREATORBUG-20558
Change-Id: I65d8d31e10300da3015f388ac490b8be6e090f29
Reviewed-by: hjk <[email protected]>

5 files changed, 16 insertions, 26 deletions

diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index ba2e42ab7f6..3e5d1561e06 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -530,7 +530,7 @@ HelpViewer *HelpPluginPrivate::helpModeHelpViewer()
     activateHelpMode(); // should trigger an createPage...
     HelpViewer *viewer = m_centralWidget->currentViewer();
     if (!viewer)
-        viewer = OpenPagesManager::instance().createPage();
+        viewer = m_centralWidget->openNewPage(QUrl(Help::Constants::AboutBlank));
     return viewer;
 }
 
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index f1c33e32aa4..4b4358102cb 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -315,7 +315,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
             QAction *openPage = openMenu->addAction(tr("Open in New Page"));
             connect(openPage, &QAction::triggered, this, [this]() {
                 if (HelpViewer *viewer = currentViewer())
-                    OpenPagesManager::instance().createPage(viewer->source());
+                    openNewPage(viewer->source());
             });
         }
         QAction *openExternal = openMenu->addAction(tr("Open in Window"));
@@ -563,9 +563,7 @@ HelpViewer *HelpWidget::insertViewer(int index, const QUrl &url, qreal zoom)
     });
 
     connect(viewer, &HelpViewer::loadFinished, this, &HelpWidget::highlightSearchTerms);
-    connect(viewer, &HelpViewer::newPageRequested, [](const QUrl &url) {
-        OpenPagesManager::instance().createPage(url);
-    });
+    connect(viewer, &HelpViewer::newPageRequested, this, &HelpWidget::openNewPage);
     connect(viewer, &HelpViewer::externalPageRequested, this, &openUrlInWindow);
     updateCloseButton();
     m_model.endInsertRows();
@@ -601,11 +599,21 @@ HelpViewer *HelpWidget::viewerAt(int index) const
 void HelpWidget::open(const QUrl &url, bool newPage)
 {
     if (newPage)
-        OpenPagesManager::instance().createPage(url);
+        openNewPage(url);
     else
         setSource(url);
 }
 
+HelpViewer *HelpWidget::openNewPage(const QUrl &url)
+{
+    if (url.isValid() && HelpViewer::launchWithExternalApp(url))
+        return nullptr;
+
+    HelpViewer *page = addViewer(url);
+    setCurrentIndex(viewerCount() - 1);
+    return page;
+}
+
 void HelpWidget::showLinks(const QMap<QString, QUrl> &links,
     const QString &keyword, bool newPage)
 {
@@ -638,7 +646,7 @@ void HelpWidget::openFromSearch(const QUrl &url, const QStringList &searchTerms,
 {
     m_searchTerms = searchTerms;
     if (newPage)
-        OpenPagesManager::instance().createPage(url);
+        openNewPage(url);
     else {
         HelpViewer* viewer = currentViewer();
         QTC_ASSERT(viewer, return);
diff --git a/src/plugins/help/helpwidget.h b/src/plugins/help/helpwidget.h
index 69e19ae33f0..2af3b4b5b3f 100644
--- a/src/plugins/help/helpwidget.h
+++ b/src/plugins/help/helpwidget.h
@@ -92,6 +92,7 @@ public:
     HelpViewer *viewerAt(int index) const;
 
     void open(const QUrl &url, bool newPage = false);
+    HelpViewer *openNewPage(const QUrl &url);
     void openFromSearch(const QUrl &url, const QStringList &searchTerms, bool newPage = false);
     void showLinks(const QMap<QString, QUrl> &links, const QString &key,
                           bool newPage = false);
diff --git a/src/plugins/help/openpagesmanager.cpp b/src/plugins/help/openpagesmanager.cpp
index 68c0f6bf5e2..c9e26c6f7e3 100644
--- a/src/plugins/help/openpagesmanager.cpp
+++ b/src/plugins/help/openpagesmanager.cpp
@@ -173,22 +173,6 @@ void OpenPagesManager::setupInitialPages()
     m_helpWidget->setCurrentIndex(std::max(initialPage, m_helpWidget->viewerCount() - 1));
 }
 
-HelpViewer *OpenPagesManager::createPage()
-{
-    return createPage(QUrl(Help::Constants::AboutBlank));
-}
-
-HelpViewer *OpenPagesManager::createPage(const QUrl &url)
-{
-    if (url.isValid() && HelpViewer::launchWithExternalApp(url))
-        return nullptr;
-
-    HelpViewer *page = m_helpWidget->addViewer(url);
-    m_helpWidget->setCurrentIndex(m_helpWidget->viewerCount() - 1);
-
-    return page;
-}
-
 void OpenPagesManager::closeCurrentPage()
 {
     if (!m_openPagesWidget)
diff --git a/src/plugins/help/openpagesmanager.h b/src/plugins/help/openpagesmanager.h
index fb321d6d001..bb096de6af3 100644
--- a/src/plugins/help/openpagesmanager.h
+++ b/src/plugins/help/openpagesmanager.h
@@ -60,9 +60,6 @@ public:
 
     void setupInitialPages();
 
-    HelpViewer *createPage();
-    HelpViewer *createPage(const QUrl &url);
-
     void closeCurrentPage();
     void closePage(const QModelIndex &index);
     void closePagesExcept(const QModelIndex &index);