fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-10-26 08:20 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* contrib/hbqt/generator/hbqtgen.prg
    ! Fixed to honor Przemek's changes pertaining "
      LONG is 64bit integer and HB_LONG is declared as LONG not LONGLONG
This commit is contained in:
Pritpal Bedi
2009-10-26 15:22:06 +00:00
parent 07671ae2f3
commit 05a8736097
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -17,6 +17,11 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-10-26 08:20 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/generator/hbqtgen.prg
! Fixed to honor Przemek's changes pertaining "
LONG is 64bit integer and HB_LONG is declared as LONG not LONGLONG
2009-10-26 15:29 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbqt/qtcore/QLocale.cpp
* harbour/contrib/hbqt/qtcore/QByteArray.cpp

16
harbour/contrib/hbqt/generator/hbqtgen.prg
View File

@@ -780,6 +780,15 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
ENDIF
aA[ PRT_DOC ] := 'n' + cDocNM
CASE aA[ PRT_CAST ] $ "qlonglong,qulonglong"
s := '( ' + aA[ PRT_CAST ] + ' ) hb_parnint( ' + cHBIdx + ' )'
IF !empty( aA[ PRT_DEFAULT ] ) .AND. !( aA[ PRT_DEFAULT ] == "0" )
aA[ PRT_BODY ] := '( HB_ISNUM( ' + cHBIdx + ' ) ? ' + s + ' : ' + aA[ PRT_DEFAULT ] + ' )'
ELSE
aA[ PRT_BODY ] := s
ENDIF
aA[ PRT_DOC ] := 'n' + cDocNM
CASE aA[ PRT_CAST ] $ cIntLongLong
s := 'hb_parnint( ' + cHBIdx + ' )'
IF !empty( aA[ PRT_DEFAULT ] ) .AND. !( aA[ PRT_DEFAULT ] == "0" )
@@ -947,27 +956,20 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
cPrgRet := 'p' + cDocNM
CASE aA[ PRT_L_AND ] .AND. aA[ PRT_L_CONST ]
// cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
// cCmd := 'hb_retptrGC( hbqt_pToGCPointer( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) ) )'
cCmd := Get_Command( aA[ PRT_CAST ], cCmn )
cPrgRet := 'p' + cDocNM
CASE aA[ PRT_L_CONST ]
// cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
// cCmd := 'hb_retptrGC( hbqt_pToGCPointer( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) ) )'
cCmd := Get_Command( aA[ PRT_CAST ], cCmn )
cPrgRet := 'p' + cDocNM
CASE aA[ PRT_L_AND ]
// cCmd := 'hb_retptr( ( ' + aA[ PRT_CAST ] + '* ) ' + cCmn + ' )'
cCmd := Get_Command( aA[ PRT_CAST ], cCmn )
cPrgRet := 'p' + cDocNM
OTHERWISE
/* No attribute is attached to return value */
IF left( aA[ PRT_CAST ], 1 ) == 'Q'
// cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
// cCmd := 'hb_retptrGC( hbqt_pToGCPointer( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) ) )'
cCmd := Get_Command( aA[ PRT_CAST ], cCmn )
cPrgRet := 'p' + cDocNM