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

2010-12-21 00:15 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/hbqt_hbmk2_plugin.hbs
    ! Modified: hbQT class framework where any method which was 
      returning NIL ( void ) now returns reference to SELF.
      This means code like:
         oWidget:setTitle( "blah..." )
         oWidget:setIcon( "this..." )
      can be written as:
         oWidget:setTitle( "blah..." ):setIcon( "this..." )

      After long I updated my sources. A lot has been changed.
      The above change needes hbQT to be rebuild but I cannot 
      figure-out how to tweak it. I had to clean build Harbour
      to get above changes into effect.
This commit is contained in:
Pritpal Bedi
2010-12-21 08:23:55 +00:00
parent 870f3d3faf
commit 92baba1433
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -16,6 +16,21 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-12-21 00:15 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/hbqt_hbmk2_plugin.hbs
! Modified: hbQT class framework where any method which was
returning NIL ( void ) now returns reference to SELF.
This means code like:
oWidget:setTitle( "blah..." )
oWidget:setIcon( "this..." )
can be written as:
oWidget:setTitle( "blah..." ):setIcon( "this..." )
After long I updated my sources. A lot has been changed.
The above change needes hbQT to be rebuild but I cannot
figure-out how to tweak it. I had to clean build Harbour
to get above changes into effect.
2010-12-21 01:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbcurl/hbcurl.c
! HB_CURLOPT_SSL_VERIFYHOST option fixed to accept numeric

25
harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs
View File

@@ -1885,6 +1885,7 @@ STATIC FUNCTION hbide_pullSameMethods( cFun, aMethods, cQtObject )
STATIC PROCEDURE hbide_addReturnMethod( txt_, oM, cQtObject, nInd, nCount, lClubbed, lInIf, nTySame, nArgToCheck )
LOCAL cFun, sp := space( nInd )
LOCAL cRetCast := oM:oRet:cCast
LOCAL cRetCastT := trim( cRetCast )
LOCAL cPostFix := ""
LOCAL cPreFix
@@ -1934,10 +1935,18 @@ STATIC PROCEDURE hbide_addReturnMethod( txt_, oM, cQtObject, nInd, nCount, lClub
ENDIF
IF nTySame > 1
aadd( txt_, sp + "CASE " + hbide_getCase( oM, nArgToCheck ) )
aadd( txt_, sp + " " + cPrefix + "RETURN " + cFun + cPostFix )
IF cRetCastT == "void"
aadd( txt_, sp + " " + cPrefix + cFun + " ; " + "RETURN Self" + cPostFix )
ELSE
aadd( txt_, sp + " " + cPrefix + "RETURN " + cFun + cPostFix )
ENDIF
ELSE
aadd( txt_, sp + "IF __objGetClsName( hb_pvalue( " + hb_ntos( oM:nArgQCast ) + " ) ) == " + '"' + upper( oM:hArgs[ oM:nArgQCast ]:cCast ) + '"' )
aadd( txt_, sp + " " + cPrefix + "RETURN " + cFun + cPostFix )
IF cRetCastT == "void"
aadd( txt_, sp + " " + cPrefix + cFun + " ; " + "RETURN Self" + cPostFix )
ELSE
aadd( txt_, sp + " " + cPrefix + "RETURN " + cFun + cPostFix )
ENDIF
aadd( txt_, sp + "ENDIF" )
ENDIF
IF nTySame > 1 .AND. nCount == nTySame
@@ -1949,9 +1958,17 @@ STATIC PROCEDURE hbide_addReturnMethod( txt_, oM, cQtObject, nInd, nCount, lClub
// HB_TRACE( HB_TR_DEBUG, "// RETURN " + cFun + cPostFix ) /* needed to refine the engine further */
ELSE
IF "..." $ cFun
aadd( txt_, sp + cPrefix + "RETURN " + cFun + cPostFix )
IF cRetCastT == "void"
aadd( txt_, sp + cPrefix + cFun + " ; " + "RETURN Self" + cPostFix )
ELSE
aadd( txt_, sp + cPrefix + "RETURN " + cFun + cPostFix )
ENDIF
ELSE
aadd( txt_, sp + "RETURN " + cFun + cPostFix )
IF cRetCastT == "void"
aadd( txt_, sp + cFun + " ; " + "RETURN Self" + cPostFix )
ELSE
aadd( txt_, sp + "RETURN " + cFun + cPostFix )
ENDIF
ENDIF
ENDIF
ENDIF