diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-10-20 20:01:48 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-10-20 20:01:48 -0500 |
| commit | 7608f0043b6dfc0b1adcaa8912793e1d3fe7b636 (patch) | |
| tree | 7ffddfefaf990c9a33ee6a0f317b9133dc58305c /src/moc/moc.l | |
| parent | edec8306fb4f7dab5e6b0f368e889581f38ea3bc (diff) | |
| download | tqt3-7608f0043b6dfc0b1adcaa8912793e1d3fe7b636.tar.gz tqt3-7608f0043b6dfc0b1adcaa8912793e1d3fe7b636.zip | |
Automated update from Qt3
Diffstat (limited to 'src/moc/moc.l')
| -rw-r--r-- | src/moc/moc.l | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/moc/moc.l b/src/moc/moc.l index a917b03e3..868f9c0a6 100644 --- a/src/moc/moc.l +++ b/src/moc/moc.l @@ -127,11 +127,11 @@ STRING {ALMOSTSTRING}\" <QT_DEF>"TQ_OBJECT" { X; return TQ_OBJECT; } <QT_DEF>"signals" { X; return SIGNALS; } <QT_DEF>"slots" { X; return SLOTS; } -<QT_DEF>"Q_CLASSINFO" { X; return Q_CLASSINFO; } -<QT_DEF>"Q_PROPERTY" { X; return Q_PROPERTY; } -<QT_DEF>"Q_OVERRIDE" { X; return Q_OVERRIDE; } -<QT_DEF>"Q_ENUMS" { X; return Q_ENUMS; } -<QT_DEF>"Q_SETS" { X; return Q_SETS; } +<QT_DEF>"TQ_CLASSINFO" { X; return TQ_CLASSINFO; } +<QT_DEF>"TQ_PROPERTY" { X; return TQ_PROPERTY; } +<QT_DEF>"TQ_OVERRIDE" { X; return TQ_OVERRIDE; } +<QT_DEF>"TQ_ENUMS" { X; return TQ_ENUMS; } +<QT_DEF>"TQ_SETS" { X; return TQ_SETS; } <IN_FCT>"{" { fctLevel++;Y; } <IN_FCT>"}" { fctLevel--;Y;if (fctLevel==0){X;return '}';}} @@ -143,17 +143,17 @@ STRING {ALMOSTSTRING}\" <IN_CLASS>"private" { X;if( classPLevel == 1 ) return PRIVATE; } <IN_CLASS>"signals" { X;if( classPLevel == 1 ) return SIGNALS; } <IN_CLASS>"slots" { X;if( classPLevel == 1 ) return SLOTS; } -<IN_CLASS>"Q_CLASSINFO" { X;if( classPLevel == 1 ) return Q_CLASSINFO; } +<IN_CLASS>"TQ_CLASSINFO" { X;if( classPLevel == 1 ) return TQ_CLASSINFO; } <IN_CLASS>"TQ_OBJECT" { X; if ( classPLevel == 1 ) return TQ_OBJECT; else if ( classPLevel > 1 ) moc_warn( "Cannot use TQ_OBJECT in nested class." ); } -<IN_CLASS>"Q_PROPERTY" { X;if( classPLevel == 1 ) return Q_PROPERTY; } -<IN_CLASS>"Q_OVERRIDE" { X;if( classPLevel == 1 ) return Q_OVERRIDE; } -<IN_CLASS>"Q_ENUMS" { X;if( classPLevel == 1 ) return Q_ENUMS; } -<IN_CLASS>"Q_SETS" { X;if( classPLevel == 1 ) return Q_SETS; } +<IN_CLASS>"TQ_PROPERTY" { X;if( classPLevel == 1 ) return TQ_PROPERTY; } +<IN_CLASS>"TQ_OVERRIDE" { X;if( classPLevel == 1 ) return TQ_OVERRIDE; } +<IN_CLASS>"TQ_ENUMS" { X;if( classPLevel == 1 ) return TQ_ENUMS; } +<IN_CLASS>"TQ_SETS" { X;if( classPLevel == 1 ) return TQ_SETS; } <IN_NAMESPACE>"{" { namespacePLevel++;Y; } <IN_NAMESPACE>"}" { namespacePLevel--;Y;if (namespacePLevel == 0) |