From 6c7c333128e8e774da8c0d0d5014b2d70fe04fcf Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 18 Sep 2009 11:07:05 +0200
Subject: [PATCH] Cleanup
---
src/libs/cplusplus/MatchingText.cpp | 37 +++++++++++++----------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp
index 1ee368860d5..8023449eee2 100644
--- a/src/libs/cplusplus/MatchingText.cpp
+++ b/src/libs/cplusplus/MatchingText.cpp
@@ -40,12 +40,13 @@ enum { MAX_NUM_LINES = 20 };
static bool maybeOverrideChar(const QChar &ch)
{
- if (ch == QLatin1Char(')')) return true;
- else if (ch == QLatin1Char(']')) return true;
- else if (ch == QLatin1Char(';')) return true;
- else if (ch == QLatin1Char('"')) return true;
- else if (ch == QLatin1Char('\'')) return true;
- else return false;
+ switch (ch.unicode()) {
+ case ')': case ']': case ';': case '"': case '\'':
+ return true;
+
+ default:
+ return false;
+ }
}
static bool isCompleteStringLiteral(const BackwardsScanner &tk, int index, int startToken)
@@ -76,22 +77,18 @@ static bool isCompleteCharLiteral(const BackwardsScanner &tk, int index, int sta
static bool shouldInsertMatchingText(const QChar &lookAhead)
{
- if (lookAhead.isSpace())
- return true;
- else if (lookAhead == QLatin1Char('{'))
- return true;
- else if (lookAhead == QLatin1Char('}'))
- return true;
- else if (lookAhead == QLatin1Char(']'))
- return true;
- else if (lookAhead == QLatin1Char(')'))
- return true;
- else if (lookAhead == QLatin1Char(';'))
- return true;
- else if (lookAhead == QLatin1Char(','))
+ switch (lookAhead.unicode()) {
+ case '{': case '}':
+ case ']': case ')':
+ case ';': case ',':
return true;
- return false;
+ default:
+ if (lookAhead.isSpace())
+ return true;
+
+ return false;
+ } // switch
}
MatchingText::MatchingText()
--
GitLab