diff --git a/contrib/gtwvg/3state.prg b/contrib/gtwvg/3state.prg index 00d07e1856..74cb092aef 100644 --- a/contrib/gtwvg/3state.prg +++ b/contrib/gtwvg/3state.prg @@ -95,7 +95,7 @@ METHOD Wvg3State:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) - ::oParent:AddChild( SELF ) + ::oParent:AddChild( Self ) ::createControl() diff --git a/contrib/gtwvg/class.prg b/contrib/gtwvg/class.prg index b104ffb2cf..c348ad1500 100644 --- a/contrib/gtwvg/class.prg +++ b/contrib/gtwvg/class.prg @@ -638,7 +638,7 @@ METHOD WvtDialog:CreateObjects() ENDSWITCH NEXT - RETURN self + RETURN Self METHOD WvtDialog:Eval( bBlock, p1, p2, p3, p4, p5 ) @@ -1003,7 +1003,7 @@ METHOD WvtBrowse:Create() METHOD WvtBrowse:SetVBar() IF ::lVSBar - ::oVBar := WvtScrollBar():New( self, 999991, ; + ::oVBar := WvtScrollBar():New( Self, 999991, ; ::oBrw:nTop, ::oBrw:nRight + 1, ::oBrw:nBottom, ::oBrw:nRight + 2 ) ::oVBar:nBarType := WVT_SCROLLBAR_VERT ::oVBar:bTotal := ::bTotalRecords @@ -1033,7 +1033,7 @@ METHOD WvtBrowse:SetVBar() METHOD WvtBrowse:SetHBar() IF ::lHSBar - ::oHBar := WvtScrollBar():New( self, 999990, ; + ::oHBar := WvtScrollBar():New( Self, 999990, ; ::oBrw:nBottom + 1, ::oBrw:nLeft, ::oBrw:nBottom + 1, ::oBrw:nRight ) ::oHBar:nBarType := 2 ::oHBar:bTotal := ::bTotalColumns @@ -1288,7 +1288,7 @@ METHOD WvtStatusBar:SetPanels( aPanels ) oPanel:cColor := ::cColor NEXT - RETURN self + RETURN Self METHOD WvtStatusBar:Update( nPanel, cText, cColor ) @@ -1582,7 +1582,7 @@ METHOD WvtToolBar:AddButton( cFileImage, bBlock, cTooltip ) nCol := ( ::nBottom - ::nTop + 1 ) * 2 - oObj := WvtToolButton():New( self ) + oObj := WvtToolButton():New( Self ) oObj:lActive := ::lActive oObj:nTop := ::nTop @@ -1623,7 +1623,7 @@ METHOD WvtToolBar:HoverOn() ::Refresh() ENDIF - RETURN self + RETURN Self METHOD WvtToolBar:HoverOff() diff --git a/contrib/gtwvg/crt.prg b/contrib/gtwvg/crt.prg index cf5833a61a..23543dc927 100644 --- a/contrib/gtwvg/crt.prg +++ b/contrib/gtwvg/crt.prg @@ -453,7 +453,7 @@ METHOD WvgCrt:lockUpdate() METHOD WvgCrt:menuBar() IF ! HB_ISOBJECT( ::oMenu ) - ::oMenu := WvgMenuBar():New( self ):create() + ::oMenu := WvgMenuBar():New( Self ):create() ENDIF RETURN ::oMenu diff --git a/contrib/gtwvg/dataref.prg b/contrib/gtwvg/dataref.prg index 901bceb8e5..26310b2ac4 100644 --- a/contrib/gtwvg/dataref.prg +++ b/contrib/gtwvg/dataref.prg @@ -82,7 +82,7 @@ CREATE CLASS WvgDataRef ENDCLASS METHOD WvgDataRef:new() - RETURN self + RETURN Self METHOD WvgDataRef:getData() diff --git a/contrib/gtwvg/dialog.prg b/contrib/gtwvg/dialog.prg index b3f4d419cc..96ed224e93 100644 --- a/contrib/gtwvg/dialog.prg +++ b/contrib/gtwvg/dialog.prg @@ -208,7 +208,7 @@ METHOD WvgDialog:getFrameState() METHOD WvgDialog:menuBar() IF ! HB_ISOBJECT( ::oMenu ) - ::oMenu := WvgMenuBar():New( self ):create() + ::oMenu := WvgMenuBar():New( Self ):create() ENDIF RETURN ::oMenu diff --git a/contrib/gtwvg/htmlview.prg b/contrib/gtwvg/htmlview.prg index d7418590c8..a04d7e51a6 100644 --- a/contrib/gtwvg/htmlview.prg +++ b/contrib/gtwvg/htmlview.prg @@ -207,4 +207,4 @@ METHOD WvgHTMLViewer:setHTML( cHTML ) ::document:innerHTML := cHTML ::refresh() - RETURN self + RETURN Self diff --git a/contrib/gtwvg/radiobut.prg b/contrib/gtwvg/radiobut.prg index 167a58879a..b7638ccd22 100644 --- a/contrib/gtwvg/radiobut.prg +++ b/contrib/gtwvg/radiobut.prg @@ -90,7 +90,7 @@ METHOD WvgRadioButton:create( oParent, oOwner, aPos, aSize, aPresParams, lVisibl ::wvgWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) - ::oParent:addChild( SELF ) + ::oParent:addChild( Self ) ::createControl() diff --git a/contrib/gtwvg/scrollbr.prg b/contrib/gtwvg/scrollbr.prg index 339fba885b..2d7b22dfb1 100644 --- a/contrib/gtwvg/scrollbr.prg +++ b/contrib/gtwvg/scrollbr.prg @@ -101,7 +101,7 @@ METHOD WvgScrollBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ::style += SBS_HORZ ENDIF - ::oParent:AddChild( SELF ) + ::oParent:AddChild( Self ) ::createControl() @@ -302,7 +302,7 @@ METHOD WvgScrollBar:Scroll( xParam ) ::sl_xbeSB_Scroll := xParam ENDIF - RETURN self + RETURN Self METHOD WvgScrollBar:setRange( aRange ) diff --git a/contrib/gtwvg/statbar.prg b/contrib/gtwvg/statbar.prg index f7f97a9352..dccefa3c53 100644 --- a/contrib/gtwvg/statbar.prg +++ b/contrib/gtwvg/statbar.prg @@ -98,7 +98,7 @@ METHOD WvgStatusBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ::style += SBARS_SIZEGRIP ENDIF - ::oParent:AddChild( SELF ) + ::oParent:AddChild( Self ) ::createControl() @@ -192,7 +192,7 @@ METHOD WvgStatusBar:addItem( cCaption, xImage, cDLL, nStyle, cKey, nMode ) HB_SYMBOL_UNUSED( cDLL ) oPanel := WvgStatusBarPanel():new( cCaption, nStyle, cKey ) - oPanel:oParent := self + oPanel:oParent := Self oPanel:index := ::numItems + 1 diff --git a/contrib/gtwvg/static.prg b/contrib/gtwvg/static.prg index 7107279067..2243cf6e66 100644 --- a/contrib/gtwvg/static.prg +++ b/contrib/gtwvg/static.prg @@ -197,7 +197,7 @@ METHOD WvgStatic:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ENDIF #endif - ::oParent:addChild( SELF ) + ::oParent:addChild( Self ) ::createControl() diff --git a/contrib/gtwvg/tabpage.prg b/contrib/gtwvg/tabpage.prg index 2bdf19178c..769ef8a61e 100644 --- a/contrib/gtwvg/tabpage.prg +++ b/contrib/gtwvg/tabpage.prg @@ -106,7 +106,7 @@ METHOD WvgTabPage:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::style += TCS_FOCUSNEVER - ::oParent:AddChild( SELF ) + ::oParent:AddChild( Self ) ::createControl() @@ -163,7 +163,7 @@ METHOD WvgTabPage:tabActivate( xParam ) ::sl_tabActivate := xParam ENDIF - RETURN self + RETURN Self METHOD WvgTabPage:minimize() diff --git a/contrib/gtwvg/toolbar.prg b/contrib/gtwvg/toolbar.prg index 946d26c024..7770070dd8 100644 --- a/contrib/gtwvg/toolbar.prg +++ b/contrib/gtwvg/toolbar.prg @@ -149,7 +149,7 @@ METHOD WvgToolBar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ENDIF #endif - ::oParent:AddChild( SELF ) + ::oParent:AddChild( Self ) ::createControl() diff --git a/contrib/gtwvg/treeview.prg b/contrib/gtwvg/treeview.prg index a68d281d10..f88dd80928 100644 --- a/contrib/gtwvg/treeview.prg +++ b/contrib/gtwvg/treeview.prg @@ -128,7 +128,7 @@ METHOD WvgTreeView:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::style += TVS_HASLINES + TVS_LINESATROOT ENDIF - ::oParent:AddChild( SELF ) + ::oParent:AddChild( Self ) ::createControl() @@ -403,7 +403,7 @@ METHOD WvgTreeViewItem:addItem( cCaption ) oItem := WvgTreeViewItem():New() oItem:hTree := ::hTree - oItem:oParent := self + oItem:oParent := Self oItem:caption := cCaption oItem:oWnd := ::oWnd diff --git a/contrib/hbamf/hbamfobj.prg b/contrib/hbamf/hbamfobj.prg index 7f90a2a154..5e3124b318 100644 --- a/contrib/hbamf/hbamfobj.prg +++ b/contrib/hbamf/hbamfobj.prg @@ -73,7 +73,7 @@ METHOD New( hCachedData ) CLASS amf_Obj ::hCachedData := hCachedData - RETURN self + RETURN Self METHOD noMessage( ... ) CLASS amf_Obj RETURN ::msgNotFound( __GetMessage(), ... ) @@ -107,4 +107,4 @@ METHOD New( cData ) CLASS amf_Raw ::cData := cData - RETURN self + RETURN Self diff --git a/contrib/hbfbird/tfirebrd.prg b/contrib/hbfbird/tfirebrd.prg index 2f2c0f27cd..7c8939472b 100644 --- a/contrib/hbfbird/tfirebrd.prg +++ b/contrib/hbfbird/tfirebrd.prg @@ -112,7 +112,7 @@ METHOD New( cServer, cUser, cPassword, nDialect ) CLASS TFbServer ::nError := ::db ENDIF - RETURN self + RETURN Self METHOD StartTransaction() CLASS TFbServer @@ -517,7 +517,7 @@ METHOD New( nDB, cQuery, nDialect ) CLASS TFbQuery ::Refresh() - RETURN self + RETURN Self METHOD Refresh() CLASS TFbQuery @@ -812,7 +812,7 @@ METHOD new( row, struct, nDb, nDialect, aTable ) CLASS TFbRow ::aTables := aTable ::aChanged := Array( Len( row ) ) - RETURN self + RETURN Self METHOD Changed( nField ) CLASS TFbRow diff --git a/contrib/hbpgsql/tpostgre.prg b/contrib/hbpgsql/tpostgre.prg index d7f4ec007f..4a3a3e23a6 100644 --- a/contrib/hbpgsql/tpostgre.prg +++ b/contrib/hbpgsql/tpostgre.prg @@ -116,7 +116,7 @@ METHOD New( cHost, cDatabase, cUser, cPass, nPort, Schema ) CLASS TPQserver ENDIF ENDIF - RETURN self + RETURN Self METHOD Destroy() CLASS TPQserver @@ -543,7 +543,7 @@ METHOD New( pDB, cQuery, lallCols, cSchema, res ) CLASS TPQquery ::Refresh( res == NIL ) - RETURN self + RETURN Self METHOD Destroy() CLASS TPQquery @@ -1225,7 +1225,7 @@ METHOD new( row, old, struct ) CLASS TPQrow ::aOld := old ::aStruct := struct - RETURN self + RETURN Self METHOD FieldGet( nField ) CLASS TPQrow diff --git a/contrib/hbwin/oleauto.prg b/contrib/hbwin/oleauto.prg index 91991de610..4a5ec39995 100644 --- a/contrib/hbwin/oleauto.prg +++ b/contrib/hbwin/oleauto.prg @@ -73,11 +73,11 @@ METHOD __enumStart( enum, lDescend ) CLASS win_oleAuto IF ! Empty( hObjEnum := __oleEnumCreate( ::__hObj, lDescend ) ) IF ! Empty( ::__hObjEnum ) /* small hack - clone the object array for nested FOR EACH calls */ - self := __objClone( self ) + Self := __objClone( Self ) ENDIF ::__hObjEnum := hObjEnum /* set base value for enumerator */ - ( @enum ):__enumBase( self ) + ( @enum ):__enumBase( Self ) RETURN ::__enumSkip( @enum, lDescend ) ENDIF diff --git a/contrib/hbwin/tests/activex.prg b/contrib/hbwin/tests/activex.prg index 1987564f70..d8a2f51afe 100644 --- a/contrib/hbwin/tests/activex.prg +++ b/contrib/hbwin/tests/activex.prg @@ -45,7 +45,7 @@ METHOD Init( hWnd, cProgId, nTop, nLeft, nWidth, nHeight, cID ) CLASS HActiveX #endif ::oOLE := win_axGetControl( ::hWnd, {| event, ... | ::Event( event, ... ) }, cID ) - RETURN self + RETURN Self PROCEDURE Event( ... ) CLASS HActiveX diff --git a/contrib/hbwin/win_tcom.prg b/contrib/hbwin/win_tcom.prg index 6d9776a43c..f9306f9f15 100644 --- a/contrib/hbwin/win_tcom.prg +++ b/contrib/hbwin/win_tcom.prg @@ -107,7 +107,7 @@ METHOD Init( cPortName, nBaudRate, nParity, nByteSize, nStopBits ) CLASS win_Com ENDIF ENDIF - RETURN self + RETURN Self METHOD QueueSize( nInQueue, nOutQueue ) CLASS win_Com RETURN win_comSetQueueSize( ::nPort, nInQueue, nOutQueue ) diff --git a/contrib/xhb/hblognet.prg b/contrib/xhb/hblognet.prg index 95336591fb..b4315a9adf 100644 --- a/contrib/xhb/hblognet.prg +++ b/contrib/xhb/hblognet.prg @@ -100,7 +100,7 @@ METHOD New( nLevel, cHelo, cServer, cSendTo, cSubject, cFrom ) CLASS HB_LogEmail ::cAddress := cFrom ENDIF - RETURN SELF + RETURN Self /* hb_inetInit() must be called here */ METHOD Open( cName ) CLASS HB_LogEmail diff --git a/contrib/xhb/htjlist.prg b/contrib/xhb/htjlist.prg index e8ed313289..63971c65a7 100644 --- a/contrib/xhb/htjlist.prg +++ b/contrib/xhb/htjlist.prg @@ -187,7 +187,7 @@ METHOD SetFont( name, font, fntColor, fntSize ) CLASS TJSList AAdd( ::aScript, cStr ) - RETURN self + RETURN Self /**** * @@ -207,7 +207,7 @@ METHOD AddItem( name, url, bgColor ) CLASS TJSList ::nItems++ AAdd( ::aScript, cStr ) - RETURN self + RETURN Self /**** * @@ -228,7 +228,7 @@ METHOD AddLink( name, url, img, bgColor ) CLASS TJSList ::nItems++ AAdd( ::aScript, cStr ) - RETURN self + RETURN Self METHOD EndNode( name, caption ) CLASS TJSList @@ -240,7 +240,7 @@ METHOD EndNode( name, caption ) CLASS TJSList ::nItems++ AAdd( ::aScript, cStr ) - RETURN self + RETURN Self METHOD Build( xPos, yPos ) CLASS TJSList diff --git a/contrib/xhb/htmutil.prg b/contrib/xhb/htmutil.prg index 8c10fd53a7..cd0fcdd94a 100644 --- a/contrib/xhb/htmutil.prg +++ b/contrib/xhb/htmutil.prg @@ -389,7 +389,9 @@ METHOD New( cVarName, cUrl, cName, x, y, w, h ) CLASS JWindow ::height := h ::width := w - // objectViewer( self ) + #if 0 + objectViewer( Self ) + #endif RETURN Self diff --git a/contrib/xhb/thtm.prg b/contrib/xhb/thtm.prg index 7a1594f7fe..ed4299a2bb 100644 --- a/contrib/xhb/thtm.prg +++ b/contrib/xhb/thtm.prg @@ -506,7 +506,7 @@ METHOD New( cTitle, cLinkTitle, cCharSet, aScriptSRC, ; t_oPage := Self - RETURN self + RETURN Self METHOD NewAlt( cType ) CLASS THtml @@ -517,8 +517,7 @@ METHOD NewAlt( cType ) CLASS THtml t_oPage := Self - RETURN self - + RETURN Self /**** * diff --git a/contrib/xhb/ttable.prg b/contrib/xhb/ttable.prg index bd96a2f18f..7e36f660e9 100644 --- a/contrib/xhb/ttable.prg +++ b/contrib/xhb/ttable.prg @@ -785,7 +785,7 @@ METHOD New( cDBF, cALIAS, cOrderBag, cDRIVER, ; ::aOrders := {} ::Area := 0 ::Alias := cALIAS - ::nDataOffset := Len( self ) // 66 + ::nDataOffset := Len( Self ) // 66 RETURN Self @@ -855,7 +855,7 @@ METHOD FldInit() CLASS HBTable LOCAL oNew LOCAL nScope := 1 - ::nDataOffset := Len( self ) - 1 + ::nDataOffset := Len( Self ) - 1 ::Buffer := Array( ( ::Alias )->( FCount() ) ) IF Empty( ::Buffer ) diff --git a/src/debug/dbgbrwsr.prg b/src/debug/dbgbrwsr.prg index 9cd9e08c1f..39a74a0c6c 100644 --- a/src/debug/dbgbrwsr.prg +++ b/src/debug/dbgbrwsr.prg @@ -272,7 +272,7 @@ METHOD Resize( nTop, nLeft, nBottom, nRight ) CLASS HBDbBrowser ::Configure():ForceStable() ENDIF - RETURN self + RETURN Self CREATE CLASS HBDbColumn diff --git a/src/debug/dbgtarr.prg b/src/debug/dbgtarr.prg index 7f71d1f2ec..81072235cf 100644 --- a/src/debug/dbgtarr.prg +++ b/src/debug/dbgtarr.prg @@ -231,7 +231,7 @@ METHOD SetsKeyPressed( nKey, oBrwSets, oWnd, cName, aArray ) CLASS HBDbArray ::aWindows[ ::nCurWindow ]:SetCaption( cName + "[" + hb_ntos( oBrwSets:cargo[ 1 ] ) + ".." + ; hb_ntos( Len( aArray ) ) + "]" ) - RETURN self + RETURN Self FUNCTION __dbgArrays( aArray, cVarName, lEditable ) RETURN HBDbArray():New( aArray, cVarName, lEditable ) diff --git a/src/debug/dbgthsh.prg b/src/debug/dbgthsh.prg index 3b0bfc43f4..2457733bc1 100644 --- a/src/debug/dbgthsh.prg +++ b/src/debug/dbgthsh.prg @@ -240,7 +240,7 @@ METHOD SetsKeyPressed( nKey, oBrwSets, oWnd, cName, hHash ) CLASS HBDbHash ::aWindows[ ::nCurwindow ]:SetCaption( cName + "[" + hb_ntos( oBrwSets:cargo[ 1 ] ) + ".." + ; hb_ntos( Len( hHash ) ) + "]" ) - RETURN self + RETURN Self FUNCTION __dbgHashes( hHash, cVarName, lEditable ) RETURN HBDbHash():New( hHash, cVarName, lEditable ) diff --git a/src/debug/dbgtwin.prg b/src/debug/dbgtwin.prg index 3c04136edc..385c107e08 100644 --- a/src/debug/dbgtwin.prg +++ b/src/debug/dbgtwin.prg @@ -378,4 +378,4 @@ METHOD Resize( nTop, nLeft, nBottom, nRight ) CLASS HBDbWindow ::Show( ::lFocused ) ENDIF - RETURN self + RETURN Self diff --git a/src/rtl/tbrowse.prg b/src/rtl/tbrowse.prg index ff84889c0d..2976eeaca6 100644 --- a/src/rtl/tbrowse.prg +++ b/src/rtl/tbrowse.prg @@ -2537,7 +2537,7 @@ METHOD mRowPos() CLASS TBrowse ::doConfigure() ENDIF - _mBrwPos( self, @mRow, @mCol ) + _mBrwPos( Self, @mRow, @mCol ) RETURN mRow @@ -2550,7 +2550,7 @@ METHOD mColPos() CLASS TBrowse ::doConfigure() ENDIF - _mBrwPos( self, @mRow, @mCol ) + _mBrwPos( Self, @mRow, @mCol ) RETURN mCol #endif diff --git a/tests/clsdata.prg b/tests/clsdata.prg index 30d0c33d37..175cce17a5 100644 --- a/tests/clsdata.prg +++ b/tests/clsdata.prg @@ -29,39 +29,39 @@ FUNCTION TBaseObject() STATIC FUNCTION NewBase() - LOCAL self := QSelf() + LOCAL Self := QSelf() ::Data1 := 1 ::ClassData1 := "A" - RETURN self + RETURN Self STATIC FUNCTION Test() - LOCAL self := QSelf() + LOCAL Self := QSelf() ? "Inside ::Test()" ? "calling ::Method1()" ::Method1() - RETURN self + RETURN Self STATIC FUNCTION Method1Base() - LOCAL self := QSelf() + LOCAL Self := QSelf() ? "I am Method1 from TBaseObject" ::Method2() - RETURN self + RETURN Self STATIC FUNCTION Method2Base() - LOCAL self := QSelf() + LOCAL Self := QSelf() ? "I am Method2 from TBaseObject" - RETURN self + RETURN Self FUNCTION HBObject() @@ -81,7 +81,7 @@ FUNCTION HBObject() STATIC FUNCTION New() - LOCAL self := QSelf() + LOCAL Self := QSelf() ::TBaseObject:NewBase() ::Data1 := 1 @@ -90,21 +90,21 @@ STATIC FUNCTION New() // ClassData2 override ClassData1 ::ClassData2 := "B" - RETURN self + RETURN Self STATIC FUNCTION Method1() - LOCAL self := QSelf() + LOCAL Self := QSelf() ? "I am Method1 from HBObject" ::TBaseObject:Method1() - RETURN self + RETURN Self STATIC FUNCTION Method2() - LOCAL self := QSelf() + LOCAL Self := QSelf() ? "I am Method2 from HBObject" - RETURN self + RETURN Self diff --git a/tests/clsnv.prg b/tests/clsnv.prg index 459aaa85bd..0dbfa015f6 100644 --- a/tests/clsnv.prg +++ b/tests/clsnv.prg @@ -58,7 +58,7 @@ METHOD m1 ? " execute ::z(), should be: MYCLASS3:Z()" ::z() - RETURN self + RETURN Self METHOD x @@ -70,7 +70,7 @@ METHOD x ? " e =>", ::e, ", should be: (e3)" ? " f =>", ::f, ", should be: (f3)" - RETURN self + RETURN Self METHOD y @@ -82,7 +82,7 @@ METHOD y ? " e =>", ::e, ", should be: (e3)" ? " f =>", ::f, ", should be: (f3)" - RETURN self + RETURN Self METHOD z @@ -94,7 +94,7 @@ METHOD z ? " e =>", ::e, ", should be: (e3)" ? " f =>", ::f, ", should be: (f3)" - RETURN self + RETURN Self CREATE CLASS myclass2 hidden: @@ -131,7 +131,7 @@ METHOD m2 ? " execute ::z(), should be: MYCLASS3:Z()" ::z() - RETURN self + RETURN Self METHOD x @@ -143,7 +143,7 @@ METHOD x ? " e =>", ::e, ", should be: (e3)" ? " f =>", ::f, ", should be: (f3)" - RETURN self + RETURN Self METHOD y @@ -155,7 +155,7 @@ METHOD y ? " e =>", ::e, ", should be: (e3)" ? " f =>", ::f, ", should be: (f3)" - RETURN self + RETURN Self METHOD z @@ -167,7 +167,7 @@ METHOD z ? " e =>", ::e, ", should be: (e3)" ? " f =>", ::f, ", should be: (f3)" - RETURN self + RETURN Self CREATE CLASS myclass3 FROM myclass1, myclass2 hidden: @@ -204,7 +204,7 @@ METHOD m3 ? " execute ::z(), should be: MYCLASS3:Z()" ::z() - RETURN self + RETURN Self METHOD x @@ -216,7 +216,7 @@ METHOD x ? " e =>", ::e, ", should be: (e3)" ? " f =>", ::f, ", should be: (f3)" - RETURN self + RETURN Self METHOD y @@ -228,7 +228,7 @@ METHOD y ? " e =>", ::e, ", should be: (e3)" ? " f =>", ::f, ", should be: (f3)" - RETURN self + RETURN Self METHOD z @@ -240,4 +240,4 @@ METHOD z ? " e =>", ::e, ", should be: (e3)" ? " f =>", ::f, ", should be: (f3)" - RETURN self + RETURN Self diff --git a/tests/debug.prg b/tests/debug.prg index 2eacd87a67..e1c57b2ee2 100644 --- a/tests/debug.prg +++ b/tests/debug.prg @@ -158,7 +158,7 @@ STATIC FUNCTION Show() // Set a whole list symbols to value // Normal way of set objects from external // sources, like memo files. -// Set self according to the DATA +// Set Self according to the DATA // contained in // Can be used to transfer info from // one class to another @@ -204,23 +204,23 @@ STATIC FUNCTION Show() STATIC FUNCTION Transfer( ... ) - LOCAL self := QSelf() + LOCAL Self := QSelf() LOCAL aParam := __dbgVMParLList() LOCAL nLen := PCount() LOCAL xRet LOCAL xData IF nLen == 0 - xRet := __objGetValueList( self, ::aExcept() ) + xRet := __objGetValueList( Self, ::aExcept() ) ELSE FOR EACH xData IN aParam IF HB_ISARRAY( xData ) IF HB_ISARRAY( xData[ 1 ] ) // 2D array passed - xRet := __objSetValueList( self, xData ) + xRet := __objSetValueList( Self, xData ) ELSE // 1D array passed - xRet := __objSetValueList( self, { xData } ) + xRet := __objSetValueList( Self, { xData } ) ENDIF ELSEIF HB_ISOBJECT( xData ) // Object passed diff --git a/tests/destruct.prg b/tests/destruct.prg index 7d4836aedf..2e3ccd87f8 100644 --- a/tests/destruct.prg +++ b/tests/destruct.prg @@ -97,29 +97,29 @@ END CLASS METHOD INIT( type ) CLASS myClass - ? "Hi, I'm INIT method of class:", self:classname() + ? "Hi, I'm INIT method of class:", Self:classname() ::type := type - RETURN self + RETURN Self PROCEDURE DTOR CLASS myClass - ? " Hi, I'm desturctor of class: ", self:classname() + ? " Hi, I'm desturctor of class: ", Self:classname() IF ::type == 1 - ? " I'm storing reference to self in instance variable." + ? " I'm storing reference to Self in instance variable." ? " Bad practice but safe in Harbour because it will be destroyed." - ::var1 := self + ::var1 := Self ELSEIF ::Type == 2 - ? " I'm storing reference to self in class variable." + ? " I'm storing reference to Self in class variable." ? " It's programmer bug which should cause RT error." - ::var2 := self + ::var2 := Self ELSEIF ::Type == 3 - ? " I'm storing reference to self in public variable." + ? " I'm storing reference to Self in public variable." ? " It's programmer bug which should cause RT error." - P := self + P := Self ELSE - ? " I do not store any references to self." + ? " I do not store any references to Self." ? " It's a safe destructor." ENDIF diff --git a/tests/dynobj.prg b/tests/dynobj.prg index d1b64c14d4..842e30fa0b 100644 --- a/tests/dynobj.prg +++ b/tests/dynobj.prg @@ -20,7 +20,7 @@ PROCEDURE Main() ? "Let's add inline 'CalcArea' at run-time to an already instanced class" __objAddInline( oForm, "CalcArea", ; - {| self | ( ::nRight - ::nLeft ) * ( ::nBottom - ::nTop ) } ) + {| Self | ( ::nRight - ::nLeft ) * ( ::nBottom - ::nTop ) } ) ? "What methods are in the class :" ? hb_ValToExp( __objGetMethodList( oForm ) ) @@ -64,7 +64,7 @@ PROCEDURE Main() ? "And CalcArea() will now give a result in square inches" __objModInline( oForm, "CalcArea", ; - {| self | ( ::nRight - ::nLeft ) * ( ::nBottom - ::nTop ) / ( 2.54 * 2.54 ) } ) + {| Self | ( ::nRight - ::nLeft ) * ( ::nBottom - ::nTop ) / ( 2.54 * 2.54 ) } ) ? "What is the Form area ?" ? oForm:CalcArea() diff --git a/tests/inherit.prg b/tests/inherit.prg index 39c76e5db0..fff991272e 100644 --- a/tests/inherit.prg +++ b/tests/inherit.prg @@ -60,10 +60,10 @@ FUNCTION TEmpty() IF oEmpty == NIL oEmpty := HBClass():New( "TEmpty" ) // Create a new class def - oEmpty:AddInline( "New", {| self | self } ) + oEmpty:AddInline( "New", {| Self | Self } ) oEmpty:AddInline( "Run", {|| QOut( "Run !" ) } ) // Test command - oEmpty:AddInline( "Set", {| self, xParam | ::Out := xParam } ) + oEmpty:AddInline( "Set", {| Self, xParam | ::Out := xParam } ) oEmpty:AddData( "Out", "Hi there" ) // Test command oEmpty:AddVirtual( "Dispose" ) // Clean up code @@ -82,7 +82,7 @@ FUNCTION TOnTop() IF oOnTop == NIL oOnTop := HBClass():New( "TOnTop", "TTextFile" ) - oOnTop:AddInline( "Say", {| self, cArg | QOut( __objSendMsg( self, cArg ) ) } ) + oOnTop:AddInline( "Say", {| Self, cArg | QOut( __objSendMsg( Self, cArg ) ) } ) oOnTop:Create() ENDIF @@ -134,7 +134,7 @@ FUNCTION TTextFile() FUNCTION New( cFileName, cMode, nBlock ) - LOCAL self := QSelf() // Get self + LOCAL Self := QSelf() // Get Self hb_default( @cMode, "R" ) hb_default( @nBlock, 4096 ) @@ -160,11 +160,11 @@ FUNCTION New( cFileName, cMode, nBlock ) ENDIF ::nBlockSize := nBlock - RETURN self + RETURN Self FUNCTION RUN( xTxt, lCRLF ) - LOCAL self := QSelf() + LOCAL Self := QSelf() LOCAL xRet IF ::cMode == "R" @@ -181,7 +181,7 @@ FUNCTION RUN( xTxt, lCRLF ) FUNCTION Dispose() - LOCAL self := QSelf() + LOCAL Self := QSelf() ::cBlock := NIL IF ::hFile != F_ERROR @@ -191,7 +191,7 @@ FUNCTION Dispose() ENDIF ENDIF - RETURN self + RETURN Self // // Read a single line @@ -199,7 +199,7 @@ FUNCTION Dispose() FUNCTION READ() - LOCAL self := QSelf() + LOCAL Self := QSelf() LOCAL cRet := "" LOCAL cBlock LOCAL nCrPos @@ -256,7 +256,7 @@ FUNCTION READ() FUNCTION WriteLn( xTxt, lCRLF ) - LOCAL self := QSelf() + LOCAL Self := QSelf() LOCAL cBlock IF ::hFile == F_ERROR @@ -276,11 +276,11 @@ FUNCTION WriteLn( xTxt, lCRLF ) ::nLine := ::nLine + 1 ENDIF - RETURN self + RETURN Self FUNCTION Write( xTxt ) - LOCAL self := QSelf() + LOCAL Self := QSelf() RETURN ::WriteLn( xTxt, .F. ) @@ -290,7 +290,7 @@ FUNCTION Write( xTxt ) STATIC FUNCTION GOTO( nLine ) - LOCAL self := QSelf() + LOCAL Self := QSelf() LOCAL nWhere := 1 IF Empty( ::hFile ) diff --git a/tests/objarr.prg b/tests/objarr.prg index 9e694e6263..965ad6b53b 100644 --- a/tests/objarr.prg +++ b/tests/objarr.prg @@ -77,7 +77,7 @@ STATIC FUNCTION New() ::x := { 1, 1 } - RETURN self + RETURN Self STATIC FUNCTION Get() diff --git a/tests/objasign.prg b/tests/objasign.prg index 5e074d16a5..092a4c9c7b 100644 --- a/tests/objasign.prg +++ b/tests/objasign.prg @@ -68,4 +68,4 @@ STATIC FUNCTION New() ::x := 1 - RETURN self + RETURN Self diff --git a/tests/overload.prg b/tests/overload.prg index 91ea73e3e7..719191542c 100644 --- a/tests/overload.prg +++ b/tests/overload.prg @@ -40,7 +40,7 @@ CREATE CLASS TString VAR cValue - METHOD New( cText ) INLINE ::cValue := cText, self + METHOD New( cText ) INLINE ::cValue := cText, Self OPERATOR "=" ARG cArg INLINE ::cValue = cArg OPERATOR "==" ARG cArg INLINE ::cValue == cArg diff --git a/tests/speedtst.prg b/tests/speedtst.prg index fe3d891537..56b4325b38 100644 --- a/tests/speedtst.prg +++ b/tests/speedtst.prg @@ -914,12 +914,12 @@ return METHOD Notifier:init ::aQueue := {} ::oSignal := Signal():new() - RETURN self + RETURN Self METHOD Notifier:notify( xValue ) AAdd( ::aQueue, xValue ) ::oSignal:signal() - RETURN self + RETURN Self METHOD Notifier:subscribe() LOCAL xResult diff --git a/tests/stripem.prg b/tests/stripem.prg index 4a32571d99..200bb57476 100644 --- a/tests/stripem.prg +++ b/tests/stripem.prg @@ -102,7 +102,7 @@ METHOD New( cFileName, cMode, nBlock ) CLASS TTextFile ENDIF ::nBlockSize := nBlock - RETURN self + RETURN Self // // Dispose -> Close the file handle @@ -118,7 +118,7 @@ METHOD Dispose() CLASS TTextFile ENDIF ENDIF - RETURN self + RETURN Self // // Read a single line @@ -201,7 +201,7 @@ METHOD WriteLn( xTxt, lCRLF ) CLASS TTextFile ::nLine := ::nLine + 1 ENDIF - RETURN self + RETURN Self // // Go to a specified line number diff --git a/utils/hbtest/rt_class.prg b/utils/hbtest/rt_class.prg index 1b9b8107fe..2529741abf 100644 --- a/utils/hbtest/rt_class.prg +++ b/utils/hbtest/rt_class.prg @@ -1118,7 +1118,7 @@ ENDCLASS METHOD INIT( type ) CLASS DTORCLASS ::type := type -RETURN self + RETURN Self METHOD PROCEDURE DTOR CLASS DTORCLASS