diff options
Diffstat (limited to 'src/moc/moc.y')
| -rw-r--r-- | src/moc/moc.y | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/moc/moc.y b/src/moc/moc.y index afbf3988d..2826274ca 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -466,7 +466,7 @@ struct Property designable( d ), scriptable( sc ), override( ov ), oredEnum( -1 ) { /* - The Q_PROPERTY construct cannot contain any commas, since + The TQ_PROPERTY construct cannot contain any commas, since commas separate macro arguments. We therefore expect users to type "TQMap" instead of "TQMap<TQString, TQVariant>". For coherence, we also expect the same for @@ -581,7 +581,7 @@ class parser_reg { PropList props; // list of all properties ClassInfoList infos; // list of all class infos -// Used to store the values in the Q_PROPERTY macro +// Used to store the values in the TQ_PROPERTY macro TQCString propWrite; // set function TQCString propRead; // get function TQCString propReset; // reset function @@ -590,8 +590,8 @@ class parser_reg { TQCString propScriptable; // "true", "false" or function or empty if not specified bool propOverride; // Wether OVERRIDE was detected - TQStrList qtEnums; // Used to store the contents of Q_ENUMS - TQStrList qtSets; // Used to store the contents of Q_SETS + TQStrList qtEnums; // Used to store the contents of TQ_ENUMS + TQStrList qtSets; // Used to store the contents of TQ_SETS }; @@ -637,9 +637,9 @@ Access subClassPerm; // current access permission bool TQ_OBJECTdetected; // TRUE if current class // contains the TQ_OBJECT macro -bool Q_PROPERTYdetected; // TRUE if current class - // contains at least one Q_PROPERTY, - // Q_OVERRIDE, Q_SETS or Q_ENUMS macro +bool TQ_PROPERTYdetected; // TRUE if current class + // contains at least one TQ_PROPERTY, + // TQ_OVERRIDE, TQ_SETS or TQ_ENUMS macro bool tmpPropOverride; // current property override setting int tmpYYStart; // Used to store the lexers current mode @@ -747,11 +747,11 @@ extern "C" int hack_isatty( int ) %token SIGNALS %token SLOTS %token TQ_OBJECT -%token Q_PROPERTY -%token Q_OVERRIDE -%token Q_CLASSINFO -%token Q_ENUMS -%token Q_SETS +%token TQ_PROPERTY +%token TQ_OVERRIDE +%token TQ_CLASSINFO +%token TQ_ENUMS +%token TQ_SETS %token READ %token WRITE @@ -1252,36 +1252,36 @@ obj_member_area: qt_access_specifier { BEGIN QT_DEF; } " access permission to \"private\"."); TQ_OBJECTdetected = TRUE; } - | Q_PROPERTY { tmpYYStart = YY_START; + | TQ_PROPERTY { tmpYYStart = YY_START; tmpPropOverride = FALSE; BEGIN IN_PROPERTY; } '(' property ')' { BEGIN tmpYYStart; } opt_property_candidates - | Q_OVERRIDE { tmpYYStart = YY_START; + | TQ_OVERRIDE { tmpYYStart = YY_START; tmpPropOverride = TRUE; BEGIN IN_PROPERTY; } '(' property ')' { BEGIN tmpYYStart; } opt_property_candidates - | Q_CLASSINFO { tmpYYStart = YY_START; BEGIN IN_CLASSINFO; } + | TQ_CLASSINFO { tmpYYStart = YY_START; BEGIN IN_CLASSINFO; } '(' STRING ',' STRING ')' { g->infos.append( new ClassInfo( $4, $6 ) ); BEGIN tmpYYStart; } opt_property_candidates - | Q_ENUMS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; } + | TQ_ENUMS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; } '(' qt_enums ')' { - Q_PROPERTYdetected = TRUE; + TQ_PROPERTYdetected = TRUE; BEGIN tmpYYStart; } opt_property_candidates - | Q_SETS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; } + | TQ_SETS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; } '(' qt_sets ')' { - Q_PROPERTYdetected = TRUE; + TQ_PROPERTYdetected = TRUE; BEGIN tmpYYStart; } opt_property_candidates @@ -1290,7 +1290,7 @@ obj_member_area: qt_access_specifier { BEGIN QT_DEF; } slot_area: SIGNALS ':' { moc_err( "Signals cannot " "have access specifiers" ); } | SLOTS ':' opt_slot_declarations - | ':' { if ( tmpAccess == Public && Q_PROPERTYdetected ) + | ':' { if ( tmpAccess == Public && TQ_PROPERTYdetected ) BEGIN QT_DEF; else BEGIN IN_CLASS; @@ -1572,7 +1572,7 @@ property: IDENTIFIER IDENTIFIER if ( g->propRead.isEmpty() && !g->propOverride ) moc_err( "A property must at least feature a read method." ); checkPropertyName( $2 ); - Q_PROPERTYdetected = TRUE; + TQ_PROPERTYdetected = TRUE; // Avoid duplicates for( TQPtrListIterator<Property> lit( g->props ); lit.current(); ++lit ) { if ( lit.current()->name == $2 ) { @@ -2019,7 +2019,7 @@ void initClass() // prepare for new class tmpAccess = Private; subClassPerm = Private; TQ_OBJECTdetected = FALSE; - Q_PROPERTYdetected = FALSE; + TQ_PROPERTYdetected = FALSE; skipClass = FALSE; templateClass = FALSE; g->slots.clear(); @@ -2555,7 +2555,7 @@ int generateProps() if ( p->getfunc == 0 ) { if ( displayWarnings ) { - // Is the type a set, that means, mentioned in Q_SETS? + // Is the type a set, that means, mentioned in TQ_SETS? bool set = FALSE; for( TQPtrListIterator<Enum> lit( g->enums ); lit.current(); ++lit ) if ( lit.current()->name == p->type && lit.current()->set ) @@ -2671,7 +2671,7 @@ int generateProps() if ( p->setfunc == 0 ) { if ( displayWarnings ) { - // Is the type a set, that means, mentioned in Q_SETS ? + // Is the type a set, that means, mentioned in TQ_SETS ? bool set = FALSE; for( TQPtrListIterator<Enum> lit( g->enums ); lit.current(); ++lit ) if ( lit.current()->name == p->type && lit.current()->set ) @@ -3544,7 +3544,7 @@ void addEnum() } } - // Only look at types mentioned in Q_ENUMS and Q_SETS + // Only look at types mentioned in TQ_ENUMS and TQ_SETS if ( g->qtEnums.contains( tmpEnum->name ) || g->qtSets.contains( tmpEnum->name ) ) { g->enums.append( tmpEnum ); |