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

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

Browse Source 
* contrib/hbtpathy/telepath.prg
    * using hb_default() instead of rolling it manually

  * contrib/gtwvg/tests/wvgactivex.prg
  * contrib/gtwvg/tests/wvgmodal.prg
  * contrib/hbhttpd/core.prg
  * contrib/hbhttpd/log.prg
  * contrib/hbide/hbqreportsmanager.prg
  * contrib/hbide/hbqtoolbar.prg
  * contrib/hbide/idebrowse.prg
  * contrib/hbide/ideconsole.prg
  * contrib/hbide/idedict.prg
  * contrib/hbide/idedocks.prg
  * contrib/hbide/ideedit.prg
  * contrib/hbide/ideeditor.prg
  * contrib/hbide/idefindreplace.prg
  * contrib/hbide/ideharbourhelp.prg
  * contrib/hbide/idemisc.prg
  * contrib/hbide/ideprojmanager.prg
  * contrib/hbide/ideshortcuts.prg
  * contrib/hbide/idesources.prg
  * contrib/hbide/idestylesheets.prg
  * contrib/hbide/idethemes.prg
  * contrib/hbide/idetools.prg
  * contrib/hbide/ideuisrcmanager.prg
  * contrib/hbmagic/hbmagis.prg
  * contrib/hbmxml/tests/custom.prg
  * contrib/hbnetio/utils/hbnetio/netiomgm.prg
  * contrib/hbnetio/utils/hbnetio/netiosrv.prg
  * contrib/hbnf/menutonf.prg
  * contrib/hbnf/ontick.prg
  * contrib/hboslib/core.prg
  * contrib/hbqt/tests/cls_dbstruct.prg
  * contrib/hbqt/tests/demoqt.prg
  * contrib/hbxbp/tests/xbpqtc.prg
  * contrib/xhb/stream.prg
  * contrib/xhb/xhbole.prg
  * examples/hbxlsxml/xlsxml_s.prg
  * examples/hbxlsxml/xlsxml_y.prg
  * examples/hbxlsxml/xlsxml.prg
  * tests/parseini.prg
    * formatting HB_IS*() calls
    ! using HB_ISSTRING() instead of HB_ISCHAR() on .prg level

  * utils/hbmk2/hbmk2.prg
    ! minor typo on help screen
This commit is contained in:
Viktor Szakats
2012-06-11 19:09:28 +00:00
parent 907f90c6e2
commit 84f5afb216
41 changed files with 196 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
harbour/ChangeLog
View File

@@ -16,6 +16,54 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-06-11 21:06 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/hbtpathy/telepath.prg
* using hb_default() instead of rolling it manually
* contrib/gtwvg/tests/wvgactivex.prg
* contrib/gtwvg/tests/wvgmodal.prg
* contrib/hbhttpd/core.prg
* contrib/hbhttpd/log.prg
* contrib/hbide/hbqreportsmanager.prg
* contrib/hbide/hbqtoolbar.prg
* contrib/hbide/idebrowse.prg
* contrib/hbide/ideconsole.prg
* contrib/hbide/idedict.prg
* contrib/hbide/idedocks.prg
* contrib/hbide/ideedit.prg
* contrib/hbide/ideeditor.prg
* contrib/hbide/idefindreplace.prg
* contrib/hbide/ideharbourhelp.prg
* contrib/hbide/idemisc.prg
* contrib/hbide/ideprojmanager.prg
* contrib/hbide/ideshortcuts.prg
* contrib/hbide/idesources.prg
* contrib/hbide/idestylesheets.prg
* contrib/hbide/idethemes.prg
* contrib/hbide/idetools.prg
* contrib/hbide/ideuisrcmanager.prg
* contrib/hbmagic/hbmagis.prg
* contrib/hbmxml/tests/custom.prg
* contrib/hbnetio/utils/hbnetio/netiomgm.prg
* contrib/hbnetio/utils/hbnetio/netiosrv.prg
* contrib/hbnf/menutonf.prg
* contrib/hbnf/ontick.prg
* contrib/hboslib/core.prg
* contrib/hbqt/tests/cls_dbstruct.prg
* contrib/hbqt/tests/demoqt.prg
* contrib/hbxbp/tests/xbpqtc.prg
* contrib/xhb/stream.prg
* contrib/xhb/xhbole.prg
* examples/hbxlsxml/xlsxml_s.prg
* examples/hbxlsxml/xlsxml_y.prg
* examples/hbxlsxml/xlsxml.prg
* tests/parseini.prg
* formatting HB_IS*() calls
! using HB_ISSTRING() instead of HB_ISCHAR() on .prg level
* utils/hbmk2/hbmk2.prg
! minor typo on help screen
2012-06-11 17:35 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/hbplist
+ reenabled hbqt and dependencies. it should build now.

2
harbour/contrib/gtwvg/tests/wvgactivex.prg
View File

@@ -220,7 +220,7 @@ FUNCTION ExecuteActiveX( nActiveX, xParam )
#if 1
//--------------------------- Active-X ---------------------------\\
oCom := BuildActiveXControl( nActiveX, oDA )
if hb_isObject( oCom )
if HB_ISOBJECT( oCom )
oCrt:sendMessage( WM_SIZE, 0, 0 )
oCrt:show()
ExeActiveX( nActiveX, oCom, xParam )

2
harbour/contrib/gtwvg/tests/wvgmodal.prg
View File

