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

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

5 files changed, 54 insertions, 54 deletions

diff --git a/lib/widgets/Api/qwebcontentsview.cpp b/lib/widgets/Api/qwebengineview.cpp
index dff1ebf43..a7a135fc8 100644
--- a/lib/widgets/Api/qwebcontentsview.cpp
+++ b/lib/widgets/Api/qwebengineview.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qwebcontentsview.h"
-#include "qwebcontentsview_p.h"
+#include "qwebengineview.h"
+#include "qwebengineview_p.h"
 
 #include "render_widget_host_view_qt_delegate_widget.h"
 #include "web_contents_adapter.h"
@@ -48,25 +48,25 @@
 #include <QStackedLayout>
 #include <QUrl>
 
-QWebContentsViewPrivate::QWebContentsViewPrivate()
+QWebEngineViewPrivate::QWebEngineViewPrivate()
     : m_isLoading(false)
     , adapter(new WebContentsAdapter(this))
 {
 }
 
-void QWebContentsViewPrivate::titleChanged(const QString &title)
+void QWebEngineViewPrivate::titleChanged(const QString &title)
 {
     Q_EMIT q_ptr->titleChanged(title);
 }
 
-void QWebContentsViewPrivate::urlChanged(const QUrl &url)
+void QWebEngineViewPrivate::urlChanged(const QUrl &url)
 {
     Q_EMIT q_ptr->urlChanged(url);
 }
 
-void QWebContentsViewPrivate::loadingStateChanged()
+void QWebEngineViewPrivate::loadingStateChanged()
 {
-    Q_Q(QWebContentsView);
+    Q_Q(QWebEngineView);
     const bool wasLoading = m_isLoading;
     m_isLoading = adapter->isLoading();
     if (m_isLoading != wasLoading) {
@@ -75,82 +75,82 @@ void QWebContentsViewPrivate::loadingStateChanged()
     }
 }
 
-QRectF QWebContentsViewPrivate::viewportRect() const
+QRectF QWebEngineViewPrivate::viewportRect() const
 {
-    Q_Q(const QWebContentsView);
+    Q_Q(const QWebEngineView);
     return q->geometry();
 }
 
-void QWebContentsViewPrivate::loadFinished(bool success)
+void QWebEngineViewPrivate::loadFinished(bool success)
 {
-    Q_Q(QWebContentsView);
+    Q_Q(QWebEngineView);
     m_isLoading = adapter->isLoading();
     Q_EMIT q->loadFinished(success);
 }
 
-void QWebContentsViewPrivate::focusContainer()
+void QWebEngineViewPrivate::focusContainer()
 {
-    Q_Q(QWebContentsView);
+    Q_Q(QWebEngineView);
     q->setFocus();
 }
 
-RenderWidgetHostViewQtDelegate *QWebContentsViewPrivate::CreateRenderWidgetHostViewQtDelegate()
+RenderWidgetHostViewQtDelegate *QWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate()
 {
     return new RenderWidgetHostViewQtDelegateWidget;
 }
 
-QWebContentsView::QWebContentsView()
-    : d_ptr(new QWebContentsViewPrivate)
+QWebEngineView::QWebEngineView()
+    : d_ptr(new QWebEngineViewPrivate)
 {
     d_ptr->q_ptr=this;
     // This causes the child RenderWidgetHostViewQtDelegateWidgets to fill this widget.
     setLayout(new QStackedLayout);
 }
 
-QWebContentsView::~QWebContentsView()
+QWebEngineView::~QWebEngineView()
 {
 }
 
-void QWebContentsView::load(const QUrl& url)
+void QWebEngineView::load(const QUrl& url)
 {
-    Q_D(QWebContentsView);
+    Q_D(QWebEngineView);
     d->adapter->load(url);
 }
 
-bool QWebContentsView::canGoBack() const
+bool QWebEngineView::canGoBack() const
 {
-    Q_D(const QWebContentsView);
+    Q_D(const QWebEngineView);
     return d->adapter->canGoBack();
 }
 
-bool QWebContentsView::canGoForward() const
+bool QWebEngineView::canGoForward() const
 {
-    Q_D(const QWebContentsView);
+    Q_D(const QWebEngineView);
     return d->adapter->canGoForward();
 }
 
-void QWebContentsView::back()
+void QWebEngineView::back()
 {
-    Q_D(QWebContentsView);
+    Q_D(QWebEngineView);
     d->adapter->navigateHistory(-1);
 }
 
-void QWebContentsView::forward()
+void QWebEngineView::forward()
 {
-    Q_D(QWebContentsView);
+    Q_D(QWebEngineView);
     d->adapter->navigateHistory(1);
 }
 
-void QWebContentsView::reload()
+void QWebEngineView::reload()
 {
-    Q_D(QWebContentsView);
+    Q_D(QWebEngineView);
     d->adapter->reload();
 }
 
-void QWebContentsView::stop()
+void QWebEngineView::stop()
 {
-    Q_D(QWebContentsView);
+    Q_D(QWebEngineView);
     d->adapter->stop();
 }
 
