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/chromium_overrides.cpp | |
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/chromium_overrides.cpp')
-rw-r--r-- | src/core/chromium_overrides.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index a098fb0ad..bd76025ea 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -63,6 +63,7 @@ #include "ui/gfx/platform_font.h" #endif +namespace QtWebEngineCore { void GetScreenInfoFromNativeWindow(QWindow* window, blink::WebScreenInfo* results) { QScreen* screen = window->screen(); @@ -80,6 +81,8 @@ void GetScreenInfoFromNativeWindow(QWindow* window, blink::WebScreenInfo* result *results = r; } +} // namespace QtWebEngineCore + #if defined(USE_X11) XDisplay* GetQtXDisplay() { @@ -97,7 +100,7 @@ WebContentsView* CreateWebContentsView(WebContentsImpl *web_contents, WebContentsViewDelegate *, RenderViewHostDelegateView **render_view_host_delegate_view) { - WebContentsViewQt* rv = new WebContentsViewQt(web_contents); + QtWebEngineCore::WebContentsViewQt* rv = new QtWebEngineCore::WebContentsViewQt(web_contents); *render_view_host_delegate_view = rv; return rv; } @@ -105,10 +108,10 @@ WebContentsView* CreateWebContentsView(WebContentsImpl *web_contents, // static void RenderWidgetHostViewBase::GetDefaultScreenInfo(blink::WebScreenInfo* results) { QWindow dummy; - GetScreenInfoFromNativeWindow(&dummy, results); + QtWebEngineCore::GetScreenInfoFromNativeWindow(&dummy, results); } -} +} // namespace content #if defined(USE_AURA) && !defined(USE_OZONE) namespace content { |