diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/api/qwebenginecookiestoreclient_p.h | 5 | ||||
-rw-r--r-- | src/core/cookie_monster_delegate_qt.h | 1 | ||||
-rw-r--r-- | src/core/delegated_frame_node.cpp | 2 | ||||
-rw-r--r-- | src/core/delegated_frame_node.h | 6 | ||||
-rw-r--r-- | src/core/permission_manager_qt.h | 4 | ||||
-rw-r--r-- | src/core/web_contents_delegate_qt.h | 3 | ||||
-rw-r--r-- | src/core/web_engine_context.cpp | 2 |
7 files changed, 11 insertions, 12 deletions
diff --git a/src/core/api/qwebenginecookiestoreclient_p.h b/src/core/api/qwebenginecookiestoreclient_p.h index 6b959c562..54f3b9eb7 100644 --- a/src/core/api/qwebenginecookiestoreclient_p.h +++ b/src/core/api/qwebenginecookiestoreclient_p.h @@ -53,8 +53,7 @@ #include "qwebenginecallback_p.h" #include "qwebenginecookiestoreclient.h" -#include <QList> -#include <QMap> +#include <QVector> #include <QNetworkCookie> #include <QUrl> @@ -75,7 +74,7 @@ public: Q_DECLARE_PUBLIC(QWebEngineCookieStoreClient) QtWebEngineCore::CallbackDirectory callbackDirectory; QWebEngineCallback<QWebEngineCookieStoreClient::FilterRequest&> filterCallback; - QList<CookieData> m_pendingUserCookies; + QVector<CookieData> m_pendingUserCookies; quint64 m_nextCallbackId; bool m_deleteSessionCookiesPending; bool m_deleteAllCookiesPending; diff --git a/src/core/cookie_monster_delegate_qt.h b/src/core/cookie_monster_delegate_qt.h index 7592d57fa..db80bf0a1 100644 --- a/src/core/cookie_monster_delegate_qt.h +++ b/src/core/cookie_monster_delegate_qt.h @@ -47,7 +47,6 @@ QT_WARNING_DISABLE_CLANG("-Wunused-parameter") #include "net/cookies/cookie_monster.h" QT_WARNING_POP -#include <QList> #include <QNetworkCookie> #include <QPointer> diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp index 1b6a80f82..07b3131ce 100644 --- a/src/core/delegated_frame_node.cpp +++ b/src/core/delegated_frame_node.cpp @@ -136,7 +136,7 @@ private: QSGGeometry m_geometry; }; -static inline QSharedPointer<QSGLayer> findRenderPassLayer(const cc::RenderPassId &id, const QList<QPair<cc::RenderPassId, QSharedPointer<QSGLayer> > > &list) +static inline QSharedPointer<QSGLayer> findRenderPassLayer(const cc::RenderPassId &id, const QVector<QPair<cc::RenderPassId, QSharedPointer<QSGLayer> > > &list) { typedef QPair<cc::RenderPassId, QSharedPointer<QSGLayer> > Pair; Q_FOREACH (const Pair &pair, list) diff --git a/src/core/delegated_frame_node.h b/src/core/delegated_frame_node.h index 60a1535d2..eed03fadd 100644 --- a/src/core/delegated_frame_node.h +++ b/src/core/delegated_frame_node.h @@ -90,9 +90,9 @@ private: QExplicitlySharedDataPointer<ChromiumCompositorData> m_chromiumCompositorData; struct SGObjects { - QList<QPair<cc::RenderPassId, QSharedPointer<QSGLayer> > > renderPassLayers; - QList<QSharedPointer<QSGRootNode> > renderPassRootNodes; - QList<QSharedPointer<QSGTexture> > textureStrongRefs; + QVector<QPair<cc::RenderPassId, QSharedPointer<QSGLayer> > > renderPassLayers; + QVector<QSharedPointer<QSGRootNode> > renderPassRootNodes; + QVector<QSharedPointer<QSGTexture> > textureStrongRefs; } m_sgObjects; int m_numPendingSyncPoints; QMap<uint32, gfx::TransferableFence> m_mailboxGLFences; diff --git a/src/core/permission_manager_qt.h b/src/core/permission_manager_qt.h index d4ee72bae..6dfc60c39 100644 --- a/src/core/permission_manager_qt.h +++ b/src/core/permission_manager_qt.h @@ -102,7 +102,7 @@ private: QUrl origin; base::Callback<void(content::PermissionStatus)> callback; }; - QList<Request> m_requests; + QVector<Request> m_requests; struct Subscriber { int id; PermissionType type; @@ -110,7 +110,7 @@ private: base::Callback<void(content::PermissionStatus)> callback; }; int m_subscriberCount; - QList<Subscriber> m_subscribers; + QVector<Subscriber> m_subscribers; }; diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h index 8f1317b6d..d3075cfbf 100644 --- a/src/core/web_contents_delegate_qt.h +++ b/src/core/web_contents_delegate_qt.h @@ -44,6 +44,7 @@ #include "base/callback.h" #include "javascript_dialog_manager_qt.h" +#include <QtCore/qvector.h> #include <QtCore/qcompilerdetection.h> QT_FORWARD_DECLARE_CLASS(CertificateErrorController) @@ -117,7 +118,7 @@ private: WebContentsAdapterClient *m_viewClient; QString m_lastSearchedString; int m_lastReceivedFindReply; - QList<int64> m_loadingErrorFrameList; + QVector<int64> m_loadingErrorFrameList; }; } // namespace QtWebEngineCore diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 4e4159cef..12b8bdadb 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -199,7 +199,7 @@ WebEngineContext::WebEngineContext() , m_browserRunner(content::BrowserMainRunner::Create()) , m_globalQObject(new QObject()) { - QList<QByteArray> args; + QVector<QByteArray> args; Q_FOREACH (const QString& arg, QCoreApplication::arguments()) args << arg.toUtf8(); |