summaryrefslogtreecommitdiffstats
path: root/src/moc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-06-17 17:28:28 -0500
committerTimothy Pearson <[email protected]>2012-06-17 17:28:28 -0500
commit6dec101d43dcbd4195c47d54bd388db1a8d7230e (patch)
tree7c336cbed3a93807a34cd4df39b2f92a7d48a141 /src/moc
parentf27c2533f735d53c6b555f387c6390c0690cc246 (diff)
downloadtqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.tar.gz
tqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.zip
Automated update from Qt3
Diffstat (limited to 'src/moc')
-rw-r--r--src/moc/moc.y12
-rw-r--r--src/moc/moc_yacc.cpp12
2 files changed, 12 insertions, 12 deletions
diff --git a/src/moc/moc.y b/src/moc/moc.y
index 0026ef2ce..afbf3988d 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -288,8 +288,8 @@ static const char* const type_map[ntypes] =
"TQBitArray",
"TQKeySequence",
"TQPen",
- "Q_LLONG",
- "Q_ULLONG"
+ "TQ_LLONG",
+ "TQ_ULLONG"
};
int qvariant_nameToType( const char* name )
@@ -478,9 +478,9 @@ struct Property
} else if ( type == "TQValueList" ) {
type = "TQValueList<TQVariant>";
} else if ( type == "LongLong" ) {
- type = "Q_LLONG";
+ type = "TQ_LLONG";
} else if ( type == "ULongLong" ) {
- type = "Q_ULLONG";
+ type = "TQ_ULLONG";
}
}
@@ -3417,9 +3417,9 @@ void generateClass() // generate C++ source code for a class
fprintf( out, "v->asMap()" );
else if ( type == "TQValueList<TQVariant>" )
fprintf( out, "v->asList()" );
- else if ( type == "Q_LLONG" )
+ else if ( type == "TQ_LLONG" )
fprintf( out, "v->asLongLong()" );
- else if ( type == "Q_ULLONG" )
+ else if ( type == "TQ_ULLONG" )
fprintf( out, "v->asULongLong()" );
else if ( isVariantType( type ) ) {
if (( type[0] == 'T' ) && ( type[1] == 'Q' ))
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index d7f661fea..46a5cfe28 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -303,8 +303,8 @@ static const char* const type_map[ntypes] =
"TQBitArray",
"TQKeySequence",
"TQPen",
- "Q_LLONG",
- "Q_ULLONG"
+ "TQ_LLONG",
+ "TQ_ULLONG"
};
int qvariant_nameToType( const char* name )
@@ -493,9 +493,9 @@ struct Property
} else if ( type == "TQValueList" ) {
type = "TQValueList<TQVariant>";
} else if ( type == "LongLong" ) {
- type = "Q_LLONG";
+ type = "TQ_LLONG";
} else if ( type == "ULongLong" ) {
- type = "Q_ULLONG";
+ type = "TQ_ULLONG";
}
}
@@ -6243,9 +6243,9 @@ void generateClass() // generate C++ source code for a class
fprintf( out, "v->asMap()" );
else if ( type == "TQValueList<TQVariant>" )
fprintf( out, "v->asList()" );
- else if ( type == "Q_LLONG" )
+ else if ( type == "TQ_LLONG" )
fprintf( out, "v->asLongLong()" );
- else if ( type == "Q_ULLONG" )
+ else if ( type == "TQ_ULLONG" )
fprintf( out, "v->asULongLong()" );
else if ( isVariantType( type ) ) {
if (( type[0] == 'T' ) && ( type[1] == 'Q' ))