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

2010-01-14 01:44 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/compiler/harbour.y
  * harbour/src/compiler/harbour.yyh
  * harbour/src/compiler/harbour.yyc
    ! pacified compile time error when ... is used as parameter in _HB_MEMBRER
      declaration. TODO: Remove or fix this strong typing grammar rules.

  * harbour/src/debug/dbgtwin.prg
  * harbour/src/debug/dbgtmenu.prg
  * harbour/src/debug/tbrwtext.prg
  * harbour/src/debug/debugger.prg
  * harbour/src/debug/dbgtinp.prg
  * harbour/src/rtl/tbcolumn.prg
  * harbour/src/rtl/listbox.prg
  * harbour/src/rtl/pushbtn.prg
  * harbour/src/rtl/treport.prg
  * harbour/src/rtl/radiogrp.prg
  * harbour/src/rtl/tthreadx.prg
  * harbour/src/rtl/checkbox.prg
  * harbour/src/rtl/tsymbol.prg
  * harbour/src/rtl/teditor.prg
  * harbour/src/rtl/tmenuitm.prg
  * harbour/src/rtl/tbrowse.prg
  * harbour/contrib/hbmysql/tmysql.prg
  * harbour/contrib/xhb/stream.prg
  * harbour/contrib/xhb/trpccli.prg
  * harbour/contrib/xhb/hblognet.prg
  * harbour/contrib/xhb/tfile.prg
  * harbour/contrib/xhb/tframe.prg
  * harbour/contrib/xhb/htjlist.prg
  * harbour/contrib/xhb/hblog.prg
  * harbour/contrib/xhb/trpc.prg
  * harbour/contrib/xhb/thtm.prg
  * harbour/contrib/xhb/tcgi.prg
  * harbour/contrib/xhb/ttable.prg
  * harbour/contrib/xhb/txml.prg
  * harbour/contrib/xhb/hjwindow.prg
  * harbour/contrib/xhb/htmutil.prg
  * harbour/contrib/hbodbc/todbc.prg
  * harbour/contrib/hbfbird/tfirebrd.prg
  * harbour/contrib/xpp/tthreadx.prg
  * harbour/contrib/hbpgsql/tpostgre.prg
  * harbour/contrib/hbgd/gdchart.prg
  * harbour/contrib/hbgd/gdimage.prg
  * harbour/contrib/hbgd/gdbar.prg
  * harbour/contrib/hbgd/gdbarcod.prg
  * harbour/contrib/hbmisc/twirler.prg
  * harbour/contrib/hbtip/thtml.prg
  * harbour/contrib/hbtip/cgi.prg
  * harbour/contrib/hbtip/httpcli.prg
  * harbour/contrib/hbtip/smtpcli.prg
  * harbour/contrib/hbtip/client.prg
  * harbour/contrib/hbtip/ftpcli.prg
  * harbour/contrib/hbtip/mail.prg
  * harbour/contrib/hbtip/popcli.prg
  * harbour/contrib/hbwin/win_tprn.prg
  * harbour/contrib/hbbtree/tbtree.prg
  * harbour/utils/hbformat/hbformat.prg
    ! fixed class method declarations to be synced with method implementations
      All of the above missdeclarations were detected by compilation with:
         HB_USER_PRGFLAGS=-DHB_CLS_PARAMS_ERR
      Few years ago in hbclass.ch I defined PP rules to force strict method
      declarations but I had to disable them due to problems with old PP.
      I defined HB_CLS_NO_PARAMS_ERR and left this note in hbclass.ch:
         > I have to enable this definition by default until we will not fix
         > preprocessor. [druzus]
      Current PP code works correctly so we can remove it and activate this
      code. Anyhow as above commit shows a lot of code has been created with
      wrong declarations. I fixed Harbour core code (except HBQT, HBXBP and
      GTWVG - I hope Pritpal or Viktor will fix it) but setting
      HB_CLS_PARAMS_ERR as default will exploit a lot of similar problems in
      user code so I would like the hear other developers' opinions about it.
This commit is contained in:
Przemyslaw Czerpak
2010-01-14 00:45:19 +00:00
parent aab5406bdb
commit b1d68f0a5e
56 changed files with 2233 additions and 2028 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
harbour/ChangeLog
View File

@@ -17,6 +17,79 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-14 01:44 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/compiler/harbour.y
* harbour/src/compiler/harbour.yyh
* harbour/src/compiler/harbour.yyc
! pacified compile time error when ... is used as parameter in _HB_MEMBRER
declaration. TODO: Remove or fix this strong typing grammar rules.
* harbour/src/debug/dbgtwin.prg
* harbour/src/debug/dbgtmenu.prg
* harbour/src/debug/tbrwtext.prg
* harbour/src/debug/debugger.prg
* harbour/src/debug/dbgtinp.prg
* harbour/src/rtl/tbcolumn.prg
* harbour/src/rtl/listbox.prg
* harbour/src/rtl/pushbtn.prg
* harbour/src/rtl/treport.prg
* harbour/src/rtl/radiogrp.prg
* harbour/src/rtl/tthreadx.prg
* harbour/src/rtl/checkbox.prg
* harbour/src/rtl/tsymbol.prg
* harbour/src/rtl/teditor.prg
* harbour/src/rtl/tmenuitm.prg
* harbour/src/rtl/tbrowse.prg
* harbour/contrib/hbmysql/tmysql.prg
* harbour/contrib/xhb/stream.prg
* harbour/contrib/xhb/trpccli.prg
* harbour/contrib/xhb/hblognet.prg
* harbour/contrib/xhb/tfile.prg
* harbour/contrib/xhb/tframe.prg
* harbour/contrib/xhb/htjlist.prg
* harbour/contrib/xhb/hblog.prg
* harbour/contrib/xhb/trpc.prg
* harbour/contrib/xhb/thtm.prg
* harbour/contrib/xhb/tcgi.prg
* harbour/contrib/xhb/ttable.prg
* harbour/contrib/xhb/txml.prg
* harbour/contrib/xhb/hjwindow.prg
* harbour/contrib/xhb/htmutil.prg
* harbour/contrib/hbodbc/todbc.prg
* harbour/contrib/hbfbird/tfirebrd.prg
* harbour/contrib/xpp/tthreadx.prg
* harbour/contrib/hbpgsql/tpostgre.prg
* harbour/contrib/hbgd/gdchart.prg
* harbour/contrib/hbgd/gdimage.prg
* harbour/contrib/hbgd/gdbar.prg
* harbour/contrib/hbgd/gdbarcod.prg
* harbour/contrib/hbmisc/twirler.prg
* harbour/contrib/hbtip/thtml.prg
* harbour/contrib/hbtip/cgi.prg
* harbour/contrib/hbtip/httpcli.prg
* harbour/contrib/hbtip/smtpcli.prg
* harbour/contrib/hbtip/client.prg
* harbour/contrib/hbtip/ftpcli.prg
* harbour/contrib/hbtip/mail.prg
* harbour/contrib/hbtip/popcli.prg
* harbour/contrib/hbwin/win_tprn.prg
* harbour/contrib/hbbtree/tbtree.prg
* harbour/utils/hbformat/hbformat.prg
! fixed class method declarations to be synced with method implementations
All of the above missdeclarations were detected by compilation with:
HB_USER_PRGFLAGS=-DHB_CLS_PARAMS_ERR
Few years ago in hbclass.ch I defined PP rules to force strict method
declarations but I had to disable them due to problems with old PP.
I defined HB_CLS_NO_PARAMS_ERR and left this note in hbclass.ch:
> I have to enable this definition by default until we will not fix
> preprocessor. [druzus]
Current PP code works correctly so we can remove it and activate this
code. Anyhow as above commit shows a lot of code has been created with
wrong declarations. I fixed Harbour core code (except HBQT, HBXBP and
GTWVG - I hope Pritpal or Viktor will fix it) but setting
HB_CLS_PARAMS_ERR as default will exploit a lot of similar problems in
user code so I would like the hear other developers' opinions about it.
2010-01-14 01:35 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/memoedit.prg
! Fixed to set K_ESC as lastkey() if exiting with changed

8
harbour/contrib/hbbtree/tbtree.prg
View File

@@ -58,15 +58,15 @@ CLASS TBTree STATIC
ENDCLASS
METHOD New( FileName, PageSize, KeySize, nFlags, Buffers ) CLASS TBTree
::nHandle := hb_btreenew( FileName, PageSize, KeySize, nFlags, Buffers )
METHOD New( cFileName, nPageSize, nKeySize, nFlags, nBuffers ) CLASS TBTree
::nHandle := hb_btreenew( cFileName, nPageSize, nKeySize, nFlags, nBuffers )
IF ::nHandle >= 1
RETURN SELF
ENDIF
RETURN NIL
METHOD Open( FileName, nFlags, Buffers ) CLASS TBTree
::nHandle := hb_btreeopen( FileName, nFlags, Buffers )
METHOD Open( cFileName, nFlags, nBuffers ) CLASS TBTree
::nHandle := hb_btreeopen( cFileName, nFlags, nBuffers )
IF ::nHandle >= 1
RETURN SELF
ENDIF

6
harbour/contrib/hbfbird/tfirebrd.prg
View File

@@ -468,7 +468,7 @@ CREATE CLASS TFbQuery
VAR aKeys
VAR aTables
METHOD New( db, cQuery, nDialect )
METHOD New( nDB, cQuery, nDialect )
METHOD Destroy()
METHOD Close() INLINE ::Destroy()
@@ -764,14 +764,14 @@ CREATE CLASS TFbRow
VAR dialect
VAR aTables
METHOD New( row, struct, db, dialect )
METHOD New( row, struct, nDB, nDialect, aTable )
METHOD Changed(nField)
METHOD GetTables() INLINE ::aTables
METHOD FCount() INLINE Len(::aRow)
METHOD FieldGet( nField )
METHOD FieldPut( nField, Value )
METHOD FieldName( nField )
METHOD FieldPos( cFieldName )
METHOD FieldPos( cField )
METHOD FieldLen( nField )
METHOD FieldDec( nField )
METHOD FieldType( nField )

6
harbour/contrib/hbgd/gdbar.prg
View File

@@ -105,9 +105,9 @@ CLASS TBarCode FROM GDImage
METHOD DrawError(ptext)
METHOD DrawSingleBar(pcode )
METHOD DrawSingleI25( pcode )
METHOD DrawText()
METHOD nextX()
METHOD Finish( image_style, quality )
METHOD DrawText( lIsI25 )
METHOD nextX( lI25 )
METHOD Finish( image_style, quality, nFG )
METHOD SetText( ptext )
METHOD ResetColor()
METHOD CheckCode()

