diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-25 16:43:20 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-31 08:34:21 +0200 |
commit | e2451bd729d0f1d795a5b689deba65bc4e9d92c6 (patch) | |
tree | 4f2356107b0e58db7afda0fc324b9eac49ff68c0 /idlc | |
parent | 460b52838fdad0352188bdd877b69cbb5f17ca63 (diff) |
Convert indexOf->startsWith and lastIndexOf->endsWith
This is both an optimisation and a cleanup.
This converts code like
aStr.indexOf("XX") == 0
to
aStr.startsWith("XX")
and converts code like
aStr.lastIndexOf("XXX") == aStr.getLength() - 3
to
aStr.endsWith("XXX")
Note that in general
aStr.lastIndexOf("X") == aStr.getLength() - 1
converts to
aStr.isEmpty() || aStr.endsWith("X")
so I used the surrounding context to determine if aStr could be empty
when modifying the code.
Change-Id: I22cb8ca7c2a4d0288b001f72adb27fd63af87669
Diffstat (limited to 'idlc')
-rw-r--r-- | idlc/source/astscope.cxx | 8 | ||||
-rw-r--r-- | idlc/source/idlccompile.cxx | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx index 1c0d4fd84101..ba06611feb1a 100644 --- a/idlc/source/astscope.cxx +++ b/idlc/source/astscope.cxx @@ -25,13 +25,9 @@ using namespace ::rtl; -sal_Bool isGlobal(const OString& scopedName) +bool isGlobal(const OString& scopedName) { - if (scopedName.isEmpty() || (scopedName.indexOf(':') == 0)) - { - return sal_True; - } - return sal_False; + return scopedName.isEmpty() || scopedName.startsWith(":"); } AstScope::AstScope(NodeType nodeType) diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 8a98af2aa456..8c6701aa292a 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -60,7 +60,7 @@ static sal_Char tmpFilePattern[512]; sal_Bool isFileUrl(const OString& fileName) { - if (fileName.indexOf("file://") == 0 ) + if (fileName.startsWith("file://") ) return sal_True; return sal_False; } |