diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-12-12 15:06:29 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-02 13:18:46 +0000 |
commit | 0c49002d833b6c8ccf822d1ebd29a86b3f15f389 (patch) | |
tree | a414da48ea946a97daba4eb9106f0e2387f18a42 /src/core/renderer | |
parent | 26ae2ce0a8401698a2b1c1f0a8162ebf83dcafef (diff) |
Add namespace to internal QtWebEngine API
Adds the QtWebEngineCore namespace to all internal core API. This
ensures we don't export any internal symbols in the global namespace.
Change-Id: I26af888ea7c6c4c4d0f04c24a377c1a9d3c92751
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core/renderer')
-rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 4 | ||||
-rw-r--r-- | src/core/renderer/content_renderer_client_qt.h | 4 | ||||
-rw-r--r-- | src/core/renderer/web_channel_ipc_transport.cpp | 4 | ||||
-rw-r--r-- | src/core/renderer/web_channel_ipc_transport.h | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index 242c8ef6d..e1333144a 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -56,6 +56,8 @@ #include "grit/renderer_resources.h" +namespace QtWebEngineCore { + static const char kHttpErrorDomain[] = "http"; ContentRendererClientQt::ContentRendererClientQt() @@ -139,3 +141,5 @@ bool ContentRendererClientQt::IsLinkVisited(unsigned long long linkHash) { return m_visitedLinkSlave->IsVisited(linkHash); } + +} // namespace diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h index 0a89e050d..dcb4e7fcb 100644 --- a/src/core/renderer/content_renderer_client_qt.h +++ b/src/core/renderer/content_renderer_client_qt.h @@ -45,6 +45,8 @@ namespace visitedlink { class VisitedLinkSlave; } +namespace QtWebEngineCore { + class ContentRendererClientQt : public content::ContentRendererClient { public: ContentRendererClientQt(); @@ -64,4 +66,6 @@ private: QScopedPointer<visitedlink::VisitedLinkSlave> m_visitedLinkSlave; }; +} // namespace + #endif // CONTENT_RENDERER_CLIENT_QT_H diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp index ebebb01e9..3d844bf0d 100644 --- a/src/core/renderer/web_channel_ipc_transport.cpp +++ b/src/core/renderer/web_channel_ipc_transport.cpp @@ -48,6 +48,8 @@ #include <QJsonDocument> +namespace QtWebEngineCore { + static const char kWebChannelTransportExtensionName[] = "v8/WebChannelTransport"; static const char kWebChannelTransportApi[] = @@ -173,3 +175,5 @@ bool WebChannelIPCTransport::OnMessageReceived(const IPC::Message &message) IPC_END_MESSAGE_MAP() return handled; } + +} // namespace diff --git a/src/core/renderer/web_channel_ipc_transport.h b/src/core/renderer/web_channel_ipc_transport.h index 8074c2302..69a02f7ea 100644 --- a/src/core/renderer/web_channel_ipc_transport.h +++ b/src/core/renderer/web_channel_ipc_transport.h @@ -45,6 +45,8 @@ namespace v8 { class Extension; } +namespace QtWebEngineCore { + class WebChannelIPCTransport : public content::RenderViewObserver { public: static v8::Extension* getV8Extension(); @@ -56,4 +58,6 @@ private: virtual bool OnMessageReceived(const IPC::Message &message) Q_DECL_OVERRIDE; }; +} // namespace + #endif // WEB_CHANNEL_IPC_TRANSPORT |