diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2015-05-31 00:06:45 +0200 |
|---|---|---|
| committer | Milian Wolff <milian.wolff@kdab.com> | 2015-07-23 08:23:23 +0000 |
| commit | f6d5c21e3e5d96f070dfa6cd208d1920459fb501 (patch) | |
| tree | 00b8d394cbb5dcf54704825578c3f5afc89c24d6 /src/tools/moc | |
| parent | 4535c7911d47b94ecb2067793f2f6d906794e1fe (diff) | |
moc: Make toExpand const, we do not modify it.
Change-Id: I7036ea7ee9e533670ebed425e6c4a8bb0063f751
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/tools/moc')
| -rw-r--r-- | src/tools/moc/preprocessor.cpp | 2 | ||||
| -rw-r--r-- | src/tools/moc/preprocessor.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp index adba0f9b9b..d036c40f35 100644 --- a/src/tools/moc/preprocessor.cpp +++ b/src/tools/moc/preprocessor.cpp @@ -529,7 +529,7 @@ Symbols Preprocessor::tokenize(const QByteArray& input, int lineNum, Preprocesso return symbols; } -void Preprocessor::macroExpand(Symbols *into, Preprocessor *that, Symbols &toExpand, int &index, +void Preprocessor::macroExpand(Symbols *into, Preprocessor *that, const Symbols &toExpand, int &index, int lineNum, bool one, const QSet<QByteArray> &excludeSymbols) { SymbolStack symbols; diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h index 8d3bf4edbe..9c81f86f9c 100644 --- a/src/tools/moc/preprocessor.h +++ b/src/tools/moc/preprocessor.h @@ -76,7 +76,7 @@ public: void substituteUntilNewline(Symbols &substituted); static Symbols macroExpandIdentifier(Preprocessor *that, SymbolStack &symbols, int lineNum, QByteArray *macroName); - static void macroExpand(Symbols *into, Preprocessor *that, Symbols &toExpand, int &index, int lineNum, bool one, + static void macroExpand(Symbols *into, Preprocessor *that, const Symbols &toExpand, int &index, int lineNum, bool one, const QSet<QByteArray> &excludeSymbols = QSet<QByteArray>()); int evaluateCondition(); |