summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorAlbert Astals Cid <albert.astals.cid@kdab.com>2018-01-10 14:43:49 +0100
committerAlbert Astals Cid <albert.astals.cid@kdab.com>2018-01-15 10:11:31 +0000
commit537af273026eaf0a18d2151ad6928b7797d7955b (patch)
tree09a3a38c18c1b219e4d5ca12372eb544000942cd /src/tools
parentd1f2208eec96a0f0f3ee12b5c65ff64e94647deb (diff)
Simplify ifs since PP_WHITESPACE and WHITESPACE are the same
Change-Id: Ib18c60270d9275840db051f1eec86227cc8f6c1c Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/moc/preprocessor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp
index a6725af924..e83125925d 100644
--- a/src/tools/moc/preprocessor.cpp
+++ b/src/tools/moc/preprocessor.cpp
@@ -1131,14 +1131,14 @@ void Preprocessor::preprocess(const QByteArray &filename, Symbols &preprocessed)
Token lastToken = HASH; // skip shitespace at the beginning
for (int i = start; i < index - 1; ++i) {
Token token = symbols.at(i).token;
- if (token == PP_WHITESPACE || token == WHITESPACE) {
+ if (token == WHITESPACE) {
if (lastToken == PP_HASH || lastToken == HASH ||
lastToken == PP_HASHHASH ||
- lastToken == PP_WHITESPACE || lastToken == WHITESPACE)
+ lastToken == WHITESPACE)
continue;
} else if (token == PP_HASHHASH) {
if (!macro.symbols.isEmpty() &&
- (lastToken == PP_WHITESPACE || lastToken == WHITESPACE))
+ lastToken == WHITESPACE)
macro.symbols.pop_back();
}
macro.symbols.append(symbols.at(i));