summaryrefslogtreecommitdiffstats
path: root/src/core/type_conversion.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-12-12 15:06:29 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-03-02 13:18:46 +0000
commit0c49002d833b6c8ccf822d1ebd29a86b3f15f389 (patch)
treea414da48ea946a97daba4eb9106f0e2387f18a42 /src/core/type_conversion.h
parent26ae2ce0a8401698a2b1c1f0a8162ebf83dcafef (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/type_conversion.h')
-rw-r--r--src/core/type_conversion.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h
index 0e34c68e6..66fcd4dd0 100644
--- a/src/core/type_conversion.h
+++ b/src/core/type_conversion.h
@@ -52,6 +52,8 @@
#include "ui/gfx/rect.h"
#include "url/gurl.h"
+namespace QtWebEngineCore {
+
inline QString toQt(const base::string16 &string)
{
#if defined(OS_WIN)
@@ -191,4 +193,6 @@ inline std::vector<T> toVector(const QStringList &fileList)
return selectedFiles;
}
+} // namespace QtWebEngineCore
+
#endif // TYPE_CONVERSION_H