summaryrefslogtreecommitdiff
path: root/Source/WebKit/win/WebLocalizableStrings.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/win/WebLocalizableStrings.cpp')
-rw-r--r--Source/WebKit/win/WebLocalizableStrings.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/win/WebLocalizableStrings.cpp b/Source/WebKit/win/WebLocalizableStrings.cpp
index dfb714b46..442a80172 100644
--- a/Source/WebKit/win/WebLocalizableStrings.cpp
+++ b/Source/WebKit/win/WebLocalizableStrings.cpp
@@ -88,7 +88,7 @@ private:
LocalizedString::operator LPCTSTR() const
{
if (!m_string.isEmpty())
- return m_string.charactersWithNullTermination();
+ return m_string.charactersWithNullTermination().data();
m_string = m_cfString;
@@ -96,7 +96,7 @@ LocalizedString::operator LPCTSTR() const
if (m_string[i] == '@' && (m_string[i - 1] == '%' || (i > 2 && m_string[i - 1] == '$' && m_string[i - 2] >= '1' && m_string[i - 2] <= '9' && m_string[i - 3] == '%')))
m_string.replace(i, 1, "s");
- return m_string.charactersWithNullTermination();
+ return m_string.charactersWithNullTermination().data();
}
static CFBundleRef createWebKitBundle()
@@ -154,7 +154,7 @@ static CFBundleRef cfBundleForStringsBundle(WebLocalizableStringsBundle* strings
createWebKitBundle();
if (!stringsBundle->bundle)
- stringsBundle->bundle = CFBundleGetBundleWithIdentifier(RetainPtr<CFStringRef>(AdoptCF, CFStringCreateWithCString(0, stringsBundle->identifier, kCFStringEncodingASCII)).get());
+ stringsBundle->bundle = CFBundleGetBundleWithIdentifier(adoptCF(CFStringCreateWithCString(0, stringsBundle->identifier, kCFStringEncodingASCII)).get());
return stringsBundle->bundle;
}