-#include "moc_qwebcontentsview.cpp"
+#include "moc_qwebengineview.cpp"
diff --git a/lib/widgets/Api/qwebcontentsview.h b/lib/widgets/Api/qwebengineview.h
index 4db8e4b56..a86218538 100644
--- a/lib/widgets/Api/qwebcontentsview.h
+++ b/lib/widgets/Api/qwebengineview.h
@@ -39,21 +39,21 @@
 **
 ****************************************************************************/
 
-#ifndef QWEBCONTESTSVIEW_H
-#define QWEBCONTESTSVIEW_H
+#ifndef QWEBENGINEVIEW_H
+#define QWEBENGINEVIEW_H
 
 #include <qtwebenginewidgetsglobal.h>
 
 #include <QWidget>
 #include <QScopedPointer>
 
-class QWebContentsViewPrivate;
+class QWebEngineViewPrivate;
 
-class QWEBENGINEWIDGETS_EXPORT QWebContentsView : public QWidget {
+class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget {
     Q_OBJECT
 public:
-    QWebContentsView();
-    ~QWebContentsView();
+    QWebEngineView();
+    ~QWebEngineView();
 
     void load(const QUrl& url);
     bool canGoBack() const;
@@ -72,8 +72,8 @@ Q_SIGNALS:
     void urlChanged(const QUrl& url);
 
 private:
-    Q_DECLARE_PRIVATE(QWebContentsView);
-    QScopedPointer<QWebContentsViewPrivate> d_ptr;
+    Q_DECLARE_PRIVATE(QWebEngineView);
+    QScopedPointer<QWebEngineViewPrivate> d_ptr;
 };
 
-#endif // QWEBCONTESTSVIEW_H
+#endif // QWEBENGINEVIEW_H
diff --git a/lib/widgets/Api/qwebcontentsview_p.h b/lib/widgets/Api/qwebengineview_p.h
index 6fb60c33e..5c623a097 100644
--- a/lib/widgets/Api/qwebcontentsview_p.h
+++ b/lib/widgets/Api/qwebengineview_p.h
@@ -39,24 +39,24 @@
 **
 ****************************************************************************/
 
-#ifndef QWEBCONTESTSVIEWPRIVATE_H
-#define QWEBCONTESTSVIEWPRIVATE_H
+#ifndef QWEBENGINEVIEWPRIVATE_H
+#define QWEBENGINEVIEWPRIVATE_H
 
 #include "web_contents_adapter_client.h"
 
 #include <QScopedPointer>
 
-class QWebContentsView;
+class QWebEngineView;
 class RenderWidgetHostViewQtDelegate;
 class WebContentsAdapter;
 
-class QWebContentsViewPrivate : public WebContentsAdapterClient
+class QWebEngineViewPrivate : public WebContentsAdapterClient
 {
-    Q_DECLARE_PUBLIC(QWebContentsView)
-    QWebContentsView *q_ptr;
+    Q_DECLARE_PUBLIC(QWebEngineView)
+    QWebEngineView *q_ptr;
 
 public:
-    QWebContentsViewPrivate();
+    QWebEngineViewPrivate();
 
     virtual RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate() Q_DECL_OVERRIDE;
     virtual void titleChanged(const QString&) Q_DECL_OVERRIDE;
diff --git a/lib/widgets/render_widget_host_view_qt_delegate_widget.cpp b/lib/widgets/render_widget_host_view_qt_delegate_widget.cpp
index 05b8a16e8..507471a78 100644
--- a/lib/widgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/lib/widgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -41,8 +41,8 @@
 
 #include "render_widget_host_view_qt_delegate_widget.h"
 
-#include "qwebcontentsview.h"
-#include "qwebcontentsview_p.h"
+#include "qwebengineview.h"
+#include "qwebengineview_p.h"
 #include <QtGlobal>
 #include <QLayout>
 #include <QResizeEvent>
@@ -75,7 +75,7 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(QWidg
 
 void RenderWidgetHostViewQtDelegateWidget::initAsChild(WebContentsAdapterClient* container)
 {
-    QWebContentsViewPrivate *viewPrivate = static_cast<QWebContentsViewPrivate *>(container);
+    QWebEngineViewPrivate *viewPrivate = static_cast<QWebEngineViewPrivate *>(container);
     viewPrivate->q_func()->layout()->addWidget(this);
 }
 
diff --git a/lib/widgets/widgets.pro b/lib/widgets/widgets.pro
index fddfa4945..9a5591b82 100644
--- a/lib/widgets/widgets.pro
+++ b/lib/widgets/widgets.pro
@@ -22,13 +22,13 @@ DESTDIR = $$LIBPATH
 INCLUDEPATH += Api ../
 
 SOURCES = \
-        Api/qwebcontentsview.cpp\
+        Api/qwebengineview.cpp\
         render_widget_host_view_qt_delegate_widget.cpp
 
 HEADERS = \
         Api/qtwebenginewidgetsglobal.h \
-        Api/qwebcontentsview.h \
-        Api/qwebcontentsview_p.h \
+        Api/qwebengineview.h \
+        Api/qwebengineview_p.h \
         render_widget_host_view_qt_delegate_widget.h
 
 load(qt_module)