diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4fb72ecc85..bcac2689a6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-19 09:20 UTC+0600 April White (april@users.sourceforge.net) + * contrib/hbblat/blatcls.prg + * contrib/hbgd/gdimage.prg + * contrib/xhb/hblog.prg + * contrib/xhb/stream.prg + * contrib/xhb/ttable.prg + * Declare class methods indicated as procedure + 2009-06-19 15:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/darwin/gcc.cf ! Fixed a hard-wired 'cc' to be $(HB_CMP) diff --git a/harbour/contrib/hbblat/blatcls.prg b/harbour/contrib/hbblat/blatcls.prg index 745d141d37..a630075818 100644 --- a/harbour/contrib/hbblat/blatcls.prg +++ b/harbour/contrib/hbblat/blatcls.prg @@ -221,7 +221,7 @@ METHOD Send() CLASS HBBlat RETURN ::nError -PROCEDURE Check() CLASS HBBlat +METHOD Check() CLASS HBBlat // Not using registry, so every parameter has to be explicity set // No control apart from existence diff --git a/harbour/contrib/hbgd/gdimage.prg b/harbour/contrib/hbgd/gdimage.prg index 03c5d5d73a..f0c5c1df5a 100644 --- a/harbour/contrib/hbgd/gdimage.prg +++ b/harbour/contrib/hbgd/gdimage.prg @@ -298,7 +298,7 @@ METHOD New( sx, sy ) CLASS GDImage ::Create( sx, sy ) RETURN Self -PROCEDURE Destruct() CLASS GDImage +METHOD Destruct() CLASS GDImage //__OutDebug( "Destroyed" ) IF ::lDestroy ::Destroy() diff --git a/harbour/contrib/xhb/hblog.prg b/harbour/contrib/xhb/hblog.prg index 955b4f84b3..72ed1b3652 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 */ -PROCEDURE Open() CLASS HB_Logger +METHOD Open() CLASS HB_Logger LOCAL oChannel @@ -268,7 +268,7 @@ RETURN /** * Close all the channels calling their ::Close() method */ -PROCEDURE Close() CLASS HB_Logger +METHOD Close() CLASS HB_Logger LOCAL oChannel @@ -285,7 +285,7 @@ RETURN /** * Send a log message to all the channels */ -PROCEDURE Log( cMessage, nPriority ) CLASS HB_Logger +METHOD Log( cMessage, nPriority ) CLASS HB_Logger LOCAL oChannel IF nPriority == NIL @@ -344,7 +344,7 @@ RETURN Self * if the log level is higher or equal than the channel setting */ -PROCEDURE Log( nStyle, cMessage, cName, nPriority ) CLASS HB_LogChannel +METHOD Log( nStyle, cMessage, cName, nPriority ) CLASS HB_LogChannel IF nPriority <= ::nLevel .and. ::lActive ::Send( nStyle, cMessage, cName, nPriority ) @@ -459,7 +459,7 @@ METHOD Close( cName ) CLASS HB_LogConsole RETURN .T. -PROCEDURE Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogConsole +METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogConsole IF ::lRealConsole OutStd( ::Format( nStyle, cMessage, cName, nPriority ), HB_OSnewLine() ) @@ -657,7 +657,7 @@ METHOD New( nLevel, nMaxLevel ) CLASS HB_LogDebug RETURN Self -PROCEDURE Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogDebug +METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogDebug IF .not. Empty( ::nMaxLevel ) IF nPriority < ::nMaxLevel diff --git a/harbour/contrib/xhb/stream.prg b/harbour/contrib/xhb/stream.prg index f53fb70f9c..29effdd64f 100644 --- a/harbour/contrib/xhb/stream.prg +++ b/harbour/contrib/xhb/stream.prg @@ -94,7 +94,7 @@ CREATE CLASS TStream ENDCLASS -PROCEDURE CopyTo( oTargetStream ) CLASS TStream +METHOD CopyTo( oTargetStream ) CLASS TStream LOCAL nBytesToRead := ::nLength LOCAL sBuffer := Space( BUFFER_SIZE ) @@ -164,7 +164,7 @@ METHOD New( cFile, nMode ) CLASS TStreamFileReader RETURN Self -PROCEDURE Finalize CLASS TStreamFileReader +METHOD Finalize CLASS TStreamFileReader ::Close() RETURN @@ -242,7 +242,7 @@ METHOD New( cFile, nMode ) CLASS TStreamFileWriter RETURN Self -PROCEDURE Finalize CLASS TStreamFileWriter +METHOD Finalize CLASS TStreamFileWriter ::Close() RETURN @@ -260,7 +260,7 @@ METHOD Write( sBuffer, nOffset, nCount ) CLASS TStreamFileWriter RETURN nWritten -PROCEDURE WriteByte( cByte ) CLASS TStreamFileWriter +METHOD WriteByte( cByte ) CLASS TStreamFileWriter LOCAL nWritten := FWrite( ::Handle, cByte, 1 ) diff --git a/harbour/contrib/xhb/ttable.prg b/harbour/contrib/xhb/ttable.prg index 7e291d94be..c8b439fc83 100644 --- a/harbour/contrib/xhb/ttable.prg +++ b/harbour/contrib/xhb/ttable.prg @@ -574,7 +574,7 @@ METHOD NEW( cAlias ) CLASS HBRecord RETURN Self -PROCEDURE GET() CLASS HBRecord +METHOD GET() CLASS HBRecord LOCAL xField @@ -586,7 +586,7 @@ PROCEDURE GET() CLASS HBRecord RETURN -PROCEDURE Put() CLASS HBRecord +METHOD Put() CLASS HBRecord LOCAL xField @@ -850,7 +850,7 @@ METHOD OPEN() CLASS HBTable RETURN ( lSuccess ) -PROCEDURE DBMove( nDirection ) CLASS HBTable +METHOD DBMove( nDirection ) CLASS HBTable DEFAULT nDirection TO 0 @@ -943,7 +943,7 @@ METHOD FldInit() CLASS HBTable RETURN oNew -PROCEDURE READ( lKeepBuffer ) CLASS HBTable +METHOD READ( lKeepBuffer ) CLASS HBTable LOCAL i LOCAL nSel := SELECT( ::Alias ) @@ -973,7 +973,7 @@ PROCEDURE READ( lKeepBuffer ) CLASS HBTable RETURN -PROCEDURE ReadBlank( lKeepBuffer ) CLASS HBTable +METHOD ReadBlank( lKeepBuffer ) CLASS HBTable LOCAL i LOCAL nSel := SELECT( ::Alias ) @@ -1417,7 +1417,7 @@ RETURN aRet // Relation Methods // -PROCEDURE AddChild( oChild, cKey ) CLASS HBTable // ::addChild() +METHOD AddChild( oChild, cKey ) CLASS HBTable // ::addChild() AADD( ::aChildren, { oChild, cKey } ) oChild:oParent := Self @@ -1447,13 +1447,13 @@ METHOD CreateTable( cFile ) CLASS HBTable RETURN Self -PROCEDURE AddField( f, t, l, d ) CLASS HBTable +METHOD AddField( f, t, l, d ) CLASS HBTable AADD( ::aStruc, { f, t, l, d } ) RETURN -PROCEDURE Gentable() CLASS HBTable +METHOD Gentable() CLASS HBTable DBCREATE( ::cDbf, ::aStruc, ::Driver ) RETURN @@ -1544,7 +1544,7 @@ METHOD New( cTag, cKey, cLabel, cFor, cWhile, lUnique, bEval, nInterval, cOrderB RETURN Self -PROCEDURE Create() CLASS HBOrder +METHOD Create() CLASS HBOrder DEFAULT ::cOrderBag TO ::oTable:cOrderBag //? "<<<",::alias, ::cOrderBag