summaryrefslogtreecommitdiffstats
path: root/src/tools/moc/preprocessor.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-09-08 21:44:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-25 00:08:16 +0200
commit38f1b4eeaeb013983126c155a9b25e08074c41f7 (patch)
tree4024eaa4f63de0a437f87c87afa7cb03f45825d0 /src/tools/moc/preprocessor.h
parent34a3b63dc7d3b09342647537d378f5a55d0c81f0 (diff)
Correctly parse function macros
Parse function macros and add it's list of arguments to the Macro definition. Change-Id: Id22f5cf4a1c098f7b4f5b72f002900cd40d03e0f Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/tools/moc/preprocessor.h')
-rw-r--r--src/tools/moc/preprocessor.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h
index 70121c2102..518ead8b41 100644
--- a/src/tools/moc/preprocessor.h
+++ b/src/tools/moc/preprocessor.h
@@ -51,6 +51,9 @@ QT_BEGIN_NAMESPACE
struct Macro
{
+ bool isFunction;
+ bool isVariadic;
+ Symbols arguments;
Symbols symbols;
};
@@ -75,6 +78,7 @@ public:
Symbols preprocessed(const QByteArray &filename, FILE *file);
Symbols preprocessed(const QByteArray &filename, QIODevice *device);
+ void parseDefineArguments(Macro *m);
void skipUntilEndif();
bool skipBranch();