diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-26 20:58:15 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-26 20:58:15 -0500 |
| commit | 68fd119104cf123043eb7ee573de638cc159f743 (patch) | |
| tree | 6e2944b4a19988514a37a13ef03524b9b1e0b6fe /src/moc/moc_yacc.cpp | |
| parent | 6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d (diff) | |
| parent | 970116b129a0dfd4ac8e90f1788ad7e81e3f6d71 (diff) | |
| download | tqt3-68fd119104cf123043eb7ee573de638cc159f743.tar.gz tqt3-68fd119104cf123043eb7ee573de638cc159f743.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/moc/moc_yacc.cpp')
| -rw-r--r-- | src/moc/moc_yacc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index 57ee1e861..83caffeb9 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -1334,11 +1334,11 @@ static const char *const yytname[] = "ENUM", "CLASS", "STRUCT", "UNION", "ASM", "PRIVATE", "PROTECTED", "PUBLIC", "OPERATOR", "DBL_COLON", "TRIPLE_DOT", "TEMPLATE", "NAMESPACE", "USING", "MUTABLE", "THROW", "SIGNALS", "SLOTS", "TQ_OBJECT", - "TQ_PROPERTY", "TQ_OVERRIDE", "TQ_CLASSINFO", "TQ_ENUMS", "TQ_SETS", "READ", - "WRITE", "STORED", "DESIGNABLE", "SCRIPTABLE", "RESET", "'{'", "'}'", - "'='", "';'", "'<'", "'>'", "','", "'['", "']'", "'('", "')'", "'*'", - "'&'", "':'", "'+'", "'-'", "'/'", "'%'", "'^'", "'|'", "'~'", "'!'", - "$accept", "declaration_seq", "declaration", "namespace_def", + "TQ_PROPERTY", "TQ_OVERRIDE", "TQ_CLASSINFO", "TQ_ENUMS", "TQ_SETS", + "READ", "WRITE", "STORED", "DESIGNABLE", "SCRIPTABLE", "RESET", "'{'", + "'}'", "'='", "';'", "'<'", "'>'", "','", "'['", "']'", "'('", "')'", + "'*'", "'&'", "':'", "'+'", "'-'", "'/'", "'%'", "'^'", "'|'", "'~'", + "'!'", "$accept", "declaration_seq", "declaration", "namespace_def", "named_namespace_def", "$@1", "$@2", "unnamed_namespace_def", "$@3", "$@4", "namespace_body", "namespace_alias_def", "using_directive", "using_declaration", "class_def", "$@5", "class_name", |