4
harbour/contrib/hbgd/gdbarcod.prg
View File

@@ -66,7 +66,7 @@ CLASS TCode FROM TBarCode
DATA nType
// EAN-13 ISBN
METHOD New( nType ) CONSTRUCTOR
METHOD New( nTypeCode ) CONSTRUCTOR
METHOD Draw( cText )
METHOD Draw13( cText )
@@ -85,7 +85,7 @@ CLASS TCode FROM TBarCode
// Utils
METHOD FindCharCode( cstring, cchar )
METHOD MixCode(bar_string)
METHOD MixCode(value)
METHOD Findcode( uval )
ENDCLASS

10
harbour/contrib/hbgd/gdchart.prg
View File

@@ -72,10 +72,10 @@ CLASS GDChart FROM GDImage
METHOD New( sx, sy ) CONSTRUCTOR
METHOD AddData()
METHOD AddDef()
METHOD SetData()
METHOD SetDefs()
METHOD AddData( hData )
METHOD AddDef( cDefKey, xDefVal )
METHOD SetData( aData )
METHOD SetDefs( hDefs )
METHOD PieChart()
METHOD VerticalBarChart()
@@ -86,7 +86,7 @@ CLASS GDChart FROM GDImage
METHOD Clone()
PROTECTED:
METHOD CloneDataFrom()
METHOD CloneDataFrom( oSrc )
ENDCLASS

29
harbour/contrib/hbgd/gdimage.prg
View File

@@ -157,8 +157,9 @@ CLASS GDImage
METHOD Points() INLINE Len( ::aPoints )
METHOD Rectangle( x1, y1, x2, y2, lFilled, color )
METHOD Arc( x, y, nWidth, nHeight, nStartDegree, nEndDegree, lFilled, nColor )
METHOD Ellipse( x, y, nWidth, nHeight, lFilled, nColor )
METHOD Arc( x, y, nWidth, nHeight, nStartDegree, nEndDegree, lFilled, color, nStyle )
METHOD Ellipse( x, y, nWidth, nHeight, lFilled, color )
METHOD Circle( x, y, nRadius, lFilled, nColor ) ;
INLINE ::Ellipse( x, y, nRadius, nRadius, lFilled, nColor )
@@ -263,20 +264,20 @@ CLASS GDImage
METHOD SetInterlaceOff() INLINE gdImageInterlace( ::pImage, .F. )
/* COPY AND RESIZING FUNCTIONS */
METHOD Copy()
METHOD CopyResized()
METHOD CopyResampled()
METHOD CopyRotated()
METHOD CopyMerge()
METHOD CopyMergeGray()
METHOD Copy( nSrcX, nSrcY, nWidth, nHeight, nDstX, nDstY, oDestImage )
METHOD CopyResized( nSrcX, nSrcY, nSrcWidth, nSrcHeight, nDstX, nDstY, nDstWidth, nDstHeight, oDestImage )
METHOD CopyResampled( nSrcX, nSrcY, nSrcWidth, nSrcHeight, nDstX, nDstY, nDstWidth, nDstHeight, oDestImage )
METHOD CopyRotated( nSrcX, nSrcY, nWidth, nHeight, nDstX, nDstY, nAngle, oDestImage )
METHOD CopyMerge( nSrcX, nSrcY, nWidth, nHeight, nDstX, nDstY, nPerc, oDestImage )
METHOD CopyMergeGray( nSrcX, nSrcY, nWidth, nHeight, nDstX, nDstY, nPerc, oDestImage )
/* New implemented */
METHOD Clone()
METHOD CopyZoomed()
METHOD Crop()
METHOD Zoom()
METHOD Resize()
METHOD Rotate()
METHOD CopyZoomed( nPerc, nSrcX, nSrcY, nSrcWidth, nSrcHeight )
METHOD Crop( nX, nY, nWidth, nHeight )
METHOD Zoom( nPerc )
METHOD Resize( nWidth, nHeight )
METHOD Rotate( nAngle, lInside )
METHOD RotateInside( nAngle ) INLINE ::Rotate( nAngle, .T. )
METHOD PaletteCopy( oDestImage ) INLINE gdImagePaletteCopy( oDestImage:pImage, ::pImage )
@@ -290,7 +291,7 @@ CLASS GDImage
METHOD Version() INLINE gdVersion()
PROTECTED:
METHOD CloneDataFrom()
METHOD CloneDataFrom( oSrc )
ENDCLASS

2
harbour/contrib/hbmisc/twirler.prg
View File

@@ -18,7 +18,7 @@ class Twirler
var n_Smooth
var c_Chars
var c_Title
method new( nRow, nCol, cTitle, cChars )
method new( nRow, nCol, cTitle, cChars, nSmooth )
method twirl()
method show()
method hide()

2
harbour/contrib/hbmysql/tmysql.prg
View File

@@ -1330,7 +1330,7 @@ CREATE CLASS TMySQLServer
VAR lError // .T. if occurred an error
VAR cCreateQuery
METHOD New( cServer, cUser, cPassword ) // Opens connection to a server, returns a server object
METHOD New( cServer, cUser, cPassword, nPort ) // Opens connection to a server, returns a server object
METHOD Destroy() // Closes connection to server
METHOD SelectDB( cDBName ) // Which data base I will use for subsequent queries

2
harbour/contrib/hbodbc/todbc.prg
View File

@@ -131,7 +131,7 @@ CREATE CLASS TODBC FROM HBClass
METHOD ExecSQL()
METHOD CLOSE()
METHOD LoadData()
METHOD LoadData( nPos )
METHOD ClearData() INLINE AEval( ::Fields, {| oField | oField:Value := NIL } )
METHOD FieldByName( cField )

4
harbour/contrib/hbpgsql/tpostgre.prg
View File

@@ -489,7 +489,7 @@ CREATE CLASS TPQQuery
METHOD Destroy()
METHOD Close() INLINE ::Destroy()
METHOD Refresh()
METHOD Refresh( lQuery, lMeta )
METHOD Fetch() INLINE ::Skip()
METHOD Read()
METHOD Skip( nRecno )
@@ -1180,7 +1180,7 @@ CREATE CLASS TPQRow
METHOD FieldGet( nField )
METHOD FieldPut( nField, Value )
METHOD FieldName( nField )
METHOD FieldPos( cFieldName )
METHOD FieldPos( cField )
METHOD FieldLen( nField )
METHOD FieldDec( nField )
METHOD FieldType( nField )

10
harbour/contrib/hbtip/cgi.prg
View File

@@ -87,20 +87,20 @@ CREATE CLASS TIpCgi
VAR lDumpHtml INIT .F.
METHOD New()
METHOD Header( hOptions )
METHOD Header( cValue )
METHOD Redirect( cUrl )
METHOD Print( cString )
METHOD Flush()
METHOD ErrHandler()
METHOD ErrHandler( xError )
METHOD StartHtml( hOptions )
METHOD EndHtml()
METHOD StartFrameSet( hOptions )
METHOD EndFrameSet()
METHOD EndFrameSet( hOptions )
METHOD SaveHtmlPage( cFile )
METHOD StartSession()
METHOD DestroySession()
METHOD StartSession( cSID )
METHOD DestroySession( cID )
METHOD CreateSID( cCRCKey ) INLINE ::cSID := TIP_GenerateSID( cCrcKey )
METHOD CheckCrcSID( cSID, cCRCKey ) INLINE TIP_CheckSID( cSID, cCRCKey )
METHOD SessionEncode()

12
harbour/contrib/hbtip/client.prg
View File

@@ -136,13 +136,13 @@ CREATE CLASS tIPClient
VAR cProxyPassword
METHOD New( oUrl, bTrace, oCredentials )
METHOD Open()
METHOD Open( cUrl )
METHOD EnableTLS( lEnable )
METHOD Read( iLen )
METHOD Read( nLen )
METHOD ReadToFile( cFile, nMode, nSize )
METHOD Write( cData, iLen, bCommit )
METHOD Write( cData, nLen, bCommit )
METHOD Commit()
METHOD WriteFromFile( cFile )
METHOD Reset()
@@ -169,15 +169,15 @@ CREATE CLASS tIPClient
/* Methods to log data if needed */
METHOD InetRecv( SocketCon, cStr1, len)
METHOD InetRecvLine( SocketCon, nLen, size )
METHOD InetRecvAll( SocketCon, cStr1, len )
METHOD InetRecvLine( SocketCon, nRet, size )
METHOD InetRecvAll( SocketCon, cRet, size )
METHOD InetCount( SocketCon )
METHOD InetSendAll( SocketCon, cData, nLen )
METHOD InetErrorCode( SocketCon )
METHOD InetErrorDesc( SocketCon )
METHOD InetConnect( cServer, nPort, SocketCon )
METHOD Log()
METHOD Log( ... )
ENDCLASS

10
harbour/contrib/hbtip/ftpcli.prg
View File

@@ -113,9 +113,9 @@ CREATE CLASS tIPClientFTP FROM tIPClient
VAR cLogFile
METHOD New( oUrl, bTrace, oCredentials )
METHOD Open()
METHOD Open( cUrl )
METHOD Read( nLen )
METHOD Write( nLen )
METHOD Write( cData, nLen )
METHOD Close()
METHOD TransferStart()
METHOD Commit()
@@ -137,8 +137,8 @@ CREATE CLASS tIPClientFTP FROM tIPClient
METHOD Stor( cFile )
METHOD Quit()
METHOD ScanLength()
METHOD ReadAuxPort()
METHOD mget()
METHOD ReadAuxPort( cLocalFile )
METHOD mget( cSpec, cLocalPath )
// Method below contributed by Rafa Carmona
@@ -149,7 +149,7 @@ CREATE CLASS tIPClientFTP FROM tIPClient
METHOD MKD( cPath ) // new method to create an directory on ftp server
METHOD RMD( cPath )
METHOD listFiles( cList )
METHOD listFiles( cFileSpec )
METHOD MPut
METHOD StartCleanLogFile()
METHOD fileSize( cFileSpec )

2
harbour/contrib/hbtip/httpcli.prg
View File

@@ -74,7 +74,7 @@ CREATE CLASS tIPClientHTTP FROM tIPClient
METHOD New( oUrl, bTrace, oCredentials )
METHOD Get( cQuery )
METHOD Post( xPostData, cQuery )
METHOD ReadHeaders()
METHOD ReadHeaders( lClear )
METHOD Read( nLen )
METHOD UseBasicAuth() INLINE ::cAuthMode := "Basic"
METHOD ReadAll()

24
harbour/contrib/hbtip/mail.prg
View File

