diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
commit | 88a04ac016f57c2d78e714682445dff2e7db4ade (patch) | |
tree | a48ca81ee3b29953121308168db22532d5b57fe2 /Source/WebKit/chromium/tests/LocaleMacTest.cpp | |
parent | 284837daa07b29d6a63a748544a90b1f5842ac5c (diff) | |
download | qtwebkit-88a04ac016f57c2d78e714682445dff2e7db4ade.tar.gz |
Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)
This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future
Diffstat (limited to 'Source/WebKit/chromium/tests/LocaleMacTest.cpp')
-rw-r--r-- | Source/WebKit/chromium/tests/LocaleMacTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/chromium/tests/LocaleMacTest.cpp b/Source/WebKit/chromium/tests/LocaleMacTest.cpp index f6b0f6292..eb86a2f68 100644 --- a/Source/WebKit/chromium/tests/LocaleMacTest.cpp +++ b/Source/WebKit/chromium/tests/LocaleMacTest.cpp @@ -221,9 +221,9 @@ TEST_F(LocaleMacTest, decimalSeparator) } #endif -static void testNumberIsReversible(const String& localeString, const char* original, const char* shouldHave = 0) +static void testNumberIsReversible(const AtomicString& localeString, const char* original, const char* shouldHave = 0) { - OwnPtr<LocaleMac> locale = LocaleMac::create(localeString); + OwnPtr<Localizer> locale = Localizer::create(localeString); String localized = locale->convertToLocalizedNumber(original); if (shouldHave) EXPECT_TRUE(localized.contains(shouldHave)); @@ -231,7 +231,7 @@ static void testNumberIsReversible(const String& localeString, const char* origi EXPECT_STREQ(original, converted.utf8().data()); } -void testNumbers(const String& localeString, const char* decimalSeparatorShouldBe = 0) +void testNumbers(const AtomicString& localeString, const char* decimalSeparatorShouldBe = 0) { testNumberIsReversible(localeString, "123456789012345678901234567890"); testNumberIsReversible(localeString, "-123.456", decimalSeparatorShouldBe); |