From 608da306e9eda42c78caed4f6f30e8a56dfd1a8b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 4 Jun 2012 15:25:14 +0000 Subject: [PATCH] 2012-06-04 17:21 UTC+0200 Viktor Szakats (harbour syenar.net) * 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 --- harbour/ChangeLog | 72 ++++++++++++++++++++++++ harbour/src/debug/dbgbrwsr.prg | 9 +-- harbour/src/debug/dbgtarr.prg | 8 +-- harbour/src/debug/dbgthsh.prg | 9 ++- harbour/src/debug/dbgtinp.prg | 3 +- harbour/src/debug/dbgtmenu.prg | 9 ++- harbour/src/debug/dbgtobj.prg | 14 ++--- harbour/src/debug/dbgwa.prg | 1 - harbour/src/debug/debugger.prg | 10 ++-- harbour/src/rdd/dbstruxu.prg | 2 - harbour/src/rdd/dbtotal.prg | 14 ++--- harbour/src/rdd/hbsix/sxcompat.prg | 51 ++++++++--------- harbour/src/rdd/hbsix/sxini.prg | 2 +- harbour/src/rdd/hbsix/sxtrig.prg | 1 - harbour/src/rdd/rddord.prg | 5 +- harbour/src/rdd/rddordu.prg | 2 - harbour/src/rdd/usrrdd/rdds/arrayrdd.prg | 20 +++---- harbour/src/rdd/usrrdd/rdds/hscdx.prg | 5 +- harbour/src/rdd/usrrdd/rdds/logrdd.prg | 11 ++-- harbour/src/rdd/usrrdd/rdds/rlcdx.prg | 3 +- harbour/src/rtl/achoice.prg | 30 +++++----- harbour/src/rtl/adir.prg | 15 +++-- harbour/src/rtl/alert.prg | 19 +++---- harbour/src/rtl/checkbox.prg | 8 +-- harbour/src/rtl/color53.prg | 8 +-- harbour/src/rtl/dbedit.prg | 43 +++++++------- harbour/src/rtl/einstv52.prg | 1 - harbour/src/rtl/einstvar.prg | 1 - harbour/src/rtl/errsys.prg | 7 +-- harbour/src/rtl/fieldbl.prg | 2 - harbour/src/rtl/getsys.prg | 6 +- harbour/src/rtl/getsys53.prg | 14 ++--- harbour/src/rtl/gui.prg | 2 - harbour/src/rtl/hbdoc.prg | 23 ++++---- harbour/src/rtl/hbfilehi.prg | 20 +++---- harbour/src/rtl/hbi18n2.prg | 11 ++-- harbour/src/rtl/hbini.prg | 33 ++++++----- harbour/src/rtl/libname.prg | 4 +- harbour/src/rtl/listbox.prg | 57 +++++++++---------- harbour/src/rtl/memoedit.prg | 37 ++++++------ harbour/src/rtl/memvarbl.prg | 4 +- harbour/src/rtl/memvarhb.prg | 25 ++++---- harbour/src/rtl/menusys.prg | 1 - harbour/src/rtl/menuto.prg | 7 +-- harbour/src/rtl/objfunc.prg | 39 +++++++------ harbour/src/rtl/profiler.prg | 5 +- harbour/src/rtl/pushbtn.prg | 12 ++-- harbour/src/rtl/radiobtn.prg | 19 +++---- harbour/src/rtl/radiogrp.prg | 24 ++++---- harbour/src/rtl/readvar.prg | 4 +- harbour/src/rtl/scrollbr.prg | 32 +++++------ harbour/src/rtl/setfunc.prg | 3 +- harbour/src/rtl/tbcolumn.prg | 3 +- harbour/src/rtl/tbrowse.prg | 62 ++++++++++---------- harbour/src/rtl/tbrowsys.prg | 1 - harbour/src/rtl/tclass.prg | 18 +++--- harbour/src/rtl/teditor.prg | 47 ++++++++-------- harbour/src/rtl/tget.prg | 40 ++++++------- harbour/src/rtl/tgetlist.prg | 62 ++++++++++---------- harbour/src/rtl/tmenuitm.prg | 19 +++---- harbour/src/rtl/tmenusys.prg | 17 +++--- harbour/src/rtl/tobject.prg | 3 +- harbour/src/rtl/tpersist.prg | 5 +- harbour/src/rtl/tpopup.prg | 19 +++---- harbour/src/rtl/ttopbar.prg | 13 ++--- harbour/src/rtl/typefile.prg | 7 +-- harbour/tests/hbdoctst.prg | 3 +- harbour/utils/hbmk2/hbmk2.prg | 70 +++++++++++------------ 68 files changed, 583 insertions(+), 573 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8e29f423ed..239cb54e03 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,78 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-04 17:21 UTC+0200 Viktor Szakats (harbour syenar.net) + * 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 + 2012-06-04 15:26 UTC+0200 Viktor Szakats (harbour syenar.net) * src/3rd/zlib/Makefile * src/3rd/zlib/* diff --git a/harbour/src/debug/dbgbrwsr.prg b/harbour/src/debug/dbgbrwsr.prg index 0b3a970f15..221ce328a9 100644 --- a/harbour/src/debug/dbgbrwsr.prg +++ b/harbour/src/debug/dbgbrwsr.prg @@ -7,9 +7,8 @@ * The Debugger Browser * * Copyright 2004 Ryszard Glab - * www - http://harbour-project.org * Copyright 2007 Phil Krylov - * 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 ] diff --git a/harbour/src/debug/dbgtarr.prg b/harbour/src/debug/dbgtarr.prg index cc3998622e..2baf3014d0 100644 --- a/harbour/src/debug/dbgtarr.prg +++ b/harbour/src/debug/dbgtarr.prg @@ -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 ) diff --git a/harbour/src/debug/dbgthsh.prg b/harbour/src/debug/dbgthsh.prg index 6024556909..9275f11c4a 100644 --- a/harbour/src/debug/dbgthsh.prg +++ b/harbour/src/debug/dbgthsh.prg @@ -7,7 +7,6 @@ * The Debugger Hash Inspector * * Copyright 2006 Francesco Saverio Giudice - * 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 ) diff --git a/harbour/src/debug/dbgtinp.prg b/harbour/src/debug/dbgtinp.prg index 622ca1309f..14fdc56e9b 100644 --- a/harbour/src/debug/dbgtinp.prg +++ b/harbour/src/debug/dbgtinp.prg @@ -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 diff --git a/harbour/src/debug/dbgtmenu.prg b/harbour/src/debug/dbgtmenu.prg index 86a86977ba..32a292f21f 100644 --- a/harbour/src/debug/dbgtmenu.prg +++ b/harbour/src/debug/dbgtmenu.prg @@ -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 diff --git a/harbour/src/debug/dbgtobj.prg b/harbour/src/debug/dbgtobj.prg index 6514f6f291..cb71c7ee5e 100644 --- a/harbour/src/debug/dbgtobj.prg +++ b/harbour/src/debug/dbgtobj.prg @@ -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 diff --git a/harbour/src/debug/dbgwa.prg b/harbour/src/debug/dbgwa.prg index 16637e5082..20b3818784 100644 --- a/harbour/src/debug/dbgwa.prg +++ b/harbour/src/debug/dbgwa.prg @@ -53,7 +53,6 @@ #pragma DEBUGINFO=OFF #include "box.ch" -#include "common.ch" #include "setcurs.ch" #include "inkey.ch" diff --git a/harbour/src/debug/debugger.prg b/harbour/src/debug/debugger.prg index a343ce464d..36e29dc314 100644 --- a/harbour/src/debug/debugger.prg +++ b/harbour/src/debug/debugger.prg @@ -7,10 +7,8 @@ * The Debugger * * Copyright 1999 Antonio Linares - * www - http://harbour-project.org - * * Copyright 2003-2006 Phil Krylov - * 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 ) } ) diff --git a/harbour/src/rdd/dbstruxu.prg b/harbour/src/rdd/dbstruxu.prg index 7855c84744..ffe0c64582 100644 --- a/harbour/src/rdd/dbstruxu.prg +++ b/harbour/src/rdd/dbstruxu.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - /* NOTE: Undocumented, internal Clipper function */ #ifdef HB_CLP_UNDOC diff --git a/harbour/src/rdd/dbtotal.prg b/harbour/src/rdd/dbtotal.prg index dbbb132e4a..c22cbaca91 100644 --- a/harbour/src/rdd/dbtotal.prg +++ b/harbour/src/rdd/dbtotal.prg @@ -81,19 +81,19 @@ FUNCTION __dbTotal( cFile, xKey, aFields,; LOCAL oError LOCAL lError := .F. - IF ISCHARACTER( xWhile ) + IF HB_ISSTRING( xWhile ) bWhileBlock := hb_macroBlock( xWhile ) lRest := .T. - ELSEIF ISBLOCK( xWhile ) + ELSEIF HB_ISBLOCK( xWhile ) bWhileBlock := xWhile lRest := .T. ELSE bWhileBlock := {|| .T. } ENDIF - IF ISCHARACTER( xFor ) + IF HB_ISSTRING( xFor ) bForBlock := hb_macroBlock( xFor ) - ELSEIF ISBLOCK( xFor ) + ELSEIF HB_ISBLOCK( xFor ) bForBlock := xFor ELSE bForBlock := {|| .T. } @@ -129,9 +129,9 @@ FUNCTION __dbTotal( cFile, xKey, aFields,; xKey := ordKey() ENDIF - IF ISCHARACTER( xKey ) + IF HB_ISSTRING( xKey ) bKeyBlock := hb_macroBlock( xKey ) - ELSEIF ISBLOCK( xKey ) + ELSEIF HB_ISBLOCK( xKey ) bKeyBlock := xKey ELSE bKeyBlock := {|| .T. } @@ -214,7 +214,7 @@ STATIC FUNCTION __GetField( cField ) oError:subCode := 1101 lError := Eval( ErrorBlock(), oError ) - IF !ISLOGICAL( lError ) .OR. lError + IF !HB_ISLOGICAL( lError ) .OR. lError __ErrInHandler() ENDIF diff --git a/harbour/src/rdd/hbsix/sxcompat.prg b/harbour/src/rdd/hbsix/sxcompat.prg index 0c847f150f..70ce2a97ee 100644 --- a/harbour/src/rdd/hbsix/sxcompat.prg +++ b/harbour/src/rdd/hbsix/sxcompat.prg @@ -81,7 +81,6 @@ * */ -#include "common.ch" #include "dbinfo.ch" #include "ord.ch" #include "hbsxdef.ch" @@ -102,11 +101,11 @@ FUNCTION sxChar( nLen, xKeyVal ) xKeyVal := iif( xKeyVal, "T", "F" ) EXIT OTHERWISE - xKeyVal := iif( ISNUMBER( nLen ), "", Space( 10 ) ) + xKeyVal := iif( HB_ISNUMERIC( nLen ), "", Space( 10 ) ) EXIT ENDSWITCH - RETURN iif( ISNUMBER( nLen ), PadR( LTrim( xKeyVal ), nLen ), xKeyVal ) + RETURN iif( HB_ISNUMERIC( nLen ), PadR( LTrim( xKeyVal ), nLen ), xKeyVal ) FUNCTION sxNum( xKeyVal ) @@ -205,7 +204,7 @@ FUNCTION Sx_TagInfo( cIndex ) IF Used() .AND. ( nOrds := OrdCount( cIndex ) ) > 0 aInfo := Array( nOrds, 6 ) - IF ISCHARACTER( cIndex ) + IF HB_ISSTRING( cIndex ) nFirst := dbOrderInfo( DBOI_BAGORDER, cIndex ) nOrds += nFirst - 1 ELSE @@ -227,12 +226,12 @@ FUNCTION Sx_TagInfo( cIndex ) FUNCTION Sx_TagCount( xIndex ) LOCAL nTags := 0, cIndex, nOrder IF Used() - IF ISNUMBER( xIndex ) + IF HB_ISNUMERIC( xIndex ) nOrder := Sx_TagOrder( 1, xIndex ) IF nOrder != 0 cIndex := dbOrderInfo( DBOI_FULLPATH,, nOrder ) ENDIF - ELSEIF ISCHARACTER( xIndex ) .AND. !Empty( xIndex ) + ELSEIF HB_ISSTRING( xIndex ) .AND. !Empty( xIndex ) cIndex := xIndex ELSE cIndex := dbOrderInfo( DBOI_FULLPATH ) @@ -246,9 +245,9 @@ FUNCTION Sx_TagCount( xIndex ) FUNCTION Sx_Tags( xIndex ) LOCAL aTagNames := {}, nOrder, nTags IF Used() - IF ISNUMBER( xIndex ) + IF HB_ISNUMERIC( xIndex ) nOrder := Sx_TagOrder( 1, xIndex ) - ELSEIF ISCHARACTER( xIndex ) .AND. !Empty( xIndex ) + ELSEIF HB_ISSTRING( xIndex ) .AND. !Empty( xIndex ) nOrder := dbOrderInfo( DBOI_BAGORDER, xIndex ) ELSE nOrder := OrdNumber() @@ -265,10 +264,10 @@ FUNCTION Sx_Tags( xIndex ) FUNCTION Sx_SetTag( xTag, xIndex ) LOCAL lRet := .F., nOrder := 0, nOldOrd, cIndex IF Used() .AND. ValType( xTag ) $ "CN" - IF ISNUMBER( xTag ) + IF HB_ISNUMERIC( xTag ) IF Empty( xIndex ) .OR. !ValType( xIndex ) $ "CN" nOrder := xTag - ELSEIF ISCHARACTER( xIndex ) + ELSEIF HB_ISSTRING( xIndex ) IF xTag >= 1 .AND. xTag <= ordCount( xIndex ) nOrder := dbOrderInfo( DBOI_BAGORDER, xIndex ) + xTag - 1 ENDIF @@ -278,7 +277,7 @@ FUNCTION Sx_SetTag( xTag, xIndex ) ELSE IF Empty( xIndex ) .OR. !ValType( xIndex ) $ "CN" nOrder := OrdNumber( xTag ) - ELSEIF ISCHARACTER( xIndex ) + ELSEIF HB_ISSTRING( xIndex ) nOrder := Sx_TagOrder( xTag, xIndex ) ELSE nOrder := Sx_TagOrder( 1, xIndex ) @@ -308,13 +307,13 @@ FUNCTION Sx_SetTag( xTag, xIndex ) FUNCTION Sx_KillTag( xTag, xIndex ) LOCAL lRet := .F., nOrder, cIndex - IF ISLOGICAL( xTag ) + IF HB_ISLOGICAL( xTag ) IF xTag IF Empty( xIndex ) cIndex := Sx_IndexName() - ELSEIF ISNUMBER( xIndex ) + ELSEIF HB_ISNUMERIC( xIndex ) cIndex := Sx_IndexName( 1, xIndex ) - ELSEIF ISCHARACTER( xIndex ) + ELSEIF HB_ISSTRING( xIndex ) nOrder := dbOrderInfo( DBOI_BAGORDER, xIndex ) IF nOrder != 0 cIndex := dbOrderInfo( DBOI_FULLPATH,, nOrder ) @@ -327,10 +326,10 @@ FUNCTION Sx_KillTag( xTag, xIndex ) ENDIF ENDIF ELSE - IF ISNUMBER( xTag ) + IF HB_ISNUMERIC( xTag ) IF Empty( xIndex ) .OR. !ValType( xIndex ) $ "CN" nOrder := xTag - ELSEIF ISCHARACTER( xIndex ) + ELSEIF HB_ISSTRING( xIndex ) IF xTag >= 1 .AND. xTag <= ordCount( xIndex ) nOrder := dbOrderInfo( DBOI_BAGORDER, xIndex ) + xTag - 1 ELSE @@ -342,7 +341,7 @@ FUNCTION Sx_KillTag( xTag, xIndex ) ELSE IF Empty( xIndex ) .OR. !ValType( xIndex ) $ "CN" nOrder := OrdNumber( xTag ) - ELSEIF ISCHARACTER( xIndex ) + ELSEIF HB_ISSTRING( xIndex ) nOrder := Sx_TagOrder( xTag, xIndex ) ELSE nOrder := Sx_TagOrder( 1, xIndex ) @@ -366,7 +365,7 @@ FUNCTION Sx_FileOrder() RETURN dbOrderInfo( DBOI_BAGNUMBER ) FUNCTION Sx_SetFileOrd( nIndex ) - RETURN iif( ISNUMBER( nIndex ), ; + RETURN iif( HB_ISNUMERIC( nIndex ), ; OrdSetFocus( Sx_TagOrder( 1, nIndex ) ), ; OrdSetFocus() ) @@ -376,7 +375,7 @@ FUNCTION RDD_Count() FUNCTION RDD_Name( nRDD ) LOCAL aRDD - IF ISNUMBER( nRDD ) .AND. nRDD >= 1 + IF HB_ISNUMERIC( nRDD ) .AND. nRDD >= 1 aRDD := RDDList() IF nRDD <= Len( aRDD ) RETURN aRDD[ nRDD ] @@ -387,11 +386,11 @@ FUNCTION RDD_Name( nRDD ) FUNCTION RDD_Info( xID ) LOCAL aInfo, cRDD - IF ISNUMBER( xID ) + IF HB_ISNUMERIC( xID ) IF !Empty( Alias( xID ) ) ( xID )->( rddName() ) ENDIF - ELSEIF ISCHARACTER( xID ) + ELSEIF HB_ISSTRING( xID ) cRDD := Upper( AllTrim( xID ) ) IF AScan( rddList(), {|x| Upper( x ) == cRDD } ) == 0 cRDD := NIL @@ -478,9 +477,9 @@ FUNCTION Sx_VSigLen( xField ) LOCAL nResult := 0, nField := 0 IF Used() - IF ISCHARACTER( xField ) + IF HB_ISSTRING( xField ) nField := FieldPos( xField ) - ELSEIF ISNUMBER( xField ) + ELSEIF HB_ISNUMERIC( xField ) nField := xField ENDIF IF nField >= 1 .AND. nField <= FCount() @@ -526,9 +525,9 @@ FUNCTION Sx_IsLocked( xRec ) FUNCTION Sx_SetTrigger( nAction, cTriggerName, cRDD /* Harbour extensions */ ) LOCAL cPrevTrigger := "" - IF ISNUMBER( nAction ) + IF HB_ISNUMERIC( nAction ) IF nAction == TRIGGER_PENDING - IF ISCHARACTER( cTriggerName ) + IF HB_ISSTRING( cTriggerName ) hb_rddInfo( RDDI_PENDINGTRIGGER, cTriggerName, cRDD ) ENDIF ELSEIF Used() @@ -544,7 +543,7 @@ FUNCTION Sx_SetTrigger( nAction, cTriggerName, cRDD /* Harbour extensions */ ) dbInfo( DBI_TRIGGER, "" ) EXIT CASE TRIGGER_INSTALL - IF ISCHARACTER( cTriggerName ) + IF HB_ISSTRING( cTriggerName ) dbInfo( DBI_TRIGGER, cTriggerName ) ENDIF EXIT diff --git a/harbour/src/rdd/hbsix/sxini.prg b/harbour/src/rdd/hbsix/sxini.prg index e73524395c..649ff463df 100644 --- a/harbour/src/rdd/hbsix/sxini.prg +++ b/harbour/src/rdd/hbsix/sxini.prg @@ -126,7 +126,7 @@ FUNCTION _sx_INIinit( nArea ) /* convert hash array into normal array */ FOR EACH item IN hIni - IF hb_isHash( item ) + IF HB_ISHASH( item ) sect := Array( Len( item ) ) FOR EACH h, a IN item, sect a := { h:__enumKey(), h } diff --git a/harbour/src/rdd/hbsix/sxtrig.prg b/harbour/src/rdd/hbsix/sxtrig.prg index cf21ab2010..5c4702b8f6 100644 --- a/harbour/src/rdd/hbsix/sxtrig.prg +++ b/harbour/src/rdd/hbsix/sxtrig.prg @@ -51,7 +51,6 @@ * */ -#include "common.ch" #include "hbsxdef.ch" FUNCTION Sx_DefTrigger( nEvent, nArea, nFieldPos, xTrigVal ) diff --git a/harbour/src/rdd/rddord.prg b/harbour/src/rdd/rddord.prg index c8dc6159cc..04ba5f1352 100644 --- a/harbour/src/rdd/rddord.prg +++ b/harbour/src/rdd/rddord.prg @@ -50,7 +50,6 @@ * */ -#include "common.ch" #include "dbinfo.ch" /* NOTE: The fifth parameters (cOrderName) is undocumented. */ @@ -69,7 +68,7 @@ FUNCTION dbReindex() PROCEDURE dbSetOrder( nOrderNum ) - IF ISCHARACTER( nOrderNum ) .AND. !Empty( Val( nOrderNum ) ) + IF HB_ISSTRING( nOrderNum ) .AND. !Empty( Val( nOrderNum ) ) nOrderNum := Val( nOrderNum ) ENDIF @@ -82,7 +81,7 @@ FUNCTION IndexExt() FUNCTION IndexKey( nOrder ) - IF !ISNUMBER( nOrder ) + IF !HB_ISNUMERIC( nOrder ) RETURN ordKey( nOrder ) ENDIF diff --git a/harbour/src/rdd/rddordu.prg b/harbour/src/rdd/rddordu.prg index 4753c6de85..619954bca1 100644 --- a/harbour/src/rdd/rddordu.prg +++ b/harbour/src/rdd/rddordu.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - /* NOTE: Undocumented Clipper function */ #ifdef HB_CLP_UNDOC diff --git a/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg b/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg index 5afda5d91e..6c73d78b65 100644 --- a/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg +++ b/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg @@ -421,7 +421,7 @@ STATIC FUNCTION AR_CLOSE( nWA ) HB_TRACE( HB_TR_DEBUG, hb_StrFormat( "nWA = %1$d", nWA ) ) - IF HB_ISARRAY( aDBFData ) + IF HB_HB_ISARRAY( aDBFData ) /* decrease open number */ aDBFData[ DATABASE_OPENNUMBER ]-- @@ -1171,7 +1171,7 @@ STATIC FUNCTION AR_ORDCREATE( nWA, aOrderCreate ) aWAData := USRRDD_AREADATA( nWA ) aDBFData := aWAData[ WADATA_DATABASE ] - IF HB_ISARRAY( aOrderCreate[ UR_ORCR_CONDINFO ] ) + IF HB_HB_ISARRAY( aOrderCreate[ UR_ORCR_CONDINFO ] ) aOCInfo := aOrderCreate[ UR_ORCR_CONDINFO ] ELSE aOCInfo := aOrderCreate[ UR_ORCR_CONDINFO ] := ; @@ -1458,7 +1458,7 @@ FUNCTION hb_EraseArrayRdd( cFullName ) hRDDData := USRRDD_RDDDATA( s_nRddID ) IF hRDDData != NIL - IF ISCHARACTER( cFullName ) + IF HB_ISSTRING( cFullName ) cFullName := Upper( cFullName ) /* First search if memory dbf exists */ IF hb_HHasKey( hRDDData, cFullName ) @@ -1535,7 +1535,7 @@ FUNCTION hb_FileArrayRdd( cFullName ) hRDDData := USRRDD_RDDDATA( s_nRddID ) IF hRDDData != NIL - IF ISCHARACTER( cFullName ) + IF HB_ISSTRING( cFullName ) cFullName := Upper( cFullName ) /* First search if memory dbf exists */ IF hb_HHasKey( hRDDData, cFullName ) @@ -1671,17 +1671,17 @@ STATIC FUNCTION HB_Decode(...) /* Ok because I have no other value than default, I will check if it is a complex value */ /* like an array or an hash, so I can get it to decode values */ IF xDefault != NIL .AND. ; - ( ISARRAY( xDefault ) .OR. ; - hb_isHash( xDefault ) ) + ( HB_ISARRAY( xDefault ) .OR. ; + HB_ISHASH( xDefault ) ) /* If it is an array I will restart this function creating a linear call */ - IF ISARRAY( xDefault ) .AND. Len( xDefault ) > 0 + IF HB_ISARRAY( xDefault ) .AND. Len( xDefault ) > 0 /* I can have a linear array like { 1, "A", 2, "B", 3, "C" } * or an array of array couples like { { 1, "A" }, { 2, "B" }, { 3, "C" } } * first element tell me what type is */ /* couples of values */ - IF ISARRAY( xDefault[ 1 ] ) + IF HB_ISARRAY( xDefault[ 1 ] ) /* If i have an array as default, this contains couples of key / value */ /* so I have to convert in a linear array */ @@ -1689,7 +1689,7 @@ STATIC FUNCTION HB_Decode(...) /* Check if array has a default value, this will be last value and has a value */ /* different from an array */ - IF ! ISARRAY( ValType( xDefault[ nLen ] ) ) + IF ! HB_ISARRAY( ValType( xDefault[ nLen ] ) ) aParams := Array( ( nLen - 1 ) * 2 ) n := 1 @@ -1718,7 +1718,7 @@ STATIC FUNCTION HB_Decode(...) ENDIF /* If it is an hash, translate it in an array */ - ELSEIF hb_isHash( xDefault ) + ELSEIF HB_ISHASH( xDefault ) aParams := Array( Len( xDefault ) * 2 ) i := 1 diff --git a/harbour/src/rdd/usrrdd/rdds/hscdx.prg b/harbour/src/rdd/usrrdd/rdds/hscdx.prg index 88c1b9ca86..f9d2927087 100644 --- a/harbour/src/rdd/usrrdd/rdds/hscdx.prg +++ b/harbour/src/rdd/usrrdd/rdds/hscdx.prg @@ -62,7 +62,6 @@ #include "hbusrrdd.ch" #include "fileio.ch" #include "dbinfo.ch" -#include "common.ch" ANNOUNCE HSCDX @@ -193,9 +192,9 @@ FUNCTION HSX_CLOSE( xHSX ) IF USED() .AND. RDDNAME() == "HSCDX" aWData:= USRRDD_AREADATA( SELECT() ) - IF ISNUMBER( xHSX ) + IF HB_ISNUMERIC( xHSX ) nSlot := ASCAN( aWData[ 2 ], xHSX ) - ELSEIF ISCHARACTER( xHSX ) + ELSEIF HB_ISSTRING( xHSX ) nSlot := ASCAN( aWData[ 3 ], { |_1| _1 == xHSX } ) ELSE nSlot := 0 diff --git a/harbour/src/rdd/usrrdd/rdds/logrdd.prg b/harbour/src/rdd/usrrdd/rdds/logrdd.prg index a8939df0d0..35009c128d 100644 --- a/harbour/src/rdd/usrrdd/rdds/logrdd.prg +++ b/harbour/src/rdd/usrrdd/rdds/logrdd.prg @@ -60,7 +60,6 @@ #include "rddsys.ch" #include "hbusrrdd.ch" -#include "common.ch" #include "fileio.ch" #include "dbinfo.ch" @@ -257,7 +256,7 @@ FUNCTION hb_LogRddActive( lActive ) lOldActive := aRDDData[ ARRAY_ACTIVE ] - IF HB_ISLOGICAL( lActive ) + IF HB_HB_ISLOGICAL( lActive ) aRDDData[ ARRAY_ACTIVE ] := lActive ENDIF @@ -274,7 +273,7 @@ FUNCTION hb_LogRddMsgLogBlock( bMsgLogBlock ) bOldMsgLogBlock := aRDDData[ ARRAY_MSGLOGBLOCK ] - IF HB_ISBLOCK( bMsgLogBlock ) + IF HB_HB_ISBLOCK( bMsgLogBlock ) aRDDData[ ARRAY_MSGLOGBLOCK ] := bMsgLogBlock ENDIF @@ -291,7 +290,7 @@ FUNCTION hb_LogRddUserLogBlock( bUserLogBlock ) bOldUserLogBlock := aRDDData[ ARRAY_MSGLOGBLOCK ] - IF HB_ISBLOCK( bUserLogBlock ) + IF HB_HB_ISBLOCK( bUserLogBlock ) aRDDData[ ARRAY_USERLOGBLOCK ] := bUserLogBlock ENDIF @@ -405,7 +404,7 @@ STATIC PROCEDURE ToLog( cCmd, nWA, xPar1, xPar2, xPar3 ) bUserLogBlock := aRDDData[ ARRAY_USERLOGBLOCK ] // If not defined a User codeblock - IF !HB_ISBLOCK( bUserLogBlock ) + IF !HB_HB_ISBLOCK( bUserLogBlock ) nHandle := aRDDData[ ARRAY_FHANDLE ] @@ -420,7 +419,7 @@ STATIC PROCEDURE ToLog( cCmd, nWA, xPar1, xPar2, xPar3 ) // If defined a codeblock I send to user infos and he has to return a formatted string // Look at local ToString() function for details - IF HB_ISBLOCK( bMsgLogBlock ) + IF HB_HB_ISBLOCK( bMsgLogBlock ) cLog := Eval( bMsgLogBlock, cTag, cRDDName, cCmd, nWA, xPar1, xPar2, xPar3 ) ELSE cLog := DToS( Date() ) + " " + Time() + " " + cTag + ": " + PadR( cRDDName + "_" + cCmd, 20 ) + " - " + ToString( cCmd, nWA, xPar1, xPar2, xPar3 ) diff --git a/harbour/src/rdd/usrrdd/rdds/rlcdx.prg b/harbour/src/rdd/usrrdd/rdds/rlcdx.prg index fd84b930b8..65ec1e7556 100644 --- a/harbour/src/rdd/usrrdd/rdds/rlcdx.prg +++ b/harbour/src/rdd/usrrdd/rdds/rlcdx.prg @@ -60,7 +60,6 @@ #include "rddsys.ch" #include "hbusrrdd.ch" -#include "common.ch" ANNOUNCE RLCDX @@ -155,7 +154,7 @@ STATIC FUNCTION RLCDX_LOCK( nWA, aLockInfo ) STATIC FUNCTION RLCDX_UNLOCK( nWA, xRecID ) LOCAL aWData := USRRDD_AREADATA( nWA ), i - IF ISNUMBER( xRecID ) .AND. xRecID > 0 + IF HB_ISNUMERIC( xRecID ) .AND. xRecID > 0 IF ( i:= ASCAN( aWData[ 2 ], { |x| x[ 1 ] == xRecID } ) ) != 0 IF --aWData[ 2, i, 2 ] > 0 RETURN HB_SUCCESS diff --git a/harbour/src/rtl/achoice.prg b/harbour/src/rtl/achoice.prg index a54a80c4b5..daf06dcdf9 100644 --- a/harbour/src/rtl/achoice.prg +++ b/harbour/src/rtl/achoice.prg @@ -53,16 +53,16 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo LOCAL cKey LOCAL nAux - IF ! ISNUMBER( nTop ) + IF ! HB_ISNUMERIC( nTop ) nTop := 0 ENDIF - IF ! ISNUMBER( nLeft ) + IF ! HB_ISNUMERIC( nLeft ) nLeft := 0 ENDIF - IF ! ISNUMBER( nBottom ) + IF ! HB_ISNUMERIC( nBottom ) nBottom := 0 ENDIF - IF ! ISNUMBER( nRight ) + IF ! HB_ISNUMERIC( nRight ) nRight := 0 ENDIF @@ -74,7 +74,7 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo nBottom := MaxRow() ENDIF - IF ! ISARRAY( acItems ) .OR. Len( acItems ) == 0 + IF ! HB_ISARRAY( acItems ) .OR. Len( acItems ) == 0 SetPos( nTop, nRight + 1 ) RETURN 0 ENDIF @@ -95,13 +95,13 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo lUserFunc := !Empty( xUserFunc ) .AND. ValType( xUserFunc ) $ "CB" - IF ! ISARRAY( xSelect ) .AND. ! ISLOGICAL( xSelect ) + IF ! HB_ISARRAY( xSelect ) .AND. ! HB_ISLOGICAL( xSelect ) xSelect := .T. // Array or logical, what is selectable ENDIF - IF ! ISNUMBER( nPos ) + IF ! HB_ISNUMERIC( nPos ) nPos := 1 // The number of the selected item ENDIF - IF ! ISNUMBER( nHiLiteRow ) + IF ! HB_ISNUMERIC( nHiLiteRow ) nHiLiteRow := 0 // The row to be highlighted ENDIF @@ -109,7 +109,7 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo nNumRows := nBottom - nTop + 1 - IF ISARRAY( xSelect ) + IF HB_ISARRAY( xSelect ) alSelect := xSelect ELSE alSelect := Array( Len( acItems ) ) @@ -519,7 +519,7 @@ FUNCTION AChoice( nTop, nLeft, nBottom, nRight, acItems, xSelect, xUserFunc, nPo nUserFunc := Do( xUserFunc, nMode, nPos, nPos - nAtTop ) - IF ISNUMBER( nUserFunc ) + IF HB_ISNUMERIC( nUserFunc ) DO CASE CASE nUserFunc == AC_ABORT .OR. nMode == AC_NOITEM @@ -631,10 +631,10 @@ STATIC PROCEDURE DispPage( acItems, alSelect, nTop, nLeft, nRight, nNumRows, nPo STATIC PROCEDURE DispLine( cLine, nRow, nCol, lSelect, lHiLite, nNumCols ) - ColorSelect( iif( lSelect .AND. ISCHARACTER( cLine ), ; + ColorSelect( iif( lSelect .AND. HB_ISSTRING( cLine ), ; iif( lHiLite, CLR_ENHANCED, CLR_STANDARD ), CLR_UNSELECTED ) ) - hb_dispOutAt( nRow, nCol, iif( ISCHARACTER( cLine ), PadR( cLine, nNumCols ), Space( nNumCols ) ) ) + hb_dispOutAt( nRow, nCol, iif( HB_ISSTRING( cLine ), PadR( cLine, nNumCols ), Space( nNumCols ) ) ) IF lHiLite SetPos( nRow, nCol ) ENDIF @@ -651,7 +651,7 @@ STATIC FUNCTION Ach_Limits( nFrstItem, nLastItem, nItems, alSelect, acItems ) nFrstItem := nLastItem := nItems := 0 FOR nCntr := 1 TO Len( acItems ) - IF ISCHARACTER( acItems[ nCntr ] ) .AND. Len( acItems[ nCntr ] ) > 0 + IF HB_ISSTRING( acItems[ nCntr ] ) .AND. Len( acItems[ nCntr ] ) > 0 nItems++ IF Ach_Select( alSelect, nCntr ) IF nFrstItem == 0 @@ -678,10 +678,10 @@ STATIC FUNCTION Ach_Select( alSelect, nPos ) LOCAL sel IF nPos >= 1 .AND. nPos <= Len( alSelect ) sel := alSelect[ nPos ] - IF ISCHARACTER( sel ) .AND. !Empty( sel ) + IF HB_ISSTRING( sel ) .AND. !Empty( sel ) sel := &sel ENDIF - IF ISLOGICAL( sel ) + IF HB_ISLOGICAL( sel ) RETURN sel ENDIF ENDIF diff --git a/harbour/src/rtl/adir.prg b/harbour/src/rtl/adir.prg index 3b4b4a1e76..e69440cfac 100644 --- a/harbour/src/rtl/adir.prg +++ b/harbour/src/rtl/adir.prg @@ -50,7 +50,6 @@ * */ -#include "common.ch" #include "directry.ch" FUNCTION ADir( cFileMask, aName, aSize, aDate, aTime, aAttr ) @@ -69,7 +68,7 @@ FUNCTION ADir( cFileMask, aName, aSize, aDate, aTime, aAttr ) // ; CA-Cl*pper would fail on this case. - IF !ISCHARACTER( cFileMask ) + IF !HB_ISSTRING( cFileMask ) RETURN 0 ENDIF @@ -83,25 +82,25 @@ FUNCTION ADir( cFileMask, aName, aSize, aDate, aTime, aAttr ) // ; - IF ISARRAY( aAttr ) + IF HB_ISARRAY( aAttr ) aDir := Directory( cFileMask, "HSD" ) ELSE aDir := Directory( cFileMask ) ENDIF - IF ISARRAY( aName ) + IF HB_ISARRAY( aName ) nNameLen := Len( aName ) ENDIF - IF ISARRAY( aSize ) + IF HB_ISARRAY( aSize ) nSizeLen := Len( aSize ) ENDIF - IF ISARRAY( aDate ) + IF HB_ISARRAY( aDate ) nDateLen := Len( aDate ) ENDIF - IF ISARRAY( aTime ) + IF HB_ISARRAY( aTime ) nTimeLen := Len( aTime ) ENDIF - IF ISARRAY( aAttr ) + IF HB_ISARRAY( aAttr ) nAttrLen := Len( aAttr ) ENDIF diff --git a/harbour/src/rtl/alert.prg b/harbour/src/rtl/alert.prg index ead268cdd9..55fa834350 100644 --- a/harbour/src/rtl/alert.prg +++ b/harbour/src/rtl/alert.prg @@ -24,7 +24,6 @@ */ #include "box.ch" -#include "common.ch" #include "inkey.ch" #include "setcurs.ch" #include "hbgtinfo.ch" @@ -58,17 +57,17 @@ FUNCTION Alert( cMessage, aOptions, cColorNorm ) #endif - IF ! ISCHARACTER( cMessage ) + IF ! HB_ISSTRING( cMessage ) RETURN NIL ENDIF cMessage := StrTran( cMessage, ";", Chr( 10 ) ) - IF ! ISARRAY( aOptions ) + IF ! HB_ISARRAY( aOptions ) aOptions := {} ENDIF - IF ! ISCHARACTER( cColorNorm ) .OR. Empty( cColorNorm ) + IF ! HB_ISSTRING( cColorNorm ) .OR. Empty( cColorNorm ) cColorNorm := "W+/R" // first pair color (Box line and Text) cColorHigh := "W+/B" // second pair color (Options buttons) ELSE @@ -78,7 +77,7 @@ FUNCTION Alert( cMessage, aOptions, cColorNorm ) aOptionsOK := {} FOR nEval := 1 TO Len( aOptions ) - IF ISCHARACTER( aOptions[ nEval ] ) .AND. ! Empty( aOptions[ nEval ] ) + IF HB_ISSTRING( aOptions[ nEval ] ) .AND. ! Empty( aOptions[ nEval ] ) AAdd( aOptionsOK, aOptions[ nEval ] ) ENDIF NEXT @@ -119,22 +118,22 @@ FUNCTION hb_Alert( xMessage, aOptions, cColorNorm, nDelay ) RETURN NIL ENDIF - IF ISARRAY( xMessage ) + IF HB_ISARRAY( xMessage ) cMessage := "" FOR nEval := 1 TO Len( xMessage ) cMessage += iif( nEval == 1, "", Chr( 10 ) ) + hb_CStr( xMessage[ nEval ] ) NEXT - ELSEIF ISCHARACTER( xMessage ) + ELSEIF HB_ISSTRING( xMessage ) cMessage := StrTran( xMessage, ";", Chr( 10 ) ) ELSE cMessage := hb_CStr( xMessage ) ENDIF - IF ! ISARRAY( aOptions ) + IF ! HB_ISARRAY( aOptions ) aOptions := {} ENDIF - IF !ISCHARACTER( cColorNorm ) .OR. Empty( cColorNorm ) + IF !HB_ISSTRING( cColorNorm ) .OR. Empty( cColorNorm ) cColorNorm := "W+/R" // first pair color (Box line and Text) cColorHigh := "W+/B" // second pair color (Options buttons) ELSE @@ -144,7 +143,7 @@ FUNCTION hb_Alert( xMessage, aOptions, cColorNorm, nDelay ) aOptionsOK := {} FOR nEval := 1 TO Len( aOptions ) - IF ISCHARACTER( aOptions[ nEval ] ) .AND. ! Empty( aOptions[ nEval ] ) + IF HB_ISSTRING( aOptions[ nEval ] ) .AND. ! Empty( aOptions[ nEval ] ) AAdd( aOptionsOK, aOptions[ nEval ] ) ENDIF NEXT diff --git a/harbour/src/rtl/checkbox.prg b/harbour/src/rtl/checkbox.prg index 36ce678a57..9d7dab7135 100644 --- a/harbour/src/rtl/checkbox.prg +++ b/harbour/src/rtl/checkbox.prg @@ -122,7 +122,7 @@ METHOD setFocus() CLASS CHECKBOX ::lHasFocus := .T. ::display() - IF ISBLOCK( ::bFBlock ) + IF HB_ISBLOCK( ::bFBlock ) Eval( ::bFBlock ) ENDIF ENDIF @@ -133,12 +133,12 @@ METHOD select( lState ) CLASS CHECKBOX LOCAL lOldState := ::lBuffer - ::lBuffer := iif( ISLOGICAL( lState ), lState, !::lBuffer ) + ::lBuffer := iif( HB_ISLOGICAL( lState ), lState, !::lBuffer ) IF lOldState != ::lBuffer ::display() - IF ISBLOCK( ::bSBlock ) + IF HB_ISBLOCK( ::bSBlock ) Eval( ::bSBlock ) ENDIF ENDIF @@ -150,7 +150,7 @@ METHOD killFocus() CLASS CHECKBOX IF ::lHasFocus ::lHasFocus := .F. - IF ISBLOCK( ::bFBlock ) + IF HB_ISBLOCK( ::bFBlock ) Eval( ::bFBlock ) ENDIF diff --git a/harbour/src/rtl/color53.prg b/harbour/src/rtl/color53.prg index 3b00b67456..68e595b4a5 100644 --- a/harbour/src/rtl/color53.prg +++ b/harbour/src/rtl/color53.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - #ifdef HB_COMPAT_C53 FUNCTION GetClrPair( cColor, nColor ) @@ -200,15 +198,15 @@ FUNCTION ApplyDefau( cColor, xClr1, xClr2, xClr3, xClr4, xClr5, xClr6, xClr7, xC IF "/" $ cClrToSet IF ( cClrFore := GetClrFore( cClrToSet ) ) == "" - cClrFore := GetClrFore( iif( ISNUMBER( xNewColor ), aSetColor[ xNewColor ], xNewColor ) ) + cClrFore := GetClrFore( iif( HB_ISNUMERIC( xNewColor ), aSetColor[ xNewColor ], xNewColor ) ) ENDIF IF ( cClrBack := GetClrBack( cClrToSet ) ) == "" - cClrBack := GetClrBack( iif( ISNUMBER( xNewColor ), aSetColor[ xNewColor ], xNewColor ) ) + cClrBack := GetClrBack( iif( HB_ISNUMERIC( xNewColor ), aSetColor[ xNewColor ], xNewColor ) ) ENDIF cClrDefa := SetClrPair( cClrDefa, n, cClrFore + "/" + cClrBack ) ELSE - cClrDefa := SetClrPair( cClrDefa, n, iif( ISNUMBER( xNewColor ), aSetColor[ xNewColor ], xNewColor ) ) + cClrDefa := SetClrPair( cClrDefa, n, iif( HB_ISNUMERIC( xNewColor ), aSetColor[ xNewColor ], xNewColor ) ) ENDIF NEXT diff --git a/harbour/src/rtl/dbedit.prg b/harbour/src/rtl/dbedit.prg index 32fc4c830b..9d2df17a6d 100644 --- a/harbour/src/rtl/dbedit.prg +++ b/harbour/src/rtl/dbedit.prg @@ -50,7 +50,6 @@ * */ -#include "common.ch" #include "dbedit.ch" #include "inkey.ch" #include "setcurs.ch" @@ -84,30 +83,30 @@ FUNCTION DBEDIT( nTop, nLeft, nBottom, nRight, ; dbGoBottom() ENDIF - IF !ISNUMBER( nTop ) .OR. nTop < 0 + IF !HB_ISNUMERIC( nTop ) .OR. nTop < 0 nTop := 0 ENDIF - IF !ISNUMBER( nLeft ) .OR. nLeft < 0 + IF !HB_ISNUMERIC( nLeft ) .OR. nLeft < 0 nLeft := 0 ENDIF - IF !ISNUMBER( nBottom ) .OR. nBottom > MaxRow() .OR. nBottom < nTop + IF !HB_ISNUMERIC( nBottom ) .OR. nBottom > MaxRow() .OR. nBottom < nTop nBottom := MaxRow() ENDIF - IF !ISNUMBER( nRight ) .OR. nRight > MaxCol() .OR. nRight < nLeft + IF !HB_ISNUMERIC( nRight ) .OR. nRight > MaxCol() .OR. nRight < nLeft nRight := MaxCol() ENDIF oBrowse := TBrowseDb( nTop, nLeft, nBottom, nRight ) - oBrowse:headSep := iif( ISCHARACTER( xHeadingSeparators ), xHeadingSeparators, Chr( 205 ) + Chr( 209 ) + Chr( 205 ) ) - oBrowse:colSep := iif( ISCHARACTER( xColumnSeparators ), xColumnSeparators, " " + Chr( 179 ) + " " ) - oBrowse:footSep := iif( ISCHARACTER( xFootingSeparators ), xFootingSeparators, "" ) + oBrowse:headSep := iif( HB_ISSTRING( xHeadingSeparators ), xHeadingSeparators, Chr( 205 ) + Chr( 209 ) + Chr( 205 ) ) + oBrowse:colSep := iif( HB_ISSTRING( xColumnSeparators ), xColumnSeparators, " " + Chr( 179 ) + " " ) + oBrowse:footSep := iif( HB_ISSTRING( xFootingSeparators ), xFootingSeparators, "" ) oBrowse:skipBlock := {| nRecs | Skipped( nRecs, lAppend ) } oBrowse:autoLite := .F. /* Set to .F. just like in CA-Cl*pper. [vszakats] */ - IF ISARRAY( acColumns ) + IF HB_ISARRAY( acColumns ) nColCount := 0 FOR EACH aCol IN acColumns - IF ISCHARACTER( aCol ) .AND. !Empty( aCol ) + IF HB_ISSTRING( aCol ) .AND. !Empty( aCol ) nColCount++ ELSE EXIT @@ -125,7 +124,7 @@ FUNCTION DBEDIT( nTop, nLeft, nBottom, nRight, ; FOR nPos := 1 TO nColCount - IF ISARRAY( acColumns ) + IF HB_ISARRAY( acColumns ) cBlock := acColumns[ nPos ] IF ( nAliasPos := At( "->", cBlock ) ) > 0 cHeading := SubStr( cBlock, 1, nAliasPos - 1 ) + "->;" + ; @@ -151,35 +150,35 @@ FUNCTION DBEDIT( nTop, nLeft, nBottom, nRight, ; /* ; */ - IF ISARRAY( xColumnHeaders ) .AND. Len( xColumnHeaders ) >= nPos .AND. ISCHARACTER( xColumnHeaders[ nPos ] ) + IF HB_ISARRAY( xColumnHeaders ) .AND. Len( xColumnHeaders ) >= nPos .AND. HB_ISSTRING( xColumnHeaders[ nPos ] ) cHeading := xColumnHeaders[ nPos ] - ELSEIF ISCHARACTER( xColumnHeaders ) + ELSEIF HB_ISSTRING( xColumnHeaders ) cHeading := xColumnHeaders ENDIF oColumn := TBColumnNew( cHeading, bBlock ) - IF ISARRAY( xColumnSayPictures ) .AND. nPos <= Len( xColumnSayPictures ) .AND. ISCHARACTER( xColumnSayPictures[ nPos ] ) .AND. !Empty( xColumnSayPictures[ nPos ] ) + IF HB_ISARRAY( xColumnSayPictures ) .AND. nPos <= Len( xColumnSayPictures ) .AND. HB_ISSTRING( xColumnSayPictures[ nPos ] ) .AND. !Empty( xColumnSayPictures[ nPos ] ) oColumn:picture := xColumnSayPictures[ nPos ] - ELSEIF ISCHARACTER( xColumnSayPictures ) .AND. !Empty( xColumnSayPictures ) + ELSEIF HB_ISSTRING( xColumnSayPictures ) .AND. !Empty( xColumnSayPictures ) oColumn:picture := xColumnSayPictures ENDIF - IF ISARRAY( xColumnFootings ) .AND. nPos <= Len( xColumnFootings ) .AND. ISCHARACTER( xColumnFootings[ nPos ] ) + IF HB_ISARRAY( xColumnFootings ) .AND. nPos <= Len( xColumnFootings ) .AND. HB_ISSTRING( xColumnFootings[ nPos ] ) oColumn:footing := xColumnFootings[ nPos ] - ELSEIF ISCHARACTER( xColumnFootings ) + ELSEIF HB_ISSTRING( xColumnFootings ) oColumn:footing := xColumnFootings ENDIF - IF ISARRAY( xHeadingSeparators ) .AND. nPos <= Len( xHeadingSeparators ) .AND. ISCHARACTER( xHeadingSeparators[ nPos ] ) + IF HB_ISARRAY( xHeadingSeparators ) .AND. nPos <= Len( xHeadingSeparators ) .AND. HB_ISSTRING( xHeadingSeparators[ nPos ] ) oColumn:headSep := xHeadingSeparators[ nPos ] ENDIF - IF ISARRAY( xColumnSeparators ) .AND. nPos <= Len( xColumnSeparators ) .AND. ISCHARACTER( xColumnSeparators[ nPos ] ) + IF HB_ISARRAY( xColumnSeparators ) .AND. nPos <= Len( xColumnSeparators ) .AND. HB_ISSTRING( xColumnSeparators[ nPos ] ) oColumn:colSep := xColumnSeparators[ nPos ] ENDIF - IF ISARRAY( xFootingSeparators ) .AND. nPos <= Len( xFootingSeparators ) .AND. ISCHARACTER( xFootingSeparators[ nPos ] ) + IF HB_ISARRAY( xFootingSeparators ) .AND. nPos <= Len( xFootingSeparators ) .AND. HB_ISSTRING( xFootingSeparators[ nPos ] ) oColumn:footSep := xFootingSeparators[ nPos ] ENDIF @@ -308,9 +307,9 @@ STATIC FUNCTION CallUser( oBrowse, xUserFunc, nKey, lAppend, lFlag ) /* NOTE: CA-Cl*pper won't check the type of the return value here, and will crash if it's a non-NIL, non-numeric type. We're replicating this behavior. */ - nAction := iif( ISBLOCK( xUserFunc ), ; + nAction := iif( HB_ISBLOCK( xUserFunc ), ; Eval( xUserFunc, nMode, oBrowse:colPos ), ; - iif( ISCHARACTER( xUserFunc ) .AND. !Empty( xUserFunc ), ; + iif( HB_ISSTRING( xUserFunc ) .AND. !Empty( xUserFunc ), ; &xUserFunc( nMode, oBrowse:colPos ), ; iif( nKey == K_ENTER .OR. nKey == K_ESC, DE_ABORT, DE_CONT ) ) ) diff --git a/harbour/src/rtl/einstv52.prg b/harbour/src/rtl/einstv52.prg index a8150e7ed3..d1b7b3a2b7 100644 --- a/harbour/src/rtl/einstv52.prg +++ b/harbour/src/rtl/einstv52.prg @@ -51,7 +51,6 @@ * */ -#include "common.ch" #include "error.ch" /* NOTE: In CA-Cl*pper 5.2/5.3 the cMethod argument seems to be ignored. */ diff --git a/harbour/src/rtl/einstvar.prg b/harbour/src/rtl/einstvar.prg index de89463ec9..8b31a83f69 100644 --- a/harbour/src/rtl/einstvar.prg +++ b/harbour/src/rtl/einstvar.prg @@ -51,7 +51,6 @@ * */ -#include "common.ch" #include "error.ch" /* NOTE: In CA-Cl*pper 5.2/5.3 the cMethod argument seems to be ignored. */ diff --git a/harbour/src/rtl/errsys.prg b/harbour/src/rtl/errsys.prg index b0d7b60725..5b32ded36d 100644 --- a/harbour/src/rtl/errsys.prg +++ b/harbour/src/rtl/errsys.prg @@ -50,7 +50,6 @@ * */ -#include "common.ch" #include "error.ch" PROCEDURE ErrorSys() @@ -168,21 +167,21 @@ STATIC FUNCTION ErrorMessage( oError ) LOCAL cMessage := iif( oError:severity > ES_WARNING, "Error", "Warning" ) + " " // add subsystem name if available - IF ISCHARACTER( oError:subsystem ) + IF HB_ISSTRING( oError:subsystem ) cMessage += oError:subsystem() ELSE cMessage += "???" ENDIF // add subsystem's error code if available - IF ISNUMBER( oError:subCode ) + IF HB_ISNUMERIC( oError:subCode ) cMessage += "/" + hb_NToS( oError:subCode ) ELSE cMessage += "/???" ENDIF // add error description if available - IF ISCHARACTER( oError:description ) + IF HB_ISSTRING( oError:description ) cMessage += " " + oError:description ENDIF diff --git a/harbour/src/rtl/fieldbl.prg b/harbour/src/rtl/fieldbl.prg index 60ea19a372..eab95adfa3 100644 --- a/harbour/src/rtl/fieldbl.prg +++ b/harbour/src/rtl/fieldbl.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - FUNCTION FIELDBLOCK( cFieldName ) LOCAL bField diff --git a/harbour/src/rtl/getsys.prg b/harbour/src/rtl/getsys.prg index dec54fc8ba..e8f0a283c5 100644 --- a/harbour/src/rtl/getsys.prg +++ b/harbour/src/rtl/getsys.prg @@ -61,8 +61,6 @@ * */ -#include "common.ch" - #ifdef HB_COMPAT_C53 #define SLUPDATED 1 @@ -167,7 +165,7 @@ PROCEDURE GetDoSetKey( bKeyBlock, oGet ) #ifdef HB_COMPAT_C53 PROCEDURE GetApplyKey( oGet, nKey, oGetList, oMenu, aMsg ) - IF !ISOBJECT( oGetList ) + IF !HB_ISOBJECT( oGetList ) oGetList := __GetListActive() ENDIF #else @@ -282,7 +280,7 @@ PROCEDURE __SetFormat( bFormat ) LOCAL oGetList := __GetListActive() IF oGetList != NIL - IF ISBLOCK( bFormat ) + IF HB_ISBLOCK( bFormat ) oGetList:SetFormat( bFormat ) ELSE oGetList:SetFormat() diff --git a/harbour/src/rtl/getsys53.prg b/harbour/src/rtl/getsys53.prg index 05d21f7dc4..cfe70e841b 100644 --- a/harbour/src/rtl/getsys53.prg +++ b/harbour/src/rtl/getsys53.prg @@ -61,13 +61,11 @@ * */ -#include "common.ch" - #ifdef HB_COMPAT_C53 PROCEDURE GUIReader( oGet, oGetlist, oMenu, aMsg ) - IF !ISOBJECT( oGetList ) + IF !HB_ISOBJECT( oGetList ) oGetList := __GetListActive() ENDIF @@ -79,7 +77,7 @@ PROCEDURE GUIReader( oGet, oGetlist, oMenu, aMsg ) PROCEDURE GUIApplyKey( oGet, oGUI, oGetList, nKey, oMenu, aMsg ) - IF !ISOBJECT( oGetList ) + IF !HB_ISOBJECT( oGetList ) oGetList := __GetListActive() ENDIF @@ -101,7 +99,7 @@ FUNCTION GUIPostValidate( oGet, oGUI, aMsg ) PROCEDURE TBReader( oGet, oGetList, oMenu, aMsg ) - IF !ISOBJECT( oGetList ) + IF !HB_ISOBJECT( oGetList ) oGetList := __GetListActive() ENDIF @@ -113,7 +111,7 @@ PROCEDURE TBReader( oGet, oGetList, oMenu, aMsg ) PROCEDURE TBApplyKey( oGet, oTB, oGetList, nKey, aMsg ) - IF !ISOBJECT( oGetList ) + IF !HB_ISOBJECT( oGetList ) oGetList := __GetListActive() ENDIF @@ -125,7 +123,7 @@ PROCEDURE TBApplyKey( oGet, oTB, oGetList, nKey, aMsg ) FUNCTION Accelerator( oGetList, nKey, aMsg ) - IF !ISOBJECT( oGetList ) + IF !HB_ISOBJECT( oGetList ) oGetList := __GetListActive() ENDIF @@ -133,7 +131,7 @@ FUNCTION Accelerator( oGetList, nKey, aMsg ) FUNCTION HitTest( oGetList, nMRow, nMCol, aMsg ) - IF !ISOBJECT( oGetList ) + IF !HB_ISOBJECT( oGetList ) oGetList := __GetListActive() ENDIF diff --git a/harbour/src/rtl/gui.prg b/harbour/src/rtl/gui.prg index 451daa0a5b..f2b7092b45 100644 --- a/harbour/src/rtl/gui.prg +++ b/harbour/src/rtl/gui.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - #ifdef HB_COMPAT_C53 #define LLG_VIDEO_TXT 3 diff --git a/harbour/src/rtl/hbdoc.prg b/harbour/src/rtl/hbdoc.prg index f34cd55380..2d05ec5f62 100644 --- a/harbour/src/rtl/hbdoc.prg +++ b/harbour/src/rtl/hbdoc.prg @@ -50,19 +50,18 @@ * */ -#include "common.ch" #include "directry.ch" #include "fileio.ch" #define _HBDOC_SRC_SUBDIR "doc" #define _HBDOC_SRC_EXT ".txt" -#define _HBDOC_ADD_MSG( a, m ) IF ISARRAY( a ); AAdd( a, m ); ENDIF +#define _HBDOC_ADD_MSG( a, m ) IF HB_ISARRAY( a ); AAdd( a, m ); ENDIF FUNCTION __hbdoc_FromSource( cFile, aErrMsg ) LOCAL aEntry := {} - IF ISCHARACTER( cFile ) + IF HB_ISSTRING( cFile ) __hbdoc__read_stream( aEntry, cFile, "(stream)",, aErrMsg ) ENDIF @@ -74,7 +73,7 @@ FUNCTION __hbdoc_LoadDir( cDir, cName, aErrMsg ) LOCAL aFile LOCAL aEntry - IF ISCHARACTER( cDir ) + IF HB_ISSTRING( cDir ) cDir := hb_DirSepAdd( cDir ) @@ -83,7 +82,7 @@ FUNCTION __hbdoc_LoadDir( cDir, cName, aErrMsg ) aEntry := {} hMeta := { => } - IF ISCHARACTER( cName ) + IF HB_ISSTRING( cName ) hMeta[ "_COMPONENT" ] := cName ENDIF @@ -176,7 +175,7 @@ STATIC PROCEDURE __hbdoc__read_stream( aEntry, cFile, cFileName, hMeta, aErrMsg ENDIF hEntry := { => } hb_HKeepOrder( hEntry, .T. ) - IF hb_isHash( hMeta ) + IF HB_ISHASH( hMeta ) FOR EACH tmp IN hMeta hEntry[ tmp:__enumKey() ] := tmp NEXT @@ -229,12 +228,12 @@ FUNCTION __hbdoc_ToSource( aEntry ) LOCAL item LOCAL cLine - IF ISARRAY( aEntry ) + IF HB_ISARRAY( aEntry ) FOR EACH hEntry IN aEntry cSource += hb_eol() cSource += "/* $DOC$" + hb_eol() FOR EACH item IN hEntry - IF ISCHARACTER( item ) .AND. ; + IF HB_ISSTRING( item ) .AND. ; !( Left( item:__enumKey(), 1 ) == "_" ) cSource += " * $" + item:__enumKey() + "$" + hb_eol() FOR EACH cLine IN hb_ATokens( StrTran( item, Chr( 13 ) ), Chr( 10 ) ) @@ -316,8 +315,8 @@ FUNCTION __hbdoc_SaveHBD( cFileName, aEntry ) LOCAL fhnd LOCAL cExt - IF ISCHARACTER( cFileName ) .AND. ; - ISARRAY( aEntry ) + IF HB_ISSTRING( cFileName ) .AND. ; + HB_ISARRAY( aEntry ) IF Set( _SET_DEFEXTENSIONS ) hb_FNameSplit( cFileName, NIL, NIL, @cExt ) @@ -344,7 +343,7 @@ FUNCTION __hbdoc_LoadHBD( cFileName ) LOCAL cBuffer - IF ISCHARACTER( cFileName ) + IF HB_ISSTRING( cFileName ) IF Set( _SET_DEFEXTENSIONS ) hb_FNameSplit( cFileName, NIL, NIL, @cExt ) @@ -368,7 +367,7 @@ FUNCTION __hbdoc_LoadHBD( cFileName ) aEntry := hb_deserialize( hb_ZUncompress( cBuffer ) ) cBuffer := NIL - IF ! ISARRAY( aEntry ) + IF ! HB_ISARRAY( aEntry ) aEntry := NIL ENDIF ELSE diff --git a/harbour/src/rtl/hbfilehi.prg b/harbour/src/rtl/hbfilehi.prg index 944433cfa0..731f277763 100644 --- a/harbour/src/rtl/hbfilehi.prg +++ b/harbour/src/rtl/hbfilehi.prg @@ -52,7 +52,7 @@ /* QUESTION: How to return success/failure when dir is passed? */ FUNCTION hb_cwd( cNewDir ) - IF hb_isString( cNewDir ) + IF HB_ISSTRING( cNewDir ) /* TODO */ ENDIF RETURN hb_DirSepAdd( hb_CurDrive() + hb_osDriveSeparator() + hb_ps() + CurDir() ) @@ -64,7 +64,7 @@ FUNCTION hb_PathNormalize( cPath ) LOCAL aDir LOCAL cDir - IF ! hb_isString( cPath ) + IF ! HB_ISSTRING( cPath ) RETURN "" ENDIF @@ -109,11 +109,11 @@ FUNCTION hb_PathJoin( cPathA, cPathR ) LOCAL cDirA LOCAL cDirR, cDriveR, cNameR, cExtR - IF ! hb_isString( cPathR ) + IF ! HB_ISSTRING( cPathR ) RETURN "" ENDIF - IF ! hb_isString( cPathA ) .OR. Empty( cPathA ) + IF ! HB_ISSTRING( cPathA ) .OR. Empty( cPathA ) RETURN cPathR ENDIF @@ -142,11 +142,11 @@ FUNCTION hb_PathRelativize( cPathBase, cPathTarget, lForceRelative ) LOCAL cTargetFileName - IF ! hb_isString( cPathBase ) .OR. ! hb_isString( cPathTarget ) + IF ! HB_ISSTRING( cPathBase ) .OR. ! HB_ISSTRING( cPathTarget ) RETURN "" ENDIF - IF ! hb_isLogical( lForceRelative ) + IF ! HB_ISLOGICAL( lForceRelative ) lForceRelative := .T. ENDIF @@ -229,7 +229,7 @@ STATIC FUNCTION s_FN_FromArray( aPath, nFrom, cFileName, cDirPrefix ) FUNCTION hb_DirSepAdd( cDir ) - IF ! hb_isString( cDir ) + IF ! HB_ISSTRING( cDir ) RETURN "" ENDIF @@ -244,7 +244,7 @@ FUNCTION hb_DirSepAdd( cDir ) FUNCTION hb_DirSepDel( cDir ) - IF ! hb_isString( cDir ) + IF ! HB_ISSTRING( cDir ) RETURN "" ENDIF @@ -268,7 +268,7 @@ FUNCTION hb_DirBuild( cDir ) LOCAL cDirItem LOCAL tmp - IF ! hb_isString( cDir ) + IF ! HB_ISSTRING( cDir ) RETURN .F. ENDIF @@ -312,7 +312,7 @@ FUNCTION hb_DirUnbuild( cDir ) LOCAL cDirTemp LOCAL tmp - IF ! hb_isString( cDir ) + IF ! HB_ISSTRING( cDir ) RETURN .F. ENDIF diff --git a/harbour/src/rtl/hbi18n2.prg b/harbour/src/rtl/hbi18n2.prg index f2f380a9d7..e54257cf73 100644 --- a/harbour/src/rtl/hbi18n2.prg +++ b/harbour/src/rtl/hbi18n2.prg @@ -50,7 +50,6 @@ * */ -#include "common.ch" #include "fileio.ch" #define _I18N_NONE 0 @@ -326,10 +325,10 @@ FUNCTION __I18N_POTARRAYSAVE( cFile, aTrans, cErrorMsg, lVersionNo, lSourceRef ) LOCAL cEol, cPOT, cFlg LOCAL msg - IF ! ISLOGICAL( lVersionNo ) + IF ! HB_ISLOGICAL( lVersionNo ) lVersionNo := .T. ENDIF - IF ! ISLOGICAL( lSourceRef ) + IF ! HB_ISLOGICAL( lSourceRef ) lSourceRef := .T. ENDIF @@ -443,10 +442,10 @@ FUNCTION __I18N_POTARRAYTRANS( aTrans, hI18N ) IF aItem[ _I18N_MSGID, 1 ] $ hContext xTrans := hContext[ aItem[ _I18N_MSGID, 1 ] ] IF aItem[ _I18N_PLURAL ] - aItem[ _I18N_MSGSTR ] := IIF( HB_ISARRAY( xTrans ), ; + aItem[ _I18N_MSGSTR ] := iif( HB_ISARRAY( xTrans ), ; AClone( xTrans ), { xTrans } ) ELSE - aItem[ _I18N_MSGSTR ] := IIF( HB_ISARRAY( xTrans ), ; + aItem[ _I18N_MSGSTR ] := iif( HB_ISARRAY( xTrans ), ; { xTrans[ 1 ] }, { xTrans } ) ENDIF ENDIF @@ -471,7 +470,7 @@ FUNCTION __I18N_HASHJOIN( hTrans, hTrans2 ) IF !Empty( xTrans ) .AND. ; ( ! xTrans:__enumKey() $ hDstCtx .OR. ; Empty( hDstCtx[ xTrans:__enumKey() ] ) ) - hDstCtx[ xTrans:__enumKey() ] := IIF( HB_ISARRAY( xTrans ), ; + hDstCtx[ xTrans:__enumKey() ] := iif( HB_ISARRAY( xTrans ), ; AClone( xTrans ), xTrans ) ENDIF NEXT diff --git a/harbour/src/rtl/hbini.prg b/harbour/src/rtl/hbini.prg index 9d5beed258..f814e4277a 100644 --- a/harbour/src/rtl/hbini.prg +++ b/harbour/src/rtl/hbini.prg @@ -74,7 +74,6 @@ * */ -#include "common.ch" #include "fileio.ch" @@ -84,11 +83,11 @@ STATIC s_cHalfLineComment := "#" PROCEDURE hb_IniSetComment( cLc, cHlc ) - IF ISCHARACTER( cLc ) + IF HB_ISSTRING( cLc ) s_cLineComment := cLc ENDIF - IF ISCHARACTER( cHlc ) + IF HB_ISSTRING( cHlc ) s_cHalfLineComment := cHlc ENDIF @@ -99,7 +98,7 @@ FUNCTION HB_IniNew( lAutoMain ) hb_HKeepOrder( hIni, .T. ) - IF ! ISLOGICAL( lAutoMain ) + IF ! HB_ISLOGICAL( lAutoMain ) lAutoMain := .T. ENDIF @@ -111,7 +110,7 @@ FUNCTION HB_IniNew( lAutoMain ) RETURN hIni FUNCTION hb_IniRead( cFileSpec, lKeyCaseSens, cSplitters, lAutoMain ) - RETURN hb_IniReadStr( iif( ISCHARACTER( cFileSpec ), hb_IniFileLow( cFileSpec ), "" ), lKeyCaseSens, cSplitters, lAutoMain ) + RETURN hb_IniReadStr( iif( HB_ISSTRING( cFileSpec ), hb_IniFileLow( cFileSpec ), "" ), lKeyCaseSens, cSplitters, lAutoMain ) FUNCTION hb_IniReadStr( cData, lKeyCaseSens, cSplitters, lAutoMain ) LOCAL hIni := { => } @@ -119,16 +118,16 @@ FUNCTION hb_IniReadStr( cData, lKeyCaseSens, cSplitters, lAutoMain ) hb_HKeepOrder( hIni, .T. ) /* Default case sensitiveness for keys */ - IF ! ISLOGICAL( lKeyCaseSens ) + IF ! HB_ISLOGICAL( lKeyCaseSens ) lKeyCaseSens := .T. ENDIF - IF ! ISCHARACTER( cSplitters ) + IF ! HB_ISSTRING( cSplitters ) cSplitters := "=" ENDIF - IF ! ISLOGICAL( lAutoMain ) + IF ! HB_ISLOGICAL( lAutoMain ) lAutoMain := .T. ENDIF - IF ! ISCHARACTER( cData ) + IF ! HB_ISSTRING( cData ) cData := "" ENDIF @@ -299,14 +298,14 @@ FUNCTION hb_IniWrite( xFileName, hIni, cCommentBegin, cCommentEnd, lAutoMain ) cBuffer := hb_IniWriteStr( hIni, cCommentBegin, cCommentEnd, lAutoMain ) // if cBuffer == NIL I have to stop here - IF !ISCHARACTER( cBuffer ) + IF !HB_ISSTRING( cBuffer ) RETURN .F. ENDIF - IF ISCHARACTER( xFileName ) + IF HB_ISSTRING( xFileName ) hFile := FCreate( xFileName ) lClose := .T. - ELSEIF ISNUMBER( xFileName ) + ELSEIF HB_ISNUMERIC( xFileName ) hFile := xFileName lClose := .F. ELSE @@ -339,11 +338,11 @@ FUNCTION hb_IniWriteStr( hIni, cCommentBegin, cCommentEnd, lAutoMain ) RETURN NIL ENDIF - IF ISCHARACTER( cCommentBegin ) .AND. ! Empty( cCommentBegin ) + IF HB_ISSTRING( cCommentBegin ) .AND. ! Empty( cCommentBegin ) cBuffer += cCommentBegin + cNewLine ENDIF - IF ! ISLOGICAL( lAutoMain ) + IF ! HB_ISLOGICAL( lAutoMain ) lAutoMain := .T. ENDIF @@ -361,7 +360,7 @@ FUNCTION hb_IniWriteStr( hIni, cCommentBegin, cCommentEnd, lAutoMain ) ELSE /* When automain is off, just write all the toplevel variables. */ - hb_HEval( hIni, { |cKey, xVal| iif( ! hb_isHash( xVal ),; + hb_HEval( hIni, { |cKey, xVal| iif( ! HB_ISHASH( xVal ),; cBuffer += hb_CStr( cKey ) + " = " + ; hb_CStr( xVal ) + cNewLine, /* nothing */ ) } ) ENDIF @@ -376,7 +375,7 @@ FUNCTION hb_IniWriteStr( hIni, cCommentBegin, cCommentEnd, lAutoMain ) ENDIF ELSE /* When automain is off, skip all the toplevel variables. */ - IF ! hb_isHash( cSection ) + IF ! HB_ISHASH( cSection ) LOOP ENDIF ENDIF @@ -388,7 +387,7 @@ FUNCTION hb_IniWriteStr( hIni, cCommentBegin, cCommentEnd, lAutoMain ) hb_CStr( xVal ) + cNewLine } ) NEXT - IF ISCHARACTER( cCommentEnd ) .AND. ! Empty( cCommentEnd ) + IF HB_ISSTRING( cCommentEnd ) .AND. ! Empty( cCommentEnd ) cBuffer += cCommentEnd + cNewLine ENDIF diff --git a/harbour/src/rtl/libname.prg b/harbour/src/rtl/libname.prg index 96b3511fd2..8f5efa5a9f 100644 --- a/harbour/src/rtl/libname.prg +++ b/harbour/src/rtl/libname.prg @@ -53,11 +53,11 @@ FUNCTION hb_LibName( cLibName, cLibDir ) LOCAL cDir, cName, cExt - IF hb_isString( cLibName ) + IF HB_ISSTRING( cLibName ) hb_FNameSplit( cLibName, @cDir, @cName, @cExt ) - IF Empty( cDir ) .AND. hb_isString( cLibDir ) + IF Empty( cDir ) .AND. HB_ISSTRING( cLibDir ) cDir := cLibDir ENDIF IF Empty( cExt ) diff --git a/harbour/src/rtl/listbox.prg b/harbour/src/rtl/listbox.prg index b4aed3db42..156f2c7044 100644 --- a/harbour/src/rtl/listbox.prg +++ b/harbour/src/rtl/listbox.prg @@ -55,7 +55,6 @@ #include "box.ch" #include "button.ch" #include "color.ch" -#include "common.ch" #include "inkey.ch" #include "setcurs.ch" @@ -167,7 +166,7 @@ ENDCLASS METHOD addItem( cText, cData ) CLASS LISTBOX - IF ISCHARACTER( cText ) .AND. Valtype( cData ) $ "CU" + IF HB_ISSTRING( cText ) .AND. Valtype( cData ) $ "CU" AAdd( ::aItems, { cText, cData } ) @@ -206,7 +205,7 @@ METHOD delItem( nPos ) ::cTextValue := iif( ::nValue == 0, "", _LISTBOX_ITEMDATA( ::aItems[ ::nItemCount ] ) ) IF ::xBuffer == NIL - ELSEIF ISNUMBER( ::xBuffer ) + ELSEIF HB_ISNUMERIC( ::xBuffer ) ::xBuffer := ::nItemCount ELSEIF ::nValue > 0 ::xBuffer := ::cTextValue @@ -322,16 +321,16 @@ METHOD findText( cText, nPos, lCaseSensitive, lExact ) CLASS LISTBOX LOCAL nLen LOCAL bSearch - IF !ISCHARACTER( cText ) .OR. Len( cText ) == 0 + IF !HB_ISSTRING( cText ) .OR. Len( cText ) == 0 RETURN 0 ENDIF - IF !ISNUMBER( nPos ) + IF !HB_ISNUMERIC( nPos ) nPos := 1 ENDIF - IF !ISLOGICAL( lCaseSensitive ) + IF !HB_ISLOGICAL( lCaseSensitive ) lCaseSensitive := .T. ENDIF - IF !ISLOGICAL( lExact ) + IF !HB_ISLOGICAL( lExact ) lExact := Set( _SET_EXACT ) ENDIF @@ -366,16 +365,16 @@ METHOD findData( cData, nPos, lCaseSensitive, lExact ) CLASS LISTBOX LOCAL nLen LOCAL bSearch - IF !ISCHARACTER( cData ) + IF !HB_ISSTRING( cData ) RETURN 0 ENDIF - IF !ISNUMBER( nPos ) + IF !HB_ISNUMERIC( nPos ) nPos := 1 ENDIF - IF !ISLOGICAL( lCaseSensitive ) + IF !HB_ISLOGICAL( lCaseSensitive ) lCaseSensitive := .T. ENDIF - IF !ISLOGICAL( lExact ) + IF !HB_ISLOGICAL( lExact ) lExact := Set( _SET_EXACT ) ENDIF @@ -499,8 +498,8 @@ METHOD hitTest( nMRow, nMCol ) CLASS LISTBOX METHOD insItem( nPos, cText, cData ) - IF ISCHARACTER( cText ) .AND. ; - ISNUMBER( nPos ) .AND. ; + IF HB_ISSTRING( cText ) .AND. ; + HB_ISNUMERIC( nPos ) .AND. ; nPos < ::nItemCount ASize( ::aItems, ++::nItemCount ) @@ -524,7 +523,7 @@ METHOD killFocus() CLASS LISTBOX IF ::lHasFocus ::lHasFocus := .F. - IF ISBLOCK( ::bFBlock ) + IF HB_ISBLOCK( ::bFBlock ) Eval( ::bFBlock ) ENDIF @@ -742,7 +741,7 @@ METHOD select( xPos ) CLASS LISTBOX ::display() - IF ISBLOCK( ::bSBlock ) + IF HB_ISBLOCK( ::bSBlock ) Eval( ::bSBlock ) ENDIF @@ -765,7 +764,7 @@ METHOD setFocus() CLASS LISTBOX ::display() - IF ISBLOCK( ::bFBlock ) + IF HB_ISBLOCK( ::bFBlock ) Eval( ::bFBlock ) ENDIF @@ -777,7 +776,7 @@ METHOD setItem( nPos, aItem ) CLASS LISTBOX IF nPos >= 1 .AND. nPos <= ::nItemCount .AND. ; Len( aItem ) == 2 .AND. ; - ISCHARACTER( aItem[ _ITEM_cTEXT ] ) + HB_ISSTRING( aItem[ _ITEM_cTEXT ] ) ::aItems[ nPos ] := aItem ENDIF @@ -804,7 +803,7 @@ METHOD changeItem( nOldPos, nNewPos ) CLASS LISTBOX ::cTextValue := iif( ::nValue == 0, "", _LISTBOX_ITEMDATA( ::aItems[ ::nValue ] ) ) IF ::xBuffer == NIL - ELSEIF ISNUMBER( ::xBuffer ) + ELSEIF HB_ISNUMERIC( ::xBuffer ) ::xBuffer := ::nValue ELSEIF ::nValue > 0 ::xBuffer := ::cTextValue @@ -828,7 +827,7 @@ METHOD changeItem( nOldPos, nNewPos ) CLASS LISTBOX ::display() - IF ISBLOCK( ::bSBlock ) + IF HB_ISBLOCK( ::bSBlock ) Eval( ::bSBlock ) ENDIF ENDIF @@ -1057,14 +1056,14 @@ METHOD New( nTop, nLeft, nBottom, nRight, lDropDown ) LOCAL cColor - IF !ISNUMBER( nTop ) .OR. ; - !ISNUMBER( nLeft ) .OR. ; - !ISNUMBER( nBottom ) .OR. ; - !ISNUMBER( nRight ) + IF !HB_ISNUMERIC( nTop ) .OR. ; + !HB_ISNUMERIC( nLeft ) .OR. ; + !HB_ISNUMERIC( nBottom ) .OR. ; + !HB_ISNUMERIC( nRight ) RETURN NIL ENDIF - IF !ISLOGICAL( lDropDown ) + IF !HB_ISLOGICAL( lDropDown ) lDropDown := .F. ENDIF @@ -1107,7 +1106,7 @@ FUNCTION _LISTBOX_( nTop, nLeft, nBottom, nRight, xPos, aItems, cCaption,; IF o != NIL - IF ISCHARACTER( cCaption ) + IF HB_ISSTRING( cCaption ) o:caption := cCaption o:capCol := nLeft - __CapLength( cCaption ) ENDIF @@ -1122,7 +1121,7 @@ FUNCTION _LISTBOX_( nTop, nLeft, nBottom, nRight, xPos, aItems, cCaption,; xItem := aItems[ nPos ] - IF ! ISARRAY( xItem ) + IF ! HB_ISARRAY( xItem ) o:addItem( xItem ) ELSEIF Len( xItem ) == _ITEM_cTEXT o:addItem( xItem[ _ITEM_cTEXT ] ) @@ -1131,14 +1130,14 @@ FUNCTION _LISTBOX_( nTop, nLeft, nBottom, nRight, xPos, aItems, cCaption,; ENDIF NEXT - IF ISLOGICAL( lScrollBar ) .AND. lScrollBar - IF ISLOGICAL( lDropDown ) .AND. lDropDown + IF HB_ISLOGICAL( lScrollBar ) .AND. lScrollBar + IF HB_ISLOGICAL( lDropDown ) .AND. lDropDown nTop++ ENDIF o:VScroll := ScrollBar( nTop + 1, nBottom - 1, nRight ) ENDIF - IF ISCHARACTER( cBitmap ) + IF HB_ISSTRING( cBitmap ) o:bitmap := cBitmap ENDIF diff --git a/harbour/src/rtl/memoedit.prg b/harbour/src/rtl/memoedit.prg index 8660789bb8..46c0d138f6 100644 --- a/harbour/src/rtl/memoedit.prg +++ b/harbour/src/rtl/memoedit.prg @@ -52,7 +52,6 @@ #include "hbclass.ch" -#include "common.ch" #include "inkey.ch" #include "memoedit.ch" #include "setcurs.ch" @@ -84,7 +83,7 @@ METHOD MemoInit( xUserFunction ) CLASS HBMemoEditor // Save/Init object internal representation of user function ::xUserFunction := xUserFunction - IF ISCHARACTER( ::xUserFunction ) + IF HB_ISSTRING( ::xUserFunction ) // Keep calling user function until it returns ME_DEFAULT DO WHILE ( nKey := ::xDo( ME_INIT ) ) != ME_DEFAULT @@ -110,7 +109,7 @@ METHOD Edit() CLASS HBMemoEditor // If I have an user function I need to trap configurable keys and ask to // user function if handle them the standard way or not - IF ::lEditAllow .AND. ISCHARACTER( ::xUserFunction ) + IF ::lEditAllow .AND. HB_ISSTRING( ::xUserFunction ) DO WHILE ! ::lExitEdit @@ -151,7 +150,7 @@ METHOD KeyboardHook( nKey ) CLASS HBMemoEditor LOCAL nRow LOCAL nCol - IF ISCHARACTER( ::xUserFunction ) + IF HB_ISSTRING( ::xUserFunction ) IF ! ::lCallKeyboardHook // To avoid recursive calls in endless loop. [jarabal] ::lCallKeyboardHook := .T. ::HandleUserKey( nKey, ::xDo( iif( ::lDirty, ME_UNKEYX, ME_UNKEY ) ) ) @@ -188,7 +187,7 @@ METHOD KeyboardHook( nKey ) CLASS HBMemoEditor METHOD IdleHook() CLASS HBMemoEditor - IF ISCHARACTER( ::xUserFunction ) + IF HB_ISSTRING( ::xUserFunction ) ::xDo( ME_IDLE ) ENDIF @@ -250,7 +249,7 @@ METHOD xDo( nStatus ) CLASS HBMemoEditor LOCAL xResult := Do( ::xUserFunction, nStatus, ::nRow, ::nCol - 1 ) - IF ! ISNUMBER( xResult ) + IF ! HB_ISNUMERIC( xResult ) xResult := ME_DEFAULT ENDIF @@ -292,25 +291,25 @@ FUNCTION MemoEdit( cString,; LOCAL nOldCursor - IF ! ISNUMBER( nTop ) ; nTop := 0 ; ENDIF - IF ! ISNUMBER( nLeft ) ; nLeft := 0 ; ENDIF - IF ! ISNUMBER( nBottom ) ; nBottom := MaxRow() ; ENDIF - IF ! ISNUMBER( nRight ) ; nRight := MaxCol() ; ENDIF - IF ! ISLOGICAL( lEditMode ) ; lEditMode := .T. ; ENDIF - IF ! ISNUMBER( nLineLength ) ; nLineLength := nRight - nLeft + 1 ; ENDIF - IF ! ISNUMBER( nTabSize ) ; nTabSize := 4 ; ENDIF - IF ! ISNUMBER( nTextBuffRow ) ; nTextBuffRow := 1 ; ENDIF - IF ! ISNUMBER( nTextBuffColumn ) ; nTextBuffColumn := 0 ; ENDIF - IF ! ISNUMBER( nWindowRow ) ; nWindowRow := 0 ; ENDIF - IF ! ISNUMBER( nWindowColumn ) ; nWindowColumn := nTextBuffColumn ; ENDIF - IF ! ISCHARACTER( cString ) ; cString := "" ; ENDIF + IF ! HB_ISNUMERIC( nTop ) ; nTop := 0 ; ENDIF + IF ! HB_ISNUMERIC( nLeft ) ; nLeft := 0 ; ENDIF + IF ! HB_ISNUMERIC( nBottom ) ; nBottom := MaxRow() ; ENDIF + IF ! HB_ISNUMERIC( nRight ) ; nRight := MaxCol() ; ENDIF + IF ! HB_ISLOGICAL( lEditMode ) ; lEditMode := .T. ; ENDIF + IF ! HB_ISNUMERIC( nLineLength ) ; nLineLength := nRight - nLeft + 1 ; ENDIF + IF ! HB_ISNUMERIC( nTabSize ) ; nTabSize := 4 ; ENDIF + IF ! HB_ISNUMERIC( nTextBuffRow ) ; nTextBuffRow := 1 ; ENDIF + IF ! HB_ISNUMERIC( nTextBuffColumn ) ; nTextBuffColumn := 0 ; ENDIF + IF ! HB_ISNUMERIC( nWindowRow ) ; nWindowRow := 0 ; ENDIF + IF ! HB_ISNUMERIC( nWindowColumn ) ; nWindowColumn := nTextBuffColumn ; ENDIF + IF ! HB_ISSTRING( cString ) ; cString := "" ; ENDIF // Original MemoEdit() converts Tabs into spaces; oEd := HBMemoEditor():New( StrTran( cString, Chr( K_TAB ), Space( 1 ) ), nTop, nLeft, nBottom, nRight, lEditMode, nLineLength, nTabSize, nTextBuffRow, nTextBuffColumn, nWindowRow, nWindowColumn ) oEd:MemoInit( xUserFunction ) oEd:display() - IF ! ISLOGICAL( xUserFunction ) .OR. xUserFunction == .T. + IF ! HB_ISLOGICAL( xUserFunction ) .OR. xUserFunction == .T. nOldCursor := SetCursor( iif( Set( _SET_INSERT ), SC_INSERT, SC_NORMAL ) ) oEd:Edit() IF oEd:Changed() .AND. oEd:Saved() diff --git a/harbour/src/rtl/memvarbl.prg b/harbour/src/rtl/memvarbl.prg index b14e7acb01..47f5c341b2 100644 --- a/harbour/src/rtl/memvarbl.prg +++ b/harbour/src/rtl/memvarbl.prg @@ -52,11 +52,9 @@ #include "hbmemvar.ch" -#include "common.ch" - FUNCTION MEMVARBLOCK( cMemvar ) - IF ISCHARACTER( cMemvar ) .AND. __mvEXIST( cMemvar ) + IF HB_ISSTRING( cMemvar ) .AND. __mvEXIST( cMemvar ) RETURN {| x | iif( x == NIL, __mvGET( cMemvar ), __mvPUT( cMemvar, x ) ) } ENDIF diff --git a/harbour/src/rtl/memvarhb.prg b/harbour/src/rtl/memvarhb.prg index 09e4d869f4..5d68cdd4fe 100644 --- a/harbour/src/rtl/memvarhb.prg +++ b/harbour/src/rtl/memvarhb.prg @@ -51,7 +51,6 @@ */ #include "hbmemvar.ch" -#include "common.ch" #include "error.ch" #include "fileio.ch" @@ -93,7 +92,7 @@ FUNCTION HB_MVSAVE( cFileName, cMask, lIncludeMask ) LOCAL xRecover LOCAL nRetries - IF ISCHARACTER( cFileName ) + IF HB_ISSTRING( cFileName ) IF Set( _SET_DEFEXTENSIONS ) hb_FNameSplit( cFileName, NIL, NIL, @cExt ) @@ -102,12 +101,12 @@ FUNCTION HB_MVSAVE( cFileName, cMask, lIncludeMask ) ENDIF ENDIF - IF ! ISCHARACTER( cMask ) .OR. ; + IF ! HB_ISSTRING( cMask ) .OR. ; Empty( cMask ) .OR. Left( cMask, 1 ) == "*" cMask := "*" ENDIF - IF ! ISLOGICAL( lIncludeMask ) + IF ! HB_ISLOGICAL( lIncludeMask ) lIncludeMask := .T. ENDIF @@ -143,7 +142,7 @@ FUNCTION HB_MVSAVE( cFileName, cMask, lIncludeMask ) oError:tries := ++nRetries xRecover := Eval( ErrorBlock(), oError ) - IF ISLOGICAL( xRecover ) .AND. xRecover + IF HB_ISLOGICAL( xRecover ) .AND. xRecover LOOP ENDIF ENDIF @@ -188,9 +187,9 @@ FUNCTION HB_MVRESTORE( cFileName, lAdditive, cMask, lIncludeMask ) LOCAL xRecover LOCAL nRetries - IF ISCHARACTER( cFileName ) + IF HB_ISSTRING( cFileName ) - IF ! ISLOGICAL( lAdditive ) + IF ! HB_ISLOGICAL( lAdditive ) lAdditive := .T. ENDIF @@ -205,12 +204,12 @@ FUNCTION HB_MVRESTORE( cFileName, lAdditive, cMask, lIncludeMask ) ENDIF ENDIF - IF ! ISCHARACTER( cFileName ) .OR. ; + IF ! HB_ISSTRING( cFileName ) .OR. ; Empty( cMask ) .OR. Left( cMask, 1 ) == "*" cMask := "*" ENDIF - IF ! ISLOGICAL( lIncludeMask ) + IF ! HB_ISLOGICAL( lIncludeMask ) lIncludeMask := .T. ENDIF @@ -231,7 +230,7 @@ FUNCTION HB_MVRESTORE( cFileName, lAdditive, cMask, lIncludeMask ) oError:tries := ++nRetries xRecover := Eval( ErrorBlock(), oError ) - IF ISLOGICAL( xRecover ) .AND. xRecover + IF HB_ISLOGICAL( xRecover ) .AND. xRecover LOOP ENDIF ENDIF @@ -256,10 +255,10 @@ FUNCTION HB_MVRESTORE( cFileName, lAdditive, cMask, lIncludeMask ) aVars := hb_deserialize( cBuffer ) cBuffer := NIL - IF ISARRAY( aVars ) + IF HB_ISARRAY( aVars ) FOR EACH item IN aVars - IF ISARRAY( item ) .AND. Len( item ) == 2 .AND. ; - ISCHARACTER( item[ 1 ] ) .AND. ; + IF HB_ISARRAY( item ) .AND. Len( item ) == 2 .AND. ; + HB_ISSTRING( item[ 1 ] ) .AND. ; ! Empty( item[ 1 ] ) cName := item[ 1 ] diff --git a/harbour/src/rtl/menusys.prg b/harbour/src/rtl/menusys.prg index 13d7de7221..1a9097f911 100644 --- a/harbour/src/rtl/menusys.prg +++ b/harbour/src/rtl/menusys.prg @@ -52,7 +52,6 @@ #include "hbclass.ch" -#include "common.ch" #include "getexit.ch" #include "inkey.ch" #include "setcurs.ch" diff --git a/harbour/src/rtl/menuto.prg b/harbour/src/rtl/menuto.prg index e741718d3f..c08c8f27ce 100644 --- a/harbour/src/rtl/menuto.prg +++ b/harbour/src/rtl/menuto.prg @@ -14,7 +14,6 @@ /* NOTE: Recursive use is supported. */ #include "color.ch" -#include "common.ch" #include "inkey.ch" #include "hbmemvar.ch" #include "setcurs.ch" @@ -95,7 +94,7 @@ FUNCTION __MenuTo( bBlock, cVariable ) // put choice in a valid range - IF !ISNUMBER( n ) .OR. n < 1 + IF !HB_ISNUMERIC( n ) .OR. n < 1 n := 1 ENDIF @@ -126,11 +125,11 @@ FUNCTION __MenuTo( bBlock, cVariable ) xMsg := t_aLevel[ nPointer - 1, n, 4 ] // Code Block messages ( yes, they are documented! ) - IF ISBLOCK( xMsg ) + IF HB_ISBLOCK( xMsg ) xMsg := Eval( xMsg ) ENDIF - IF !ISCHARACTER( xMsg ) + IF !HB_ISSTRING( xMsg ) xMsg := "" ENDIF diff --git a/harbour/src/rtl/objfunc.prg b/harbour/src/rtl/objfunc.prg index 626be88cbc..1ce5af30e7 100644 --- a/harbour/src/rtl/objfunc.prg +++ b/harbour/src/rtl/objfunc.prg @@ -66,13 +66,12 @@ * */ -#include "common.ch" #include "error.ch" #include "hboo.ch" FUNCTION __objHasData( oObject, cSymbol ) - IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) + IF ! HB_ISOBJECT( oObject ) .OR. ! HB_ISSTRING( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF @@ -81,7 +80,7 @@ FUNCTION __objHasData( oObject, cSymbol ) FUNCTION __objHasMethod( oObject, cSymbol ) - IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) + IF ! HB_ISOBJECT( oObject ) .OR. ! HB_ISSTRING( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF @@ -94,15 +93,15 @@ FUNCTION __objGetMsgList( oObject, lDataMethod, nClassType ) LOCAL n LOCAL nLen - IF ! ISOBJECT( oObject ) + IF ! HB_ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF - IF ! ISLOGICAL( lDataMethod ) + IF ! HB_ISLOGICAL( lDataMethod ) lDataMethod := .T. ENDIF - IF ! ISNUMBER( nClassType ) + IF ! HB_ISNUMERIC( nClassType ) nClasstype := HB_MSGLISTALL ENDIF @@ -133,7 +132,7 @@ FUNCTION __objGetMsgList( oObject, lDataMethod, nClassType ) FUNCTION __objGetMethodList( oObject ) - IF ! ISOBJECT( oObject ) + IF ! HB_ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF @@ -146,11 +145,11 @@ FUNCTION __objGetValueList( oObject, aExcept ) LOCAL cSymbol LOCAL n - IF ! ISOBJECT( oObject ) + IF ! HB_ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF - IF ! ISARRAY( aExcept ) + IF ! HB_ISARRAY( aExcept ) aExcept := {} ENDIF @@ -169,7 +168,7 @@ FUNCTION __objGetValueList( oObject, aExcept ) FUNCTION __objSetValueList( oObject, aData ) - IF ! ISOBJECT( oObject ) + IF ! HB_ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSE AEval( aData, {| aItem | __objSendMsg( oObject, "_" + aItem[ HB_OO_DATA_SYMBOL ], aItem[ HB_OO_DATA_VALUE ] ) } ) @@ -179,7 +178,7 @@ FUNCTION __objSetValueList( oObject, aData ) FUNCTION __objAddMethod( oObject, cSymbol, nFuncPtr ) - IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) .OR. !hb_ISSYMBOL( nFuncPtr ) + IF ! HB_ISOBJECT( oObject ) .OR. ! HB_ISSTRING( cSymbol ) .OR. !hb_ISSYMBOL( nFuncPtr ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF !__objHasMsg( oObject, cSymbol ) __clsAddMsg( oObject:ClassH, cSymbol, nFuncPtr, HB_OO_MSG_METHOD, NIL, 1 ) @@ -189,7 +188,7 @@ FUNCTION __objAddMethod( oObject, cSymbol, nFuncPtr ) FUNCTION __objAddInline( oObject, cSymbol, bInline ) - IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) + IF ! HB_ISOBJECT( oObject ) .OR. ! HB_ISSTRING( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF !__objHasMsg( oObject, cSymbol ) __clsAddMsg( oObject:ClassH, cSymbol, bInline, HB_OO_MSG_INLINE, NIL, 1 ) @@ -200,7 +199,7 @@ FUNCTION __objAddInline( oObject, cSymbol, bInline ) FUNCTION __objAddData( oObject, cSymbol ) LOCAL nSeq, hClass - IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) + IF ! HB_ISOBJECT( oObject ) .OR. ! HB_ISSTRING( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF !__objHasMsg( oObject, cSymbol ) .AND. !__objHasMsg( oObject, "_" + cSymbol ) hClass := oObject:ClassH @@ -213,7 +212,7 @@ FUNCTION __objAddData( oObject, cSymbol ) FUNCTION __objModMethod( oObject, cSymbol, nFuncPtr ) - IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) .OR. !hb_ISSYMBOL( nFuncPtr ) + IF ! HB_ISOBJECT( oObject ) .OR. ! HB_ISSTRING( cSymbol ) .OR. !hb_ISSYMBOL( nFuncPtr ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF __objHasMethod( oObject, cSymbol ) __clsModMsg( oObject:ClassH, cSymbol, nFuncPtr ) @@ -223,7 +222,7 @@ FUNCTION __objModMethod( oObject, cSymbol, nFuncPtr ) FUNCTION __objModInline( oObject, cSymbol, bInline ) - IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) .OR. ! ISBLOCK( bInline ) + IF ! HB_ISOBJECT( oObject ) .OR. ! HB_ISSTRING( cSymbol ) .OR. ! HB_ISBLOCK( bInline ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF __objHasMethod( oObject, cSymbol ) __clsModMsg( oObject:ClassH, cSymbol, bInline ) @@ -233,7 +232,7 @@ FUNCTION __objModInline( oObject, cSymbol, bInline ) FUNCTION __objDelMethod( oObject, cSymbol ) - IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) + IF ! HB_ISOBJECT( oObject ) .OR. ! HB_ISSTRING( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF __objHasMethod( oObject, cSymbol ) __clsDelMsg( oObject:ClassH, cSymbol ) @@ -246,7 +245,7 @@ FUNCTION __objDelInline( oObject, cSymbol ) FUNCTION __objDelData( oObject, cSymbol ) - IF ! ISOBJECT( oObject ) .OR. ! ISCHARACTER( cSymbol ) + IF ! HB_ISOBJECT( oObject ) .OR. ! HB_ISSTRING( cSymbol ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ELSEIF __objHasData( oObject, cSymbol ) __clsDelMsg( oObject:ClassH, cSymbol ) @@ -259,13 +258,13 @@ FUNCTION __objDelData( oObject, cSymbol ) FUNCTION __objDerivedFrom( oObject, xSuper ) LOCAL cClassName - IF ! ISOBJECT( oObject ) + IF ! HB_ISOBJECT( oObject ) __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) ENDIF - IF ISOBJECT( xSuper ) + IF HB_ISOBJECT( xSuper ) cClassName := xSuper:ClassName() - ELSEIF ISCHARACTER( xSuper ) + ELSEIF HB_ISSTRING( xSuper ) cClassName := hb_asciiUpper( xSuper ) ELSE __errRT_BASE( EG_ARG, 3101, NIL, ProcName( 0 ) ) diff --git a/harbour/src/rtl/profiler.prg b/harbour/src/rtl/profiler.prg index 2a9c4c744c..fe5f6373fe 100644 --- a/harbour/src/rtl/profiler.prg +++ b/harbour/src/rtl/profiler.prg @@ -98,7 +98,6 @@ #include "hbclass.ch" #include "fileio.ch" -#include "common.ch" #ifdef __TEST__ @@ -611,7 +610,7 @@ METHOD emitLine( oEntity ) CLASS HBProfileReport METHOD generate( bFilter ) CLASS HBProfileReport LOCAL lProfile := __setProfiler( .F. ) - IF ! ISBLOCK( bFilter ) + IF ! HB_ISBLOCK( bFilter ) bFilter := {|| .T. } ENDIF @@ -651,7 +650,7 @@ METHOD writeLines( aLines ) CLASS HBProfileReportToFile METHOD generate( bFilter, cFile ) CLASS HBProfileReportToFile LOCAL lProfile := __setProfiler( .F. ) - IF ! ISCHARACTER( cFile ) + IF ! HB_ISSTRING( cFile ) cFile := "hbprof.txt" ENDIF diff --git a/harbour/src/rtl/pushbtn.prg b/harbour/src/rtl/pushbtn.prg index 1d8ae6268a..ac63fd3711 100644 --- a/harbour/src/rtl/pushbtn.prg +++ b/harbour/src/rtl/pushbtn.prg @@ -123,7 +123,7 @@ METHOD setFocus() CLASS PUSHBUTTON ::lHasFocus := .T. ::display() - IF ISBLOCK( ::bFBlock ) + IF HB_ISBLOCK( ::bFBlock ) Eval( ::bFBlock ) ENDIF ENDIF @@ -138,7 +138,7 @@ METHOD select( nPos ) CLASS PUSHBUTTON ::lbuffer := .T. ::display() - IF ISNUMBER( nPos ) + IF HB_ISNUMERIC( nPos ) IF nPos == 32 @@ -152,7 +152,7 @@ METHOD select( nPos ) CLASS PUSHBUTTON ENDIF ENDIF - IF ISBLOCK( ::bSBlock ) + IF HB_ISBLOCK( ::bSBlock ) Eval( ::bSBlock ) ENDIF @@ -167,7 +167,7 @@ METHOD killFocus() CLASS PUSHBUTTON IF ::lHasFocus ::lHasFocus := .F. - IF ISBLOCK( ::bFBlock ) + IF HB_ISBLOCK( ::bFBlock ) Eval( ::bFBlock ) ENDIF @@ -342,8 +342,8 @@ METHOD New( nRow, nCol, cCaption ) CLASS PUSHBUTTON LOCAL cColor - IF !ISNUMBER( nRow ) .OR. ; - !ISNUMBER( nCol ) + IF !HB_ISNUMERIC( nRow ) .OR. ; + !HB_ISNUMERIC( nCol ) RETURN NIL ENDIF diff --git a/harbour/src/rtl/radiobtn.prg b/harbour/src/rtl/radiobtn.prg index 29a01f3a4c..7d8bdffe17 100644 --- a/harbour/src/rtl/radiobtn.prg +++ b/harbour/src/rtl/radiobtn.prg @@ -54,7 +54,6 @@ #include "button.ch" #include "color.ch" -#include "common.ch" /* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but it has all related variables and methods. */ @@ -118,7 +117,7 @@ METHOD setFocus() CLASS RADIOBUTTN ::lHasFocus := .T. ::display() - IF ISBLOCK( ::bFBlock ) + IF HB_ISBLOCK( ::bFBlock ) Eval( ::bFBlock ) ENDIF ENDIF @@ -129,10 +128,10 @@ METHOD select( lState ) CLASS RADIOBUTTN LOCAL lOldState := ::lBuffer - ::lBuffer := iif( ISLOGICAL( lState ), lState, !::lBuffer ) + ::lBuffer := iif( HB_ISLOGICAL( lState ), lState, !::lBuffer ) IF lOldState != ::lBuffer .AND. ; - ISBLOCK( ::bSBlock ) + HB_ISBLOCK( ::bSBlock ) Eval( ::bSBlock ) ENDIF @@ -144,7 +143,7 @@ METHOD killFocus() CLASS RADIOBUTTN IF ::lHasFocus ::lHasFocus := .F. - IF ISBLOCK( ::bFBlock ) + IF HB_ISBLOCK( ::bFBlock ) Eval( ::bFBlock ) ENDIF @@ -191,9 +190,9 @@ METHOD isAccel( xKey ) CLASS RADIOBUTTN LOCAL cKey - IF ISCHARACTER( xKey ) + IF HB_ISSTRING( xKey ) cKey := xKey - ELSEIF ISNUMBER( xKey ) + ELSEIF HB_ISNUMERIC( xKey ) cKey := hb_KeyChar( xKey ) ELSE RETURN .F. @@ -325,12 +324,12 @@ METHOD New( nRow, nCol, cCaption, cData ) CLASS RADIOBUTTN LOCAL cColor - IF !ISNUMBER( nRow ) .OR. ; - !ISNUMBER( nCol ) + IF !HB_ISNUMERIC( nRow ) .OR. ; + !HB_ISNUMERIC( nCol ) RETURN NIL ENDIF - IF !ISCHARACTER( cCaption ) + IF !HB_ISSTRING( cCaption ) cCaption := "" ENDIF diff --git a/harbour/src/rtl/radiogrp.prg b/harbour/src/rtl/radiogrp.prg index 4b5bebe73c..c93b014a19 100644 --- a/harbour/src/rtl/radiogrp.prg +++ b/harbour/src/rtl/radiogrp.prg @@ -137,7 +137,7 @@ ENDCLASS METHOD addItem( oRadioButton ) CLASS RADIOGROUP - IF ISOBJECT( oRadioButton ) .AND. oRadioButton:ClassName() == "RADIOBUTTN" + IF HB_ISOBJECT( oRadioButton ) .AND. oRadioButton:ClassName() == "RADIOBUTTN" AAdd( ::aItems, oRadioButton ) ::nItemCount++ ENDIF @@ -154,7 +154,7 @@ METHOD delItem( nPos ) CLASS RADIOGROUP IF ::lHasFocus .AND. ::nItemCount < ::nValue ::nValue := ::nItemCount ::cTextValue := ::aItems[ ::nValue ]:data - ::xBuffer := iif( ISNUMBER( ::xBuffer ), ::nValue, ::cTextValue ) + ::xBuffer := iif( HB_ISNUMERIC( ::xBuffer ), ::nValue, ::cTextValue ) ENDIF RETURN Self @@ -210,9 +210,9 @@ METHOD getAccel( xValue ) CLASS RADIOGROUP LOCAL cValue - IF ISCHARACTER( xValue ) + IF HB_ISSTRING( xValue ) cValue := xValue - ELSEIF ISNUMBER( xValue ) + ELSEIF HB_ISNUMERIC( xValue ) cValue := hb_KeyChar( xValue ) ELSE RETURN 0 @@ -300,7 +300,7 @@ METHOD hitTest( nMRow, nMCol ) CLASS RADIOGROUP METHOD insItem( nPos, oRadioButton ) CLASS RADIOGROUP - IF ISOBJECT( oRadioButton ) .AND. oRadioButton:ClassName() == "RADIOBUTTN" .AND. ; + IF HB_ISOBJECT( oRadioButton ) .AND. oRadioButton:ClassName() == "RADIOBUTTN" .AND. ; nPos < ::nItemCount ASize( ::aItems, ++::nItemCount ) @@ -322,7 +322,7 @@ METHOD killFocus() CLASS RADIOGROUP ::lHasFocus := .F. - IF ISBLOCK( ::bFBlock ) + IF HB_ISBLOCK( ::bFBlock ) Eval( ::bFBlock ) ENDIF @@ -378,7 +378,7 @@ METHOD setFocus() CLASS RADIOGROUP MSetCursor( nOldMCur ) - IF ISBLOCK( ::bFBlock ) + IF HB_ISBLOCK( ::bFBlock ) Eval( ::bFBlock ) ENDIF ENDIF @@ -491,7 +491,7 @@ METHOD changeButton( nUnselect, nSelect ) CLASS RADIOGROUP ::nValue := nSelect ::cTextValue := ::aItems[ nSelect ]:data - ::xBuffer := iif( ISNUMBER( ::xBuffer ), nSelect, ::cTextValue ) + ::xBuffer := iif( HB_ISNUMERIC( ::xBuffer ), nSelect, ::cTextValue ) ENDIF @@ -618,10 +618,10 @@ METHOD New( nTop, nLeft, nBottom, nRight ) CLASS RADIOGROUP LOCAL cColor - IF !ISNUMBER( nTop ) .OR. ; - !ISNUMBER( nLeft ) .OR. ; - !ISNUMBER( nBottom ) .OR. ; - !ISNUMBER( nRight ) + IF !HB_ISNUMERIC( nTop ) .OR. ; + !HB_ISNUMERIC( nLeft ) .OR. ; + !HB_ISNUMERIC( nBottom ) .OR. ; + !HB_ISNUMERIC( nRight ) RETURN NIL ENDIF diff --git a/harbour/src/rtl/readvar.prg b/harbour/src/rtl/readvar.prg index 2ebb5ec897..0c20c58552 100644 --- a/harbour/src/rtl/readvar.prg +++ b/harbour/src/rtl/readvar.prg @@ -50,8 +50,6 @@ * */ -#include "common.ch" - FUNCTION ReadVar( cVarName ) THREAD STATIC t_cVarName := "" @@ -64,7 +62,7 @@ FUNCTION ReadVar( cVarName ) cOldVarName := t_cVarName - IF ISCHARACTER( cVarName ) + IF HB_ISSTRING( cVarName ) t_cVarName := cVarName ENDIF diff --git a/harbour/src/rtl/scrollbr.prg b/harbour/src/rtl/scrollbr.prg index b60ac8d68c..97e4d71eaa 100644 --- a/harbour/src/rtl/scrollbr.prg +++ b/harbour/src/rtl/scrollbr.prg @@ -163,7 +163,7 @@ METHOD update() CLASS SCROLLBAR LOCAL nOldThumbPos := ::nThumbPos - IF ISBLOCK( ::bSBlock ) + IF HB_ISBLOCK( ::bSBlock ) Eval( ::bSBlock ) ENDIF @@ -253,7 +253,7 @@ METHOD barLength() CLASS SCROLLBAR METHOD bitmaps( aBitmaps ) CLASS SCROLLBAR - IF ISARRAY( aBitmaps ) .AND. ; + IF HB_ISARRAY( aBitmaps ) .AND. ; Len( aBitmaps ) == 3 ::aBitmaps := aBitmaps @@ -263,7 +263,7 @@ METHOD bitmaps( aBitmaps ) CLASS SCROLLBAR METHOD colorSpec( cColorSpec ) CLASS SCROLLBAR - IF ISCHARACTER( cColorSpec ) .AND. ; + IF HB_ISSTRING( cColorSpec ) .AND. ; !Empty( hb_ColorIndex( cColorSpec, 1 ) ) .AND. ; Empty( hb_ColorIndex( cColorSpec, 2 ) ) @@ -274,7 +274,7 @@ METHOD colorSpec( cColorSpec ) CLASS SCROLLBAR METHOD current( nCurrent ) CLASS SCROLLBAR - IF ISNUMBER( nCurrent ) .AND. ; + IF HB_ISNUMERIC( nCurrent ) .AND. ; nCurrent <= ::nTotal .AND. ; nCurrent != ::nCurrent @@ -285,7 +285,7 @@ METHOD current( nCurrent ) CLASS SCROLLBAR METHOD end( nEnd ) CLASS SCROLLBAR - IF ISNUMBER( nEnd ) .AND. ; + IF HB_ISNUMERIC( nEnd ) .AND. ; nEnd >= ::nStart .AND. ; nEnd != ::nEnd @@ -297,7 +297,7 @@ METHOD end( nEnd ) CLASS SCROLLBAR METHOD offset( nOffset ) CLASS SCROLLBAR - IF ISNUMBER( nOffset ) .AND. ; + IF HB_ISNUMERIC( nOffset ) .AND. ; nOffset != ::nOffset ::nOffset := nOffset @@ -307,7 +307,7 @@ METHOD offset( nOffset ) CLASS SCROLLBAR METHOD orient( nOrient ) CLASS SCROLLBAR - IF ISNUMBER( nOrient ) .AND. ; + IF HB_ISNUMERIC( nOrient ) .AND. ; ( nOrient == SCROLL_VERTICAL .OR. nOrient == SCROLL_HORIZONTAL ) ::nOrient := nOrient @@ -317,7 +317,7 @@ METHOD orient( nOrient ) CLASS SCROLLBAR METHOD sBlock( bSBlock ) CLASS SCROLLBAR - IF ISBLOCK( bSBlock ) + IF HB_ISBLOCK( bSBlock ) ::bSBlock := bSBlock ENDIF @@ -325,7 +325,7 @@ METHOD sBlock( bSBlock ) CLASS SCROLLBAR METHOD start( nStart ) CLASS SCROLLBAR - IF ISNUMBER( nStart ) .AND. ; + IF HB_ISNUMERIC( nStart ) .AND. ; nStart <= ::nEnd .AND. ; nStart != ::nStart @@ -337,7 +337,7 @@ METHOD start( nStart ) CLASS SCROLLBAR METHOD style( cStyle ) CLASS SCROLLBAR - IF ISCHARACTER( cStyle ) .AND. ; + IF HB_ISSTRING( cStyle ) .AND. ; Len( cStyle ) == 4 ::cStyle := cStyle @@ -347,7 +347,7 @@ METHOD style( cStyle ) CLASS SCROLLBAR METHOD thumbPos( nThumbPos ) CLASS SCROLLBAR - IF ISNUMBER( nThumbPos ) + IF HB_ISNUMERIC( nThumbPos ) IF nThumbPos < 1 ::nThumbPos := 1 @@ -366,7 +366,7 @@ METHOD thumbPos( nThumbPos ) CLASS SCROLLBAR METHOD total( nTotal ) CLASS SCROLLBAR - IF ISNUMBER( nTotal ) .AND. ; + IF HB_ISNUMERIC( nTotal ) .AND. ; nTotal >= 2 .AND. ; nTotal != ::nTotal @@ -406,11 +406,11 @@ METHOD New( nStart, nEnd, nOffset, bSBlock, nOrient ) CLASS SCROLLBAR DEFAULT nOrient TO SCROLL_VERTICAL - IF !ISNUMBER( nStart ) .OR. ; - !ISNUMBER( nEnd ) .OR. ; - !ISNUMBER( nOffset ) .OR. ; + IF !HB_ISNUMERIC( nStart ) .OR. ; + !HB_ISNUMERIC( nEnd ) .OR. ; + !HB_ISNUMERIC( nOffset ) .OR. ; !ValType( bSBlock ) $ "BU" .OR. ; - !ISNUMBER( nOrient ) .OR. ; + !HB_ISNUMERIC( nOrient ) .OR. ; ( nOrient != SCROLL_VERTICAL .AND. nOrient != SCROLL_HORIZONTAL ) RETURN NIL ENDIF diff --git a/harbour/src/rtl/setfunc.prg b/harbour/src/rtl/setfunc.prg index 4c74a15438..60672c835c 100644 --- a/harbour/src/rtl/setfunc.prg +++ b/harbour/src/rtl/setfunc.prg @@ -51,7 +51,6 @@ */ #include "inkey.ch" -#include "common.ch" PROCEDURE __SetFunction( nFunctionKey, xKeySeq ) @@ -67,7 +66,7 @@ PROCEDURE __SetFunction( nFunctionKey, xKeySeq ) OTHERWISE ; nFunctionKey := -nFunctionKey + 1 ENDCASE - IF ISCHARACTER( xKeySeq ) + IF HB_ISSTRING( xKeySeq ) SetKey( nFunctionKey, {|| __Keyboard(), hb_KeyPut( xKeySeq ) } ) ELSE SetKey( nFunctionKey, NIL ) diff --git a/harbour/src/rtl/tbcolumn.prg b/harbour/src/rtl/tbcolumn.prg index b2bf2508d3..74840452c0 100644 --- a/harbour/src/rtl/tbcolumn.prg +++ b/harbour/src/rtl/tbcolumn.prg @@ -53,7 +53,6 @@ #include "hbclass.ch" -#include "common.ch" #include "tbrowse.ch" /* NOTE: In CA-Cl*pper TBCOLUMN class does not inherit from any other classes. */ @@ -199,7 +198,7 @@ METHOD setStyle( nStyle, lNewValue ) CLASS TBCOLUMN ASize( ::aSetStyle, nStyle ) ENDIF - IF ISLOGICAL( lNewValue ) + IF HB_ISLOGICAL( lNewValue ) ::aSetStyle[ nStyle ] := lNewValue ENDIF diff --git a/harbour/src/rtl/tbrowse.prg b/harbour/src/rtl/tbrowse.prg index 5ca51e97cb..d92531d0db 100644 --- a/harbour/src/rtl/tbrowse.prg +++ b/harbour/src/rtl/tbrowse.prg @@ -322,7 +322,7 @@ METHOD new( nTop, nLeft, nBottom, nRight ) CLASS TBROWSE STATIC FUNCTION _SKIP_RESULT( xResult ) - RETURN iif( ISNUMBER( xResult ), Int( xResult ), 0 ) + RETURN iif( HB_ISNUMERIC( xResult ), Int( xResult ), 0 ) STATIC PROCEDURE _DISP_FHSEP( nRow, nType, cColor, aColData ) @@ -525,16 +525,16 @@ METHOD colorRect( aRect, aColors ) CLASS TBROWSE LOCAL nCol := ::colCount /* CA-Cl*pper checks all this conditions */ - IF ISARRAY( aRect ) .AND. Len( aRect ) >= 4 .AND. ; - ISNUMBER( aRect[ 1 ] ) .AND. ISNUMBER( aRect[ 2 ] ) .AND. ; - ISNUMBER( aRect[ 3 ] ) .AND. ISNUMBER( aRect[ 4 ] ) .AND. ; + IF HB_ISARRAY( aRect ) .AND. Len( aRect ) >= 4 .AND. ; + HB_ISNUMERIC( aRect[ 1 ] ) .AND. HB_ISNUMERIC( aRect[ 2 ] ) .AND. ; + HB_ISNUMERIC( aRect[ 3 ] ) .AND. HB_ISNUMERIC( aRect[ 4 ] ) .AND. ; aRect[ 1 ] >= 1 .AND. aRect[ 1 ] <= nRow .AND. ; aRect[ 2 ] >= 1 .AND. aRect[ 2 ] <= nCol .AND. ; aRect[ 3 ] >= aRect[ 1 ] .AND. aRect[ 3 ] <= nRow .AND. ; aRect[ 4 ] >= aRect[ 2 ] .AND. aRect[ 4 ] <= nCol .AND. ; ; - ISARRAY( aColors ) .AND. Len( aColors ) >= 2 .AND. ; - ISNUMBER( aColors[ 1 ] ) .AND. ISNUMBER( aColors[ 2 ] ) .AND. ; + HB_ISARRAY( aColors ) .AND. Len( aColors ) >= 2 .AND. ; + HB_ISNUMERIC( aColors[ 1 ] ) .AND. HB_ISNUMERIC( aColors[ 2 ] ) .AND. ; ; /* in colorRect() index 0 is not supported */ aColors[ 1 ] >= 1 .AND. aColors[ 1 ] <= Len( ::aColors ) .AND. ; aColors[ 2 ] >= 1 .AND. aColors[ 2 ] <= Len( ::aColors ) @@ -640,7 +640,7 @@ METHOD readRecord( nRow ) CLASS TBROWSE cValue := Eval( oCol:block ) aColor := _CELLCOLORS( aCol, cValue, nColors ) IF ValType( cValue ) $ "CMNDTL" - cValue := PadR( Transform( cValue, iif( ISCHARACTER( oCol:picture ), oCol:picture, NIL ) ), aCol[ _TBCI_CELLWIDTH ] ) + cValue := PadR( Transform( cValue, iif( HB_ISSTRING( oCol:picture ), oCol:picture, NIL ) ), aCol[ _TBCI_CELLWIDTH ] ) ELSE cValue := Space( aCol[ _TBCI_CELLWIDTH ] ) ENDIF @@ -860,7 +860,7 @@ METHOD colorValue( nColorIndex ) CLASS TBROWSE ::doConfigure() ENDIF - IF ISNUMBER( nColorIndex ) + IF HB_ISNUMERIC( nColorIndex ) IF nColorIndex >= 1 .AND. nColorIndex <= Len( ::aColors ) RETURN ::aColors[ nColorIndex ] /* In CA-Cl*pper index 0 has special meaning - it's always N/N color */ @@ -945,10 +945,10 @@ STATIC FUNCTION _COLDEFCOLORS( aDefColorsIdx, nMaxColorIndex ) LOCAL nColorIndex LOCAL nPos - IF ISARRAY( aDefColorsIdx ) + IF HB_ISARRAY( aDefColorsIdx ) FOR nPos := 1 TO _TBC_CLR_MAX IF nPos <= Len( aDefColorsIdx ) .AND. ; - ISNUMBER( nColorIndex := aDefColorsIdx[ nPos ] ) .AND. ; + HB_ISNUMERIC( nColorIndex := aDefColorsIdx[ nPos ] ) .AND. ; ( nColorIndex := Int( nColorIndex ) ) >= 0 .AND. ; nColorIndex <= nMaxColorIndex @@ -974,11 +974,11 @@ STATIC FUNCTION _CELLCOLORS( aCol, xValue, nMaxColorIndex ) LOCAL nColorIndex LOCAL nPos, nMax - IF ISARRAY( xColor ) + IF HB_ISARRAY( xColor ) nMax := Min( Len( xColor ), 2 ) FOR nPos := 1 TO nMax nColorIndex := xColor[ nPos ] - IF ISNUMBER( nColorIndex ) + IF HB_ISNUMERIC( nColorIndex ) nColorIndex := Int( nColorIndex ) IF nColorIndex >= 0 .AND. nColorIndex <= nMaxColorIndex aColors[ nPos ] := nColorIndex @@ -1249,7 +1249,7 @@ METHOD configure( nMode ) CLASS TBROWSE * accessing [druzus] */ - IF !ISNUMBER( nMode ) .OR. nMode == 0 .OR. nMode > _TBR_CONF_ALL + IF !HB_ISNUMERIC( nMode ) .OR. nMode == 0 .OR. nMode > _TBR_CONF_ALL nMode := _TBR_CONF_ALL ENDIF ::nConfigure := HB_BITOR( ::nConfigure, nMode ) @@ -1293,22 +1293,22 @@ METHOD doConfigure() CLASS TBROWSE xValue := Eval( oCol:block ) cType := ValType( xValue ) nWidth := iif( cType $ "CMNDTL", ; - Len( Transform( xValue, iif( ISCHARACTER( oCol:picture ), oCol:picture, NIL ) ) ), 0 ) + Len( Transform( xValue, iif( HB_ISSTRING( oCol:picture ), oCol:picture, NIL ) ) ), 0 ) cColSep := oCol:colSep IF cColSep == NIL cColSep := ::cColSep ENDIF cHeadSep := oCol:headSep - IF !ISCHARACTER( cHeadSep ) .OR. cHeadSep == "" + IF !HB_ISSTRING( cHeadSep ) .OR. cHeadSep == "" cHeadSep := ::cHeadSep - IF !ISCHARACTER( cHeadSep ) + IF !HB_ISSTRING( cHeadSep ) cHeadSep := "" ENDIF ENDIF cFootSep := oCol:footSep - IF !ISCHARACTER( cFootSep ) .OR. cFootSep == "" + IF !HB_ISSTRING( cFootSep ) .OR. cFootSep == "" cFootSep := ::cFootSep - IF !ISCHARACTER( cFootSep ) + IF !HB_ISSTRING( cFootSep ) cFootSep := "" ENDIF ENDIF @@ -1500,7 +1500,7 @@ STATIC FUNCTION _DECODE_FH( cName, nHeight, nWidth ) LOCAL i nHeight := nWidth := 0 - IF ISCHARACTER( cName ) + IF HB_ISSTRING( cName ) IF Len( cName ) > 0 /* When last character of heading/footing is ';' then CA-Cl*pper @@ -1871,7 +1871,7 @@ METHOD colWidth( nColumn ) CLASS TBROWSE ::doConfigure() ENDIF - IF ISNUMBER( nColumn ) .AND. nColumn >= 1 .AND. nColumn <= ::colCount + IF HB_ISNUMERIC( nColumn ) .AND. nColumn >= 1 .AND. nColumn <= ::colCount RETURN ::aColData[ nColumn ][ _TBCI_COLWIDTH ] ENDIF @@ -1897,7 +1897,7 @@ METHOD freeze( nColumns ) CLASS TBROWSE ::doConfigure() ENDIF - IF ISNUMBER( nColumns ) + IF HB_ISNUMERIC( nColumns ) nCols := Int( nColumns ) IF _MAXFREEZE( nCols, ::aColData, _TBR_COORD( ::n_Right ) - _TBR_COORD( ::n_Left ) + 1 ) == nCols @@ -1957,7 +1957,7 @@ METHOD setRowPos( nRowPos ) CLASS TBROWSE LOCAL nRow LOCAL nRowCount := ::rowCount /* executes doConfigure internally */ - IF ISNUMBER( nRowPos ) + IF HB_ISNUMERIC( nRowPos ) nRow := Int( nRowPos ) ::nRowPos := iif( nRow > nRowCount, nRowCount, ; iif( nRow < 1, 1, nRow ) ) @@ -1988,7 +1988,7 @@ METHOD setColPos( nColPos ) CLASS TBROWSE ::doConfigure() ENDIF - IF ISNUMBER( nColPos ) + IF HB_ISNUMERIC( nColPos ) ::nColPos := nColPos ELSE ::nColPos := 0 @@ -2021,7 +2021,7 @@ METHOD setTopFlag( lTop ) CLASS TBROWSE ::doConfigure() ENDIF - IF !ISLOGICAL( lTop ) + IF !HB_ISLOGICAL( lTop ) RETURN .T. ENDIF @@ -2045,7 +2045,7 @@ METHOD setBottomFlag( lBottom ) CLASS TBROWSE ::doConfigure() ENDIF - IF !ISLOGICAL( lBottom ) + IF !HB_ISLOGICAL( lBottom ) RETURN .T. ENDIF @@ -2069,7 +2069,7 @@ METHOD setAutoLite( lAutoLite ) CLASS TBROWSE ::doConfigure() ENDIF - IF !ISLOGICAL( lAutoLite ) + IF !HB_ISLOGICAL( lAutoLite ) RETURN .T. ENDIF @@ -2093,7 +2093,7 @@ METHOD setStableFlag( lStable ) CLASS TBROWSE ::doConfigure() ENDIF - IF !ISLOGICAL( lStable ) + IF !HB_ISLOGICAL( lStable ) RETURN .T. ENDIF @@ -2390,7 +2390,7 @@ METHOD hitTest( mRow, mCol ) CLASS TBROWSE ::mRowPos := ::mColPos := 0 #endif - IF !ISNUMBER( mRow ) .OR. !ISNUMBER( mCol ) .OR. ; + IF !HB_ISNUMERIC( mRow ) .OR. !HB_ISNUMERIC( mCol ) .OR. ; mRow < ( nTop := _TBR_COORD( ::n_Top ) ) .OR. ; mRow > ( nBottom := _TBR_COORD( ::n_Bottom ) ) .OR. ; mCol < ( nLeft := _TBR_COORD( ::n_Left ) ) .OR. ; @@ -2641,11 +2641,11 @@ METHOD setKey( nKey, bBlock ) CLASS TBROWSE ENDIF IF ( nPos := AScan( ::keys, {| x | x[ _TBC_SETKEY_KEY ] == nKey } ) ) == 0 - IF ISBLOCK( bBlock ) + IF HB_ISBLOCK( bBlock ) AAdd( ::keys, { nKey, bBlock } ) ENDIF bReturn := bBlock - ELSEIF ISBLOCK( bBlock ) + ELSEIF HB_ISBLOCK( bBlock ) ::keys[ nPos ][ _TBC_SETKEY_BLOCK ] := bBlock bReturn := bBlock ELSEIF PCount() == 1 @@ -2676,7 +2676,7 @@ METHOD setStyle( nStyle, lNewValue ) CLASS TBROWSE ASize( ::styles, nStyle ) ENDIF - IF ISLOGICAL( lNewValue ) + IF HB_ISLOGICAL( lNewValue ) ::styles[ nStyle ] := lNewValue ENDIF diff --git a/harbour/src/rtl/tbrowsys.prg b/harbour/src/rtl/tbrowsys.prg index 917f457e45..7e5084147c 100644 --- a/harbour/src/rtl/tbrowsys.prg +++ b/harbour/src/rtl/tbrowsys.prg @@ -53,7 +53,6 @@ #ifdef HB_COMPAT_C53 #include "button.ch" -#include "common.ch" #include "tbrowse.ch" FUNCTION TApplyKey( nKey, oBrowse ) diff --git a/harbour/src/rtl/tclass.prg b/harbour/src/rtl/tclass.prg index ae3dee242e..342b211bf7 100644 --- a/harbour/src/rtl/tclass.prg +++ b/harbour/src/rtl/tclass.prg @@ -172,18 +172,18 @@ STATIC FUNCTION New( cClassName, xSuper, sClassFunc, lModuleFriendly ) DEFAULT lModuleFriendly TO .F. - IF hb_isSymbol( xSuper ) + IF HB_ISSYMBOL( xSuper ) ::asSuper := { xSuper } ELSEIF Empty( xSuper ) ::asSuper := {} - ELSEIF ISCHARACTER( xSuper ) + ELSEIF HB_ISSTRING( xSuper ) ::asSuper := { __DynsN2Sym( xSuper ) } - ELSEIF ISARRAY( xSuper ) + ELSEIF HB_ISARRAY( xSuper ) ::asSuper := {} FOR EACH i IN xSuper - IF hb_isSymbol( i ) + IF HB_ISSYMBOL( i ) AAdd( ::asSuper, i ) - ELSEIF ISCHARACTER( i ) .AND. ! Empty( i ) + ELSEIF HB_ISSTRING( i ) .AND. ! Empty( i ) AAdd( ::asSuper, __DynsN2Sym( i ) ) ENDIF NEXT @@ -340,7 +340,7 @@ STATIC PROCEDURE AddMultiData( cType, xInit, nScope, aData, lNoInit ) LOCAL data FOR EACH data IN aData - IF ISCHARACTER( data ) + IF HB_ISSTRING( data ) QSelf():AddData( data, xInit, cType, nScope, lNoInit ) ENDIF NEXT @@ -387,7 +387,7 @@ STATIC PROCEDURE AddMultiClsData( cType, xInit, nScope, aData, lNoInit ) LOCAL data FOR EACH data IN aData - IF ISCHARACTER( data ) + IF HB_ISSTRING( data ) QSelf():AddClassData( data, xInit, cType, nScope, lNoInit ) ENDIF NEXT @@ -430,9 +430,9 @@ STATIC PROCEDURE AddDelegate( xMethod, cDelegMsg, cObject, nScope ) LOCAL mth - IF ISCHARACTER( xMethod ) + IF HB_ISSTRING( xMethod ) AAdd( QSelf():aDelegates, { xMethod, cDelegMsg, cObject, nScope } ) - ELSEIF ISARRAY( xMethod ) + ELSEIF HB_ISARRAY( xMethod ) FOR EACH mth IN xMethod AAdd( QSelf():aDelegates, { mth, cDelegMsg, cObject, nScope } ) NEXT diff --git a/harbour/src/rtl/teditor.prg b/harbour/src/rtl/teditor.prg index 55cc891599..f2c6b492a2 100644 --- a/harbour/src/rtl/teditor.prg +++ b/harbour/src/rtl/teditor.prg @@ -54,7 +54,6 @@ #include "button.ch" #include "color.ch" -#include "common.ch" #include "error.ch" #include "fileio.ch" #include "inkey.ch" @@ -160,16 +159,16 @@ ENDCLASS METHOD Resize( nTop, nLeft, nBottom, nRight ) CLASS HBEditor // don't change coordinates not given - IF ! ISNUMBER( nTop ) + IF ! HB_ISNUMERIC( nTop ) nTop := ::nTop ENDIF - IF ! ISNUMBER( nLeft ) + IF ! HB_ISNUMERIC( nLeft ) nLeft := ::nLeft ENDIF - IF ! ISNUMBER( nBottom ) + IF ! HB_ISNUMERIC( nBottom ) nBottom := ::nBottom ENDIF - IF ! ISNUMBER( nRight ) + IF ! HB_ISNUMERIC( nRight ) nRight := ::nRight ENDIF @@ -659,7 +658,7 @@ METHOD MoveCursor( nKey ) CLASS HBEditor // Changes insert state and insertion / overstrike mode of editor METHOD InsertState( lInsState ) CLASS HBEditor - IF ISLOGICAL( lInsState ) + IF HB_ISLOGICAL( lInsState ) Set( _SET_INSERT, lInsState ) IF ::lEditAllow SetCursor( iif( lInsState, SC_INSERT, SC_NORMAL ) ) @@ -851,7 +850,7 @@ METHOD SetColor( cColorString ) CLASS HBEditor LOCAL cOldColor := ::cColorSpec - IF ISCHARACTER( cColorString ) + IF HB_ISSTRING( cColorString ) ::cColorSpec := cColorString ENDIF @@ -879,10 +878,10 @@ METHOD DeHilite() CLASS HBEditor METHOD SetPos( nRow, nCol ) CLASS HBEditor - IF ! ISNUMBER( nRow ) + IF ! HB_ISNUMERIC( nRow ) nRow := ::nPhysRow ENDIF - IF ! ISNUMBER( nCol ) + IF ! HB_ISNUMERIC( nCol ) nCol := ::nPhysCol ENDIF @@ -998,18 +997,18 @@ METHOD BrowseText( nPassedKey ) METHOD New( cString, nTop, nLeft, nBottom, nRight, lEditMode, nLineLength, nTabSize, nTextRow, nTextCol, nWndRow, nWndCol ) CLASS HBEditor - IF ! ISCHARACTER( cString ) ; cString := "" ; ENDIF - IF ! ISNUMBER( nTop ) ; nTop := 0 ; ENDIF - IF ! ISNUMBER( nLeft ) ; nLeft := 0 ; ENDIF - IF ! ISNUMBER( nBottom ) ; nBottom := MaxRow() ; ENDIF - IF ! ISNUMBER( nRight ) ; nRight := MaxCol() ; ENDIF - IF ! ISLOGICAL( lEditMode ) ; lEditMode := .T. ; ENDIF - IF ! ISNUMBER( nLineLength ) ; nLineLength := NIL ; ENDIF - IF ! ISNUMBER( nTabSize ) ; nTabSize := NIL ; ENDIF - IF ! ISNUMBER( nTextRow ) ; nTextRow := 1 ; ENDIF - IF ! ISNUMBER( nTextCol ) ; nTextCol := 0 ; ENDIF - IF ! ISNUMBER( nWndRow ) ; nWndRow := 0 ; ENDIF - IF ! ISNUMBER( nWndCol ) ; nWndCol := 0 ; ENDIF + IF ! HB_ISSTRING( cString ) ; cString := "" ; ENDIF + IF ! HB_ISNUMERIC( nTop ) ; nTop := 0 ; ENDIF + IF ! HB_ISNUMERIC( nLeft ) ; nLeft := 0 ; ENDIF + IF ! HB_ISNUMERIC( nBottom ) ; nBottom := MaxRow() ; ENDIF + IF ! HB_ISNUMERIC( nRight ) ; nRight := MaxCol() ; ENDIF + IF ! HB_ISLOGICAL( lEditMode ) ; lEditMode := .T. ; ENDIF + IF ! HB_ISNUMERIC( nLineLength ) ; nLineLength := NIL ; ENDIF + IF ! HB_ISNUMERIC( nTabSize ) ; nTabSize := NIL ; ENDIF + IF ! HB_ISNUMERIC( nTextRow ) ; nTextRow := 1 ; ENDIF + IF ! HB_ISNUMERIC( nTextCol ) ; nTextCol := 0 ; ENDIF + IF ! HB_ISNUMERIC( nWndRow ) ; nWndRow := 0 ; ENDIF + IF ! HB_ISNUMERIC( nWndCol ) ; nWndCol := 0 ; ENDIF ::aText := Text2Array( cString, nLineLength ) ::naTextLen := Len( ::aText ) @@ -1031,18 +1030,18 @@ METHOD New( cString, nTop, nLeft, nBottom, nRight, lEditMode, nLineLength, nTabS ::nNumCols := nRight - nLeft + 1 ::nNumRows := nBottom - nTop + 1 - IF ISLOGICAL( lEditMode ) + IF HB_ISLOGICAL( lEditMode ) ::lEditAllow := lEditMode ENDIF // is word wrap required? - IF ISNUMBER( nLineLength ) + IF HB_ISNUMERIC( nLineLength ) ::lWordWrap := .T. ::nWordWrapCol := nLineLength ENDIF // how many spaces for each tab? - IF ISNUMBER( nTabSize ) + IF HB_ISNUMERIC( nTabSize ) ::nTabWidth := nTabSize ENDIF diff --git a/harbour/src/rtl/tget.prg b/harbour/src/rtl/tget.prg index 22e464e529..7bb1682ce0 100644 --- a/harbour/src/rtl/tget.prg +++ b/harbour/src/rtl/tget.prg @@ -505,9 +505,9 @@ METHOD varPut( xValue ) CLASS GET LOCAL i LOCAL aValue - IF ISBLOCK( ::bBlock ) .AND. ValType( xValue ) $ "CNDTLU" + IF HB_ISBLOCK( ::bBlock ) .AND. ValType( xValue ) $ "CNDTLU" aSubs := ::xSubScript - IF ISARRAY( aSubs ) .AND. ! Empty( aSubs ) + IF HB_ISARRAY( aSubs ) .AND. ! Empty( aSubs ) nLen := Len( aSubs ) aValue := Eval( ::bBlock ) FOR i := 1 TO nLen - 1 @@ -536,9 +536,9 @@ METHOD varGet() CLASS GET LOCAL i LOCAL xValue - IF ISBLOCK( ::bBlock ) + IF HB_ISBLOCK( ::bBlock ) aSubs := ::xSubScript - IF ISARRAY( aSubs ) .AND. ! Empty( aSubs ) + IF HB_ISARRAY( aSubs ) .AND. ! Empty( aSubs ) nLen := Len( aSubs ) xValue := Eval( ::bBlock ) FOR i := 1 TO nLen @@ -907,7 +907,7 @@ METHOD setColorSpec( cColorSpec ) CLASS GET LOCAL nClrUns LOCAL nClrOth - IF ISCHARACTER( cColorSpec ) + IF HB_ISSTRING( cColorSpec ) #ifdef HB_COMPAT_C53 ::cColorSpec := hb_NToColor( nClrUns := Max( hb_ColorToN( hb_ColorIndex( cColorSpec, GET_CLR_UNSELECTED ) ), 0 ) ) +; @@ -951,7 +951,7 @@ METHOD setPos( nPos ) CLASS GET LOCAL tmp - IF ISNUMBER( nPos ) + IF HB_ISNUMERIC( nPos ) nPos := Int( nPos ) @@ -1019,7 +1019,7 @@ METHOD picture( cPicture ) CLASS GET ::cPicMask := "" ::lPicBlankZero := .F. - IF ISCHARACTER( cPicture ) + IF HB_ISSTRING( cPicture ) cNum := "" @@ -1242,7 +1242,7 @@ METHOD unTransform() CLASS GET cBuffer := ::cBuffer - IF ISCHARACTER( cBuffer ) .AND. ::cType != NIL + IF HB_ISSTRING( cBuffer ) .AND. ::cType != NIL SWITCH ::cType CASE "C" @@ -1470,7 +1470,7 @@ METHOD reform() CLASS GET METHOD hitTest( nMRow, nMCol ) CLASS GET - IF ISOBJECT( ::oControl ) + IF HB_ISOBJECT( ::oControl ) RETURN ::oControl:hitTest( nMRow, nMCol ) ELSE DO CASE @@ -1489,7 +1489,7 @@ METHOD hitTest( nMRow, nMCol ) CLASS GET METHOD control( oControl ) CLASS GET - IF PCount() == 1 .AND. ( oControl == NIL .OR. ISOBJECT( oControl ) ) + IF PCount() == 1 .AND. ( oControl == NIL .OR. HB_ISOBJECT( oControl ) ) ::oControl := oControl ENDIF @@ -1497,7 +1497,7 @@ METHOD control( oControl ) CLASS GET METHOD caption( cCaption ) CLASS GET - IF ISCHARACTER( cCaption ) + IF HB_ISSTRING( cCaption ) ::cCaption := cCaption ENDIF @@ -1505,7 +1505,7 @@ METHOD caption( cCaption ) CLASS GET METHOD capRow( nCapRow ) CLASS GET - IF ISNUMBER( nCapRow ) + IF HB_ISNUMERIC( nCapRow ) ::nCapRow := Int( nCapRow ) ENDIF @@ -1513,7 +1513,7 @@ METHOD capRow( nCapRow ) CLASS GET METHOD capCol( nCapCol ) CLASS GET - IF ISNUMBER( nCapCol ) + IF HB_ISNUMERIC( nCapCol ) ::nCapCol := Int( nCapCol ) ENDIF @@ -1521,7 +1521,7 @@ METHOD capCol( nCapCol ) CLASS GET METHOD message( cMessage ) CLASS GET - IF ISCHARACTER( cMessage ) + IF HB_ISSTRING( cMessage ) ::cMessage := cMessage ENDIF @@ -1825,7 +1825,7 @@ METHOD getChanged() CLASS GET METHOD setChanged( lChanged ) CLASS GET - IF ISLOGICAL( lChanged ) + IF HB_ISLOGICAL( lChanged ) RETURN iif( ::hasFocus, ::lChanged := lChanged, lChanged ) ENDIF @@ -1836,7 +1836,7 @@ METHOD getClear() CLASS GET METHOD setClear( lClear ) CLASS GET - IF ISLOGICAL( lClear ) + IF HB_ISLOGICAL( lClear ) RETURN iif( ::hasFocus, ::lClear := lClear, lClear ) ENDIF @@ -1847,7 +1847,7 @@ METHOD getMinus() CLASS GET METHOD setMinus( lMinus ) CLASS GET - IF ISLOGICAL( lMinus ) + IF HB_ISLOGICAL( lMinus ) RETURN iif( ::hasFocus, ::lMinus := lMinus, lMinus ) ENDIF @@ -1860,7 +1860,7 @@ METHOD getRow() CLASS GET RETURN ::nRow METHOD setRow( nRow ) CLASS GET - RETURN ::nRow := iif( ISNUMBER( nRow ), Int( nRow ), 0 ) + RETURN ::nRow := iif( HB_ISNUMERIC( nRow ), Int( nRow ), 0 ) /* NOTE: CA-Cl*pper has a bug where negative nCol value will be translated to 16bit unsigned int, so the behaviour will be different in this case. [vszakats] */ @@ -1869,7 +1869,7 @@ METHOD getCol() CLASS GET RETURN ::nCol METHOD setCol( nCol ) CLASS GET - RETURN ::nCol := iif( ISNUMBER( nCol ), Int( nCol ), 0 ) + RETURN ::nCol := iif( HB_ISNUMERIC( nCol ), Int( nCol ), 0 ) METHOD name( cName ) CLASS GET @@ -1934,7 +1934,7 @@ METHOD New( nRow, nCol, bVarBlock, cVarName, cPicture, cColorSpec ) CLASS GET DEFAULT nRow TO Row() DEFAULT nCol TO Col() + iif( Set( _SET_DELIMITERS ), 1, 0 ) DEFAULT cVarName TO "" - DEFAULT bVarBlock TO iif( ISCHARACTER( cVarName ), MemvarBlock( cVarName ), NIL ) + DEFAULT bVarBlock TO iif( HB_ISSTRING( cVarName ), MemvarBlock( cVarName ), NIL ) #ifdef HB_COMPAT_C53 DEFAULT cColorSpec TO hb_ColorIndex( SetColor(), CLR_UNSELECTED ) + "," +; hb_ColorIndex( SetColor(), CLR_ENHANCED ) + "," +; diff --git a/harbour/src/rtl/tgetlist.prg b/harbour/src/rtl/tgetlist.prg index 0d852b9ff1..b40633268d 100644 --- a/harbour/src/rtl/tgetlist.prg +++ b/harbour/src/rtl/tgetlist.prg @@ -177,13 +177,13 @@ METHOD ReadModal() CLASS HBGetList ::nReadProcLine := ProcLine( 2 ) #ifdef HB_COMPAT_C53 - ::nPos := ::Settle( iif( ISNUMBER( nPos ), nPos, 0 ), .T. ) + ::nPos := ::Settle( iif( HB_ISNUMERIC( nPos ), nPos, 0 ), .T. ) - IF ( lMsgFlag := ISNUMBER( nMsgRow ) .AND. ; - ISNUMBER( nMsgLeft ) .AND. ; - ISNUMBER( nMsgRight ) ) + IF ( lMsgFlag := HB_ISNUMERIC( nMsgRow ) .AND. ; + HB_ISNUMERIC( nMsgLeft ) .AND. ; + HB_ISNUMERIC( nMsgRight ) ) - IF !ISCHARACTER( cMsgColor ) + IF !HB_ISSTRING( cMsgColor ) cMsgColor := GetClrPair( SetColor(), 1 ) ENDIF @@ -207,13 +207,13 @@ METHOD ReadModal() CLASS HBGetList ::PostActiveGet() #ifdef HB_COMPAT_C53 - IF ISBLOCK( ::oGet:reader ) + IF HB_ISBLOCK( ::oGet:reader ) Eval( ::oGet:reader, ::oGet, Self, oMenu, aMsg ) ELSE ::Reader( oMenu, aMsg ) ENDIF #else - IF ISBLOCK( ::oGet:reader ) + IF HB_ISBLOCK( ::oGet:reader ) Eval( ::oGet:reader, ::oGet ) ELSE ::Reader() @@ -349,7 +349,7 @@ METHOD GetApplyKey( nKey, oGet, oMenu, aMsg ) CLASS HBGetList oGet:exitState := GE_SHORTCUT ::nNextGet := nHotItem ::nLastExitState := GE_SHORTCUT - ELSEIF !ISOBJECT( oMenu ) + ELSEIF !HB_ISOBJECT( oMenu ) ELSEIF ( nHotItem := oMenu:getAccel( nKey ) ) != 0 ::nMenuID := MenuModal( oMenu, nHotItem, aMsg[ MSGROW ], aMsg[ MSGLEFT ], aMsg[ MSGRIGHT ], aMsg[ MSGCOLOR ] ) nKey := 0 @@ -418,7 +418,7 @@ METHOD GetApplyKey( nKey, oGet, oMenu, aMsg ) CLASS HBGetList nMRow := MRow() nMCol := MCol() - IF !ISOBJECT( oMenu ) + IF !HB_ISOBJECT( oMenu ) nButton := 0 ELSEIF !( oMenu:ClassName() == "TOPBARMENU" ) nButton := 0 @@ -556,7 +556,7 @@ METHOD GetPreValidate( oGet, aMsg ) CLASS HBGetList lWhen := Eval( oGet:preBlock, oGet, aMsg ) - IF ! ISOBJECT( oGet:control ) .AND. ! lWhen + IF ! HB_ISOBJECT( oGet:control ) .AND. ! lWhen oGet:display() ENDIF @@ -616,7 +616,7 @@ METHOD GetPostValidate( oGet, aMsg ) CLASS HBGetList lUpdated := ::lUpdated - IF ISCHARACTER( oGet:buffer ) + IF HB_ISSTRING( oGet:buffer ) SetPos( oGet:row, oGet:col + Len( oGet:buffer ) ) ENDIF lValid := Eval( oGet:postBlock, oGet, aMsg ) @@ -657,7 +657,7 @@ METHOD GetDoSetKey( bKeyBlock, oGet ) CLASS HBGetList lSetKey := Eval( bKeyBlock, ::cReadProcName, ::nReadProcLine, ::ReadVar() ) - IF !ISLOGICAL( lSetKey ) + IF !HB_ISLOGICAL( lSetKey ) lSetKey := .T. ENDIF @@ -781,7 +781,7 @@ METHOD SetFormat( bFormat ) CLASS HBGetList LOCAL bSavFormat := ::bFormat - IF ISBLOCK( bFormat ) + IF HB_ISBLOCK( bFormat ) ::bFormat := bFormat ENDIF @@ -836,7 +836,7 @@ METHOD ReadVar( cNewVarName ) CLASS HBGetList LOCAL cOldName := ::cVarName - IF ISCHARACTER( cNewVarName ) + IF HB_ISSTRING( cNewVarName ) ::cVarName := cNewVarName ENDIF @@ -858,7 +858,7 @@ METHOD GUIReader( oGet, oMenu, aMsg ) CLASS HBGetList LOCAL oGUI - IF ISOBJECT( oGet:control ) .AND. ; + IF HB_ISOBJECT( oGet:control ) .AND. ; ::nLastExitState == GE_SHORTCUT .OR. ; ::nLastExitState == GE_MOUSEHIT .OR. ; ::GetPreValidate( oGet, aMsg ) @@ -911,7 +911,7 @@ METHOD GUIReader( oGet, oMenu, aMsg ) CLASS HBGetList ENDDO // De-activate the GET - IF oGUI:ClassName() $ "LISTBOX|RADIOGROUP" .AND. ISNUMBER( oGet:varGet() ) + IF oGUI:ClassName() $ "LISTBOX|RADIOGROUP" .AND. HB_ISNUMERIC( oGet:varGet() ) oGet:varPut( oGUI:value ) ELSE oGet:varPut( oGUI:buffer ) @@ -951,7 +951,7 @@ METHOD GUIApplyKey( oGet, oGUI, nKey, oMenu, aMsg ) CLASS HBGetList IF ( nHotItem := ::Accelerator( nKey, aMsg ) ) != 0 oGet:exitState := GE_SHORTCUT ::nNextGet := nHotItem - ELSEIF !ISOBJECT( oMenu ) + ELSEIF !HB_ISOBJECT( oMenu ) ELSEIF ( nHotItem := oMenu:getAccel( nKey ) ) != 0 ::nMenuID := MenuModal( oMenu, nHotItem, aMsg[ MSGROW ], aMsg[ MSGLEFT ], aMsg[ MSGRIGHT ], aMsg[ MSGCOLOR ] ) nKey := 0 @@ -974,7 +974,7 @@ METHOD GUIApplyKey( oGet, oGUI, nKey, oMenu, aMsg ) CLASS HBGetList ENDIF - IF ISNUMBER( oGet:varGet() ) + IF HB_ISNUMERIC( oGet:varGet() ) oGet:varPut( oGUI:Value ) ENDIF @@ -1014,7 +1014,7 @@ METHOD GUIApplyKey( oGet, oGUI, nKey, oMenu, aMsg ) CLASS HBGetList ENDIF - IF ISNUMBER( oGet:varGet() ) + IF HB_ISNUMERIC( oGet:varGet() ) oGet:varPut( oGUI:Value ) ENDIF @@ -1082,7 +1082,7 @@ METHOD GUIApplyKey( oGet, oGUI, nKey, oMenu, aMsg ) CLASS HBGetList nMRow := MRow() nMCol := MCol() - IF !ISOBJECT( oMenu ) + IF !HB_ISOBJECT( oMenu ) nButton := 0 ELSEIF !( oMenu:ClassName() == "TOPBARMENU" ) nButton := 0 @@ -1180,7 +1180,7 @@ METHOD GUIPostValidate( oGet, oGUI, aMsg ) CLASS HBGetList IF !( oGUI:ClassName() == "TBROWSE" ) xOldValue := oGet:varGet() - IF oGUI:ClassName() $ "LISTBOX|RADIOGROUP" .AND. ISNUMBER( oGet:varGet() ) + IF oGUI:ClassName() $ "LISTBOX|RADIOGROUP" .AND. HB_ISNUMERIC( oGet:varGet() ) xNewValue := oGUI:Value ELSE xNewValue := oGUI:Buffer @@ -1238,7 +1238,7 @@ METHOD TBApplyKey( oGet, oTB, nKey, oMenu, aMsg ) CLASS HBGetList IF ( nHotItem := ::Accelerator( nKey, aMsg ) ) != 0 oGet:exitState := GE_SHORTCUT ::nNextGet := nHotItem - ELSEIF !ISOBJECT( oMenu ) + ELSEIF !HB_ISOBJECT( oMenu ) ELSEIF ( nHotItem := oMenu:getAccel( nKey ) ) != 0 ::nMenuID := MenuModal( oMenu, nHotItem, aMsg[ MSGROW ], aMsg[ MSGLEFT ], aMsg[ MSGRIGHT ], aMsg[ MSGCOLOR ] ) nKey := 0 @@ -1292,7 +1292,7 @@ METHOD TBApplyKey( oGet, oTB, nKey, oMenu, aMsg ) CLASS HBGetList nMRow := MRow() nMCol := MCol() - IF !ISOBJECT( oMenu ) + IF !HB_ISOBJECT( oMenu ) nButton := 0 ELSEIF !( oMenu:ClassName() == "TOPBARMENU" ) nButton := 0 @@ -1327,7 +1327,7 @@ METHOD TBReader( oGet, oMenu, aMsg ) CLASS HBGetList // LOCAL oGUI := oGet:control // Read the GET if the WHEN condition is satisfied - IF ISOBJECT( oGet:control ) .AND. ; + IF HB_ISOBJECT( oGet:control ) .AND. ; ::nLastExitState == GE_SHORTCUT .OR. ; ::nLastExitState == GE_MOUSEHIT .OR. ; ::GetPreValidate( oGet, aMsg ) @@ -1440,7 +1440,7 @@ METHOD Accelerator( nKey, aMsg ) CLASS HBGetList oGet := ::aGetList[ nGet ] - IF ISOBJECT( oGet:control ) .AND. ; + IF HB_ISOBJECT( oGet:control ) .AND. ; !( oGet:Control:ClassName() == "TBROWSE" ) cCaption := oGet:control:caption @@ -1453,7 +1453,7 @@ METHOD Accelerator( nKey, aMsg ) CLASS HBGetList ELSEIF Lower( SubStr( cCaption, nHotPos + 1, 1 ) ) == cKey // Test the current GUI-GET or Get PostValidation: - lGUI := ISOBJECT( ::aGetList[ ::nPos ]:control ) + lGUI := HB_ISOBJECT( ::aGetList[ ::nPos ]:control ) IF lGUI .AND. !::GUIPostValidate( ::aGetList[ ::nPos ], ::aGetList[ ::nPos ]:control, aMsg ) RETURN 0 @@ -1464,7 +1464,7 @@ METHOD Accelerator( nKey, aMsg ) CLASS HBGetList ENDIF // Test the next GUI-GET or Get PreValidation: - lGUI := ISOBJECT( oGet:control ) + lGUI := HB_ISOBJECT( oGet:control ) IF lGUI .AND. !::GUIPreValidate( oGet, oGet:control, aMsg ) // RETURN 0 // Commented out. @@ -1506,7 +1506,7 @@ METHOD HitTest( nMRow, nMCol, aMsg ) CLASS HBGetList IF ::nNextGet != 0 // Changed. // Test the current GUI-GET or Get PostValidation: - lGUI := ISOBJECT( ::aGetList[ ::nPos ]:control ) + lGUI := HB_ISOBJECT( ::aGetList[ ::nPos ]:control ) IF lGUI .AND. !::GUIPostValidate( ::aGetList[ ::nPos ], ::aGetList[ ::nPos ]:control, aMsg ) @@ -1523,7 +1523,7 @@ METHOD HitTest( nMRow, nMCol, aMsg ) CLASS HBGetList ENDIF // Test the next GUI-GET or Get PreValidation: - lGUI := ISOBJECT( ::aGetList[ ::nNextGet ]:control ) + lGUI := HB_ISOBJECT( ::aGetList[ ::nNextGet ]:control ) IF lGUI .AND. !::GUIPreValidate( ::aGetList[ ::nNextGet ], ::aGetList[ ::nNextGet ]:control, aMsg ) @@ -1627,7 +1627,7 @@ METHOD ShowGetMsg( oGet, aMsg ) CLASS HBGetList DEFAULT oGet TO ::oGet - cMsg := iif( ISOBJECT( oGet:control ), oGet:control:message, oGet:message ) + cMsg := iif( HB_ISOBJECT( oGet:control ), oGet:control:message, oGet:message ) IF !Empty( cMsg ) lMOldState := MSetCursor( .F. ) @@ -1668,7 +1668,7 @@ METHOD New( GetList ) CLASS HBGetList ::aGetList := GetList - IF ISARRAY( GetList ) .AND. Len( GetList ) >= 1 + IF HB_ISARRAY( GetList ) .AND. Len( GetList ) >= 1 ::oGet := GetList[ 1 ] ENDIF diff --git a/harbour/src/rtl/tmenuitm.prg b/harbour/src/rtl/tmenuitm.prg index 8c8d7572eb..a577195eb2 100644 --- a/harbour/src/rtl/tmenuitm.prg +++ b/harbour/src/rtl/tmenuitm.prg @@ -53,7 +53,6 @@ #include "hbclass.ch" #include "button.ch" -#include "common.ch" /* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but it has all related variables and methods. */ @@ -121,7 +120,7 @@ METHOD checked( lChecked ) CLASS MENUITEM METHOD data( boData ) CLASS MENUITEM IF boData != NIL - IF ISBLOCK( boData ) + IF HB_ISBLOCK( boData ) ::boData := boData ELSE ::boData := __eInstVar53( Self, "DATA", boData, "O", 1001, {|| boData:ClassName() $ "POPUPMENU|HB_POPUPMENU" } ) @@ -171,17 +170,17 @@ METHOD style( cStyle ) CLASS MENUITEM RETURN ::cStyle METHOD isPopUp() CLASS MENUITEM - RETURN ISOBJECT( ::data ) .AND. ::data:ClassName() $ "POPUPMENU|HB_POPUPMENU" + RETURN HB_ISOBJECT( ::data ) .AND. ::data:ClassName() $ "POPUPMENU|HB_POPUPMENU" METHOD New( cCaption, boData, nShortcut, cMessage, nID ) CLASS MENUITEM - IF !ISNUMBER( nShortcut ) + IF !HB_ISNUMERIC( nShortcut ) nShortcut := 0 ENDIF - IF !ISCHARACTER( cMessage ) + IF !HB_ISSTRING( cMessage ) cMessage := "" ENDIF - IF !ISNUMBER( nID ) + IF !HB_ISNUMERIC( nID ) nID := 0 ENDIF @@ -200,9 +199,9 @@ FUNCTION MenuItem( cCaption, boData, nShortcut, cMessage, nID ) FUNCTION __miColumn( o, nColumn ) - IF ISOBJECT( o ) .AND. o:ClassName() == "MENUITEM" + IF HB_ISOBJECT( o ) .AND. o:ClassName() == "MENUITEM" - IF ISNUMBER( nColumn ) + IF HB_ISNUMERIC( nColumn ) o:__col := nColumn ENDIF @@ -213,9 +212,9 @@ FUNCTION __miColumn( o, nColumn ) FUNCTION __miRow( o, nRow ) - IF ISOBJECT( o ) .AND. o:ClassName() == "MENUITEM" + IF HB_ISOBJECT( o ) .AND. o:ClassName() == "MENUITEM" - IF ISNUMBER( nRow ) + IF HB_ISNUMERIC( nRow ) o:__row := nRow ENDIF diff --git a/harbour/src/rtl/tmenusys.prg b/harbour/src/rtl/tmenusys.prg index 34ba2c6d3f..b9fc6dde06 100644 --- a/harbour/src/rtl/tmenusys.prg +++ b/harbour/src/rtl/tmenusys.prg @@ -52,7 +52,6 @@ #include "hbclass.ch" -#include "common.ch" #include "getexit.ch" #include "inkey.ch" #include "setcurs.ch" @@ -134,11 +133,11 @@ METHOD Modal( nSelection, nMsgRow, nMsgLeft, nMsgRight, cMsgColor, GetList ) CLA ::nMsgRight := nMsgRight ::cMsgColor := cMsgColor - IF ( ::lMsgFlag := ISNUMBER( ::nMsgRow ) .AND. ; - ISNUMBER( ::nMsgLeft ) .AND. ; - ISNUMBER( ::nMsgRight ) ) + IF ( ::lMsgFlag := HB_ISNUMERIC( ::nMsgRow ) .AND. ; + HB_ISNUMERIC( ::nMsgLeft ) .AND. ; + HB_ISNUMERIC( ::nMsgRight ) ) - IF !ISCHARACTER( ::cMsgColor ) + IF !HB_ISSTRING( ::cMsgColor ) ::cMsgColor := GetClrPair( SetColor(), 1 ) ENDIF @@ -466,7 +465,7 @@ METHOD Modal( nSelection, nMsgRow, nMsgLeft, nMsgRight, cMsgColor, GetList ) CLA METHOD PushMenu() CLASS HBMenuSys LOCAL oNewMenu := ::oMenu:getItem( ::oMenu:current ) - IF ISOBJECT( oNewMenu ) .AND. oNewMenu:IsPopUp + IF HB_ISOBJECT( oNewMenu ) .AND. oNewMenu:IsPopUp ::oMenu := oNewMenu:data ::aMenuList[ ++::nMenuLevel ] := ::oMenu @@ -545,7 +544,7 @@ METHOD Execute() CLASS HBMenuSys LOCAL lPas := .T. // Execute the Data block if selected MenuItem is !IsPopUp: - IF ISOBJECT( oNewMenu ) .AND. !oNewMenu:IsPopUp + IF HB_ISOBJECT( oNewMenu ) .AND. !oNewMenu:IsPopUp IF ::oMenu:ClassName() $ "TOPBARMENU|POPUPMENU|HB_POPUPMENU" SetPos( ::nOldRow, ::nOldCol ) @@ -616,12 +615,12 @@ METHOD ShowMsg( lMode ) CLASS HBMenuSys LOCAL nCurrent LOCAL cMsg - IF ISLOGICAL( ::lOldMsgFlag ) .AND. ::lOldMsgFlag + IF HB_ISLOGICAL( ::lOldMsgFlag ) .AND. ::lOldMsgFlag RestScreen( ::nMsgRow, ::nMsgLeft, ::nMsgRow, ::nMsgRight, ::cMsgSaveS ) ENDIF IF lMode - IF !ISCHARACTER( ::cMsgColor ) + IF !HB_ISSTRING( ::cMsgColor ) ::cMsgColor := GetClrPair( SetColor(), 1 ) ENDIF diff --git a/harbour/src/rtl/tobject.prg b/harbour/src/rtl/tobject.prg index c3d37dbd0d..749fb6c7d7 100644 --- a/harbour/src/rtl/tobject.prg +++ b/harbour/src/rtl/tobject.prg @@ -71,7 +71,6 @@ /* WARNING: Can not use the preprocessor, otherwise it will auto inherit from itself. */ -#include "common.ch" #include "hboo.ch" #include "error.ch" @@ -173,7 +172,7 @@ STATIC FUNCTION HBObject_Dftonerror( ... ) STATIC FUNCTION HBObject_Error( cDesc, cClass, cMsg, nCode ) - IF ! ISNUMBER( nCode ) + IF ! HB_ISNUMERIC( nCode ) nCode := 1004 ENDIF diff --git a/harbour/src/rtl/tpersist.prg b/harbour/src/rtl/tpersist.prg index 2281beb940..cfd5d552fa 100644 --- a/harbour/src/rtl/tpersist.prg +++ b/harbour/src/rtl/tpersist.prg @@ -51,7 +51,6 @@ */ #include "hbclass.ch" -#include "common.ch" REQUEST ARRAY @@ -138,11 +137,11 @@ METHOD SaveToText( cObjectName, nIndent ) CLASS HBPersistent LOCAL cObject LOCAL cType - IF ! ISCHARACTER( cObjectName ) + IF ! HB_ISSTRING( cObjectName ) cObjectName := "o" + ::ClassName() ENDIF - IF ISNUMBER( nIndent ) + IF HB_ISNUMERIC( nIndent ) nIndent += 3 ELSE nIndent := 0 diff --git a/harbour/src/rtl/tpopup.prg b/harbour/src/rtl/tpopup.prg index 94bf4b0821..a21bb4d088 100644 --- a/harbour/src/rtl/tpopup.prg +++ b/harbour/src/rtl/tpopup.prg @@ -125,7 +125,7 @@ ENDCLASS METHOD addItem( oItem ) CLASS POPUPMENU - IF ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" + IF HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" AAdd( ::aItems, oItem ) ::nItemCount++ @@ -284,10 +284,9 @@ METHOD getAccel( xKey ) CLASS POPUPMENU LOCAL cKey LOCAL item - - IF ISCHARACTER( xKey ) + IF HB_ISSTRING( xKey ) cKey := xKey - ELSEIF ISNUMBER( xKey ) + ELSEIF HB_ISNUMERIC( xKey ) cKey := hb_KeyChar( xKey ) ELSE RETURN 0 @@ -431,7 +430,7 @@ METHOD hitTest( nMRow, nMCol ) CLASS POPUPMENU METHOD insItem( nPos, oItem ) CLASS POPUPMENU IF nPos >= 1 .AND. nPos <= ::nItemCount .AND. ; - ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" + HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" ASize( ::aItems, ++::nItemCount ) AIns( ::aItems, nPos ) @@ -505,7 +504,7 @@ METHOD select( nPos ) CLASS POPUPMENU METHOD setItem( nPos, oItem ) CLASS POPUPMENU IF nPos >= 1 .AND. nPos <= ::nItemCount .AND. ; - ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" + HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" ::aItems[ nPos ] := oItem ::nWidth := Max( __CapMetrics( oItem ), ::nWidth ) @@ -619,16 +618,16 @@ METHOD width() CLASS POPUPMENU METHOD New( nTop, nLeft, nBottom, nRight ) CLASS POPUPMENU LOCAL cColor - IF ISNUMBER( nTop ) + IF HB_ISNUMERIC( nTop ) ::nTop := nTop ENDIF - IF ISNUMBER( nLeft ) + IF HB_ISNUMERIC( nLeft ) ::nLeft := nLeft ENDIF - IF ISNUMBER( nBottom ) + IF HB_ISNUMERIC( nBottom ) ::nBottom := nBottom ENDIF - IF ISNUMBER( nRight ) + IF HB_ISNUMERIC( nRight ) ::nRight := nRight ENDIF diff --git a/harbour/src/rtl/ttopbar.prg b/harbour/src/rtl/ttopbar.prg index 1ccaf20899..b69acd439d 100644 --- a/harbour/src/rtl/ttopbar.prg +++ b/harbour/src/rtl/ttopbar.prg @@ -54,7 +54,6 @@ #include "button.ch" #include "color.ch" -#include "common.ch" #include "inkey.ch" /* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but @@ -108,7 +107,7 @@ ENDCLASS METHOD addItem( oItem ) CLASS TOPBARMENU - IF ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" + IF HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" ::nItemCount++ AAdd( ::aItems, oItem ) @@ -347,7 +346,7 @@ METHOD hitTest( nMRow, nMCol ) CLASS TOPBARMENU METHOD insItem( nPos, oItem ) CLASS TOPBARMENU IF nPos >= 1 .AND. nPos <= ::nItemCount .AND. ; - ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" + HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" ASize( ::aItems, ++::nItemCount ) AIns( ::aItems, nPos ) @@ -379,7 +378,7 @@ METHOD select( nPos ) CLASS TOPBARMENU METHOD setItem( nPos, oItem ) CLASS TOPBARMENU IF nPos >= 1 .AND. nPos <= ::nItemCount .AND. ; - ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" + HB_ISOBJECT( oItem ) .AND. oItem:ClassName() == "MENUITEM" ::aItems[ nPos ] := oItem @@ -434,9 +433,9 @@ METHOD New( nRow, nLeft, nRight ) CLASS TOPBARMENU LOCAL cColor - IF !ISNUMBER( nRow ) .OR. ; - !ISNUMBER( nLeft ) .OR. ; - !ISNUMBER( nRight ) + IF !HB_ISNUMERIC( nRow ) .OR. ; + !HB_ISNUMERIC( nLeft ) .OR. ; + !HB_ISNUMERIC( nRight ) RETURN NIL ENDIF diff --git a/harbour/src/rtl/typefile.prg b/harbour/src/rtl/typefile.prg index c869b9a4fc..5acdf78bd0 100644 --- a/harbour/src/rtl/typefile.prg +++ b/harbour/src/rtl/typefile.prg @@ -50,7 +50,6 @@ * */ -#include "common.ch" #include "error.ch" #include "fileio.ch" @@ -73,11 +72,11 @@ PROCEDURE __TypeFile( cFile, lPrint ) LOCAL aPath LOCAL i - IF ! ISLOGICAL( lPrint ) + IF ! HB_ISLOGICAL( lPrint ) lPrint := .F. ENDIF - IF ! ISCHARACTER( cFile ) + IF ! HB_ISSTRING( cFile ) oErr := ErrorNew() oErr:severity := ES_ERROR oErr:genCode := EG_ARG @@ -119,7 +118,7 @@ PROCEDURE __TypeFile( cFile, lPrint ) oErr:OsCode := FError() oErr:tries := ++nRetries xRecover := Eval( ErrorBlock(), oErr ) - IF ISLOGICAL( xRecover ) .AND. !xRecover /* user select "Default" */ + IF HB_ISLOGICAL( xRecover ) .AND. !xRecover /* user select "Default" */ RETURN ENDIF ENDDO diff --git a/harbour/tests/hbdoctst.prg b/harbour/tests/hbdoctst.prg index 1f4f68ce2e..6afe5234f2 100644 --- a/harbour/tests/hbdoctst.prg +++ b/harbour/tests/hbdoctst.prg @@ -10,7 +10,6 @@ * */ -#include "common.ch" #include "directry.ch" PROCEDURE Main( cRoot ) @@ -25,7 +24,7 @@ PROCEDURE Main( cRoot ) LOCAL aErrMsg LOCAL tmp - IF ! ISCHARACTER( cRoot ) + IF ! HB_ISSTRING( cRoot ) /* Detect Harbour root */ cRoot := "." + hb_ps() DO WHILE hb_DirExists( cRoot + ".." ) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index b79e250eda..cca8b87bca 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1738,7 +1738,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) hbmk[ _HBMK_cCOMP ] := aCOMPDET_EMBED[ tmp ][ _COMPDETE_cCOMP ] hbmk[ _HBMK_cCCPREFIX ] := aCOMPDET_EMBED[ tmp ][ _COMPDETE_cCCPREFIX ] hbmk[ _HBMK_cCCPATH ] := cPath_CompC - IF ISBLOCK( aCOMPDET_EMBED[ tmp ][ _COMPDETE_bSetup ] ) + IF HB_ISBLOCK( aCOMPDET_EMBED[ tmp ][ _COMPDETE_bSetup ] ) Eval( aCOMPDET_EMBED[ tmp ][ _COMPDETE_bSetup ], hbmk[ _HBMK_cPLAT ], hbmk[ _HBMK_cCOMP ], cPath_CompC ) ENDIF EXIT @@ -1769,7 +1769,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) ! Empty( cPath_CompC := Eval( aCOMPDET_EMBED[ tmp ][ _COMPDETE_bBlock ], aCOMPDET_EMBED[ tmp ][ _COMPDETE_cCCPREFIX ], aCOMPDET_EMBED[ tmp ][ _COMPDETE_cCCPATH ] ) ) hbmk[ _HBMK_cCCPATH ] := cPath_CompC hbmk[ _HBMK_cCCPREFIX ] := aCOMPDET_EMBED[ tmp ][ _COMPDETE_cCCPREFIX ] - IF ISBLOCK( aCOMPDET_EMBED[ tmp ][ _COMPDETE_bSetup ] ) + IF HB_ISBLOCK( aCOMPDET_EMBED[ tmp ][ _COMPDETE_bSetup ] ) Eval( aCOMPDET_EMBED[ tmp ][ _COMPDETE_bSetup ], hbmk[ _HBMK_cPLAT ], hbmk[ _HBMK_cCOMP ], cPath_CompC ) ENDIF EXIT @@ -5296,7 +5296,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) /* Creating implibs requested in dependency specification */ - IF ! hbmk[ _HBMK_lStopAfterInit ] .AND. hbmk[ _HBMK_lDEPIMPLIB ] .AND. ISBLOCK( bBlk_ImpLib ) + IF ! hbmk[ _HBMK_lStopAfterInit ] .AND. hbmk[ _HBMK_lDEPIMPLIB ] .AND. HB_ISBLOCK( bBlk_ImpLib ) FOR EACH tmp IN hbmk[ _HBMK_hDEP ] IF tmp[ _HBMKDEP_lFound ] .AND. ! Empty( tmp[ _HBMKDEP_aIMPLIBSRC ] ) DoIMPLIB( hbmk, bBlk_ImpLib, cLibLibPrefix, cLibLibExt, tmp[ _HBMKDEP_aIMPLIBSRC ], tmp[ _HBMKDEP_cIMPLIBDST ], "depimplib" ) @@ -7118,7 +7118,7 @@ STATIC FUNCTION DoIMPLIB( hbmk, bBlk_ImpLib, cLibLibPrefix, cLibLibExt, aIMPLIBS LOCAL aToDelete LOCAL lRetVal := .F. - IF ISBLOCK( bBlk_ImpLib ) + IF HB_ISBLOCK( bBlk_ImpLib ) IF ! Empty( aIMPLIBSRC ) aToDelete := {} nNotFound := 0 @@ -7192,7 +7192,7 @@ STATIC PROCEDURE DoInstCopy( hbmk ) nCopied := 0 /* files copied */ FOR EACH aInstFile IN hbmk[ _HBMK_aINSTFILE ] - IF ISARRAY( aInstFile[ _INST_cData ] ) + IF HB_ISARRAY( aInstFile[ _INST_cData ] ) cInstFile := aInstFile[ _INST_cData ][ 1 ] cLink := aInstFile[ _INST_cData ][ 2 ] ELSE @@ -7456,7 +7456,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, tTimeParent, lCMode, cBin_Com ListToArray( iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) ),; hbmk[ _HBMK_aOPTPRG ] } ) - IF ! hb_isString( tmp := hbmk2_hb_compileBuf( hbmk, "harbour", aCommand ) ) + IF ! HB_ISSTRING( tmp := hbmk2_hb_compileBuf( hbmk, "harbour", aCommand ) ) RETURN .F. ENDIF @@ -8566,7 +8566,7 @@ FUNCTION hbmk2_ArrayToList( array, cSeparator ) LOCAL cString := "" LOCAL tmp - IF ! hb_isString( cSeparator ) + IF ! HB_ISSTRING( cSeparator ) cSeparator := " " ENDIF @@ -8581,9 +8581,9 @@ FUNCTION hbmk2_ArrayToList( array, cSeparator ) STATIC FUNCTION ctx_to_hbmk( ctx ) LOCAL hbmk - IF hb_isHash( ctx ) .AND. s_cSecToken $ ctx + IF HB_ISHASH( ctx ) .AND. s_cSecToken $ ctx hbmk := ctx[ s_cSecToken ] - IF ISARRAY( hbmk ) .AND. Len( hbmk ) == _HBMK_MAX_ + IF HB_ISARRAY( hbmk ) .AND. Len( hbmk ) == _HBMK_MAX_ RETURN hbmk ENDIF ENDIF @@ -8626,7 +8626,7 @@ FUNCTION hbmk2_PathSepToTarget( ctx, ... ) FUNCTION hbmk2_AddInput_PRG( ctx, cFileName ) LOCAL hbmk := ctx_to_hbmk( ctx ) - IF hbmk != NIL .AND. hb_isString( cFileName ) + IF hbmk != NIL .AND. HB_ISSTRING( cFileName ) AAdd( hbmk[ _HBMK_aPRG ], PathSepToSelf( cFileName ) ) DEFAULT hbmk[ _HBMK_cFIRST ] TO PathSepToSelf( cFileName ) ENDIF @@ -8634,7 +8634,7 @@ FUNCTION hbmk2_AddInput_PRG( ctx, cFileName ) FUNCTION hbmk2_AddInput_C( ctx, cFileName ) LOCAL hbmk := ctx_to_hbmk( ctx ) - IF hbmk != NIL .AND. hb_isString( cFileName ) + IF hbmk != NIL .AND. HB_ISSTRING( cFileName ) AAdd( hbmk[ _HBMK_aC ], PathSepToSelf( cFileName ) ) DEFAULT hbmk[ _HBMK_cFIRST ] TO PathSepToSelf( cFileName ) ENDIF @@ -8642,7 +8642,7 @@ FUNCTION hbmk2_AddInput_C( ctx, cFileName ) FUNCTION hbmk2_AddInput_CPP( ctx, cFileName ) LOCAL hbmk := ctx_to_hbmk( ctx ) - IF hbmk != NIL .AND. hb_isString( cFileName ) + IF hbmk != NIL .AND. HB_ISSTRING( cFileName ) AAdd( hbmk[ _HBMK_aCPP ], PathSepToSelf( cFileName ) ) DEFAULT hbmk[ _HBMK_cFIRST ] TO PathSepToSelf( cFileName ) ENDIF @@ -8650,22 +8650,22 @@ FUNCTION hbmk2_AddInput_CPP( ctx, cFileName ) FUNCTION hbmk2_AddInput_RC( ctx, cFileName ) LOCAL hbmk := ctx_to_hbmk( ctx ) - IF hbmk != NIL .AND. hb_isString( cFileName ) + IF hbmk != NIL .AND. HB_ISSTRING( cFileName ) AAdd( hbmk[ _HBMK_aRESSRC ], PathSepToSelf( cFileName ) ) ENDIF RETURN NIL FUNCTION hbmk2_AddInput_OBJ( ctx, cFileName ) LOCAL hbmk := ctx_to_hbmk( ctx ) - IF hbmk != NIL .AND. hb_isString( cFileName ) + IF hbmk != NIL .AND. HB_ISSTRING( cFileName ) AAdd( hbmk[ _HBMK_aOBJUSER ], PathSepToSelf( cFileName ) ) ENDIF RETURN NIL FUNCTION hbmk2_AddInput_INSTFILE( ctx, cFileName, cGroup ) LOCAL hbmk := ctx_to_hbmk( ctx ) - IF hbmk != NIL .AND. hb_isString( cFileName ) - IF ! hb_isString( cGroup ) + IF hbmk != NIL .AND. HB_ISSTRING( cFileName ) + IF ! HB_ISSTRING( cGroup ) cGroup := "" ENDIF AAddNewINST( hbmk[ _HBMK_aINSTFILE ], { cGroup, PathSepToSelf( cFileName ) } ) @@ -8674,7 +8674,7 @@ FUNCTION hbmk2_AddInput_INSTFILE( ctx, cFileName, cGroup ) FUNCTION hbmk2_Register_Input_File_Extension( ctx, cExt ) LOCAL hbmk := ctx_to_hbmk( ctx ) - IF hbmk != NIL .AND. hb_isString( cExt ) + IF hbmk != NIL .AND. HB_ISSTRING( cExt ) IF ! Empty( cExt ) IF !( Left( cExt, 1 ) == "." ) cExt := "." + cExt @@ -8771,13 +8771,13 @@ STATIC FUNCTION hbmk_ErrorMessage( oError ) LOCAL cMessage := iif( oError:severity > ES_WARNING, "Error", "Warning" ) + " " /* add subsystem name if available */ - cMessage += iif( hb_isString( oError:subsystem ), oError:subsystem(), "???" ) + cMessage += iif( HB_ISSTRING( oError:subsystem ), oError:subsystem(), "???" ) /* add subsystem's error code if available */ - cMessage += "/" + iif( hb_isNumeric( oError:subCode ), hb_ntos( oError:subCode ), "???" ) + cMessage += "/" + iif( HB_ISNUMERIC( oError:subCode ), hb_ntos( oError:subCode ), "???" ) /* add error description if available */ - IF hb_isString( oError:description ) + IF HB_ISSTRING( oError:description ) cMessage += " " + oError:description ENDIF @@ -8836,7 +8836,7 @@ STATIC FUNCTION FindInPath( cFileName, cPath ) ENDIF ENDIF - IF ! hb_isString( cPath ) + IF ! HB_ISSTRING( cPath ) cPath := GetEnv( "PATH" ) ENDIF @@ -8975,7 +8975,7 @@ STATIC PROCEDURE DepTreeWorker( aList, aTree ) LOCAL xItem FOR EACH xItem IN aTree DESCEND - IF ISARRAY( xItem ) .AND. Len( xItem ) == 2 + IF HB_ISARRAY( xItem ) .AND. Len( xItem ) == 2 DepTreeWorker( aList, xItem[ 2 ] ) AAddNew( aList, xItem[ 1 ] ) ELSE @@ -9141,7 +9141,7 @@ STATIC FUNCTION PathSepToSelf( cFileName, nStart ) STATIC FUNCTION PathSepToTarget( hbmk, cFileName, nStart ) - IF ! hb_isNumeric( nStart ) + IF ! HB_ISNUMERIC( nStart ) nStart := 1 ENDIF @@ -9154,10 +9154,10 @@ STATIC FUNCTION PathSepToTarget( hbmk, cFileName, nStart ) STATIC FUNCTION FNameEscape( cFileName, nEscapeMode, nFNNotation ) LOCAL cDir, cName, cExt, cDrive - IF ! hb_isNumeric( nEscapeMode ) + IF ! HB_ISNUMERIC( nEscapeMode ) nEscapeMode := _ESC_NONE ENDIF - IF ! hb_isNumeric( nFNNotation ) + IF ! HB_ISNUMERIC( nFNNotation ) #if defined( __PLATFORM__WINDOWS ) .OR. ; defined( __PLATFORM__DOS ) .OR. ; defined( __PLATFORM__OS2 ) @@ -10185,7 +10185,7 @@ STATIC FUNCTION ArchCompFilter( hbmk, cItem, cFileName ) /* Evaluate filter */ BEGIN SEQUENCE WITH {| oError | Break( oError ) } bFilter := &( "{| hbmk, cFileName |" + cFilterHarb + "}" ) - IF hb_isLogical( xResult := Eval( bFilter, hbmk, cFileName ) ) .AND. xResult + IF HB_ISLOGICAL( xResult := Eval( bFilter, hbmk, cFileName ) ) .AND. xResult cRetVal := cItem ENDIF RECOVER @@ -10205,7 +10205,7 @@ STATIC FUNCTION MacroProc( hbmk, cString, cFileName, cMacroPrefix ) LOCAL nEnd LOCAL cMacro - LOCAL cStart := iif( hb_isString( cMacroPrefix ), cMacroPrefix, _MACRO_NORM_PREFIX ) + _MACRO_OPEN + LOCAL cStart := iif( HB_ISSTRING( cMacroPrefix ), cMacroPrefix, _MACRO_NORM_PREFIX ) + _MACRO_OPEN LOCAL cStdOut @@ -10318,9 +10318,9 @@ STATIC FUNCTION MacroGet( hbmk, cMacro, cFileName ) CASE "HB_FIRST" cMacro := hb_FNameName( hbmk[ _HBMK_cFIRST ] ) ; EXIT CASE "HB_OUTPUTDIR" - cMacro := iif( hb_isString( hbmk[ _HBMK_cPROGDIR ] ), hb_FNameDir( hbmk[ _HBMK_cPROGDIR ] ), "" ) ; EXIT + cMacro := iif( HB_ISSTRING( hbmk[ _HBMK_cPROGDIR ] ), hb_FNameDir( hbmk[ _HBMK_cPROGDIR ] ), "" ) ; EXIT CASE "HB_OUTPUTNAME" - cMacro := iif( hb_isString( hbmk[ _HBMK_cPROGNAME ] ), hb_FNameName( hbmk[ _HBMK_cPROGNAME ] ), "" ) ; EXIT + cMacro := iif( HB_ISSTRING( hbmk[ _HBMK_cPROGNAME ] ), hb_FNameName( hbmk[ _HBMK_cPROGNAME ] ), "" ) ; EXIT CASE "HB_LEVEL" cMacro := hb_ntos( hbmk[ _HBMK_nLevel ] ) ; EXIT OTHERWISE @@ -10338,7 +10338,7 @@ STATIC FUNCTION MacroGet( hbmk, cMacro, cFileName ) ENDIF ENDSWITCH - IF ! hb_isString( cMacro ) + IF ! HB_ISSTRING( cMacro ) cMacro := "" ENDIF @@ -10754,7 +10754,7 @@ STATIC FUNCTION rtlnk_process( hbmk, cCommands, cFileOut, aFileList, aLibList, ; cCommands := StrTran( StrTran( cCommands, Chr( 13 ) ), "//", "# " ) nMode := RTLNK_MODE_NONE - IF ! ISARRAY( aPrevFiles ) + IF ! HB_ISARRAY( aPrevFiles ) aPrevFiles := {} ENDIF FOR EACH cLine IN hb_ATokens( cCommands, Chr( 10 ) ) @@ -11068,7 +11068,7 @@ STATIC FUNCTION GenHBL( hbmk, aFiles, cFileOut, lEmpty ) LOCAL aTrans := LoadPOTFiles( hbmk, aFiles, NIL, .F. ) LOCAL lRetVal := .F. - IF ISARRAY( aTrans ) + IF HB_ISARRAY( aTrans ) pI18N := __i18n_hashTable( __i18n_potArrayToHash( aTrans, lEmpty ) ) cHBLBody := hb_i18n_SaveTable( pI18N ) IF hb_MemoWrit( cFileOut, cHBLBody ) @@ -12533,7 +12533,7 @@ STATIC FUNCTION __UnixParseLangCP( cString, /* @ */ cCP, /* @ */ cLang ) STATIC FUNCTION __CPUnixToCPStd( cCPUnix ) - IF hb_isString( cCPUnix ) + IF HB_ISSTRING( cCPUnix ) cCPUnix := StrTran( cCPUnix, "_" ) cCPUnix := StrTran( cCPUnix, "-" ) @@ -12581,7 +12581,7 @@ STATIC FUNCTION __CPUnixToCPStd( cCPUnix ) STATIC FUNCTION __CPWinToCPStd( nCPWin ) - IF hb_isNumeric( nCPWin ) + IF HB_ISNUMERIC( nCPWin ) SWITCH nCPWin CASE 437 ; RETURN "cp437" CASE 737 ; RETURN "cp737" @@ -12650,7 +12650,7 @@ STATIC FUNCTION __CPStdToHarbour( cCPStd, cCtryStd ) STATIC FUNCTION __CtryStdToCtry( cCtryStd ) LOCAL cCtryHb := Left( hb_cdpSelect(), 2 ) - IF hb_isString( cCtryStd ) + IF HB_ISSTRING( cCtryStd ) SWITCH Lower( cCtryStd ) CASE "af-za" ; EXIT CASE "af" ; EXIT