From 40bab3e66ee2630458ca3d5fab20a94351308849 Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 30 Apr 2018 07:57:13 +1000 Subject: Backport: Feature [feature-requests:#1215]. Simplify RESearch::ChSetWithCase. Backport of changeset 6759:a4ec3a347298. --- src/RESearch.cxx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/RESearch.cxx b/src/RESearch.cxx index 85a7171f4..6d558281b 100644 --- a/src/RESearch.cxx +++ b/src/RESearch.cxx @@ -290,17 +290,12 @@ void RESearch::ChSet(unsigned char c) { } void RESearch::ChSetWithCase(unsigned char c, bool caseSensitive) { - if (caseSensitive) { - ChSet(c); - } else { + ChSet(c); + if (!caseSensitive) { if ((c >= 'a') && (c <= 'z')) { - ChSet(c); - ChSet(static_cast(c - 'a' + 'A')); + ChSet(c - 'a' + 'A'); } else if ((c >= 'A') && (c <= 'Z')) { - ChSet(c); - ChSet(static_cast(c - 'A' + 'a')); - } else { - ChSet(c); + ChSet(c - 'A' + 'a'); } } } -- cgit v1.2.3