diff options
Diffstat (limited to 'src/tools/moc/preprocessor.h')
| -rw-r--r-- | src/tools/moc/preprocessor.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h index 0c099318db..df5d28f473 100644 --- a/src/tools/moc/preprocessor.h +++ b/src/tools/moc/preprocessor.h @@ -64,7 +64,6 @@ typedef QByteArray MacroName; typedef SubArray MacroName; #endif typedef QHash<MacroName, Macro> Macros; -typedef QVector<MacroName> MacroSafeSet; class QIODevice; @@ -84,10 +83,9 @@ public: void skipUntilEndif(); bool skipBranch(); - void substituteMacro(const MacroName ¯o, Symbols &substituted, MacroSafeSet safeset = MacroSafeSet()); - void substituteUntilNewline(Symbols &substituted, MacroSafeSet safeset = MacroSafeSet()); - void macroExpandIdentifier(int lineNum, Symbols &preprocessed, MacroSafeSet safeset = MacroSafeSet()); - void macroExpandSymbols(int lineNum, const Symbols &symbols, Symbols &expanded, MacroSafeSet safeset); + void substituteUntilNewline(Symbols &substituted); + static Symbols macroExpandIdentifier(Preprocessor *that, SymbolStack &symbols, int lineNum, QByteArray *macroName); + static Symbols macroExpand(Preprocessor *that, Symbols &toExpand, int &index, int lineNum, bool one); int evaluateCondition(); |