From e7ebd069e38b3c72088a0467cc3bd6c01fb56e00 Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 7 Feb 2017 12:25:08 +0000 Subject: [PATCH] tidied up String::replaceFirstOccurrenceOf() method --- modules/juce_core/text/juce_String.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/juce_core/text/juce_String.cpp b/modules/juce_core/text/juce_String.cpp index e281ee6673..712097a4fd 100644 --- a/modules/juce_core/text/juce_String.cpp +++ b/modules/juce_core/text/juce_String.cpp @@ -1328,12 +1328,11 @@ String String::replace (StringRef stringToReplace, StringRef stringToInsert, con String String::replaceFirstOccurrenceOf (StringRef stringToReplace, StringRef stringToInsert, const bool ignoreCase) const { const int stringToReplaceLen = stringToReplace.length(); + const int index = ignoreCase ? indexOfIgnoreCase (stringToReplace) + : indexOf (stringToReplace); - int i = 0; - - if ((i = (ignoreCase ? indexOfIgnoreCase (stringToReplace) - : indexOf (stringToReplace))) >= 0) - return replaceSection (i, stringToReplaceLen, stringToInsert); + if (index >= 0) + return replaceSection (index, stringToReplaceLen, stringToInsert); return *this; }