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

Help: Disambiguate the HelpPage classes from QtWebKit and WebEngine

Browse Source 
This way the help viewers can coexist and the building against a
version of Qt that has both webkit and webengine available doesn't
fail anymore.

Change-Id: I2de00b03fc7b127899cbf90b91fc2cfb090a47a5
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-03-31 11:49:00 +02:00
parent 4707fc4945
commit 2ce3bf8ed4
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/help/qtwebkithelpviewer.cpp
View File

@@ -136,9 +136,9 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation op,
return new HelpNetworkReply(request, data.data, data.mimeType); return new HelpNetworkReply(request, data.data, data.mimeType);
} }
// - HelpPage // - QtWebKitHelpPage
HelpPage::HelpPage(QObject *parent) QtWebKitHelpPage::QtWebKitHelpPage(QObject *parent)
: QWebPage(parent) : QWebPage(parent)
, closeNewTabIfNeeded(false) , closeNewTabIfNeeded(false)
, m_pressedButtons(Qt::NoButton) , m_pressedButtons(Qt::NoButton)
@@ -149,18 +149,18 @@ HelpPage::HelpPage(QObject *parent)
SLOT(onHandleUnsupportedContent(QNetworkReply*))); SLOT(onHandleUnsupportedContent(QNetworkReply*)));
} }
QWebPage *HelpPage::createWindow(QWebPage::WebWindowType) QWebPage *QtWebKitHelpPage::createWindow(QWebPage::WebWindowType)
{ {
// TODO: ensure that we'll get a QtWebKitHelpViewer here // TODO: ensure that we'll get a QtWebKitHelpViewer here
QtWebKitHelpViewer* viewer = static_cast<QtWebKitHelpViewer *>(OpenPagesManager::instance() QtWebKitHelpViewer* viewer = static_cast<QtWebKitHelpViewer *>(OpenPagesManager::instance()
.createPage()); .createPage());
HelpPage *newPage = viewer->page(); QtWebKitHelpPage *newPage = viewer->page();
newPage->closeNewTabIfNeeded = closeNewTabIfNeeded; newPage->closeNewTabIfNeeded = closeNewTabIfNeeded;
closeNewTabIfNeeded = false; closeNewTabIfNeeded = false;
return newPage; return newPage;
} }
void HelpPage::triggerAction(WebAction action, bool checked) void QtWebKitHelpPage::triggerAction(WebAction action, bool checked)
{ {
switch (action) { switch (action) {
case OpenLinkInNewWindow: case OpenLinkInNewWindow:
@@ -171,7 +171,7 @@ void HelpPage::triggerAction(WebAction action, bool checked)
} }
} }
bool HelpPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, bool QtWebKitHelpPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request,
QWebPage::NavigationType type) QWebPage::NavigationType type)
{ {
const bool closeNewTab = closeNewTabIfNeeded; const bool closeNewTab = closeNewTabIfNeeded;
@@ -198,7 +198,7 @@ bool HelpPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &
return true; return true;
} }
void HelpPage::onHandleUnsupportedContent(QNetworkReply *reply) void QtWebKitHelpPage::onHandleUnsupportedContent(QNetworkReply *reply)
{ {
// sub resource of this page // sub resource of this page
if (m_loadingUrl != reply->url()) { if (m_loadingUrl != reply->url()) {
@@ -254,7 +254,7 @@ QtWebKitHelpWidget::QtWebKitHelpWidget(QtWebKitHelpViewer *parent)
QWebSettings::globalSettings()->setAttribute(QWebSettings::DnsPrefetchEnabled, true); QWebSettings::globalSettings()->setAttribute(QWebSettings::DnsPrefetchEnabled, true);
setPage(new HelpPage(this)); setPage(new QtWebKitHelpPage(this));
HelpNetworkAccessManager *manager = new HelpNetworkAccessManager(this); HelpNetworkAccessManager *manager = new HelpNetworkAccessManager(this);
page()->setNetworkAccessManager(manager); page()->setNetworkAccessManager(manager);
connect(manager, SIGNAL(finished(QNetworkReply*)), this, connect(manager, SIGNAL(finished(QNetworkReply*)), this,
@@ -323,7 +323,7 @@ void QtWebKitHelpWidget::mousePressEvent(QMouseEvent *event)
if (Utils::HostOsInfo::isLinuxHost() && m_parent->handleForwardBackwardMouseButtons(event)) if (Utils::HostOsInfo::isLinuxHost() && m_parent->handleForwardBackwardMouseButtons(event))
return; return;
if (HelpPage *currentPage = static_cast<HelpPage*>(page())) { if (QtWebKitHelpPage *currentPage = static_cast<QtWebKitHelpPage*>(page())) {
currentPage->m_pressedButtons = event->buttons(); currentPage->m_pressedButtons = event->buttons();
currentPage->m_keyboardModifiers = event->modifiers(); currentPage->m_keyboardModifiers = event->modifiers();
} }
@@ -402,7 +402,7 @@ QtWebKitHelpViewer::QtWebKitHelpViewer(QWidget *parent)
connect(m_webView->page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested())); connect(m_webView->page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested()));
connect(m_webView, SIGNAL(backwardAvailable(bool)), this, SIGNAL(backwardAvailable(bool))); connect(m_webView, SIGNAL(backwardAvailable(bool)), this, SIGNAL(backwardAvailable(bool)));
connect(m_webView, SIGNAL(forwardAvailable(bool)), this, SIGNAL(forwardAvailable(bool))); connect(m_webView, SIGNAL(forwardAvailable(bool)), this, SIGNAL(forwardAvailable(bool)));
connect(page(), &HelpPage::linkHovered, this, &QtWebKitHelpViewer::setToolTip); connect(page(), &QtWebKitHelpPage::linkHovered, this, &QtWebKitHelpViewer::setToolTip);
} }
QFont QtWebKitHelpViewer::viewerFont() const QFont QtWebKitHelpViewer::viewerFont() const
@@ -582,9 +582,9 @@ bool QtWebKitHelpViewer::findText(const QString &text, FindFlags flags,
return found; return found;
} }
HelpPage *QtWebKitHelpViewer::page() const QtWebKitHelpPage *QtWebKitHelpViewer::page() const
{ {
return static_cast<HelpPage *>(m_webView->page()); return static_cast<QtWebKitHelpPage *>(m_webView->page());
} }
void QtWebKitHelpViewer::copy() void QtWebKitHelpViewer::copy()

8
src/plugins/help/qtwebkithelpviewer.h
View File

@@ -36,7 +36,7 @@
namespace Help { namespace Help {
namespace Internal { namespace Internal {
class HelpPage; class QtWebKitHelpPage;
class QtWebKitHelpWidget; class QtWebKitHelpWidget;
class QtWebKitHelpViewer : public HelpViewer class QtWebKitHelpViewer : public HelpViewer
@@ -70,7 +70,7 @@ public:
bool findText(const QString &text, Core::FindFlags flags, bool findText(const QString &text, Core::FindFlags flags,
bool incremental, bool fromSearch, bool *wrapped = 0); bool incremental, bool fromSearch, bool *wrapped = 0);
HelpPage *page() const; QtWebKitHelpPage *page() const;
public slots: public slots:
void scaleUp(); void scaleUp();
@@ -128,11 +128,11 @@ private:
QtWebKitHelpViewer *m_parent; QtWebKitHelpViewer *m_parent;
}; };
class HelpPage : public QWebPage class QtWebKitHelpPage : public QWebPage
{ {
Q_OBJECT Q_OBJECT
public: public:
HelpPage(QObject *parent); QtWebKitHelpPage(QObject *parent);
protected: protected:
virtual QWebPage *createWindow(QWebPage::WebWindowType); virtual QWebPage *createWindow(QWebPage::WebWindowType);

10
src/plugins/help/webenginehelpviewer.cpp
View File

@@ -73,7 +73,7 @@ WebEngineHelpViewer::WebEngineHelpViewer(QWidget *parent) :
HelpViewer(parent), HelpViewer(parent),
m_widget(new WebView(this)) m_widget(new WebView(this))
{ {
m_widget->setPage(new HelpPage(this)); m_widget->setPage(new WebEngineHelpPage(this));
auto layout = new QVBoxLayout; auto layout = new QVBoxLayout;
setLayout(layout); setLayout(layout);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
@@ -226,9 +226,9 @@ bool WebEngineHelpViewer::findText(const QString &text, Core::FindFlags flags, b
return true; return true;
} }
HelpPage *WebEngineHelpViewer::page() const WebEngineHelpPage *WebEngineHelpViewer::page() const
{ {
return static_cast<HelpPage *>(m_widget->page()); return static_cast<WebEngineHelpPage *>(m_widget->page());
} }
void WebEngineHelpViewer::scaleUp() void WebEngineHelpViewer::scaleUp()
@@ -271,12 +271,12 @@ void WebEngineHelpViewer::print(QPrinter *printer)
Q_UNUSED(printer) Q_UNUSED(printer)
} }
HelpPage::HelpPage(QObject *parent) WebEngineHelpPage::WebEngineHelpPage(QObject *parent)
: QWebEnginePage(parent) : QWebEnginePage(parent)
{ {
} }
QWebEnginePage *HelpPage::createWindow(QWebEnginePage::WebWindowType) QWebEnginePage *WebEngineHelpPage::createWindow(QWebEnginePage::WebWindowType)
{ {
auto viewer = static_cast<WebEngineHelpViewer *>(OpenPagesManager::instance().createPage()); auto viewer = static_cast<WebEngineHelpViewer *>(OpenPagesManager::instance().createPage());
return viewer->page(); return viewer->page();

6
src/plugins/help/webenginehelpviewer.h
View File

@@ -40,10 +40,10 @@ public:
void requestStarted(QWebEngineUrlRequestJob *job) override; void requestStarted(QWebEngineUrlRequestJob *job) override;
}; };
class HelpPage : public QWebEnginePage class WebEngineHelpPage : public QWebEnginePage
{ {
public: public:
explicit HelpPage(QObject *parent = 0); explicit WebEngineHelpPage(QObject *parent = 0);
QWebEnginePage *createWindow(QWebEnginePage::WebWindowType) override; QWebEnginePage *createWindow(QWebEnginePage::WebWindowType) override;
}; };
@@ -83,7 +83,7 @@ public:
void setOpenInNewPageActionVisible(bool visible) override; void setOpenInNewPageActionVisible(bool visible) override;
bool findText(const QString &text, Core::FindFlags flags, bool incremental, bool fromSearch, bool *wrapped) override; bool findText(const QString &text, Core::FindFlags flags, bool incremental, bool fromSearch, bool *wrapped) override;
HelpPage *page() const; WebEngineHelpPage *page() const;
public slots: public slots:
void scaleUp() override; void scaleUp() override;