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

2012-06-04 17:21 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* src/debug/dbgbrwsr.prg
  * src/debug/dbgtarr.prg
  * src/debug/dbgthsh.prg
  * src/debug/dbgtinp.prg
  * src/debug/dbgtmenu.prg
  * src/debug/dbgtobj.prg
  * src/debug/dbgwa.prg
  * src/debug/debugger.prg
  * src/rdd/dbstruxu.prg
  * src/rdd/dbtotal.prg
  * src/rdd/hbsix/sxcompat.prg
  * src/rdd/hbsix/sxini.prg
  * src/rdd/hbsix/sxtrig.prg
  * src/rdd/rddord.prg
  * src/rdd/rddordu.prg
  * src/rdd/usrrdd/rdds/arrayrdd.prg
  * src/rdd/usrrdd/rdds/hscdx.prg
  * src/rdd/usrrdd/rdds/logrdd.prg
  * src/rdd/usrrdd/rdds/rlcdx.prg
  * src/rtl/achoice.prg
  * src/rtl/adir.prg
  * src/rtl/alert.prg
  * src/rtl/checkbox.prg
  * src/rtl/color53.prg
  * src/rtl/dbedit.prg
  * src/rtl/einstv52.prg
  * src/rtl/einstvar.prg
  * src/rtl/errsys.prg
  * src/rtl/fieldbl.prg
  * src/rtl/getsys.prg
  * src/rtl/getsys53.prg
  * src/rtl/gui.prg
  * src/rtl/hbdoc.prg
  * src/rtl/hbfilehi.prg
  * src/rtl/hbi18n2.prg
  * src/rtl/hbini.prg
  * src/rtl/libname.prg
  * src/rtl/listbox.prg
  * src/rtl/memoedit.prg
  * src/rtl/memvarbl.prg
  * src/rtl/memvarhb.prg
  * src/rtl/menusys.prg
  * src/rtl/menuto.prg
  * src/rtl/objfunc.prg
  * src/rtl/profiler.prg
  * src/rtl/pushbtn.prg
  * src/rtl/radiobtn.prg
  * src/rtl/radiogrp.prg
  * src/rtl/readvar.prg
  * src/rtl/scrollbr.prg
  * src/rtl/setfunc.prg
  * src/rtl/tbcolumn.prg
  * src/rtl/tbrowse.prg
  * src/rtl/tbrowsys.prg
  * src/rtl/tclass.prg
  * src/rtl/teditor.prg
  * src/rtl/tget.prg
  * src/rtl/tgetlist.prg
  * src/rtl/tmenuitm.prg
  * src/rtl/tmenusys.prg
  * src/rtl/tobject.prg
  * src/rtl/tpersist.prg
  * src/rtl/tpopup.prg
  * src/rtl/ttopbar.prg
  * src/rtl/typefile.prg
  * tests/hbdoctst.prg
  * utils/hbmk2/hbmk2.prg
    * IS*() macros converted to HB_IS*() function calls.
      (using full uppercase to make them stand out)
    % deleted '#include "common.ch"' where possible
This commit is contained in:
Viktor Szakats
2012-06-04 15:25:14 +00:00
parent 0cd6638432
commit 608da306e9
68 changed files with 583 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/src/debug/dbgbrwsr.prg
View File

