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

2012-11-09 00:15 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/xhb/xhb.hbx
  * contrib/hbtip/hbtip.hbx
    * minor fix for some class names

  * contrib/gtwvg/class.prg
  * contrib/gtwvg/menubar.prg
  * contrib/hbformat/hbfmtcls.prg
  * contrib/hbtip/cgi.prg
  * contrib/hbtip/client.prg
  * contrib/hbtip/credent.prg
  * contrib/hbtip/encoder.prg
  * contrib/hbtip/encurl.prg
  * contrib/hbtip/ftpcli.prg
  * contrib/hbtip/httpcli.prg
  * contrib/hbtip/log.prg
  * contrib/hbtip/mail.prg
  * contrib/hbtip/popcli.prg
  * contrib/hbtip/smtpcli.prg
  * contrib/hbtip/url.prg
  * contrib/hbwin/oleauto.prg
  * contrib/hbwin/wce_sim.prg
  * contrib/hbwin/win_tprn.prg
  * contrib/xhb/hblog.ch
  * contrib/xhb/hblog.prg
  * contrib/xhb/hjwindow.prg
  * contrib/xhb/htjlist.prg
  * contrib/xhb/trpc.prg
  * contrib/xhb/trpccli.prg
  * contrib/xhb/txml.prg
  * contrib/xhb/xhbmemo.prg
  * contrib/xhb/xhbole.prg
    * class names synced with the format in .hbx files
This commit is contained in:
Viktor Szakats
2012-11-08 23:18:57 +00:00
parent 7e43547b32
commit 25a47ce169
30 changed files with 448 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
harbour/ChangeLog
View File

@@ -16,6 +16,40 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-11-09 00:15 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/xhb/xhb.hbx
* contrib/hbtip/hbtip.hbx
* minor fix for some class names
* contrib/gtwvg/class.prg
* contrib/gtwvg/menubar.prg
* contrib/hbformat/hbfmtcls.prg
* contrib/hbtip/cgi.prg
* contrib/hbtip/client.prg
* contrib/hbtip/credent.prg
* contrib/hbtip/encoder.prg
* contrib/hbtip/encurl.prg
* contrib/hbtip/ftpcli.prg
* contrib/hbtip/httpcli.prg
* contrib/hbtip/log.prg
* contrib/hbtip/mail.prg
* contrib/hbtip/popcli.prg
* contrib/hbtip/smtpcli.prg
* contrib/hbtip/url.prg
* contrib/hbwin/oleauto.prg
* contrib/hbwin/wce_sim.prg
* contrib/hbwin/win_tprn.prg
* contrib/xhb/hblog.ch
* contrib/xhb/hblog.prg
* contrib/xhb/hjwindow.prg
* contrib/xhb/htjlist.prg
* contrib/xhb/trpc.prg
* contrib/xhb/trpccli.prg
* contrib/xhb/txml.prg
* contrib/xhb/xhbmemo.prg
* contrib/xhb/xhbole.prg
* class names synced with the format in .hbx files
2012-11-08 23:51 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/xhb/hbcompat.ch
* utils/hbmk2/hbmk2.prg

30
harbour/contrib/gtwvg/class.prg
View File

