From b7856be521ec69c94612eda7f6d1d57634634eb3 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 3 Apr 2012 15:05:03 +0200
Subject: [PATCH] Help: Decouple BookmarksWidget from OpenPageManager.

Connect via signal to make it possible to build the shared help
code as a static library.

Change-Id: If4e9c8ee43eb32e08167c7642f52214643de6d5c
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/plugins/help/helpplugin.cpp     | 2 ++
 src/shared/help/bookmarkmanager.cpp | 6 ++----
 src/shared/help/bookmarkmanager.h   | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index df86dc24c8c..0ef8f145d9e 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -472,6 +472,8 @@ void HelpPlugin::setupUi()
     m_bookmarkItem = new Core::SideBarItem(bookmarkWidget, QLatin1String(SB_BOOKMARKS));
     connect(bookmarkWidget, SIGNAL(linkActivated(QUrl)), m_centralWidget,
         SLOT(setSource(QUrl)));
+    connect(bookmarkWidget, SIGNAL(createPage(QUrl,bool)), &OpenPagesManager::instance(),
+            SLOT(createPage(QUrl,bool)));
 
      shortcut = new QShortcut(m_splitter);
      shortcut->setWhatsThis(tr("Activate Bookmarks in Help mode"));
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index 38f2c012804..c6364596bfa 100644
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -32,9 +32,7 @@
 
 #include "bookmarkmanager.h"
 
-#include "centralwidget.h"
 #include "localhelpmanager.h"
-#include "openpagesmanager.h"
 
 #include <utils/filterlineedit.h>
 #include <utils/styledbar.h>
@@ -406,7 +404,7 @@ void BookmarkWidget::customContextMenuRequested(const QPoint &point)
         emit linkActivated(data);
     }
     else if (pickedAction == showItemNewTab) {
-        OpenPagesManager::instance().createPage(data);
+        emit createPage(QUrl(data), false);
     }
     else if (pickedAction == removeItem) {
         bookmarkManager->removeBookmarkItem(treeView,
@@ -569,7 +567,7 @@ bool BookmarkWidget::eventFilter(QObject *object, QEvent *e)
                     || (me->button() == Qt::MidButton)) {
                         QString data = index.data(Qt::UserRole + 10).toString();
                         if (!data.isEmpty() && data != QLatin1String("Folder"))
-                            OpenPagesManager::instance().createPage(data);
+                            emit createPage(QUrl(data), false);
                 }
             }
         }
diff --git a/src/shared/help/bookmarkmanager.h b/src/shared/help/bookmarkmanager.h
index 98b22d3b6a9..445b8f7f508 100644
--- a/src/shared/help/bookmarkmanager.h
+++ b/src/shared/help/bookmarkmanager.h
@@ -119,6 +119,7 @@ public:
 signals:
     void addBookmark();
     void linkActivated(const QUrl &url);
+    void createPage(const QUrl &url, bool fromSearch);
 
 private slots:
     void removeClicked();