@@ -80,13 +80,13 @@ CREATE CLASS TipMail
METHOD Send( sSocket )
METHOD Recv( sSocket )
*/
METHOD FromString( cString )
METHOD FromString( cMail, cBoundary, nPos )
METHOD ToString()
METHOD GetFieldPart( cField )
METHOD GetFieldOption( cField )
METHOD SetFieldPart( cField, cValue )
METHOD SetFieldOption( cField, cValue )
METHOD GetFieldPart( cPart )
METHOD GetFieldOption( cPart, cOption )
METHOD SetFieldPart( cPart, cValue )
METHOD SetFieldOption( cPart, cOption, cValue )
METHOD SetCharset( cCharset ) INLINE ::cCharset := iif( ISCHARACTER( cCharset ), cCharset, "ISO-8859-1" )
METHOD GetContentType() INLINE ::GetFieldPart( "Content-Type" )
@@ -101,9 +101,9 @@ CREATE CLASS TipMail
METHOD MakeBoundary()
METHOD isMultiPart()
METHOD getMultiParts()
METHOD getMultiParts( aParts )
METHOD setHeader( cSubject, cFrom, cTo, cCC, cBCC )
METHOD setHeader( cSubject, cFrom, xTo, xCC, xBCC )
METHOD attachFile( cFileName )
METHOD detachFile( cPath )
METHOD getFileName()
@@ -137,11 +137,11 @@ METHOD New( cBody, oEncoder ) CLASS TipMail
RETURN Self
METHOD SetEncoder( cEnc ) CLASS TipMail
IF hb_isString( cEnc )
::oEncoder := TIp_GetEncoder( cEnc )
METHOD SetEncoder( cEncoder ) CLASS TipMail
IF hb_isString( cEncoder )
::oEncoder := TIp_GetEncoder( cEncoder )
ELSE
::oEncoder := cEnc
::oEncoder := cEncoder
ENDIF
::hHeaders[ "Content-Transfer-Encoding" ] := ::oEncoder:cName
RETURN .T.
@@ -653,7 +653,7 @@ METHOD detachFile( cPath ) CLASS TipMail
METHOD getFileName() CLASS TipMail
RETURN StrTran( ::getFieldOption( "Content-Type", "name" ), '"' )
METHOD isMultiPart CLASS TipMail
METHOD isMultiPart() CLASS TipMail
RETURN "multipart/" $ Lower( ::GetFieldPart("Content-Type") )
METHOD getMultiParts( aParts ) CLASS TipMail

8
harbour/contrib/hbtip/popcli.prg
View File

@@ -68,7 +68,7 @@ CREATE CLASS tIPClientPOP FROM tIPClient
METHOD Open( cUrl )
METHOD OpenDigest( cUrl )
METHOD Close( lAutoQuit )
METHOD Delete()
METHOD Delete( nId )
METHOD List()
METHOD Noop() // Can be called repeatedly to keep-alive the connection
METHOD Retrieve( nId, nLen )
@@ -79,8 +79,8 @@ CREATE CLASS tIPClientPOP FROM tIPClient
METHOD UIDL( nMsgId ) // Returns Unique ID of message n or list of unique IDs of all message inside maildrop
METHOD countMail()
METHOD GetOK()
METHOD Read( iLen )
METHOD retrieveAll()
METHOD Read( nLen )
METHOD retrieveAll( lDelete )
ENDCLASS
@@ -327,7 +327,7 @@ METHOD UIDL( nMsgId ) CLASS tIPClientPOP
/**
*/
METHOD countMail CLASS TIpClientPop
METHOD countMail() CLASS TIpClientPop
LOCAL cStat
IF ::isOpen

6
harbour/contrib/hbtip/smtpcli.prg
View File

@@ -64,11 +64,11 @@
CREATE CLASS tIPClientSMTP FROM tIPClient
METHOD New( oUrl, bTrace, oCredentials )
METHOD Open( cUrl )
METHOD Open( cUrl, lTLS )
METHOD Close()
METHOD Write( cData, nLen, bCommit )
METHOD Mail( cFrom )
METHOD Rcpt( cRcpt )
METHOD Rcpt( cTo )
METHOD Data( cData )
METHOD Commit()
METHOD Quit()
@@ -76,7 +76,7 @@ CREATE CLASS tIPClientSMTP FROM tIPClient
METHOD SendMail( oTIpMail )
/* Methods for smtp server that require login */
METHOD OpenSecure( cUrl )
METHOD OpenSecure( cUrl, lTLS )
METHOD Auth( cUser, cPass ) // Auth by login method
METHOD AuthPlain( cUser, cPass ) // Auth by plain method
METHOD ServerSuportSecure( lAuthPlain, lAuthLogin )

48
harbour/contrib/hbtip/thtml.prg
View File

@@ -123,7 +123,7 @@ CREATE CLASS THtmlDocument MODULE FRIENDLY
METHOD writeFile( cFileName )
METHOD collect()
METHOD toString( nIndent )
METHOD toString()
METHOD getNode( cTagName )
METHOD getNodes( cTagName )
METHOD findFirst( cName, cAttrib, cValue, cData )
@@ -313,7 +313,7 @@ METHOD findFirstRegex( cName, cAttrib, cValue, cData ) CLASS THtmlDocument
* (Adopted from TXMLIterator -> source\rtl\txml.prg)
*/
CREATE CLASS THtmlIterator MODULE FRIENDLY
METHOD New( oNodeTop ) CONSTRUCTOR
METHOD New( oHtml ) CONSTRUCTOR
METHOD Next()
METHOD Rewind()
METHOD Find( cName, cAttribute, cValue, cData )
@@ -351,7 +351,7 @@ METHOD New( oHtml ) CLASS THtmlIterator
::nLast := Len( ::aNodes )
RETURN Self
METHOD rewind CLASS THtmlIterator
METHOD rewind() CLASS THtmlIterator
::oNode := ::oTop
::nCurrent := 0
RETURN Self
@@ -512,13 +512,13 @@ CREATE CLASS THtmlNode MODULE FRIENDLY
VAR parent
VAR htmlContent
METHOD parseHtml
METHOD parseHtmlFixed
METHOD parseHtml( parser )
METHOD parseHtmlFixed( parser )
METHOD _getTextNode
METHOD _setTextNode
METHOD _getTextNode()
METHOD _setTextNode( cText )
METHOD keepFormatting
METHOD keepFormatting()
EXPORTED:
@@ -529,7 +529,7 @@ CREATE CLASS THtmlNode MODULE FRIENDLY
METHOD New( oParent, cTagName, cAttrib, cContent )
METHOD isType( nCM_TYPE )
METHOD isType( nType )
ACCESS isEmpty()
ACCESS isInline()
ACCESS isOptional()
@@ -545,8 +545,8 @@ CREATE CLASS THtmlNode MODULE FRIENDLY
MESSAGE insertBelow METHOD addNode
MESSAGE unlink METHOD delete
METHOD firstNode()
METHOD lastNode()
METHOD firstNode( lRoot )
METHOD lastNode( lRoot )
ACCESS nextNode()
ACCESS prevNode()
@@ -559,19 +559,19 @@ CREATE CLASS THtmlNode MODULE FRIENDLY
METHOD toString( nIndent )
METHOD attrToString()
METHOD collect()
METHOD getText( cCRLF )
METHOD collect( oEndNode )
METHOD getText( cEOL )
METHOD getAttribute( cAttrName )
METHOD getAttribute( cName )
METHOD getAttributes()
METHOD setAttribute( cAttrName, cAttrValue )
METHOD setAttributes( cHtmlAttr )
METHOD setAttribute( cName, cValue )
METHOD setAttributes( cHtml )
METHOD delAttribute( cAttrName )
METHOD delAttribute( cName )
METHOD delAttributes()
METHOD isAttribute()
METHOD isAttribute( cName )
ACCESS text INLINE ::_getTextNode()
ASSIGN text(x) INLINE ::_setTextNode( x )
@@ -641,27 +641,27 @@ METHOD isType( nType ) CLASS THtmlNode
RETURN lRet
// checks if this is a node that is always empty and never has HTML text, e.g. <img>,<link>,<meta>
METHOD isEmpty CLASS THtmlNode
METHOD isEmpty() CLASS THtmlNode
RETURN hb_bitAnd( ::htmlTagType[ 2 ], CM_EMPTY ) > 0
// checks if this is a node that may occur inline, eg. <b>,<font>
METHOD isInline CLASS THtmlNode
METHOD isInline() CLASS THtmlNode
RETURN hb_bitAnd( ::htmlTagType[ 2 ], CM_INLINE ) > 0
// checks if this is a node that may appear without a closing tag, eg. <p>,<tr>,<td>
METHOD isOptional CLASS THtmlNode
METHOD isOptional() CLASS THtmlNode
RETURN hb_bitAnd( ::htmlTagType[ 2 ], CM_OPT ) > 0
// checks if this is a node (leafs contain no further nodes, e.g. <br>,<hr>,_text_)
METHOD isNode CLASS THtmlNode
METHOD isNode() CLASS THtmlNode
RETURN ISARRAY( ::htmlContent ) .AND. Len( ::htmlContent ) > 0
// checks if this is a block node that must be closed with an ending tag: eg: <table></table>, <ul></ul>
METHOD isBlock CLASS THtmlNode
METHOD isBlock() CLASS THtmlNode
RETURN hb_bitAnd( ::htmlTagType[ 2 ], CM_BLOCK ) > 0
// checks if this is a node whose text line formatting must be preserved: <pre>,<script>,<textarea>
METHOD keepFormatting CLASS THtmlNode
METHOD keepFormatting() CLASS THtmlNode
RETURN "<" + Lower( ::htmlTagName ) + ">" $ "<pre>,<script>,<textarea>"
// parses a HTML string and builds a tree of THtmlNode objects

2
harbour/contrib/hbwin/legacy.prg
View File

@@ -95,7 +95,7 @@ STATIC FUNCTION ThrowOpError( nSubCode, cOperator, ... )
CREATE CLASS TOLEAUTO FROM WIN_OLEAUTO
/* TODO: Implement compatibility to the required extent */
VAR cClassName
METHOD New( xOle, cIID )
METHOD New( xOle, cClass )
METHOD hObj( xOle )
METHOD OleCollection( xIndex, xValue ) OPERATOR "[]"

16
harbour/contrib/hbwin/win_tprn.prg
View File

