diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-23 12:06:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-24 14:43:34 +0200 |
commit | 6f50961e69406a17d6ec998956a6b33208b1001b (patch) | |
tree | 413c83df969e73c5cba1e11ef3740afc748ee1f5 /sal/qa/rtl/ostring/rtl_str.cxx | |
parent | 4e729de73f2947155248f8df5897380611b87917 (diff) |
remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals.
Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal/qa/rtl/ostring/rtl_str.cxx')
-rw-r--r-- | sal/qa/rtl/ostring/rtl_str.cxx | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx index 94b741caae32..e2d79d812d77 100644 --- a/sal/qa/rtl/ostring/rtl_str.cxx +++ b/sal/qa/rtl/ostring/rtl_str.cxx @@ -39,13 +39,13 @@ namespace rtl_str void compare_000_1() { - rtl::OString aStr1 = "Line must be equal."; + OString aStr1 = "Line must be equal."; rtl_str_compare( aStr1.getStr(), NULL); } void compare_001() { - rtl::OString aStr1 = ""; - rtl::OString aStr2 = ""; + OString aStr1 = ""; + OString aStr2 = ""; sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0); @@ -53,8 +53,8 @@ namespace rtl_str void compare_002() { - rtl::OString aStr1 = "Line must be equal."; - rtl::OString aStr2 = "Line must be equal."; + OString aStr1 = "Line must be equal."; + OString aStr2 = "Line must be equal."; sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0); @@ -62,8 +62,8 @@ namespace rtl_str void compare_003() { - rtl::OString aStr1 = "Line must differ."; - rtl::OString aStr2 = "Line foo bar, ok, differ."; + OString aStr1 = "Line must differ."; + OString aStr2 = "Line foo bar, ok, differ."; sal_Int32 nValue = rtl_str_compare( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); @@ -93,13 +93,13 @@ namespace rtl_str void compare_000_1() { - rtl::OString aStr1 = "Line must be equal."; + OString aStr1 = "Line must be equal."; rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), NULL); } void compare_001() { - rtl::OString aStr1 = ""; - rtl::OString aStr2 = ""; + OString aStr1 = ""; + OString aStr2 = ""; sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0); @@ -107,8 +107,8 @@ namespace rtl_str void compare_002() { - rtl::OString aStr1 = "Line must be equal."; - rtl::OString aStr2 = "Line must be equal."; + OString aStr1 = "Line must be equal."; + OString aStr2 = "Line must be equal."; sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0); @@ -116,8 +116,8 @@ namespace rtl_str void compare_002_1() { - rtl::OString aStr1 = "Line must be equal."; - rtl::OString aStr2 = "LINE MUST BE EQUAL."; + OString aStr1 = "Line must be equal."; + OString aStr2 = "LINE MUST BE EQUAL."; sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitive).", nValue == 0); @@ -125,8 +125,8 @@ namespace rtl_str void compare_003() { - rtl::OString aStr1 = "Line must differ."; - rtl::OString aStr2 = "Line foo bar, ok, differ."; + OString aStr1 = "Line must differ."; + OString aStr2 = "Line foo bar, ok, differ."; sal_Int32 nValue = rtl_str_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0); @@ -157,13 +157,13 @@ namespace rtl_str void compare_000_1() { - rtl::OString aStr1 = "Line must be equal."; + OString aStr1 = "Line must be equal."; rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0, 1); } void compare_001() { - rtl::OString aStr1 = ""; - rtl::OString aStr2 = ""; + OString aStr1 = ""; + OString aStr2 = ""; sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), aStr1.getLength()); CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0); @@ -171,8 +171,8 @@ namespace rtl_str void compare_002() { - rtl::OString aStr1 = "Line must be equal."; - rtl::OString aStr2 = "Line must be equal."; + OString aStr1 = "Line must be equal."; + OString aStr2 = "Line must be equal."; sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -182,8 +182,8 @@ namespace rtl_str void compare_002_1() { - rtl::OString aStr1 = "Line must be equal."; - rtl::OString aStr2 = "LINE MUST BE EQUAL."; + OString aStr1 = "Line must be equal."; + OString aStr2 = "LINE MUST BE EQUAL."; sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -193,8 +193,8 @@ namespace rtl_str void compare_003() { - rtl::OString aStr1 = "Line must differ."; - rtl::OString aStr2 = "Line foo bar, ok, differ."; + OString aStr1 = "Line must differ."; + OString aStr2 = "Line foo bar, ok, differ."; sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -204,8 +204,8 @@ namespace rtl_str void compare_004() { - rtl::OString aStr1 = "Line must differ."; - rtl::OString aStr2 = "Line foo bar, ok, differ."; + OString aStr1 = "Line must differ."; + OString aStr2 = "Line foo bar, ok, differ."; sal_Int32 nValue = rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), aStr2.getStr(), aStr2.getLength(), @@ -239,7 +239,7 @@ namespace rtl_str void hashCode_001() { - rtl::OString aStr1 = "Line for a hashCode."; + OString aStr1 = "Line for a hashCode."; sal_Int32 nHashCode = rtl_str_hashCode( aStr1.getStr() ); printf("hashcode: %d\n", nHashCode); // CPPUNIT_ASSERT_MESSAGE("failed.", nValue == 0); @@ -247,10 +247,10 @@ namespace rtl_str void hashCode_002() { - rtl::OString aStr1 = "Line for a hashCode."; + OString aStr1 = "Line for a hashCode."; sal_Int32 nHashCode1 = rtl_str_hashCode( aStr1.getStr() ); - rtl::OString aStr2 = "Line for a hashCode."; + OString aStr2 = "Line for a hashCode."; sal_Int32 nHashCode2 = rtl_str_hashCode( aStr2.getStr() ); CPPUNIT_ASSERT_MESSAGE("hashcodes must be equal.", nHashCode1 == nHashCode2 ); @@ -258,10 +258,10 @@ namespace rtl_str void hashCode_003() { - rtl::OString aStr1 = "Line for a hashCode."; + OString aStr1 = "Line for a hashCode."; sal_Int32 nHashCode1 = rtl_str_hashCode( aStr1.getStr() ); - rtl::OString aStr2 = "Line for another hashcode."; + OString aStr2 = "Line for another hashcode."; sal_Int32 nHashCode2 = rtl_str_hashCode( aStr2.getStr() ); CPPUNIT_ASSERT_MESSAGE("hashcodes must differ.", nHashCode1 != nHashCode2 ); @@ -290,7 +290,7 @@ namespace rtl_str void indexOfChar_001() { - rtl::OString aStr1 = "Line for a indexOfChar."; + OString aStr1 = "Line for a indexOfChar."; sal_Int32 nIndex = rtl_str_indexOfChar( aStr1.getStr(), 'L' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0); @@ -307,7 +307,7 @@ namespace rtl_str void indexOfChar_002() { - rtl::OString aStr1 = "Line for a indexOfChar."; + OString aStr1 = "Line for a indexOfChar."; sal_Int32 nIndex = rtl_str_indexOfChar( aStr1.getStr(), 'y' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -335,7 +335,7 @@ namespace rtl_str void lastIndexOfChar_001() { - rtl::OString aStr1 = "Line for a lastIndexOfChar."; + OString aStr1 = "Line for a lastIndexOfChar."; sal_Int32 nIndex = rtl_str_lastIndexOfChar( aStr1.getStr(), 'C' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 22); @@ -352,7 +352,7 @@ namespace rtl_str void lastIndexOfChar_002() { - rtl::OString aStr1 = "Line for a lastIndexOfChar."; + OString aStr1 = "Line for a lastIndexOfChar."; sal_Int32 nIndex = rtl_str_lastIndexOfChar( aStr1.getStr(), 'y' ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -380,13 +380,13 @@ namespace rtl_str void indexOfStr_000_1() { - rtl::OString aStr1 = "Line for a indexOfStr."; + OString aStr1 = "Line for a indexOfStr."; rtl_str_indexOfStr( aStr1.getStr(), 0 ); } void indexOfStr_001() { - rtl::OString aStr1 = "Line for a indexOfStr."; + OString aStr1 = "Line for a indexOfStr."; sal_Int32 nIndex = rtl_str_indexOfStr( aStr1.getStr(), "Line" ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0); @@ -403,7 +403,7 @@ namespace rtl_str void indexOfStr_002() { - rtl::OString aStr1 = "Line for a indexOfStr."; + OString aStr1 = "Line for a indexOfStr."; sal_Int32 nIndex = rtl_str_indexOfStr( aStr1.getStr(), "not exist" ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -431,31 +431,31 @@ namespace rtl_str void lastIndexOfStr_000_1() { - rtl::OString aStr1 = "Line for a lastIndexOfStr."; + OString aStr1 = "Line for a lastIndexOfStr."; rtl_str_lastIndexOfStr( aStr1.getStr(), NULL ); } void lastIndexOfStr_001() { - rtl::OString aStr1 = "Line for a lastIndexOfStr."; - rtl::OString aSearchStr = "Index"; + OString aStr1 = "Line for a lastIndexOfStr."; + OString aSearchStr = "Index"; sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 15); - /* rtl::OString */ aSearchStr = "Line"; + /* OString */ aSearchStr = "Line"; /* sal_Int32 */ nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0); - /* rtl::OString */ aSearchStr = ""; + /* OString */ aSearchStr = ""; /* sal_Int32 */ nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1); } void lastIndexOfStr_002() { - rtl::OString aStr1 = "Line for a lastIndexOfStr."; - rtl::OString aSearchStr = "foo"; + OString aStr1 = "Line for a lastIndexOfStr."; + OString aSearchStr = "foo"; sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 ); @@ -463,8 +463,8 @@ namespace rtl_str void lastIndexOfStr_003() { - rtl::OString aStr1 = "Line for a lastIndexOfStr."; - rtl::OString aSearchStr = "O"; + OString aStr1 = "Line for a lastIndexOfStr."; + OString aSearchStr = "O"; sal_Int32 nIndex = rtl_str_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() ); CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 20 ); @@ -493,8 +493,8 @@ namespace rtl_str void replaceChar_001() { - rtl::OString aStr1 = "replace char."; - rtl::OString aShouldStr1 = "ruplacu char."; + OString aStr1 = "replace char."; + OString aShouldStr1 = "ruplacu char."; sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); @@ -502,7 +502,7 @@ namespace rtl_str rtl_str_replaceChar( pStr, 'e', 'u' ); - CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True); + CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(OString(pStr)) == sal_True); free(pStr); } @@ -531,8 +531,8 @@ namespace rtl_str } void replaceChar_WithLength_001() { - rtl::OString aStr1 = "replace char."; - rtl::OString aShouldStr1 = "ruplace char."; + OString aStr1 = "replace char."; + OString aShouldStr1 = "ruplace char."; sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); @@ -540,7 +540,7 @@ namespace rtl_str rtl_str_replaceChar_WithLength( pStr, 6, 'e', 'u' ); - CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True); + CPPUNIT_ASSERT_MESSAGE("replace failed", aShouldStr1.equals(OString(pStr)) == sal_True); free(pStr); } @@ -566,8 +566,8 @@ namespace rtl_str void toAsciiLowerCase_001() { - rtl::OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE."; - rtl::OString aShouldStr1 = "change this to ascii lower case."; + OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE."; + OString aShouldStr1 = "change this to ascii lower case."; sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); @@ -575,7 +575,7 @@ namespace rtl_str rtl_str_toAsciiLowerCase( pStr ); - CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True); + CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True); free(pStr); } @@ -600,8 +600,8 @@ namespace rtl_str void toAsciiLowerCase_WithLength_001() { - rtl::OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE."; - rtl::OString aShouldStr1 = "change thiS TO ASCII LOWER CASE."; + OString aStr1 = "CHANGE THIS TO ASCII LOWER CASE."; + OString aShouldStr1 = "change thiS TO ASCII LOWER CASE."; sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); @@ -610,7 +610,7 @@ namespace rtl_str rtl_str_toAsciiLowerCase_WithLength( pStr, 10 ); printf("Lowercase with length: '%s'\n", pStr); - CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True); + CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True); free(pStr); } @@ -635,8 +635,8 @@ namespace rtl_str void toAsciiUpperCase_001() { - rtl::OString aStr1 = "change this to ascii upper case."; - rtl::OString aShouldStr1 = "CHANGE THIS TO ASCII UPPER CASE."; + OString aStr1 = "change this to ascii upper case."; + OString aShouldStr1 = "CHANGE THIS TO ASCII UPPER CASE."; sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); @@ -644,7 +644,7 @@ namespace rtl_str rtl_str_toAsciiUpperCase( pStr ); - CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True); + CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True); free(pStr); } @@ -669,8 +669,8 @@ namespace rtl_str void toAsciiUpperCase_WithLength_001() { - rtl::OString aStr1 = "change this to ascii lower case."; - rtl::OString aShouldStr1 = "CHANGE THIs to ascii lower case."; + OString aStr1 = "change this to ascii lower case."; + OString aShouldStr1 = "CHANGE THIs to ascii lower case."; sal_Char* pStr = (sal_Char*) malloc(aStr1.getLength() + 1); CPPUNIT_ASSERT_MESSAGE("can't get memory for test", pStr != NULL); @@ -679,7 +679,7 @@ namespace rtl_str rtl_str_toAsciiUpperCase_WithLength( pStr, 10 ); printf("Uppercase with length: '%s'\n", aStr1.getStr()); - CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(rtl::OString(pStr)) == sal_True); + CPPUNIT_ASSERT_MESSAGE("failed", aShouldStr1.equals(OString(pStr)) == sal_True); free(pStr); } |