From 257c522aca0f2a94004006851369bf107d2f77bb Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 9 Jun 2012 16:41:39 +0000 Subject: [PATCH] 2012-06-09 18:38 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/gtwvg/wvgpaint.prg ! fixed #3488700 * contrib/gtwvg/wvg3stat.prg * contrib/gtwvg/wvgcheck.prg * contrib/gtwvg/wvgcombo.prg * contrib/gtwvg/wvgdatar.prg * contrib/gtwvg/wvgdlg.prg * contrib/gtwvg/wvgmenub.prg * contrib/gtwvg/wvgpaint.prg * contrib/gtwvg/wvgpushb.prg * contrib/gtwvg/wvgradio.prg * contrib/gtwvg/wvgstatb.prg * contrib/gtwvg/wvgtreev.prg * contrib/gtwvg/wvgwnd.prg * contrib/hbhttpd/core.prg * contrib/hbide/hbqreportsmanager.prg * contrib/hbide/ideconsole.prg * contrib/hbide/idedocks.prg * contrib/hbide/ideedit.prg * contrib/hbide/idemisc.prg * contrib/hbide/ideprojmanager.prg * contrib/hbide/ideshortcuts.prg * contrib/hbide/idesources.prg * contrib/hbide/idethemes.prg * contrib/hbqt/qtcore/hbqt_misc.prg * contrib/hbxbp/xbp3state.prg * contrib/hbxbp/xbpcheckbox.prg * contrib/hbxbp/xbpcrt.prg * contrib/hbxbp/xbpdataref.prg * contrib/hbxbp/xbpdialog.prg * contrib/hbxbp/xbpfiledialog.prg * contrib/hbxbp/xbplistbox.prg * contrib/hbxbp/xbpmenubar.prg * contrib/hbxbp/xbpmle.prg * contrib/hbxbp/xbpprinter.prg * contrib/hbxbp/xbppushbutton.prg * contrib/hbxbp/xbpradiobutton.prg * contrib/hbxbp/xbprtf.prg * contrib/hbxbp/xbpstatic.prg * contrib/hbxbp/xbpstatusbar.prg * contrib/hbxbp/xbptreeview.prg * contrib/hbxbp/xbpwindow.prg ! HB_ISCHAR() -> HB_ISSTRING() --- harbour/ChangeLog | 46 +++++++++++++++++ harbour/contrib/gtwvg/wvg3stat.prg | 2 +- harbour/contrib/gtwvg/wvgcheck.prg | 2 +- harbour/contrib/gtwvg/wvgcombo.prg | 2 +- harbour/contrib/gtwvg/wvgdatar.prg | 2 +- harbour/contrib/gtwvg/wvgdlg.prg | 2 +- harbour/contrib/gtwvg/wvgmenub.prg | 6 +-- harbour/contrib/gtwvg/wvgpaint.prg | 4 +- harbour/contrib/gtwvg/wvgpushb.prg | 6 +-- harbour/contrib/gtwvg/wvgradio.prg | 2 +- harbour/contrib/gtwvg/wvgstatb.prg | 2 +- harbour/contrib/gtwvg/wvgtreev.prg | 4 +- harbour/contrib/gtwvg/wvgwnd.prg | 8 +-- harbour/contrib/hbhttpd/core.prg | 4 +- harbour/contrib/hbide/hbqreportsmanager.prg | 10 ++-- harbour/contrib/hbide/ideconsole.prg | 2 +- harbour/contrib/hbide/idedocks.prg | 11 ++-- harbour/contrib/hbide/ideedit.prg | 18 +++---- harbour/contrib/hbide/idemisc.prg | 14 +++--- harbour/contrib/hbide/ideprojmanager.prg | 6 +-- harbour/contrib/hbide/ideshortcuts.prg | 18 +++---- harbour/contrib/hbide/idesources.prg | 4 +- harbour/contrib/hbide/idethemes.prg | 4 +- harbour/contrib/hbqt/qtcore/hbqt_misc.prg | 56 ++++++++++----------- harbour/contrib/hbxbp/xbp3state.prg | 2 +- harbour/contrib/hbxbp/xbpcheckbox.prg | 2 +- harbour/contrib/hbxbp/xbpcrt.prg | 2 +- harbour/contrib/hbxbp/xbpdataref.prg | 6 +-- harbour/contrib/hbxbp/xbpdialog.prg | 4 +- harbour/contrib/hbxbp/xbpfiledialog.prg | 28 +++++------ harbour/contrib/hbxbp/xbplistbox.prg | 6 +-- harbour/contrib/hbxbp/xbpmenubar.prg | 2 +- harbour/contrib/hbxbp/xbpmle.prg | 2 +- harbour/contrib/hbxbp/xbpprinter.prg | 4 +- harbour/contrib/hbxbp/xbppushbutton.prg | 2 +- harbour/contrib/hbxbp/xbpradiobutton.prg | 2 +- harbour/contrib/hbxbp/xbprtf.prg | 10 ++-- harbour/contrib/hbxbp/xbpstatic.prg | 2 +- harbour/contrib/hbxbp/xbpstatusbar.prg | 2 +- harbour/contrib/hbxbp/xbptreeview.prg | 2 +- harbour/contrib/hbxbp/xbpwindow.prg | 8 +-- 41 files changed, 183 insertions(+), 138 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8f6884dcc0..92f791b279 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,52 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-09 18:38 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/gtwvg/wvgpaint.prg + ! fixed #3488700 + + * contrib/gtwvg/wvg3stat.prg + * contrib/gtwvg/wvgcheck.prg + * contrib/gtwvg/wvgcombo.prg + * contrib/gtwvg/wvgdatar.prg + * contrib/gtwvg/wvgdlg.prg + * contrib/gtwvg/wvgmenub.prg + * contrib/gtwvg/wvgpaint.prg + * contrib/gtwvg/wvgpushb.prg + * contrib/gtwvg/wvgradio.prg + * contrib/gtwvg/wvgstatb.prg + * contrib/gtwvg/wvgtreev.prg + * contrib/gtwvg/wvgwnd.prg + * contrib/hbhttpd/core.prg + * contrib/hbide/hbqreportsmanager.prg + * contrib/hbide/ideconsole.prg + * contrib/hbide/idedocks.prg + * contrib/hbide/ideedit.prg + * contrib/hbide/idemisc.prg + * contrib/hbide/ideprojmanager.prg + * contrib/hbide/ideshortcuts.prg + * contrib/hbide/idesources.prg + * contrib/hbide/idethemes.prg + * contrib/hbqt/qtcore/hbqt_misc.prg + * contrib/hbxbp/xbp3state.prg + * contrib/hbxbp/xbpcheckbox.prg + * contrib/hbxbp/xbpcrt.prg + * contrib/hbxbp/xbpdataref.prg + * contrib/hbxbp/xbpdialog.prg + * contrib/hbxbp/xbpfiledialog.prg + * contrib/hbxbp/xbplistbox.prg + * contrib/hbxbp/xbpmenubar.prg + * contrib/hbxbp/xbpmle.prg + * contrib/hbxbp/xbpprinter.prg + * contrib/hbxbp/xbppushbutton.prg + * contrib/hbxbp/xbpradiobutton.prg + * contrib/hbxbp/xbprtf.prg + * contrib/hbxbp/xbpstatic.prg + * contrib/hbxbp/xbpstatusbar.prg + * contrib/hbxbp/xbptreeview.prg + * contrib/hbxbp/xbpwindow.prg + ! HB_ISCHAR() -> HB_ISSTRING() + 2012-06-09 17:58 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbrun/hbrun.prg + enabled UTF8EX as default CP for hbrun script. This makes diff --git a/harbour/contrib/gtwvg/wvg3stat.prg b/harbour/contrib/gtwvg/wvg3stat.prg index a17b10fea5..b39ed53055 100644 --- a/harbour/contrib/gtwvg/wvg3stat.prg +++ b/harbour/contrib/gtwvg/wvg3stat.prg @@ -200,7 +200,7 @@ METHOD Wvg3State:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible METHOD Wvg3State:setCaption( xCaption ) - IF hb_isChar( xCaption ) + IF HB_ISSTRING( xCaption ) ::caption := xCaption WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) ENDIF diff --git a/harbour/contrib/gtwvg/wvgcheck.prg b/harbour/contrib/gtwvg/wvgcheck.prg index 210b18de5c..743822bd59 100644 --- a/harbour/contrib/gtwvg/wvgcheck.prg +++ b/harbour/contrib/gtwvg/wvgcheck.prg @@ -210,7 +210,7 @@ METHOD WvgCheckBox:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisibl METHOD WvgCheckBox:setCaption( xCaption ) - IF hb_isChar( xCaption ) + IF HB_ISSTRING( xCaption ) ::caption := xCaption WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) ENDIF diff --git a/harbour/contrib/gtwvg/wvgcombo.prg b/harbour/contrib/gtwvg/wvgcombo.prg index 25eb75164d..113407e87b 100644 --- a/harbour/contrib/gtwvg/wvgcombo.prg +++ b/harbour/contrib/gtwvg/wvgcombo.prg @@ -271,7 +271,7 @@ METHOD WvgComboBox:handleEvent( nMessage, aNM ) METHOD WvgComboBox:addItem( cItem ) - IF hb_isChar( cItem ) + IF HB_ISSTRING( cItem ) RETURN ::sendCBMessage( CB_ADDSTRING, cItem ) ENDIF diff --git a/harbour/contrib/gtwvg/wvgdatar.prg b/harbour/contrib/gtwvg/wvgdatar.prg index 3bddbac8d0..9b6b4f637a 100644 --- a/harbour/contrib/gtwvg/wvgdatar.prg +++ b/harbour/contrib/gtwvg/wvgdatar.prg @@ -174,7 +174,7 @@ METHOD WvgDataRef:setData( xValue, mp2 ) ENDIF CASE ::className == "EDIT" - IF hb_isChar( ::sl_editBuffer ) + IF HB_ISSTRING( ::sl_editBuffer ) WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::sl_editBuffer ) ENDIF diff --git a/harbour/contrib/gtwvg/wvgdlg.prg b/harbour/contrib/gtwvg/wvgdlg.prg index 0cb98b32ac..3d73e9969a 100644 --- a/harbour/contrib/gtwvg/wvgdlg.prg +++ b/harbour/contrib/gtwvg/wvgdlg.prg @@ -150,7 +150,7 @@ METHOD WvgDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) if HB_ISNUMERIC( ::icon ) hb_gtInfo( HB_GTI_ICONRES, ::icon ) - elseif hb_isChar( ::icon ) + elseif HB_ISSTRING( ::icon ) hb_gtInfo( HB_GTI_ICONFILE, ::icon ) endif diff --git a/harbour/contrib/gtwvg/wvgmenub.prg b/harbour/contrib/gtwvg/wvgmenub.prg index 663028396c..434264e08b 100644 --- a/harbour/contrib/gtwvg/wvgmenub.prg +++ b/harbour/contrib/gtwvg/wvgmenub.prg @@ -329,7 +329,7 @@ METHOD WvgMenuBar:putItem( aItem, nPos, lInsert ) WVG_AppendMenu( ::hMenu, ; aItem[ 1 ], ; aItem[ 2 ], ; - iif( hb_isChar( aItem[ 3 ] ), strtran( aItem[ 3 ], "~", "&" ), aItem[ 3 ] ) ) + iif( HB_ISSTRING( aItem[ 3 ] ), strtran( aItem[ 3 ], "~", "&" ), aItem[ 3 ] ) ) ELSE nItemIndex := nPos IF lInsert @@ -338,7 +338,7 @@ METHOD WvgMenuBar:putItem( aItem, nPos, lInsert ) nItemIndex - 1, ; aItem[ 1 ] + MF_BYPOSITION, ; aItem[ 2 ], ; - iif( hb_isChar( aItem[ 3 ] ), strtran( aItem[ 3 ], "~", "&" ), aItem[ 3 ] ) ) + iif( HB_ISSTRING( aItem[ 3 ] ), strtran( aItem[ 3 ], "~", "&" ), aItem[ 3 ] ) ) ELSE IF valtype( xCaption ) == "C" aItem[ 2 ] := ::aMenuItems[ nItemIndex, 2 ] @@ -347,7 +347,7 @@ METHOD WvgMenuBar:putItem( aItem, nPos, lInsert ) WVG_SetMenuItem( ::hMenu, ; nItemIndex - 1, ; aItem[ 2 ], ; - iif( hb_isChar( aItem[ 3 ] ), strtran( aItem[ 3 ], "~", "&" ), aItem[ 3 ] ),; + iif( HB_ISSTRING( aItem[ 3 ] ), strtran( aItem[ 3 ], "~", "&" ), aItem[ 3 ] ),; valtype( xCaption ) == "C" ) ENDIF ENDIF diff --git a/harbour/contrib/gtwvg/wvgpaint.prg b/harbour/contrib/gtwvg/wvgpaint.prg index f4696261e1..4a50e4cd1a 100644 --- a/harbour/contrib/gtwvg/wvgpaint.prg +++ b/harbour/contrib/gtwvg/wvgpaint.prg @@ -672,8 +672,8 @@ FUNCTION Wvt_GetRGBColorByString( cColor, nForeBack ) nForeBack := iif( HB_ISNUMERIC( nForeBack ), nForeBack, 0 ) - IF hb_isChar( cColor ) - IF ( n := at( cColor, "/" ) ) > 0 + IF HB_ISSTRING( cColor ) + IF ( n := at( "/", cColor ) ) > 0 IF nForeBack == 0 s := substr( cColor, 1, n-1 ) ELSE diff --git a/harbour/contrib/gtwvg/wvgpushb.prg b/harbour/contrib/gtwvg/wvgpushb.prg index 99308c7355..dd03b8fac6 100644 --- a/harbour/contrib/gtwvg/wvgpushb.prg +++ b/harbour/contrib/gtwvg/wvgpushb.prg @@ -122,7 +122,7 @@ METHOD WvgPushButton:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible IF HB_ISNUMERIC( ::caption ) ::style += BS_BITMAP - ELSEIF hb_isChar( ::caption ) + ELSEIF HB_ISSTRING( ::caption ) IF ".ICO" == upper( right( ::caption, 4 ) ) ::style += BS_ICON ELSEIF ".BMP" == upper( right( ::caption, 4 ) ) @@ -223,9 +223,9 @@ METHOD WvgPushButton:setCaption( xCaption, cDll ) DEFAULT xCaption TO ::caption HB_SYMBOL_UNUSED( cDll ) - IF hb_isChar( xCaption ) + IF HB_ISSTRING( xCaption ) ::caption := xCaption - IF ".ICO" == upper( right( ::caption, 4 ) ) + IF ".ico" == lower( right( ::caption, 4 ) ) WVG_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_ICON, WVG_LoadImage( ::caption, 2, IMAGE_ICON ) ) ELSEIF ".BMP" == upper( right( ::caption, 4 ) ) WVG_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_BITMAP, WVG_LoadImage( ::caption, 2, IMAGE_BITMAP ) ) diff --git a/harbour/contrib/gtwvg/wvgradio.prg b/harbour/contrib/gtwvg/wvgradio.prg index 0e2114ee77..4b83092855 100644 --- a/harbour/contrib/gtwvg/wvgradio.prg +++ b/harbour/contrib/gtwvg/wvgradio.prg @@ -183,7 +183,7 @@ METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) CLASS Wv METHOD setCaption( xCaption ) CLASS WvgRadioButton - IF hb_isChar( xCaption ) + IF HB_ISSTRING( xCaption ) ::caption := xCaption WVG_SendMessageText( ::hWnd, WM_SETTEXT, 0, ::caption ) ENDIF diff --git a/harbour/contrib/gtwvg/wvgstatb.prg b/harbour/contrib/gtwvg/wvgstatb.prg index befd49ff32..8f73a6d7cd 100644 --- a/harbour/contrib/gtwvg/wvgstatb.prg +++ b/harbour/contrib/gtwvg/wvgstatb.prg @@ -271,7 +271,7 @@ METHOD WvgStatusBar:delItem( nItemORcKey ) METHOD WvgStatusBar:getItem( nItemORcKey ) LOCAL nIndex := 0, oPanel - IF hb_isChar( nItemORcKey ) + IF HB_ISSTRING( nItemORcKey ) nIndex := ascan( ::aItems, {|o| o:key == nItemORcKey } ) ELSEIF HB_ISNUMERIC( nItemORcKey ) diff --git a/harbour/contrib/gtwvg/wvgtreev.prg b/harbour/contrib/gtwvg/wvgtreev.prg index 1761b98e47..4ede12ebf7 100644 --- a/harbour/contrib/gtwvg/wvgtreev.prg +++ b/harbour/contrib/gtwvg/wvgtreev.prg @@ -114,8 +114,8 @@ CLASS WvgTreeView INHERIT WvgWindow, WvgDataRef DATA textItemSelected INIT "" METHOD getSelectionInfo( nlParam ) - METHOD setColorFG( nRGB ) INLINE WVG_TreeView_SetTextColor( ::hWnd, iif( hb_isChar( nRGB ), Wvt_GetRGBColorByString( nRGB, 0 ), nRGB ) ) - METHOD setColorBG( nRGB ) INLINE WVG_TreeView_SetBkColor( ::hWnd, iif( hb_isChar( nRGB ), Wvt_GetRGBColorByString( nRGB, 1 ), nRGB ) ) + METHOD setColorFG( nRGB ) INLINE WVG_TreeView_SetTextColor( ::hWnd, iif( HB_ISSTRING( nRGB ), Wvt_GetRGBColorByString( nRGB, 0 ), nRGB ) ) + METHOD setColorBG( nRGB ) INLINE WVG_TreeView_SetBkColor( ::hWnd, iif( HB_ISSTRING( nRGB ), Wvt_GetRGBColorByString( nRGB, 1 ), nRGB ) ) METHOD setColorLines( nRGB ) INLINE WVG_TreeView_SetLineColor( ::hWnd, nRGB ) METHOD showExpanded( lExpanded, nLevels ) INLINE Wvg_TreeView_ShowExpanded( ::hWnd, ; iif( HB_ISNIL( lExpanded ), .f., lExpanded ), nLevels ) diff --git a/harbour/contrib/gtwvg/wvgwnd.prg b/harbour/contrib/gtwvg/wvgwnd.prg index f9053bc5fe..408e6e19dc 100644 --- a/harbour/contrib/gtwvg/wvgwnd.prg +++ b/harbour/contrib/gtwvg/wvgwnd.prg @@ -230,7 +230,7 @@ CLASS WvgWindow INHERIT WvgPartHandler METHOD HandleEvent() INLINE EVENT_UNHANDELLED METHOD isEnabled() INLINE ::is_enabled METHOD isVisible() INLINE ! ::is_hidden - METHOD setColorFG( nRGB ) INLINE ::clr_FG := iif( hb_isChar( nRGB ), Wvt_GetRGBColorByString( nRGB, 0 ), nRGB ), ::invalidateRect() + METHOD setColorFG( nRGB ) INLINE ::clr_FG := iif( HB_ISSTRING( nRGB ), Wvt_GetRGBColorByString( nRGB, 0 ), nRGB ), ::invalidateRect() METHOD enter( xParam ) SETGET METHOD leave( xParam ) SETGET @@ -491,7 +491,7 @@ METHOD WvgWindow:lockUpdate() METHOD WvgWindow:setColorBG( nRGB ) LOCAL hBrush - IF hb_isChar( nRGB ) + IF HB_ISSTRING( nRGB ) nRGB := Wvt_GetRGBColorByString( nRGB, 1 ) ENDIF IF HB_ISNUMERIC( nRGB ) @@ -613,7 +613,7 @@ METHOD WvgWindow:isDerivedFrom( cClassORoObject ) /* Compares without Xbp or Wvg prefixes */ - IF hb_isChar( cClassORoObject ) + IF HB_ISSTRING( cClassORoObject ) IF upper( substr( cClassORoObject,4 ) ) == upper( substr( cCls,4 ) ) lTrue := .t. ENDIF @@ -1349,7 +1349,7 @@ METHOD WvgWindow:getPosAndSize( aPs, aSz ) METHOD WvgWindow:toolTipText( cText ) - IF hb_isChar( cText ) + IF HB_ISSTRING( cText ) ::s_toolTipText := cText IF WVG_IsWindow( ::hWndTT ) WVG_SetTooltipText( ::hWnd, ::hWndTT, ::s_toolTipText ) diff --git a/harbour/contrib/hbhttpd/core.prg b/harbour/contrib/hbhttpd/core.prg index 8660b48b47..7cd755609b 100644 --- a/harbour/contrib/hbhttpd/core.prg +++ b/harbour/contrib/hbhttpd/core.prg @@ -1559,7 +1559,7 @@ STATIC FUNCTION parse_data( aData, aCode, hConfig ) CASE "=" IF HB_HHasKey( aData, aInstr[2] ) xValue := aData[aInstr[2]] - IF HB_ISCHAR( xValue ) + IF HB_ISSTRING( xValue ) cRet += UHtmlEncode( xValue ) ELSEIF HB_ISNUMERIC( xValue ) cRet += UHtmlEncode( Str( xValue ) ) @@ -1580,7 +1580,7 @@ STATIC FUNCTION parse_data( aData, aCode, hConfig ) CASE ":" IF HB_HHasKey( aData, aInstr[2] ) xValue := aData[aInstr[2]] - IF HB_ISCHAR( xValue ) + IF HB_ISSTRING( xValue ) cRet += xValue ELSEIF HB_ISNUMERIC( xValue ) cRet += Str( xValue ) diff --git a/harbour/contrib/hbide/hbqreportsmanager.prg b/harbour/contrib/hbide/hbqreportsmanager.prg index 2024b7f69c..ba0263d4d6 100644 --- a/harbour/contrib/hbide/hbqreportsmanager.prg +++ b/harbour/contrib/hbide/hbqreportsmanager.prg @@ -1261,13 +1261,13 @@ METHOD HbqReportsManager:buildToolbar() qTBar:addToolButton( "Save" , "Save Report" , app_image( "save3" ), {|| ::execEvent( "buttonSave_clicked" ) } ) qTBar:addToolButton( "Close" , "Close Report" , app_image( "close3" ), {|| ::execEvent( "buttonClose_clicked" ) } ) qTBar:addToolButton( "Print" , "Print Report" , app_image( "print" ), {|| ::execEvent( "buttonPrint_clicked" ) } ) - qTBar:addSeparator() + qTBar:addSeparator() qTBar:addToolButton( "ToBack" , "Push to back" , app_image( "toback" ), {|| ::execEvent( "buttonToBack_clicked" ) }, .f., .f. ) qTBar:addToolButton( "ToFront" , "Bring to front" , app_image( "tofront" ), {|| ::execEvent( "buttonToFront_clicked" ) }, .f., .f. ) - qTBar:addSeparator() + qTBar:addSeparator() qTBar:addToolButton( "RotateL" , "Rotate anti-clock wise", app_image( "unload_1" ), {|| ::execEvent( "buttonRotateL_clicked" ) }, .f., .f. ) qTBar:addToolButton( "RotateR" , "Rotate clock wise" , app_image( "load_1" ), {|| ::execEvent( "buttonRotateR_clicked" ) }, .f., .f. ) - qTBar:addSeparator() + qTBar:addSeparator() qTBar:addToolButton( "Portrait" , "Portrait orientation" , app_image( "r-portrait" ), {|| ::execEvent( "buttonPortrait_clicked" ) }, .f., .f. ) qTBar:addToolButton( "Landscape", "Landscape orientation" , app_image( "r-landscape" ), {|| ::execEvent( "buttonLandscape_clicked" ) }, .f., .f. ) qTBar:addSeparator() @@ -1875,7 +1875,7 @@ METHOD HqrGraphicsItem:contextMenu( p1, p2 ) EXIT ENDSWITCH ENDIF - RETURN NIL + RETURN NIL /*----------------------------------------------------------------------*/ @@ -1890,7 +1890,7 @@ METHOD HqrGraphicsItem:setText( ... ) IF empty( a_ ) RETURN ::cText ENDIF - IF hb_isChar( a_[ 1 ] ) + IF HB_ISSTRING( a_[ 1 ] ) ::cText := a_[ 1 ] ::update() ENDIF diff --git a/harbour/contrib/hbide/ideconsole.prg b/harbour/contrib/hbide/ideconsole.prg index ff4c870dff..923753d36a 100644 --- a/harbour/contrib/hbide/ideconsole.prg +++ b/harbour/contrib/hbide/ideconsole.prg @@ -4207,7 +4207,7 @@ FUNCTION SetHelpStr( cStr ) STATIC s_str := "" o_str := s_str - IF hb_isChar( cStr ) + IF HB_ISSTRING( cStr ) s_str := cStr ENDIF diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index c53faf91e5..5e99f0180c 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -1100,7 +1100,7 @@ METHOD IdeDocks:setView( cView ) EXIT OTHERWISE - IF ( n := ascan( ::aViews, {|o| iif( hb_isChar( o:oWidget:objectName() ), o:oWidget:objectName() == cView, .f. ) } ) ) > 0 + IF ( n := ascan( ::aViews, {|o| iif( HB_ISSTRING( o:oWidget:objectName() ), o:oWidget:objectName() == cView, .f. ) } ) ) > 0 ::oIde:cWrkView := cView ::oIde:qTabWidget := ::aViews[ n ]:oTabWidget:oWidget ::oIde:oTabParent := ::aViews[ n ] @@ -1384,15 +1384,15 @@ METHOD IdeDocks:buildToolBarPanels() aadd( aBtns, { ::oUiSrcDock , "fileprg" } ) aadd( aBtns, {} ) aadd( aBtns, { ::oDockB2 , "builderror" } ) - + ::oIde:qTBarDocks := HBQToolBar():new( "ToolBar_Docks" ) - + ::qTBarDocks:cName := "ToolBar_Docks" ::qTBarDocks:allowedAreas := Qt_LeftToolBarArea + Qt_RightToolBarArea + Qt_TopToolBarArea + Qt_BottomToolBarArea ::qTBarDocks:size := qSize - + ::qTBarDocks:create() - + ::qTBarDocks:setStyleSheet( GetStyleSheet( "QToolBarLR5", ::nAnimantionMode ) ) ::qTBarDocks:setWindowTitle( "ToolBar: Dockable Widgets" ) ::qTBarDocks:setToolButtonStyle( Qt_ToolButtonIconOnly ) @@ -2023,4 +2023,3 @@ METHOD IdeDocks:buildUISrcDock() RETURN Self /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbide/ideedit.prg b/harbour/contrib/hbide/ideedit.prg index c36683c018..e553107d6f 100644 --- a/harbour/contrib/hbide/ideedit.prg +++ b/harbour/contrib/hbide/ideedit.prg @@ -330,8 +330,8 @@ METHOD IdeEdit:destroy() ::oSourceThumbnailDock:oWidget:hide() ENDIF - ::oEditor := NIL - + ::oEditor := NIL + ::qTimer:disconnect( "timeout()" ) IF ::qTimer:isActive() ::qTimer:stop() @@ -350,7 +350,7 @@ METHOD IdeEdit:destroy() ::qEdit := NIL ::qFont := NIL - RETURN NIL + RETURN NIL /*----------------------------------------------------------------------*/ @@ -369,7 +369,7 @@ METHOD IdeEdit:disconnectEditSignals() ::qEdit:disConnect( "undoAvailable(bool)" ) #endif - RETURN NIL + RETURN NIL /*----------------------------------------------------------------------*/ @@ -387,7 +387,7 @@ METHOD IdeEdit:connectEditSignals() ::qEdit:connect( "redoAvailable(bool)" , {|p | ::execEvent( 5, p ) } ) ::qEdit:connect( "undoAvailable(bool)" , {|p | ::execEvent( 7, p ) } ) #endif - + RETURN NIL /*----------------------------------------------------------------------*/ @@ -398,8 +398,8 @@ METHOD IdeEdit:execEvent( nMode, p, p1 ) HB_SYMBOL_UNUSED( p1 ) IF ::lQuitting - RETURN NIL - ENDIF + RETURN NIL + ENDIF qCursor := ::qEdit:textCursor() ::nCurLineNo := qCursor:blockNumber() @@ -570,7 +570,7 @@ METHOD IdeEdit:execEvent( nMode, p, p1 ) #endif ENDSWITCH - RETURN NIL + RETURN NIL /*----------------------------------------------------------------------*/ @@ -2166,7 +2166,7 @@ METHOD IdeEdit:insertSeparator( cSep ) METHOD IdeEdit:insertText( cText ) LOCAL qCursor, nL, nB - IF hb_isChar( cText ) .AND. !Empty( cText ) + IF HB_ISSTRING( cText ) .AND. !Empty( cText ) qCursor := ::qEdit:textCursor() nL := len( cText ) diff --git a/harbour/contrib/hbide/idemisc.prg b/harbour/contrib/hbide/idemisc.prg index 37ffc0d94d..d4e2925b6c 100644 --- a/harbour/contrib/hbide/idemisc.prg +++ b/harbour/contrib/hbide/idemisc.prg @@ -99,7 +99,7 @@ FUNCTION hbide_setProjectOutputPath( cPath ) oldProjPath := cProjPath - IF hb_isChar( cPath ) + IF HB_ISSTRING( cPath ) cProjPath := cPath ENDIF @@ -117,7 +117,7 @@ FUNCTION hbide_setProjectTitle( cTitle ) ENDIF oldProjTitle := cProjTitle - IF hb_isChar( cTitle ) + IF HB_ISSTRING( cTitle ) cProjTitle := cTitle ENDIF @@ -286,7 +286,7 @@ FUNCTION hbide_fetchAFile( oWnd, cTitle, aFlt, cDftDir, cDftSuffix ) oDlg:title := cTitle oDlg:center := .t. oDlg:fileFilters := aFlt - IF hb_isChar( cDftSuffix ) + IF HB_ISSTRING( cDftSuffix ) oDlg:oWidget:setDefaultSuffix( cDftSuffix ) ENDIF @@ -307,7 +307,7 @@ FUNCTION hbide_saveAFile( oWnd, cTitle, aFlt, cDftFile, cDftSuffix ) oDlg:title := cTitle oDlg:center := .t. oDlg:fileFilters := aFlt - IF hb_isChar( cDftSuffix ) + IF HB_ISSTRING( cDftSuffix ) oDlg:oWidget:setDefaultSuffix( cDftSuffix ) ENDIF @@ -334,7 +334,7 @@ FUNCTION hbide_fetchADir( oWnd, cTitle, cDftDir ) cFile := oDlg:open( cDftDir, , .f. ) oDlg:destroy() - IF hb_isChar( cFile ) + IF HB_ISSTRING( cFile ) //cFile := strtran( cFile, "/", hb_ps() ) RETURN cFile ENDIF @@ -380,7 +380,7 @@ FUNCTION hbide_evalAsString( cExp ) cValue := cExp END SEQUENCE - IF !hb_isChar( cValue ) + IF !HB_ISSTRING( cValue ) cValue := "" ENDIF @@ -1915,7 +1915,7 @@ FUNCTION hbide_SetWrkFolderLast( cPathFile ) ENDIF cOldPath := cPath - IF hb_isChar( cPathFile ) + IF HB_ISSTRING( cPathFile ) hb_fNameSplit( cPathFile, @cPth ) cPath := cPth ENDIF diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg index 4537940360..f00f712919 100644 --- a/harbour/contrib/hbide/ideprojmanager.prg +++ b/harbour/contrib/hbide/ideprojmanager.prg @@ -1331,7 +1331,7 @@ METHOD IdeProjManager:promptForPath( cObjPathName, cTitle, cObjFileName, cObjPat cTemp := "" ENDIF - IF !hb_isChar( cObjFileName ) + IF !HB_ISSTRING( cObjFileName ) cPath := hbide_fetchADir( ::oDlg, cTitle, cTemp ) ELSE @@ -1350,11 +1350,11 @@ METHOD IdeProjManager:promptForPath( cObjPathName, cTitle, cObjFileName, cObjPat ENDIF ::oUI:qObj[ cObjPathName ]:setText( cPath ) - IF hb_isChar( cObjPath2 ) .AND. Empty( ::oUI:qObj[ cObjPath2 ]:Text() ) + IF HB_ISSTRING( cObjPath2 ) .AND. Empty( ::oUI:qObj[ cObjPath2 ]:Text() ) ::oUI:qObj[ cObjPath2 ]:setText( cPath ) ENDIF - IF hb_isChar( cObjPath3 ) .AND. Empty( ::oUI:qObj[ cObjPath3 ]:Text() ) + IF HB_ISSTRING( cObjPath3 ) .AND. Empty( ::oUI:qObj[ cObjPath3 ]:Text() ) ::oUI:qObj[ cObjPath3 ]:setText( cPath ) ENDIF ENDIF diff --git a/harbour/contrib/hbide/ideshortcuts.prg b/harbour/contrib/hbide/ideshortcuts.prg index 39477a0109..11926fbbad 100644 --- a/harbour/contrib/hbide/ideshortcuts.prg +++ b/harbour/contrib/hbide/ideshortcuts.prg @@ -311,8 +311,8 @@ METHOD IdeShortcuts:execEvent( nMode, p ) LOCAL nRow, cMethod, cFile, cPath, cTemp, cExt, a_ IF ::lQuitting - RETURN Self - ENDIF + RETURN Self + ENDIF SWITCH nMode @@ -660,8 +660,8 @@ METHOD IdeShortcuts:populateDftSCuts() ::array2table( nRow, a_ ) qApp:processEvents() IF ::lQuitting - EXIT - ENDIF + EXIT + ENDIF NEXT oTbl:setCurrentCell( 0,0 ) @@ -1199,31 +1199,31 @@ METHOD IdeShortcuts:findDlgEx() RETURN Self /*----------------------------------------------------------------------*/ METHOD IdeShortcuts:build( cProj ) - IF ! hb_isChar( cProj ) + IF ! HB_ISSTRING( cProj ) cProj := "" ENDIF RETURN ::oPM:buildProject( cProj, .F., .F. ) /*----------------------------------------------------------------------*/ METHOD IdeShortcuts:buildLaunch( cProj ) - IF ! hb_isChar( cProj ) + IF ! HB_ISSTRING( cProj ) cProj := "" ENDIF RETURN ::oPM:buildProject( cProj, .T., .F. ) /*----------------------------------------------------------------------*/ METHOD IdeShortcuts:reBuild( cProj ) - IF ! hb_isChar( cProj ) + IF ! HB_ISSTRING( cProj ) cProj := "" ENDIF RETURN ::oPM:buildProject( cProj, .F., .T. ) /*----------------------------------------------------------------------*/ METHOD IdeShortcuts:reBuildLaunch( cProj ) - IF ! hb_isChar( cProj ) + IF ! HB_ISSTRING( cProj ) cProj := "" ENDIF RETURN ::oPM:buildProject( cProj, .T., .T. ) /*----------------------------------------------------------------------*/ METHOD IdeShortcuts:launch( cProj ) - IF ! hb_isChar( cProj ) + IF ! HB_ISSTRING( cProj ) cProj := "" ENDIF RETURN ::oPM:launchProject( cProj ) diff --git a/harbour/contrib/hbide/idesources.prg b/harbour/contrib/hbide/idesources.prg index 5e4166edaa..b6cb07c0b2 100644 --- a/harbour/contrib/hbide/idesources.prg +++ b/harbour/contrib/hbide/idesources.prg @@ -504,11 +504,11 @@ METHOD IdeSourcesManager:selectSource( cMode, cFile, cTitle, cDftPath ) ENDIF ELSEIF cMode == "save" - oDlg:title := iif( !hb_isChar( cTitle ), "Save as...", cTitle ) + oDlg:title := iif( !HB_ISSTRING( cTitle ), "Save as...", cTitle ) oDlg:center := .t. oDlg:defExtension:= 'prg' - IF hb_isChar( cFile ) .AND. !Empty( cFile ) + IF HB_ISSTRING( cFile ) .AND. !Empty( cFile ) IF Right( cFile, 1 ) $ '/\' cPath := cFile ELSE diff --git a/harbour/contrib/hbide/idethemes.prg b/harbour/contrib/hbide/idethemes.prg index e1acf50485..06eecea0f3 100644 --- a/harbour/contrib/hbide/idethemes.prg +++ b/harbour/contrib/hbide/idethemes.prg @@ -317,7 +317,7 @@ METHOD IdeThemes:contains( cTheme ) METHOD IdeThemes:load( cFile ) - IF hb_isChar( cFile ) .AND. !empty( cFile ) .AND. hb_FileExists( cFile ) + IF HB_ISSTRING( cFile ) .AND. !empty( cFile ) .AND. hb_FileExists( cFile ) ::aIni:= hbide_readSource( cFile ) ::parseINI() ::lDefault := .f. @@ -352,7 +352,7 @@ METHOD IdeThemes:getThemeAttribute( cAttr, cTheme ) LOCAL nTheme, aAttr := {} IF !empty( cAttr ) - IF !empty( cTheme ) .and. hb_isChar( cTheme ) .and. ( nTheme := ascan( ::aThemes, {|e_| e_[ 1 ] == cTheme } ) ) > 0 + IF !empty( cTheme ) .and. HB_ISSTRING( cTheme ) .and. ( nTheme := ascan( ::aThemes, {|e_| e_[ 1 ] == cTheme } ) ) > 0 aAttr := GetKeyValue( ::aThemes[ nTheme, 2 ], cAttr ) ENDIF ENDIF diff --git a/harbour/contrib/hbqt/qtcore/hbqt_misc.prg b/harbour/contrib/hbqt/qtcore/hbqt_misc.prg index 1053f4a1d7..a08fb91480 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_misc.prg +++ b/harbour/contrib/hbqt/qtcore/hbqt_misc.prg @@ -68,12 +68,12 @@ CREATE CLASS HbQtObjectHandler VAR __pEvents PROTECTED VAR hEvents INIT {=>} - + METHOD hasValidPointer() METHOD connect( cnEvent, bBlock ) METHOD disconnect( cnEvent ) - + DESTRUCTOR _destroy() ERROR HANDLER onError() @@ -118,7 +118,7 @@ METHOD HbQtObjectHandler:connect( cnEvent, bBlock ) IF ! __objDerivedFrom( Self, "QOBJECT" ) RETURN .f. - ENDIF + ENDIF IF ! HB_ISBLOCK( bBlock ) RETURN .f. @@ -127,11 +127,11 @@ METHOD HbQtObjectHandler:connect( cnEvent, bBlock ) IF hb_hHasKey( ::hEvents, cnEvent ) IF HB_ISNUMERIC( ::hEvents[ cnEvent ] ) ::__pEvents:hbDisconnect( Self, cnEvent ) - ELSE + ELSE ::__pSlots:hbDisconnect( Self, cnEvent ) - ENDIF + ENDIF hb_hDel( ::hEvents, cnEvent ) - ENDIF + ENDIF SWITCH ValType( cnEvent ) CASE "C" @@ -175,7 +175,7 @@ METHOD HbQtObjectHandler:connect( cnEvent, bBlock ) OTHERWISE nResult := 99 - + ENDSWITCH __hbqt_error( 1200 + nResult ) @@ -185,15 +185,15 @@ METHOD HbQtObjectHandler:connect( cnEvent, bBlock ) METHOD HbQtObjectHandler:disconnect( cnEvent ) LOCAL nResult := 0 - + IF ! __objDerivedFrom( Self, "QOBJECT" ) RETURN .f. - ENDIF + ENDIF IF ! hb_hHasKey( ::hEvents, cnEvent ) RETURN .f. - ENDIF - + ENDIF + SWITCH ValType( cnEvent ) CASE "C" IF ! empty( ::__pSlots ) @@ -231,7 +231,7 @@ METHOD HbQtObjectHandler:disconnect( cnEvent ) OTHERWISE nResult := 99 - + ENDSWITCH __hbqt_error( 1300 + nResult ) @@ -241,38 +241,38 @@ METHOD HbQtObjectHandler:disconnect( cnEvent ) METHOD HbQtObjectHandler:_destroy() LOCAL cnEvent - -#ifdef __HBQT_REVAMP__ - HB_TRACE( HB_TR_DEBUG, " _destroy()", __objDerivedFrom( Self, "QOBJECT" ), __objGetClsName( Self ) ) + +#ifdef __HBQT_REVAMP__ + HB_TRACE( HB_TR_DEBUG, " _destroy()", __objDerivedFrom( Self, "QOBJECT" ), __objGetClsName( Self ) ) __hbqt_destroy( Self ) #endif - + IF ! __objDerivedFrom( Self, "QOBJECT" ) RETURN NIL - ENDIF + ENDIF IF empty( ::__pSlots ) .AND. empty( ::__pEvents ) RETURN NIL - ENDIF - + ENDIF + HB_TRACE( HB_TR_DEBUG, " _destroy()", __objDerivedFrom( Self, "QOBJECT" ), "pSlots", valtype( ::__pSlots ), "pEvents", valtype( ::__pEvents ) ) - + FOR EACH cnEvent IN ::hEvents - IF HB_ISNUMERIC( cnEvent ) .AND. ! empty( ::__pEvents ) + IF HB_ISNUMERIC( cnEvent ) .AND. ! empty( ::__pEvents ) HB_TRACE( HB_TR_DEBUG, " _destroy()", ".....N.....", cnEvent ) ::__pEvents:hbDisconnect( Self, cnEvent ) - ELSEIF hb_isChar( cnEvent ) .AND. ! empty( ::__pSlots ) + ELSEIF HB_ISSTRING( cnEvent ) .AND. ! empty( ::__pSlots ) HB_TRACE( HB_TR_DEBUG, " _destroy()", ".....C.....", cnEvent ) ::__pSlots:hbDisconnect( Self, cnEvent ) - ENDIF - NEXT - + ENDIF + NEXT + ::hEvents := NIL - + ::__pSlots := NIL ::__pEvents := NIL - + HB_TRACE( HB_TR_DEBUG, " _destroy()", "Exiting..." ) - + RETURN NIL /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbxbp/xbp3state.prg b/harbour/contrib/hbxbp/xbp3state.prg index fa27e63928..44dda01331 100644 --- a/harbour/contrib/hbxbp/xbp3state.prg +++ b/harbour/contrib/hbxbp/xbp3state.prg @@ -183,7 +183,7 @@ METHOD Xbp3State:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible METHOD Xbp3State:setCaption( xCaption ) - IF hb_isChar( xCaption ) + IF HB_ISSTRING( xCaption ) ::caption := xCaption ::oWidget:setText( xCaption ) ENDIF diff --git a/harbour/contrib/hbxbp/xbpcheckbox.prg b/harbour/contrib/hbxbp/xbpcheckbox.prg index 145438ce2b..d97ed6667d 100644 --- a/harbour/contrib/hbxbp/xbpcheckbox.prg +++ b/harbour/contrib/hbxbp/xbpcheckbox.prg @@ -182,7 +182,7 @@ METHOD XbpCheckBox:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisibl METHOD XbpCheckBox:setCaption( xCaption ) - IF hb_isChar( xCaption ) + IF HB_ISSTRING( xCaption ) ::caption := xCaption ::oWidget:setText( xCaption ) ENDIF diff --git a/harbour/contrib/hbxbp/xbpcrt.prg b/harbour/contrib/hbxbp/xbpcrt.prg index 4034b01289..9dd10a653b 100644 --- a/harbour/contrib/hbxbp/xbpcrt.prg +++ b/harbour/contrib/hbxbp/xbpcrt.prg @@ -306,7 +306,7 @@ METHOD XbpCrt:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF ! empty( ::toolTipText ) ::oWidget:setTooltip( ::toolTipText ) ENDIF - IF hb_isChar( ::icon ) + IF HB_ISSTRING( ::icon ) ::oWidget:setWindowIcon( QIcon( ::icon ) ) ENDIF diff --git a/harbour/contrib/hbxbp/xbpdataref.prg b/harbour/contrib/hbxbp/xbpdataref.prg index 685fac6b3c..376f913c7e 100644 --- a/harbour/contrib/hbxbp/xbpdataref.prg +++ b/harbour/contrib/hbxbp/xbpdataref.prg @@ -169,16 +169,16 @@ METHOD DataRef:setData( xValue, mp2 ) ENDIF CASE ::isDerivedFrom( "XBPSLE" ) - IF hb_isChar( ::sl_editBuffer ) + IF HB_ISSTRING( ::sl_editBuffer ) ::oWidget:setText( ::sl_editBuffer ) ENDIF CASE ::isDerivedFrom( "XBPMLE" ) - IF hb_isChar( ::sl_editBuffer ) + IF HB_ISSTRING( ::sl_editBuffer ) ::oWidget:setPlainText( ::sl_editBuffer ) ENDIF #if 0 CASE cClass $ "XBPCOMBOBOX" - IF hb_isChar( ::sl_editBuffer ) + IF HB_ISSTRING( ::sl_editBuffer ) ::oWidget:setText( ::sl_editBuffer ) ENDIF #endif diff --git a/harbour/contrib/hbxbp/xbpdialog.prg b/harbour/contrib/hbxbp/xbpdialog.prg index 667551402a..914a9ba9e2 100644 --- a/harbour/contrib/hbxbp/xbpdialog.prg +++ b/harbour/contrib/hbxbp/xbpdialog.prg @@ -209,7 +209,7 @@ METHOD XbpDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF ! empty( ::title ) ::oWidget:setWindowTitle( ::title ) ENDIF - IF hb_isChar( ::icon ) + IF HB_ISSTRING( ::icon ) ::oWidget:setWindowIcon( QIcon( ::icon ) ) ENDIF @@ -288,7 +288,7 @@ METHOD XbpDialog:destroy() ::oMdi := NIL ENDIF - RETURN NIL + RETURN NIL /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbxbp/xbpfiledialog.prg b/harbour/contrib/hbxbp/xbpfiledialog.prg index d38d41f674..7fff4c8f6a 100644 --- a/harbour/contrib/hbxbp/xbpfiledialog.prg +++ b/harbour/contrib/hbxbp/xbpfiledialog.prg @@ -116,17 +116,17 @@ METHOD XbpFileDialog:create( oParent, oOwner, aPos ) ::oWidget := QFileDialog( ::pParent ) -#if 0 +#if 0 ::oWidget:setStyle( AppDesktop():style() ) ::setStyle() ::setColorBG( GraMakeRGBColor( { 255,255,255 } ) ) ::setColorFG( GraMakeRGBColor( { 0,0,0 } ) ) -#endif +#endif ::oWidget:setOption( QFileDialog_DontResolveSymlinks, .t. ) - + ::postCreate() - + RETURN Self /*----------------------------------------------------------------------*/ @@ -143,7 +143,7 @@ METHOD XbpFileDialog:destroy() HB_TRACE( HB_TR_DEBUG, "XbpFileDialog:destroy()" ) ::xbpWindow:destroy() ENDIF - RETURN NIL + RETURN NIL /*----------------------------------------------------------------------*/ @@ -152,7 +152,7 @@ METHOD XbpFileDialog:connect() ::oWidget:connect( "finished(int)" , {|| ::disconnect() } ) ::oWidget:connect( "rejected()" , {|p| ::execSlot( "rejected()" , p ) } ) -#if 0 +#if 0 ::oWidget:connect( "accepted()" , {|p| ::execSlot( "accepted()" , p ) } ) ::oWidget:connect( "finished(int)" , {|p| ::execSlot( "finished(int)" , p ) } ) ::oWidget:connect( "currentChanged(QString)" , {|p| ::execSlot( "currentChanged(QString)" , p ) } ) @@ -162,7 +162,7 @@ METHOD XbpFileDialog:connect() ::oWidget:connect( "filterSelected(QString)" , {|p| ::execSlot( "filterSelected(QString)" , p ) } ) #endif - RETURN NIL + RETURN NIL /*----------------------------------------------------------------------*/ @@ -170,8 +170,8 @@ METHOD XbpFileDialog:disconnect() ::oWidget:disconnect( "rejected()" ) ::oWidget:disconnect( "finished(int)" ) - -#if 0 + +#if 0 ::oWidget:disconnect( "accepted()" ) ::oWidget:disconnect( "finished(int)" ) ::oWidget:disconnect( "currentChanged(QString)" ) @@ -181,7 +181,7 @@ METHOD XbpFileDialog:disconnect() ::oWidget:disconnect( "filterSelected(QString)" ) #endif - RETURN NIL + RETURN NIL /*----------------------------------------------------------------------*/ @@ -233,11 +233,11 @@ METHOD XbpFileDialog:open( cDefaultFile, lCenter, lAllowMultiple, lCreateNewFile ::oWidget:setDefaultSuffix( ::defExtension ) ENDIF - IF hb_isChar( ::title ) + IF HB_ISSTRING( ::title ) ::oWidget:setWindowTitle( ::title ) ENDIF - IF hb_isChar( cDefaultFile ) + IF HB_ISSTRING( cDefaultFile ) hb_fNameSplit( cDefaultFile, @cPath, @cFile, @cExt ) //::oWidget:setDirectory( cFile ) ::oWidget:setDirectory( cDefaultFile ) @@ -290,11 +290,11 @@ METHOD XbpFileDialog:saveAs( cDefaultFile, lFileList, lCenter ) ::oWidget:setDefaultSuffix( ::defExtension ) ENDIF - IF hb_isChar( ::title ) + IF HB_ISSTRING( ::title ) ::oWidget:setWindowTitle( ::title ) ENDIF - IF hb_isChar( cDefaultFile ) + IF HB_ISSTRING( cDefaultFile ) ::oWidget:setDirectory( cDefaultFile ) ENDIF diff --git a/harbour/contrib/hbxbp/xbplistbox.prg b/harbour/contrib/hbxbp/xbplistbox.prg index c3cc9e24c1..6dc9609c2c 100644 --- a/harbour/contrib/hbxbp/xbplistbox.prg +++ b/harbour/contrib/hbxbp/xbplistbox.prg @@ -347,7 +347,7 @@ METHOD XbpListBox:clear( lConnect ) #if 0 ::disConnect() #endif - + FOR EACH qItm IN ::aItems qItm := NIL NEXT @@ -361,7 +361,7 @@ METHOD XbpListBox:clear( lConnect ) IF lConnect ::connect() ENDIF - #endif + #endif RETURN .t. /*----------------------------------------------------------------------*/ @@ -447,7 +447,7 @@ METHOD XbpListBox:setItemColorFG( nIndex, aRGB ) ::aItems[ nIndex ]:setForeGround( QBrush( QColor( aRGB[ 1 ], aRGB[ 2 ], aRGB[ 3 ] ) ) ) ::nOldIndex := nIndex - ELSEIF hb_isChar( nIndex ) + ELSEIF HB_ISSTRING( nIndex ) IF ( nIndex := ascan( ::aItems, {|o| o:text() == nIndex } ) ) > 0 IF ::nOldIndex > 0 .AND. ::nOldIndex <= len( ::aItems ) ::aItems[ ::nOldIndex ]:setForeGround( QBrush( QColor( 0,0,0 ) ) ) diff --git a/harbour/contrib/hbxbp/xbpmenubar.prg b/harbour/contrib/hbxbp/xbpmenubar.prg index 7d036ed812..8d2b727df0 100644 --- a/harbour/contrib/hbxbp/xbpmenubar.prg +++ b/harbour/contrib/hbxbp/xbpmenubar.prg @@ -350,7 +350,7 @@ METHOD xbpMenuBar:placeItem( xCaption, bAction, nStyle, nAttrb, nMode, nPos ) CASE cType == "O" cCaption := IIF( bAction == NIL, xCaption:title, bAction ) aItem := { QMF_POPUP, xCaption:oWidget, cCaption, xCaption, NIL } - IF hb_isChar( cCaption ) + IF HB_ISSTRING( cCaption ) xCaption:oWidget:setTitle( strtran( cCaption, '~','&' ) ) ENDIF diff --git a/harbour/contrib/hbxbp/xbpmle.prg b/harbour/contrib/hbxbp/xbpmle.prg index 74dfa5e0bc..263fedbfdb 100644 --- a/harbour/contrib/hbxbp/xbpmle.prg +++ b/harbour/contrib/hbxbp/xbpmle.prg @@ -312,7 +312,7 @@ METHOD XbpMLE:setMarked( aStartEnd ) METHOD XbpMLE:insert( nPos, cString ) LOCAL qCursor - IF hb_isChar( cString ) + IF HB_ISSTRING( cString ) qCursor := ::oWidget:textCursor() IF HB_ISNUMERIC( nPos ) .AND. nPos >= 0 qCursor:setPosition( nPos ) diff --git a/harbour/contrib/hbxbp/xbpprinter.prg b/harbour/contrib/hbxbp/xbpprinter.prg index 89afd2bc5a..7f58a8f267 100644 --- a/harbour/contrib/hbxbp/xbpprinter.prg +++ b/harbour/contrib/hbxbp/xbpprinter.prg @@ -149,7 +149,7 @@ METHOD XbpPrinter:create( cDeviceName, nSpoolFormat, cDeviceParams ) ::oWidget := QPrinter() - IF hb_isChar( cDeviceName ) + IF HB_ISSTRING( cDeviceName ) ::oWidget:setPrinterName( cDeviceName ) ENDIF IF !::oWidget:isValid() @@ -460,7 +460,7 @@ METHOD XbpPrinter:setPaperBin( nBin ) METHOD XbpPrinter:setPrintFile( cFileName ) LOCAL cOldFileName := ::oWidget:outputFileName() - IF hb_isChar( cFileName ) + IF HB_ISSTRING( cFileName ) ::oWidget:setOutputFileName( cFileName ) ENDIF diff --git a/harbour/contrib/hbxbp/xbppushbutton.prg b/harbour/contrib/hbxbp/xbppushbutton.prg index bd7e8a1694..1e7283553a 100644 --- a/harbour/contrib/hbxbp/xbppushbutton.prg +++ b/harbour/contrib/hbxbp/xbppushbutton.prg @@ -223,7 +223,7 @@ METHOD XbpPushButton:setCaption( xCaption, cDll ) HB_SYMBOL_UNUSED( cDll ) - IF hb_isChar( xCaption ) + IF HB_ISSTRING( xCaption ) ::caption := xCaption IF hb_FileExists( xCaption ) diff --git a/harbour/contrib/hbxbp/xbpradiobutton.prg b/harbour/contrib/hbxbp/xbpradiobutton.prg index adbfbe313b..eeb7cf8eab 100644 --- a/harbour/contrib/hbxbp/xbpradiobutton.prg +++ b/harbour/contrib/hbxbp/xbpradiobutton.prg @@ -180,7 +180,7 @@ METHOD XbpRadioButton:configure( oParent, oOwner, aPos, aSize, aPresParams, lVis METHOD XbpRadioButton:setCaption( xCaption ) - IF hb_isChar( xCaption ) + IF HB_ISSTRING( xCaption ) ::caption := xCaption ::oWidget:setText( xCaption ) ENDIF diff --git a/harbour/contrib/hbxbp/xbprtf.prg b/harbour/contrib/hbxbp/xbprtf.prg index 4a89daf89f..f4d3fb7981 100644 --- a/harbour/contrib/hbxbp/xbprtf.prg +++ b/harbour/contrib/hbxbp/xbprtf.prg @@ -315,7 +315,7 @@ METHOD XbpRtf:find( cSearchString, nStart, nEnd, nOptions ) HB_SYMBOL_UNUSED( nEnd ) HB_SYMBOL_UNUSED( nOptions ) - IF hb_isChar( cSearchString ) + IF HB_ISSTRING( cSearchString ) ::oTextDocument := ::oWidget:document() ::oTextCursor := ::oTextDocument:find( cSearchString ) ::oCurCursor := ::oTextCursor @@ -531,7 +531,7 @@ METHOD XbpRtf:selFontName( ... ) // "" LOCAL xRet := 0 LOCAL aP := hb_aParams() - IF len( aP ) >= 1 .and. hb_isChar( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISSTRING( aP[ 1 ] ) ::oTextCharFormat := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() xRet := ::oTextCharFormat:fontFamily() @@ -676,7 +676,7 @@ METHOD XbpRtf:selText( ... ) // "" IF ::oCurCursor:hasSelection() xRet := ::oCurCursor:selectedText() ENDIF - IF len( aP ) >= 1 .and. hb_isChar( aP[ 1 ] ) + IF len( aP ) >= 1 .and. HB_ISSTRING( aP[ 1 ] ) ::oCurCursor:removeSelectedText() ::oCurCursor:insertText( aP[ 1 ] ) ENDIF @@ -703,7 +703,7 @@ METHOD XbpRtf:text( ... ) // "" LOCAL xRet := ::oWidget:toPlainText() LOCAL aP := hb_aParams() - IF len( aP ) == 1 .and. hb_isChar( aP[ 1 ] ) + IF len( aP ) == 1 .and. HB_ISSTRING( aP[ 1 ] ) ::oWidget:setPlainText( aP[ 1 ] ) ENDIF @@ -717,7 +717,7 @@ METHOD XbpRtf:textRTF( ... ) // "" LOCAL xRet := ::oWidget:toHtml() LOCAL aP := hb_aParams() - IF len( aP ) == 1 .and. hb_isChar( aP[ 1 ] ) + IF len( aP ) == 1 .and. HB_ISSTRING( aP[ 1 ] ) ::oWidget:setHTML( aP[ 1 ] ) ENDIF diff --git a/harbour/contrib/hbxbp/xbpstatic.prg b/harbour/contrib/hbxbp/xbpstatic.prg index c845ec7c66..03fe743477 100644 --- a/harbour/contrib/hbxbp/xbpstatic.prg +++ b/harbour/contrib/hbxbp/xbpstatic.prg @@ -296,7 +296,7 @@ METHOD XbpStatic:setCaption( xCaption, cDll ) ENDIF ::oWidget:setPixmap( QPixmap():fromImage( ::caption:oWidget ) ) - ELSEIF hb_isChar( ::caption ) /* $HARBOUR$ */ + ELSEIF HB_ISSTRING( ::caption ) /* $HARBOUR$ */ IF ::options == XBPSTATIC_BITMAP_SCALED ::setCSSAttribute( "XBPSTATIC_BITMAP_SCALED" , 'border-image: url(' + ::caption + ');' ) ELSE diff --git a/harbour/contrib/hbxbp/xbpstatusbar.prg b/harbour/contrib/hbxbp/xbpstatusbar.prg index b9a795ad40..2c51ed3568 100644 --- a/harbour/contrib/hbxbp/xbpstatusbar.prg +++ b/harbour/contrib/hbxbp/xbpstatusbar.prg @@ -224,7 +224,7 @@ METHOD XbpStatusBar:delItem( nItemORcKey ) METHOD XbpStatusBar:getItem( nItemORcKey ) LOCAL nIndex := 0, oPanel - IF hb_isChar( nItemORcKey ) + IF HB_ISSTRING( nItemORcKey ) nIndex := ascan( ::aItems, {|o| o:key == nItemORcKey } ) ELSEIF HB_ISNUMERIC( nItemORcKey ) diff --git a/harbour/contrib/hbxbp/xbptreeview.prg b/harbour/contrib/hbxbp/xbptreeview.prg index ab76725372..2d377638b9 100644 --- a/harbour/contrib/hbxbp/xbptreeview.prg +++ b/harbour/contrib/hbxbp/xbptreeview.prg @@ -471,7 +471,7 @@ METHOD XbpTreeViewItem:setExpandedImage( nResIdoBitmap ) METHOD XbpTreeViewItem:setImage( xIcon ) - ::oWidget:setIcon( 0, iif( hb_isChar( xIcon ), QIcon( xIcon ), xIcon ) ) + ::oWidget:setIcon( 0, iif( HB_ISSTRING( xIcon ), QIcon( xIcon ), xIcon ) ) RETURN self diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg index 0425846de8..d3df6b9b58 100644 --- a/harbour/contrib/hbxbp/xbpwindow.prg +++ b/harbour/contrib/hbxbp/xbpwindow.prg @@ -407,7 +407,7 @@ METHOD XbpWindow:postCreate() ::status := iif( ::oWidget:hasValidPointer(), XBP_STAT_CREATE, XBP_STAT_FAILURE ) - IF ! empty( ::toolTipText ) .AND. hb_isChar( ::toolTipText ) + IF ! empty( ::toolTipText ) .AND. HB_ISSTRING( ::toolTipText ) ::oWidget:setTooltip( ::toolTipText ) ENDIF @@ -565,7 +565,7 @@ METHOD XbpWindow:clearSlots() METHOD XbpWindow:grabEvent( nEvent, oEvent ) LOCAL nXbpKey, oP0, oP1, oObj_O, oObj_N - HB_TRACE( HB_TR_DEBUG, nEvent, valtype( oEvent ), __objGetClsName( oEvent ) ) + HB_TRACE( HB_TR_DEBUG, nEvent, valtype( oEvent ), __objGetClsName( oEvent ) ) SWITCH ( nEvent ) @@ -1218,7 +1218,7 @@ METHOD XbpWindow:isDerivedFrom( cClassORoObject ) /* Compares without Xbp or Wvg prefixes */ - IF hb_isChar( cClassORoObject ) + IF HB_ISSTRING( cClassORoObject ) RETURN __clsParent( Self:classH, cClassORoObject ) ELSEIF HB_ISOBJECT( cClassORoObject ) @@ -1337,7 +1337,7 @@ METHOD XbpWindow:hasInputFocus() METHOD XbpWindow:title( cTitle ) LOCAL xTitle := ::cTitle - IF hb_isChar( cTitle ) + IF HB_ISSTRING( cTitle ) ::cTitle := cTitle IF HB_ISOBJECT( ::oWidget ) ::oWidget:setWindowTitle( ::cTitle )