@@ -298,7 +298,7 @@ FUNCTION CreateOCrt( nT, nL, nB, nR, cTitle, xIcon, lModal, lRowCols, lHidden, ;
oCrt:create()
SetCursor( 0 )
IF hb_isNumeric( xIcon )
IF HB_ISNUMERIC( xIcon )
hb_gtInfo( HB_GTI_ICONRES, xIcon )
ELSE
IF ( '.ico' $ lower( xIcon ) )

12
harbour/contrib/hbhttpd/core.prg
View File

@@ -985,7 +985,7 @@ STATIC FUNCTION GetErrorDesc( oErr )
ENDIF
IF !Empty( oErr:osCode ); cRet += "OS error: " + hb_ntos( oErr:osCode ) + hb_eol()
ENDIF
IF hb_isArray( oErr:args )
IF HB_ISARRAY( oErr:args )
cRet += "Arguments:" + hb_eol()
AEval( oErr:args, {| X, Y | cRet += Str( Y, 5 ) + ": " + HB_CStr( X ) + hb_eol() } )
ENDIF
@@ -1106,19 +1106,19 @@ STATIC FUNCTION cvt2str( xI, lLong )
cI := ""
IF __objHasMsg( xI, "ID" )
xJ := xI:ID
IF ! hb_isObject( xJ )
IF ! HB_ISOBJECT( xJ )
cI += ",ID=" + cvt2str( xJ )
ENDIF
ENDIF
IF __objHasMsg( xI, "nID" )
xJ := xI:nID
IF ! hb_isObject( xJ )
IF ! HB_ISOBJECT( xJ )
cI += ",NID=" + cvt2str( xJ )
ENDIF
ENDIF
IF __objHasMsg( xI, "xValue" )
xJ := xI:xValue
IF ! hb_isObject( xJ )
IF ! HB_ISOBJECT( xJ )
cI += ",XVALUE=" + cvt2str( xJ )
ENDIF
ENDIF
@@ -1368,7 +1368,7 @@ PROCEDURE UProcFiles( cFileName, lIndex )
LOCAL aDir, aF, nI, cI, tDate, tHDate
IF ! hb_isLogical( lIndex )
IF ! HB_ISLOGICAL( lIndex )
lIndex := .F.
ENDIF
@@ -1608,7 +1608,7 @@ STATIC FUNCTION parse_data( aData, aCode, hConfig )
EXIT
CASE "loop"
IF HB_HHasKey( aData, aInstr[2] ) .AND. hb_isArray( aValue := aData[aInstr[2]] )
IF HB_HHasKey( aData, aInstr[2] ) .AND. HB_ISARRAY( aValue := aData[aInstr[2]] )
FOR EACH xValue IN aValue
aData2 := HB_HCLONE( aData )
HB_HEVAL( xValue, {| k, v | aData2[aInstr[2] + "." + k] := v } )

4
harbour/contrib/hbhttpd/log.prg
View File

@@ -71,7 +71,7 @@ ENDCLASS
METHOD New( cFileName ) CLASS UHttpdLog
LOCAL cExt
IF hb_isString( cFileName )
IF HB_ISSTRING( cFileName )
IF Set( _SET_DEFEXTENSIONS )
hb_FNameSplit( cFileName, NIL, NIL, @cExt )
@@ -90,7 +90,7 @@ METHOD IsOpen() CLASS UHttpdLog
METHOD Add( cMsg ) CLASS UHttpdLog
IF ! hb_isString( cMsg )
IF ! HB_ISSTRING( cMsg )
RETURN .F.
ENDIF

34
harbour/contrib/hbide/hbqreportsmanager.prg
View File

@@ -1904,7 +1904,7 @@ METHOD HqrGraphicsItem:setTextFlags( ... )
CASE 0
EXIT
OTHERWISE
IF hb_isNumeric( a_[ 1 ] )
IF HB_ISNUMERIC( a_[ 1 ] )
::nTextFlags := a_[ 1 ]
ENDIF
::update()
@@ -1924,7 +1924,7 @@ METHOD HqrGraphicsItem:setPen( ... )
ENDIF
RETURN ::qPen
OTHERWISE
IF hb_isObject( a_[ 1 ] )
IF HB_ISOBJECT( a_[ 1 ] )
::qPen := a_[ 1 ]
ELSE
::qPen := QPen( ... )
@@ -1944,7 +1944,7 @@ METHOD HqrGraphicsItem:setBrush( ... )
ENDIF
EXIT
OTHERWISE
IF hb_isObject( a_[ 1 ] )
IF HB_ISOBJECT( a_[ 1 ] )
::qBrush := a_[ 1 ]
ELSE
::qBrush := QBrush( ... )
@@ -1965,7 +1965,7 @@ METHOD HqrGraphicsItem:setBackgroundBrush( ... )
ENDIF
EXIT
OTHERWISE
IF hb_isObject( a_[ 1 ] )
IF HB_ISOBJECT( a_[ 1 ] )
::qBgBrush := a_[ 1 ]
ELSE
::qBgBrush := QBrush( ... )
@@ -1989,7 +1989,7 @@ METHOD HqrGraphicsItem:setFont( ... )
ENDIF
EXIT
OTHERWISE
IF hb_isObject( a_[ 1 ] )
IF HB_ISOBJECT( a_[ 1 ] )
::qFont := a_[ 1 ]
ELSE
::qFont := QFont( ... )
@@ -2008,7 +2008,7 @@ METHOD HqrGraphicsItem:setBarcodeType( ... )
CASE 0
EXIT
OTHERWISE
IF hb_isNumeric( a_[ 1 ] )
IF HB_ISNUMERIC( a_[ 1 ] )
::nBarcodeType := a_[ 1 ]
ENDIF
::update()
@@ -2027,7 +2027,7 @@ METHOD HqrGraphicsItem:setGradient( ... )
ENDIF
EXIT
OTHERWISE
IF hb_isObject( a_[ 1 ] )
IF HB_ISOBJECT( a_[ 1 ] )
::qGBrush := a_[ 1 ]
ELSE
::qGBrush := QBrush( ... )
@@ -2048,7 +2048,7 @@ METHOD HqrGraphicsItem:setPixmap( ... )
ENDIF
EXIT
OTHERWISE
IF hb_isObject( a_[ 1 ] )
IF HB_ISOBJECT( a_[ 1 ] )
::qPixmap := a_[ 1 ]
ELSE
::qPixmap := QPixmap( ... )
@@ -2066,7 +2066,7 @@ METHOD HqrGraphicsItem:setBorderWidth( ... )
CASE 0
EXIT
OTHERWISE
IF hb_isNumeric( a_[ 1 ] )
IF HB_ISNUMERIC( a_[ 1 ] )
::nBorderWidth := a_[ 1 ]
ENDIF
::update()
@@ -2082,7 +2082,7 @@ METHOD HqrGraphicsItem:setWidth( ... )
CASE 0
RETURN ::oWidget:width()
OTHERWISE
IF hb_isNumeric( a_[ 1 ] )
IF HB_ISNUMERIC( a_[ 1 ] )
::nWidth := a_[ 1 ]
::oWidget:setWidth( ::nWidth )
ENDIF
@@ -2099,7 +2099,7 @@ METHOD HqrGraphicsItem:setHeight( ... )
CASE 0
RETURN ::oWidget:height()
OTHERWISE
IF hb_isNumeric( a_[ 1 ] )
IF HB_ISNUMERIC( a_[ 1 ] )
::nHeight := a_[ 1 ]
::oWidget:setHeight( ::nHeight )
ENDIF
@@ -2117,7 +2117,7 @@ METHOD HqrGraphicsItem:setGeometry( ... )
qPos := ::oWidget:pos()
RETURN QRectF( qPos:x(), qPos:y(), ::width(), ::height() )
CASE 1
IF hb_isObject( a_[ 1 ] )
IF HB_ISOBJECT( a_[ 1 ] )
qRectF := a_[ 1 ]
::oWidget:setPos( QPointF( qRectF:x(), qRectF:y() ) )
::oWidget:setWidth( qRectF:width() )
@@ -2142,7 +2142,7 @@ METHOD HqrGraphicsItem:setPos( ... )
CASE 0
RETURN ::oWidget:pos()
CASE 1
IF hb_isObject( a_[ 1 ] )
IF HB_ISOBJECT( a_[ 1 ] )
::oWidget:setPos( a_[ 1 ] )
::update()
ENDIF
@@ -2162,7 +2162,7 @@ METHOD HqrGraphicsItem:setLineStyle( ... )
CASE 0
EXIT
OTHERWISE
IF hb_isNumeric( a_[ 1 ] )
IF HB_ISNUMERIC( a_[ 1 ] )
::nLineStyle := a_[ 1 ]
ENDIF
::update()
@@ -2178,7 +2178,7 @@ METHOD HqrGraphicsItem:setBackgroundMode( ... )
CASE 0
EXIT
OTHERWISE
IF hb_isNumeric( a_[ 1 ] )
IF HB_ISNUMERIC( a_[ 1 ] )
::nBackgroundMode := a_[ 1 ]
ENDIF
::update()
@@ -2194,7 +2194,7 @@ METHOD HqrGraphicsItem:setOpacity( ... )
CASE 0
EXIT
OTHERWISE
IF hb_isNumeric( a_[ 1 ] )
IF HB_ISNUMERIC( a_[ 1 ] )
::nOpacity := a_[ 1 ]
ENDIF
::update()
@@ -2210,7 +2210,7 @@ METHOD HqrGraphicsItem:setLineType( ... )
CASE 0
EXIT
OTHERWISE
IF hb_isNumeric( a_[ 1 ] )
IF HB_ISNUMERIC( a_[ 1 ] )
::nLineType := a_[ 1 ]
ENDIF
::update()

6
harbour/contrib/hbide/hbqtoolbar.prg
View File

@@ -309,7 +309,7 @@ METHOD HbqToolbar:addToolButton( cName, cDesc, cImage, bAction, lCheckable, lDra
oButton:connect( QEvent_Enter , {|p| ::execEvent( "QEvent_MouseEnter" , p, cName ) } )
ENDIF
IF hb_isBlock( bAction )
IF HB_ISBLOCK( bAction )
oButton:connect( "clicked()", bAction )
ENDIF
oActBtn := ::oWidget:addWidget( oButton )
@@ -327,7 +327,7 @@ METHOD HbqToolbar:setItemChecked( cName, lState )
IF hb_hHasKey( ::hItems, cName )
IF ::hItems[ cName ]:isCheckable()
lOldState := ::hItems[ cName ]:isChecked()
IF hb_isLogical( lState )
IF HB_ISLOGICAL( lState )
::hItems[ cName ]:setChecked( lState )
ENDIF
ENDIF
@@ -342,7 +342,7 @@ METHOD HbqToolbar:setItemEnabled( cName, lEnabled )
IF hb_hHasKey( ::hItems, cName )
lOldEnabled := ::hItems[ cName ]:isEnabled()
IF hb_isLogical( lEnabled )
IF HB_ISLOGICAL( lEnabled )
::hItems[ cName ]:setEnabled( lEnabled )
ENDIF
ENDIF

10
harbour/contrib/hbide/idebrowse.prg
View File

@@ -376,7 +376,7 @@ METHOD IdeBrowseManager:getPanelsInfo()
aAttr[ TBL_INDEX ] := hb_ntos( oBrw:indexOrd() )
aAttr[ TBL_RECORD ] := hb_ntos( oBrw:recNo() )
aAttr[ TBL_CURSOR ] := hb_ntos( oBrw:nCursorType )
IF !hb_isObject( aSub[ SUB_GEOMETRY ] )
IF !HB_ISOBJECT( aSub[ SUB_GEOMETRY ] )
aSub[ SUB_GEOMETRY ] := aSub[ SUB_WINDOW ]:geometry()
ENDIF
aAttr[ TBL_GEOMETRY ] := hb_ntos( aSub[ SUB_GEOMETRY ]:x() ) + " " + hb_ntos( aSub[ SUB_GEOMETRY ]:y() ) + " " + ;
@@ -525,7 +525,7 @@ METHOD IdeBrowseManager:addPanel( cPanel )
METHOD IdeBrowseManager:addPanelsMenu( cPanel )
LOCAL qAct
IF hb_isObject( ::qPanelsMenu )
IF HB_ISOBJECT( ::qPanelsMenu )
qAct := ::qPanelsMenu:addAction( cPanel )
qAct:setIcon( QIcon( hbide_image( "panel_7" ) ) )
qAct:connect( "triggered(bool)", {|| ::setPanel( cPanel ) } )
@@ -962,7 +962,7 @@ METHOD IdeBrowseManager:loadTables()
ENDIF
NEXT
IF hb_isObject( oCurPanel )
IF HB_ISOBJECT( oCurPanel )
::qStack:setCurrentWidget( oCurPanel )
ENDIF
RETURN Self
@@ -1298,7 +1298,7 @@ METHOD IdeBrowsePanel:setViewStyle( nStyle )
LOCAL qObj, a_
LOCAL nOldStyle := ::nViewStyle
IF hb_isNumeric( nStyle )
IF HB_ISNUMERIC( nStyle )
IF nStyle != ::nViewStyle
IF ::nViewStyle == HBPMDI_STYLE_ORGANIZED
::saveGeometry()
@@ -1424,7 +1424,7 @@ METHOD IdeBrowsePanel:saveGeometry()
METHOD IdeBrowsePanel:restGeometry()
LOCAL a_
FOR EACH a_ IN ::aBrowsers
IF hb_isObject( a_[ SUB_GEOMETRY ] )
IF HB_ISOBJECT( a_[ SUB_GEOMETRY ] )
a_[ SUB_WINDOW ]:setGeometry( a_[ SUB_GEOMETRY ] )
ENDIF
NEXT

4
harbour/contrib/hbide/ideconsole.prg
View File

@@ -3197,7 +3197,7 @@ FUNCTION setGetAch( v_ )
LOCAL lCrt
THREAD STATIC sCrt := {}
lCrt := sCrt
IF hb_isArray( v_ )
IF HB_ISARRAY( v_ )
sCrt := v_
ENDIF
RETURN lCrt
@@ -5204,7 +5204,7 @@ FUNCTION hbide_setExitCuiEd( lYes )
LOCAL l_lYes
STATIC s_lYes := .f.
l_lYes := s_lYes
IF hb_isLogical( lYes )
IF HB_ISLOGICAL( lYes )
s_lYes := lYes
ENDIF
RETURN l_lYes

4
harbour/contrib/hbide/idedict.prg
View File

@@ -159,7 +159,7 @@ METHOD IdeDictionary:load( cDict )
LOCAL a_:= hb_aTokens( cDict, ";" )
LOCAL s, b_, n, n1, cKeyword, cSyntax, cDesc, q_
IF !empty( a_ ) .AND. hb_isArray( a_ )
IF !empty( a_ ) .AND. HB_ISARRAY( a_ )
asize( a_, DIC_NUM_VRBLS )
DEFAULT a_[ DIC_FILENAME ] TO ""
@@ -177,7 +177,7 @@ METHOD IdeDictionary:load( cDict )
IF !( ::cBgColor == "NONE" )
q_:= hbide_evalAsIs( ::cBgColor )
IF hb_isArray( q_ ) .AND. len( q_ ) == 3
IF HB_ISARRAY( q_ ) .AND. len( q_ ) == 3
::qBgColor := QColor( q_[ 1 ], q_[ 2 ], q_[ 3 ] )
ENDIF
HB_TRACE( HB_TR_DEBUG, ::cBgColor, valtype( q_ ) )

10
harbour/contrib/hbide/idedocks.prg
View File

@@ -254,7 +254,7 @@ METHOD IdeDocks:destroy()
IF !empty( ::oSys )
::oIde:oSys : disconnect( "activated(QSystemTrayIcon::ActivationReason)" )
IF hb_isObject( ::qAct1 )
IF HB_ISOBJECT( ::qAct1 )
::qAct1 : disconnect( "triggered(bool)" )
::qAct2 : disconnect( "triggered(bool)" )
ENDIF
@@ -322,11 +322,11 @@ METHOD IdeDocks:destroy()
qTmp := NIL
NEXT
IF hb_isObject( ::qMdiToolBar )
IF HB_ISOBJECT( ::qMdiToolBar )
::qMdiToolBar:destroy()
::qMdiToolBar := NIL
ENDIF
IF hb_isObject( ::qMdiToolBarL )
IF HB_ISOBJECT( ::qMdiToolBarL )
::qMdiToolBarL:destroy()
::qMdiToolBarL := NIL
ENDIF
@@ -992,7 +992,7 @@ METHOD IdeDocks:restPanelsGeometry()
LOCAL a_, n
FOR EACH a_ IN ::aViewsInfo
IF ( n := ascan( ::oIde:aMdies, {|o| o:objectName() == a_[ 1 ] } ) ) > 0
IF hb_isObject( a_[ 2 ] )
IF HB_ISOBJECT( a_[ 2 ] )
::oIde:aMdies[ n ]:setGeometry( a_[ 2 ] )
ENDIF
ENDIF
@@ -1719,7 +1719,7 @@ METHOD IdeDocks:buildStatusBar()
METHOD IdeDocks:setStatusText( nPart, xValue )
LOCAL oPanel
IF ! hb_isObject( ::oSBar )
IF ! HB_ISOBJECT( ::oSBar )
RETURN Self
ENDIF

14
harbour/contrib/hbide/ideedit.prg
View File

@@ -512,7 +512,7 @@ METHOD IdeEdit:execEvent( nMode, p, p1 )
::oUpDn:show()
::unHighlight()
IF hb_isObject( ::oEditor:qHiliter )
IF HB_ISOBJECT( ::oEditor:qHiliter )
::oEditor:qHiliter:hbSetEditor( ::qEdit )
::qEdit:hbSetHighlighter( ::oEditor:qHiliter )
::qEdit:hbHighlightPage()
@@ -764,7 +764,7 @@ METHOD IdeEdit:setFont()
METHOD IdeEdit:highlightPage()
IF hb_isObject( ::oEditor:qHiliter )
IF HB_ISOBJECT( ::oEditor:qHiliter )
::qEdit:hbHighlightPage()
ENDIF
@@ -789,7 +789,7 @@ STATIC FUNCTION hbide_blockContents( aContents )
STATIC contents := {}
oldContents := contents
IF hb_isArray( aContents )
IF HB_ISARRAY( aContents )
contents := aclone( aContents )
ENDIF
@@ -800,7 +800,7 @@ STATIC FUNCTION hbide_blockContents( aContents )
STATIC FUNCTION hbide_setQCursor( qEdit, q_ )
LOCAL qCursor
IF hb_isArray( q_ )
IF HB_ISARRAY( q_ )
qCursor := q_[ 1 ]
qCursor:movePosition( QTextCursor_Start, QTextCursor_MoveAnchor )
qCursor:movePosition( QTextCursor_Down , QTextCursor_MoveAnchor, q_[ 2 ] )
@@ -1593,7 +1593,7 @@ METHOD IdeEdit:setReadOnly( lReadOnly )
IF ::oEditor:lReadOnly
lReadOnly := .t.
ELSE
IF ! hb_isLogical( lReadOnly )
IF ! HB_ISLOGICAL( lReadOnly )
lReadOnly := ! ::qEdit:isReadOnly()
ENDIF
ENDIF
@@ -1666,12 +1666,12 @@ METHOD IdeEdit:find( cText, nPosFrom )
LOCAL qCursor := ::getCursor()
nPos := qCursor:position()
IF hb_isNumeric( nPosFrom )
IF HB_ISNUMERIC( nPosFrom )
qCursor:setPosition( nPosFrom )
ENDIF
::qEdit:setTextCursor( qCursor )
IF ! ( lFound := ::qEdit:find( cText, QTextDocument_FindCaseSensitively ) )
IF ! hb_isNumeric( nPosFrom )
IF ! HB_ISNUMERIC( nPosFrom )
lFound := ::qEdit:find( cText, QTextDocument_FindBackward + QTextDocument_FindCaseSensitively )
ENDIF
ENDIF

12
harbour/contrib/hbide/ideeditor.prg
View File

@@ -528,7 +528,7 @@ METHOD IdeEditsManager:getEditorCurrent()
METHOD IdeEditsManager:getEditorByIndex( nIndex ) /* Index is 0 based */
LOCAL qTab, a_
IF hb_isNumeric( nIndex ) .AND. nIndex >= 0 .AND. nIndex < ::qTabWidget:count()
IF HB_ISNUMERIC( nIndex ) .AND. nIndex >= 0 .AND. nIndex < ::qTabWidget:count()
qTab := ::qTabWidget:widget( nIndex )
FOR EACH a_ IN ::aTabs
IF !empty( a_[ TAB_OTAB ] ) .AND. hbqt_IsEqual( a_[ TAB_OTAB ]:oWidget, qTab )
@@ -544,7 +544,7 @@ METHOD IdeEditsManager:getEditorByIndex( nIndex ) /* Index is 0 based */
METHOD IdeEditsManager:getEditorByTabObject( oTab )
LOCAL nPos
IF hb_isObject( oTab )
IF HB_ISOBJECT( oTab )
IF ( nPos := ascan( ::aTabs, {|e_| e_[ TAB_OTAB ] == oTab } ) ) > 0
RETURN ::aTabs[ nPos, TAB_OEDITOR ]
ENDIF
@@ -556,7 +556,7 @@ METHOD IdeEditsManager:getEditorByTabObject( oTab )
METHOD IdeEditsManager:getEditorByTabPosition( nPos )
IF hb_isNumeric( nPos ) .AND. nPos > 0 .AND. nPos <= len( ::aTabs )
IF HB_ISNUMERIC( nPos ) .AND. nPos > 0 .AND. nPos <= len( ::aTabs )
IF !empty( ::aTabs[ nPos, TAB_OEDITOR ] )
RETURN ::aTabs[ nPos, TAB_OEDITOR ]
ENDIF
@@ -1465,7 +1465,7 @@ METHOD IdeEditor:relay( oEdit )
ENDIF
ENDIF
IF hb_isObject( oEdit )
IF HB_ISOBJECT( oEdit )
aadd( ::aEdits, oEdit )
ENDIF
@@ -1503,7 +1503,7 @@ METHOD IdeEditor:split( nOrient, oEditP )
::relay( oEdit )
IF hb_isObject( ::qHiliter )
IF HB_ISOBJECT( ::qHiliter )
oEdit:qEdit:hbSetHighLighter( ::qHiliter )
oEdit:qEdit:hbHighlightPage()
ENDIF
@@ -1646,7 +1646,7 @@ METHOD IdeEditor:setDocumentProperties()
QIcon( hbide_image( iif( ::lReadOnly, "tabreadonly", "tabunmodified" ) ) ) )
::lLoaded := .T.
IF hb_isObject( ::qHiliter )
IF HB_ISOBJECT( ::qHiliter )
::qHiliter:hbSetInitialized( .t. )
::qEdit:hbHighlightPage()
ENDIF

4
harbour/contrib/hbide/idefindreplace.prg
View File

@@ -199,7 +199,7 @@ METHOD IdeUpDown:execEvent( cEvent, p )
METHOD IdeUpDown:destroy()
IF hb_isObject( ::oUI )
IF HB_ISOBJECT( ::oUI )
::oUI:destroy()
ENDIF
@@ -287,7 +287,7 @@ METHOD IdeSearchReplace:create( oIde )
METHOD IdeSearchReplace:destroy()
IF hb_isObject( ::oUI )
IF HB_ISOBJECT( ::oUI )
::qFindLineEdit:disconnect( "textChanged(QString)" )
::qFindLineEdit:disconnect( "returnPressed()" )

10
harbour/contrib/hbide/ideharbourhelp.prg
View File

@@ -352,7 +352,7 @@ METHOD IdeHarbourHelp:clear()
NEXT
FOR EACH a_ IN ::aNodes
IF a_[ 2 ] == "Path"
IF hb_isObject( a_[ 3 ] )
IF HB_ISOBJECT( a_[ 3 ] )
// a_[ 3 ]:removeChild( a_[ 1 ] )
a_[ 3 ] := NIL
ENDIF
@@ -883,7 +883,7 @@ METHOD IdeHarbourHelp:populateIndex()
METHOD IdeHarbourHelp:pullDefinitions( acBuffer )
IF hb_isArray( acBuffer )
IF HB_ISARRAY( acBuffer )
RETURN doc2functions( __hbdoc_fromSource( hbide_arrayTOmemo( acBuffer ) ) )
ELSE
IF hb_fileExists( acBuffer )
@@ -1066,7 +1066,7 @@ METHOD IdeHarbourHelp:getFunctionPrototypes()
IF !( a_[ 5 ] == "D" )
aFn := ::pullDefinitions( cFolder + a_[ 1 ] )
FOR EACH oFunc IN aFn
IF hb_isObject( oFunc )
IF HB_ISOBJECT( oFunc )
IF !empty( oFunc:aSyntax )
IF "C Prototype" $ oFunc:aSyntax[ 1 ]
aadd( aProto, alltrim( oFunc:aSyntax[ len( oFunc:aSyntax ) ] ) )
@@ -1083,7 +1083,7 @@ METHOD IdeHarbourHelp:getFunctionPrototypes()
FOR EACH a_ IN aHbd
aFn := ::pullDefinitionsHBD( cRoot + a_[ 1 ] )
FOR EACH oFunc IN aFn
IF hb_isObject( oFunc )
IF HB_ISOBJECT( oFunc )
IF !empty( oFunc:aSyntax )
IF "C Prototype" $ oFunc:aSyntax[ 1 ]
aadd( aProto, alltrim( oFunc:aSyntax[ len( oFunc:aSyntax ) ] ) )
@@ -1164,7 +1164,7 @@ METHOD IdeHarbourHelp:populateTextFile( cTextFile )
aFn := ::aFuncByFile[ nParsed, 2 ]
IF len( aFn ) > 0
FOR EACH oFunc IN aFn
IF hb_isObject( oFunc )
IF HB_ISOBJECT( oFunc )
aadd( aHtm, ' <br>' + hbide_arrayToMemoHtml( oFunc:aSyntax ) + '</br>' )
ENDIF
NEXT

18
harbour/contrib/hbide/idemisc.prg
View File

@@ -128,16 +128,16 @@ FUNCTION hbide_setProjectTitle( cTitle )
FUNCTION hbide_execPopup( aPops, aqPos, qParent )
LOCAL i, qPop, qPoint, qAct, cAct, xRet, a_, qSub, b_, qSub_:={}, qAct_:={}
qPop := QMenu( iif( hb_isObject( qParent ), qParent, NIL ) )
qPop := QMenu( iif( HB_ISOBJECT( qParent ), qParent, NIL ) )
qPop:setStyleSheet( GetStyleSheet( "QMenuPop", hbide_setIde():nAnimantionMode ) )
FOR i := 1 TO len( aPops )
IF empty( aPops[ i,1 ] )
aadd( qAct_, qPop:addSeparator() )
ELSE
IF hb_isObject( aPops[ i, 1 ] )
IF HB_ISOBJECT( aPops[ i, 1 ] )
aadd( qAct_, qPop:addAction( aPops[ i, 1 ] ) )
ELSEIF hb_isArray( aPops[ i, 1 ] ) /* Sub-menu */
ELSEIF HB_ISARRAY( aPops[ i, 1 ] ) /* Sub-menu */
qSub := QMenu( qPop )
qSub:setStyleSheet( GetStyleSheet( "QMenuPop", hbide_setIde():nAnimantionMode ) )
FOR EACH a_ IN aPops[ i, 1 ]
@@ -152,21 +152,21 @@ FUNCTION hbide_execPopup( aPops, aqPos, qParent )
ENDIF
NEXT
IF hb_isArray( aqPos )
IF HB_ISARRAY( aqPos )
qPoint := QPoint( aqPos[ 1 ], aqPos[ 2 ] )
ELSEIF hb_isObject( aqPos )
ELSEIF HB_ISOBJECT( aqPos )
qPoint := aqPos
ENDIF
IF __objGetClsName( qAct := qPop:exec( qPoint ) ) == "QACTION"
IF valtype( cAct := qAct:text() ) == "C"
FOR EACH a_ IN aPops
IF hb_isObject( a_[ 1 ] )
IF HB_ISOBJECT( a_[ 1 ] )
IF a_[ 1 ]:text() == cAct
xRet := eval( aPops[ a_:__enumIndex(), 2 ] )
EXIT
ENDIF
ELSEIF hb_isArray( a_[ 1 ] )
ELSEIF HB_ISARRAY( a_[ 1 ] )
FOR EACH b_ IN a_[ 1 ]
IF b_[ 1 ] == cAct
xRet := eval( b_[ 2 ], cAct )
@@ -2010,7 +2010,7 @@ FUNCTION hbide_setClose( lYes )
LOCAL yes
STATIC sYes := .f.
yes := sYes
IF hb_isLogical( lYes )
IF HB_ISLOGICAL( lYes )
sYes := lYes
ENDIF
RETURN yes
@@ -2021,7 +2021,7 @@ FUNCTION hbide_setAdsAvailable( lYes )
LOCAL yes
STATIC sYes := .f.
yes := sYes
IF hb_isLogical( lYes )
IF HB_ISLOGICAL( lYes )
sYes := lYes
ENDIF
RETURN yes

6
harbour/contrib/hbide/ideprojmanager.prg
View File

@@ -154,7 +154,7 @@ CLASS IdeProject
METHOD IdeProject:new( oIDE, aProps )
LOCAL b_, a_, oSource, cSource
IF hb_isArray( aProps ) .AND. !empty( aProps )
IF HB_ISARRAY( aProps ) .AND. !empty( aProps )
::aProjProps := aProps
b_:= aProps
@@ -1325,7 +1325,7 @@ METHOD IdeProjManager:closeProject( cProjectTitle )
METHOD IdeProjManager:promptForPath( cObjPathName, cTitle, cObjFileName, cObjPath2, cObjPath3 )
LOCAL cTemp, cPath, cFile
IF hb_isObject( ::oProject )
IF HB_ISOBJECT( ::oProject )
cTemp := ::oUI:qObj[ cObjPathName ]:Text()
ELSE
cTemp := ""
@@ -1653,7 +1653,7 @@ METHOD IdeProjManager:finished( nExitCode, nExitStatus, oProcess )
ENDIF
ENDIF
IF hb_isObject( ::cargo )
IF HB_ISOBJECT( ::cargo )
cExe := hb_PathJoin( hbide_pathToOSPath( ::cargo:cPath ), cExe )
ELSE
cExe := hb_PathJoin( hbide_pathToOSPath( ::oProject:location ), cExe )

2
harbour/contrib/hbide/ideshortcuts.prg
View File

@@ -1155,7 +1155,7 @@ METHOD IdeShortcuts:help( cTopic )
RETURN ::oHelpDock:show()
/*----------------------------------------------------------------------*/
METHOD IdeShortcuts:exit( lWarn )
IF hb_isLogical( lWarn ) .AND. lWarn
IF HB_ISLOGICAL( lWarn ) .AND. lWarn
IF hbide_getYesNo( "Exit hbIDE ?", , "Macro Executed" )
PostAppEvent( xbeP_Close, NIL, NIL, ::oDlg )
ENDIF

2
harbour/contrib/hbide/idesources.prg
View File

@@ -138,7 +138,7 @@ METHOD IdeSourcesManager:saveNamedSource( cSource )
FOR EACH a_ IN ::aTabs
oEditor := a_[ TAB_OEDITOR ]
IF hb_isObject( oEditor )
IF HB_ISOBJECT( oEditor )
IF hb_FileMatch( hbide_pathNormalized( oEditor:sourceFile, .t. ), cSource )
IF oEditor:lLoaded
IF oEditor:qDocument:isModified()

4
harbour/contrib/hbide/idestylesheets.prg
View File

@@ -73,7 +73,7 @@ FUNCTION hbide_setAppTheme( aTheme )
LOCAL oTheme
STATIC sTheme
oTheme := sTheme
IF hb_isArray( aTheme )
IF HB_ISARRAY( aTheme )
sTheme := aTheme
ENDIF
RETURN oTheme
@@ -490,7 +490,7 @@ FUNCTION hbide_cssColorString( cPart )
/*----------------------------------------------------------------------*/
FUNCTION hbide_rgbString( nR, nG, nB )
IF hb_isArray( nR )
IF HB_ISARRAY( nR )
RETURN "rgb(" + hb_ntos( nR[ 1 ] ) + "," + hb_ntos( nR[ 2 ] ) + "," + hb_ntos( nR[ 3 ] ) + ")"
ELSE
RETURN "rgb(" + hb_ntos( nR ) + "," + hb_ntos( nG ) + "," + hb_ntos( nB ) + ")"

6
harbour/contrib/hbide/idethemes.prg
View File

@@ -1017,13 +1017,13 @@ STATIC FUNCTION hbide_setSyntaxAttrbs( qHiliter, cPattern, cName, nR, nG, nB, lI
qFormat := QTextCharFormat()
IF hb_isLogical( lItalic )
IF HB_ISLOGICAL( lItalic )
qFormat:setFontItalic( lItalic )
ENDIF
IF hb_isLogical( lBold ) .and. lBold
IF HB_ISLOGICAL( lBold ) .and. lBold
qFormat:setFontWeight( 1000 )
ENDIF
IF hb_isLogical( lUnderline )
IF HB_ISLOGICAL( lUnderline )
qFormat:setFontUnderline( lUnderline )
ENDIF
qFormat:setForeGround( QBrush( QColor( nR, nG, nB ) ) )

6
harbour/contrib/hbide/idetools.prg
View File

@@ -787,12 +787,12 @@ METHOD IdeToolsManager:execTool( ... )
cParams := iif( "http://" $ lower( cParams ), cParams, hbide_pathToOSPath( cParams ) )
cParams := hbide_parseMacros( cParams )
cStayIn := hbide_pathToOSPath( aParam[ 3 ] )
lCapture := iif( hb_isLogical( aParam[ 4 ] ), aParam[ 4 ], aParam[ 4 ] == "YES" )
lOpen := iif( hb_isLogical( aParam[ 5 ] ), aParam[ 5 ], aParam[ 5 ] == "YES" )
lCapture := iif( HB_ISLOGICAL( aParam[ 4 ] ), aParam[ 4 ], aParam[ 4 ] == "YES" )
lOpen := iif( HB_ISLOGICAL( aParam[ 5 ] ), aParam[ 5 ], aParam[ 5 ] == "YES" )
ENDIF
IF hb_isLogical( lCapture )
IF HB_ISLOGICAL( lCapture )
IF !empty( cPlugin )
a_:= hb_aTokens( cParams, " " )
FOR EACH cParams IN a_

6
harbour/contrib/hbide/ideuisrcmanager.prg
View File

@@ -578,7 +578,7 @@ METHOD IdeUISrcManager:clear()
::pHrb := NIL
ENDIF
IF hb_isObject( ::qMdiSub )
IF HB_ISOBJECT( ::qMdiSub )
::qMdiArea:removeSubWindow( ::qMdiSub )
::qMdiSub := NIL
ENDIF
@@ -687,7 +687,7 @@ METHOD IdeUISrcManager:buildWidget( cBuffer, cPath, cName, cExt, aPrg )
::cSrcFile := ::cPath + "cls_" + ::cName + ".prg"
::qU := eval( &( "{|q| " + "hbide_ui_" + cName + "( q ) }" ) )
IF hb_isObject( ::qU )
IF HB_ISOBJECT( ::qU )
::loadSource()
::qMdiSub := QMdiSubWindow()
@@ -1019,7 +1019,7 @@ METHOD IdeUISrcManager:buildClassSkeleton( cCls, cUiName )
aadd( aSrc, '' )
aadd( aSrc, 'METHOD ' + cClsC + 'destroy()' )
aadd( aSrc, '' )
aadd( aSrc, ' IF hb_isObject( ::oUI )' )
aadd( aSrc, ' IF HB_ISOBJECT( ::oUI )' )
aadd( aSrc, ' ::disconnects()' )
aadd( aSrc, ' ::oUI:destroy()' )
aadd( aSrc, ' ENDIF' )

2
harbour/contrib/hbmagic/hbmagis.prg
View File

@@ -56,7 +56,7 @@ FUNCTION hb_Magic_Simple( cFileName, nFlags )
LOCAL hMagic
IF ! hb_isNumeric( nFlags )
IF ! HB_ISNUMERIC( nFlags )
nFlags := MAGIC_MIME_TYPE
ENDIF

2
harbour/contrib/hbmxml/tests/custom.prg
View File

@@ -39,7 +39,7 @@ PROCEDURE main()
ENDIF
xData := mxmlGetCustom( node )
IF hb_isHash( xData ) .AND. hb_hHasKey( xData, "Today" )
IF HB_ISHASH( xData ) .AND. hb_hHasKey( xData, "Today" )
OutStd( xData[ "Today" ], hb_eol() )
ENDIF

6
harbour/contrib/hbnetio/utils/hbnetio/netiomgm.prg
View File

@@ -162,7 +162,7 @@ STATIC PROCEDURE hbnetiocon_IPPortSplit( cAddr, /* @ */ cIP, /* @ */ nPort )
/* TODO: To display event in separate screen area than cmd prompt. */
STATIC FUNCTION hbnetiocon_acceptStreamData( netiocli, xItem )
IF hb_isString( xItem )
IF HB_ISSTRING( xItem )
IF xItem == "__SHUTDOWN__"
hbnetiocon_dispevent( netiocli, "> message from server: Shutting down..." )
RETURN .F.
@@ -198,10 +198,10 @@ STATIC PROCEDURE hbnetiocon_waitStream( netiocli, bBlock ) /* in separate thread
IF netiocli[ _NETIOCLI_nStreamID ] != NIL
IF ( xList := netio_GetData( netiocli[ _NETIOCLI_nStreamID ] ) ) != NIL
IF hb_isArray( xList )
IF HB_ISARRAY( xList )
FOR EACH xItem IN xList
xRetVal := Eval( bBlock, netiocli[ _NETIOCLI_nStreamID ], xItem )
IF hb_isLogical( xRetVal ) .AND. ! xRetVal
IF HB_ISLOGICAL( xRetVal ) .AND. ! xRetVal
lExit := .T.
EXIT
ENDIF

16
harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
View File

@@ -330,7 +330,7 @@ STATIC FUNCTION netiosrv_ConfSave( netiosrv, netiomgm )
STATIC FUNCTION netiosrv_ConfLoad( netiosrv, netiomgm )
LOCAL hConf := hb_Deserialize( hb_MemoRead( netiosrv_ConfName() ) )
IF hb_isHash( hConf ) .AND. ;
IF HB_ISHASH( hConf ) .AND. ;
"__signature" $ hConf .AND. ;
hConf[ "__signature" ] == _NETIOSRV_SIGNATURE
@@ -520,7 +520,7 @@ STATIC FUNCTION netiomgm_rpc_regnotif( netiomgm, pConnSock, nStreamID, lRegister
RETURN iif( index $ netiomgm[ _NETIOSRV_hNotifStream ], netiomgm[ _NETIOSRV_hNotifStream ][ index ][ _CLI_xCargo ], NIL )
#endif
CASE 4
IF ! hb_isLogical( lRegister ) .OR. ! lRegister
IF ! HB_ISLOGICAL( lRegister ) .OR. ! lRegister
hb_mutexLock( netiomgm[ _NETIOSRV_mtxNotifStream ] )
IF index $ netiomgm[ _NETIOSRV_hNotifStream ]
hb_HDel( netiomgm[ _NETIOSRV_hNotifStream ], index )
@@ -545,7 +545,7 @@ STATIC FUNCTION netiomgm_rpc_regnotif( netiomgm, pConnSock, nStreamID, lRegister
STATIC FUNCTION netiomgm_rpc_setclientinfo( netiosrv, hInfo )
LOCAL nconn
IF hb_isHash( hInfo )
IF HB_ISHASH( hInfo )
hb_mutexLock( netiosrv[ _NETIOSRV_mtxConnection ] )
@@ -574,7 +574,7 @@ STATIC FUNCTION netiomgm_rpc_serverconfig( netiosrv, netiomgm )
STATIC FUNCTION netiomgm_rpc_logconn( netiosrv, lValue )
LOCAL lOldValue := netiosrv[ _NETIOSRV_lShowConn ]
IF hb_isLogical( lValue )
IF HB_ISLOGICAL( lValue )
netiosrv[ _NETIOSRV_lShowConn ] := lValue
ENDIF
@@ -583,7 +583,7 @@ STATIC FUNCTION netiomgm_rpc_logconn( netiosrv, lValue )
STATIC FUNCTION netiomgm_rpc_conn( netiosrv, lValue )
LOCAL lOldValue := netiosrv[ _NETIOSRV_lAcceptConn ]
IF hb_isLogical( lValue )
IF HB_ISLOGICAL( lValue )
netiosrv[ _NETIOSRV_lAcceptConn ] := lValue
ENDIF
@@ -593,7 +593,7 @@ STATIC FUNCTION netiomgm_rpc_stop( netiosrv, cIPPort )
LOCAL nconn
LOCAL aAddressPeer
IF hb_isString( cIPPort )
IF HB_ISSTRING( cIPPort )
cIPPort := Lower( cIPPort )
@@ -623,7 +623,7 @@ STATIC FUNCTION netiomgm_rpc_clientinfo( netiosrv, netiomgm, cIPPort )
LOCAL xCargo := NIL
LOCAL lDone
IF hb_isString( cIPPort )
IF HB_ISSTRING( cIPPort )
cIPPort := Lower( cIPPort )
@@ -777,7 +777,7 @@ STATIC FUNCTION ConnStatusStr( nStatus )
STATIC FUNCTION AddrToIPPort( aAddr )
LOCAL cIP
IF hb_isArray( aAddr ) .AND. ;
IF HB_ISARRAY( aAddr ) .AND. ;
( aAddr[ HB_SOCKET_ADINFO_FAMILY ] == HB_SOCKET_AF_INET .OR. ;
aAddr[ HB_SOCKET_ADINFO_FAMILY ] == HB_SOCKET_AF_INET6 )
cIP := aAddr[ HB_SOCKET_ADINFO_ADDRESS ] + ":" + hb_ntos( aAddr[ HB_SOCKET_ADINFO_PORT ] )

2
harbour/contrib/hbnf/menutonf.prg
View File

@@ -160,7 +160,7 @@ local lChoice := .F.
local nCursor := set( _SET_CURSOR,SC_NONE )
local nKey,bKey,nScan,lWrap,cScreen,nPrev
IF ! hb_isLogical( lCold )
IF ! HB_ISLOGICAL( lCold )
lCold := .F.
ENDIF

4
harbour/contrib/hbnf/ontick.prg
View File

@@ -66,9 +66,9 @@ STATIC PROCEDURE __FT_ONTICK()
PROCEDURE FT_ONTICK( bOnTick, nTickInterval )
IF hb_isBlock( bOnTick )
IF HB_ISBLOCK( bOnTick )
t_bOnTick := bOnTick
IF hb_isNumeric( nTickInterval )
IF HB_ISNUMERIC( nTickInterval )
t_nTickInterval := ( 1 / 18.20648 ) * nTickInterval * 1000
ENDIF
t_nLastCheck := hb_milliSeconds()

2
harbour/contrib/hboslib/core.prg
View File

@@ -88,7 +88,7 @@ FUNCTION OL_WinCBCopy()
RETURN hb_gtInfo( HB_GTI_CLIPBOARDDATA )
FUNCTION OL_WinCBPaste( cText )
IF hb_isString( cText )
IF HB_ISSTRING( cText )
hb_gtInfo( HB_GTI_CLIPBOARDDATA, cText )
RETURN .T.
ENDIF

2
harbour/contrib/hbqt/tests/cls_dbstruct.prg
View File

@@ -63,7 +63,7 @@ METHOD ui_dbstruct:create( oParent )
METHOD ui_dbstruct:destroy()
IF hb_isObject( ::oUI )
IF HB_ISOBJECT( ::oUI )
::disconnects()
::oUI:destroy()
ENDIF

8
harbour/contrib/hbqt/tests/demoqt.prg
View File

@@ -135,9 +135,9 @@ FUNCTION xReleaseMemory( aObj )
#if 0
LOCAL i
FOR i := 1 TO len( aObj )
IF hb_isObject( aObj[ i ] )
IF HB_ISOBJECT( aObj[ i ] )
aObj[ i ] := NIL
ELSEIF hb_isArray( aObj[ i ] )
ELSEIF HB_ISARRAY( aObj[ i ] )
xReleaseMemory( aObj[ i ] )
ENDIF
NEXT
@@ -322,7 +322,7 @@ STATIC FUNCTION Build_PushButton( oWnd, aPos, aSize, cLabel, cMsg, lExit )
oBtn:move( aPos[ 1 ],aPos[ 2 ] )
oBtn:resize( aSize[ 1 ],aSize[ 2 ] )
oBtn:show()
IF hb_isLogical( lExit )
IF HB_ISLOGICAL( lExit )
oBtn:connect( "clicked()", {|| lExit := .t. } )
ELSE
oBtn:connect( "clicked()", {|| MsgInfo( cMsg ), lExit := .t. } )
@@ -674,7 +674,7 @@ STATIC FUNCTION SetButtonColor( qClr )
s_clr := QColor( 220,100,12 )
ENDIF
l_clr := s_clr
IF hb_isObject( qClr )
IF HB_ISOBJECT( qClr )
s_clr := qClr
ENDIF
RETURN l_clr

74
harbour/contrib/hbtpathy/telepath.prg
View File

@@ -80,9 +80,7 @@ THREAD STATIC t_nErrorCode := 0 // Error code from last operation, 0 if no
FUNCTION tp_baud( nPort, nNewBaud )
IF ! HB_ISNUMERIC( nNewBaud )
nNewBaud := 0
ENDIF
hb_default( @nNewBaud, 0 )
IF ! isport( nPort ) .OR. Empty( t_aPorts[ nPort, TPFP_NAME ] )
RETURN TE_NOPORT
@@ -114,9 +112,7 @@ FUNCTION tp_idle( lNewval )
PROCEDURE tp_delay( nTime )
IF ! HB_ISNUMERIC( nTime )
nTime := 0
ENDIF
hb_default( @nTime, 0 )
IF nTime < 0
RETURN
@@ -130,9 +126,7 @@ PROCEDURE tp_delay( nTime )
FUNCTION tp_close( nPort, nTimeout )
IF ! HB_ISNUMERIC( nTimeout )
nTimeout := 0
ENDIF
hb_default( @nTimeout, 0 )
/* Clipper returns 0 even if a port is not open */
IF ! isopenport( nPort )
@@ -179,24 +173,13 @@ FUNCTION tp_open( nPort, nInSize, nOutSize, nBaud, nData, cParity, nStop, cPortn
RETURN TE_NOPORT
ENDIF
IF ! HB_ISNUMERIC( nInSize )
nInSize := 1536
ENDIF
IF ! HB_ISNUMERIC( nOutSize )
nOutSize := 1536
ENDIF
IF ! HB_ISNUMERIC( nBaud )
nBaud := 1200
ENDIF
IF ! HB_ISNUMERIC( nData )
nData := 8
ENDIF
IF ! HB_ISSTRING( cParity )
cParity := "N"
ENDIF
IF ! HB_ISNUMERIC( nStop )
nStop := 1
ENDIF
hb_default( @nInSize, 1536 )
hb_default( @nOutSize, 1536 )
hb_default( @nBaud, 1200 )
hb_default( @nData, 8 )
hb_default( @cParity, "N" )
hb_default( @nStop, 1 )
IF HB_ISSTRING( cPortname )
hb_comSetDevice( nPort, cPortname )
ENDIF
@@ -244,9 +227,7 @@ FUNCTION tp_recv( nPort, nLength, nTimeout )
IF ! HB_ISNUMERIC( nLength )
nLength := t_aPorts[ nPort, TPFP_INBUF_SIZE ]
ENDIF
IF ! HB_ISNUMERIC( nTimeout )
nTimeout := 0
ENDIF
hb_default( @nTimeout, 0 )
FetchChars( nPort )
@@ -274,12 +255,9 @@ FUNCTION tp_recv( nPort, nLength, nTimeout )
FUNCTION tp_send( nPort, cString, nTimeout )
IF ! HB_ISSTRING( cString )
cString := ""
ENDIF
IF ! HB_ISNUMERIC( nTimeout )
nTimeout := 0
ENDIF
hb_default( @cString, "" )
hb_default( @nTimeout, 0 )
IF ! isopenport( nPort )
RETURN 0
ENDIF
@@ -292,9 +270,7 @@ FUNCTION tp_send( nPort, cString, nTimeout )
FUNCTION tp_sendsub( nPort, cString, nStart, nLength, nTimeout )
IF ! HB_ISNUMERIC( nStart )
nStart := 1
ENDIF
hb_default( @nStart, 1 )
IF ! HB_ISNUMERIC( nLength )
nLength := Len( cString )
ENDIF
@@ -317,12 +293,8 @@ FUNCTION tp_recvto( nPort, cDelim, nMaxlen, nTimeout )
RETURN ""
ENDIF
IF ! HB_ISNUMERIC( nMaxlen )
nMaxlen := 64999 /* dos telepathy def. on xharbour could be higher */
ENDIF
IF ! HB_ISNUMERIC( nTimeout )
nTimeout := 0
ENDIF
hb_default( @nMaxLen, 64999 ) /* dos telepathy def. on xharbour could be higher */
hb_default( @nTimeout, 0 )
FetchChars( nPort )
@@ -468,12 +440,8 @@ FUNCTION tp_waitfor( ... )
RETURN 0
ENDIF
// IF ! HB_ISNUMERIC( nTimeout )
// nTimeout := -1
// ENDIF
// IF ! HB_ISLOGICAL( lIgnorecase )
// lIgnorecase := .F.
// ENDIF
// hb_default( @nTimeout, -1 )
// hb_default( @lIgnorecase, .F. )
/*
@@ -631,9 +599,7 @@ FUNCTION tp_flush( nPort, nTimeout )
LOCAL nDone
IF ! HB_ISNUMERIC( nTimeout )
nTimeout := -1
ENDIF
hb_default( @nTimeout, -1 )
IF ! isopenport( nPort )
RETURN TE_CLOSED

2
harbour/contrib/hbxbp/tests/xbpqtc.prg
View File

@@ -123,7 +123,7 @@ PROCEDURE BuildADialog()
IF ( nEvent == xbeP_Close ) .OR. ( nEvent == xbeP_Keyboard .and. mp1 == xbeK_ESC )
EXIT
ENDIF
HB_TRACE( HB_TR_DEBUG, nEvent, valtype( oXbp ), iif( hb_isObject( oXbp ), oXbp:title, "Nothing" ) )
HB_TRACE( HB_TR_DEBUG, nEvent, valtype( oXbp ), iif( HB_ISOBJECT( oXbp ), oXbp:title, "Nothing" ) )
oXbp:handleEvent( nEvent, mp1, mp2 )
ENDDO

2
harbour/contrib/xhb/stream.prg
View File

@@ -173,7 +173,7 @@ METHOD Read( sBuffer, nOffset, nCount ) CLASS TStreamFileReader
LOCAL nRead
/*
IF ! HB_IsByRef( @sBuffer )
IF ! HB_ISBYREF( @sBuffer )
Throw( xhb_ErrorNew( "Stream", 0, 1002, ProcName(), "Buffer not BYREF.", HB_aParams() ) )
ENDIF
*/

6
harbour/contrib/xhb/xhbole.prg
View File

@@ -176,7 +176,7 @@ METHOD hObj( xOle ) CLASS TOLEAUTO
METHOD New( xOle, cClass, cLicense ) CLASS TOLEAUTO
LOCAL hOle
IF HB_ISCHAR( xOle )
IF HB_ISSTRING( xOle )
hOle := __OleCreateObject( xOle,, cLicense )
IF ! Empty( hOle )
::__hObj := hOle
@@ -188,7 +188,7 @@ METHOD New( xOle, cClass, cLicense ) CLASS TOLEAUTO
::hObj := xOle
IF ::__hObj == NIL
RETURN Throw( s_oleError( 0, "Invalid argument to contructor!" ) )
ELSEIF HB_ISCHAR( cClass )
ELSEIF HB_ISSTRING( cClass )
::cClassName := cClass
ELSE
::cClassName := hb_ntos( win_P2N( ::__hObj ) )
@@ -197,7 +197,7 @@ METHOD New( xOle, cClass, cLicense ) CLASS TOLEAUTO
RETURN Self
METHOD GetActiveObject( cClass ) CLASS TOLEAUTO
IF HB_ISCHAR( cClass )
IF HB_ISSTRING( cClass )
IF ! Empty( ::__hObj := __OleGetActiveObject( cClass ) )
::cClassName := cClass
ELSE

10
harbour/examples/hbxlsxml/xlsxml.prg
View File

@@ -339,7 +339,7 @@ METHOD ExcelWriterXML:writeData( target )
METHOD ExcelWriterXML:docTitle( title )
IF hb_isChar( title )
IF HB_ISSTRING( title )
::cDocTitle := title
ENDIF
@@ -349,7 +349,7 @@ METHOD ExcelWriterXML:docTitle( title )
METHOD ExcelWriterXML:docSubject( subject )
IF hb_isChar( subject )
IF HB_ISSTRING( subject )
::cDocSubject := subject
ENDIF
@@ -359,7 +359,7 @@ METHOD ExcelWriterXML:docSubject( subject )
METHOD ExcelWriterXML:docAuthor( author )
IF hb_isChar( author )
IF HB_ISSTRING( author )
::cDocAuthor := author
ENDIF
@@ -369,7 +369,7 @@ METHOD ExcelWriterXML:docAuthor( author )
METHOD ExcelWriterXML:docManager( manager )
IF hb_isChar( manager )
IF HB_ISSTRING( manager )
::cDocManager := manager
ENDIF
@@ -379,7 +379,7 @@ METHOD ExcelWriterXML:docManager( manager )
METHOD ExcelWriterXML:docCompany( company )
IF hb_isChar( company )
IF HB_ISSTRING( company )
::cDocCompany := company
ENDIF

2
harbour/examples/hbxlsxml/xlsxml_s.prg
View File

@@ -169,7 +169,7 @@ METHOD ExcelWriterXML_Sheet:writeData( type, row, column, xData, style, formula
LOCAL hcol, cell, styleID
IF style != NIL
IF HB_IsObject( style )
IF HB_ISOBJECT( style )
styleID := style:getID()
ELSE
styleID := style

6
harbour/examples/hbxlsxml/xlsxml_y.prg
View File

@@ -360,7 +360,7 @@ METHOD ExcelWriterXML_Style:alignHorizontal( halign )
METHOD ExcelWriterXML_Style:alignRotate( rotate )
IF !HB_IsNumeric( rotate )
IF !HB_ISNUMERIC( rotate )
RETURN NIL
ENDIF
IF abs( rotate ) > 90
@@ -402,7 +402,7 @@ METHOD ExcelWriterXML_Style:alignWraptext()
METHOD ExcelWriterXML_Style:setFontSize( fontSize )
IF ! HB_IsNumeric( fontSize )
IF ! HB_ISNUMERIC( fontSize )
fontSize := 10
ENDIF
IF fontSize <= 0
@@ -553,7 +553,7 @@ METHOD ExcelWriterXML_Style:border( position,weight,color,linestyle )
position := 'All'
ENDIF
IF HB_IsNumeric( weight )
IF HB_ISNUMERIC( weight )
IF abs( weight ) > 3
weight := 3
ENDIF

4
harbour/tests/parseini.prg
View File

@@ -80,7 +80,7 @@ PROCEDURE Main( cName )
/* Now (without automatic main), toplevel options may be in the root hash */
aSect := hIni[ cSection ]
IF hb_isHash( aSect )
IF HB_ISHASH( aSect )
/* It's a section */
?
? "Section [" + cSection + "]"
@@ -146,7 +146,7 @@ PROCEDURE Main( cName )
/* Now (without automatic main), toplevel options may be in the root hash */
aSect := hIni[ cSection ]
IF hb_isHash( aSect )
IF HB_ISHASH( aSect )
/* It's a section */
?
? "Section [" + cSection + "]"

2
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -12712,7 +12712,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
" - linux : gcc, clang, icc, watcom, sunpro, open64, pcc",;
" - darwin : gcc, clang, icc, pcc",;
" - win : mingw, msvc, bcc, watcom, icc, pocc, xcc,",;
" - mingw64, msvc64, msvcia64, iccia64, pocc64",;
" mingw64, msvc64, msvcia64, iccia64, pocc64",;
" - wce : mingwarm, mingw, msvcarm, poccarm",;
" - os2 : gcc, gccomf, watcom",;
" - dos : djgpp, watcom",;