Change "Contents" to "Engine" in API class names.

Change-Id: I58d83f4f33728f92e4bf13b6be30b15528fdd033
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

6 files changed, 66 insertions, 66 deletions

diff --git a/lib/quick/plugin.cpp b/lib/quick/plugin.cpp
index b2e332c91..e1da73cca 100644
--- a/lib/quick/plugin.cpp
+++ b/lib/quick/plugin.cpp
@@ -41,7 +41,7 @@
 
 #include <QtQml/qqmlextensionplugin.h>
 
-#include "qquickwebcontentsview_p.h"
+#include "qquickwebengineview_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -55,7 +55,7 @@ public:
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine"));
         Q_UNUSED(uri);
 
-        qmlRegisterType<QQuickWebContentsView>(uri, 1, 0, "WebContentsView");
+        qmlRegisterType<QQuickWebEngineView>(uri, 1, 0, "WebEngineView");
     }
 };
 
diff --git a/lib/quick/qquickwebcontentsview.cpp b/lib/quick/qquickwebengineview.cpp
index 48ba0fb60..587906698 100644
--- a/lib/quick/qquickwebcontentsview.cpp
+++ b/lib/quick/qquickwebengineview.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qquickwebcontentsview_p.h"
-#include "qquickwebcontentsview_p_p.h"
+#include "qquickwebengineview_p.h"
+#include "qquickwebengineview_p_p.h"
 
 #include "web_contents_adapter.h"
 #include "render_widget_host_view_qt_delegate_quick.h"
@@ -48,126 +48,126 @@
 #include <QUrl>
 
 
-QQuickWebContentsViewPrivate::QQuickWebContentsViewPrivate()
+QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
     : adapter(new WebContentsAdapter(this))
 {
 }
 
-RenderWidgetHostViewQtDelegate *QQuickWebContentsViewPrivate::CreateRenderWidgetHostViewQtDelegate()
+RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate()
 {
     return new RenderWidgetHostViewQtDelegateQuick;
 }
 
-void QQuickWebContentsViewPrivate::titleChanged(const QString &title)
+void QQuickWebEngineViewPrivate::titleChanged(const QString &title)
 {
-    Q_Q(QQuickWebContentsView);
+    Q_Q(QQuickWebEngineView);
     Q_UNUSED(title);
     Q_EMIT q->titleChanged();
 }
 
-void QQuickWebContentsViewPrivate::urlChanged(const QUrl &url)
+void QQuickWebEngineViewPrivate::urlChanged(const QUrl &url)
 {
-    Q_Q(QQuickWebContentsView);
+    Q_Q(QQuickWebEngineView);
     Q_UNUSED(url);
     Q_EMIT q->urlChanged();
 }
 
-void QQuickWebContentsViewPrivate::loadingStateChanged()
+void QQuickWebEngineViewPrivate::loadingStateChanged()
 {
-    Q_Q(QQuickWebContentsView);
+    Q_Q(QQuickWebEngineView);
     Q_EMIT q->loadingStateChanged();
 }
 
-QRectF QQuickWebContentsViewPrivate::viewportRect() const
+QRectF QQuickWebEngineViewPrivate::viewportRect() const
 {
-    Q_Q(const QQuickWebContentsView);
+    Q_Q(const QQuickWebEngineView);
     return QRectF(q->x(), q->y(), q->width(), q->height());
 }
 
-void QQuickWebContentsViewPrivate::loadFinished(bool success)
+void QQuickWebEngineViewPrivate::loadFinished(bool success)
 {
-    Q_Q(QQuickWebContentsView);
+    Q_Q(QQuickWebEngineView);
     Q_UNUSED(success);
     Q_EMIT q->loadingStateChanged();
 }
 
-void QQuickWebContentsViewPrivate::focusContainer()
+void QQuickWebEngineViewPrivate::focusContainer()
 {
-    Q_Q(QQuickWebContentsView);
+    Q_Q(QQuickWebEngineView);
     q->forceActiveFocus();
 }
 
-QQuickWebContentsView::QQuickWebContentsView()
-    : d_ptr(new QQuickWebContentsViewPrivate)
+QQuickWebEngineView::QQuickWebEngineView()
+    : d_ptr(new QQuickWebEngineViewPrivate)
 {
     d_ptr->q_ptr = this;
 }
 
