summaryrefslogtreecommitdiff
path: root/tools/qa/cppunit
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /tools/qa/cppunit
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'tools/qa/cppunit')
-rw-r--r--tools/qa/cppunit/test_inetmime.cxx2
-rw-r--r--tools/qa/cppunit/test_reversemap.cxx12
-rw-r--r--tools/qa/cppunit/test_stream.cxx16
-rw-r--r--tools/qa/cppunit/test_urlobj.cxx2
4 files changed, 16 insertions, 16 deletions
diff --git a/tools/qa/cppunit/test_inetmime.cxx b/tools/qa/cppunit/test_inetmime.cxx
index 06d8d4952f08..5770ff31ba15 100644
--- a/tools/qa/cppunit/test_inetmime.cxx
+++ b/tools/qa/cppunit/test_inetmime.cxx
@@ -41,7 +41,7 @@ namespace
bool Test::testDecode(char const * input, char const * expected)
{
- rtl::OUString result = INetMIME::decodeHeaderFieldBody(
+ OUString result = INetMIME::decodeHeaderFieldBody(
INetMIME::HEADER_FIELD_TEXT, input);
return result.equalsAscii(expected);
}
diff --git a/tools/qa/cppunit/test_reversemap.cxx b/tools/qa/cppunit/test_reversemap.cxx
index af232c0bcb1e..f20ffb32c7a8 100644
--- a/tools/qa/cppunit/test_reversemap.cxx
+++ b/tools/qa/cppunit/test_reversemap.cxx
@@ -80,14 +80,14 @@ namespace
//Some slots are unused, so don't map to private, just set them to 'X'
sal_uInt32 convertFlags = OUSTRING_TO_OSTRING_CVTFLAGS ^ RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE;
- rtl::OUString sOrigText(&aAllChars[0], aAllChars.size(), eEncoding, convertFlags);
+ OUString sOrigText(&aAllChars[0], aAllChars.size(), eEncoding, convertFlags);
sOrigText = sOrigText.replace( 0xfffd, 'X' );
//Should clearly be equal
sal_Int32 nLength = aAllChars.size();
CPPUNIT_ASSERT_EQUAL(sOrigText.getLength(), nLength);
- rtl::OUString sFinalText;
+ OUString sFinalText;
//Split up in chunks of the same encoding returned by
//getBestMSEncodingByChar, convert to it, and back
@@ -99,16 +99,16 @@ namespace
rtl_TextEncoding eCurrEncoding = getBestMSEncodingByChar(pStr[i]);
if (eCurrEncoding != ePrevEncoding)
{
- rtl::OString aChunk(pStr+nChunkStart, i-nChunkStart, ePrevEncoding);
- sFinalText += rtl::OStringToOUString(aChunk, ePrevEncoding);
+ OString aChunk(pStr+nChunkStart, i-nChunkStart, ePrevEncoding);
+ sFinalText += OStringToOUString(aChunk, ePrevEncoding);
nChunkStart = i;
}
ePrevEncoding = eCurrEncoding;
}
if (nChunkStart < 255)
{
- rtl::OString aChunk(pStr+nChunkStart, 255-nChunkStart, ePrevEncoding);
- sFinalText += rtl::OStringToOUString(aChunk, ePrevEncoding);
+ OString aChunk(pStr+nChunkStart, 255-nChunkStart, ePrevEncoding);
+ sFinalText += OStringToOUString(aChunk, ePrevEncoding);
}
//Final text should be the same as original
diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx
index a65b6be290cb..d1029ca82e63 100644
--- a/tools/qa/cppunit/test_stream.cxx
+++ b/tools/qa/cppunit/test_stream.cxx
@@ -154,18 +154,18 @@ namespace
char foo[] = "foobar";
SvMemoryStream aMemStream(foo, SAL_N_ELEMENTS(foo)-1, STREAM_READ);
- rtl::OString aOne = read_uInt8s_ToOString(aMemStream, 3);
+ OString aOne = read_uInt8s_ToOString(aMemStream, 3);
CPPUNIT_ASSERT(aOne == "foo");
- rtl::OString aTwo = read_uInt8s_ToOString(aMemStream, 3);
+ OString aTwo = read_uInt8s_ToOString(aMemStream, 3);
CPPUNIT_ASSERT(aTwo == "bar");
- rtl::OString aThree = read_uInt8s_ToOString(aMemStream, 3);
+ OString aThree = read_uInt8s_ToOString(aMemStream, 3);
CPPUNIT_ASSERT(aThree.isEmpty());
aMemStream.Seek(0);
- rtl::OString aFour = read_uInt8s_ToOString(aMemStream, 100);
+ OString aFour = read_uInt8s_ToOString(aMemStream, 100);
CPPUNIT_ASSERT(aFour == foo);
}
@@ -174,7 +174,7 @@ namespace
char foo[] = "foobar";
SvMemoryStream aMemStream(foo, SAL_N_ELEMENTS(foo)-1, STREAM_READ);
- rtl::OString aOne = read_zeroTerminated_uInt8s_ToOString(aMemStream);
+ OString aOne = read_zeroTerminated_uInt8s_ToOString(aMemStream);
CPPUNIT_ASSERT(aOne == "foobar");
CPPUNIT_ASSERT(!aMemStream.good());
CPPUNIT_ASSERT(!aMemStream.bad());
@@ -182,7 +182,7 @@ namespace
aMemStream.Seek(0);
foo[3] = 0;
- rtl::OString aTwo = read_zeroTerminated_uInt8s_ToOString(aMemStream);
+ OString aTwo = read_zeroTerminated_uInt8s_ToOString(aMemStream);
CPPUNIT_ASSERT(aTwo == "foo");
CPPUNIT_ASSERT(aMemStream.good());
}
@@ -192,7 +192,7 @@ namespace
char foo[] = "\3foobar";
SvMemoryStream aMemStream(foo, SAL_N_ELEMENTS(foo)-1, STREAM_READ);
- rtl::OString aFoo = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(aMemStream);
+ OString aFoo = read_lenPrefixed_uInt8s_ToOString<sal_uInt8>(aMemStream);
CPPUNIT_ASSERT(aFoo == "foo");
CPPUNIT_ASSERT(aMemStream.good());
CPPUNIT_ASSERT(!aMemStream.bad());
@@ -234,7 +234,7 @@ namespace
char foo[] = "foo\nbar\n\n";
SvMemoryStream aMemStream(foo, SAL_N_ELEMENTS(foo)-1, STREAM_READ);
- rtl::OString aFoo;
+ OString aFoo;
sal_Bool bRet;
bRet = aMemStream.ReadLine(aFoo);
diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx
index c53f2b18fdb7..ded7f6e5eeb8 100644
--- a/tools/qa/cppunit/test_urlobj.cxx
+++ b/tools/qa/cppunit/test_urlobj.cxx
@@ -33,7 +33,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include "tools/urlobj.hxx"
-#define OUSTR_TO_STDSTR( oustr ) std::string( rtl::OUStringToOString( oustr, RTL_TEXTENCODING_ASCII_US ).getStr() )
+#define OUSTR_TO_STDSTR( oustr ) std::string( OUStringToOString( oustr, RTL_TEXTENCODING_ASCII_US ).getStr() )
CPPUNIT_NS_BEGIN