@@ -78,7 +78,7 @@ CREATE CLASS WIN_PRN
// Create() ( & StartDoc() ) must be called before printing can start.
METHOD Destroy() // Calls EndDoc() - restores default font, Deletes DC.
// Destroy() must be called to avoid memory leaks
METHOD StartDoc( cDocame ) // Calls StartPage()
METHOD StartDoc( cDocName ) // Calls StartPage()
METHOD EndDoc( lAbortDoc ) // Calls EndPage() if lAbortDoc not .T.
METHOD StartPage()
METHOD EndPage( lStartNewPage ) // If lStartNewPage == .T. then StartPage() is called for the next page of output
@@ -95,15 +95,15 @@ CREATE CLASS WIN_PRN
METHOD SetDefaultFont()
METHOD GetFonts() // Returns array of { "FontName", lFixed, lTrueType, nCharSetRequired }
METHOD Bold( nBoldWeight )
METHOD UnderLine( lOn )
METHOD Italic( lOn )
METHOD Bold( nWeight )
METHOD UnderLine( lUnderline )
METHOD Italic( lItalic )
METHOD SetDuplexType( nDuplexType ) // Get/Set current Duplexmode
METHOD SetPrintQuality( nPrintQuality ) // Get/Set Printquality
METHOD CharSet( nCharSet )
METHOD SetPos( nX, nY ) // **WARNING** : ( Col, Row ) _NOT_ ( Row, Col )
METHOD SetPos( nPosX, nPosY ) // **WARNING** : ( Col, Row ) _NOT_ ( Row, Col )
METHOD SetColor( nClrText, nClrPane, nAlign )
METHOD TextOut( cString, lNewLine, lUpdatePosX, nAlign ) // nAlign : 0 == left, 1 == right, 2 == centered
@@ -135,8 +135,8 @@ CREATE CLASS WIN_PRN
METHOD INCH_TO_POSY( nInch ) // " " " " " " " " " Row
METHOD TextAtFont( nPosX, nPosY, cString, cFont, nPointSize,; // Print text string at location
nWidth, nBold, lUnderLine, lItalic, lNewLine,; // in specified font and color.
lUpdatePosX, nColor, nAlign ) // Restore original font and colour
nWidth, nBold, lUnderLine, lItalic, nCharSet,; // in specified font and color.
lNewLine, lUpdatePosX, nColor, nAlign ) // Restore original font and colour
// after printing.
METHOD SetBkMode( nMode ) // OPAQUE == 2 or TRANSPARENT == 1
// Set Background mode
@@ -256,7 +256,7 @@ METHOD Destroy() CLASS WIN_PRN
IF ::Printing
::EndDoc()
ENDIF
::hPrinterDC := win_DeleteDC( ::hPrinterDC )
::hPrinterDC := win_DeleteDC( ::hPrinterDC )
ENDIF
RETURN .T.

40
harbour/contrib/xhb/hblog.prg
View File

@@ -415,12 +415,12 @@ CLASS HB_LogConsole FROM HB_LogChannel
METHOD New( nLevel )
METHOD Open( cName )
METHOD Close( cName )
METHOD Out()
METHOD Out( ... )
METHOD LogOnVt( ldo ) INLINE ::lRealConsole := ldo
PROTECTED:
METHOD Send( nStyle, cMessage, nPriority )
METHOD Send( nStyle, cMessage, cName, nPriority )
DATA lRealConsole INIT .T.
ENDCLASS
@@ -484,12 +484,12 @@ CLASS HB_LogFile FROM HB_LogChannel
DATA nFileLimit INIT -1
DATA nBackup INIT 5
METHOD New( nLevel, cName, cFile, nMaxSize, nBackup )
METHOD Open( cName )
METHOD Close( cName )
METHOD New( nLevel, cFilename, nMaxSize, nBackup )
METHOD Open( cProgName )
METHOD Close( cProgName )
PROTECTED:
METHOD Send( nStyle, cMessage, nPriority )
METHOD Send( nStyle, cMessage, cProgName, nPriority )
ENDCLASS
@@ -550,11 +550,11 @@ METHOD Close( cProgName ) CLASS HB_LogFile
RETURN .T.
METHOD Send( nStyle, cMessage, cProgName, nPrio ) CLASS HB_LogFile
METHOD Send( nStyle, cMessage, cProgName, nPriority ) CLASS HB_LogFile
LOCAL nCount
FWrite( ::nFileHandle, ::Format( nStyle, cMessage, cProgName, nPrio ) + HB_OsNewLine() )
FWrite( ::nFileHandle, ::Format( nStyle, cMessage, cProgName, nPriority ) + HB_OsNewLine() )
HB_FCommit( ::nFileHandle );
// see file limit and eventually swap file.
@@ -598,12 +598,12 @@ CLASS HB_LogDbf FROM HB_LogChannel
{ "TIME" , "C", 8, 0 } ;
}
METHOD New( nLevel, cFile, cIndex, aStruct, cDriver )
METHOD Open( cName )
METHOD Close( cName )
METHOD New( nLevel, cDBFName, cIndexName, aStruct, cDriver )
METHOD Open( cProgName )
METHOD Close( cProgName )
PROTECTED:
METHOD Send( nStyle, cMessage, nPriority )
METHOD Send( nStyle, cMessage, cProgName, nPriority )
ENDCLASS
@@ -696,10 +696,10 @@ METHOD Close( cProgName ) CLASS HB_LogDbf
RETURN .T.
METHOD Send( nStyle, cMessage, cProgName, nPrio ) CLASS HB_LogDbf
METHOD Send( nStyle, cMessage, cProgName, nPriority ) CLASS HB_LogDbf
LogDbf->( dbAppend() )
LogDbf->priority := nPrio
LogDbf->priority := nPriority
LogDbf->date := Date()
LogDbf->time := Time()
LogDbf->progname := cProgName
@@ -720,11 +720,11 @@ CLASS HB_LogSyslog FROM HB_LogChannel
DATA nId
METHOD New( nLevel, nId )
METHOD Open()
METHOD Close()
METHOD Open( cName )
METHOD Close( cName )
PROTECTED:
METHOD Send( cMessage, nPrio )
METHOD Send( nType, cMessage, cName, nPriority )
ENDCLASS
@@ -761,11 +761,11 @@ METHOD Close( cName ) CLASS HB_LogSyslog
RETURN .F.
METHOD Send( nType, cMessage, cName, nPrio ) CLASS HB_LogSyslog
METHOD Send( nType, cMessage, cName, nPriority ) CLASS HB_LogSyslog
HB_SYMBOL_UNUSED( nType )
// Syslog does not need timestamp, nor priority
RETURN HB_SyslogMessage( ::Format( HB_LOG_ST_LEVEL, cMessage, cName, nPrio ), nPrio, ::nId )
RETURN HB_SyslogMessage( ::Format( HB_LOG_ST_LEVEL, cMessage, cName, nPriority ), nPriority, ::nId )
/**********************************************
@@ -779,7 +779,7 @@ CLASS HB_LogDebug FROM HB_LogChannel
METHOD Open() INLINE .T.
METHOD Close() INLINE .T.
PROTECTED:
METHOD Send( nStyle, cMessage, nPriority )
METHOD Send( nStyle, cMessage, cName, nPriority )
ENDCLASS

24
harbour/contrib/xhb/hblognet.prg
View File

@@ -66,15 +66,15 @@ CLASS HB_LogEmail FROM HB_LogChannel
DATA cPostfix
METHOD New( nLevel, cHelo, cServer, cSendTo, cSubject, cFrom )
METHOD Open()
METHOD Close()
METHOD Open( cName )
METHOD Close( cName )
PROTECTED:
METHOD Send( nStyle, cMessage, cProgName, nPrio )
METHOD Send( nStyle, cMessage, cName, nPriority )
HIDDEN:
METHOD GetOk()
METHOD Prepare( nStyle, cMessage, cProgName, nPrio )
METHOD GetOk( skCon )
METHOD Prepare( nStyle, cMessage, cName, nPriority )
ENDCLASS
@@ -127,7 +127,7 @@ RETURN .T.
* Sends the real message in e-mail
*/
METHOD Send( nStyle, cMessage, cName, nPrio ) CLASS HB_LogEmail
METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogEmail
LOCAL skCon := hb_inetCreate()
@@ -159,7 +159,7 @@ METHOD Send( nStyle, cMessage, cName, nPrio ) CLASS HB_LogEmail
RETURN .F.
ENDIF
cMessage := ::Prepare( nStyle, cMessage, cName, nPrio )
cMessage := ::Prepare( nStyle, cMessage, cName, nPriority )
hb_inetSendAll( skCon, cMessage + hb_inetCRLF() + "." + hb_inetCRLF() )
IF .not. ::GetOk( skCon )
@@ -183,7 +183,7 @@ METHOD GetOk( skCon ) CLASS HB_LogEmail
ENDIF
RETURN .T.
METHOD Prepare( nStyle, cMessage, cName, nPrio ) CLASS HB_LogEmail
METHOD Prepare( nStyle, cMessage, cName, nPriority ) CLASS HB_LogEmail
LOCAL cPre
cPre := "FROM: " + ::cAddress + hb_inetCRLF() + ;
"TO: " + ::cSendTo + hb_inetCRLF() +;
@@ -193,7 +193,7 @@ METHOD Prepare( nStyle, cMessage, cName, nPrio ) CLASS HB_LogEmail
cPre += ::cPrefix + hb_inetCRLF() + hb_inetCRLF()
ENDIF
cPre += ::Format( nStyle, cMessage, cName, nPrio )
cPre += ::Format( nStyle, cMessage, cName, nPriority )
IF .not. Empty( ::cPostfix )
cPre += hb_inetCRLF() +hb_inetCRLF() + ::cPostfix + hb_inetCRLF()
@@ -223,7 +223,7 @@ CLASS HB_LogInetPort FROM HB_LogChannel
METHOD Close( cName )
PROTECTED:
METHOD Send( nStyle, cMessage, cName, nPrio )
METHOD Send( nStyle, cMessage, cName, nPriority )
#ifdef HB_THREAD_SUPPORT
HIDDEN:
@@ -297,7 +297,7 @@ METHOD Close( cName ) CLASS HB_LogInetPort
RETURN .T.
METHOD Send( nStyle, cMessage, cName, nPrio ) CLASS HB_LogInetPort
METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogInetPort
LOCAL sk, nCount
#ifdef HB_THREAD_SUPPORT
@@ -313,7 +313,7 @@ METHOD Send( nStyle, cMessage, cName, nPrio ) CLASS HB_LogInetPort
#endif
// now we transmit the message to all the available channels
cMessage := ::Format( nStyle, cMessage, cName, nPrio )
cMessage := ::Format( nStyle, cMessage, cName, nPriority )
nCount := 1
DO WHILE nCount <= Len( ::aListeners )

8
harbour/contrib/xhb/hjwindow.prg
View File

