diff options
author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-26 19:27:24 +0000 |
---|---|---|
committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-26 19:27:24 +0000 |
commit | f0fcfd3fe4f8b9f06608f9a6456f585cf82d9730 (patch) | |
tree | 8bd521ba25b97de5f71736937ad756ce704e1d5d /webkit/glue/glue_util.h | |
parent | 2539eda33909f9efc27ac403e964e140eaf3dd84 (diff) | |
download | chromium_src-f0fcfd3fe4f8b9f06608f9a6456f585cf82d9730.zip chromium_src-f0fcfd3fe4f8b9f06608f9a6456f585cf82d9730.tar.gz chromium_src-f0fcfd3fe4f8b9f06608f9a6456f585cf82d9730.tar.bz2 |
Add UTF8 <-> UTF-16 conversion functions, and a WebCore::String -> std::string function. We already have a std::string -> WebCore::String function.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/glue_util.h')
-rw-r--r-- | webkit/glue/glue_util.h | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/webkit/glue/glue_util.h b/webkit/glue/glue_util.h index 1ad8d59..55f8ea3 100644 --- a/webkit/glue/glue_util.h +++ b/webkit/glue/glue_util.h @@ -18,20 +18,23 @@ namespace WebCore { } namespace webkit_glue { - std::string CStringToStdString(const WebCore::CString& str); - WebCore::CString StdStringToCString(const std::string& str); - std::wstring StringToStdWString(const WebCore::String& str); - std::string16 StringToStdString16(const WebCore::String& str); - - WebCore::String StdWStringToString(const std::wstring& str); - WebCore::String StdStringToString(const std::string& str); - - WebCore::DeprecatedString StdWStringToDeprecatedString(const std::wstring& str); - std::wstring DeprecatedStringToStdWString(const WebCore::DeprecatedString& dep); - - GURL KURLToGURL(const WebCore::KURL& url); - WebCore::KURL GURLToKURL(const GURL& url); -} + +std::string CStringToStdString(const WebCore::CString& str); +WebCore::CString StdStringToCString(const std::string& str); +std::wstring StringToStdWString(const WebCore::String& str); +std::string16 StringToStdString16(const WebCore::String& str); +std::string StringToStdString(const WebCore::String& str); + +WebCore::String StdWStringToString(const std::wstring& str); +WebCore::String StdStringToString(const std::string& str); + +WebCore::DeprecatedString StdWStringToDeprecatedString(const std::wstring& str); +std::wstring DeprecatedStringToStdWString(const WebCore::DeprecatedString& dep); + +GURL KURLToGURL(const WebCore::KURL& url); +WebCore::KURL GURLToKURL(const GURL& url); + +} // namespace webkit_glue #endif // #ifndef WEBKIT_GLUE_GLUE_UTIL_H_ |