@@ -7,9 +7,8 @@
* The Debugger Browser
*
* Copyright 2004 Ryszard Glab <rglab@imid.med.pl>
* www - http://harbour-project.org
* Copyright 2007 Phil Krylov <phil a t newstar.rinet.ru>
* www - http://xharbour.org
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -57,8 +56,6 @@
#define HB_CLS_NOTOBJECT /* do not inherit from HBObject calss */
#include "hbclass.ch"
#include "common.ch"
/* HBDbBrowser
*
* A minimalistic TBrowse implementation just enough for use in
@@ -136,7 +133,7 @@ METHOD Configure()
RETURN Self
METHOD SetColorSpec( cColors )
IF ISCHARACTER( cColors )
IF HB_ISSTRING( cColors )
::cColorSpec := cColors
::aColorSpec := hb_aTokens( ::cColorSpec, "," )
ENDIF
@@ -178,7 +175,7 @@ METHOD ForceStable()
xData := Eval( oCol:block )
nClr := iif( nRow == ::rowPos, 2, 1 )
aClr := Eval( oCol:colorBlock, xData )
IF ISARRAY( aClr )
IF HB_ISARRAY( aClr )
nClr := aClr[ nClr ]
ELSE
nClr := oCol:defColor[ nClr ]

8
harbour/src/debug/dbgtarr.prg
View File

@@ -201,7 +201,7 @@ METHOD SetsKeyPressed( nKey, oBrwSets, oWnd, cName, aArray ) CLASS HBDbArray
oBrwSets:PageUp()
CASE nKey == K_ENTER
IF ISARRAY( aArray[ nSet ] )
IF HB_ISARRAY( aArray[ nSet ] )
IF Len( aArray[ nSet ] ) == 0
__dbgAlert( "Array is empty" )
ELSE
@@ -219,14 +219,14 @@ METHOD SetsKeyPressed( nKey, oBrwSets, oWnd, cName, aArray ) CLASS HBDbArray
::nCurWindow--
ENDIF
ENDIF
ELSEIF ISBLOCK( aArray[ nSet ] ) .OR. hb_isPointer( aArray[ nSet ] )
ELSEIF HB_ISBLOCK( aArray[ nSet ] ) .OR. HB_ISPOINTER( aArray[ nSet ] )
__dbgAlert( "Value cannot be edited" )
ELSE
IF ::lEditable
oBrwSets:RefreshCurrent()
IF ISOBJECT( aArray[ nSet ] )
IF HB_ISOBJECT( aArray[ nSet ] )
__DbgObject( aArray[ nSet ], cName + "[" + hb_NToS( nSet ) + "]" )
ELSEIF hb_isHash( aArray[ nSet ] )
ELSEIF HB_ISHASH( aArray[ nSet ] )
__DbgHashes( aArray[ nSet ], cName + "[" + hb_NToS( nSet ) + "]" )
ELSE
::doGet( oBrwsets, aArray, nSet )

9
harbour/src/debug/dbgthsh.prg
View File

@@ -7,7 +7,6 @@
* The Debugger Hash Inspector
*
* Copyright 2006 Francesco Saverio Giudice <info / at / fsgiudice / dot / com>
* www - http://www.xharbour.org
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
@@ -210,7 +209,7 @@ METHOD SetsKeyPressed( nKey, oBrwSets, oWnd, cName, hHash ) CLASS HBDbHash
uValue := HB_HValueAt( hHash, nSet )
IF hb_isHash( uValue )
IF HB_ISHASH( uValue )
IF Len( uValue ) == 0
__dbgAlert( "Hash is empty" )
@@ -230,14 +229,14 @@ METHOD SetsKeyPressed( nKey, oBrwSets, oWnd, cName, hHash ) CLASS HBDbHash
::nCurwindow--
ENDIF
ENDIF
ELSEIF ISBLOCK( uValue ) .OR. hb_isPointer( uValue )
ELSEIF HB_ISBLOCK( uValue ) .OR. HB_ISPOINTER( uValue )
__dbgAlert( "Value cannot be edited" )
ELSE
IF ::lEditable
oBrwSets:RefreshCurrent()
IF ISOBJECT( uValue )
IF HB_ISOBJECT( uValue )
__DbgObject( uValue, cName + "[" + HashKeyString( hHash, nSet ) + "]" )
ELSEIF ISARRAY( uValue )
ELSEIF HB_ISARRAY( uValue )
__DbgArrays( uValue, cName + "[" + HashKeyString( hHash, nSet ) + "]" )
ELSE
::doGet( oBrwSets, hHash, nSet )

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

@@ -58,7 +58,6 @@
#include "inkey.ch"
#include "color.ch"
#include "setcurs.ch"
#include "common.ch"
CREATE CLASS HbDbInput
@@ -92,7 +91,7 @@ METHOD new( nRow, nCol, nWidth, cValue, cColor, nSize ) CLASS HbDbInput
::nRow := nRow
::nCol := nCol
::nWidth := nWidth
::nSize := IIF( ISNUMBER( nSize ), nSize, nWidth )
::nSize := IIF( HB_ISNUMERIC( nSize ), nSize, nWidth )
::cValue := PadR( cValue, ::nSize )
::nRow := nRow

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

@@ -62,7 +62,6 @@
#include "hbmemvar.ch"
#include "box.ch"
#include "common.ch"
#include "inkey.ch"
#include "setcurs.ch"
@@ -203,7 +202,7 @@ METHOD ClosePopup( nPopup ) CLASS HBDbMenu
IF nPopup != 0
oPopup := ::aItems[ nPopup ]:bAction
IF ISOBJECT( oPopup )
IF HB_ISOBJECT( oPopup )
RestScreen( oPopup:nTop, oPopup:nLeft, oPopup:nBottom + 1, oPopup:nRight + 2,;
oPopup:cBackImage )
oPopup:cBackImage := NIL
@@ -293,7 +292,7 @@ METHOD GetItemByIdent( uIdent ) CLASS HBDbMenu
LOCAL oItem
FOR n := 1 TO Len( ::aItems )
IF ISOBJECT( ::aItems[ n ]:bAction )
IF HB_ISOBJECT( ::aItems[ n ]:bAction )
oItem := ::aItems[ n ]:bAction:GetItemByIdent( uIdent )
IF oItem != NIL
RETURN oItem
@@ -391,7 +390,7 @@ METHOD LoadColors() CLASS HBDbMenu
::cClrHotFocus := aColors[ 11 ]
FOR n := 1 TO Len( ::aItems )
IF ISOBJECT( ::aItems[ n ]:bAction )
IF HB_ISOBJECT( ::aItems[ n ]:bAction )
::aItems[ n ]:bAction:LoadColors()
ENDIF
NEXT
@@ -422,7 +421,7 @@ METHOD ShowPopup( nPopup ) CLASS HBDbMenu
::aItems[ nPopup ]:Display( ::cClrHilite, ::cClrHotFocus )
::nOpenPopup := nPopup
IF ISOBJECT( ::aItems[ nPopup ]:bAction )
IF HB_ISOBJECT( ::aItems[ nPopup ]:bAction )
::aItems[ nPopup ]:bAction:Display()
::aItems[ nPopup ]:bAction:ShowPopup( 1 )
ENDIF

14
harbour/src/debug/dbgtobj.prg
View File

@@ -156,7 +156,7 @@ METHOD addWindows( aArray, nRow ) CLASS HBDbObject
oCol:ColorBlock := { || { iif( ::Arrayindex == oBrwSets:Cargo, 2, 1 ), 2 } }
oBrwSets:Freeze := 1
oBrwSets:AddColumn( oCol := HBDbColumnNew( "", { || iif( ISCHARACTER( ::ArrayReference[ ::ArrayIndex, 2 ] ) .AND. !::ArrayReference[ ::ArrayIndex, 3 ],;
oBrwSets:AddColumn( oCol := HBDbColumnNew( "", { || iif( HB_ISSTRING( ::ArrayReference[ ::ArrayIndex, 2 ] ) .AND. !::ArrayReference[ ::ArrayIndex, 3 ],;
::ArrayReference[ ::ArrayIndex, 2 ],;
PadR( __dbgValToStr( __dbgObjGetValue( ::TheObj, ::ArrayReference[ ::arrayindex, 1 ] ) ), nWidth - 12 ) ) } ) )
@@ -263,20 +263,20 @@ METHOD SetsKeyPressed( nKey, oBrwSets, nSets, aArray ) CLASS HBDbObject
CASE nKey == K_ENTER
IF nSet == oBrwSets:Cargo
IF ISARRAY( aArray[ nSet, 2 ] )
IF HB_ISARRAY( aArray[ nSet, 2 ] )
IF Len( aArray[ nSet, 2 ] ) > 0
HBDbArray():New( aArray[ nSet, 2 ], ::pitems[ nSet, 1 ] )
ENDIF
ELSEIF hb_isHash( aArray[ nSet, 2 ] )
ELSEIF HB_ISHASH( aArray[ nSet, 2 ] )
IF Len( aArray[ nSet, 2 ] ) > 0
HBDbHash():New( aArray[ nSet, 2 ], ::pitems[ nSet, 1 ] )
ENDIF
ELSEIF ISOBJECT( aArray[ nSet, 2 ] )
ELSEIF HB_ISOBJECT( aArray[ nSet, 2 ] )
HBDbObject():New( aArray[ nSet, 2 ], ::pitems[ nSet, 1 ] )
ELSEIF ( ISCHARACTER( aArray[ nSet, 2 ] ) .AND. ;
ELSEIF ( HB_ISSTRING( aArray[ nSet, 2 ] ) .AND. ;
!aArray[ nSet, 3 ] ) .OR. ;
ISBLOCK( aArray[ nSet, 2 ] ) .OR. ;
hb_isPointer( aArray[ nSet, 2 ] )
HB_ISBLOCK( aArray[ nSet, 2 ] ) .OR. ;
HB_ISPOINTER( aArray[ nSet, 2 ] )
__dbgAlert( "Value cannot be edited" )
ELSE
IF ::lEditable

1
harbour/src/debug/dbgwa.prg
View File

@@ -53,7 +53,6 @@
#pragma DEBUGINFO=OFF
#include "box.ch"
#include "common.ch"
#include "setcurs.ch"
#include "inkey.ch"

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

@@ -7,10 +7,8 @@
* The Debugger
*
* Copyright 1999 Antonio Linares <alinares@fivetechsoft.com>
* www - http://harbour-project.org
*
* Copyright 2003-2006 Phil Krylov <phil@newstar.rinet.ru>
* www - http://www.xharbour.org
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1194,7 +1192,7 @@ METHOD GetExprValue( xExpr, lValid ) CLASS HBDebugger
ENDIF
RECOVER USING oErr
xResult := oErr:operation + ": " + oErr:description
IF ISARRAY( oErr:args )
IF HB_ISARRAY( oErr:args )
xResult += "; arguments:"
AEval( oErr:args, { | x | xResult += " " + AllTrim( __dbgCStr( x ) ) } )
ENDIF
@@ -3306,7 +3304,7 @@ FUNCTION __dbgInput( nRow, nCol, nWidth, cValue, bValid, cColor, nSize )
LOCAL nKey
LOCAL oGet
IF !ISNUMBER( nWidth )
IF !HB_ISNUMERIC( nWidth )
nWidth := Len( cValue )
ENDIF
oGet := HbDbInput():new( nRow, nCol, nWidth, cValue, cColor, nSize )
@@ -3340,7 +3338,7 @@ FUNCTION __dbgAchoice( nTop, nLeft, nBottom, nRight, aItems, cColors )
LOCAL nLen
oBrw := HBDbBrowser():New( nTop, nLeft, nBottom, nRight )
oBrw:colorSpec := IIF( ISCHARACTER( cColors ), cColors, SetColor() )
oBrw:colorSpec := IIF( HB_ISSTRING( cColors ), cColors, SetColor() )
nLen := nRight - nLeft + 1
nRow := 1
oCol := HBDbColumnNew( "", {|| PadR( aItems[ nRow ], nLen ) } )