From 0a2d163cdb5ea0ae0d92a557fc1dbb5a449a3201 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@theqtcompany.com>
Date: Fri, 24 Jul 2015 14:28:45 +0200
Subject: Fix #include's in public headers

Uniformly use the <Module/class.h> style, like

  https://wiki.qt.io/Coding_Conventions

mandates.

Change-Id: I4c05599fa689f375158fd3b0a54aada8571e5c59
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 src/core/api/qwebenginecallback.h                     |  6 +++---
 src/core/api/qwebenginecookiestoreclient.h            |  8 ++++----
 src/core/api/qwebengineurlrequestinfo.h               |  4 ++--
 src/core/api/qwebengineurlrequestinterceptor.h        | 10 +++++-----
 src/core/core_gyp_generator.pro                       |  1 -
 src/webenginewidgets/api/qwebenginecertificateerror.h |  6 +++---
 src/webenginewidgets/api/qwebenginedownloaditem.h     |  4 ++--
 src/webenginewidgets/api/qwebengineprofile.h          |  8 ++++----
 src/webenginewidgets/api/qwebenginescript.h           |  7 ++++---
 src/webenginewidgets/api/qwebenginescriptcollection.h | 10 +++++-----
 10 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/core/api/qwebenginecallback.h b/src/core/api/qwebenginecallback.h
index a88fa838c..ddee20d06 100644
--- a/src/core/api/qwebenginecallback.h
+++ b/src/core/api/qwebenginecallback.h
@@ -40,9 +40,9 @@
 #include "qtwebenginecoreglobal.h"
 
 #include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
-#include <QExplicitlySharedDataPointer>
-#include <QString>
-#include <QVariant>
+#include <QtCore/qshareddata.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qvariant.h>
 
 namespace QtWebEngineCore {
 class CallbackDirectory;
diff --git a/src/core/api/qwebenginecookiestoreclient.h b/src/core/api/qwebenginecookiestoreclient.h
index c9cfc1b37..929584c86 100644
--- a/src/core/api/qwebenginecookiestoreclient.h
+++ b/src/core/api/qwebenginecookiestoreclient.h
@@ -40,10 +40,10 @@
 #include "qtwebenginecoreglobal.h"
 #include "qwebenginecallback.h"
 
-#include <QObject>
-#include <QScopedPointer>
-#include <QNetworkCookie>
-#include <QUrl>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qurl.h>
+#include <QtNetwork/qnetworkcookie.h>
 
 namespace QtWebEngineCore {
 class CookieMonsterDelegateQt;
diff --git a/src/core/api/qwebengineurlrequestinfo.h b/src/core/api/qwebengineurlrequestinfo.h
index 8ef787995..dd1e57ebd 100644
--- a/src/core/api/qwebengineurlrequestinfo.h
+++ b/src/core/api/qwebengineurlrequestinfo.h
@@ -39,8 +39,8 @@
 
 #include "qtwebenginecoreglobal.h"
 
-#include <QScopedPointer>
-#include <QUrl>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qurl.h>
 
 namespace QtWebEngineCore {
 class NetworkDelegateQt;
diff --git a/src/core/api/qwebengineurlrequestinterceptor.h b/src/core/api/qwebengineurlrequestinterceptor.h
index a38a697af..3eac74bb6 100644
--- a/src/core/api/qwebengineurlrequestinterceptor.h
+++ b/src/core/api/qwebengineurlrequestinterceptor.h
@@ -38,12 +38,12 @@
 #define QWEBENINGEURLREQUESTINTERCEPTOR_H
 
 #include "qtwebenginecoreglobal.h"
-
 #include "qwebengineurlrequestinfo.h"
-#include <QByteArray>
-#include <QHash>
-#include <QObject>
-#include <QUrl>
+
+#include <QtCore/qbytearray.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qurl.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index b878fdc9f..1a2679a60 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -136,7 +136,6 @@ HEADERS = \
         proxy_resolver_qt.h \
         qrc_protocol_handler_qt.h \
         qt_render_view_observer_host.h \
-        qtwebenginecoreglobal.h \
         render_widget_host_view_qt.h \
         render_widget_host_view_qt_delegate.h \
         renderer/content_renderer_client_qt.h \
diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.h b/src/webenginewidgets/api/qwebenginecertificateerror.h
index 90b23208c..7706ea32d 100644
--- a/src/webenginewidgets/api/qwebenginecertificateerror.h
+++ b/src/webenginewidgets/api/qwebenginecertificateerror.h
@@ -37,10 +37,10 @@
 #ifndef QWEBENGINECERTIFICATEERROR_H
 #define QWEBENGINECERTIFICATEERROR_H
 
-#include "qtwebenginewidgetsglobal.h"
+#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
 
-#include <QtCore/QScopedPointer>
-#include <QtCore/QUrl>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qurl.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.h b/src/webenginewidgets/api/qwebenginedownloaditem.h
index d362131f2..1428ad4c3 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.h
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.h
@@ -37,9 +37,9 @@
 #ifndef QWEBENGINEDOWNLOADITEM_H
 #define QWEBENGINEDOWNLOADITEM_H
 
-#include "qtwebenginewidgetsglobal.h"
+#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
 
-#include <QObject>
+#include <QtCore/qobject.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/webenginewidgets/api/qwebengineprofile.h
index 09160fecb..06e11eeca 100644
--- a/src/webenginewidgets/api/qwebengineprofile.h
+++ b/src/webenginewidgets/api/qwebengineprofile.h
@@ -37,11 +37,11 @@
 #ifndef QWEBENGINEPROFILE_H
 #define QWEBENGINEPROFILE_H
 
-#include "qtwebenginewidgetsglobal.h"
+#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
 
-#include <QObject>
-#include <QScopedPointer>
-#include <QString>
+#include <QtCore/qobject.h>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qstring.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webenginewidgets/api/qwebenginescript.h b/src/webenginewidgets/api/qwebenginescript.h
index 2b03cd06f..4cff2631d 100644
--- a/src/webenginewidgets/api/qwebenginescript.h
+++ b/src/webenginewidgets/api/qwebenginescript.h
@@ -36,10 +36,11 @@
 
 #ifndef QWEBENGINESCRIPT_H
 #define QWEBENGINESCRIPT_H
-#include "qtwebenginewidgetsglobal.h"
 
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QString>
+#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
+
+#include <QtCore/qshareddata.h>
+#include <QtCore/qstring.h>
 
 namespace QtWebEngineCore {
 class UserScript;
diff --git a/src/webenginewidgets/api/qwebenginescriptcollection.h b/src/webenginewidgets/api/qwebenginescriptcollection.h
index fe3ce2861..40196b478 100644
--- a/src/webenginewidgets/api/qwebenginescriptcollection.h
+++ b/src/webenginewidgets/api/qwebenginescriptcollection.h
@@ -37,12 +37,12 @@
 #ifndef QWEBENGINESCRIPTCOLLECTION_H
 #define QWEBENGINESCRIPTCOLLECTION_H
 
-#include "qtwebenginewidgetsglobal.h"
+#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
+#include <QtWebEngineWidgets/qwebenginescript.h>
 
-#include "qwebenginescript.h"
-#include <QtCore/QScopedPointer>
-#include <QtCore/QList>
-#include <QtCore/QSet>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qset.h>
 
 QT_BEGIN_NAMESPACE
 class QWebEngineScriptCollectionPrivate;
-- 
cgit v1.2.3