@@ -115,7 +115,7 @@ CLASS TJsWindow
METHOD SetFeatures( alwaysRaised, alwaysLowered, ;
Resizable, Menubar, personalBar, ;
dependent, location, directories, ;
Scrollbars, Status, TitleBar, Toolbar )
Scrollbars, Status, TitleBar, Toolbar, copyHistory )
METHOD ImageURL( cImage, cUrl, nHeight, nBorder, ;
cOnClick, cOnMsover, cOnMsout, ;
@@ -159,9 +159,9 @@ RETURN Self
*/
METHOD SetFeatures( alwaysRaised, alwaysLowered, ;
Resizable, Menubar, personalBar, ;
dependent, location, directories, ;
Scrollbars, Status, TitleBar, Toolbar, copyHistory ) CLASS TJsWindow
Resizable, Menubar, personalBar, ;
dependent, location, directories, ;
Scrollbars, Status, TitleBar, Toolbar, copyHistory ) CLASS TJsWindow
LOCAL cStr := ""

4
harbour/contrib/xhb/htjlist.prg
View File

@@ -68,7 +68,7 @@ CLASS TJsList
DATA FontColor INIT "black"
METHOD New( name, lOpen, width, height, bgColor, ;
FONT, fntColor, fntSize, cMinusIg, cPlusImg )
FONT, fntColor, fntSize, cMinusImg, cPlusImg )
METHOD NewNode( name, lOpen, width, height, bgColor )
@@ -93,7 +93,7 @@ ENDCLASS
*/
METHOD New( name, lOpen, width, height, bgColor, ;
FONT, fntColor, fntSize, cMinusImg, cPlusImg ) CLASS TJsList
FONT, fntColor, fntSize, cMinusImg, cPlusImg ) CLASS TJsList
LOCAL cStr

12
harbour/contrib/xhb/htmutil.prg
View File

@@ -357,9 +357,9 @@ Class JWindow
METHOD WriteLN( c ) INLINE ::qOut( c )
METHOD SetFeatures( alwaysRaised, alwaysLowered, ;
Resizable, Menubar, personalBar, ;
dependent, location, directories, ;
Scrollbars, Status, TitleBar, Toolbar )
Resizable, Menubar, personalBar, ;
dependent, location, directories, ;
Scrollbars, Status, TitleBar, Toolbar, copyHistory )
METHOD ImageURL( cImage, cUrl, nHeight, nBorder, ;
cOnClick, cOnMsover, cOnMsout, ;
@@ -409,9 +409,9 @@ RETURN Self
*/
METHOD SetFeatures( alwaysRaised, alwaysLowered, ;
Resizable, Menubar, personalBar, ;
dependent, location, directories, ;
Scrollbars, Status, TitleBar, Toolbar, copyHistory ) Class JWindow
Resizable, Menubar, personalBar, ;
dependent, location, directories, ;
Scrollbars, Status, TitleBar, Toolbar, copyHistory ) Class JWindow
LOCAL cStr := ""

4
harbour/contrib/xhb/stream.prg
View File

@@ -130,7 +130,7 @@ CREATE CLASS TStreamFileReader FROM TStream
VAR cFile
VAR Handle
METHOD New( cFile ) CONSTRUCTOR
METHOD New( cFile, nMode ) CONSTRUCTOR
METHOD Close() INLINE IIF( ::Handle > 0, FClose( ::Handle ), ), ::Handle := -2
METHOD Seek( nOffset Origin ) INLINE FSeek( ::Handle, nOffset, Origin )
@@ -200,7 +200,7 @@ CREATE CLASS TStreamFileWriter FROM TStream
VAR cFile
VAR Handle
METHOD New( cFile ) CONSTRUCTOR
METHOD New( cFile, nMode ) CONSTRUCTOR
METHOD Close() INLINE IIF( ::Handle > 0, FClose( ::Handle ), ), ::Handle := -2
METHOD Seek( nOffset Origin ) INLINE ::nPosition := FSeek( ::Handle, nOffset, Origin )

4
harbour/contrib/xhb/tcgi.prg
View File

@@ -77,9 +77,9 @@ CLASS TCgi FROM THtml
DATA aQueryFields INIT {}
METHOD New( c )
METHOD New( cInBuffer )
METHOD Field( c )
METHOD Field( cQueryName )
METHOD ToObject()

30
harbour/contrib/xhb/tfile.prg
View File

@@ -85,11 +85,11 @@ CLASS TCgiFile
Freadstr( ::Handle, n )
METHOD Write( c, n ) INLINE Fwrite( ::Handle, c, n )
METHOD WriteByte( n )
METHOD WriteByte( nByte )
METHOD WriteInt( n )
METHOD WriteInt( nInt )
METHOD WriteLong( n )
METHOD WriteLong( nLong )
METHOD GetBuffer() INLINE ::Buffer
@@ -103,15 +103,15 @@ CLASS TCgiFile
METHOD SEEK( n, o ) INLINE Fseek( ::Handle, n, o )
METHOD CREATE ( n )
METHOD CREATE( nAttr )
METHOD Size()
METHOD _Read( n, c )
METHOD _Read( nSize, cBuff )
METHOD ReadAhead( n, c )
METHOD ReadAhead( nSize, cBuff )
METHOD ReadLine( n )
METHOD ReadLine( nSize )
METHOD PrevLine( nBytes )
@@ -121,15 +121,15 @@ CLASS TCgiFile
METHOD ReadLong()
METHOD GOTO( n )
METHOD GOTO( nLine )
METHOD SKIP( n )
METHOD SKIP( nLines )
METHOD MaxPages( n )
METHOD MaxPages( nPageSize )
METHOD PrevPage( n )
METHOD PrevPage( nBytes )
METHOD NextPage( n )
METHOD NextPage( nBytes )
ENDCLASS
@@ -475,7 +475,7 @@ RETURN ::cPage
** ::PrevLine( [<nBytes>] ) --> ::Buffer
*/
METHOD PrevLine( npBytes ) CLASS TCgiFile
METHOD PrevLine( nBytes ) CLASS TCgiFile
LOCAL fHandle := ::Handle
@@ -488,7 +488,7 @@ METHOD PrevLine( npBytes ) CLASS TCgiFile
LOCAL nPrev
LOCAL cTemp
DEFAULT npBytes TO 256
DEFAULT nBytes TO 256
IF nOrigPos == 0
@@ -507,7 +507,7 @@ METHOD PrevLine( npBytes ) CLASS TCgiFile
Fseek( fHandle, - 2, FS_RELATIVE )
ENDIF
nMaxRead := Min( npBytes, FPOS( fHandle ) )
nMaxRead := Min( nBytes, FPOS( fHandle ) )
cBuff := Space( nMaxRead )
nNewPos := Fseek( fHandle, - nMaxRead, FS_RELATIVE )

2
harbour/contrib/xhb/tframe.prg
View File

@@ -57,7 +57,7 @@ CLASS THtmlFrameSet
DATA TITLE INIT "FrameSet01"
METHOD New( fName, title )
METHOD New( cFName, cTitle )
METHOD StartSet( aRows, aCols, onLoad, onUnload )

108
harbour/contrib/xhb/thtm.prg
View File

