From 6af3a360442b6cc781c61279f5fee4bbe4359c65 Mon Sep 17 00:00:00 2001 From: April White Date: Tue, 23 Jun 2009 01:56:52 +0000 Subject: [PATCH] 2009-06-22 20:48 UTC+0600 April White (april users.sourceforge.net) * contrib\hbblat\blatcls.prg * METHOD Check() CLASS HBBlat -> METHOD PROCEDURE * contrib\hbgd\gdimage.prg * METHOD Destruct() CLASS GDImage -> METHOD PROCEDURE * contrib\xhb\hblog.prg * METHOD Open() CLASS HB_Logger -> METHOD PROCEDURE * METHOD Close() CLASS HB_Logger -> METHOD PROCEDURE * METHOD Log( cMessage, nPriority ) CLASS HB_Logger -> METHOD PROCEDURE * METHOD Log( nStyle, cMessage, cName, nPriority ) CLASS HB_LogChannel -> METHOD PROCEDURE * METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogConsole -> METHOD PROCEDURE * METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogDebug -> METHOD PROCEDURE * contrib\xhb\stream.prg * METHOD CopyTo( oTargetStream ) CLASS TStream -> METHOD PROCEDURE * METHOD Finalize CLASS TStreamFileReader -> METHOD PROCEDURE * METHOD Finalize CLASS TStreamFileWriter -> METHOD PROCEDURE * METHOD WriteByte( cByte ) CLASS TStreamFileWriter -> METHOD PROCEDURE * contrib\xhb\ttable.prg * METHOD GET() CLASS HBRecord -> METHOD PROCEDURE * METHOD Put() CLASS HBRecord -> METHOD PROCEDURE * METHOD DBMove( nDirection ) CLASS HBTable -> METHOD PROCEDURE * METHOD READ( lKeepBuffer ) CLASS HBTable -> METHOD PROCEDURE * METHOD ReadBlank( lKeepBuffer ) CLASS HBTable -> METHOD PROCEDURE * METHOD AddField( f, t, l, d ) CLASS HBTable -> METHOD PROCEDURE * METHOD Gentable() CLASS HBTable -> METHOD PROCEDURE * METHOD Create() CLASS HBOrder -> METHOD PROCEDURE --- harbour/ChangeLog | 27 ++++++++++++++++++++ harbour/contrib/hbblat/blatcls.prg | 40 +++++++++++++++--------------- harbour/contrib/hbgd/gdimage.prg | 4 +-- harbour/contrib/xhb/hblog.prg | 26 +++++++++---------- harbour/contrib/xhb/stream.prg | 16 ++++++------ harbour/contrib/xhb/ttable.prg | 32 ++++++++++++------------ 6 files changed, 86 insertions(+), 59 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 86da67fb93..d17fafe686 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,33 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-22 20:48 UTC+0600 April White (april users.sourceforge.net) + * contrib\hbblat\blatcls.prg + * METHOD Check() CLASS HBBlat -> METHOD PROCEDURE + * contrib\hbgd\gdimage.prg + * METHOD Destruct() CLASS GDImage -> METHOD PROCEDURE + * contrib\xhb\hblog.prg + * METHOD Open() CLASS HB_Logger -> METHOD PROCEDURE + * METHOD Close() CLASS HB_Logger -> METHOD PROCEDURE + * METHOD Log( cMessage, nPriority ) CLASS HB_Logger -> METHOD PROCEDURE + * METHOD Log( nStyle, cMessage, cName, nPriority ) CLASS HB_LogChannel -> METHOD PROCEDURE + * METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogConsole -> METHOD PROCEDURE + * METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogDebug -> METHOD PROCEDURE + * contrib\xhb\stream.prg + * METHOD CopyTo( oTargetStream ) CLASS TStream -> METHOD PROCEDURE + * METHOD Finalize CLASS TStreamFileReader -> METHOD PROCEDURE + * METHOD Finalize CLASS TStreamFileWriter -> METHOD PROCEDURE + * METHOD WriteByte( cByte ) CLASS TStreamFileWriter -> METHOD PROCEDURE + * contrib\xhb\ttable.prg + * METHOD GET() CLASS HBRecord -> METHOD PROCEDURE + * METHOD Put() CLASS HBRecord -> METHOD PROCEDURE + * METHOD DBMove( nDirection ) CLASS HBTable -> METHOD PROCEDURE + * METHOD READ( lKeepBuffer ) CLASS HBTable -> METHOD PROCEDURE + * METHOD ReadBlank( lKeepBuffer ) CLASS HBTable -> METHOD PROCEDURE + * METHOD AddField( f, t, l, d ) CLASS HBTable -> METHOD PROCEDURE + * METHOD Gentable() CLASS HBTable -> METHOD PROCEDURE + * METHOD Create() CLASS HBOrder -> METHOD PROCEDURE + 2009-06-22 20:38 UTC+0600 April White (april users.sourceforge.net) * examples/hbextern/hbextern.prg * significant re-implementation diff --git a/harbour/contrib/hbblat/blatcls.prg b/harbour/contrib/hbblat/blatcls.prg index f707c12682..98a03f5ba1 100644 --- a/harbour/contrib/hbblat/blatcls.prg +++ b/harbour/contrib/hbblat/blatcls.prg @@ -221,7 +221,7 @@ METHOD Send() CLASS HBBlat RETURN ::nError -METHOD Check() CLASS HBBlat +METHOD PROCEDURE Check() CLASS HBBlat // Not using registry, so every parameter has to be explicity set // No control apart from existence @@ -238,7 +238,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_TO ) AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE IF ISCHARACTER( ::cTO ) @@ -253,7 +253,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_TOFILE ) + ": " + ::cToFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += " -tf " + ::cToFile @@ -272,7 +272,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_CCFILE ) + ": " + ::cCCFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += " -cf " + ::cCCFile @@ -291,7 +291,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_BCCFILE ) + ": " + ::cBCCFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += " -bf " + ::cBCCFile @@ -325,7 +325,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_SUBJECTFILE ) + ": " + ::cSubjectFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += ' -sf ' + ::cSubjectFile @@ -339,7 +339,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_BODYFILE ) + ": " + ::cBodyFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += " -bodyF " + ::cBodyFile @@ -352,7 +352,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_BODY ) AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE IF ISCHARACTER( ::cBody ) @@ -363,7 +363,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_BODYFILE ) + ": " + ::cBodyFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += " -bodyF " + ::cBodyFile @@ -378,7 +378,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_SIGNATUREFILE ) + ": " + ::cSignatureFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += ' -sig ' + ::cSignatureFile @@ -392,7 +392,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_TAGFILE ) + ": " + ::cTagFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += ' -tag ' + ::cTagFile @@ -406,7 +406,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_PSFILE ) + ": " + ::cPostScriptumFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += ' -ps ' + ::cPostScriptumFile @@ -431,7 +431,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_SERVERSMTP ) AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += " -server " + ::cServerSMTP @@ -463,7 +463,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_FROM ) AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += " -f " + ::cFrom @@ -604,7 +604,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_WRONG_DSN ) + ": " + ::cDSN AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ENDIF ENDIF @@ -692,7 +692,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_ATTACHLISTBINFILE ) + ": " + ::cAttachListBinFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += " -af " + ::cAttachListBinFile @@ -706,7 +706,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_ATTACHLISTTEXTFILE ) + ": " + ::cAttachListTextFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += " -atf " + ::cAttachListTextFile @@ -720,7 +720,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_ATTACHLISTEMBEDDEDFILE ) + ": " + ::cAttachListEmbeddedFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += " -aef " + ::cAttachListEmbeddedFile @@ -764,7 +764,7 @@ METHOD Check() CLASS HBBlat ::cError := ::TranslateBlatError( BLAT_ERR_MISSING_ALTERNATETEXTFILE ) + ": " + ::cAlternateTextFile AAdd( ::aErrors, { ::nError, ::cError } ) IF !::lIgnoreErrors - RETURN Self + RETURN ENDIF ELSE ::cCommand += " -alttextf " + ::cAlternateTextFile @@ -894,7 +894,7 @@ METHOD Check() CLASS HBBlat ENDIF - RETURN Self + RETURN METHOD GetCommand() CLASS HBBlat IF !::lChecked diff --git a/harbour/contrib/hbgd/gdimage.prg b/harbour/contrib/hbgd/gdimage.prg index e2e0b9a112..3675ecc9df 100644 --- a/harbour/contrib/hbgd/gdimage.prg +++ b/harbour/contrib/hbgd/gdimage.prg @@ -298,12 +298,12 @@ METHOD New( sx, sy ) CLASS GDImage ::Create( sx, sy ) RETURN Self -METHOD Destruct() CLASS GDImage +METHOD PROCEDURE Destruct() CLASS GDImage //__OutDebug( "Destroyed" ) IF ::lDestroy ::Destroy() ENDIF -RETURN NIL +RETURN METHOD Polygon( aPoints, lFilled, color ) CLASS GDImage DEFAULT aPoints TO ::aPoints diff --git a/harbour/contrib/xhb/hblog.prg b/harbour/contrib/xhb/hblog.prg index b469fd52a1..32d9c18caa 100644 --- a/harbour/contrib/xhb/hblog.prg +++ b/harbour/contrib/xhb/hblog.prg @@ -251,7 +251,7 @@ RETURN Self * Open all the channels calling their ::Open() method */ -METHOD Open() CLASS HB_Logger +METHOD PROCEDURE Open() CLASS HB_Logger LOCAL oChannel @@ -263,12 +263,12 @@ METHOD Open() CLASS HB_Logger oChannel:Open( ::cProgName ) NEXT -RETURN Self +RETURN /** * Close all the channels calling their ::Close() method */ -METHOD Close() CLASS HB_Logger +METHOD PROCEDURE Close() CLASS HB_Logger LOCAL oChannel @@ -280,12 +280,12 @@ METHOD Close() CLASS HB_Logger oChannel:Close( ::cProgName ) NEXT -RETURN Self +RETURN /** * Send a log message to all the channels */ -METHOD Log( cMessage, nPriority ) CLASS HB_Logger +METHOD PROCEDURE Log( cMessage, nPriority ) CLASS HB_Logger LOCAL oChannel IF nPriority == NIL @@ -298,7 +298,7 @@ METHOD Log( cMessage, nPriority ) CLASS HB_Logger oChannel:Log( ::nStyle, cMessage, ::cProgName, nPriority ) NEXT -RETURN Self +RETURN /********************************************** * Logger Channel class (mostly VIRTUAL) @@ -344,13 +344,13 @@ RETURN Self * if the log level is higher or equal than the channel setting */ -METHOD Log( nStyle, cMessage, cName, nPriority ) CLASS HB_LogChannel +METHOD PROCEDURE Log( nStyle, cMessage, cName, nPriority ) CLASS HB_LogChannel IF nPriority <= ::nLevel .and. ::lActive ::Send( nStyle, cMessage, cName, nPriority ) ENDIF -RETURN Self +RETURN /** * This is an utility functions for subclasses, used to @@ -459,7 +459,7 @@ METHOD Close( cName ) CLASS HB_LogConsole RETURN .T. -METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogConsole +METHOD PROCEDURE Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogConsole IF ::lRealConsole OutStd( ::Format( nStyle, cMessage, cName, nPriority ), HB_OSnewLine() ) @@ -467,7 +467,7 @@ METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogConsole QOut( ::Format( nStyle, cMessage, cName, nPriority ) ) ENDIF -RETURN Self +RETURN /********************************************** * Console channel - to file @@ -657,14 +657,14 @@ METHOD New( nLevel, nMaxLevel ) CLASS HB_LogDebug RETURN Self -METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogDebug +METHOD PROCEDURE Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogDebug IF .not. Empty( ::nMaxLevel ) IF nPriority < ::nMaxLevel - RETURN Self + RETURN ENDIF ENDIF HB_OutDebug( ::Format( nStyle, cMessage, cName, nPriority ) ) -RETURN Self +RETURN diff --git a/harbour/contrib/xhb/stream.prg b/harbour/contrib/xhb/stream.prg index 7c3024b63e..2653ba4f07 100644 --- a/harbour/contrib/xhb/stream.prg +++ b/harbour/contrib/xhb/stream.prg @@ -94,7 +94,7 @@ CREATE CLASS TStream ENDCLASS -METHOD CopyTo( oTargetStream ) CLASS TStream +METHOD PROCEDURE CopyTo( oTargetStream ) CLASS TStream LOCAL nBytesToRead := ::nLength LOCAL sBuffer := Space( BUFFER_SIZE ) @@ -123,7 +123,7 @@ METHOD CopyTo( oTargetStream ) CLASS TStream // Restore. ::Seek( nPosition, FS_SET ) - RETURN Self + RETURN CREATE CLASS TStreamFileReader FROM TStream @@ -164,9 +164,9 @@ METHOD New( cFile, nMode ) CLASS TStreamFileReader RETURN Self -METHOD Finalize CLASS TStreamFileReader +METHOD PROCEDURE Finalize CLASS TStreamFileReader ::Close() - RETURN NIL + RETURN METHOD Read( sBuffer, nOffset, nCount ) CLASS TStreamFileReader @@ -242,9 +242,9 @@ METHOD New( cFile, nMode ) CLASS TStreamFileWriter RETURN Self -METHOD Finalize CLASS TStreamFileWriter +METHOD PROCEDURE Finalize CLASS TStreamFileWriter ::Close() - RETURN NIL + RETURN METHOD Write( sBuffer, nOffset, nCount ) CLASS TStreamFileWriter @@ -260,7 +260,7 @@ METHOD Write( sBuffer, nOffset, nCount ) CLASS TStreamFileWriter RETURN nWritten -METHOD WriteByte( cByte ) CLASS TStreamFileWriter +METHOD PROCEDURE WriteByte( cByte ) CLASS TStreamFileWriter LOCAL nWritten := FWrite( ::Handle, cByte, 1 ) @@ -270,4 +270,4 @@ METHOD WriteByte( cByte ) CLASS TStreamFileWriter Throw( ErrorNew( "Stream", 0, 1006, ProcName(), "Write failed", HB_aParams() ) ) ENDIF - RETURN Self + RETURN diff --git a/harbour/contrib/xhb/ttable.prg b/harbour/contrib/xhb/ttable.prg index d558aaba57..a205601fd3 100644 --- a/harbour/contrib/xhb/ttable.prg +++ b/harbour/contrib/xhb/ttable.prg @@ -574,7 +574,7 @@ METHOD NEW( cAlias ) CLASS HBRecord RETURN Self -METHOD GET() CLASS HBRecord +METHOD PROCEDURE GET() CLASS HBRecord LOCAL xField @@ -583,10 +583,10 @@ METHOD GET() CLASS HBRecord ::buffer[ xField:__EnumIndex() ] := xField:value NEXT -RETURN Self +RETURN -METHOD Put() CLASS HBRecord +METHOD PROCEDURE Put() CLASS HBRecord LOCAL xField @@ -597,7 +597,7 @@ METHOD Put() CLASS HBRecord ENDIF NEXT -RETURN Self +RETURN /**** * @@ -850,7 +850,7 @@ METHOD OPEN() CLASS HBTable RETURN ( lSuccess ) -METHOD DBMove( nDirection ) CLASS HBTable +METHOD PROCEDURE DBMove( nDirection ) CLASS HBTable DEFAULT nDirection TO 0 @@ -871,7 +871,7 @@ METHOD DBMove( nDirection ) CLASS HBTable ( ::Alias )->( DBGOTO( nDirection ) ) ENDCASE -RETURN Self +RETURN // --> // --> @@ -943,7 +943,7 @@ METHOD FldInit() CLASS HBTable RETURN oNew -METHOD READ( lKeepBuffer ) CLASS HBTable +METHOD PROCEDURE READ( lKeepBuffer ) CLASS HBTable LOCAL i LOCAL nSel := SELECT( ::Alias ) @@ -970,10 +970,10 @@ METHOD READ( lKeepBuffer ) CLASS HBTable SELECT( nSel ) -RETURN Self +RETURN -METHOD ReadBlank( lKeepBuffer ) CLASS HBTable +METHOD PROCEDURE ReadBlank( lKeepBuffer ) CLASS HBTable LOCAL i LOCAL nSel := SELECT( ::Alias ) @@ -1002,7 +1002,7 @@ METHOD ReadBlank( lKeepBuffer ) CLASS HBTable ( ::Alias )->( DBGOTO( nRec ) ) SELECT( nSel ) -RETURN Self +RETURN METHOD Write( lKeepBuffer ) CLASS HBTable @@ -1447,16 +1447,16 @@ METHOD CreateTable( cFile ) CLASS HBTable RETURN Self -METHOD AddField( f, t, l, d ) CLASS HBTable +METHOD PROCEDURE AddField( f, t, l, d ) CLASS HBTable AADD( ::aStruc, { f, t, l, d } ) -RETURN Self +RETURN -METHOD Gentable() CLASS HBTable +METHOD PROCEDURE Gentable() CLASS HBTable DBCREATE( ::cDbf, ::aStruc, ::Driver ) -RETURN Self +RETURN METHOD OnError( uParam ) CLASS HBTable @@ -1544,7 +1544,7 @@ METHOD New( cTag, cKey, cLabel, cFor, cWhile, lUnique, bEval, nInterval, cOrderB RETURN Self -METHOD Create() CLASS HBOrder +METHOD PROCEDURE Create() CLASS HBOrder DEFAULT ::cOrderBag TO ::oTable:cOrderBag //? "<<<",::alias, ::cOrderBag @@ -1555,4 +1555,4 @@ METHOD Create() CLASS HBOrder ( ::alias )->( ORDCREATE( ::cOrderBag, ::Tag, ::cKey, ; ::bKey, ::Unique ) ) -RETURN Self +RETURN