diff options
| author | Darrell Anderson <[email protected]> | 2012-06-18 00:09:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-06-18 00:09:52 -0500 |
| commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
| tree | b910be3588cb706defc00c31aefa850bb2312784 /src/moc/moc.y | |
| parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/moc/moc.y')
| -rw-r--r-- | src/moc/moc.y | 12 |
1 files changed, 6 insertions, 6 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' )) |