@@ -83,13 +83,24 @@ CLASS THtml
//cStyle, aimages, baseURL, baseTarget, ;
//nRefresh, cRefreshURL, cStyleScr, lnocache )
METHOD Newalt(cType)
MeTHOD CGINEW()
METHOD New( cTitle, cLinkTitle, cCharSet, cScriptSRC, ;
bgImage, bgColor, txtColor, cJavaCode, ;
onLoad, onUnload, cLinkClr, cVLinkClr, cALinkClr, ;
cStyle, aImages, aServerSrc, baseURL, baseTarget, ;
nRefresh, cRefreshURL, cStyleScr, lnocache, ;
nof, nMarginTop, nMarginHeight, nMarginWidth, nMarginLeft ,lcgi)
METHOD cgiNew( cTitle, cLinkTitle, cCharSet, aScriptSRC, ;
BGIMAGE, BGCOLOR, txtColor, aJsCode, ;
onLoad, onUnload, ;
cLinkClr, cVLinkClr, cALinkClr, ;
cStyle, aImages, aServerSrc, ;
cBaseURL, cBaseTarget, ;
nRefresh, cRefreshURL, cStyleScr, ;
lNocache, NOF, nMarginTop, nMarginHeight, ;
nMarginWidth, nMarginLeft, lCgi, cFile )
METHOD New( cTitle, cLinkTitle, cCharSet, aScriptSRC, ;
BGIMAGE, BGCOLOR, txtColor, aJsCode, ;
onLoad, onUnload, ;
cLinkClr, cVLinkClr, cALinkClr, ;
cStyle, aImages, aServerSrc, ;
cBaseURL, cBaseTarget, ;
nRefresh, cRefreshURL, cStyleScr, ;
lNocache, NOF, nMarginTop, nMarginHeight, ;
nMarginWidth, nMarginLeft, lCgi, cFile )
METHOD CGIClose()
@@ -105,7 +116,7 @@ CLASS THtml
METHOD SetFont( cFont, lBold, lItalic, lULine, nSize, cColor, lSet )
METHOD StartFont( cFont, lBold, lItalic, lULine, nSize, cColor, lSet )
METHOD StartFont( cFont, lBold, lItalic, lULine, nSize, cColor, lSet, lPut )
METHOD DefineFont( cFont, cType, nSize, cColor, lSet )
@@ -146,7 +157,7 @@ CLASS THtml
METHOD PutParagraph() INLINE ::cStr += "<P> </P>" + CRLF()
METHOD Paragraph( l, c, style )
METHOD Paragraph( lStart, cAlign, cStyle )
METHOD PutBreak() INLINE ::cStr += "<BR>" + CRLF()
@@ -159,23 +170,26 @@ CLASS THtml
onMsOver, onMsOut, onClick, onStart, onFinish )
METHOD EndMarquee()
METHOD PutTextUrl( cText, cUrl, cOnClick, cOmMsOver, cOnMsout, cTarget, font, clr, size, style, bld, lbreak, cClass )
METHOD PutTextUrl( cText, cUrl, cOnClick, cOnMsOver, cOnMsout, cTarget, font, clr, size, style, bld, lbreak, cClass )
METHOD PutImageUrl( cImage, nBorder, nHeight, nWidth, cUrl, ;
cOnclick, cOnMsOver, cOnMsOut, cName, cAlt, cTarget, nWidth, lbreak, cClass, ALING )
METHOD PutImageUrl( cImage, nBorder, nHeight, cUrl, ;
cOnclick, cOnMsOver, cOnMsOut, cName, cAlt, cTarget, nWidth, lbreak, cClass, ;
Id, hSpace, Aling )
METHOD DefineTable( nCols, nBorder, nWidth, nHeight, ColorFore, ColorBG, l3d, lRuleCols, lRuleRows, ;
cClrDark, cClrLight, ncellpadding, ncellspacing, ;
cAling, lRules, BGIMAGE, cStyle, ID, NOF )
METHOD DefineTable( nCols, nBorder, nWidth, nHeight, ColorFore, ColorBG, ;
l3d, lRuleCols, lRuleRows, cClrDark, cClrLight, cClrBorder, ;
nCellPadding, nCellSpacing, cAling, lRules, ;
bgImage, cStyle, Id, NOF )
METHOD TableHead( cHead, cColor, cAlign, cFont, nSize, cFntColor, nHeight, cBgPic )
METHOD NewTableRow( cColor )
METHOD NewTableRow( cColor, vAling, aLing )
METHOD EndTableRow()
METHOD NewTableCell( cAlign, cColor, cFont, nSize, cFntColor, nHeight, cBgPic, ;
nWidth, lWrap, nCSpan, nRSpan, cValing, clrdrk, clrlt, cBdrClr, cclass )
METHOD NewTableCell( cAlign, cColor, cFont, nSize, cFntColor, nHeight, ;
cBgPic, nWidth, lWrap, nColspan, nRowspan, cValign, ;
clrdrk, clrlt, cBdrClr, cClass, lNoFont )
METHOD EndTableCell()
@@ -193,9 +207,9 @@ CLASS THtml
METHOD FormEdit( cType, cName, xValue, nSize )
METHOD FormReset( c )
METHOD FormReset( cText )
METHOD FormSubmit( c )
METHOD FormSubmit( cText )
METHOD FormQOut( c ) INLINE ::cStr += c + '<BR>' + CRLF()
@@ -209,7 +223,7 @@ CLASS THtml
METHOD Button( cName, cCaption, cOnClick, cCgiApp, cOnMsOver, cOnMsOut, style, ID )
METHOD iFrame( name, src, border, marginwidth, marginheight, scrolling, allign, WIDTH, HEIGHT )
METHOD iFrame( name, src, border, marginwidth, marginheight, scrolling, align, WIDTH, HEIGHT )
METHOD StartJava() INLINE ::cStr += '<SCRIPT LANGUAGE="JavaScript">' + CRLF() + "<!--" + CRLF()
@@ -235,7 +249,7 @@ CLASS THtml
METHOD ADDoBJECT( cType, cClassid, cAling, cCode, lDisable, cCodeBase, ;
cName, nWidth, nHeight )
METHOD ADDPARAM( cName, cValue )
METHOD ADDPARAM( cType, cValue )
METHOD EndOBJect()
@@ -260,14 +274,14 @@ ENDCLASS
METHOD cgiNew( cTitle, cLinkTitle, cCharSet, aScriptSRC, ;
BGIMAGE, BGCOLOR, txtColor, aJsCode, ;
onLoad, onUnload, ;
cLinkClr, cVLinkClr, cALinkClr, ;
cStyle, aImages, aServerSrc, ;
cBaseURL, cBaseTarget, ;
nRefresh, cRefreshURL, cStyleScr, ;
lNocache, NOF, nMarginTop, nMarginHeight, ;
nMarginWidth, nMarginLeft, lCgi, cFile ) CLASS THtml
BGIMAGE, BGCOLOR, txtColor, aJsCode, ;
onLoad, onUnload, ;
cLinkClr, cVLinkClr, cALinkClr, ;
cStyle, aImages, aServerSrc, ;
cBaseURL, cBaseTarget, ;
nRefresh, cRefreshURL, cStyleScr, ;
lNocache, NOF, nMarginTop, nMarginHeight, ;
nMarginWidth, nMarginLeft, lCgi, cFile ) CLASS THtml
HB_SYMBOL_UNUSED( lCgi )
@@ -284,14 +298,14 @@ METHOD cgiNew( cTitle, cLinkTitle, cCharSet, aScriptSRC, ;
METHOD New( cTitle, cLinkTitle, cCharSet, aScriptSRC, ;
BGIMAGE, BGCOLOR, txtColor, aJsCode, ;
onLoad, onUnload, ;
cLinkClr, cVLinkClr, cALinkClr, ;
cStyle, aImages, aServerSrc, ;
cBaseURL, cBaseTarget, ;
nRefresh, cRefreshURL, cStyleScr, ;
lNocache, NOF, nMarginTop, nMarginHeight, ;
nMarginWidth, nMarginLeft, lCgi, cFile ) CLASS THtml
BGIMAGE, BGCOLOR, txtColor, aJsCode, ;
onLoad, onUnload, ;
cLinkClr, cVLinkClr, cALinkClr, ;
cStyle, aImages, aServerSrc, ;
cBaseURL, cBaseTarget, ;
nRefresh, cRefreshURL, cStyleScr, ;
lNocache, NOF, nMarginTop, nMarginHeight, ;
nMarginWidth, nMarginLeft, lCgi, cFile ) CLASS THtml
LOCAL i
DEFAULT lCgi to .F.
@@ -972,8 +986,8 @@ METHOD PutTextUrl( cText, cUrl, cOnClick, cOnMsOver, cOnMsout, cTarget, font, cl
*/
METHOD PutImageUrl( cImage, nBorder, nHeight, cUrl, ;
cOnclick, cOnMsOver, cOnMsOut, cName, cAlt, cTarget, nWidth, lbreak, cClass, ;
Id, hSpace, Aling ) CLASS THtml
cOnclick, cOnMsOver, cOnMsOut, cName, cAlt, cTarget, nWidth, lbreak, cClass, ;
Id, hSpace, Aling ) CLASS THtml
LOCAL cStr := ""
default lbreak TO .F.
@@ -1210,9 +1224,9 @@ RETURN Self
*/
METHOD DefineTable( nCols, nBorder, nWidth, nHeight, ColorFore, ColorBG, ;
l3d, lRuleCols, lRuleRows, cClrDark, cClrLight, cClrBorder, ;
nCellPadding, nCellSpacing, cAling, lRules, ;
bgImage, cStyle, Id, NOF ) CLASS THtml
l3d, lRuleCols, lRuleRows, cClrDark, cClrLight, cClrBorder, ;
nCellPadding, nCellSpacing, cAling, lRules, ;
bgImage, cStyle, Id, NOF ) CLASS THtml
LOCAL cStr := CRLF() + CRLF() + "<TABLE "
LOCAL xCols := nCols
@@ -1408,9 +1422,9 @@ METHOD EndTableRow() CLASS THtml
*/
METHOD NewTableCell( cAlign, cColor, ;
cFont, nSize, cFntColor, nHeight, ;
cBgPic, nWidth, lWrap, ;
nColspan, nRowspan, cValign, clrdrk, clrlt, cBdrClr, cClass, lNoFont ) CLASS THtml
cFont, nSize, cFntColor, nHeight, ;
cBgPic, nWidth, lWrap, ;
nColspan, nRowspan, cValign, clrdrk, clrlt, cBdrClr, cClass, lNoFont ) CLASS THtml
LOCAL cStr := Space( 10 ) + "<TD"
LOCAL cAli := cAlign
@@ -1900,7 +1914,7 @@ METHOD EndMarquee() CLASS THtml
*/
METHOD iFrame( name, src, border, marginwidth, marginheight, ;
scrolling, align, WIDTH, HEIGHT ) CLASS THtml
scrolling, align, WIDTH, HEIGHT ) CLASS THtml
LOCAL cStr := "<IFRAME " + CRLF()

26
harbour/contrib/xhb/trpc.prg
View File

@@ -218,8 +218,8 @@ CLASS tRPCFunction
CLASSDATA cPattern INIT HB_RegexComp( "^C:[0-9]{1,6}$|^A$|^O$|^D$|^N$|^NI$")
METHOD New( cFname, cSerial, cFret, aParams, nAuthLevel, oExec, oMethod ) CONSTRUCTOR
METHOD SetCallable( oExecSymbol, oMethod )
METHOD New( cFname, cSerial, nAuthLevel, oExec, oMeth ) CONSTRUCTOR
METHOD SetCallable( oExec, oMeth )
METHOD CheckTypes( aParams )
METHOD CheckParam( cParam )
METHOD Describe()
@@ -383,7 +383,7 @@ CLASS tRPCServeCon
/* Allow progress ?*/
DATA lAllowProgress
METHOD New( oCaller, skRemote ) CONSTRUCTOR
METHOD New( oParent, skIn ) CONSTRUCTOR
METHOD Destroy()
/* Managing async */
@@ -392,7 +392,7 @@ CLASS tRPCServeCon
METHOD Run()
/* Utilty */
METHOD SendProgress( nProgress, aData )
METHOD SendProgress( nProgress, oData )
METHOD IsCanceled() INLINE ::lCanceled
METHOD GetStatus() INLINE ::nStatus
@@ -415,12 +415,12 @@ HIDDEN:
METHOD RecvChallenge()
METHOD RecvFunction( bComp, bMode )
METHOD FuncCall( cData )
METHOD FuncLoopCall( cData, cMode )
METHOD FuncForeachCall( cData, cMode )
METHOD FuncLoopCall( cMode, cData )
METHOD FuncForeachCall( cMode, cData )
METHOD LaunchChallenge( cUserid, cPassword )
METHOD LaunchFunction( cFuncName, aParms, nMode, aItems )
METHOD FunctionRunner( cFuncName, oFunc, nMode, aParams, aItems )
METHOD SendResult( oRet )
METHOD LaunchFunction( cFuncName, aParams, nMode, aDesc )
METHOD FunctionRunner( cFuncName, oFunc, nMode, aParams, aDesc )
METHOD SendResult( oRet, cFuncName )
METHOD Encrypt(cDataIn)
METHOD Decrypt(cDataIn)
@@ -1209,7 +1209,7 @@ CLASS tRPCService
DATA bConnection
/* Function management */
METHOD Add( xFunction, cVersion, nId, oExec, oMethod )
METHOD Add( xFunction, cVersion, nLevel, oExec, oMethod )
METHOD Run( cName, aParams )
METHOD Describe( cName )
METHOD Find( cName )
@@ -1226,11 +1226,11 @@ CLASS tRPCService
/* UDP services */
METHOD UdpListen()
METHOD UDPParseRequest()
METHOD UDPParseRequest( cData, nPacketLen )
METHOD UDPInterpretRequest( cData, nPacketLen, cRes )
/* Utility */
METHOD AuthorizeChallenge( cUserid, cPassword )
METHOD AuthorizeChallenge( cUserId, cData )
/* to be overloaded */
METHOD Authorize( cUserid, cPassword )
@@ -1242,7 +1242,7 @@ CLASS tRPCService
METHOD OnClientLogin( oClient )
METHOD OnClientRequest( oClient, nRequest, cData )
METHOD OnFunctionProgress( oClient, nProgress, aData )
METHOD OnFunctionError( oClient, cFuncName, nError )
METHOD OnFunctionError( oClient, cFunction, nError )
METHOD OnFunctionReturn( oClient, aData )
METHOD OnFunctionCanceled( oClient, cFuncName )
METHOD OnClientLogout( oClient )