-QQuickWebContentsView::~QQuickWebContentsView()
+QQuickWebEngineView::~QQuickWebEngineView()
 {
 }
 
-QUrl QQuickWebContentsView::url() const
+QUrl QQuickWebEngineView::url() const
 {
-    Q_D(const QQuickWebContentsView);
+    Q_D(const QQuickWebEngineView);
     return d->adapter->activeUrl();
 }
 
-void QQuickWebContentsView::setUrl(const QUrl& url)
+void QQuickWebEngineView::setUrl(const QUrl& url)
 {
-    Q_D(QQuickWebContentsView);
+    Q_D(QQuickWebEngineView);
     d->adapter->load(url);
 }
 
-void QQuickWebContentsView::goBack()
+void QQuickWebEngineView::goBack()
 {
-    Q_D(QQuickWebContentsView);
+    Q_D(QQuickWebEngineView);
     d->adapter->navigateHistory(-1);
 }
 
-void QQuickWebContentsView::goForward()
+void QQuickWebEngineView::goForward()
 {
-    Q_D(QQuickWebContentsView);
+    Q_D(QQuickWebEngineView);
     d->adapter->navigateHistory(1);
 }
 
-void QQuickWebContentsView::reload()
+void QQuickWebEngineView::reload()
 {
-    Q_D(QQuickWebContentsView);
+    Q_D(QQuickWebEngineView);
     d->adapter->reload();
 }
 
-void QQuickWebContentsView::stop()
+void QQuickWebEngineView::stop()
 {
-    Q_D(QQuickWebContentsView);
+    Q_D(QQuickWebEngineView);
     d->adapter->stop();
 }
 
-bool QQuickWebContentsView::isLoading() const
+bool QQuickWebEngineView::isLoading() const
 {
-    Q_D(const QQuickWebContentsView);
+    Q_D(const QQuickWebEngineView);
     return d->adapter->isLoading();
 }
 
-QString QQuickWebContentsView::title() const
+QString QQuickWebEngineView::title() const
 {
-    Q_D(const QQuickWebContentsView);
+    Q_D(const QQuickWebEngineView);
     return d->adapter->pageTitle();
 }
 
-bool QQuickWebContentsView::canGoBack() const
+bool QQuickWebEngineView::canGoBack() const
 {
-    Q_D(const QQuickWebContentsView);
+    Q_D(const QQuickWebEngineView);
     return d->adapter->canGoBack();
 }
 
-bool QQuickWebContentsView::canGoForward() const
+bool QQuickWebEngineView::canGoForward() const
 {
-    Q_D(const QQuickWebContentsView);
+    Q_D(const QQuickWebEngineView);
     return d->adapter->canGoForward();
 }
 
-void QQuickWebContentsView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     QQuickItem::geometryChanged(newGeometry, oldGeometry);
 
diff --git a/lib/quick/qquickwebcontentsview_p.h b/lib/quick/qquickwebengineview_p.h
index 61aca128e..2aa34c033 100644
--- a/lib/quick/qquickwebcontentsview_p.h
+++ b/lib/quick/qquickwebengineview_p.h
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKWEBCONTESTSVIEW_P_H
-#define QQUICKWEBCONTESTSVIEW_P_H
+#ifndef QQUICKWEBENGINEVIEW_P_H
+#define QQUICKWEBENGINEVIEW_P_H
 
 #include <QQuickItem>
 #include <QScopedPointer>
 
-class QQuickWebContentsViewPrivate;
+class QQuickWebEngineViewPrivate;
 
