diff options
Diffstat (limited to 'src/tools/moc/preprocessor.h')
| -rw-r--r-- | src/tools/moc/preprocessor.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h index 84186fec9e..3509e83dce 100644 --- a/src/tools/moc/preprocessor.h +++ b/src/tools/moc/preprocessor.h @@ -20,11 +20,7 @@ struct Macro Symbols symbols; }; -#ifdef USE_LEXEM_STORE -typedef QByteArray MacroName; -#else typedef SubArray MacroName; -#endif typedef QHash<MacroName, Macro> Macros; class QFile; @@ -48,8 +44,9 @@ public: void substituteUntilNewline(Symbols &substituted); static Symbols macroExpandIdentifier(Preprocessor *that, SymbolStack &symbols, int lineNum, QByteArray *macroName); - static void macroExpand(Symbols *into, Preprocessor *that, const Symbols &toExpand, int &index, int lineNum, bool one, - const QSet<QByteArray> &excludeSymbols = QSet<QByteArray>()); + static void macroExpand(Symbols *into, Preprocessor *that, const Symbols &toExpand, + qsizetype &index, int lineNum, bool one, + const QSet<QByteArray> &excludeSymbols = QSet<QByteArray>()); int evaluateCondition(); |