@@ -105,7 +105,7 @@
*/
//
CREATE CLASS wvtDialog
CREATE CLASS WvtDialog
/* To hold previous settings */
VAR nOldRows
@@ -191,7 +191,7 @@ ENDCLASS
//
METHOD wvtDialog:New( nRows, nCols, cTitle, cFont, nFontHeight, nFontWidth, nFontBold, nFontQuality )
METHOD WvtDialog:New( nRows, nCols, cTitle, cFont, nFontHeight, nFontWidth, nFontBold, nFontQuality )
LOCAL fnt_ := Wvt_GetFontInfo()
@@ -249,7 +249,7 @@ METHOD wvtDialog:New( nRows, nCols, cTitle, cFont, nFontHeight, nFontWidth, nFon
//
METHOD wvtDialog:Create()
METHOD WvtDialog:Create()
LOCAL aPalette, i, j
@@ -320,7 +320,7 @@ METHOD wvtDialog:Create()
//
METHOD wvtDialog:Destroy()
METHOD WvtDialog:Destroy()
IF HB_ISOBJECT( ::oMenu )
::oMenu:Destroy()
@@ -359,7 +359,7 @@ METHOD wvtDialog:Destroy()
//
METHOD wvtDialog:Event()
METHOD WvtDialog:Event()
LOCAL nKey
@@ -373,7 +373,7 @@ METHOD wvtDialog:Event()
//
METHOD wvtDialog:Execute()
METHOD WvtDialog:Execute()
IF ::nObjects == 0
DO WHILE .T.
@@ -390,7 +390,7 @@ METHOD wvtDialog:Execute()
//
METHOD wvtDialog:Inkey()
METHOD WvtDialog:Inkey()
LOCAL n, oObj, nID, i
@@ -610,7 +610,7 @@ METHOD wvtDialog:Inkey()
//
METHOD wvtDialog:MouseOver()
METHOD WvtDialog:MouseOver()
LOCAL mRow := MRow()
LOCAL mCol := MCol()
@@ -634,7 +634,7 @@ METHOD wvtDialog:MouseOver()
//
METHOD wvtDialog:Update()
METHOD WvtDialog:Update()
Wvt_InvalidateRect( 0, 0, ::MaxRow(), ::MaxCol() )
@@ -642,7 +642,7 @@ METHOD wvtDialog:Update()
//
METHOD wvtDialog:CreateObjects()
METHOD WvtDialog:CreateObjects()
LOCAL i, nObjs
@@ -699,7 +699,7 @@ METHOD wvtDialog:CreateObjects()
//
METHOD wvtDialog:Eval( bBlock, p1, p2, p3, p4, p5 )
METHOD WvtDialog:Eval( bBlock, p1, p2, p3, p4, p5 )
LOCAL lRet
@@ -711,7 +711,7 @@ METHOD wvtDialog:Eval( bBlock, p1, p2, p3, p4, p5 )
//
METHOD wvtDialog:ActivateMenu()
METHOD WvtDialog:ActivateMenu()
LOCAL nMenu := Wvt_GetLastMenuEvent()
LOCAL aMenuItem
@@ -3590,7 +3590,7 @@ METHOD WvtConsole:Box( nRow, nCol, n2Row, n2Col, cBoxChars, cColor )
//
//
/*
* TBrowseWVG From TBrowse
* TBrowseWvg From TBrowse
*/
//
//
@@ -3614,7 +3614,7 @@ METHOD WvtConsole:Box( nRow, nCol, n2Row, n2Col, cBoxChars, cColor )
//
CREATE CLASS TBrowseWVG FROM TBrowse
CREATE CLASS TBrowseWvg FROM TBrowse
VAR aColumnsSep INIT {}
@@ -3624,7 +3624,7 @@ ENDCLASS
//
METHOD TBrowseWVG:SetVisible()
METHOD TBrowseWvg:SetVisible()
LOCAL lFirst, aCol, nColPos

6
harbour/contrib/gtwvg/menubar.prg
View File

@@ -76,7 +76,7 @@
//
CREATE CLASS wvgMenuBar INHERIT wvgWindow
CREATE CLASS WvgMenuBar INHERIT wvgWindow
VAR hMenu
VAR pMenu
@@ -587,7 +587,7 @@ METHOD WvgMenuBar:onMenuKey( xParam )
//
//
CREATE CLASS wvgMenu INHERIT wvgMenuBar
CREATE CLASS WvgMenu INHERIT WvgMenuBar
VAR title INIT ""
@@ -661,5 +661,3 @@ METHOD WvgMenu:Popup( oXbp, aPos, nDefaultItem, nControl )
ENDIF
RETURN 0
//

26
harbour/contrib/hbformat/hbfmtcls.prg
View File

@@ -79,7 +79,7 @@
// THREAD STATIC a5
// ---
CREATE CLASS HBFORMATCODE
CREATE CLASS HBFormatCode
VAR cEol
VAR nLineErr, nErr, cLineErr
@@ -145,7 +145,7 @@ CREATE CLASS HBFORMATCODE
ENDCLASS
METHOD New( aParams, cIniName ) CLASS HBFORMATCODE
METHOD New( aParams, cIniName ) CLASS HBFormatCode
LOCAL cParam
@@ -208,7 +208,7 @@ METHOD New( aParams, cIniName ) CLASS HBFORMATCODE
RETURN Self
METHOD Reformat( aFile ) CLASS HBFORMATCODE
METHOD Reformat( aFile ) CLASS HBFormatCode
LOCAL i, iDelta := 0, nLen := Len( aFile ), cToken1, cToken2, nLenToken, nPos
LOCAL nPosSep, cLine, cLineAll, nLineSegment
@@ -475,7 +475,7 @@ METHOD Reformat( aFile ) CLASS HBFORMATCODE
#define FL_STATE_QUOTED 11
#define FL_STATE_SQBR 12
METHOD FormatLine( cLine, lContinued ) CLASS HBFORMATCODE
METHOD FormatLine( cLine, lContinued ) CLASS HBFormatCode
LOCAL i, nLen, c, nState := 0, cSymb, cToken, nPos := 1
LOCAL lFirst, nBegin, nEnd, nB := 0, nA := 0, aBrackets[ 2 ]
@@ -686,7 +686,7 @@ METHOD FormatLine( cLine, lContinued ) CLASS HBFORMATCODE
RETURN cLine
METHOD ConvertCmd( cLine, nBegin, nEnd, lFirstOnly ) CLASS HBFORMATCODE
METHOD ConvertCmd( cLine, nBegin, nEnd, lFirstOnly ) CLASS HBFormatCode
LOCAL nPos, cToken
@@ -724,7 +724,7 @@ METHOD ConvertCmd( cLine, nBegin, nEnd, lFirstOnly ) CLASS HBFORMATCODE
RETURN .T.
METHOD ConvertFnc( cLine, nBegin, nEnd ) CLASS HBFORMATCODE
METHOD ConvertFnc( cLine, nBegin, nEnd ) CLASS HBFormatCode
LOCAL nPos, cToken
@@ -752,7 +752,7 @@ METHOD ConvertFnc( cLine, nBegin, nEnd ) CLASS HBFORMATCODE
RETURN .T.
METHOD ConvertBool( cLine, nBegin, nEnd ) CLASS HBFORMATCODE
METHOD ConvertBool( cLine, nBegin, nEnd ) CLASS HBFormatCode
LOCAL cBool
LOCAL nPos, cToken
@@ -781,7 +781,7 @@ METHOD ConvertBool( cLine, nBegin, nEnd ) CLASS HBFORMATCODE
RETURN .T.
METHOD SetOption( cLine, i, aIni ) CLASS HBFORMATCODE
METHOD SetOption( cLine, i, aIni ) CLASS HBFormatCode
LOCAL nPos, cToken1, cToken2, cTemp, xRes
@@ -833,7 +833,7 @@ METHOD SetOption( cLine, i, aIni ) CLASS HBFORMATCODE
RETURN ::nErr == 0
METHOD ReadIni( cIniName ) CLASS HBFORMATCODE
METHOD ReadIni( cIniName ) CLASS HBFormatCode
LOCAL i, nLen, aIni, c
@@ -852,7 +852,7 @@ METHOD ReadIni( cIniName ) CLASS HBFORMATCODE
RETURN ::nErr == 0
METHOD Source2Array( cSource ) CLASS HBFORMATCODE
METHOD Source2Array( cSource ) CLASS HBFormatCode
IF ::nEol < 0
IF Chr( 13 ) + Chr( 10 ) $ cSource
@@ -864,7 +864,7 @@ METHOD Source2Array( cSource ) CLASS HBFORMATCODE
RETURN hb_ATokens( StrTran( cSource, Chr( 13 ) + Chr( 10 ), Chr( 10 ) ), Chr( 10 ) )
METHOD Array2Source( aSource ) CLASS HBFORMATCODE
METHOD Array2Source( aSource ) CLASS HBFormatCode
LOCAL nLen := Len( aSource ), i
LOCAL cSource := ""
@@ -884,7 +884,7 @@ METHOD Array2Source( aSource ) CLASS HBFORMATCODE
RETURN cSource
METHOD File2Array( cFileName ) CLASS HBFORMATCODE
METHOD File2Array( cFileName ) CLASS HBFormatCode
IF hb_FileExists( cFileName )
RETURN ::Source2Array( MemoRead( cFileName ) )
@@ -892,7 +892,7 @@ METHOD File2Array( cFileName ) CLASS HBFORMATCODE
RETURN NIL
METHOD Array2File( cFileName, aSource ) CLASS HBFORMATCODE
METHOD Array2File( cFileName, aSource ) CLASS HBFormatCode
LOCAL i, cName, cBakName, cPath

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

@@ -4,7 +4,7 @@
/*
* xHarbour Project source code:
* TipCgi Class oriented cgi protocol
* TIPCgi Class oriented cgi protocol
*
* Copyright 2006 Lorenzo Fiorini <lorenzo.fiorini@gmail.com>
*
@@ -69,7 +69,7 @@
#define _CRLF Chr( 13 ) + Chr( 10 )
#define _BR "<br />"
CREATE CLASS TIpCgi
CREATE CLASS TIPCgi
VAR HTTP_RAW_POST_DATA
@@ -106,7 +106,7 @@ CREATE CLASS TIpCgi
ENDCLASS
METHOD New() CLASS TIpCgi
METHOD New() CLASS TIPCgi
LOCAL aTemp
LOCAL aVar
@@ -172,7 +172,7 @@ METHOD New() CLASS TIpCgi
RETURN Self
METHOD Header( cValue ) CLASS TIpCgi
METHOD Header( cValue ) CLASS TIPCgi
IF Empty( cValue )
::cCgiHeader += "Content-Type: text/html" + _CRLF
@@ -182,13 +182,13 @@ METHOD Header( cValue ) CLASS TIpCgi
RETURN Self
METHOD Redirect( cUrl ) CLASS TIpCgi
METHOD Redirect( cUrl ) CLASS TIPCgi
::cCgiHeader += "Location: " + cUrl + _CRLF
RETURN Self
METHOD Flush() CLASS TIpCgi
METHOD Flush() CLASS TIPCgi
LOCAL cStream
LOCAL lRet
@@ -235,7 +235,7 @@ METHOD Flush() CLASS TIpCgi
RETURN lRet
METHOD SaveHtmlPage( cFile ) CLASS TIpCgi
METHOD SaveHtmlPage( cFile ) CLASS TIPCgi
LOCAL nFile
LOCAL lSuccess
@@ -253,7 +253,7 @@ METHOD SaveHtmlPage( cFile ) CLASS TIpCgi
RETURN lSuccess
METHOD StartSession( cSID ) CLASS TIpCgi
METHOD StartSession( cSID ) CLASS TIPCgi
LOCAL nH
LOCAL cFile
@@ -309,17 +309,17 @@ METHOD StartSession( cSID ) CLASS TIpCgi
RETURN Self
METHOD SessionEncode() CLASS TIpCgi
METHOD SessionEncode() CLASS TIPCgi
RETURN hb_Serialize( ::hSession )
METHOD SessionDecode( cData ) CLASS TIpCgi
METHOD SessionDecode( cData ) CLASS TIPCgi
::hSession := hb_Deserialize( cData )
RETURN HB_ISHASH( ::hSession )
METHOD DestroySession( cID ) CLASS TIpCgi
METHOD DestroySession( cID ) CLASS TIPCgi
LOCAL cFile
LOCAL cSID := ::cSID
@@ -348,7 +348,7 @@ METHOD DestroySession( cID ) CLASS TIpCgi
RETURN lRet
METHOD ErrHandler( xError ) CLASS TIpCgi
METHOD ErrHandler( xError ) CLASS TIPCgi
LOCAL nCalls
LOCAL cErrMsg := ""
@@ -384,13 +384,13 @@ METHOD ErrHandler( xError ) CLASS TIpCgi
RETURN NIL
METHOD Write( cString ) CLASS TIpCgi
METHOD Write( cString ) CLASS TIPCgi
::cHtmlPage += cString + _CRLF
RETURN Self
METHOD StartHtml( hOptions ) CLASS TIpCgi
METHOD StartHtml( hOptions ) CLASS TIPCgi
::cHtmlPage += ;
'<?xml version="1.0"' + HtmlOption( hOptions, "encoding", " " ) + "?>" + _CRLF + ;
@@ -409,7 +409,7 @@ METHOD StartHtml( hOptions ) CLASS TIpCgi
RETURN Self
METHOD EndHtml() CLASS TIpCgi
METHOD EndHtml() CLASS TIPCgi
::cHtmlPage += "</body></html>"

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

@@ -54,12 +54,12 @@
/* 2004-01-13
Enhanced tip cliente to conenct to secure smtp servers by Luiz Rafael Culik
2007-03-29, Hannes Ziegler
Adapted all :new() method(s) so that tIPClient becomes the
abstract super class for TIpClientFtp, TIpClientHttp, TIpClientPop and TIpClientSmtp
Adapted all :new() method(s) so that TIPClient becomes the
abstract super class for TIPClientFtp, TIPClientHttp, TIPClientPop and TIPClientSmtp
Added Methods :INetErrorDesc(), :lastErrorCode() and :lastErrorMessage()
Removed method :data() since it calls an undeclared method :getOk()
:data() is used in TIpClientSmtp
:data() is used in TIPClientSmtp
Fixed bug in :readToFile()
2007-06-01, Toninho@fwi
@@ -87,7 +87,7 @@
/**
* Inet Client class
*/
CREATE CLASS tIPClient
CREATE CLASS TIPClient
CLASS VAR bInitSocks INIT .F.
CLASS VAR cCRLF INIT tip_CRLF()
@@ -182,7 +182,7 @@ CREATE CLASS tIPClient
ENDCLASS
METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClient
METHOD New( oUrl, xTrace, oCredentials ) CLASS TIPClient
LOCAL oErr
LOCAL oLog
@@ -242,7 +242,7 @@ METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClient
RETURN self
METHOD Open( cUrl ) CLASS tIPClient
METHOD Open( cUrl ) CLASS TIPClient
LOCAL nPort
LOCAL cResp
@@ -277,7 +277,7 @@ METHOD Open( cUrl ) CLASS tIPClient
RETURN .T.
METHOD EnableTLS( lEnable ) CLASS tIPClient
METHOD EnableTLS( lEnable ) CLASS TIPClient
LOCAL lSuccess
@@ -305,7 +305,7 @@ METHOD EnableTLS( lEnable ) CLASS tIPClient
RETURN lSuccess
METHOD OpenProxy( cServer, nPort, cProxy, nProxyPort, cResp, cUserName, cPassWord, cUserAgent ) CLASS tIPClient
METHOD OpenProxy( cServer, nPort, cProxy, nProxyPort, cResp, cUserName, cPassWord, cUserAgent ) CLASS TIPClient
LOCAL cRequest
LOCAL lRet := .F.
@@ -340,7 +340,7 @@ METHOD OpenProxy( cServer, nPort, cProxy, nProxyPort, cResp, cUserName, cPassWor
RETURN lRet
METHOD ReadHTTPProxyResponse( /* @ */ sResponse ) CLASS tIPClient
METHOD ReadHTTPProxyResponse( /* @ */ sResponse ) CLASS TIPClient
LOCAL bMoreDataToRead := .T.
LOCAL nLength, nData
@@ -364,7 +364,7 @@ METHOD ReadHTTPProxyResponse( /* @ */ sResponse ) CLASS tIPClient
RETURN .T.
METHOD Close() CLASS tIPClient
METHOD Close() CLASS TIPClient
LOCAL nRet := -1
@@ -389,17 +389,17 @@ METHOD Close() CLASS tIPClient
RETURN nRet
METHOD Reset() CLASS tIPClient
METHOD Reset() CLASS TIPClient
::bInitialized := .F.
::bEof := .F.
RETURN .T.
METHOD Commit() CLASS tIPClient
METHOD Commit() CLASS TIPClient
RETURN .T.
METHOD Read( nLen ) CLASS tIPClient
METHOD Read( nLen ) CLASS TIPClient
LOCAL cStr0
LOCAL cStr1
@@ -454,7 +454,7 @@ METHOD Read( nLen ) CLASS tIPClient
RETURN cStr0
METHOD ReadToFile( cFile, nMode, nSize ) CLASS tIPClient
METHOD ReadToFile( cFile, nMode, nSize ) CLASS TIPClient
LOCAL nFout
LOCAL cData
@@ -513,7 +513,7 @@ METHOD ReadToFile( cFile, nMode, nSize ) CLASS tIPClient
RETURN .T.
METHOD WriteFromFile( cFile ) CLASS tIPClient
METHOD WriteFromFile( cFile ) CLASS TIPClient
LOCAL nFin
LOCAL cData
@@ -563,9 +563,9 @@ METHOD WriteFromFile( cFile ) CLASS tIPClient
RETURN .T.
/*
HZ: METHOD :getOk() is not declared in tIPClient
HZ: METHOD :getOk() is not declared in TIPClient
METHOD Data( cData ) CLASS tIPClient
METHOD Data( cData ) CLASS TIPClient
::InetSendall( ::SocketCon, "DATA" + ::cCRLF )
IF ! ::GetOk()
RETURN .F.
@@ -574,7 +574,7 @@ METHOD Data( cData ) CLASS tIPClient
RETURN ::GetOk()
*/
METHOD Write( cData, nLen, bCommit ) CLASS tIPClient
METHOD Write( cData, nLen, bCommit ) CLASS TIPClient
IF Empty( nLen )
nLen := Len( cData )
@@ -590,7 +590,7 @@ METHOD Write( cData, nLen, bCommit ) CLASS tIPClient
RETURN ::nLastWrite
METHOD inetSendAll( SocketCon, cData, nLen ) CLASS tIPClient
METHOD inetSendAll( SocketCon, cData, nLen ) CLASS TIPClient
LOCAL nRet
@@ -618,7 +618,7 @@ METHOD inetSendAll( SocketCon, cData, nLen ) CLASS tIPClient
RETURN nRet
METHOD inetCount( SocketCon ) CLASS tIPClient
METHOD inetCount( SocketCon ) CLASS TIPClient
LOCAL nRet := hb_inetCount( SocketCon )
@@ -628,7 +628,7 @@ METHOD inetCount( SocketCon ) CLASS tIPClient
RETURN nRet
METHOD inetRecv( SocketCon, cStr1, len ) CLASS tIPClient
METHOD inetRecv( SocketCon, cStr1, len ) CLASS TIPClient
LOCAL nRet
@@ -652,7 +652,7 @@ METHOD inetRecv( SocketCon, cStr1, len ) CLASS tIPClient
RETURN nRet
METHOD inetRecvLine( SocketCon, nRet, size ) CLASS tIPClient
METHOD inetRecvLine( SocketCon, nRet, size ) CLASS TIPClient
LOCAL cRet
@@ -680,7 +680,7 @@ METHOD inetRecvLine( SocketCon, nRet, size ) CLASS tIPClient
RETURN cRet
METHOD inetRecvAll( SocketCon, cRet, size ) CLASS tIPClient
METHOD inetRecvAll( SocketCon, cRet, size ) CLASS TIPClient
LOCAL nRet
@@ -708,7 +708,7 @@ METHOD inetRecvAll( SocketCon, cRet, size ) CLASS tIPClient
RETURN nRet
METHOD inetErrorCode( SocketCon ) CLASS tIPClient
METHOD inetErrorCode( SocketCon ) CLASS TIPClient
LOCAL nRet
@@ -730,7 +730,7 @@ METHOD inetErrorCode( SocketCon ) CLASS tIPClient
RETURN nRet
METHOD inetErrorDesc( SocketCon ) CLASS tIPClient
METHOD inetErrorDesc( SocketCon ) CLASS TIPClient
LOCAL cMsg := ""
@@ -751,7 +751,7 @@ METHOD inetErrorDesc( SocketCon ) CLASS tIPClient
RETURN cMsg
/* BROKEN, should test number of parameters and act accordingly, see doc\inet.txt */
METHOD inetConnect( cServer, nPort, SocketCon ) CLASS tIPClient
METHOD inetConnect( cServer, nPort, SocketCon ) CLASS TIPClient
hb_inetConnect( cServer, nPort, SocketCon )
@@ -777,7 +777,7 @@ METHOD inetConnect( cServer, nPort, SocketCon ) CLASS tIPClient
RETURN NIL
/* Methods to manage buffers */
METHOD InetRcvBufSize( SocketCon, nSizeBuff ) CLASS tIPClient
METHOD InetRcvBufSize( SocketCon, nSizeBuff ) CLASS TIPClient
IF ! Empty( nSizeBuff )
hb_inetSetRcvBufSize( SocketCon, nSizeBuff )
@@ -785,7 +785,7 @@ METHOD InetRcvBufSize( SocketCon, nSizeBuff ) CLASS tIPClient
RETURN hb_inetGetRcvBufSize( SocketCon )
METHOD InetSndBufSize( SocketCon, nSizeBuff ) CLASS tIPClient
METHOD InetSndBufSize( SocketCon, nSizeBuff ) CLASS TIPClient
IF ! Empty( nSizeBuff )
hb_inetSetSndBufSize( SocketCon, nSizeBuff )
@@ -793,7 +793,7 @@ METHOD InetSndBufSize( SocketCon, nSizeBuff ) CLASS tIPClient
RETURN hb_inetGetSndBufSize( SocketCon )
METHOD InetTimeOut( SocketCon, nConnTimeout ) CLASS tIPClient
METHOD InetTimeOut( SocketCon, nConnTimeout ) CLASS TIPClient
IF HB_ISNUMERIC( nConnTimeout )
::nConnTimeout := nConnTimeout
@@ -809,7 +809,7 @@ METHOD InetTimeOut( SocketCon, nConnTimeout ) CLASS tIPClient
Example, I want to log MyFunc( a, b, c ) which returns m,
::Log( a, b, c, m )
*/
METHOD Log( ... ) CLASS tIPClient
METHOD Log( ... ) CLASS TIPClient
LOCAL xVar
LOCAL cMsg
@@ -843,7 +843,7 @@ METHOD Log( ... ) CLASS tIPClient
RETURN Self
METHOD SetProxy( cProxyHost, nProxyPort, cProxyUser, cProxyPassword ) CLASS tIPClient
METHOD SetProxy( cProxyHost, nProxyPort, cProxyUser, cProxyPassword ) CLASS TIPClient
::cProxyHost := cProxyHost
::nProxyPort := nProxyPort

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

@@ -57,7 +57,7 @@
* A way to give basic credentials
*/
CREATE CLASS tIPCredentials
CREATE CLASS TIPCredentials
VAR cMethod
VAR cUserid

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

@@ -78,7 +78,7 @@ FUNCTION tip_GetEncoder( cModel )
oEncoder := TIPEncoderQP():New()
CASE cModel == "url" .OR. cModel == "urlencoded"
oEncoder := TIPEncoderURL():New()
oEncoder := TIPEncoderUrl():New()
CASE cModel == "7bit" .OR. cModel == "8bit"
oEncoder := TIPEncoder():New( cModel )

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

@@ -60,14 +60,14 @@ CREATE CLASS TIPEncoderUrl FROM TIPEncoder
ENDCLASS
METHOD New() CLASS TIPEncoderURL
METHOD New() CLASS TIPEncoderUrl
::cName := "urlencoded"
RETURN Self
METHOD Encode( cData ) CLASS TIPEncoderURL
METHOD Encode( cData ) CLASS TIPEncoderUrl
RETURN tip_URLEncode( cData )
METHOD Decode( cData ) CLASS TIPEncoderURL
METHOD Decode( cData ) CLASS TIPEncoderUrl
RETURN tip_URLDecode( cData )

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

@@ -100,7 +100,7 @@
/* TOFIX: This won't work in MT programs. [vszakats] */
STATIC s_nPort := 16000
CREATE CLASS tIPClientFTP FROM tIPClient
CREATE CLASS TIPClientFTP FROM TIPClient
VAR nDataPort
VAR cDataServer
@@ -155,7 +155,7 @@ CREATE CLASS tIPClientFTP FROM tIPClient
ENDCLASS
METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClientFTP
METHOD New( oUrl, xTrace, oCredentials ) CLASS TIPClientFTP
::super:new( oUrl, iif( HB_ISLOGICAL( xTrace ) .AND. xTrace, "ftp", xTrace ), oCredentials )
@@ -172,7 +172,7 @@ METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClientFTP
RETURN Self
METHOD Open( cUrl ) CLASS tIPClientFTP
METHOD Open( cUrl ) CLASS TIPClientFTP
IF HB_ISSTRING( cUrl )
::oUrl := TUrl():New( cUrl )
@@ -199,7 +199,7 @@ METHOD Open( cUrl ) CLASS tIPClientFTP
RETURN .F.
METHOD GetReply() CLASS tIPClientFTP
METHOD GetReply() CLASS TIPClientFTP
LOCAL nLen
LOCAL cRep
@@ -225,7 +225,7 @@ METHOD GetReply() CLASS tIPClientFTP
RETURN .T.
METHOD Pasv() CLASS tIPClientFTP
METHOD Pasv() CLASS TIPClientFTP
LOCAL aRep
@@ -246,7 +246,7 @@ METHOD Pasv() CLASS tIPClientFTP
RETURN .T.
METHOD Close() CLASS tIPClientFTP
METHOD Close() CLASS TIPClientFTP
::InetTimeOut( ::SocketCon )
@@ -254,43 +254,43 @@ METHOD Close() CLASS tIPClientFTP
RETURN ::super:Close()
METHOD Quit() CLASS tIPClientFTP
METHOD Quit() CLASS TIPClientFTP
::inetSendAll( ::SocketCon, "QUIT" + ::cCRLF )
RETURN ::GetReply()
METHOD TypeI() CLASS tIPClientFTP
METHOD TypeI() CLASS TIPClientFTP
::inetSendAll( ::SocketCon, "TYPE I" + ::cCRLF )
RETURN ::GetReply()
METHOD TypeA() CLASS tIPClientFTP
METHOD TypeA() CLASS TIPClientFTP
::inetSendAll( ::SocketCon, "TYPE A" + ::cCRLF )
RETURN ::GetReply()
METHOD NoOp() CLASS tIPClientFTP
METHOD NoOp() CLASS TIPClientFTP
::inetSendAll( ::SocketCon, "NOOP" + ::cCRLF )
RETURN ::GetReply()
METHOD Rest( nPos ) CLASS tIPClientFTP
METHOD Rest( nPos ) CLASS TIPClientFTP
::inetSendAll( ::SocketCon, "REST " + hb_ntos( iif( Empty( nPos ), 0, nPos ) ) + ::cCRLF )
RETURN ::GetReply()
METHOD CWD( cPath ) CLASS tIPClientFTP
METHOD CWD( cPath ) CLASS TIPClientFTP
::inetSendAll( ::SocketCon, "CWD " + cPath + ::cCRLF )
RETURN ::GetReply()
METHOD PWD() CLASS tIPClientFTP
METHOD PWD() CLASS TIPClientFTP
::inetSendAll( ::SocketCon, "PWD" + ::cCRLF )
IF ! ::GetReply()
@@ -302,14 +302,14 @@ METHOD PWD() CLASS tIPClientFTP
RETURN .T.
METHOD DELE( cPath ) CLASS tIPClientFTP
METHOD DELE( cPath ) CLASS TIPClientFTP
::inetSendAll( ::SocketCon, "DELE " + cPath + ::cCRLF )
RETURN ::GetReply()
// scan last reply for an hint of length
METHOD ScanLength() CLASS tIPClientFTP
METHOD ScanLength() CLASS TIPClientFTP
LOCAL aBytes := hb_regex( ::RegBytes, ::cReply )
@@ -319,7 +319,7 @@ METHOD ScanLength() CLASS tIPClientFTP
RETURN .T.
METHOD TransferStart() CLASS tIPClientFTP
METHOD TransferStart() CLASS TIPClientFTP
LOCAL skt
@@ -363,7 +363,7 @@ METHOD TransferStart() CLASS tIPClientFTP
RETURN .T.
METHOD Commit() CLASS tIPClientFTP
METHOD Commit() CLASS TIPClientFTP
hb_inetClose( ::SocketCon )
@@ -381,7 +381,7 @@ METHOD Commit() CLASS tIPClientFTP
RETURN .T.
METHOD List( cSpec ) CLASS tIPClientFTP
METHOD List( cSpec ) CLASS TIPClientFTP
LOCAL cStr
@@ -409,7 +409,7 @@ METHOD List( cSpec ) CLASS tIPClientFTP
RETURN cStr
METHOD UserCommand( cCommand, lPasv, lReadPort, lGetReply ) CLASS tIPClientFTP
METHOD UserCommand( cCommand, lPasv, lReadPort, lGetReply ) CLASS TIPClientFTP
hb_default( @cCommand, "" )
hb_default( @lPasv, .T. )
@@ -432,7 +432,7 @@ METHOD UserCommand( cCommand, lPasv, lReadPort, lGetReply ) CLASS tIPClientFTP
RETURN .T.
METHOD ReadAuxPort( cLocalFile ) CLASS tIPClientFTP
METHOD ReadAuxPort( cLocalFile ) CLASS TIPClientFTP
LOCAL cRet
LOCAL cList := ""
@@ -466,7 +466,7 @@ METHOD ReadAuxPort( cLocalFile ) CLASS tIPClientFTP
RETURN NIL
METHOD Stor( cFile ) CLASS tIPClientFTP
METHOD Stor( cFile ) CLASS TIPClientFTP
IF ::bUsePasv
IF ! ::Pasv()
@@ -485,7 +485,7 @@ METHOD Stor( cFile ) CLASS tIPClientFTP
RETURN ::TransferStart()
METHOD Port() CLASS tIPClientFTP
METHOD Port() CLASS TIPClientFTP
::SocketPortServer := hb_inetCreate( ::nConnTimeout )
s_nPort++
@@ -499,7 +499,7 @@ METHOD Port() CLASS tIPClientFTP
RETURN .F.
METHOD SendPort() CLASS tIPClientFTP
METHOD SendPort() CLASS TIPClientFTP
LOCAL cAddr
LOCAL cPort, nPort
@@ -512,7 +512,7 @@ METHOD SendPort() CLASS tIPClientFTP
RETURN ::GetReply()
METHOD Read( nLen ) CLASS tIPClientFTP
METHOD Read( nLen ) CLASS TIPClientFTP
LOCAL cRet
@@ -548,7 +548,7 @@ METHOD Read( nLen ) CLASS tIPClientFTP
RETURN cRet
/* FTP transfer wants commit only at end. */
METHOD Write( cData, nLen ) CLASS tIPClientFTP
METHOD Write( cData, nLen ) CLASS TIPClientFTP
IF ! ::bInitialized
@@ -572,7 +572,7 @@ METHOD Write( cData, nLen ) CLASS tIPClientFTP
RETURN ::super:Write( cData, nLen, .F. )
METHOD Retr( cFile ) CLASS tIPClientFTP
METHOD Retr( cFile ) CLASS TIPClientFTP
IF ::bUsePasv
IF ! ::Pasv()
@@ -590,7 +590,7 @@ METHOD Retr( cFile ) CLASS tIPClientFTP
RETURN .F.
METHOD MGET( cSpec, cLocalPath ) CLASS tIPClientFTP
METHOD MGET( cSpec, cLocalPath ) CLASS TIPClientFTP
LOCAL cStr, cFile
@@ -617,7 +617,7 @@ METHOD MGET( cSpec, cLocalPath ) CLASS tIPClientFTP
RETURN cStr
METHOD MPUT( cFileSpec, cAttr ) CLASS tIPClientFTP
METHOD MPUT( cFileSpec, cAttr ) CLASS TIPClientFTP
LOCAL cPath, cFile, cExt, aFile
LOCAL cStr := ""
@@ -637,7 +637,7 @@ METHOD MPUT( cFileSpec, cAttr ) CLASS tIPClientFTP
RETURN SubStr( cStr, Len( tip_CRLF() ) + 1 )
METHOD UpLoadFile( cLocalFile, cRemoteFile ) CLASS tIPClientFTP
METHOD UpLoadFile( cLocalFile, cRemoteFile ) CLASS TIPClientFTP
LOCAL cPath
LOCAL cFile
@@ -678,7 +678,7 @@ METHOD UpLoadFile( cLocalFile, cRemoteFile ) CLASS tIPClientFTP
RETURN ::WriteFromFile( cLocalFile )
METHOD LS( cSpec ) CLASS tIPClientFTP
METHOD LS( cSpec ) CLASS TIPClientFTP
LOCAL cStr
@@ -703,7 +703,7 @@ METHOD LS( cSpec ) CLASS tIPClientFTP
RETURN cStr
/* Rename a traves del ftp */
METHOD Rename( cFrom, cTo ) CLASS tIPClientFTP
METHOD Rename( cFrom, cTo ) CLASS TIPClientFTP
LOCAL lResult := .F.
@@ -716,7 +716,7 @@ METHOD Rename( cFrom, cTo ) CLASS tIPClientFTP
RETURN lResult
METHOD DownLoadFile( cLocalFile, cRemoteFile ) CLASS tIPClientFTP
METHOD DownLoadFile( cLocalFile, cRemoteFile ) CLASS TIPClientFTP
LOCAL cPath
LOCAL cFile
@@ -753,7 +753,7 @@ METHOD DownLoadFile( cLocalFile, cRemoteFile ) CLASS tIPClientFTP
// Create a new folder
METHOD MKD( cPath ) CLASS tIPClientFTP
METHOD MKD( cPath ) CLASS TIPClientFTP
::inetSendAll( ::SocketCon, "MKD " + cPath + ::cCRLF )
@@ -761,7 +761,7 @@ METHOD MKD( cPath ) CLASS tIPClientFTP
// Delete an existing folder
METHOD RMD( cPath ) CLASS tIPClientFTP
METHOD RMD( cPath ) CLASS TIPClientFTP
::inetSendAll( ::SocketCon, "RMD " + cPath + ::cCRLF )
@@ -769,7 +769,7 @@ METHOD RMD( cPath ) CLASS tIPClientFTP
// Return total file size for <cFileSpec>
METHOD fileSize( cFileSpec ) CLASS tIPClientFTP
METHOD fileSize( cFileSpec ) CLASS TIPClientFTP
LOCAL aFile
LOCAL nSize := 0
@@ -782,7 +782,7 @@ METHOD fileSize( cFileSpec ) CLASS tIPClientFTP
// Parse the :list() string into a Directory() compatible 2-dim array
METHOD listFiles( cFileSpec ) CLASS tIPClientFTP
METHOD listFiles( cFileSpec ) CLASS TIPClientFTP
LOCAL aMonth := { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }
LOCAL cList, aList, aFile, cEntry, nStart, nEnd

2
harbour/contrib/hbtip/hbtip.hbx
View File

@@ -47,7 +47,7 @@ DYNAMIC TIPCredentials
DYNAMIC TIPEncoder
DYNAMIC TIPEncoderBase64
DYNAMIC TIPEncoderQP
DYNAMIC TIPEncoderURL
DYNAMIC TIPEncoderUrl
DYNAMIC TIPLog
DYNAMIC TIPMail
DYNAMIC tip_Base64Encode

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

@@ -54,7 +54,7 @@
#include "fileio.ch"
CREATE CLASS tIPClientHTTP FROM tIPClient
CREATE CLASS TIPClientHTTP FROM TIPClient
VAR cMethod
VAR nReplyCode
@@ -90,7 +90,7 @@ CREATE CLASS tIPClientHTTP FROM tIPClient
ENDCLASS
METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClientHTTP
METHOD New( oUrl, xTrace, oCredentials ) CLASS TIPClientHTTP
::super:new( oUrl, iif( HB_ISLOGICAL( xTrace ) .AND. xTrace, "http", xTrace ), oCredentials )
@@ -102,7 +102,7 @@ METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClientHTTP
RETURN Self
METHOD Get( cQuery ) CLASS tIPClientHTTP
METHOD Get( cQuery ) CLASS TIPClientHTTP
IF ! HB_ISSTRING( cQuery )
cQuery := ::oUrl:BuildQuery()
@@ -117,7 +117,7 @@ METHOD Get( cQuery ) CLASS tIPClientHTTP
RETURN .F.
METHOD Post( xPostData, cQuery ) CLASS tIPClientHTTP
METHOD Post( xPostData, cQuery ) CLASS TIPClientHTTP
LOCAL cData, nI, cTmp, y
@@ -176,7 +176,7 @@ METHOD Post( xPostData, cQuery ) CLASS tIPClientHTTP
RETURN .F.
METHOD StandardFields() CLASS tIPClientHTTP
METHOD StandardFields() CLASS TIPClientHTTP
LOCAL iCount
LOCAL oEncoder, cCookies
@@ -208,7 +208,7 @@ METHOD StandardFields() CLASS tIPClientHTTP
RETURN .T.
METHOD ReadHeaders( lClear ) CLASS tIPClientHTTP
METHOD ReadHeaders( lClear ) CLASS TIPClientHTTP
LOCAL cLine, nPos, aVersion
LOCAL aHead
@@ -275,7 +275,7 @@ METHOD ReadHeaders( lClear ) CLASS tIPClientHTTP
RETURN .T.
METHOD Read( nLen ) CLASS tIPClientHTTP
METHOD Read( nLen ) CLASS TIPClientHTTP
LOCAL cData, nPos, cLine, aHead
@@ -346,7 +346,7 @@ METHOD Read( nLen ) CLASS tIPClientHTTP
RETURN cData
METHOD ReadAll() CLASS tIPClientHTTP
METHOD ReadAll() CLASS TIPClientHTTP
LOCAL cOut := "", cChunk
@@ -369,7 +369,7 @@ METHOD ReadAll() CLASS tIPClientHTTP
RETURN cOut
METHOD setCookie( cLine ) CLASS tIPClientHTTP
METHOD setCookie( cLine ) CLASS TIPClientHTTP
// docs from http://www.ietf.org/rfc/rfc2109.txt
LOCAL aParam
@@ -420,7 +420,7 @@ METHOD setCookie( cLine ) CLASS tIPClientHTTP
RETURN NIL
METHOD getcookies( cHost, cPath ) CLASS tIPClientHTTP
METHOD getcookies( cHost, cPath ) CLASS TIPClientHTTP
LOCAL x, y, aDomKeys := {}, aKeys, z, cKey, aPathKeys, nPath
LOCAL a, b, cOut := "", c, d
@@ -480,7 +480,7 @@ METHOD getcookies( cHost, cPath ) CLASS tIPClientHTTP
RETURN cOut
METHOD Boundary( nType ) CLASS tIPClientHTTP
METHOD Boundary( nType ) CLASS TIPClientHTTP
/*
nType: 0=as found as the separator in the stdin stream
1=as found as the last one in the stdin stream
@@ -506,13 +506,13 @@ METHOD Boundary( nType ) CLASS tIPClientHTTP
RETURN cBound
METHOD Attach( cName, cFileName, cType ) CLASS tIPClientHTTP
METHOD Attach( cName, cFileName, cType ) CLASS TIPClientHTTP
AAdd( ::aAttachments, { cName, cFileName, cType } )
RETURN NIL
METHOD PostMultiPart( xPostData, cQuery ) CLASS tIPClientHTTP
METHOD PostMultiPart( xPostData, cQuery ) CLASS TIPClientHTTP
LOCAL cData := "", nI, cTmp, y, cBound := ::boundary()
LOCAL cCrlf := ::cCRlf, oSub
@@ -602,7 +602,7 @@ METHOD PostMultiPart( xPostData, cQuery ) CLASS tIPClientHTTP
RETURN .F.
METHOD WriteAll( cFile ) CLASS tIPClientHTTP
METHOD WriteAll( cFile ) CLASS TIPClientHTTP
LOCAL nFile
LOCAL lSuccess

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

@@ -54,7 +54,7 @@
#include "fileio.ch"
CREATE CLASS TIPLOG
CREATE CLASS TIPLog
METHOD New( cFileName )
METHOD Add( cMsg )
@@ -68,7 +68,7 @@ CREATE CLASS TIPLOG
ENDCLASS
METHOD New( cFileName ) CLASS TIPLOG
METHOD New( cFileName ) CLASS TIPLog
IF ! HB_ISSTRING( cFileName )
cFileName := "hbtip"
@@ -82,7 +82,7 @@ METHOD New( cFileName ) CLASS TIPLOG
RETURN Self
METHOD Add( cMsg ) CLASS TIPLOG
METHOD Add( cMsg ) CLASS TIPLog
LOCAL cDir, cName, cExt
LOCAL n
@@ -108,7 +108,7 @@ METHOD Add( cMsg ) CLASS TIPLOG
RETURN .F.
METHOD Close() CLASS TIPLOG
METHOD Close() CLASS TIPLog
LOCAL lRetVal
@@ -120,5 +120,5 @@ METHOD Close() CLASS TIPLOG
RETURN .F.
METHOD Clear() CLASS TIPLOG
METHOD Clear() CLASS TIPLog
RETURN ::Close() .AND. FErase( ::cFileName ) == 0

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

@@ -61,7 +61,7 @@
#include "hbclass.ch"
CREATE CLASS TipMail
CREATE CLASS TIPMail
VAR hHeaders
// received fields may be more than once.
@@ -118,7 +118,7 @@ CREATE CLASS TipMail
ENDCLASS
METHOD New( cBody, oEncoder ) CLASS TipMail
METHOD New( cBody, oEncoder ) CLASS TIPMail
// Set header fileds to non-sensitive
::hHeaders := hb_HSetCaseMatch( { => }, .F. )
@@ -136,7 +136,7 @@ METHOD New( cBody, oEncoder ) CLASS TipMail
RETURN Self
METHOD SetEncoder( cEncoder ) CLASS TipMail
METHOD SetEncoder( cEncoder ) CLASS TIPMail
IF HB_ISSTRING( cEncoder )
::oEncoder := tip_GetEncoder( cEncoder )
@@ -147,7 +147,7 @@ METHOD SetEncoder( cEncoder ) CLASS TipMail
RETURN .T.
METHOD SetBody( cBody ) CLASS TipMail
METHOD SetBody( cBody ) CLASS TIPMail
IF ::oEncoder != NIL
::cBody := ::oEncoder:Encode( cBody )
@@ -161,7 +161,7 @@ METHOD SetBody( cBody ) CLASS TipMail
RETURN .T.
METHOD GetBody() CLASS TipMail
METHOD GetBody() CLASS TIPMail
IF ::cBody == NIL
RETURN NIL
@@ -171,7 +171,7 @@ METHOD GetBody() CLASS TipMail
RETURN ::cBody
METHOD GetFieldPart( cPart ) CLASS TipMail
METHOD GetFieldPart( cPart ) CLASS TIPMail
LOCAL nPos, cEnc
@@ -188,7 +188,7 @@ METHOD GetFieldPart( cPart ) CLASS TipMail
RETURN cEnc
METHOD GetFieldOption( cPart, cOption ) CLASS TipMail
METHOD GetFieldOption( cPart, cOption ) CLASS TIPMail
LOCAL nPos, aMatch
LOCAL cEnc
@@ -209,7 +209,7 @@ METHOD GetFieldOption( cPart, cOption ) CLASS TipMail
RETURN cEnc
METHOD SetFieldPart( cPart, cValue ) CLASS TipMail
METHOD SetFieldPart( cPart, cValue ) CLASS TIPMail
LOCAL nPos, cEnc
@@ -228,7 +228,7 @@ METHOD SetFieldPart( cPart, cValue ) CLASS TipMail
RETURN .T.
METHOD SetFieldOption( cPart, cOption, cValue ) CLASS TipMail
METHOD SetFieldOption( cPart, cOption, cValue ) CLASS TIPMail
LOCAL nPos, aMatch
LOCAL cEnc
@@ -249,9 +249,9 @@ METHOD SetFieldOption( cPart, cOption, cValue ) CLASS TipMail
RETURN .T.
METHOD Attach( oSubPart ) CLASS TipMail
METHOD Attach( oSubPart ) CLASS TIPMail
IF HB_ISOBJECT( oSubPart ) .AND. oSubPart:ClassName == "TIPMAIL"
IF HB_ISOBJECT( oSubPart ) .AND. oSubPart:ClassName == "TIPMail"
// reset wrong content-type
IF At( "multipart/", Lower( ::GetFieldPart( "Content-Type" ) ) ) == 0
::hHeaders[ "Content-Type" ] := "multipart/mixed"
@@ -263,7 +263,7 @@ METHOD Attach( oSubPart ) CLASS TipMail
RETURN .F.
METHOD NextAttachment() CLASS TipMail
METHOD NextAttachment() CLASS TIPMail
IF ::nAttachPos > Len( ::aAttachments )
RETURN NIL
@@ -273,7 +273,7 @@ METHOD NextAttachment() CLASS TipMail
RETURN ::aAttachments[ ::nAttachPos - 1 ]
METHOD GetAttachment() CLASS TipMail
METHOD GetAttachment() CLASS TIPMail
IF ::nAttachPos > Len( ::aAttachments )
RETURN NIL
@@ -281,7 +281,7 @@ METHOD GetAttachment() CLASS TipMail
RETURN ::aAttachments[ ::nAttachPos ]
METHOD ToString() CLASS TipMail
METHOD ToString() CLASS TIPMail
LOCAL cBoundary, cElem, i
LOCAL cRet := ""
@@ -379,7 +379,7 @@ METHOD ToString() CLASS TipMail
RETURN cRet
METHOD FromString( cMail, cBoundary, nPos ) CLASS TipMail
METHOD FromString( cMail, cBoundary, nPos ) CLASS TIPMail
LOCAL oSubSection, cSubBoundary
LOCAL nLinePos, nSplitPos, nBodyPos
@@ -514,7 +514,7 @@ METHOD FromString( cMail, cBoundary, nPos ) CLASS TipMail
RETURN nPos
METHOD MakeBoundary() CLASS TipMail
METHOD MakeBoundary() CLASS TIPMail
LOCAL cBound := "=_0" + Space( 17 )
LOCAL i
@@ -528,7 +528,7 @@ METHOD MakeBoundary() CLASS TipMail
RETURN cBound
METHOD setHeader( cSubject, cFrom, xTo, xCC, xBCC ) CLASS TipMail
METHOD setHeader( cSubject, cFrom, xTo, xCC, xBCC ) CLASS TIPMail
LOCAL aTo, aCC, aBCC, i, imax
LOCAL cTo, cCC, cBCC
@@ -620,7 +620,7 @@ METHOD setHeader( cSubject, cFrom, xTo, xCC, xBCC ) CLASS TipMail
RETURN .T.
METHOD attachFile( cFileName ) CLASS TipMail
METHOD attachFile( cFileName ) CLASS TIPMail
LOCAL cContent := hb_MemoRead( cFileName )
LOCAL cMimeType := tip_FileMimeType( cFileName )
@@ -643,7 +643,7 @@ METHOD attachFile( cFileName ) CLASS TipMail
RETURN ::attach( oAttach )
METHOD detachFile( cPath ) CLASS TipMail
METHOD detachFile( cPath ) CLASS TIPMail
LOCAL cContent := ::getBody()
LOCAL cFileName := ::getFileName()
@@ -668,13 +668,13 @@ METHOD detachFile( cPath ) CLASS TipMail
RETURN FError() == 0
METHOD getFileName() 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
METHOD getMultiParts( aParts ) CLASS TIPMail
LOCAL oSubPart, lReset := .F.

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

@@ -61,7 +61,7 @@
* Inet service manager: pop3
*/
CREATE CLASS tIPClientPOP FROM tIPClient
CREATE CLASS TIPClientPOP FROM TIPClient
METHOD New( oUrl, xTrace, oCredentials )
METHOD Open( cUrl )
@@ -83,7 +83,7 @@ CREATE CLASS tIPClientPOP FROM tIPClient
ENDCLASS
METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClientPOP
METHOD New( oUrl, xTrace, oCredentials ) CLASS TIPClientPOP
::super:new( oUrl, iif( HB_ISLOGICAL( xTrace ) .AND. xTrace, "pop3", xTrace ), oCredentials )
@@ -94,7 +94,7 @@ METHOD New( oUrl, xTrace, oCredentials ) CLASS tIPClientPOP
/**
*/
METHOD Open( cUrl ) CLASS tIPClientPOP
METHOD Open( cUrl ) CLASS TIPClientPOP
IF ! ::super:Open( cUrl )
RETURN .F.
@@ -117,7 +117,7 @@ METHOD Open( cUrl ) CLASS tIPClientPOP
RETURN .F.
METHOD OpenDigest( cUrl ) CLASS tIPClientPOP
METHOD OpenDigest( cUrl ) CLASS TIPClientPOP
LOCAL nPos, nPos2, cDigest
@@ -147,7 +147,7 @@ METHOD OpenDigest( cUrl ) CLASS tIPClientPOP
RETURN .F.
METHOD Close( lAutoQuit ) CLASS tIPClientPOP
METHOD Close( lAutoQuit ) CLASS TIPClientPOP
IF ! HB_ISLOGICAL( lAutoQuit )
lAutoQuit := .T.
@@ -163,13 +163,13 @@ METHOD Close( lAutoQuit ) CLASS tIPClientPOP
/**
*/
METHOD Delete( nId ) CLASS tIPClientPOP
METHOD Delete( nId ) CLASS TIPClientPOP
::inetSendAll( ::SocketCon, "DELE " + hb_ntos( nId ) + ::cCRLF )
RETURN ::GetOk()
METHOD List() CLASS tIPClientPOP
METHOD List() CLASS TIPClientPOP
LOCAL nPos
LOCAL cStr, cRet
@@ -196,13 +196,13 @@ METHOD List() CLASS tIPClientPOP
RETURN cRet
METHOD Noop() CLASS tIPClientPOP
METHOD Noop() CLASS TIPClientPOP
::inetSendAll( ::SocketCon, "NOOP" + ::cCRLF )
RETURN ::GetOk()
METHOD Retrieve( nId, nLen ) CLASS tIPClientPOP
METHOD Retrieve( nId, nLen ) CLASS TIPClientPOP
LOCAL nPos
LOCAL cRet, nRetLen, cBuffer, nRead
@@ -256,13 +256,13 @@ METHOD Retrieve( nId, nLen ) CLASS tIPClientPOP
RETURN StrTran( cRet, ::cCRLF + "..", ::cCRLF + "." )
METHOD Rset() CLASS tIPClientPOP
METHOD Rset() CLASS TIPClientPOP
::inetSendAll( ::SocketCon, "RSET" + ::cCRLF )
RETURN ::GetOk()
METHOD Stat() CLASS tIPClientPOP
METHOD Stat() CLASS TIPClientPOP
LOCAL nRead
@@ -270,7 +270,7 @@ METHOD Stat() CLASS tIPClientPOP
RETURN ::inetRecvLine( ::SocketCon, @nRead, 128 )
METHOD Top( nMsgId ) CLASS tIPClientPOP
METHOD Top( nMsgId ) CLASS TIPClientPOP
LOCAL nPos
LOCAL cStr, cRet
@@ -296,13 +296,13 @@ METHOD Top( nMsgId ) CLASS tIPClientPOP
RETURN cRet
METHOD Quit() CLASS tIPClientPOP
METHOD Quit() CLASS TIPClientPOP
::inetSendAll( ::SocketCon, "QUIT" + ::cCRLF )
RETURN ::GetOk()
METHOD UIDL( nMsgId ) CLASS tIPClientPOP
METHOD UIDL( nMsgId ) CLASS TIPClientPOP
LOCAL nPos
LOCAL cStr, cRet
@@ -340,7 +340,7 @@ METHOD UIDL( nMsgId ) CLASS tIPClientPOP
/**
*/
METHOD countMail() CLASS TIpClientPop
METHOD countMail() CLASS TIPClientPop
LOCAL cStat
@@ -354,7 +354,7 @@ METHOD countMail() CLASS TIpClientPop
RETURN -1
METHOD GetOk() CLASS tIPClientPOP
METHOD GetOk() CLASS TIPClientPOP
LOCAL nLen
@@ -365,7 +365,7 @@ METHOD GetOk() CLASS tIPClientPOP
RETURN .T.
METHOD Read( nLen ) CLASS tIPClientPOP
METHOD Read( nLen ) CLASS TIPClientPOP
/** Set what to read for */
IF Empty( ::oUrl:cFile )

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

@@ -59,7 +59,7 @@
#include "tip.ch"
CREATE CLASS tIPClientSMTP FROM tIPClient
CREATE CLASS TIPClientSMTP FROM TIPClient
METHOD New( oUrl, xTrace, oCredentials, cClientHost )
METHOD Open( cUrl, lTLS )
@@ -86,7 +86,7 @@ CREATE CLASS tIPClientSMTP FROM tIPClient
ENDCLASS
METHOD New( oUrl, xTrace, oCredentials, cClientHost ) CLASS tIPClientSMTP
METHOD New( oUrl, xTrace, oCredentials, cClientHost ) CLASS TIPClientSMTP
::super:new( oUrl, iif( HB_ISLOGICAL( xTrace ) .AND. xTrace, "smtp", xTrace ), oCredentials )
@@ -97,7 +97,7 @@ METHOD New( oUrl, xTrace, oCredentials, cClientHost ) CLASS tIPClientSMTP
RETURN Self
METHOD Open( cUrl, lTLS ) CLASS tIPClientSMTP
METHOD Open( cUrl, lTLS ) CLASS TIPClientSMTP
IF ! ::super:Open( cUrl )
RETURN .F.
@@ -118,11 +118,11 @@ METHOD Open( cUrl, lTLS ) CLASS tIPClientSMTP
ENDIF
ENDIF
::inetSendAll( ::SocketCon, "HELO " + iif( Empty( ::cClientHost ), "tipClientSMTP", ::cClientHost ) + ::cCRLF )
::inetSendAll( ::SocketCon, "HELO " + iif( Empty( ::cClientHost ), "TIPClientSMTP", ::cClientHost ) + ::cCRLF )
RETURN ::GetOk()
METHOD OpenSecure( cUrl, lTLS ) CLASS tIPClientSMTP
METHOD OpenSecure( cUrl, lTLS ) CLASS TIPClientSMTP
IF ! ::super:Open( cUrl )
RETURN .F.
@@ -143,11 +143,11 @@ METHOD OpenSecure( cUrl, lTLS ) CLASS tIPClientSMTP
ENDIF
ENDIF
::inetSendAll( ::SocketCon, "EHLO " + iif( Empty( ::cClientHost ), "tipClientSMTP", ::cClientHost ) + ::cCRLF )
::inetSendAll( ::SocketCon, "EHLO " + iif( Empty( ::cClientHost ), "TIPClientSMTP", ::cClientHost ) + ::cCRLF )
RETURN ::GetOk()
METHOD GetOk() CLASS tIPClientSMTP
METHOD GetOk() CLASS TIPClientSMTP
::cReply := ::inetRecvLine( ::SocketCon,, 512 )
IF ::inetErrorCode( ::SocketCon ) != 0 .OR. ! HB_ISSTRING( ::cReply ) .OR. Left( ::cReply, 1 ) == "5"
@@ -156,39 +156,39 @@ METHOD GetOk() CLASS tIPClientSMTP
RETURN .T.
METHOD Close() CLASS tIPClientSMTP
METHOD Close() CLASS TIPClientSMTP
::InetTimeOut( ::SocketCon )
::Quit()
RETURN ::super:Close()
METHOD Commit() CLASS tIPClientSMTP
METHOD Commit() CLASS TIPClientSMTP
::inetSendAll( ::SocketCon, ::cCRLF + "." + ::cCRLF )
RETURN ::GetOk()
METHOD Quit() CLASS tIPClientSMTP
METHOD Quit() CLASS TIPClientSMTP
::inetSendAll( ::SocketCon, "QUIT" + ::cCRLF )
::isAuth := .F.
RETURN ::GetOk()
METHOD Mail( cFrom ) CLASS tIPClientSMTP
METHOD Mail( cFrom ) CLASS TIPClientSMTP
::inetSendAll( ::SocketCon, "MAIL FROM: <" + cFrom + ">" + ::cCRLF )
RETURN ::GetOk()
METHOD Rcpt( cTo ) CLASS tIPClientSMTP
METHOD Rcpt( cTo ) CLASS TIPClientSMTP
::inetSendAll( ::SocketCon, "RCPT TO: <" + cTo + ">" + ::cCRLF )
RETURN ::GetOk()
METHOD Data( cData ) CLASS tIPClientSMTP
METHOD Data( cData ) CLASS TIPClientSMTP
::inetSendAll( ::SocketCon, "DATA" + ::cCRLF )
IF ! ::GetOk()
@@ -198,7 +198,7 @@ METHOD Data( cData ) CLASS tIPClientSMTP
RETURN ::GetOk()
METHOD Auth( cUser, cPass ) CLASS tIPClientSMTP
METHOD Auth( cUser, cPass ) CLASS TIPClientSMTP
::inetSendAll( ::SocketCon, "AUTH LOGIN" + ::cCRLF )
IF ::GetOk()
@@ -213,13 +213,13 @@ METHOD Auth( cUser, cPass ) CLASS tIPClientSMTP
RETURN ::isAuth := .F.
METHOD AuthPlain( cUser, cPass ) CLASS tIPClientSMTP
METHOD AuthPlain( cUser, cPass ) CLASS TIPClientSMTP
::inetSendAll( ::SocketCon, "AUTH PLAIN" + hb_base64Encode( hb_BChar( 0 ) + cUser + hb_BChar( 0 ) + cPass ) + ::cCRLF )
RETURN ::isAuth := ::GetOk()
METHOD Write( cData, nLen, bCommit ) CLASS tIPClientSMTP
METHOD Write( cData, nLen, bCommit ) CLASS TIPClientSMTP
LOCAL cRcpt
@@ -250,7 +250,7 @@ METHOD Write( cData, nLen, bCommit ) CLASS tIPClientSMTP
RETURN ::nLastWrite
METHOD ServerSuportSecure( /* @ */ lAuthPlain, /* @ */ lAuthLogin ) CLASS tIPClientSMTP
METHOD ServerSuportSecure( /* @ */ lAuthPlain, /* @ */ lAuthLogin ) CLASS TIPClientSMTP
lAuthLogin := .F.
lAuthPlain := .F.
@@ -271,7 +271,7 @@ METHOD ServerSuportSecure( /* @ */ lAuthPlain, /* @ */ lAuthLogin ) CLASS tIPCli
RETURN lAuthLogin .OR. lAuthPlain
METHOD SendMail( oTIpMail ) CLASS TIpClientSmtp
METHOD SendMail( oTIpMail ) CLASS TIPClientSmtp
LOCAL cTo

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

@@ -63,7 +63,7 @@
* cFname cExt
*/
CREATE CLASS tURL
CREATE CLASS TUrl
VAR cAddress
VAR cProto
@@ -90,13 +90,13 @@ CREATE CLASS tURL
ENDCLASS
METHOD New( cUrl ) CLASS tURL
METHOD New( cUrl ) CLASS TUrl
::SetAddress( cUrl )
RETURN Self
METHOD SetAddress( cUrl ) CLASS tURL
METHOD SetAddress( cUrl ) CLASS TUrl
LOCAL aMatch, cServer, cPath
@@ -145,7 +145,7 @@ METHOD SetAddress( cUrl ) CLASS tURL
RETURN .T.
METHOD BuildAddress() CLASS tURL
METHOD BuildAddress() CLASS TUrl
LOCAL cRet := ""
@@ -189,7 +189,7 @@ METHOD BuildAddress() CLASS tURL
RETURN cRet
METHOD BuildQuery() CLASS tURL
METHOD BuildQuery() CLASS TUrl
LOCAL cLine

8
harbour/contrib/hbwin/oleauto.prg
View File

@@ -54,7 +54,7 @@
#include "hbclass.ch"
CREATE CLASS WIN_OLEAUTO
CREATE CLASS win_oleAuto
VAR __hObj
VAR __hObjEnum
@@ -72,7 +72,7 @@ CREATE CLASS WIN_OLEAUTO
ENDCLASS
METHOD __enumStart( enum, lDescend ) CLASS WIN_OLEAUTO
METHOD __enumStart( enum, lDescend ) CLASS win_oleAuto
LOCAL hObjEnum
@@ -91,7 +91,7 @@ METHOD __enumStart( enum, lDescend ) CLASS WIN_OLEAUTO
RETURN .F.
METHOD __enumSkip( enum, lDescend ) CLASS WIN_OLEAUTO
METHOD __enumSkip( enum, lDescend ) CLASS win_oleAuto
LOCAL lContinue, xValue
@@ -104,7 +104,7 @@ METHOD __enumSkip( enum, lDescend ) CLASS WIN_OLEAUTO
RETURN lContinue
METHOD PROCEDURE __enumStop() CLASS WIN_OLEAUTO
METHOD PROCEDURE __enumStop() CLASS win_oleAuto
::__hObjEnum := NIL /* activate autodestructor */

20
harbour/contrib/hbwin/wce_sim.prg
View File

@@ -54,7 +54,7 @@
#include "hbsim.ch"
CREATE CLASS wce_sim
CREATE CLASS wce_Sim
VAR lInitialized INIT .F.
VAR hSim
@@ -74,10 +74,10 @@ CREATE CLASS wce_sim
ENDCLASS
METHOD New() CLASS wce_sim
METHOD New() CLASS wce_Sim
RETURN Self
METHOD lInitialize() CLASS wce_sim
METHOD lInitialize() CLASS wce_Sim
LOCAL nResult := wce_SimInitialize( @::hSim )
@@ -86,7 +86,7 @@ METHOD lInitialize() CLASS wce_sim
RETURN ::lInitialized
METHOD lDeInitialize() CLASS wce_sim
METHOD lDeInitialize() CLASS wce_Sim
LOCAL nResult
@@ -102,7 +102,7 @@ METHOD lDeInitialize() CLASS wce_sim
RETURN nResult == SIM_E_OK
METHOD lNumberOfPhoneBookEntries( nType, /* @ */ nTotal, /* @ */ nUsed ) CLASS wce_sim
METHOD lNumberOfPhoneBookEntries( nType, /* @ */ nTotal, /* @ */ nUsed ) CLASS wce_Sim
LOCAL nResult
@@ -120,7 +120,7 @@ METHOD lNumberOfPhoneBookEntries( nType, /* @ */ nTotal, /* @ */ nUsed ) CLASS w
RETURN nResult == SIM_E_OK
METHOD aGetAllPhoneBookEntries( nType ) CLASS wce_sim
METHOD aGetAllPhoneBookEntries( nType ) CLASS wce_Sim
LOCAL nResult
LOCAL nTotal
@@ -160,7 +160,7 @@ METHOD aGetAllPhoneBookEntries( nType ) CLASS wce_sim
RETURN aEntries
METHOD lGetSimPhoneEntry( nPos, nType, /* @ */ aEntry ) CLASS wce_sim
METHOD lGetSimPhoneEntry( nPos, nType, /* @ */ aEntry ) CLASS wce_Sim
LOCAL nResult
LOCAL a
@@ -181,7 +181,7 @@ METHOD lGetSimPhoneEntry( nPos, nType, /* @ */ aEntry ) CLASS wce_sim
RETURN nResult == SIM_E_OK
METHOD lSetSimPhoneEntry( nPos, nType, cNumber, cName, nPlan, nAddrType ) CLASS wce_sim
METHOD lSetSimPhoneEntry( nPos, nType, cNumber, cName, nPlan, nAddrType ) CLASS wce_Sim
LOCAL nResult
@@ -202,7 +202,7 @@ METHOD lSetSimPhoneEntry( nPos, nType, cNumber, cName, nPlan, nAddrType ) CLASS
RETURN nResult == SIM_E_OK
METHOD lDelSimPhoneEntry( nPos, nType ) CLASS wce_sim
METHOD lDelSimPhoneEntry( nPos, nType ) CLASS wce_Sim
LOCAL nResult
@@ -220,7 +220,7 @@ METHOD lDelSimPhoneEntry( nPos, nType ) CLASS wce_sim
RETURN nResult == SIM_E_OK
METHOD End() CLASS wce_sim
METHOD End() CLASS wce_Sim
IF ::lInitialized
::lDeInitialize()

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

@@ -51,9 +51,9 @@
*/
/*
WIN_PRN() was designed to make it easy to emulate Clipper Dot Matrix printing.
win_Prn() was designed to make it easy to emulate Clipper Dot Matrix printing.
Dot Matrix printing was in CPI ( Characters per inch & Lines per inch ).
Even though "Mapping Mode" for WIN_PRN() is WIN_MM_TEXT, ::SetFont() accepts the
Even though "Mapping Mode" for win_Prn() is WIN_MM_TEXT, ::SetFont() accepts the
xWidth parameter in CPI not Pixels. Also the default ::LineHeight is for
6 lines per inch so ::NewLine() works as per "LineFeed" on Dot Matrix printers.
If you do not like this then inherit from the class and override anything you want
@@ -72,7 +72,7 @@
#define MM_TO_INCH 25.4
CREATE CLASS WIN_PRN
CREATE CLASS win_Prn
METHOD New( cPrinter )
METHOD Create() // CreatesDC and sets "Courier New" font, set Orientation, Copies, Bin#
@@ -214,7 +214,7 @@ CREATE CLASS WIN_PRN
ENDCLASS
METHOD New( cPrinter ) CLASS WIN_PRN
METHOD New( cPrinter ) CLASS win_Prn
::PrinterName := iif( Empty( cPrinter ), win_printerGetDefault(), cPrinter )
/* Initialized with the current properties of the printer [jarabal] */
@@ -222,7 +222,7 @@ METHOD New( cPrinter ) CLASS WIN_PRN
RETURN Self
METHOD Create() CLASS WIN_PRN
METHOD Create() CLASS win_Prn
LOCAL lResult := .F.
@@ -291,7 +291,7 @@ METHOD Create() CLASS WIN_PRN
RETURN lResult
METHOD Destroy() CLASS WIN_PRN
METHOD Destroy() CLASS win_Prn
IF ! Empty( ::hPrinterDc )
IF ::Printing
@@ -302,13 +302,13 @@ METHOD Destroy() CLASS WIN_PRN
RETURN .T.
METHOD PROCEDURE Destruct() CLASS WIN_PRN
METHOD PROCEDURE Destruct() CLASS win_Prn
::Destroy()
RETURN
METHOD StartDoc( cDocName ) CLASS WIN_PRN
METHOD StartDoc( cDocName ) CLASS win_Prn
LOCAL lResult
@@ -326,7 +326,7 @@ METHOD StartDoc( cDocName ) CLASS WIN_PRN
RETURN lResult
METHOD EndDoc( lAbortDoc ) CLASS WIN_PRN
METHOD EndDoc( lAbortDoc ) CLASS win_Prn
IF ::HavePrinted
IF ! HB_ISLOGICAL( lAbortDoc )
@@ -346,7 +346,7 @@ METHOD EndDoc( lAbortDoc ) CLASS WIN_PRN
RETURN .T.
METHOD StartPage() CLASS WIN_PRN
METHOD StartPage() CLASS win_Prn
LOCAL lLLandScape
LOCAL nLBinNumber
@@ -401,7 +401,7 @@ METHOD StartPage() CLASS WIN_PRN
RETURN .T.
METHOD CheckPage() CLASS WIN_PRN
METHOD CheckPage() CLASS win_Prn
IF ::PageInit
::PageInit := .F.
@@ -414,7 +414,7 @@ METHOD CheckPage() CLASS WIN_PRN
RETURN ::Printing
METHOD EndPage( lStartNewPage ) CLASS WIN_PRN
METHOD EndPage( lStartNewPage ) CLASS win_Prn
IF ! HB_ISLOGICAL( lStartNewPage )
lStartNewPage := .T.
@@ -435,14 +435,14 @@ METHOD EndPage( lStartNewPage ) CLASS WIN_PRN
RETURN .T.
METHOD NewLine() CLASS WIN_PRN
METHOD NewLine() CLASS win_Prn
::PosX := ::LeftMargin
::PosY += ::LineHeight
RETURN ::PosY
METHOD NewPage( lDelay ) CLASS WIN_PRN
METHOD NewPage( lDelay ) CLASS win_Prn
IF ! HB_ISLOGICAL( lDelay )
lDelay := .F.
@@ -457,7 +457,7 @@ METHOD NewPage( lDelay ) CLASS WIN_PRN
RETURN .T.
METHOD GetDocumentProperties() CLASS WIN_PRN
METHOD GetDocumentProperties() CLASS win_Prn
RETURN win_GetDocumentProperties( ::PrinterName, ;
@::FormType, @::Landscape, ;
@::Copies, @::BinNumber, ;
@@ -468,7 +468,7 @@ METHOD GetDocumentProperties() CLASS WIN_PRN
// An array {nMul,nDiv} is used to get precise size such a the Dot Matric equivalent
// of Compressed print == 16.67 char per inch == { 3,-50 }
// If nDiv is < 0 then Fixed width printing is forced via ExtTextOut()
METHOD SetFont( cFontName, nPointSize, xWidth, nBold, lUnderline, lItalic, nCharSet, lManualSize ) CLASS WIN_PRN
METHOD SetFont( cFontName, nPointSize, xWidth, nBold, lUnderline, lItalic, nCharSet, lManualSize ) CLASS win_Prn
LOCAL cType
@@ -509,7 +509,7 @@ METHOD SetFont( cFontName, nPointSize, xWidth, nBold, lUnderline, lItalic, nChar
RETURN ::SetFontOk
METHOD GetCharWidth() CLASS WIN_PRN
METHOD GetCharWidth() CLASS win_Prn
LOCAL nWidth
@@ -521,13 +521,13 @@ METHOD GetCharWidth() CLASS WIN_PRN
RETURN nWidth
METHOD GetCharHeight() CLASS WIN_PRN
METHOD GetCharHeight() CLASS win_Prn
RETURN win_GetCharSize( ::hPrinterDC, .T. )
METHOD SetDefaultFont() CLASS WIN_PRN
METHOD SetDefaultFont() CLASS win_Prn
RETURN ::SetFont( "Courier New", 12, { 1, 10 }, 0, .F., .F., 0 )
METHOD Bold( nWeight ) CLASS WIN_PRN
METHOD Bold( nWeight ) CLASS win_Prn
LOCAL nOldValue := ::fBold
@@ -540,7 +540,7 @@ METHOD Bold( nWeight ) CLASS WIN_PRN
RETURN nOldValue
METHOD Underline( lUnderLine ) CLASS WIN_PRN
METHOD Underline( lUnderLine ) CLASS win_Prn
LOCAL lOldValue := ::fUnderline
@@ -553,7 +553,7 @@ METHOD Underline( lUnderLine ) CLASS WIN_PRN
RETURN lOldValue
METHOD Italic( lItalic ) CLASS WIN_PRN
METHOD Italic( lItalic ) CLASS win_Prn
LOCAL lOldValue := ::fItalic
@@ -566,7 +566,7 @@ METHOD Italic( lItalic ) CLASS WIN_PRN
RETURN lOldValue
METHOD CharSet( nCharSet ) CLASS WIN_PRN
METHOD CharSet( nCharSet ) CLASS win_Prn
LOCAL nOldValue := ::fCharSet
@@ -579,7 +579,7 @@ METHOD CharSet( nCharSet ) CLASS WIN_PRN
RETURN nOldValue
METHOD SetDuplexType( nDuplexType ) CLASS WIN_PRN
METHOD SetDuplexType( nDuplexType ) CLASS win_Prn
LOCAL nOldValue := ::fDuplexType
@@ -592,7 +592,7 @@ METHOD SetDuplexType( nDuplexType ) CLASS WIN_PRN
RETURN nOldValue
METHOD SetPrintQuality( nPrintQuality ) CLASS WIN_PRN
METHOD SetPrintQuality( nPrintQuality ) CLASS win_Prn
LOCAL nOldValue := ::fPrintQuality
@@ -605,10 +605,10 @@ METHOD SetPrintQuality( nPrintQuality ) CLASS WIN_PRN
RETURN nOldValue
METHOD GetFonts() CLASS WIN_PRN
METHOD GetFonts() CLASS win_Prn
RETURN win_EnumFonts( ::hPrinterDC )
METHOD SetPos( nPosX, nPosY ) CLASS WIN_PRN
METHOD SetPos( nPosX, nPosY ) CLASS win_Prn
LOCAL aOldValue := { ::PosX, ::PosY }
@@ -621,7 +621,7 @@ METHOD SetPos( nPosX, nPosY ) CLASS WIN_PRN
RETURN aOldValue
METHOD SetColor( nClrText, nClrPane, nAlign ) CLASS WIN_PRN
METHOD SetColor( nClrText, nClrPane, nAlign ) CLASS win_Prn
IF HB_ISNUMERIC( nClrText )
::TextColor := nClrText
@@ -635,7 +635,7 @@ METHOD SetColor( nClrText, nClrPane, nAlign ) CLASS WIN_PRN
RETURN win_SetColor( ::hPrinterDC, nClrText, nClrPane, nAlign )
METHOD SetBkMode( nMode ) CLASS WIN_PRN
METHOD SetBkMode( nMode ) CLASS win_Prn
IF HB_ISNUMERIC( nMode )
::BkMode := nMode
@@ -643,7 +643,7 @@ METHOD SetBkMode( nMode ) CLASS WIN_PRN
RETURN win_SetBkMode( ::hPrinterDc, nMode )
METHOD TextOut( cString, lNewLine, lUpdatePosX, nAlign ) CLASS WIN_PRN
METHOD TextOut( cString, lNewLine, lUpdatePosX, nAlign ) CLASS win_Prn
LOCAL lResult := .F.
LOCAL nPosX
@@ -675,13 +675,13 @@ METHOD TextOut( cString, lNewLine, lUpdatePosX, nAlign ) CLASS WIN_PRN
RETURN lResult
METHOD TextOutAt( nPosX, nPosY, cString, lNewLine, lUpdatePosX, nAlign ) CLASS WIN_PRN
METHOD TextOutAt( nPosX, nPosY, cString, lNewLine, lUpdatePosX, nAlign ) CLASS win_Prn
::SetPos( nPosX, nPosY )
RETURN ::TextOut( cString, lNewLine, lUpdatePosX, nAlign )
METHOD TextAtFont( nPosX, nPosY, cString, cFont, nPointSize, nWidth, nBold, lUnderLine, lItalic, nCharSet, lNewLine, lUpdatePosX, nColor, nAlign ) CLASS WIN_PRN
METHOD TextAtFont( nPosX, nPosY, cString, cFont, nPointSize, nWidth, nBold, lUnderLine, lItalic, nCharSet, lNewLine, lUpdatePosX, nColor, nAlign ) CLASS win_Prn
LOCAL lResult
LOCAL nDiv := 0
@@ -722,7 +722,7 @@ METHOD TextAtFont( nPosX, nPosY, cString, cFont, nPointSize, nWidth, nBold, lUnd
RETURN lResult
METHOD SetPen( nStyle, nWidth, nColor ) CLASS WIN_PRN
METHOD SetPen( nStyle, nWidth, nColor ) CLASS win_Prn
::PenStyle := nStyle
::PenWidth := nWidth
@@ -730,7 +730,7 @@ METHOD SetPen( nStyle, nWidth, nColor ) CLASS WIN_PRN
RETURN ! Empty( ::hPen := win_SetPen( ::hPrinterDC, nStyle, nWidth, nColor ) )
METHOD Line( nX1, nY1, nX2, nY2 ) CLASS WIN_PRN
METHOD Line( nX1, nY1, nX2, nY2 ) CLASS win_Prn
LOCAL lResult := .F.
@@ -743,7 +743,7 @@ METHOD Line( nX1, nY1, nX2, nY2 ) CLASS WIN_PRN
RETURN lResult
METHOD Box( nX1, nY1, nX2, nY2, nWidth, nHeight ) CLASS WIN_PRN
METHOD Box( nX1, nY1, nX2, nY2, nWidth, nHeight ) CLASS win_Prn
LOCAL lResult := .F.
@@ -756,7 +756,7 @@ METHOD Box( nX1, nY1, nX2, nY2, nWidth, nHeight ) CLASS WIN_PRN
RETURN lResult
METHOD Arc( nX1, nY1, nX2, nY2 ) CLASS WIN_PRN
METHOD Arc( nX1, nY1, nX2, nY2 ) CLASS win_Prn
LOCAL lResult := .F.
@@ -769,7 +769,7 @@ METHOD Arc( nX1, nY1, nX2, nY2 ) CLASS WIN_PRN
RETURN lResult
METHOD Ellipse( nX1, nY1, nX2, nY2 ) CLASS WIN_PRN
METHOD Ellipse( nX1, nY1, nX2, nY2 ) CLASS win_Prn
LOCAL lResult := .F.
@@ -782,7 +782,7 @@ METHOD Ellipse( nX1, nY1, nX2, nY2 ) CLASS WIN_PRN
RETURN lResult
METHOD FillRect( nX1, nY1, nX2, nY2, nColor ) CLASS WIN_PRN
METHOD FillRect( nX1, nY1, nX2, nY2, nColor ) CLASS win_Prn
LOCAL lResult := .F.
@@ -795,7 +795,7 @@ METHOD FillRect( nX1, nY1, nX2, nY2, nColor ) CLASS WIN_PRN
RETURN lResult
METHOD GetTextWidth( cString ) CLASS WIN_PRN
METHOD GetTextWidth( cString ) CLASS win_Prn
LOCAL nWidth
@@ -807,10 +807,10 @@ METHOD GetTextWidth( cString ) CLASS WIN_PRN
RETURN nWidth
METHOD GetTextHeight( cString ) CLASS WIN_PRN
METHOD GetTextHeight( cString ) CLASS win_Prn
RETURN win_GetTextSize( ::hPrinterDC, cString, Len( cString ), .F. ) // Return Height in device units
METHOD DrawBitMap( oBmp ) CLASS WIN_PRN
METHOD DrawBitMap( oBmp ) CLASS win_Prn
LOCAL lResult := .F.
@@ -822,35 +822,35 @@ METHOD DrawBitMap( oBmp ) CLASS WIN_PRN
RETURN lResult
METHOD SetPRC( nRow, nCol ) CLASS WIN_PRN
METHOD SetPRC( nRow, nCol ) CLASS win_Prn
::SetPos( ( nCol * ::CharWidth ) + ::LeftMArgin, ( nRow * ::LineHeight ) + ::TopMargin )
RETURN NIL
METHOD PRow() CLASS WIN_PRN
METHOD PRow() CLASS win_Prn
RETURN Int( ( ::PosY - ::TopMargin ) / ::LineHeight ) // No test for Div by ZERO
METHOD PCol() CLASS WIN_PRN
METHOD PCol() CLASS win_Prn
RETURN Int( ( ::PosX - ::LeftMargin ) / ::CharWidth ) // Uses width of current character
METHOD MaxRow() CLASS WIN_PRN
METHOD MaxRow() CLASS win_Prn
RETURN Int( ( ( ::BottomMargin - ::TopMargin ) + 1 ) / ::LineHeight ) - 1
METHOD MaxCol() CLASS WIN_PRN
METHOD MaxCol() CLASS win_Prn
RETURN Int( ( ( ::RightMargin - ::LeftMargin ) + 1 ) / ::CharWidth ) - 1
METHOD MM_To_PosX( nMm ) CLASS WIN_PRN
METHOD MM_To_PosX( nMm ) CLASS win_Prn
RETURN Int( ( ( nMM * ::PixelsPerInchX ) / MM_TO_INCH ) - ::LeftMargin )
METHOD MM_To_PosY( nMm ) CLASS WIN_PRN
METHOD MM_To_PosY( nMm ) CLASS win_Prn
RETURN Int( ( ( nMM * ::PixelsPerInchY ) / MM_TO_INCH ) - ::TopMargin )
METHOD Inch_To_PosX( nInch ) CLASS WIN_PRN
METHOD Inch_To_PosX( nInch ) CLASS win_Prn
RETURN Int( ( nInch * ::PixelsPerInchX ) - ::LeftMargin )
METHOD Inch_To_PosY( nInch ) CLASS WIN_PRN
METHOD Inch_To_PosY( nInch ) CLASS win_Prn
RETURN Int( ( nInch * ::PixelsPerInchY ) - ::TopMargin )
METHOD GetDeviceCaps( nCaps ) CLASS WIN_PRN
METHOD GetDeviceCaps( nCaps ) CLASS win_Prn
RETURN win_GetDeviceCaps( ::hPrinterDC, nCaps )

12
harbour/contrib/xhb/hblog.ch
View File

@@ -75,22 +75,22 @@
[NAME <cName>] => ;
hb_InitStandardLog() ;;
IF <.con.> ;;
hb_StandardLogAdd( hb_LogConsole():New( <nConPrio> ));;
hb_StandardLogAdd( HB_LogConsole():New( <nConPrio> ));;
ENDIF ;;
IF <.fil.> ;;
hb_StandardLogAdd( hb_LogFile():New( <nFilPrio>, <cFileName>, <nFileSize>, <nFileCount> ));;
hb_StandardLogAdd( HB_LogFile():New( <nFilPrio>, <cFileName>, <nFileSize>, <nFileCount> ));;
ENDIF ;;
IF <.mon.> ;;
hb_StandardLogAdd( hb_LoginetPort():New( <nMonPrio>, <nMonPort> ));;
hb_StandardLogAdd( HB_LogInetPort():New( <nMonPrio>, <nMonPort> ));;
ENDIF ;;
IF <.sys.> ;;
hb_StandardLogAdd( hb_LogSysLog():New( <nSysPrio>, <nSysId> ));;
hb_StandardLogAdd( HB_LogSysLog():New( <nSysPrio>, <nSysId> ));;
ENDIF ;;
IF <.ema.> ;;
hb_StandardLogAdd( hb_LogEmail():New( <nEmaPrio> ,<cHelo>,<cServer>,<cDest>,<cSubject>,<cFrom>));;
hb_StandardLogAdd( HB_LogEmail():New( <nEmaPrio> ,<cHelo>,<cServer>,<cDest>,<cSubject>,<cFrom>));;
ENDIF ;;
IF <.dbg.> ;;
hb_StandardLogAdd( hb_LogDebug():New( <nDebugPrio>, <nMaxDebugPrio> ) ) ;;
hb_StandardLogAdd( HB_LogDebug():New( <nDebugPrio>, <nMaxDebugPrio> ) ) ;;
ENDIF ;;
hb_StandardLogName( <cName> );;
hb_OpenStandardLog()

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

@@ -70,7 +70,7 @@ PROCEDURE hb_InitStandardLog( ... )
LOCAL PARAM
s_StdLogger := hb_Logger():New()
s_StdLogger := HB_Logger():New()
FOR EACH PARAM in hb_AParams()
#ifdef HB_THREAD_SUPPORT
@@ -730,7 +730,7 @@ METHOD Send( nStyle, cMessage, cProgName, nPriority ) CLASS HB_LogDbf
* C interface to syslog/ event log system
***********************************************/
CREATE CLASS HB_LogSyslog FROM HB_LogChannel
CREATE CLASS HB_LogSysLog FROM HB_LogChannel
VAR nId
@@ -743,14 +743,14 @@ CREATE CLASS HB_LogSyslog FROM HB_LogChannel
ENDCLASS
METHOD New( nLevel, nId ) CLASS HB_LogSyslog
METHOD New( nLevel, nId ) CLASS HB_LogSysLog
::Super:New( nLevel )
::nId := nId
RETURN SELF
METHOD Open( cName ) CLASS HB_LogSyslog
METHOD Open( cName ) CLASS HB_LogSysLog
IF ::lOpened
RETURN .F.
@@ -763,7 +763,7 @@ METHOD Open( cName ) CLASS HB_LogSyslog
RETURN .F.
METHOD close( cName ) CLASS HB_LogSyslog
METHOD close( cName ) CLASS HB_LogSysLog
IF ! ::lOpened
RETURN .F.
@@ -776,7 +776,7 @@ METHOD close( cName ) CLASS HB_LogSyslog
RETURN .F.
METHOD Send( nType, cMessage, cName, nPriority ) CLASS HB_LogSyslog
METHOD Send( nType, cMessage, cName, nPriority ) CLASS HB_LogSysLog
HB_SYMBOL_UNUSED( nType )
// Syslog does not need timestamp, nor priority

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

@@ -47,7 +47,7 @@
#include "hbclass.ch"
#include "cgi.ch"
CREATE CLASS TJsWindow
CREATE CLASS TJSWindow
VAR nH
VAR Name INIT ""
@@ -128,7 +128,7 @@ ENDCLASS
*
*/
METHOD New( cVarName, cUrl, cName, x, y, w, h ) CLASS TJsWindow
METHOD New( cVarName, cUrl, cName, x, y, w, h ) CLASS TJSWindow
__defaultNIL( @cVarName, "newWin" )
__defaultNIL( @cURL, " " )
@@ -160,7 +160,7 @@ METHOD New( cVarName, cUrl, cName, x, y, w, h ) CLASS TJsWindow
METHOD SetFeatures( alwaysRaised, alwaysLowered, ;
Resizable, Menubar, personalBar, ;
dependent, location, directories, ;
Scrollbars, Status, TitleBar, Toolbar, copyHistory ) CLASS TJsWindow
Scrollbars, Status, TitleBar, Toolbar, copyHistory ) CLASS TJSWindow
LOCAL cStr := ""
@@ -254,7 +254,7 @@ METHOD SetFeatures( alwaysRaised, alwaysLowered, ;
*
*/
METHOD SetSize( x, y, h, w ) CLASS TJsWindow
METHOD SetSize( x, y, h, w ) CLASS TJSWindow
LOCAL cStr := ""
@@ -284,7 +284,7 @@ METHOD SetSize( x, y, h, w ) CLASS TJsWindow
*
*/
METHOD Put() CLASS TJsWindow
METHOD Put() CLASS TJSWindow
LOCAL cStr := ""
@@ -319,7 +319,7 @@ METHOD Put() CLASS TJsWindow
*
*/
METHOD Write( c ) CLASS TJsWindow
METHOD Write( c ) CLASS TJSWindow
HtmlJSCmd( ::nH, ::varName + ".document.write('" + c + "')" + CRLF() )
@@ -332,7 +332,7 @@ METHOD Write( c ) CLASS TJsWindow
*
*/
METHOD QOut( c ) CLASS TJsWindow
METHOD QOut( c ) CLASS TJSWindow
FWrite( ::nH, ::varName + ".document.write('" + c + "')" + CRLF() )
@@ -346,7 +346,7 @@ METHOD QOut( c ) CLASS TJsWindow
*
*/
METHOD Begin() CLASS TJsWindow
METHOD Begin() CLASS TJSWindow
LOCAL i
@@ -411,7 +411,7 @@ METHOD Begin() CLASS TJsWindow
*
*/
METHOD End() CLASS TJsWindow
METHOD End() CLASS TJSWindow
HtmlJSCmd( ::nH, ::varName + ".document.write('</BODY></HTML>')" + CRLF() )
@@ -425,7 +425,7 @@ METHOD End() CLASS TJsWindow
METHOD ImageURL( cImage, cUrl, nHeight, nBorder, ;
cOnClick, cOnMsover, cOnMsout, ;
cName, cAlt ) CLASS TJsWindow
cName, cAlt ) CLASS TJSWindow
LOCAL cStr := ""

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

@@ -51,7 +51,7 @@
#include "hbclass.ch"
#include "cgi.ch"
CREATE CLASS TJsList
CREATE CLASS TJSList
VAR nH INIT STD_OUT
VAR aScript INIT {}
@@ -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
@@ -152,7 +152,7 @@ METHOD New( name, lOpen, width, height, bgColor, ;
*
*/
METHOD NewNode( name, lOpen, width, height, bgColor ) CLASS TJsList
METHOD NewNode( name, lOpen, width, height, bgColor ) CLASS TJSList
LOCAL cStr := ""
@@ -181,7 +181,7 @@ METHOD NewNode( name, lOpen, width, height, bgColor ) CLASS TJsList
*
*/
METHOD SetFont( name, font, fntColor, fntSize ) CLASS TJsList
METHOD SetFont( name, font, fntColor, fntSize ) CLASS TJSList
LOCAL cStr := ""
@@ -206,7 +206,7 @@ METHOD SetFont( name, font, fntColor, fntSize ) CLASS TJsList
*
*/
METHOD AddItem( name, url, bgColor ) CLASS TJsList
METHOD AddItem( name, url, bgColor ) CLASS TJSList
LOCAL cStr := ""
LOCAL cUrl
@@ -226,7 +226,7 @@ METHOD AddItem( name, url, bgColor ) CLASS TJsList
*
*/
METHOD AddLink( name, url, img, bgColor ) CLASS TJsList
METHOD AddLink( name, url, img, bgColor ) CLASS TJSList
LOCAL cStr := ""
LOCAL cUrl
@@ -241,7 +241,7 @@ METHOD AddLink( name, url, img, bgColor ) CLASS TJsList
RETURN self
METHOD EndNode( name, caption ) CLASS TJsList
METHOD EndNode( name, caption ) CLASS TJSList
LOCAL cStr := ""
@@ -253,7 +253,7 @@ METHOD EndNode( name, caption ) CLASS TJsList
RETURN self
METHOD Build( xPos, yPos ) CLASS TJsList
METHOD Build( xPos, yPos ) CLASS TJSList
LOCAL i
LOCAL cStr := ""
@@ -294,7 +294,7 @@ METHOD Build( xPos, yPos ) CLASS TJsList
RETURN Self
METHOD Put( cFile ) CLASS TJsList
METHOD Put( cFile ) CLASS TJSList
IF cFile == NIL
::nH := STD_OUT

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

@@ -76,7 +76,7 @@
+ "server name"
11 - Function available
+"server name"
+"function description" as returned by tRPCFunction::Describe()
+"function description" as returned by TRPCFunction::Describe()
12 - Too many functions in function request
@@ -203,7 +203,7 @@
* RPC FUNCTION
*************************************/
CREATE CLASS tRPCFunction
CREATE CLASS TRPCFunction
VAR cName
VAR aParameters
@@ -227,7 +227,7 @@ CREATE CLASS tRPCFunction
ENDCLASS
METHOD New( cFname, cSerial, nAuthLevel, oExec, oMeth ) CLASS tRPCFunction
METHOD New( cFname, cSerial, nAuthLevel, oExec, oMeth ) CLASS TRPCFunction
LOCAL cParam
LOCAL aParams, aFuncDef
@@ -284,7 +284,7 @@ METHOD New( cFname, cSerial, nAuthLevel, oExec, oMeth ) CLASS tRPCFunction
RETURN Self
METHOD SetCallable( oExec, oMeth ) CLASS tRPCFunction
METHOD SetCallable( oExec, oMeth ) CLASS TRPCFunction
// If the callable is an object, we need to store the method
IF HB_ISOBJECT( oExec )
@@ -298,7 +298,7 @@ METHOD SetCallable( oExec, oMeth ) CLASS tRPCFunction
RETURN .T.
METHOD RUN( aParams, oClient ) CLASS tRPCFunction
METHOD RUN( aParams, oClient ) CLASS TRPCFunction
LOCAL nStart, nCount, xRet
@@ -319,16 +319,16 @@ METHOD RUN( aParams, oClient ) CLASS tRPCFunction
RETURN xRet
METHOD CheckParam( cParam ) CLASS tRPCFunction
METHOD CheckParam( cParam ) CLASS TRPCFunction
IF ! hb_regexMatch( ::cPattern, cParam )
Alert( "tRPCFunction:CheckParam() wrong parameter specification: " + cParam )
Alert( "TRPCFunction:CheckParam() wrong parameter specification: " + cParam )
QUIT
ENDIF
RETURN .T.
METHOD CheckTypes( aParams ) CLASS tRPCFunction
METHOD CheckTypes( aParams ) CLASS TRPCFunction
LOCAL oElem, i := 0
@@ -349,7 +349,7 @@ METHOD CheckTypes( aParams ) CLASS tRPCFunction
RETURN .T.
METHOD Describe() CLASS tRPCFunction
METHOD Describe() CLASS TRPCFunction
LOCAL cRet := ::cName + "("
LOCAL nCount
@@ -370,7 +370,7 @@ METHOD Describe() CLASS tRPCFunction
* Connection manager class; this manages a single connection
************************************************************/
CREATE CLASS tRPCServeCon
CREATE CLASS TRPCServeCon
/* back reference to the parent to get callback blocks */
VAR oServer
@@ -433,7 +433,7 @@ CREATE CLASS tRPCServeCon
ENDCLASS
METHOD New( oParent, skIn ) CLASS tRPCServeCon
METHOD New( oParent, skIn ) CLASS TRPCServeCon
::oServer := oParent
::skRemote := skIn
@@ -444,7 +444,7 @@ METHOD New( oParent, skIn ) CLASS tRPCServeCon
RETURN Self
METHOD Destroy() CLASS tRPCServeCon
METHOD Destroy() CLASS TRPCServeCon
hb_mutexLock( ::mtxBusy )
// Eventually wait for the function to terminate
@@ -460,7 +460,7 @@ METHOD Destroy() CLASS tRPCServeCon
RETURN .T.
METHOD Start() CLASS tRPCServeCon
METHOD Start() CLASS TRPCServeCon
LOCAL lRet := .F.
@@ -473,7 +473,7 @@ METHOD Start() CLASS tRPCServeCon
RETURN lRet
METHOD Stop() CLASS tRPCServeCon
METHOD Stop() CLASS TRPCServeCon
LOCAL lRet := .F.
@@ -490,7 +490,7 @@ METHOD Stop() CLASS tRPCServeCon
RETURN lRet
METHOD RUN() CLASS tRPCServeCon
METHOD RUN() CLASS TRPCServeCon
LOCAL cCode := Space( 6 )
LOCAL lBreak := .F.
@@ -693,7 +693,7 @@ METHOD RUN() CLASS tRPCServeCon
RETURN .T.
METHOD RecvAuth( lEncrypt ) CLASS tRPCServeCon
METHOD RecvAuth( lEncrypt ) CLASS TRPCServeCon
LOCAL cLength := Space( 8 ), nLen, nPos
LOCAL cUserID, cPassword
@@ -740,7 +740,7 @@ METHOD RecvAuth( lEncrypt ) CLASS tRPCServeCon
RETURN ::LaunchChallenge( cUserid, cPassword )
METHOD LaunchChallenge( cUserid, cPassword ) CLASS tRPCServeCon
METHOD LaunchChallenge( cUserid, cPassword ) CLASS TRPCServeCon
LOCAL cChallenge, nCount
@@ -769,7 +769,7 @@ METHOD LaunchChallenge( cUserid, cPassword ) CLASS tRPCServeCon
RETURN .T.
METHOD RecvChallenge() CLASS tRPCServeCon
METHOD RecvChallenge() CLASS TRPCServeCon
LOCAL cNumber := Space( 8 )
@@ -798,7 +798,7 @@ METHOD RecvChallenge() CLASS tRPCServeCon
RETURN .T.
METHOD RecvFunction( bComp, bMode ) CLASS tRPCServeCon
METHOD RecvFunction( bComp, bMode ) CLASS TRPCServeCon
LOCAL cLength := Space( 8 ), nLen, nComp
LOCAL cMode := " "
@@ -850,7 +850,7 @@ METHOD RecvFunction( bComp, bMode ) CLASS tRPCServeCon
RETURN { cMode, cData }
METHOD FuncCall( cData ) CLASS tRPCServeCon
METHOD FuncCall( cData ) CLASS TRPCServeCon
LOCAL cSer, cFuncName, aParams
@@ -870,7 +870,7 @@ METHOD FuncCall( cData ) CLASS tRPCServeCon
RETURN ::LaunchFunction( cFuncName, aParams, 0 )
METHOD FuncLoopCall( cMode, cData ) CLASS tRPCServeCon
METHOD FuncLoopCall( cMode, cData ) CLASS TRPCServeCon
LOCAL nBegin, nEnd, nStep
LOCAL cSer
@@ -895,7 +895,7 @@ METHOD FuncLoopCall( cMode, cData ) CLASS tRPCServeCon
RETURN ::LaunchFunction( cFuncName, aParams, 1, { cMode, nBegin, nEnd, nStep } )
METHOD FuncForeachCall( cMode, cData ) CLASS tRPCServeCon
METHOD FuncForeachCall( cMode, cData ) CLASS TRPCServeCon
LOCAL cSer
LOCAL cFuncName, aParams
@@ -919,7 +919,7 @@ METHOD FuncForeachCall( cMode, cData ) CLASS tRPCServeCon
RETURN ::LaunchFunction( cFuncName, aParams, 2, { cMode, aItems } )
METHOD LaunchFunction( cFuncName, aParams, nMode, aDesc ) CLASS tRPCServeCon
METHOD LaunchFunction( cFuncName, aParams, nMode, aDesc ) CLASS TRPCServeCon
LOCAL oFunc
@@ -961,7 +961,7 @@ METHOD LaunchFunction( cFuncName, aParams, nMode, aDesc ) CLASS tRPCServeCon
RETURN .T.
METHOD FunctionRunner( cFuncName, oFunc, nMode, aParams, aDesc ) CLASS tRPCServeCon
METHOD FunctionRunner( cFuncName, oFunc, nMode, aParams, aDesc ) CLASS TRPCServeCon
LOCAL nCount
LOCAL oRet, oElem, aRet
@@ -1133,7 +1133,7 @@ METHOD SendResult( oRet, cFuncName )
RETURN .T.
METHOD SendProgress( nProgress, oData ) CLASS tRPCServeCon
METHOD SendProgress( nProgress, oData ) CLASS TRPCServeCon
LOCAL cOrigLen, cCompLen, lRet := .T.
LOCAL cData
@@ -1170,7 +1170,7 @@ METHOD SendProgress( nProgress, oData ) CLASS tRPCServeCon
RETURN lRet
METHOD Encrypt( cDataIn ) CLASS tRPCServeCon
METHOD Encrypt( cDataIn ) CLASS TRPCServeCon
IF ::bEncrypted
RETURN hb_Crypt( cDataIn, ::cCryptKey )
@@ -1178,7 +1178,7 @@ METHOD Encrypt( cDataIn ) CLASS tRPCServeCon
RETURN cDataIn
METHOD Decrypt( cDataIn ) CLASS tRPCServeCon
METHOD Decrypt( cDataIn ) CLASS TRPCServeCon
IF ::bEncrypted
RETURN hb_Decrypt( cDataIn, ::cCryptKey )
@@ -1190,7 +1190,7 @@ METHOD Decrypt( cDataIn ) CLASS tRPCServeCon
* RPC SERVICE
*************************************/
CREATE CLASS tRPCService
CREATE CLASS TRPCService
VAR cServerName INIT "RPCGenericServer"
VAR aFunctions
@@ -1269,7 +1269,7 @@ CREATE CLASS tRPCService
ENDCLASS
METHOD New() CLASS tRPCService
METHOD New() CLASS TRPCService
::aFunctions := {}
@@ -1296,7 +1296,7 @@ METHOD Add( xFunction, cVersion, nLevel, oExec, oMethod )
RETURN lRet
METHOD Find( cName ) CLASS tRPCService
METHOD Find( cName ) CLASS TRPCService
LOCAL nElem
LOCAL oRet := NIL
@@ -1310,7 +1310,7 @@ METHOD Find( cName ) CLASS tRPCService
RETURN oRet
METHOD Remove( cName ) CLASS tRPCService
METHOD Remove( cName ) CLASS TRPCService
LOCAL nElem
LOCAL lRet := .F.
@@ -1325,7 +1325,7 @@ METHOD Remove( cName ) CLASS tRPCService
RETURN lRet
METHOD RUN( cName, aParams ) CLASS tRPCService
METHOD RUN( cName, aParams ) CLASS TRPCService
LOCAL oFunc := ::Find( cName )
LOCAL oRet := NIL
@@ -1338,7 +1338,7 @@ METHOD RUN( cName, aParams ) CLASS tRPCService
RETURN oRet
METHOD Describe( cName ) CLASS tRPCService
METHOD Describe( cName ) CLASS TRPCService
LOCAL oFunc := ::Find( cName )
LOCAL cRet := NIL
@@ -1351,7 +1351,7 @@ METHOD Describe( cName ) CLASS tRPCService
RETURN cRet
METHOD Start( lStartUdp ) CLASS tRPCService
METHOD Start( lStartUdp ) CLASS TRPCService
IF Empty( ::cBindAddress )
::skServer := hb_inetServer( ::nTcpPort )
@@ -1371,7 +1371,7 @@ METHOD Start( lStartUdp ) CLASS tRPCService
RETURN .T.
METHOD Stop() CLASS tRPCService
METHOD Stop() CLASS TRPCService
LOCAL oElem
@@ -1407,7 +1407,7 @@ METHOD Stop() CLASS tRPCService
RETURN .T.
METHOD ACCEPT() CLASS tRPCService
METHOD ACCEPT() CLASS TRPCService
LOCAL skIn
@@ -1424,7 +1424,7 @@ METHOD ACCEPT() CLASS tRPCService
RETURN .T.
METHOD StartService( skIn ) CLASS tRPCService
METHOD StartService( skIn ) CLASS TRPCService
LOCAL oService
@@ -1437,7 +1437,7 @@ METHOD StartService( skIn ) CLASS tRPCService
RETURN .T.
METHOD UDPListen() CLASS tRPCService
METHOD UDPListen() CLASS TRPCService
LOCAL cData := Space( 1000 )
LOCAL nPacketLen
@@ -1452,7 +1452,7 @@ METHOD UDPListen() CLASS tRPCService
RETURN .T.
METHOD UDPParseRequest( cData, nPacketLen ) CLASS tRPCService
METHOD UDPParseRequest( cData, nPacketLen ) CLASS TRPCService
LOCAL cToSend
@@ -1464,7 +1464,7 @@ METHOD UDPParseRequest( cData, nPacketLen ) CLASS tRPCService
RETURN .F.
METHOD UDPInterpretRequest( cData, nPacketLen, cRes ) CLASS tRPCService
METHOD UDPInterpretRequest( cData, nPacketLen, cRes ) CLASS TRPCService
LOCAL cCode, cMatch, cNumber, cSerial
LOCAL oFunc
@@ -1529,7 +1529,7 @@ METHOD UDPInterpretRequest( cData, nPacketLen, cRes ) CLASS tRPCService
RETURN .F.
METHOD Terminating( oConnection ) CLASS tRPCService
METHOD Terminating( oConnection ) CLASS TRPCService
LOCAL nToken
@@ -1543,7 +1543,7 @@ METHOD Terminating( oConnection ) CLASS tRPCService
RETURN .T.
METHOD AuthorizeChallenge( cUserId, cData ) CLASS tRPCService
METHOD AuthorizeChallenge( cUserId, cData ) CLASS TRPCService
LOCAL cKey, nPos, cMarker := "PASSWORD:"
@@ -1575,7 +1575,7 @@ METHOD AuthorizeChallenge( cUserId, cData ) CLASS tRPCService
/* Default authorization will ALWAYS return 1 if a bAuthorize block is not provided */
/* IF cPassword is NIL, must return the level of the given userid */
METHOD Authorize( cUserid, cPassword ) CLASS tRPCService
METHOD Authorize( cUserid, cPassword ) CLASS TRPCService
IF ::bAuthorize != NIL
RETURN Eval( ::bAuthorize, cUserid, cPassword )
@@ -1585,7 +1585,7 @@ METHOD Authorize( cUserid, cPassword ) CLASS tRPCService
/* By default, do not provide an encryption key for any user */
METHOD GetEncryption( cUserId ) CLASS tRPCService
METHOD GetEncryption( cUserId ) CLASS TRPCService
IF ::bGetEncryption != NIL
RETURN Eval( ::bGetEncryption, cUserId )
@@ -1593,7 +1593,7 @@ METHOD GetEncryption( cUserId ) CLASS tRPCService
RETURN NIL
METHOD OnFunctionScan() CLASS tRPCService
METHOD OnFunctionScan() CLASS TRPCService
IF ::bOnFunctionScan != NIL
RETURN Eval( ::bOnFunctionScan, Self )
@@ -1601,7 +1601,7 @@ METHOD OnFunctionScan() CLASS tRPCService
RETURN .T.
METHOD OnServerScan() CLASS tRPCService
METHOD OnServerScan() CLASS TRPCService
IF ::bOnServerScan != NIL
RETURN Eval( ::bOnServerScan, Self )
@@ -1609,7 +1609,7 @@ METHOD OnServerScan() CLASS tRPCService
RETURN .T.
METHOD OnClientConnect( oClient ) CLASS tRPCService
METHOD OnClientConnect( oClient ) CLASS TRPCService
IF ::bOnClientConnect != NIL
RETURN Eval( ::bOnClientConnect, oClient )
@@ -1617,7 +1617,7 @@ METHOD OnClientConnect( oClient ) CLASS tRPCService
RETURN .T.
METHOD OnClientLogin( oClient ) CLASS tRPCService
METHOD OnClientLogin( oClient ) CLASS TRPCService
IF ::bOnClientLogin != NIL
Eval( ::bOnClientLogin, oClient )
@@ -1625,7 +1625,7 @@ METHOD OnClientLogin( oClient ) CLASS tRPCService
RETURN .T.
METHOD OnClientRequest( oClient, nRequest, cData ) CLASS tRPCService
METHOD OnClientRequest( oClient, nRequest, cData ) CLASS TRPCService
IF ::bOnClientRequest != NIL
RETURN Eval( ::bOnClientRequest, oClient, nRequest, cData )
@@ -1633,7 +1633,7 @@ METHOD OnClientRequest( oClient, nRequest, cData ) CLASS tRPCService
RETURN .T.
METHOD OnFunctionProgress( oClient, nProgress, aData ) CLASS tRPCService
METHOD OnFunctionProgress( oClient, nProgress, aData ) CLASS TRPCService
IF ::bOnFunctionProgress != NIL
RETURN Eval( ::bOnFunctionProgress, oClient, nProgress, aData )
@@ -1641,7 +1641,7 @@ METHOD OnFunctionProgress( oClient, nProgress, aData ) CLASS tRPCService
RETURN .T.
METHOD OnFunctionError( oClient, cFunction, nError ) CLASS tRPCService
METHOD OnFunctionError( oClient, cFunction, nError ) CLASS TRPCService
IF ::bOnFunctionError != NIL
RETURN Eval( ::bOnFunctionError, oClient, cFunction, nError )
@@ -1649,7 +1649,7 @@ METHOD OnFunctionError( oClient, cFunction, nError ) CLASS tRPCService
RETURN .T.
METHOD OnFunctionReturn( oClient, aData ) CLASS tRPCService
METHOD OnFunctionReturn( oClient, aData ) CLASS TRPCService
IF ::bOnFunctionReturn != NIL
RETURN Eval( ::bOnFunctionReturn, oClient, aData )
@@ -1657,7 +1657,7 @@ METHOD OnFunctionReturn( oClient, aData ) CLASS tRPCService
RETURN .T.
METHOD OnFunctionCanceled( oClient, cFuncName ) CLASS tRPCService
METHOD OnFunctionCanceled( oClient, cFuncName ) CLASS TRPCService
IF ::bOnFunctionCanceled != NIL
RETURN Eval( ::bOnFunctionCanceled, oClient, cFuncName )
@@ -1665,7 +1665,7 @@ METHOD OnFunctionCanceled( oClient, cFuncName ) CLASS tRPCService
RETURN .T.
METHOD OnClientLogout( oClient ) CLASS tRPCService
METHOD OnClientLogout( oClient ) CLASS TRPCService
IF ::bOnClientLogout != NIL
RETURN Eval( ::bOnClientLogout, oClient )
@@ -1673,7 +1673,7 @@ METHOD OnClientLogout( oClient ) CLASS tRPCService
RETURN .T.
METHOD OnClientTerminate( oClient ) CLASS tRPCService
METHOD OnClientTerminate( oClient ) CLASS TRPCService
IF ::bOnClientTerminate != NIL
RETURN Eval( ::bOnClientTerminate, oClient )

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

@@ -55,7 +55,7 @@
#include "hbrpc.ch"
CREATE CLASS tRPCClient
CREATE CLASS TRPCClient
VAR aServers
VAR aFunctions
@@ -197,7 +197,7 @@ CREATE CLASS tRPCClient
ENDCLASS
METHOD New( cNetwork, nTcpPort, nUdpPort ) CLASS tRPCClient
METHOD New( cNetwork, nTcpPort, nUdpPort ) CLASS TRPCClient
::nStatus := RPC_STATUS_NONE // not connected
::nErrorCode := 0 // no RPC error
@@ -218,7 +218,7 @@ METHOD New( cNetwork, nTcpPort, nUdpPort ) CLASS tRPCClient
RETURN Self
METHOD Destroy() CLASS tRPCClient
METHOD Destroy() CLASS TRPCClient
hb_mutexLock( ::mtxBusy )
@@ -246,7 +246,7 @@ METHOD SetEncryption( cKey )
RETURN .T.
METHOD ScanServers( cName ) CLASS tRPCClient
METHOD ScanServers( cName ) CLASS TRPCClient
// do not allow asynchronous mode without timeout
IF ! ::lAsyncMode .AND. ( ::nTimeout == NIL .OR. ::nTimeOut <= 0 )
@@ -291,7 +291,7 @@ METHOD CheckServer( cRemote )
RETURN .F.
METHOD ScanFunctions( cFunc, cSerial ) CLASS tRPCClient
METHOD ScanFunctions( cFunc, cSerial ) CLASS TRPCClient
// do not allow asynchronous mode without timeout
IF ! ::lAsyncMode .AND. ( ::nTimeOut == NIL .OR. ::nTimeOut <= 0 )
@@ -334,7 +334,7 @@ METHOD StartScan()
RETURN .T.
METHOD UDPAccept() CLASS tRPCClient
METHOD UDPAccept() CLASS TRPCClient
LOCAL nTime, nDatalen, cData
@@ -372,7 +372,7 @@ METHOD UDPAccept() CLASS tRPCClient
RETURN .T.
METHOD UDPParse( cData, nLen ) CLASS tRPCClient
METHOD UDPParse( cData, nLen ) CLASS TRPCClient
LOCAL cCode, cSer, cFunc, cName
LOCAL aLoc
@@ -415,7 +415,7 @@ METHOD UDPParse( cData, nLen ) CLASS tRPCClient
RETURN .F.
METHOD StopScan() CLASS tRPCClient
METHOD StopScan() CLASS TRPCClient
hb_mutexLock( ::mtxBusy )
IF hb_threadID( ::thUDPAccept ) != 0
@@ -429,7 +429,7 @@ METHOD StopScan() CLASS tRPCClient
RETURN .T.
METHOD Connect( cServer, cUserId, cPassword ) CLASS tRPCClient
METHOD Connect( cServer, cUserId, cPassword ) CLASS TRPCClient
LOCAL cAuth, cReply := Space( 8 )
@@ -465,7 +465,7 @@ METHOD Connect( cServer, cUserId, cPassword ) CLASS tRPCClient
RETURN .F.
METHOD BuildChallengePwd( cPassword ) CLASS tRPCClient
METHOD BuildChallengePwd( cPassword ) CLASS TRPCClient
LOCAL nLen, nCount, cRet
@@ -486,7 +486,7 @@ METHOD BuildChallengePwd( cPassword ) CLASS tRPCClient
RETURN cRet
METHOD ManageChallenge() CLASS tRPCClient
METHOD ManageChallenge() CLASS TRPCClient
LOCAL cCode, cLen, nLen
LOCAL cData, nChallenge
@@ -530,7 +530,7 @@ METHOD ManageChallenge() CLASS tRPCClient
RETURN .T.
METHOD Disconnect() CLASS tRPCClient
METHOD Disconnect() CLASS TRPCClient
IF ::nStatus >= RPC_STATUS_LOGGED
hb_mutexLock( ::mtxBusy )
@@ -543,7 +543,7 @@ METHOD Disconnect() CLASS tRPCClient
RETURN .F.
METHOD SetLoopMode( nMethod, xData, nEnd, nStep ) CLASS tRPCClient
METHOD SetLoopMode( nMethod, xData, nEnd, nStep ) CLASS TRPCClient
IF nMethod == RPC_LOOP_NONE
::nLoopMode := RPC_LOOP_NONE
@@ -573,7 +573,7 @@ METHOD SetLoopMode( nMethod, xData, nEnd, nStep ) CLASS tRPCClient
RETURN .T.
METHOD ClearTCPBuffer() CLASS tRPCClient
METHOD ClearTCPBuffer() CLASS TRPCClient
LOCAL cDummy := Space( 512 )
@@ -588,7 +588,7 @@ METHOD ClearTCPBuffer() CLASS tRPCClient
RETURN .T.
METHOD Call( ... ) CLASS tRPCClient
METHOD Call( ... ) CLASS TRPCClient
LOCAL oCalling
LOCAL cFunction, aParams
@@ -648,7 +648,7 @@ METHOD Call( ... ) CLASS tRPCClient
RETURN ::oResult
METHOD SetPeriodCallback( ... ) CLASS tRPCClient
METHOD SetPeriodCallback( ... ) CLASS TRPCClient
LOCAL caCalling
LOCAL nCount
@@ -681,7 +681,7 @@ METHOD SetPeriodCallback( ... ) CLASS tRPCClient
RETURN .T.
METHOD ClearPeriodCallback() CLASS tRPCClient
METHOD ClearPeriodCallback() CLASS TRPCClient
hb_mutexLock( ::mtxBusy )
@@ -699,7 +699,7 @@ METHOD ClearPeriodCallback() CLASS tRPCClient
RETURN .T.
METHOD SetTimeout( nTime ) CLASS tRPCClient
METHOD SetTimeout( nTime ) CLASS TRPCClient
hb_mutexLock( ::mtxBusy )
@@ -720,7 +720,7 @@ METHOD GetTimeout()
RETURN nRet
METHOD StopCall() CLASS tRPCClient
METHOD StopCall() CLASS TRPCClient
IF ::nStatus != RPC_STATUS_WAITING
RETURN .F.
@@ -746,7 +746,7 @@ METHOD StopCall() CLASS tRPCClient
RETURN .T.
METHOD SendCall( cFunction, aParams ) CLASS tRPCClient
METHOD SendCall( cFunction, aParams ) CLASS TRPCClient
LOCAL cData := "", nLen
LOCAL nReq, cType
@@ -800,7 +800,7 @@ METHOD SendCall( cFunction, aParams ) CLASS tRPCClient
RETURN hb_inetErrorCode( ::skTCP ) == 0
METHOD TCPAccept() CLASS tRPCClient
METHOD TCPAccept() CLASS TRPCClient
LOCAL nTime := 0
LOCAL cCode
@@ -856,7 +856,7 @@ METHOD TCPAccept() CLASS tRPCClient
RETURN .T.
METHOD TCPParse( cCode ) CLASS tRPCClient
METHOD TCPParse( cCode ) CLASS TRPCClient
LOCAL nDataLen, cData, nOrigLen
LOCAL cDataLen := Space( 8 ), cOrigLen := Space( 8 )
@@ -963,7 +963,7 @@ METHOD TCPParse( cCode ) CLASS tRPCClient
* Utility functions
************************************/
METHOD GetFunctionName( xId ) CLASS tRpcClient
METHOD GetFunctionName( xId ) CLASS TRPCClient
LOCAL cData, nPos
@@ -982,7 +982,7 @@ METHOD GetFunctionName( xId ) CLASS tRpcClient
RETURN cData
METHOD GetServerName( xId ) CLASS tRpcClient
METHOD GetServerName( xId ) CLASS TRPCClient
LOCAL cData
@@ -1000,7 +1000,7 @@ METHOD GetServerName( xId ) CLASS tRpcClient
RETURN cData
METHOD GetServerAddress( xId ) CLASS tRpcClient
METHOD GetServerAddress( xId ) CLASS TRPCClient
LOCAL cData
@@ -1018,7 +1018,7 @@ METHOD GetServerAddress( xId ) CLASS tRpcClient
RETURN cData
METHOD Encrypt( cDataIn ) CLASS tRPCClient
METHOD Encrypt( cDataIn ) CLASS TRPCClient
IF ::bEncrypted
RETURN hb_Crypt( cDataIn, ::cCryptKey )
@@ -1026,7 +1026,7 @@ METHOD Encrypt( cDataIn ) CLASS tRPCClient
RETURN cDataIn
METHOD Decrypt( cDataIn ) CLASS tRPCClient
METHOD Decrypt( cDataIn ) CLASS TRPCClient
IF ::bEncrypted
RETURN hb_Decrypt( cDataIn, ::cCryptKey )
@@ -1039,7 +1039,7 @@ METHOD Decrypt( cDataIn ) CLASS tRPCClient
* Event handlers
************************************/
METHOD OnScanComplete() CLASS tRPCClient
METHOD OnScanComplete() CLASS TRPCClient
IF ::bOnScanComplete != NIL
RETURN Eval( ::bOnScanComplete )
@@ -1047,7 +1047,7 @@ METHOD OnScanComplete() CLASS tRPCClient
RETURN .T.
METHOD OnScanServersProgress( aLoc ) CLASS tRPCClient
METHOD OnScanServersProgress( aLoc ) CLASS TRPCClient
IF ::bOnScanServersProgress != NIL
RETURN Eval( ::bOnScanServersProgress, aLoc )
@@ -1055,7 +1055,7 @@ METHOD OnScanServersProgress( aLoc ) CLASS tRPCClient
RETURN .T.
METHOD OnScanFunctionsProgress( aLoc ) CLASS tRPCClient
METHOD OnScanFunctionsProgress( aLoc ) CLASS TRPCClient
IF ::bOnScanFunctionsProgress != NIL
RETURN Eval( ::bOnScanFunctionsProgress, aLoc )
@@ -1063,7 +1063,7 @@ METHOD OnScanFunctionsProgress( aLoc ) CLASS tRPCClient
RETURN .T.
METHOD OnFunctionFail( nReason, cReason ) CLASS tRPCClient
METHOD OnFunctionFail( nReason, cReason ) CLASS TRPCClient
IF ::bOnFunctionFail != NIL
RETURN Eval( ::bOnFunctionFail, nReason, cReason )
@@ -1071,7 +1071,7 @@ METHOD OnFunctionFail( nReason, cReason ) CLASS tRPCClient
RETURN .T.
METHOD OnFunctionReturn( oReturn ) CLASS tRPCClient
METHOD OnFunctionReturn( oReturn ) CLASS TRPCClient
IF ::bOnFunctionReturn != NIL
RETURN Eval( ::bOnFunctionReturn, oReturn )
@@ -1079,7 +1079,7 @@ METHOD OnFunctionReturn( oReturn ) CLASS tRPCClient
RETURN .T.
METHOD OnFunctionProgress( nProgress, oData ) CLASS tRPCClient
METHOD OnFunctionProgress( nProgress, oData ) CLASS TRPCClient
IF ::bOnFunctionProgress != NIL
RETURN Eval( ::bOnFunctionProgress, nProgress, oData )

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

@@ -205,7 +205,7 @@ METHOD Clone() CLASS TXmlIterator
LOCAL oRet
oRet := TXMLIterator():New( ::oNodeTop )
oRet := TXmlIterator():New( ::oNodeTop )
oRet:cName := ::cName
oRet:cAttribute := ::cAttribute
oRet:cValue := ::cValue
@@ -351,7 +351,7 @@ METHOD MatchCriteria( oFound ) CLASS TXmlIteratorRegex
Document Class
*********************************************/
CREATE CLASS TXmlDocument
CREATE CLASS TXMLDocument
VAR oRoot
VAR nStatus
@@ -378,7 +378,7 @@ CREATE CLASS TXmlDocument
ENDCLASS
METHOD New( xElem, nStyle ) CLASS TXmlDocument
METHOD New( xElem, nStyle ) CLASS TXMLDocument
::nStatus := HBXML_STATUS_OK
::nError := HBXML_ERROR_NONE
@@ -411,7 +411,7 @@ METHOD New( xElem, nStyle ) CLASS TXmlDocument
RETURN Self
METHOD Write( fHandle, nStyle ) CLASS TXmlDocument
METHOD Write( fHandle, nStyle ) CLASS TXMLDocument
LOCAL nResult := HBXML_STATUS_ERROR
@@ -433,19 +433,19 @@ METHOD Write( fHandle, nStyle ) CLASS TXmlDocument
RETURN ::oRoot:Write( fHandle, nStyle )
METHOD FindFirst( cName, cAttrib, cValue, cData ) CLASS TXmlDocument
METHOD FindFirst( cName, cAttrib, cValue, cData ) CLASS TXMLDocument
::oIterator := TXMLIteratorScan():New( ::oRoot )
::oIterator := TXmlIteratorScan():New( ::oRoot )
RETURN ::oIterator:Find( cName, cAttrib, cValue, cData )
METHOD FindFirstRegex( cName, cAttrib, cValue, cData ) CLASS TXmlDocument
METHOD FindFirstRegex( cName, cAttrib, cValue, cData ) CLASS TXMLDocument
::oIterator := TXMLIteratorRegex():New( ::oRoot )
::oIterator := TXmlIteratorRegex():New( ::oRoot )
RETURN ::oIterator:Find( cName, cAttrib, cValue, cData )
METHOD GetContext() CLASS TXmlDocument
METHOD GetContext() CLASS TXMLDocument
LOCAL oDoc

18
harbour/contrib/xhb/xhb.hbx
View File

@@ -146,16 +146,16 @@ DYNAMIC hb_IsRegexString
DYNAMIC hb_IsService
DYNAMIC hb_Is_CStructure
DYNAMIC hb_LibDo
DYNAMIC hb_LogChannel
DYNAMIC hb_LogConsole
DYNAMIC HB_LogChannel
DYNAMIC HB_LogConsole
DYNAMIC hb_LogDateStamp
DYNAMIC hb_LogDbf
DYNAMIC hb_LogDebug
DYNAMIC hb_LogEmail
DYNAMIC hb_LogFile
DYNAMIC hb_Logger
DYNAMIC hb_LogInetPort
DYNAMIC hb_LogSysLog
DYNAMIC HB_LogDbf
DYNAMIC HB_LogDebug
DYNAMIC HB_LogEmail
DYNAMIC HB_LogFile
DYNAMIC HB_Logger
DYNAMIC HB_LogInetPort
DYNAMIC HB_LogSysLog
DYNAMIC hb_Member
DYNAMIC hb_MultiThread
DYNAMIC hb_MutexTimeOutLock

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

@@ -57,7 +57,7 @@
//
// A specialized HBEditor which can simulate MemoEdit() behaviour
//
CREATE CLASS XHB_TMemoEditor FROM XHBEditor
CREATE CLASS xhb_TMemoEditor FROM XHBEditor
VAR xUserFunction // User Function called to change default MemoEdit() behaviour
@@ -77,7 +77,7 @@ CREATE CLASS XHB_TMemoEditor FROM XHBEditor
ENDCLASS
METHOD MemoInit( xUDF ) CLASS XHB_TMemoEditor
METHOD MemoInit( xUDF ) CLASS xhb_TMemoEditor
LOCAL nUdfReturn
@@ -152,7 +152,7 @@ METHOD MemoInit( xUDF ) CLASS XHB_TMemoEditor
RETURN Self
METHOD Edit() CLASS XHB_TMemoEditor
METHOD Edit() CLASS xhb_TMemoEditor
LOCAL nKey, nUdfReturn, nNextKey
@@ -275,7 +275,7 @@ METHOD Edit() CLASS XHB_TMemoEditor
// I come here if I have an unknown key and it is not a configurable key
// if there is an user function I leave to it its handling
//
METHOD KeyboardHook( nKey ) CLASS XHB_TMemoEditor
METHOD KeyboardHook( nKey ) CLASS xhb_TMemoEditor
LOCAL nUdfReturn
@@ -287,7 +287,7 @@ METHOD KeyboardHook( nKey ) CLASS XHB_TMemoEditor
RETURN Self
METHOD HandleUdf( nKey, nUdfReturn, lEdited ) CLASS XHB_TMemoEditor
METHOD HandleUdf( nKey, nUdfReturn, lEdited ) CLASS xhb_TMemoEditor
/* 05/08/2004 - <maurilio.longo@libero.it>
@@ -384,7 +384,7 @@ METHOD HandleUdf( nKey, nUdfReturn, lEdited ) CLASS XHB_TMemoEditor
RETURN Self
METHOD CallUdf( nMode ) CLASS XHB_TMemoEditor
METHOD CallUdf( nMode ) CLASS xhb_TMemoEditor
LOCAL nCurRow := ::Row()
LOCAL nCurCol := ::Col()

14
harbour/contrib/xhb/xhbole.prg
View File

@@ -133,7 +133,7 @@ STATIC FUNCTION s_oleError( nGenCode, cDescript )
RETURN oErr
CREATE CLASS TOLEAUTO FROM WIN_OLEAUTO
CREATE CLASS TOleAuto FROM win_oleAuto
VAR cClassName
@@ -167,7 +167,7 @@ CREATE CLASS TOLEAUTO FROM WIN_OLEAUTO
ENDCLASS
METHOD hObj( xOle ) CLASS TOLEAUTO
METHOD hObj( xOle ) CLASS TOleAuto
IF xOle != NIL
IF HB_ISNUMERIC( xOle )
@@ -180,7 +180,7 @@ METHOD hObj( xOle ) CLASS TOLEAUTO
RETURN ::__hObj
METHOD New( xOle, cClass, cLicense ) CLASS TOLEAUTO
METHOD New( xOle, cClass, cLicense ) CLASS TOleAuto
LOCAL hOle
@@ -205,7 +205,7 @@ METHOD New( xOle, cClass, cLicense ) CLASS TOLEAUTO
RETURN Self
METHOD GetActiveObject( cClass ) CLASS TOLEAUTO
METHOD GetActiveObject( cClass ) CLASS TOleAuto
IF HB_ISSTRING( cClass )
IF ! Empty( ::__hObj := __oleGetActiveObject( cClass ) )
@@ -221,14 +221,14 @@ METHOD GetActiveObject( cClass ) CLASS TOLEAUTO
RETURN Self
METHOD OleValue() CLASS TOLEAUTO
METHOD OleValue() CLASS TOleAuto
RETURN __oleInvokeGet( ::__hObj, DISPID_VALUE )
METHOD _OleValue( xValue ) CLASS TOLEAUTO
METHOD _OleValue( xValue ) CLASS TOleAuto
RETURN __oleInvokePut( ::__hObj, DISPID_VALUE, xValue )
#xcommand OLE OPERATOR <op> METHOD <!mth!> [WITH <!arg!>] IS <exp> => ;
METHOD <mth>( <arg> ) CLASS TOLEAUTO ;;
METHOD <mth>( <arg> ) CLASS TOleAuto ;;
LOCAL xRet ;;
BEGIN SEQUENCE WITH s_bBreak ;;
xRet := ( <exp> ) ;;