16
harbour/contrib/xhb/trpccli.prg
View File

@@ -88,18 +88,18 @@ CLASS tRPCClient
/* Network scan functions */
METHOD ScanServers( cName )
METHOD ScanFunctions( cName, cSerial )
METHOD ScanFunctions( cFunc, cSerial )
METHOD ScanAgain() INLINE ::UDPAccept()
METHOD StopScan()
/* Function call */
METHOD CheckServer() //Checks if a server is ready on tcp
METHOD CheckServer( cRemote ) //Checks if a server is ready on tcp
METHOD SetLoopMode( nMethod, xData, nEnd, nStep )
METHOD Call() // variable parameters
METHOD Call( ... ) // variable parameters
METHOD CallAgain() INLINE ::TCPAccept()
METHOD StopCall()
METHOD SetPeriodCallback()
METHOD SetPeriodCallback( ... )
METHOD ClearPeriodCallback()
@@ -170,8 +170,8 @@ HIDDEN:
DATA oResult
/* Encryption system */
METHOD Encrypt( cData )
METHOD Decrypt( cData )
METHOD Encrypt( cDataIn )
METHOD Decrypt( cDataIn )
METHOD BuildChallengePwd( cPassword )
METHOD ManageChallenge()
@@ -180,7 +180,7 @@ HIDDEN:
METHOD UDPAccept()
METHOD UDPParse( cData, nLen )
METHOD TCPAccept()
METHOD TCPParse( cData )
METHOD TCPParse( cCode )
METHOD clearTCPBuffer()
/* internal network send call */
@@ -287,7 +287,7 @@ METHOD CheckServer( cRemote )
ENDIF
RETURN .F.
METHOD ScanFunctions(cFunc, cSerial ) CLASS tRPCClient
METHOD ScanFunctions( cFunc, cSerial ) CLASS tRPCClient
// do not allow asynchronous mode without timeout
IF .not. ::lAsyncMode .and. ( ::nTimeOut == NIL .or. ::nTimeOut <= 0 )
RETURN .F.

18
harbour/contrib/xhb/ttable.prg
View File

@@ -536,7 +536,7 @@ CLASS HBRecord
DATA Number INIT 0
DATA aFields INIT {}
METHOD New()
METHOD New( cAlias )
METHOD GET()
METHOD Put()
@@ -737,15 +737,15 @@ CLASS HBTable
METHOD OPEN()
METHOD dbMove( n )
METHOD dbMove( nDirection )
METHOD FldInit()
METHOD READ( l )
METHOD ReadBLANK( l )
METHOD Write( l )
METHOD BufWrite( l )
MESSAGE DELETE() METHOD __oTDelete() // reserved word - *HAS* to be renamed...
METHOD READ( lKeepBuffer )
METHOD ReadBLANK( lKeepBuffer )
METHOD Write( lKeepBuffer )
METHOD BufWrite( aBuffer )
MESSAGE DELETE() METHOD __oTDelete( lKeepBuffer ) // reserved word - *HAS* to be renamed...
METHOD SetMonitor( l )
METHOD Undo( a, b, c )
METHOD Undo( nBuffer, nLevel )
METHOD DBSKIP( n ) INLINE ( ::Alias )->( DBSKIP( n ) ),;
::nRecno := ( ::alias )->( RECNO() )
@@ -778,7 +778,7 @@ CLASS HBTable
METHOD AddField( f, t, l, d )
METHOD Gentable()
ERROR HANDLER OnError()
ERROR HANDLER OnError( uParam )
ENDCLASS

2
harbour/contrib/xhb/txml.prg
View File

@@ -170,7 +170,7 @@ CLASS TXmlIterator
METHOD Clone()
PROTECTED:
METHOD MatchCriteria()
METHOD MatchCriteria( oNode )
DATA cName
DATA cAttribute

6
harbour/contrib/xpp/tthreadx.prg
View File

@@ -72,7 +72,7 @@ CREATE CLASS TSignal FUNCTION Signal
EXPORTED:
METHOD new()
METHOD new( ... )
METHOD wait( nTimeOut )
METHOD signal()
@@ -116,7 +116,7 @@ HIDDEN:
VAR pThreadID AS USUAL INIT NIL
EXPORTED:
METHOD new()
METHOD new( ... )
PROTECTED:
/* METHOD atEnd() */
@@ -128,7 +128,7 @@ EXPORTED:
METHOD setInterval( nHSeconds )
METHOD setPriority( nPriority )
METHOD setStartTime( nSeconds )
METHOD start()
METHOD start( xAction, ... )
METHOD synchronize( nTimeOut )
METHOD threadSelf()
METHOD threadID()

11
harbour/src/compiler/harbour.y
View File

@@ -1267,7 +1267,7 @@ ClassInfo : DecMethod
| ClassInfo DecData
;
DecMethod : IdentName '(' { HB_COMP_PARAM->pLastMethod = hb_compMethodAdd( HB_COMP_PARAM, HB_COMP_PARAM->pLastClass, $1 ); } DecList ')' AsType
DecMethod : IdentName '(' { HB_COMP_PARAM->pLastMethod = hb_compMethodAdd( HB_COMP_PARAM, HB_COMP_PARAM->pLastClass, $1 ); } DecListExt ')' AsType
{
if( HB_COMP_PARAM->pLastMethod )
{
@@ -1347,6 +1347,15 @@ DecList : /* Nothing */
| FormalList ',' OptList
;
DecListExt : /* Nothing */
| FormalList
| OptList
| EPSILON
| FormalList ',' EPSILON
| FormalList ',' OptList
| FormalList ',' OptList ',' EPSILON
;
DummyArgList : DummyArgument
| DummyArgList ',' DummyArgument
;

3564
harbour/src/compiler/harbour.yyc
View File

File diff suppressed because it is too large Load Diff

2
harbour/src/compiler/harbour.yyh
View File

@@ -314,7 +314,7 @@ typedef union YYSTYPE
} asMessage;
PHB_VARTYPE asVarType;
}
/* Line 1495 of yacc.c. */
/* Line 1489 of yacc.c. */
#line 319 "harboury.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */

2
harbour/src/debug/dbgtinp.prg
View File

@@ -75,7 +75,7 @@ HIDDEN:
VAR lFocus AS LOGICAL INIT .F.
EXPORTED:
METHOD new( nRow, nCol, nWidth, cValue, nSize )
METHOD new( nRow, nCol, nWidth, cValue, cColor, nSize )
METHOD applyKey( nKey )
METHOD getValue()
METHOD setValue( cValue )

6
harbour/src/debug/dbgtmenu.prg
View File

@@ -83,15 +83,15 @@ CREATE CLASS HBDbMenu
VAR lPopup
VAR cBackImage
METHOD New( aItems )
METHOD New()
METHOD AddItem( oMenuItem )
METHOD Build()
METHOD ClosePopup()
METHOD ClosePopup( nPopup )
METHOD Close() INLINE ::ClosePopup( ::nOpenPopup ), ::nOpenPopup := 0
METHOD DeHilite()
METHOD Display()
METHOD EvalAction()
METHOD GetHotKeyPos( nKey )
METHOD GetHotKeyPos( cKey )
METHOD GetItemByIdent( uIdent )
METHOD GetItemOrdByCoors( nRow, nCol )
METHOD GoBottom()

4
harbour/src/debug/dbgtwin.prg
View File

