From 3ce18541899b678028408075caaf1863c2bc3fb5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 15 Oct 2010 18:46:57 +0000 Subject: [PATCH] 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. --- harbour/ChangeLog | 13 ++++++++++++- harbour/contrib/hbqt/utils/hbqtgen.prg | 6 ++---- harbour/utils/hbmk2/hbmk2.prg | 3 +-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5b00edd6e3..c90f63d0ac 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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() diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg index 91c2f9a27a..b7f71b50b0 100644 --- a/harbour/contrib/hbqt/utils/hbqtgen.prg +++ b/harbour/contrib/hbqt/utils/hbqtgen.prg @@ -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" diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 0b8e81b454..f801f23697 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -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] */