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

2010-10-15 20:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbqt/utils/hbqtgen.prg
    ! Fixed to pass 'uchar' where QT needs it (instead of current 'char')

    ; TOFIX: hb_parc() return value is still de-const-ed and passed 
             to QT which is 100% way to create random GPFs.
             See TOFIXes in code.

  * utils/hbmk2/hbmk2.prg
    * Formatting.
This commit is contained in:
Viktor Szakats
2010-10-15 18:46:57 +00:00
parent 168779cd29
commit 3ce1854189
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -16,6 +16,17 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-10-15 20:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/utils/hbqtgen.prg
! Fixed to pass 'uchar' where QT needs it (instead of current 'char')
; TOFIX: hb_parc() return value is still de-const-ed and passed
to QT which is 100% way to create random GPFs.
See TOFIXes in code.
* utils/hbmk2/hbmk2.prg
* Formatting.
2010-10-15 10:29 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/ideedit.prg
! Minor.
@@ -49,7 +60,7 @@
2010-10-15 09:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/qtcore/hbqt_pointer.cpp
* contrib/hbqt/qtcore/hbqtcore.hbx
+ HBQT_ISOBJECT() will return .T. is the passed object is a HBQT one.
+ HBQT_ISOBJECT() will return .T. if the passed object is a HBQT one.
* contrib/hbqt/qtcore/hbqt_misc.prg
* :isValidObject() -> :hasValidPointer()

6
harbour/contrib/hbqt/utils/hbqtgen.prg
View File

@@ -1704,14 +1704,12 @@ METHOD HbQtSource:parseProto( cProto, fBody_ )
CASE oArg:cCast == "uchar" .and. oArg:lFar .and. !( oArg:lConst )
/* TOFIX: Such code is not valid and should never be generated (const->non-const) [vszakats] */
/* TOFIX: uchar is needed by QT, char is passed [vszakats] */
oArg:cBody := "( char * ) hb_parc( " + cHBIdx + " )"
oArg:cBody := "( uchar * ) hb_parc( " + cHBIdx + " )"
oArg:cDoc := "c" + oMtd:cDocNM
oArg:cTypeHB := "C"
CASE oArg:cCast == "uchar" .and. !( oArg:lFar ) .and. !( oArg:lConst )
/* TOFIX: uchar is needed by QT, char is passed [vszakats] */
oArg:cBody := "( char ) hb_parni( " + cHBIdx + " )"
oArg:cBody := "( uchar ) hb_parni( " + cHBIdx + " )"
oArg:cDoc := "n" + oMtd:cDocNM
oArg:cTypeHB := "N"

3
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -3409,7 +3409,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
ENDIF
DO CASE
CASE _HBMODE_IS_XHB( hbmk[ _HBMK_nHBMODE ] )
/* NOTE: Newer xhb version use "-x.y.z" version numbers. */
/* NOTE: Newer xhb versions use "-x.y.z" version numbers. */
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "xharbourmt",;
"xharbour" ) }
OTHERWISE
@@ -6166,7 +6166,6 @@ STATIC PROCEDURE convert_incpaths_to_options( hbmk, cOptIncMask, lCHD_Comp )
RETURN
/* NOTE: We store -hbdyn objects in different dirs by default as - for Windows
platforms - they're always built using different compilation options
than normal targets. [vszakats] */