From e2451bd729d0f1d795a5b689deba65bc4e9d92c6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 25 Oct 2013 16:43:20 +0200 Subject: 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 --- connectivity/source/drivers/macab/macabutilities.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'connectivity/source/drivers/macab') diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx index a17bda266458..5b151575351d 100644 --- a/connectivity/source/drivers/macab/macabutilities.hxx +++ b/connectivity/source/drivers/macab/macabutilities.hxx @@ -102,7 +102,7 @@ namespace connectivity /* Get the length, and make sure that there is actually a string * here. */ - if(_originalLabel.indexOf("_$!<") == 0) + if(_originalLabel.startsWith("_$!<")) { return _originalLabel.copy(4,_originalLabel.getLength()-8); } -- cgit