diff options
Diffstat (limited to 'src/moc/moc.l')
| -rw-r--r-- | src/moc/moc.l | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/moc/moc.l b/src/moc/moc.l index ea5669661..9ddce077f 100644 --- a/src/moc/moc.l +++ b/src/moc/moc.l @@ -124,7 +124,7 @@ STRING {ALMOSTSTRING}\" <OUTSIDE>"template" { X; BEGIN QT_DEF; return TEMPLATE; } -<QT_DEF>"Q_OBJECT" { X; return Q_OBJECT; } +<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; } @@ -144,11 +144,11 @@ STRING {ALMOSTSTRING}\" <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>"Q_OBJECT" { X; +<IN_CLASS>"TQ_OBJECT" { X; if ( classPLevel == 1 ) - return Q_OBJECT; + return TQ_OBJECT; else if ( classPLevel > 1 ) - moc_warn( "Cannot use Q_OBJECT in nested class." ); + 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; } |