diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-19 15:17:56 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-20 18:15:57 +0200 |
commit | c1c7c3cfa9d8c3e6f05095d0880a84a13a0d9e01 (patch) | |
tree | 1a77807a994125236fc6631e84cdad83d9e3897e /lib/web_contents_view_qt.cpp | |
parent | abd17e1583e8e13b1a46d599fb695c1189550226 (diff) | |
download | qtwebengine-c1c7c3cfa9d8c3e6f05095d0880a84a13a0d9e01.tar.gz |
Centralize type conversion functions.
This adds the common GURL->QUrl and string16->QString conversions
into a common header and use those functions throughout the code.
Move the qStringToStringType into the same header and rename it
to a name consistent with the others.
This also cleans up shared_globals.h by moving content:: forward
declarations in the cpp, where they are used.
Change-Id: I19527ea7de1f6047aae8b44c97eb4d7c3e5a0e54
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'lib/web_contents_view_qt.cpp')
-rw-r--r-- | lib/web_contents_view_qt.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/web_contents_view_qt.cpp b/lib/web_contents_view_qt.cpp index 09863ca9e..db991d84b 100644 --- a/lib/web_contents_view_qt.cpp +++ b/lib/web_contents_view_qt.cpp @@ -62,8 +62,7 @@ content::RenderWidgetHostView* WebContentsViewQt::CreateViewForWidget(content::R void WebContentsViewQt::SetPageTitle(const string16& title) { - QString string = QString::fromUtf16(title.data()); - m_client->titleChanged(string); + m_client->titleChanged(toQt(title)); } void WebContentsViewQt::GetContainerBounds(gfx::Rect* out) const |