@@ -117,7 +117,7 @@ CREATE CLASS HBDbWindow // Debugger windows and dialogs
METHOD Move()
METHOD KeyPressed( nKey )
METHOD Refresh()
METHOD Resize()
METHOD Resize( nTop, nLeft, nBottom, nRight )
ENDCLASS
@@ -170,7 +170,7 @@ METHOD SetCaption( cCaption ) CLASS HBDbWindow
RETURN NIL
METHOD ShowCaption CLASS HBDbWindow
METHOD ShowCaption() CLASS HBDbWindow
IF ! Empty( ::cCaption )
hb_dispOutAt( ::nTop, ::nLeft + ( ( ::nRight - ::nLeft ) / 2 ) - ;

6
harbour/src/debug/debugger.prg
View File

@@ -342,7 +342,7 @@ CREATE CLASS HBDebugger
::nTabWidth := ::InputBox( "Tab width", ::nTabWidth ),;
::oBrwText:nTabWidth := ::nTabWidth, ::oBrwText:RefreshAll()
METHOD ToggleBreakPoint()
METHOD ToggleBreakPoint( nLine, cFileName )
METHOD Trace()
@@ -351,7 +351,7 @@ CREATE CLASS HBDebugger
METHOD ViewSets()
METHOD WndVarsLButtonDown( nMRow, nMCol )
METHOD LineNumbers( lLineNumbers ) // Toggles numbering of source code lines
METHOD RemoveWindow()
METHOD RemoveWindow( oWnd )
METHOD SearchLine()
METHOD ToggleAnimate() INLINE ::oPullDown:GetItemByIdent( "ANIMATE" ):checked := ::lAnimate := ! ::lAnimate
METHOD ToggleCaseSensitive() INLINE ::oPullDown:GetItemByIdent( "CASE" ):checked := ::lCaseSensitive := ! ::lCaseSensitive
@@ -362,7 +362,7 @@ CREATE CLASS HBDebugger
METHOD WatchpointDel( nPos )
METHOD WatchpointsShow()
METHOD WatchpointsHide()
METHOD WatchpointEdit( nVar )
METHOD WatchpointEdit( nPos )
METHOD WatchpointInspect( nPos )
METHOD WatchGetInfo( nWatch )

2
harbour/src/debug/tbrwtext.prg
View File

@@ -89,7 +89,7 @@ CREATE CLASS HBBrwText
METHOD RefreshCurrent() INLINE ::oBrw:RefreshCurrent(), Self
METHOD GotoLine( n )
METHOD SetActiveLine( n )
METHOD GetLine( n )
METHOD GetLine()
METHOD ToggleBreakPoint( nRow, lSet )
METHOD Search( cString, lCaseSensitive, nMode )

2
harbour/src/rtl/checkbox.prg
View File

@@ -75,7 +75,7 @@ CREATE CLASS CHECKBOX FUNCTION HBCheckBox
METHOD display()
METHOD hitTest( nMRow, nMCol )
METHOD killFocus()
METHOD select()
METHOD select( lState )
METHOD setFocus()
METHOD bitmaps( aBitmaps ) SETGET

6
harbour/src/rtl/listbox.prg
View File

@@ -94,8 +94,8 @@ CREATE CLASS LISTBOX FUNCTION HBListBox
METHOD nextItem()
METHOD open()
METHOD prevItem()
METHOD scroll( n )
METHOD select( nValue )
METHOD scroll( nMethod )
METHOD select( xPos )
METHOD setData( nPos, cData )
METHOD setFocus()
METHOD setItem( nPos, aItem )
@@ -127,7 +127,7 @@ CREATE CLASS LISTBOX FUNCTION HBListBox
METHOD value() SETGET /* NOTE: Undocumented CA-Cl*pper method. */
METHOD vScroll( oVScroll ) SETGET
METHOD New( nTop, nLeft, nBottom, nRight, lDrop ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD New( nTop, nLeft, nBottom, nRight, lDropDown ) /* NOTE: This method is a Harbour extension [vszakats] */
PROTECTED:

2
harbour/src/rtl/pushbtn.prg
View File

@@ -82,7 +82,7 @@ CREATE CLASS PUSHBUTTON FUNCTION HBPushButton
METHOD display()
METHOD hitTest( nMRow, nMCol )
METHOD killFocus()
METHOD select()
METHOD select( nPos )
METHOD setFocus()
METHOD bitmap( cBitmap ) SETGET

18
harbour/src/rtl/radiogrp.prg
View File

@@ -73,16 +73,16 @@ CREATE CLASS RADIOGROUP FUNCTION HBRadioGroup
VAR cargo
METHOD addItem( oRadioButton )
METHOD delItem( oRadioButton )
METHOD delItem( nPos )
METHOD display()
METHOD getAccel( oRadioButton )
METHOD getItem( oRadioButton )
METHOD getAccel( xValue )
METHOD getItem( nPos )
METHOD hitTest( nMRow, nMCol )
METHOD insItem( nPos, oRadioButton )
METHOD killFocus()
METHOD nextItem()
METHOD prevItem()
METHOD select( xPos )
METHOD select( xValue )
METHOD setColor( cColorSpec )
METHOD setFocus()
METHOD setStyle( cStyle )
@@ -131,7 +131,7 @@ CREATE CLASS RADIOGROUP FUNCTION HBRadioGroup
VAR aItems INIT {}
VAR nCursor INIT 0
METHOD changeButton( xVal, nPos )
METHOD changeButton( nUnselect, nSelect )
ENDCLASS
@@ -292,14 +292,14 @@ METHOD hitTest( nMRow, nMCol ) CLASS RADIOGROUP
RETURN HTNOWHERE
METHOD insItem( nPos, oRadioButtom ) CLASS RADIOGROUP
METHOD insItem( nPos, oRadioButton ) CLASS RADIOGROUP
IF ISOBJECT( oRadioButtom ) .AND. oRadioButtom:ClassName() == "RADIOBUTTN" .AND. ;
IF ISOBJECT( oRadioButton ) .AND. oRadioButton:ClassName() == "RADIOBUTTN" .AND. ;
nPos < ::nItemCount
ASize( ::aItems, ++::nItemCount )
AIns( ::aItems, nPos, oRadioButtom )
::aItems[ nPos ] := oRadioButtom
AIns( ::aItems, nPos, oRadioButton )
::aItems[ nPos ] := oRadioButton
ENDIF
RETURN ::aItems[ nPos ]

2
harbour/src/rtl/tbcolumn.prg
View File

@@ -93,7 +93,7 @@ CREATE CLASS TBCOLUMN
#ifdef HB_COMPAT_C53
METHOD preBlock( bPreBlock ) SETGET /* Code block determining editing */
METHOD postBlock( bPostBlock ) SETGET /* Code block validating values */
METHOD setStyle( nStyle, lSetting )
METHOD setStyle( nStyle, lNewValue )
#endif
METHOD New( cHeading, bBlock ) /* NOTE: This method is a Harbour extension [vszakats] */

4
harbour/src/rtl/tbrowse.prg
View File

@@ -290,8 +290,8 @@ PROTECTED:
METHOD doConfigure() // reconfigures the internal settings of the TBrowse object
METHOD setUnstable() // set TBrows in unstable mode resetting flags
METHOD setPosition( nPos ) // synchronize record position with the buffer
METHOD readRecord() // read current record into the buffer
METHOD setPosition() // synchronize record position with the buffer
METHOD readRecord( nRow ) // read current record into the buffer
METHOD setVisible() // set visible columns
METHOD setCursorPos() // set screen cursor position at current cell

3
harbour/src/rtl/teditor.prg
View File

@@ -112,7 +112,8 @@ CREATE CLASS HBEditor
METHOD New( cString, nTop, nLeft, nBottom,; // Converts a string to an array of strings splitting input string at EOL boundaries
nRight, lEditMode, nLineLength, nTabSize )
nRight, lEditMode, nLineLength, nTabSize,;
nTextRow, nTextCol, nWndRow, nWndCol )
PROTECTED:

2
harbour/src/rtl/tmenuitm.prg
View File

@@ -80,7 +80,7 @@ CREATE CLASS MENUITEM FUNCTION HBMenuItem
METHOD isPopUp()
METHOD New( cCaption, boData, nShortcut, cMsg, nID ) /* NOTE: This method is a Harbour extension [vszakats] */
METHOD New( cCaption, boData, nShortcut, cMessage, nID ) /* NOTE: This method is a Harbour extension [vszakats] */
PROTECTED:

25
harbour/src/rtl/treport.prg
View File

@@ -182,14 +182,25 @@ CREATE CLASS HBReportForm
METHOD ReportHeader()
METHOD EjectPage()
METHOD PrintIt( cString AS STRING )
METHOD LoadReportFile( cFile AS STRING )
METHOD LoadReportFile( cFrmFile AS STRING )
METHOD GetExpr( nPointer AS NUMERIC )
METHOD GetColumn( cFieldsBuffer AS STRING, nOffset AS NUMERIC )
ENDCLASS
METHOD New( cFrmName, lPrinter, cAltFile, lNoConsole, bFor, bWhile, nNext, nRecord,;
lRest, lPlain, cHeading, lBEject, lSummary ) CLASS HBReportForm
METHOD New( cFrmName AS STRING,;
lPrinter AS LOGICAL,;
cAltFile AS STRING,;
lNoConsole AS LOGICAL,;
bFor AS CODEBLOCK,;
bWhile AS CODEBLOCK,;
nNext AS NUMERIC,;
nRecord AS NUMERIC,;
lRest AS LOGICAL,;
lPlain AS LOGICAL,;
cHeading AS STRING,;
lBEject AS LOGICAL,;
lSummary AS LOGICAL ) CLASS HBReportForm
LOCAL lPrintOn, lConsoleOn // Status of PRINTER and CONSOLE
LOCAL cExtraFile, lExtraState // Status of EXTRA
@@ -437,7 +448,7 @@ METHOD New( cFrmName, lPrinter, cAltFile, lNoConsole, bFor, bWhile, nNext, nReco
RETURN NIL
METHOD PrintIt( cString ) CLASS HBReportForm
METHOD PrintIt( cString AS STRING ) CLASS HBReportForm
DEFAULT cString TO ""
@@ -871,7 +882,7 @@ METHOD ExecuteReport() CLASS HBReportForm
RETURN NIL
METHOD LoadReportFile( cFrmFile ) CLASS HBReportForm
METHOD LoadReportFile( cFrmFile AS STRING ) CLASS HBReportForm
LOCAL cFieldsBuff
LOCAL cParamsBuff
LOCAL nFieldOffset := 0
@@ -1141,7 +1152,7 @@ METHOD LoadReportFile( cFrmFile ) CLASS HBReportForm
*
*/
METHOD GetExpr( nPointer ) CLASS HBReportForm
METHOD GetExpr( nPointer AS NUMERIC ) CLASS HBReportForm
LOCAL nExprOffset
LOCAL nExprLength
LOCAL nOffsetOffset := 0
@@ -1273,7 +1284,7 @@ STATIC FUNCTION ParseHeader( cHeaderString, nFields )
* b. Character following character pointed to by pointer is Chr(0)
*
*/
METHOD GetColumn( cFieldsBuffer, nOffset ) CLASS HBReportForm
METHOD GetColumn( cFieldsBuffer AS STRING, nOffset AS NUMERIC ) CLASS HBReportForm
LOCAL nPointer, aColumn[ RCT_COUNT ], cType, cExpr
// Column width

2
harbour/src/rtl/tsymbol.prg
View File

@@ -59,7 +59,7 @@ CREATE CLASS Symbol
METHOD New( cSymName ) // Constructor. cSymName may already exists or not
METHOD name() // retrieves the symbol name
METHOD isEqual( oSymbol ) // Compares two symbol objects
METHOD exec() // Executes the function referred to by the
METHOD exec( ... ) // Executes the function referred to by the
// Symbol object, with an optional parameters list
PROTECTED:

6
harbour/src/rtl/tthreadx.prg
View File

@@ -74,7 +74,7 @@ CREATE CLASS TSignal FUNCTION Signal
EXPORTED:
METHOD new()
METHOD new( ... )
METHOD wait( nTimeOut )
METHOD signal()
@@ -118,7 +118,7 @@ HIDDEN:
VAR pThreadID AS USUAL INIT NIL
EXPORTED:
METHOD new()
METHOD new( ... )
PROTECTED:
/* METHOD atEnd() */
@@ -130,7 +130,7 @@ EXPORTED:
METHOD setInterval( nHSeconds )
METHOD setPriority( nPriority )
METHOD setStartTime( nSeconds )
METHOD start()
METHOD start( xAction, ... )
METHOD synchronize( nTimeOut )
METHOD threadSelf()
METHOD threadID()

4
harbour/utils/hbformat/hbformat.prg
View File

@@ -264,8 +264,8 @@ CLASS CODEFORMAT
METHOD SetOption( cLine, i, aIni )
METHOD ReadIni( cIniName )
METHOD Reformat( aFile )
METHOD FormatLine( cLine )
METHOD ConvertCmd( cLine, nBegin, nEnd )
METHOD FormatLine( cLine, lContinued )
METHOD ConvertCmd( cLine, nBegin, nEnd, lFirstOnly )
METHOD ConvertFnc( cLine, nBegin, nEnd )
METHOD ConvertBool( cLine, nBegin, nEnd )
METHOD File2Array( cFileName )