-class QQuickWebContentsView : public QQuickItem {
+class QQuickWebEngineView : public QQuickItem {
     Q_OBJECT
     Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
     Q_PROPERTY(bool loading READ isLoading NOTIFY loadingStateChanged)
@@ -56,8 +56,8 @@ class QQuickWebContentsView : public QQuickItem {
     Q_PROPERTY(bool canGoForward READ canGoForward NOTIFY loadingStateChanged)
 
 public:
-    QQuickWebContentsView();
-    ~QQuickWebContentsView();
+    QQuickWebEngineView();
+    ~QQuickWebEngineView();
 
     QUrl url() const;
     void setUrl(const QUrl&);
@@ -81,11 +81,11 @@ protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
 
 private:
-    Q_DECLARE_PRIVATE(QQuickWebContentsView)
+    Q_DECLARE_PRIVATE(QQuickWebEngineView)
     // Hides QObject::d_ptr allowing us to use the convenience macros.
-    QScopedPointer<QQuickWebContentsViewPrivate> d_ptr;
+    QScopedPointer<QQuickWebEngineViewPrivate> d_ptr;
 };
 
-QML_DECLARE_TYPE(QQuickWebContentsView)
+QML_DECLARE_TYPE(QQuickWebEngineView)
 
-#endif // QQUICKWEBCONTESTSVIEW_P_H
+#endif // QQUICKWEBENGINEVIEW_P_H
diff --git a/lib/quick/qquickwebcontentsview_p_p.h b/lib/quick/qquickwebengineview_p_p.h
index 51f805881..0997fe08c 100644
--- a/lib/quick/qquickwebcontentsview_p_p.h
+++ b/lib/quick/qquickwebengineview_p_p.h
@@ -39,23 +39,23 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKWEBCONTENTSVIEW_P_P_H
-#define QQUICKWEBCONTENTSVIEW_P_P_H
+#ifndef QQUICKWEBENGINEVIEW_P_P_H
+#define QQUICKWEBENGINEVIEW_P_P_H
 
 #include "web_contents_adapter_client.h"
 
 #include <QScopedPointer>
 
-class QQuickWebContentsView;
+class QQuickWebEngineView;
 class RenderWidgetHostViewQtDelegateQuick;
 class WebContentsAdapter;
 
-class QQuickWebContentsViewPrivate : public WebContentsAdapterClient
+class QQuickWebEngineViewPrivate : public WebContentsAdapterClient
 {
-    QQuickWebContentsView *q_ptr;
-    Q_DECLARE_PUBLIC(QQuickWebContentsView)
+    QQuickWebEngineView *q_ptr;
+    Q_DECLARE_PUBLIC(QQuickWebEngineView)
 public:
-    QQuickWebContentsViewPrivate();
+    QQuickWebEngineViewPrivate();
 
     virtual RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate() Q_DECL_OVERRIDE;
     virtual void titleChanged(const QString&) Q_DECL_OVERRIDE;
@@ -69,4 +69,4 @@ public:
     friend class RenderWidgetHostViewQtDelegateQuick;
 };
 
-#endif // QQUICKWEBCONTENTSVIEW_P_P_H
+#endif // QQUICKWEBENGINEVIEW_P_P_H
diff --git a/lib/quick/quick.pro b/lib/quick/quick.pro
index e2eec55dc..bb6acc179 100644
--- a/lib/quick/quick.pro
+++ b/lib/quick/quick.pro
@@ -16,13 +16,13 @@ QMAKE_RPATHDIR += $$LIBPATH
 #DESTDIR = $$LIBPATH
 
 SOURCES = \
-        qquickwebcontentsview.cpp \
+        qquickwebengineview.cpp \
         plugin.cpp \
         render_widget_host_view_qt_delegate_quick.cpp
 
 HEADERS = \
-        qquickwebcontentsview_p.h \
-        qquickwebcontentsview_p_p.h \
+        qquickwebengineview_p.h \
+        qquickwebengineview_p_p.h \
         render_widget_host_view_qt_delegate_quick.h
 
 load(qml_plugin)
diff --git a/lib/quick/render_widget_host_view_qt_delegate_quick.cpp b/lib/quick/render_widget_host_view_qt_delegate_quick.cpp
index 5610beabb..87c1794d6 100644
--- a/lib/quick/render_widget_host_view_qt_delegate_quick.cpp
+++ b/lib/quick/render_widget_host_view_qt_delegate_quick.cpp
@@ -41,8 +41,8 @@
 
 #include "render_widget_host_view_qt_delegate_quick.h"
 
-#include "qquickwebcontentsview_p.h"
-#include "qquickwebcontentsview_p_p.h"
+#include "qquickwebengineview_p.h"
+#include "qquickwebengineview_p_p.h"
 #include <QQuickWindow>
 #include <QWindow>
 
@@ -55,7 +55,7 @@ RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(QQuickI
 
 void RenderWidgetHostViewQtDelegateQuick::initAsChild(WebContentsAdapterClient* container)
 {
-    QQuickWebContentsViewPrivate *viewPrivate = static_cast<QQuickWebContentsViewPrivate *>(container);
+    QQuickWebEngineViewPrivate *viewPrivate = static_cast<QQuickWebEngineViewPrivate *>(container);
     setParentItem(viewPrivate->q_func());
 }