From 87a5decded33477a86b06ce4038dfd55f20afe79 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Tue, 25 Jun 2013 16:58:20 +0200
Subject: [PATCH] Extract QQuickWebContentsViewPrivate declaration into its own
header
Change-Id: Iad87d10b1dca699a9b6b0ab60a4b90b19f515434
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
---
lib/lib.pro | 1 +
lib/qquickwebcontentsview.cpp | 15 +--------
lib/qquickwebcontentsview_p.h | 63 +++++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 14 deletions(-)
create mode 100644 lib/qquickwebcontentsview_p.h
diff --git a/lib/lib.pro b/lib/lib.pro
index 5f2507bbe..1aada9291 100644
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -38,6 +38,7 @@ HEADERS = \
browser_context_qt.h \
content_browser_client_qt.h \
qquickwebcontentsview.h \
+ qquickwebcontentsview_p.h \
qwebcontentsview.h \
qwebcontentsview_p.h \
render_widget_host_view_qt.h \
diff --git a/lib/qquickwebcontentsview.cpp b/lib/qquickwebcontentsview.cpp
index 2352b239c..03796fcc0 100644
--- a/lib/qquickwebcontentsview.cpp
+++ b/lib/qquickwebcontentsview.cpp
@@ -40,6 +40,7 @@
****************************************************************************/
#include "qquickwebcontentsview.h"
+#include "qquickwebcontentsview_p.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/web_contents.h"
@@ -49,7 +50,6 @@
#include "render_widget_host_view_qt_delegate_quick.h"
#include "web_contents_delegate_qt.h"
#include "web_contents_view_qt.h"
-#include "web_engine_context.h"
#include <QUrl>
@@ -59,19 +59,6 @@ void QQuickWebContentsView::registerType()
qmlRegisterType<QQuickWebContentsView>("QtWebEngine", 1, 0, "WebContentsView");
}
-class QQuickWebContentsViewPrivate : public WebContentsViewQtClient
-{
- QQuickWebContentsView *q_ptr;
- Q_DECLARE_PUBLIC(QQuickWebContentsView)
-public:
- QQuickWebContentsViewPrivate();
-
- RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQt *view) Q_DECL_OVERRIDE;
-
- scoped_refptr<WebEngineContext> context;
- scoped_ptr<WebContentsDelegateQt> webContentsDelegate;
-};
-
QQuickWebContentsView::QQuickWebContentsView()
: d_ptr(new QQuickWebContentsViewPrivate)
{
diff --git a/lib/qquickwebcontentsview_p.h b/lib/qquickwebcontentsview_p.h
new file mode 100644
index 000000000..f7fed2c01
--- /dev/null
+++ b/lib/qquickwebcontentsview_p.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKWEBCONTENTSVIEWPRIVATE_H
+#define QQUICKWEBCONTENTSVIEWPRIVATE_H
+
+#include "qwebcontentsview.h"
+#include "web_contents_delegate_qt.h"
+#include "web_contents_view_qt.h"
+#include "web_engine_context.h"
+
+class QQuickWebContentsViewPrivate : public WebContentsViewQtClient
+{
+ QQuickWebContentsView *q_ptr;
+ Q_DECLARE_PUBLIC(QQuickWebContentsView)
+public:
+ QQuickWebContentsViewPrivate();
+
+ RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQt *view) Q_DECL_OVERRIDE;
+
+ scoped_refptr<WebEngineContext> context;
+ scoped_ptr<WebContentsDelegateQt> webContentsDelegate;
+};
+
+#endif // QQUICKWEBCONTENTSVIEWPRIVATE_H
--
GitLab