diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2012-12-30 13:07:28 -0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-03 10:07:39 +0100 |
| commit | c40cd8a4f203a4f817a77ab850e5027f8bae9b91 (patch) | |
| tree | ee6c7cc0ca9fc79570898f31ff5b96dfc3b8d31a /basic/source/comp/token.cxx | |
| parent | 329f3cd02546dfe58bf00f6ad3b71bc84a8d4320 (diff) | |
Remove all occurences of RTL_* and ::rtl prefix from basic
This is a big commit, so thanks for your time reviewing this :)
Conflicts:
basic/source/sbx/sbxscan.cxx
Change-Id: Ib9bc710b87475b5695764557321e5dcef25e5933
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'basic/source/comp/token.cxx')
| -rw-r--r-- | basic/source/comp/token.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx index e0dc9fda3ac6..0da1c51476d9 100644 --- a/basic/source/comp/token.cxx +++ b/basic/source/comp/token.cxx @@ -210,7 +210,7 @@ TokenLabelInfo::~TokenLabelInfo() // the constructor detects the length of the token table -SbiTokenizer::SbiTokenizer( const ::rtl::OUString& rSrc, StarBASIC* pb ) +SbiTokenizer::SbiTokenizer( const OUString& rSrc, StarBASIC* pb ) : SbiScanner( rSrc, pb ) { pTokTable = aTokTable_Basic; @@ -240,11 +240,11 @@ void SbiTokenizer::Push( SbiToken t ) void SbiTokenizer::Error( SbError code, const char* pMsg ) { - aError = ::rtl::OUString::createFromAscii( pMsg ); + aError = OUString::createFromAscii( pMsg ); Error( code ); } -void SbiTokenizer::Error( SbError code, const ::rtl::OUString &aMsg ) +void SbiTokenizer::Error( SbError code, const OUString &aMsg ) { aError = aMsg; Error( code ); @@ -275,24 +275,24 @@ SbiToken SbiTokenizer::Peek() // For decompilation. Numbers and symbols return an empty string. -const ::rtl::OUString& SbiTokenizer::Symbol( SbiToken t ) +const OUString& SbiTokenizer::Symbol( SbiToken t ) { // character token? if( t < FIRSTKWD ) { - aSym = ::rtl::OUString::valueOf(sal::static_int_cast<sal_Unicode>(t)); + aSym = OUString::valueOf(sal::static_int_cast<sal_Unicode>(t)); return aSym; } switch( t ) { case NEG : - aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-")); + aSym = OUString("-"); return aSym; case EOS : - aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":/CRLF")); + aSym = OUString(":/CRLF"); return aSym; case EOLN : - aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CRLF")); + aSym = OUString("CRLF"); return aSym; default: break; @@ -302,14 +302,14 @@ const ::rtl::OUString& SbiTokenizer::Symbol( SbiToken t ) { if( tp->t == t ) { - aSym = ::rtl::OStringToOUString(tp->s, RTL_TEXTENCODING_ASCII_US); + aSym = OStringToOUString(tp->s, RTL_TEXTENCODING_ASCII_US); return aSym; } } const sal_Unicode *p = aSym.getStr(); if (*p <= ' ') { - aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("???")); + aSym = OUString("???"); } return aSym; } @@ -506,7 +506,7 @@ special: if( bCompatible ) { // #129904 Suppress system - if( eTok == STOP && aSym.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("system")) ) + if( eTok == STOP && aSym.equalsIgnoreAsciiCase("system") ) { eCurTok = SYMBOL; } |