From d248a7ddbffc5ea056e2b4312a3ebf8875499b72 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Tue, 23 Mar 2010 17:52:28 +0100
Subject: [PATCH] Make use of the now available gui help engine.
---
src/shared/help/contentwindow.cpp | 7 ++++---
src/shared/help/contentwindow.h | 1 -
src/shared/help/indexwindow.cpp | 11 ++++++-----
src/shared/help/indexwindow.h | 1 -
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/shared/help/contentwindow.cpp b/src/shared/help/contentwindow.cpp
index bd5b74496b8..b956110ef2e 100644
--- a/src/shared/help/contentwindow.cpp
+++ b/src/shared/help/contentwindow.cpp
@@ -28,7 +28,9 @@
**************************************************************************/
#include "contentwindow.h"
+
#include "centralwidget.h"
+#include "helpmanager.h"
#include <QtGui/QLayout>
#include <QtGui/QFocusEvent>
@@ -38,11 +40,10 @@
#include <QtHelp/QHelpContentWidget>
ContentWindow::ContentWindow(QHelpEngine *helpEngine)
- : m_helpEngine(helpEngine)
- , m_contentWidget(0)
+ : m_contentWidget(0)
, m_expandDepth(-2)
{
- m_contentWidget = m_helpEngine->contentWidget();
+ m_contentWidget = (&Help::HelpManager::helpEngine())->contentWidget();
m_contentWidget->installEventFilter(this);
m_contentWidget->viewport()->installEventFilter(this);
m_contentWidget->setContextMenuPolicy(Qt::CustomContextMenu);
diff --git a/src/shared/help/contentwindow.h b/src/shared/help/contentwindow.h
index c9a6532e016..dd3796b9c9a 100644
--- a/src/shared/help/contentwindow.h
+++ b/src/shared/help/contentwindow.h
@@ -66,7 +66,6 @@ private:
bool eventFilter(QObject *o, QEvent *e);
bool isPdfFile(QHelpContentItem *item) const;
- QHelpEngine *m_helpEngine;
QHelpContentWidget *m_contentWidget;
int m_expandDepth;
};
diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index 0344383740c..498d9d5c6a2 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -27,8 +27,9 @@
**
**************************************************************************/
-#include "indexwindow.h"
#include "centralwidget.h"
+#include "helpmanager.h"
+#include "indexwindow.h"
#include "topicchooser.h"
#include <QtGui/QLayout>
@@ -46,7 +47,6 @@ IndexWindow::IndexWindow(QHelpEngine *helpEngine, QWidget *parent)
: QWidget(parent)
, m_searchLineEdit(0)
, m_indexWidget(0)
- , m_helpEngine(helpEngine)
{
QVBoxLayout *layout = new QVBoxLayout(this);
QLabel *l = new QLabel(tr("&Look for:"));
@@ -61,11 +61,12 @@ IndexWindow::IndexWindow(QHelpEngine *helpEngine, QWidget *parent)
layout->setMargin(4);
layout->addWidget(m_searchLineEdit);
- m_indexWidget = m_helpEngine->indexWidget();
+ QHelpEngine *engine = &Help::HelpManager::helpEngine();
+ m_indexWidget = engine->indexWidget();
m_indexWidget->installEventFilter(this);
- connect(m_helpEngine->indexModel(), SIGNAL(indexCreationStarted()), this,
+ connect(engine->indexModel(), SIGNAL(indexCreationStarted()), this,
SLOT(disableSearchLineEdit()));
- connect(m_helpEngine->indexModel(), SIGNAL(indexCreated()), this,
+ connect(engine->indexModel(), SIGNAL(indexCreated()), this,
SLOT(enableSearchLineEdit()));
connect(m_indexWidget, SIGNAL(linkActivated(QUrl, QString)), this,
SIGNAL(linkActivated(QUrl)));
diff --git a/src/shared/help/indexwindow.h b/src/shared/help/indexwindow.h
index ff4db3a5368..69a557b0902 100644
--- a/src/shared/help/indexwindow.h
+++ b/src/shared/help/indexwindow.h
@@ -73,7 +73,6 @@ private:
QLineEdit *m_searchLineEdit;
QHelpIndexWidget *m_indexWidget;
- QHelpEngine *m_helpEngine;
};
#endif // INDEXWINDOW_H
--
GitLab