summaryrefslogtreecommitdiffstats
path: root/src/moc/moc_yacc.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-10-20 20:01:48 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-10-20 20:01:48 -0500
commit7608f0043b6dfc0b1adcaa8912793e1d3fe7b636 (patch)
tree7ffddfefaf990c9a33ee6a0f317b9133dc58305c /src/moc/moc_yacc.cpp
parentedec8306fb4f7dab5e6b0f368e889581f38ea3bc (diff)
downloadtqt3-7608f0043b6dfc0b1adcaa8912793e1d3fe7b636.tar.gz
tqt3-7608f0043b6dfc0b1adcaa8912793e1d3fe7b636.zip
Automated update from Qt3
Diffstat (limited to 'src/moc/moc_yacc.cpp')
-rw-r--r--src/moc/moc_yacc.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index 46a5cfe28..57ee1e861 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -481,7 +481,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
@@ -596,7 +596,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
@@ -605,8 +605,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
};
@@ -652,9 +652,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
@@ -772,11 +772,11 @@ extern "C" int hack_isatty( int )
SIGNALS = 298,
SLOTS = 299,
TQ_OBJECT = 300,
- Q_PROPERTY = 301,
- Q_OVERRIDE = 302,
- Q_CLASSINFO = 303,
- Q_ENUMS = 304,
- Q_SETS = 305,
+ TQ_PROPERTY = 301,
+ TQ_OVERRIDE = 302,
+ TQ_CLASSINFO = 303,
+ TQ_ENUMS = 304,
+ TQ_SETS = 305,
READ = 306,
WRITE = 307,
STORED = 308,
@@ -829,11 +829,11 @@ extern "C" int hack_isatty( int )
#define SIGNALS 298
#define SLOTS 299
#define TQ_OBJECT 300
-#define Q_PROPERTY 301
-#define Q_OVERRIDE 302
-#define Q_CLASSINFO 303
-#define Q_ENUMS 304
-#define Q_SETS 305
+#define TQ_PROPERTY 301
+#define TQ_OVERRIDE 302
+#define TQ_CLASSINFO 303
+#define TQ_ENUMS 304
+#define TQ_SETS 305
#define READ 306
#define WRITE 307
#define STORED 308
@@ -1334,7 +1334,7 @@ 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",
- "Q_PROPERTY", "Q_OVERRIDE", "Q_CLASSINFO", "Q_ENUMS", "Q_SETS", "READ",
+ "TQ_PROPERTY", "TQ_OVERRIDE", "TQ_CLASSINFO", "TQ_ENUMS", "TQ_SETS", "READ",
"WRITE", "STORED", "DESIGNABLE", "SCRIPTABLE", "RESET", "'{'", "'}'",
"'='", "';'", "'<'", "'>'", "','", "'['", "']'", "'('", "')'", "'*'",
"'&'", "':'", "'+'", "'-'", "'/'", "'%'", "'^'", "'|'", "'~'", "'!'",
@@ -3639,7 +3639,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 1277 "moc.y"
{
- Q_PROPERTYdetected = TRUE;
+ TQ_PROPERTYdetected = TRUE;
BEGIN tmpYYStart;
}
break;
@@ -3656,7 +3656,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 1283 "moc.y"
{
- Q_PROPERTYdetected = TRUE;
+ TQ_PROPERTYdetected = TRUE;
BEGIN tmpYYStart;
}
break;
@@ -3673,7 +3673,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 1293 "moc.y"
- { if ( tmpAccess == Public && Q_PROPERTYdetected )
+ { if ( tmpAccess == Public && TQ_PROPERTYdetected )
BEGIN QT_DEF;
else
BEGIN IN_CLASS;
@@ -4129,7 +4129,7 @@ yyreduce:
if ( g->propRead.isEmpty() && !g->propOverride )
moc_err( "A property must at least feature a read method." );
checkPropertyName( (yyvsp[(2) - (4)].string) );
- Q_PROPERTYdetected = TRUE;
+ TQ_PROPERTYdetected = TRUE;
// Avoid duplicates
for( TQPtrListIterator<Property> lit( g->props ); lit.current(); ++lit ) {
if ( lit.current()->name == (yyvsp[(2) - (4)].string) ) {
@@ -4845,7 +4845,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();
@@ -5381,7 +5381,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 )
@@ -5497,7 +5497,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 )
@@ -6370,7 +6370,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 );