diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 69c86f3ca7..a4e35222a2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,39 @@ The license applies to all entries newer than 2009-04-28. */ +2012-07-10 02:14 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/hbqreportsmanager.prg + * contrib/hbide/ideactions.prg + * contrib/hbide/idebrowse.prg + * contrib/hbide/idechangelog.prg + * contrib/hbide/ideconsole.prg + * contrib/hbide/idedict.prg + * contrib/hbide/idedocks.prg + * contrib/hbide/idedocwriter.prg + * contrib/hbide/ideedit.prg + * contrib/hbide/ideeditor.prg + * contrib/hbide/idefindreplace.prg + * contrib/hbide/idefunctions.prg + * contrib/hbide/ideharbourhelp.prg + * contrib/hbide/idehome.prg + * contrib/hbide/idemain.prg + * contrib/hbide/idemisc.prg + * contrib/hbide/ideplugins.prg + * contrib/hbide/ideprojmanager.prg + * contrib/hbide/idesaveload.prg + * contrib/hbide/ideshortcuts.prg + * contrib/hbide/ideskeletons.prg + * contrib/hbide/idestylesheets.prg + * contrib/hbide/idetags.prg + * contrib/hbide/idethemes.prg + * contrib/hbide/idetools.prg + * contrib/hbide/ideuisrcmanager.prg + * contrib/hbide/idewizard.prg + - Removed: qObj[ cObjName ] to current syntax. + % Started: to make it unicode compliant but struck + in between while global find/replaced left me + in static state. So I need to commit. + 2012-07-10 02:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqtgui.hbm * contrib/hbqt/qtgui/hbqtgui.hbx diff --git a/harbour/contrib/hbide/hbqreportsmanager.prg b/harbour/contrib/hbide/hbqreportsmanager.prg index 1e66cd2404..c62349f981 100644 --- a/harbour/contrib/hbide/hbqreportsmanager.prg +++ b/harbour/contrib/hbide/hbqreportsmanager.prg @@ -885,7 +885,7 @@ METHOD HbqReportsManager:loadReport( xData ) ELSE ::lNew := .f. - IF len( xData ) <= 300 .AND. hb_fileExists( xData ) + IF Len( xData ) <= 300 .AND. hb_fileExists( xData ) ::cSaved := xData cBuffer := hb_utf8tostr( hb_memoread( xData ) ) @@ -1424,7 +1424,7 @@ STATIC FUNCTION rmgr_a2arrayStr( aArray ) ENDSWITCH s += "," NEXT - s := iif( len( s ) == 1, s, substr( s, 1, len( s ) - 1 ) ) + "}" + s := iif( Len( s ) == 1, s, substr( s, 1, len( s ) - 1 ) ) + "}" RETURN s @@ -1523,12 +1523,12 @@ STATIC FUNCTION fetchBarString( cCode, lCheck, nType ) DO CASE CASE nType == HQR_BARCODE_3OF9 cCode := upper( cCode ) - IF len( cCode ) > 32 + IF Len( cCode ) > 32 cCode := left( cCode,32 ) ENDIF cCode := '*' + cCode + '*' - FOR n := 1 TO len( cCode ) + FOR n := 1 TO Len( cCode ) cCar := substr( cCode,n,1 ) m := at( cCar, cCars ) IF m > 0 @@ -1899,7 +1899,7 @@ METHOD HqrGraphicsItem:setText( ... ) METHOD HqrGraphicsItem:setTextFlags( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 EXIT OTHERWISE @@ -1915,7 +1915,7 @@ METHOD HqrGraphicsItem:setTextFlags( ... ) METHOD HqrGraphicsItem:setPen( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 IF empty( ::qPen ) ::qPen := QPen( Qt_black ) @@ -1936,7 +1936,7 @@ METHOD HqrGraphicsItem:setPen( ... ) METHOD HqrGraphicsItem:setBrush( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 IF empty( ::qBrush ) ::qBrush := QBrush() @@ -1957,7 +1957,7 @@ METHOD HqrGraphicsItem:setBrush( ... ) METHOD HqrGraphicsItem:setBackgroundBrush( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 IF empty( ::qBgBrush ) ::qBgBrush := QBrush() @@ -1978,7 +1978,7 @@ METHOD HqrGraphicsItem:setBackgroundBrush( ... ) METHOD HqrGraphicsItem:setFont( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 IF empty( ::qFont ) ::qFont := QFont( "Serif" ) @@ -2003,7 +2003,7 @@ METHOD HqrGraphicsItem:setFont( ... ) METHOD HqrGraphicsItem:setBarcodeType( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 EXIT OTHERWISE @@ -2019,7 +2019,7 @@ METHOD HqrGraphicsItem:setBarcodeType( ... ) METHOD HqrGraphicsItem:setGradient( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 IF empty( ::qGBrush ) ::qGBrush := QBrush() @@ -2040,7 +2040,7 @@ METHOD HqrGraphicsItem:setGradient( ... ) METHOD HqrGraphicsItem:setPixmap( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 IF empty( ::qPixmap ) ::qPixmap := QPixmap() @@ -2061,7 +2061,7 @@ METHOD HqrGraphicsItem:setPixmap( ... ) METHOD HqrGraphicsItem:setBorderWidth( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 EXIT OTHERWISE @@ -2077,7 +2077,7 @@ METHOD HqrGraphicsItem:setBorderWidth( ... ) METHOD HqrGraphicsItem:setWidth( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 RETURN ::oWidget:width() OTHERWISE @@ -2094,7 +2094,7 @@ METHOD HqrGraphicsItem:setWidth( ... ) METHOD HqrGraphicsItem:setHeight( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 RETURN ::oWidget:height() OTHERWISE @@ -2111,7 +2111,7 @@ METHOD HqrGraphicsItem:setHeight( ... ) METHOD HqrGraphicsItem:setGeometry( ... ) LOCAL qRectF, qPos, a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 qPos := ::oWidget:pos() RETURN QRectF( qPos:x(), qPos:y(), ::width(), ::height() ) @@ -2137,7 +2137,7 @@ METHOD HqrGraphicsItem:setGeometry( ... ) METHOD HqrGraphicsItem:setPos( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 RETURN ::oWidget:pos() CASE 1 @@ -2157,7 +2157,7 @@ METHOD HqrGraphicsItem:setPos( ... ) METHOD HqrGraphicsItem:setLineStyle( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 EXIT OTHERWISE @@ -2173,7 +2173,7 @@ METHOD HqrGraphicsItem:setLineStyle( ... ) METHOD HqrGraphicsItem:setBackgroundMode( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 EXIT OTHERWISE @@ -2189,7 +2189,7 @@ METHOD HqrGraphicsItem:setBackgroundMode( ... ) METHOD HqrGraphicsItem:setOpacity( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 EXIT OTHERWISE @@ -2205,7 +2205,7 @@ METHOD HqrGraphicsItem:setOpacity( ... ) METHOD HqrGraphicsItem:setLineType( ... ) LOCAL a_:= hb_aParams() - SWITCH len( a_ ) + SWITCH Len( a_ ) CASE 0 EXIT OTHERWISE @@ -2455,10 +2455,10 @@ METHOD HqrGraphicsItem:drawBarcode( qPainter, qRectF ) rc := qRectF:adjusted( 5, 5, -10, -10 ) cCode := fetchBarString( ::text() ) - w := rc:width() / len( cCode ) + w := rc:width() / Len( cCode ) x := 0.0 - FOR i := 1 TO len( cCode ) + FOR i := 1 TO Len( cCode ) IF substr( cCode, i, 1 ) == "1" qPainter:fillRect( QRectF( rc:x() + x, rc:y(), w, rc:height() ), QColor( Qt_black ) ) ELSE @@ -2600,7 +2600,7 @@ METHOD HqrGraphicsItem:drawChart( qPainter, qRect ) cMaxVal := hb_ntos( absMaxVal ) nDec := at( ".", cMaxVal ) - powVal := iif( absMaxVal < 1, 10.0 ^ ( len( substr( cMaxVal, nDec+1 ) ) + 1 ), 1 ) + powVal := iif( absMaxVal < 1, 10.0 ^ ( Len( substr( cMaxVal, nDec+1 ) ) + 1 ), 1 ) maxpv *= powVal minnv *= powVal @@ -2618,7 +2618,7 @@ METHOD HqrGraphicsItem:drawChart( qPainter, qRect ) rc := qRect:adjusted( pw / 2, pw / 2, -pw, -pw ) f := 2 - chartStep := ( 10.0 ^ ( len( substr( cMaxVal, 1, nDec - 1 ) ) - 1 ) ) / f + chartStep := ( 10.0 ^ ( Len( substr( cMaxVal, 1, nDec - 1 ) ) - 1 ) ) / f powStep := iif( chartStep < 1, 10, 1 ) chartStep *= powStep maxpv *= powStep @@ -2667,7 +2667,7 @@ METHOD HqrGraphicsItem:drawChart( qPainter, qRect ) rc := rc:adjusted( 0, nFHeight / 2, 0, 0 ) x := m_barsIdentation - barWidth := ( rc:width() - m_barsIdentation * ( len( ::xData ) + 1 ) ) / len( ::xData ) + barWidth := ( rc:width() - m_barsIdentation * ( Len( ::xData ) + 1 ) ) / len( ::xData ) py := maxHeight / maxVal FOR EACH cv IN ::xData @@ -2693,7 +2693,7 @@ METHOD HqrGraphicsItem:drawChart( qPainter, qRect ) qPainter:drawRect( qRect ) qPainter:translate( qRect:topLeft() ) qreal y := 1 / UNIT - qreal vstep := ( qRect:height() - y - 1 / UNIT * val:size() ) / len( ::aData ) + qreal vstep := ( qRect:height() - y - 1 / UNIT * val:size() ) / Len( ::aData ) FOR EACH cv IN ::aData { qPainter:fillRect( QRectF( 1 / UNIT / 2, y, m_legendColorqRectWidth, vstep ), QBrush( cv[ 3 ] ) ) diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index 7427220626..b8ab7e13e1 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -704,7 +704,7 @@ FUNCTION hbide_mnuAddFileToMRU( oIde, cFileName, cType ) hb_aDel( a_, nPos, .T. ) ENDIF - ASize( a_, len( a_ ) + 1 ) + ASize( a_, Len( a_ ) + 1 ) AIns( a_, 1 ) a_[ 1 ] := cFileName diff --git a/harbour/contrib/hbide/idebrowse.prg b/harbour/contrib/hbide/idebrowse.prg index 197f55c82b..8f97a840bd 100644 --- a/harbour/contrib/hbide/idebrowse.prg +++ b/harbour/contrib/hbide/idebrowse.prg @@ -458,8 +458,8 @@ METHOD IdeBrowseManager:getBrowserByAlias( cAlias ) METHOD IdeBrowseManager:dispStatusInfo() - ::aStatusPnls[ PNL_PANELS ]:setText( "Panels: " + hb_ntos( len( ::aPanels ) ) + ":" + ::oCurPanel:cPanel ) - ::aStatusPnls[ PNL_TABLES ]:setText( "Tables: " + hb_ntos( len( ::oCurPanel:aBrowsers ) ) ) + ::aStatusPnls[ PNL_PANELS ]:setText( "Panels: " + hb_ntos( Len( ::aPanels ) ) + ":" + ::oCurPanel:cPanel ) + ::aStatusPnls[ PNL_TABLES ]:setText( "Tables: " + hb_ntos( Len( ::oCurPanel:aBrowsers ) ) ) ::aStatusPnls[ PNL_MISC ]:setText( "M:" ) ::aStatusPnls[ PNL_READY ]:setText( "Ready" ) @@ -728,7 +728,7 @@ METHOD IdeBrowseManager:execEvent( cEvent, p, p1 ) EXIT CASE "buttonScrollToLast_clicked" IF !empty( ::oCurBrw ) - ::oCurBrw:toColumn( len( ::oCurBrw:aStruct ) ) + ::oCurBrw:toColumn( Len( ::oCurBrw:aStruct ) ) ENDIF EXIT CASE "buttonSearchInTable_clicked" @@ -741,7 +741,7 @@ METHOD IdeBrowseManager:execEvent( cEvent, p, p1 ) CASE "buttonCopyStruct_clicked" IF !empty( aStruct := ::oCurBrw:dbStruct() ) i := 0 - aeval( aStruct, {|e_| iif( len( e_[ 1 ] ) > i, i := len( e_[ 1 ] ), NIL ) } ) + aeval( aStruct, {|e_| iif( Len( e_[ 1 ] ) > i, i := len( e_[ 1 ] ), NIL ) } ) i += 2 cTmp := " LOCAL aStruct := {" @@ -749,7 +749,7 @@ METHOD IdeBrowseManager:execEvent( cEvent, p, p1 ) pad( '"' + e_[ 1 ] + '"', i ) + ', "' + e_[ 2 ] + '", ' + ; str( e_[ 3 ], 4, 0 ) + ', ' + ; str( e_[ 4 ], 2, 0 ) + ' }' + ; - iif( len( aStruct ) == n, " }", ",;" ) + hb_eol() } ) + iif( Len( aStruct ) == n, " }", ",;" ) + hb_eol() } ) QClipboard():setText( cTmp ) ENDIF @@ -868,7 +868,7 @@ METHOD IdeBrowseManager:populateUiStruct() ::qStruct:q_tableFields:clearContents() - oTbl:setRowCount( len( aStruct ) ) + oTbl:setRowCount( Len( aStruct ) ) n := 0 FOR EACH fld_ IN aStruct @@ -925,11 +925,11 @@ METHOD IdeBrowseManager:buildUiStruct() oTbl:verticalHeader():hide() oTbl:horizontalHeader():setStretchLastSection( .t. ) oTbl:setAlternatingRowColors( .t. ) - oTbl:setColumnCount( len( hdr_ ) ) + oTbl:setColumnCount( Len( hdr_ ) ) oTbl:setShowGrid( .t. ) oTbl:setSelectionMode( QAbstractItemView_SingleSelection ) oTbl:setSelectionBehavior( QAbstractItemView_SelectRows ) - FOR n := 1 TO len( hdr_ ) + FOR n := 1 TO Len( hdr_ ) qItm := QTableWidgetItem() qItm:setText( hdr_[ n,1 ] ) oTbl:setHorizontalHeaderItem( n-1, qItm ) @@ -1350,7 +1350,7 @@ METHOD IdeBrowsePanel:tileVertically() qObj := ::activeSubWindow() qVPort := ::viewport() - nH := qVPort:height() / len( ::aBrowsers ) + nH := qVPort:height() / Len( ::aBrowsers ) nW := qVPort:width() nT := 0 FOR EACH a_ IN ::aBrowsers @@ -1368,7 +1368,7 @@ METHOD IdeBrowsePanel:tileHorizontally() qObj := ::activeSubWindow() qVPort := ::viewport() nH := qVPort:height() - nW := qVPort:width() / len( ::aBrowsers ) + nW := qVPort:width() / Len( ::aBrowsers ) nT := 0 nL := 0 FOR EACH a_ IN ::aBrowsers @@ -1521,7 +1521,7 @@ METHOD IdeBrowsePanel:addBrowser( aInfo ) /*------------------------------------------------------------------------*/ METHOD IdeBrowsePanel:activateBrowser() - IF len( ::aBrowsers ) > 0 + IF Len( ::aBrowsers ) > 0 ::qWidget:setActiveSubWindow( ::aBrowsers[ 1, SUB_WINDOW ] ) ENDIF RETURN Self @@ -1621,7 +1621,7 @@ CLASS IdeBrowse INHERIT IdeObject METHOD getIndexInfo() METHOD setIndex( cIndex ) METHOD setOrder( nOrder ) - ACCESS numIndexes() INLINE len( ::aIndex ) + ACCESS numIndexes() INLINE Len( ::aIndex ) METHOD dispInfo() METHOD search( cSearch, lSoft, lLast, nMode ) @@ -1742,7 +1742,7 @@ METHOD IdeBrowse:create( oIde, oManager, oPanel, aInfo ) aadd( ::aStruct, 1 ) aadd( ::aStruct, 0 ) ELSE - aadd( ::aStruct, len( xVrb ) ) + aadd( ::aStruct, Len( xVrb ) ) aadd( ::aStruct, 0 ) ENDIF NEXT @@ -1820,7 +1820,7 @@ METHOD IdeBrowse:buildBrowser() /* Form View */ ::qForm := QWidget() - ::qForm:setMinimumSize( QSize( 300 , len( ::aStruct ) * 34 ) ) + ::qForm:setMinimumSize( QSize( 300 , Len( ::aStruct ) * 34 ) ) ::qForm:setMaximumSize( QSize( 12000, 48000 ) ) ::qFLayout := QFormLayout() @@ -2048,7 +2048,7 @@ METHOD IdeBrowse:buildContextMenu() ::qMdi:setFocus( 0 ) - IF len( ::aIndex ) > 0 + IF Len( ::aIndex ) > 0 aadd( ::aMenu, { "Set to Natural Order", {|| ::setOrder( 0 ) } } ) aadd( ::aMenu, { "" } ) ENDIF @@ -2064,7 +2064,7 @@ METHOD IdeBrowse:buildContextMenu() ENDIF /* Column Scrolling */ - nZeros := iif( len( ::aStruct ) < 10, 1, iif( len( ::aStruct ) < 100, 2, 3 ) ) + nZeros := iif( Len( ::aStruct ) < 10, 1, iif( len( ::aStruct ) < 100, 2, 3 ) ) FOR EACH a_ IN ::aStruct cPmt := strzero( a_:__enumIndex(), nZeros ) + " " + a_[ 2 ] + " . " + a_[ 1 ] aadd( ::aFlds, hbide_fieldsArray( Self, cPmt, a_:__enumIndex() ) ) @@ -2230,7 +2230,7 @@ METHOD IdeBrowse:skipBlock( nHowMany ) ENDIF ELSE - nRecs := len( ::aData ) + nRecs := Len( ::aData ) nCurPos := ::nIndex IF nHowMany >= 0 @@ -2458,7 +2458,7 @@ METHOD IdeBrowse:ordKeyGoto( nRec ) ( ::cAlias )->( OrdKeyGoto( nRec ) ) ::refreshAll() ELSE - IF nRec > 0 .AND. nRec <= len( ::aData ) + IF nRec > 0 .AND. nRec <= Len( ::aData ) ::nIndex := nRec ENDIF ENDIF @@ -2473,7 +2473,7 @@ METHOD IdeBrowse:goto( nRec ) ( ::cAlias )->( DbGoto( nRec ) ) ::refreshAll() ELSE - IF nRec > 0 .AND. nRec <= len( ::aData ) + IF nRec > 0 .AND. nRec <= Len( ::aData ) ::nIndex := nRec ENDIF ENDIF @@ -2500,7 +2500,7 @@ METHOD IdeBrowse:goBottom() ( ::cAlias )->( DbGoBottom() ) ::refreshAll() ELSE - ::nIndex := len( ::aData ) + ::nIndex := Len( ::aData ) ENDIF RETURN NIL @@ -2557,7 +2557,7 @@ METHOD IdeBrowse:ordKeyCount() IF ::nType == BRW_TYPE_DBF RETURN ( ::cAlias )->( ordKeyCount() ) ELSE - RETURN len( ::aData ) + RETURN Len( ::aData ) ENDIF RETURN 0 @@ -2569,7 +2569,7 @@ METHOD IdeBrowse:lastRec() IF ::nType == BRW_TYPE_DBF RETURN ( ::cAlias )->( LastRec() ) ELSE - RETURN len( ::aData ) + RETURN Len( ::aData ) ENDIF RETURN 0 diff --git a/harbour/contrib/hbide/idechangelog.prg b/harbour/contrib/hbide/idechangelog.prg index a057c28c57..e8d9c1882f 100644 --- a/harbour/contrib/hbide/idechangelog.prg +++ b/harbour/contrib/hbide/idechangelog.prg @@ -483,7 +483,7 @@ METHOD IdeChangeLog:buildLogEntry() STATIC FUNCTION hbide_howManyPreSpaces( cStr ) LOCAL i, n := 0 - FOR i := 1 TO len( cStr ) + FOR i := 1 TO Len( cStr ) IF ! ( substr( cStr, i, 1 ) == " " ) EXIT ENDIF diff --git a/harbour/contrib/hbide/ideconsole.prg b/harbour/contrib/hbide/ideconsole.prg index 38a0f5f642..073e54c327 100644 --- a/harbour/contrib/hbide/ideconsole.prg +++ b/harbour/contrib/hbide/ideconsole.prg @@ -522,7 +522,7 @@ METHOD hbCUIEditor:scrBuildFromBuffer( cBuffer, cScreen ) IF ( nStart := at( cTokenB, cBuffer ) ) > 0 IF ( nEnd := at( cTokenE, cBuffer ) ) > 0 - cCode := substr( cBuffer, nStart + len( cTokenB ), nEnd - nStart - 1 - len( cTokenB ) ) + cCode := substr( cBuffer, nStart + Len( cTokenB ), nEnd - nStart - 1 - len( cTokenB ) ) aCode := hb_aTokens( strtran( cCode, chr( 13 ), chr( 10 ) ), chr( 10 ) ) IF ! empty( aCode ) aAttr := {} @@ -545,7 +545,7 @@ METHOD hbCUIEditor:scrBuildFromBuffer( cBuffer, cScreen ) CASE OBJ_O_BOX aMatches := hb_regExAll( "^@|\bBOX\b|\bCOLOR\b", cLine, .f., .f., 0, 1, .f. ) - IF ! empty( nLen := len( aMatches ) ) + IF ! empty( nLen := Len( aMatches ) ) o_:= ::scrObjBlank() // o_[ OBJ_TYPE ] := OBJ_O_BOX @@ -577,7 +577,7 @@ METHOD hbCUIEditor:scrBuildFromBuffer( cBuffer, cScreen ) s := alltrim( s ) s := strtran( s, '"', "" ) o_[ OBJ_BOX_SHAPE ] := substr( s, 1, 8 ) - o_[ OBJ_PATTERN ] := iif( len( s ) == 9, "FILLED", "CLEAR" ) + o_[ OBJ_PATTERN ] := iif( Len( s ) == 9, "FILLED", "CLEAR" ) EXIT CASE "COLOR" @@ -592,7 +592,7 @@ METHOD hbCUIEditor:scrBuildFromBuffer( cBuffer, cScreen ) CASE OBJ_O_TEXT aMatches := hb_regExAll( "^@|\bSAY\b|\bCOLOR\b", cLine, .f., .f., 0, 1, .f. ) - IF ! empty( nLen := len( aMatches ) ) + IF ! empty( nLen := Len( aMatches ) ) o_:= ::scrObjBlank() // o_[ OBJ_TYPE ] := OBJ_O_TEXT @@ -623,12 +623,12 @@ METHOD hbCUIEditor:scrBuildFromBuffer( cBuffer, cScreen ) s := aAttr[ 6 ] ELSE s := alltrim( s ) - s := substr( s, 2, len( s ) - 2 ) + s := substr( s, 2, Len( s ) - 2 ) o_[ OBJ_TEXT ] := s ENDIF o_[ OBJ_TO_ROW ] := o_[ OBJ_ROW ] - o_[ OBJ_TO_COL ] := o_[ OBJ_COL ] + len( s ) - 1 - o_[ OBJ_F_LEN ] := len( s ) + o_[ OBJ_TO_COL ] := o_[ OBJ_COL ] + Len( s ) - 1 + o_[ OBJ_F_LEN ] := Len( s ) EXIT CASE "COLOR" @@ -643,7 +643,7 @@ METHOD hbCUIEditor:scrBuildFromBuffer( cBuffer, cScreen ) CASE OBJ_O_FIELD aMatches := hb_regExAll( "^@|\bGET\b|\bPICTURE\b|\bCOLOR\b|\bWHEN\b|\bVALID\b", cLine, .f., .f., 0, 1, .f. ) - IF ! empty( nLen := len( aMatches ) ) + IF ! empty( nLen := Len( aMatches ) ) o_:= ::scrObjBlank() // o_[ OBJ_TYPE ] := OBJ_O_FIELD @@ -680,7 +680,7 @@ METHOD hbCUIEditor:scrBuildFromBuffer( cBuffer, cScreen ) EXIT CASE "PICTURE" - IF aMatch:__enumIndex() < len( aMatches ) + IF aMatch:__enumIndex() < Len( aMatches ) n := aMatches[ aMatch:__enumIndex() + 1, 2 ] o_[ OBJ_F_PIC ] := alltrim( substr( cLine, aMatch[ 3 ] + 1, n - 1 - aMatch[ 3 ] ) ) ELSE @@ -689,7 +689,7 @@ METHOD hbCUIEditor:scrBuildFromBuffer( cBuffer, cScreen ) EXIT CASE "COLOR" - IF aMatch:__enumIndex() < len( aMatches ) + IF aMatch:__enumIndex() < Len( aMatches ) n := aMatches[ aMatch:__enumIndex() + 1, 2 ] o_[ OBJ_COLOR ] := alltrim( substr( cLine, aMatch[ 3 ] + 1, n - 1 - aMatch[ 3 ] ) ) ELSE @@ -698,7 +698,7 @@ METHOD hbCUIEditor:scrBuildFromBuffer( cBuffer, cScreen ) EXIT CASE "WHEN" - IF aMatch:__enumIndex() < len( aMatches ) + IF aMatch:__enumIndex() < Len( aMatches ) n := aMatches[ aMatch:__enumIndex() + 1, 2 ] o_[ OBJ_WHEN ] := alltrim( substr( cLine, aMatch[ 3 ] + 1, n - 1 - aMatch[ 3 ] ) ) ELSE @@ -707,7 +707,7 @@ METHOD hbCUIEditor:scrBuildFromBuffer( cBuffer, cScreen ) EXIT CASE "VALID" - IF aMatch:__enumIndex() < len( aMatches ) + IF aMatch:__enumIndex() < Len( aMatches ) n := aMatches[ aMatch:__enumIndex() + 1, 2 ] o_[ OBJ_VALID ] := alltrim( substr( cLine, aMatch[ 3 ] + 1, n - 1 - aMatch[ 3 ] ) ) ELSE @@ -762,14 +762,14 @@ METHOD hbCUIEditor:scrSave( lAsk ) nLenSay := nLenPic := nLenClr := nLenWhn := nLenVld := nLenGet := 0 - aeval( ::obj_, {|e_| iif( e_[ OBJ_TYPE ] == OBJ_O_FIELD, nLenGet := max( len( e_[ OBJ_ID ] ), nLenGet ), ; - iif( e_[ OBJ_TYPE ] == OBJ_O_TEXT , nLenSay := max( len( e_[ OBJ_TEXT ] ), nLenSay ), NIL ) ) } ) + aeval( ::obj_, {|e_| iif( e_[ OBJ_TYPE ] == OBJ_O_FIELD, nLenGet := max( Len( e_[ OBJ_ID ] ), nLenGet ), ; + iif( e_[ OBJ_TYPE ] == OBJ_O_TEXT , nLenSay := max( Len( e_[ OBJ_TEXT ] ), nLenSay ), NIL ) ) } ) nLenSay := iif( empty( nLenSay ), 0, nLenSay + 2 ) - aeval( ::obj_, {|e_| nLenClr := max( len( e_[ OBJ_COLOR ] ), nLenClr ) } ) - aeval( ::obj_, {|e_| nLenPic := max( len( e_[ OBJ_F_PIC ] ), nLenPic ) } ) - aeval( ::obj_, {|e_| nLenWhn := max( len( e_[ OBJ_WHEN ] ), nLenWhn ) } ) - aeval( ::obj_, {|e_| nLenVld := max( len( e_[ OBJ_VALID ] ), nLenVld ) } ) + aeval( ::obj_, {|e_| nLenClr := max( Len( e_[ OBJ_COLOR ] ), nLenClr ) } ) + aeval( ::obj_, {|e_| nLenPic := max( Len( e_[ OBJ_F_PIC ] ), nLenPic ) } ) + aeval( ::obj_, {|e_| nLenWhn := max( Len( e_[ OBJ_WHEN ] ), nLenWhn ) } ) + aeval( ::obj_, {|e_| nLenVld := max( Len( e_[ OBJ_VALID ] ), nLenVld ) } ) aadd( prg_, "/* HB_SCREEN_BEGINS <" + ::cScreen + "> */" ) aadd( prg_, " " ) @@ -869,7 +869,7 @@ METHOD hbCUIEditor:scrBuildSource( prg_, nIndent ) cP := space( nIndent ) aeval( prg_, {|e| s += cP + e + hb_eol() } ) - s := substr( s, 1, len( s ) - len( hb_eol() ) ) + s := substr( s, 1, Len( s ) - len( hb_eol() ) ) RETURN s @@ -886,12 +886,12 @@ METHOD hbCUIEditor:scrUpdateSource( prg_ ) IF ( nStart := at( cTokenB, cBuffer ) ) > 0 nEnd := at( cTokenE, cBuffer ) IF nEnd == 0 - nEnd := nStart + len( cTokenB ) + nEnd := nStart + Len( cTokenB ) ELSE - nEnd += len( cTokenE ) + nEnd += Len( cTokenE ) ENDIF cTmp := substr( cBuffer, 1, nStart - 1 ) - nIndent := nStart - hb_rat( hb_eol(), cTmp ) - len( hb_eol() ) + nIndent := nStart - hb_rat( hb_eol(), cTmp ) - Len( hb_eol() ) s := ::scrBuildSource( prg_, nIndent ) s := substr( cBuffer, 1, nStart - nIndent - 1 ) + s + substr( cBuffer, nEnd ) @@ -1016,7 +1016,7 @@ METHOD hbCUIEditor:scrUpdateUndo() METHOD hbCUIEditor:scrUndo() LOCAL nLast - IF ! empty( nLast := len( ::aUndo ) ) + IF ! empty( nLast := Len( ::aUndo ) ) ::obj_:= aclone( ::aUndo[ nLast ] ) hb_adel( ::aUndo, nLast, .t. ) ::xRefresh := OBJ_REFRESH_ALL @@ -1328,7 +1328,7 @@ METHOD hbCUIEditor:scrMove() ::cDrawFill ,; ::cClrPrev ) - FOR i := 1 TO len( ::obj_ ) + FOR i := 1 TO Len( ::obj_ ) IF ::obj_[ i,OBJ_ROW ] + ::nRowDis <= ::nBottom .AND. ; ::obj_[ i,OBJ_COL ] + ::nColDis <= ::nRight @@ -1413,7 +1413,7 @@ METHOD hbCUIEditor:scrMoveLine() ::cDrawFill ,; ::cClrPrev ) - FOR i := 1 TO len( ::obj_ ) + FOR i := 1 TO Len( ::obj_ ) nOff := ::obj_[ i, OBJ_COL ] + ::nColDis nRow := ::obj_[ i, OBJ_ROW ] + ::nRowDis nCol := nOff @@ -1506,7 +1506,7 @@ METHOD hbCUIEditor:scrDispGhost( gst_ ) METHOD hbCUIEditor:scrStatus() LOCAL s, typ_, objId, cS - cS := iif( len( ::cSource ) <= 20, ::cSource, substr( ::cSource, 1, 3 ) + ".." + right( ::cSource, 15 ) ) + cS := iif( Len( ::cSource ) <= 20, ::cSource, substr( ::cSource, 1, 3 ) + ".." + right( ::cSource, 15 ) ) dispbegin() s := pad( cS, 20 ) + CHR_PIPE @@ -1538,7 +1538,7 @@ METHOD hbCUIEditor:scrStatus() ENDIF s += pad( trim( objId ), 10 ) + CHR_PIPE - s += "U:" + hb_ntos( len( ::aUndo ) ) + s += "U:" + hb_ntos( Len( ::aUndo ) ) @ ::nRowStatus, ::nColStatus SAY pad( s, maxcol() + 1 ) COLOR ::cClrStatus @@ -1658,8 +1658,8 @@ METHOD hbCUIEditor:scrOrdGets() ENDIF NEXT IF ! empty( t_ ) - n_:= array( len( t_ ) ) - h_:= array( len( t_ ) ) + n_:= array( Len( t_ ) ) + h_:= array( Len( t_ ) ) aeval( t_, {|e_,i| e_:= e_, n_[ i ] := i } ) aeval( t_, {|e_,i| h_[ i ] := e_[ OBJ_ID ] } ) @@ -1667,7 +1667,7 @@ METHOD hbCUIEditor:scrOrdGets() B_MSG "Order GETS" CHOOSE h_ RESTORE SHADOW CENTER INTO n_ SELECTIONS NUMERIC // NUMBERED n_ ::scrMsg() - IF len( n_ ) != len( t_ ) + IF Len( n_ ) != len( t_ ) alert( "Must ORDER every field !" ) RETURN Self ENDIF @@ -1860,7 +1860,7 @@ METHOD hbCUIEditor:scrChkObj() NEXT IF !empty( a_ ) - IF len( a_ ) >= 2 + IF Len( a_ ) >= 2 RETURN a_[ 2 ] ELSE RETURN a_[ 1 ] @@ -1887,7 +1887,7 @@ METHOD hbCUIEditor:scrUpdObjRC() ::obj_[ nObj, OBJ_TO_COL ] := ::obj_[ nObj, OBJ_COL ] + nW ELSE ::obj_[ nObj, OBJ_TO_ROW ] := ::nRowRep - ::obj_[ nObj, OBJ_TO_COL ] := ::nColRep + len( ::obj_[ nObj, iif( ::objIsTxt( nObj ), OBJ_EQN, OBJ_TEXT ) ] ) - 1 + ::obj_[ nObj, OBJ_TO_COL ] := ::nColRep + Len( ::obj_[ nObj, iif( ::objIsTxt( nObj ), OBJ_EQN, OBJ_TEXT ) ] ) - 1 ENDIF ENDIF RETURN NIL @@ -1989,7 +1989,7 @@ METHOD hbCUIEditor:scrObjPas() // Paste Copied OBJECT o_[ OBJ_COL ] := ::nColRep IF o_[ OBJ_TYPE ] == OBJ_O_FIELD o_[ OBJ_TO_ROW ] := ::nRowRep - o_[ OBJ_TO_COL ] := ::nColRep + len( o_[ OBJ_TEXT ] ) - 1 + o_[ OBJ_TO_COL ] := ::nColRep + Len( o_[ OBJ_TEXT ] ) - 1 ELSEIF o_[ OBJ_TYPE ] == OBJ_O_BOX o_[ OBJ_TO_ROW ] := ::nRowRep + ( oldRow2 - oldRow ) o_[ OBJ_TO_COL ] := ::nColRep + ( oldCol2 - oldCol ) @@ -2301,27 +2301,27 @@ METHOD hbCUIEditor:scrTextPost( gst_, nMode ) s3 := substr( s, gst_[ 4 ] - nCol + 2 ) ENDIF - IF len( s1 ) > 0 - aadd( ins_, ::scrObjBlank() ) ; n1 := len( ins_ ) + IF Len( s1 ) > 0 + aadd( ins_, ::scrObjBlank() ) ; n1 := Len( ins_ ) ins_[ n1, OBJ_TYPE ] := OBJ_O_TEXT ins_[ n1, OBJ_ROW ] := ::obj_[ n, OBJ_ROW ] ins_[ n1, OBJ_COL ] := ::obj_[ n, OBJ_COL ] ins_[ n1, OBJ_EQN ] := s1 ins_[ n1, OBJ_TO_ROW ] := ::obj_[ n, OBJ_ROW ] - ins_[ n1, OBJ_TO_COL ] := ins_[ n1, OBJ_COL ] + len( s1 ) - 1 + ins_[ n1, OBJ_TO_COL ] := ins_[ n1, OBJ_COL ] + Len( s1 ) - 1 ENDIF - IF len( s3 ) > 0 + IF Len( s3 ) > 0 aadd( ins_, ::scrObjBlank() ) - n1 := len( ins_ ) + n1 := Len( ins_ ) ins_[ n1, OBJ_TYPE ] := OBJ_O_TEXT ins_[ n1, OBJ_ROW ] := ::obj_[n, OBJ_ROW] ins_[ n1, OBJ_COL ] := gst_[ 4 ] + 1 ins_[ n1, OBJ_EQN ] := s3 ins_[ n1, OBJ_TO_ROW ] := ::obj_[ n, OBJ_ROW ] - ins_[ n1, OBJ_TO_COL ] := ins_[ n1, OBJ_COL ] + len( s3 ) - 1 + ins_[ n1, OBJ_TO_COL ] := ins_[ n1, OBJ_COL ] + Len( s3 ) - 1 ENDIF ELSEIF ::objIsFld( n ) @@ -2371,35 +2371,35 @@ METHOD hbCUIEditor:scrTextPost( gst_, nMode ) ENDIF IF nMode == 0 - IF len( s1 ) > 0 - aadd( ins_, ::scrObjBlank() ) ; n1 := len( ins_ ) + IF Len( s1 ) > 0 + aadd( ins_, ::scrObjBlank() ) ; n1 := Len( ins_ ) ins_[ n1, OBJ_TYPE ] := OBJ_O_TEXT ins_[ n1, OBJ_ROW ] := ::obj_[ n, OBJ_ROW ] ins_[ n1, OBJ_COL ] := ::obj_[ n, OBJ_COL ] ins_[ n1, OBJ_EQN ] := s1 ins_[ n1, OBJ_TO_ROW ] := ::obj_[ n, OBJ_ROW ] - ins_[ n1, OBJ_TO_COL ] := ins_[ n1,OBJ_COL ] + len( s1 ) - 1 + ins_[ n1, OBJ_TO_COL ] := ins_[ n1,OBJ_COL ] + Len( s1 ) - 1 ENDIF - IF len(s3) > 0 - aadd( ins_, ::scrObjBlank() ) ; n1 := len( ins_ ) + IF Len(s3) > 0 + aadd( ins_, ::scrObjBlank() ) ; n1 := Len( ins_ ) ins_[ n1, OBJ_TYPE ] := OBJ_O_TEXT ins_[ n1, OBJ_ROW ] := ::obj_[ n, OBJ_ROW ] ins_[ n1, OBJ_COL ] := old_[ 4 ] + 1 ins_[ n1, OBJ_EQN ] := s3 ins_[ n1, OBJ_TO_ROW ] := ::obj_[ n, OBJ_ROW ] - ins_[ n1, OBJ_TO_COL ] := ins_[ n1,OBJ_COL ] + len( s3 ) - 1 + ins_[ n1, OBJ_TO_COL ] := ins_[ n1,OBJ_COL ] + Len( s3 ) - 1 ENDIF ENDIF - IF len(s2) > 0 - aadd( ins_, aclone( ::obj_[ n ] ) ) ; n1 := len( ins_ ) + IF Len(s2) > 0 + aadd( ins_, aclone( ::obj_[ n ] ) ) ; n1 := Len( ins_ ) ins_[ n1, OBJ_ROW ] := gst_[ 1 ] + nn ins_[ n1, OBJ_COL ] := gst_[ 2 ]+ iif( old_[ 2 ] - ::obj_[ n, OBJ_COL ] >= 0, 0, abs( old_[ 2 ] - ::obj_[ n, OBJ_COL ] ) ) ins_[ n1, OBJ_TO_ROW ] := ins_[ n1, OBJ_ROW ] - ins_[ n1, OBJ_TO_COL ] := ins_[ n1, OBJ_COL ] + len( s2 ) - 1 + ins_[ n1, OBJ_TO_COL ] := ins_[ n1, OBJ_COL ] + Len( s2 ) - 1 ins_[ n1, OBJ_EQN ] := s2 ENDIF @@ -2409,7 +2409,7 @@ METHOD hbCUIEditor:scrTextPost( gst_, nMode ) ENDIF // Same OBJECT is TO be inserted IN moved block - aadd( ins_, aclone( ::obj_[ n ] ) ) ; n1 := len( ins_ ) + aadd( ins_, aclone( ::obj_[ n ] ) ) ; n1 := Len( ins_ ) nWid := ::obj_[ n, OBJ_TO_COL ] - ::obj_[ n, OBJ_COL ] ins_[ n1, OBJ_ROW ] := gst_[ 1 ] + nn @@ -2430,7 +2430,7 @@ METHOD hbCUIEditor:scrTextPost( gst_, nMode ) aeval( ddd_,{|e| aadd( del_, e ) } ) IF !empty( del_ ) - FOR i := 1 TO len( ::obj_) + FOR i := 1 TO Len( ::obj_) IF ascan( del_, i ) == 0 aadd( d_, ::obj_[ i ] ) ENDIF @@ -2485,25 +2485,25 @@ METHOD hbCUIEditor:scrTextDel() s3 := substr( s, old_[ 4 ] - nCol + 2 ) ENDIF - IF len( s1 ) > 0 - aadd( ins_, ::scrObjBlank() ) ; n1 := len( ins_ ) + IF Len( s1 ) > 0 + aadd( ins_, ::scrObjBlank() ) ; n1 := Len( ins_ ) ins_[ n1, OBJ_TYPE ] := OBJ_O_TEXT ins_[ n1, OBJ_ROW ] := ::obj_[ n,OBJ_ROW ] ins_[ n1, OBJ_COL ] := ::obj_[ n,OBJ_COL ] ins_[ n1, OBJ_EQN ] := s1 ins_[ n1, OBJ_TO_ROW ] := ::obj_[ n, OBJ_ROW ] - ins_[ n1, OBJ_TO_COL ] := ins_[ n1, OBJ_COL ] + len( s1 ) - 1 + ins_[ n1, OBJ_TO_COL ] := ins_[ n1, OBJ_COL ] + Len( s1 ) - 1 ENDIF - IF len( s3 ) > 0 - aadd( ins_, ::scrObjBlank() ) ; n1 := len( ins_ ) + IF Len( s3 ) > 0 + aadd( ins_, ::scrObjBlank() ) ; n1 := Len( ins_ ) ins_[ n1, OBJ_TYPE ] := OBJ_O_TEXT ins_[ n1, OBJ_ROW ] := ::obj_[ n, OBJ_ROW ] ins_[ n1, OBJ_COL ] := old_[ 4 ] + 1 ins_[ n1, OBJ_EQN ] := s3 ins_[ n1, OBJ_TO_ROW ] := ::obj_[ n, OBJ_ROW ] - ins_[ n1, OBJ_TO_COL ] := ins_[ n1, OBJ_COL ] + len( s3 ) - 1 + ins_[ n1, OBJ_TO_COL ] := ins_[ n1, OBJ_COL ] + Len( s3 ) - 1 ENDIF ELSEIF ::objIsFld( n ) @@ -2517,7 +2517,7 @@ METHOD hbCUIEditor:scrTextDel() NEXT IF !empty(del_) - FOR i := 1 TO len( ::obj_ ) + FOR i := 1 TO Len( ::obj_ ) IF ascan(del_,i) == 0 aadd(d_,::obj_[i]) ENDIF @@ -2550,7 +2550,7 @@ METHOD hbCUIEditor:scrAddTxt( nMode ) IF nMode == 1 // New Character IF empty( txt_ ) .OR. ascan( txt_, {|e_| VouchInRange( nRepCol, e_[ OBJ_COL ], e_[ OBJ_TO_COL ] ) } ) == 0 aadd( txt_, ::scrObjBlank() ) - nTxt := len( txt_ ) + nTxt := Len( txt_ ) txt_[ nTxt, OBJ_TYPE ] := OBJ_O_TEXT txt_[ nTxt, OBJ_F_TYPE ] := 'C' txt_[ nTxt, OBJ_F_LEN ] := 1 @@ -2569,42 +2569,42 @@ METHOD hbCUIEditor:scrAddTxt( nMode ) chr( nKey ) + ; substr( txt_[ nTxt, OBJ_EQN ], ::nColRep - txt_[ nTxt, OBJ_COL ] + iif( ReadInsert(), 1, 2 ) ) - txt_[ nTxt, OBJ_TO_COL ] := txt_[ nTxt, OBJ_COL ] + len( txt_[ nTxt, OBJ_EQN ] ) - 1 + txt_[ nTxt, OBJ_TO_COL ] := txt_[ nTxt, OBJ_COL ] + Len( txt_[ nTxt, OBJ_EQN ] ) - 1 ELSEIF nMode == 2 .OR. nMode == 3 // Delete IF readInsert() txt_[nTxt,OBJ_EQN] := substr( txt_[ nTxt, OBJ_EQN ], 1,; ::nColRep - txt_[ nTxt, OBJ_COL ] ) + ; substr( txt_[ nTxt, OBJ_EQN ], ::nColRep - txt_[ nTxt, OBJ_COL ] + 2 ) - txt_[ nTxt, OBJ_TO_COL ] := txt_[ nTxt, OBJ_COL ] + len( txt_[ nTxt, OBJ_EQN ] ) - 1 + txt_[ nTxt, OBJ_TO_COL ] := txt_[ nTxt, OBJ_COL ] + Len( txt_[ nTxt, OBJ_EQN ] ) - 1 ELSE // Divide it IN two objects s1 := substr( txt_[ nTxt, OBJ_EQN ], 1, ::nColRep - txt_[ nTxt, OBJ_COL ] ) s2 := substr( txt_[ nTxt, OBJ_EQN ], ::nColRep - txt_[ nTxt, OBJ_COL ] + 2 ) nDel := 0 - IF len( s1 ) > 0 + IF Len( s1 ) > 0 txt_[ nTxt, OBJ_EQN ] := s1 - txt_[ nTxt, OBJ_TO_COL ] := txt_[ nTxt, OBJ_COL ] + len( s1 ) - 1 + txt_[ nTxt, OBJ_TO_COL ] := txt_[ nTxt, OBJ_COL ] + Len( s1 ) - 1 ELSE nDel := nTxt ENDIF - IF len( s2 ) > 0 + IF Len( s2 ) > 0 IF nDel == 0 aadd( txt_, aclone( txt_[ nTxt ] ) ) - n1 := len( txt_ ) + n1 := Len( txt_ ) ELSE n1 := nDel ENDIF txt_[ n1, OBJ_TYPE ] := OBJ_O_TEXT txt_[ n1, OBJ_F_TYPE ] := 'C' - txt_[ n1, OBJ_F_LEN ] := len( s2 ) + txt_[ n1, OBJ_F_LEN ] := Len( s2 ) txt_[ n1, OBJ_ROW ] := ::nRowRep txt_[ n1, OBJ_COL ] := ::nColRep+1 txt_[ n1, OBJ_EQN ] := s2 txt_[ n1, OBJ_TO_ROW ] := ::nRowRep - txt_[ n1, OBJ_TO_COL ] := txt_[ n1, OBJ_COL ] + len( s2 ) - 1 + txt_[ n1, OBJ_TO_COL ] := txt_[ n1, OBJ_COL ] + Len( s2 ) - 1 ENDIF - IF len( s1 ) == 0 .AND. len( s2 ) == 0 + IF Len( s1 ) == 0 .AND. len( s2 ) == 0 VouchAShrink( txt_, nTxt ) ENDIF ENDIF @@ -2628,11 +2628,11 @@ METHOD hbCUIEditor:scrAddTxt( nMode ) DO WHILE .t. lClub := .f. - FOR i := 2 TO len( txt_ ) + FOR i := 2 TO Len( txt_ ) IF txt_[ i , OBJ_COL ] == txt_[ i - 1, OBJ_TO_COL ] + 1 txt_[ i - 1, OBJ_EQN ] += txt_[ i, OBJ_EQN ] // Club both - txt_[ i - 1, OBJ_TO_COL ] := txt_[ i - 1, OBJ_COL ] + len( txt_[ i - 1, OBJ_EQN ] ) - 1 - txt_[ i - 1, OBJ_F_LEN ] := len( txt_[ i - 1, OBJ_EQN ] ) + txt_[ i - 1, OBJ_TO_COL ] := txt_[ i - 1, OBJ_COL ] + Len( txt_[ i - 1, OBJ_EQN ] ) - 1 + txt_[ i - 1, OBJ_F_LEN ] := Len( txt_[ i - 1, OBJ_EQN ] ) VouchAShrink( txt_,i ) lClub := .t. ENDIF @@ -2682,7 +2682,7 @@ METHOD hbCUIEditor:scrMsg( msg ) msg := "F1:Help F4:Prop F5:Edit F6:Select F7:Copy F8:Paste F9:Box F10:Field" ENDIF msg := " " + msg + " " - @ maxrow(), ( maxcol()+1-len( msg ) )/2 SAY msg COLOR "W+/RB" + @ maxrow(), ( maxcol()+1-Len( msg ) )/2 SAY msg COLOR "W+/RB" setPos( row,col ) RETURN NIL @@ -2868,7 +2868,7 @@ METHOD hbCUIEditor:scrAddBox( nObj ) o_[ OBJ_PATTERN ] := "CLEAR" aadd( ::obj_, o_ ) - nObj := len( ::obj_ ) + nObj := Len( ::obj_ ) ENDIF IF ! empty( nnObj ) @@ -2919,7 +2919,7 @@ METHOD hbCUIEditor:scrAddFld( nObj ) v_:= iif( nObj > 0, ::scrObj2Vv( ::obj_[ nObj ] ), ::scrVrbBlank( OBJ_O_FIELD ) ) h_:= ::scrVrbHeaders( OBJ_O_FIELD ) - w_:= afill( array( len( h_ ) ), {|| .T. } ) + w_:= afill( array( Len( h_ ) ), {|| .T. } ) w_[ 2 ] := {| | VouchMenuM( 'MN_TYFLD' ) } w_[ 3 ] := {|v| v := oAchGet( 2 ), iif( v == 'D', !oCPut( 8 ), iif( v == 'L', !oCPut( 1 ), .t. ) ) } @@ -2955,7 +2955,7 @@ METHOD hbCUIEditor:scrAddFld( nObj ) IF nObj == 0 aadd( ::obj_, o_ ) - nObj := len( ::obj_ ) + nObj := Len( ::obj_ ) ELSE ::obj_[ nObj ] := o_ ENDIF @@ -2986,7 +2986,7 @@ METHOD hbCUIEditor:scrGetProperty( nObj ) v_:= iif( nObj > 0, ::scrObj2Vv( ::obj_[ nObj ] ), ::scrVrbBlank( OBJ_O_BOX ) ) h_:= ::scrVrbHeaders( OBJ_O_BOX ) - w_:= afill( array( len( h_ ) ), {|| .T. } ) + w_:= afill( array( Len( h_ ) ), {|| .T. } ) w_[ 2 ] := {| | VouchMenuM( 'MN_BOX' ) } w_[ 3 ] := {| | VouchMenuM( 'MN_FILL' ) } @@ -3003,7 +3003,7 @@ METHOD hbCUIEditor:scrGetProperty( nObj ) v_:= iif( nObj > 0, ::scrObj2Vv( ::obj_[ nObj ] ), ::scrVrbBlank( OBJ_O_TEXT ) ) h_:= ::scrVrbHeaders( OBJ_O_TEXT ) - w_:= afill( array( len( h_ ) ), {|| .T. } ) + w_:= afill( array( Len( h_ ) ), {|| .T. } ) ::scrMsg( "ENTER: Starts Editing Current Selection. CTRL_ENTER: When Done." ) B_GETS HEADERS h_ VALUES v_ TITLE 'Configure Field' WHEN w_ INTO v_ @@ -3078,7 +3078,7 @@ METHOD hbCUIEditor:scrPreview() ENDSWITCH NEXT - IF len( getlist ) > 0 + IF Len( getlist ) > 0 READ ELSE DO WHILE inkey() != K_ESC; ENDDO @@ -3099,9 +3099,9 @@ STATIC FUNCTION VouchGetPic( cType, cPic, nLen, nDec ) cP := iif( nDec > 0, replicate( "9", nLen - nDec - 1 ) + "." + replicate( "9", nDec ), replicate( "9", nLen ) ) ELSE IF left( cPic,1 ) == '"' .and. right( cPic,1 ) == '"' - cP := substr( cPic, 2, len( cPic ) - 2 ) + cP := substr( cPic, 2, Len( cPic ) - 2 ) ELSEIF left( cPic,1 ) == "'" .and. right( cPic,1 ) == "'" - cP := substr( cPic, 2, len( cPic ) - 2 ) + cP := substr( cPic, 2, Len( cPic ) - 2 ) ENDIF ENDIF @@ -3176,7 +3176,7 @@ FUNCTION pad_max( a_,lNum,max ) DEFAULT lNum TO .f. IF max == NIL max := 0 - aeval( a_, {|x| max := max( max,len( x ) )} ) + aeval( a_, {|x| max := max( max,Len( x ) )} ) ENDIF aeval( a_, {|x| a_[ i ] := iif( lNum, str( i,3 ) + ' ', '' ) + pad( x,max ), i++ } ) RETURN a_ @@ -3191,7 +3191,7 @@ FUNCTION VouchInArray( v,a_ ) FUNCTION VouchAShrink( a_,n ) IF n > 0 adel( a_,n ) - asize( a_,len( a_ )-1 ) + asize( a_,Len( a_ )-1 ) ENDIF RETURN a_ @@ -3259,12 +3259,12 @@ FUNCTION VouchGetArray( h_,vv_, sel_, nTop, nLft, nBtm, nRgt, title, bWhen_, bVa nLenVrb := 0 aeval( vv_, {|e| cTyp := valtype( e ), nLenVrb := max( ; - iif( cTyp == 'C', len( e ), ; + iif( cTyp == 'C', Len( e ), ; iif( cTyp == 'N', 15, iif( cTyp == 'D', 8, 3 ) ) ), nLenVrb ) } ) IF bWhen_ == NIL - bWhen_:= afill( array( len( vv_) ), {|| .t. } ) - FOR i := 1 TO len( vv_ ) + bWhen_:= afill( array( Len( vv_) ), {|| .t. } ) + FOR i := 1 TO Len( vv_ ) s := h_[ i ] IF valtype( vv_[ i ] ) == 'L' bWhen_[ i ] := {|| VouchYN( s, oGet() ), .f. } @@ -3273,7 +3273,7 @@ FUNCTION VouchGetArray( h_,vv_, sel_, nTop, nLft, nBtm, nRgt, title, bWhen_, bVa ENDIF IF bValid_ == NIL - bValid_:= afill( array( len( vv_ ) ), {|| .t. } ) + bValid_:= afill( array( Len( vv_ ) ), {|| .t. } ) ENDIF pmt_:={} @@ -3281,14 +3281,14 @@ FUNCTION VouchGetArray( h_,vv_, sel_, nTop, nLft, nBtm, nRgt, title, bWhen_, bVa // decide maximum length of the largest prompt mLen := 0 - aeval( pmt_, {|x| mLen := max( mLen, len( x ) ) } ) - mLen := max( len( h_[ 1 ] ) + 2 + nLenVrb, mLen ) + 2 + aeval( pmt_, {|x| mLen := max( mLen, Len( x ) ) } ) + mLen := max( Len( h_[ 1 ] ) + 2 + nLenVrb, mLen ) + 2 IF nTop == NIL - nTop := int( ( maxrow() - min( 3 + len( h_ ), maxrow() - 3 ) ) / 2 ) + nTop := int( ( maxrow() - min( 3 + Len( h_ ), maxrow() - 3 ) ) / 2 ) ENDIF IF nBtm == NIL - nBtm := min( nTop + len( h_ ) + 3, maxrow() - 3 ) + nBtm := min( nTop + Len( h_ ) + 3, maxrow() - 3 ) ENDIF IF nLft == NIL @@ -3314,8 +3314,8 @@ FUNCTION VouchGetArray( h_,vv_, sel_, nTop, nLft, nBtm, nRgt, title, bWhen_, bVa title := alltrim( title ) ENDIF title := padc( title, nRgt - nLft ) - title := { title, replicate( chr( 196 ), len( title ) + 2 ) } - maxL := len( h_[ 1 ] ) + title := { title, replicate( chr( 196 ), Len( title ) + 2 ) } + maxL := Len( h_[ 1 ] ) sel_ := iif( sel_ == NIL, .t., sel_ ) vstk_push() @@ -3328,7 +3328,7 @@ FUNCTION VouchGetArray( h_,vv_, sel_, nTop, nLft, nBtm, nRgt, title, bWhen_, bVa setcolor( clr + "," + "+GR/B" + ",,," + "N" + substr( clr, at( "/", clr ) ) ) aScrol_ := ScrolBarNew( nTop + 2, nRgt, nBtm, "gr+/b" ) - nLenMnu := len( pmt_ ) + nLenMnu := Len( pmt_ ) clr1 := setColor() ScrolBarDisplay( aScrol_ ) @@ -3339,8 +3339,8 @@ FUNCTION VouchGetArray( h_,vv_, sel_, nTop, nLft, nBtm, nRgt, title, bWhen_, bVa SetGetAch( vv_ ) IF pic_ == NIL - pic_:= array( len( vv_ ) ) - FOR i := 1 TO len( vv_ ) + pic_:= array( Len( vv_ ) ) + FOR i := 1 TO Len( vv_ ) cTyp := valtype( vv_[ i ] ) pic_[ i ] := iif( cTyp == "C", "@S" + hb_ntos( nLenVrb ) + "K ", iif( cTyp == "N", "@Z 99999999.999", iif( cTyp == "L", "Y", "@ " ) ) ) NEXT @@ -3425,8 +3425,8 @@ STATIC FUNCTION scan_ff( elem, a_, c /*, nFrom */ ) LOCAL na, nlen c := lower( substr( c,1,1 ) ) - nLen := len( c ) - IF( na := ascan( a_,{|e| lower( substr( ltrim( e ),1,nLen ) ) == c }, min( elem+1, len( a_ ) ) ) ) == 0 + nLen := Len( c ) + IF( na := ascan( a_,{|e| lower( substr( ltrim( e ),1,nLen ) ) == c }, min( elem+1, Len( a_ ) ) ) ) == 0 na := ascan( a_,{|e| lower( substr( ltrim( e ),1,nlen ) ) == c },1,elem-1 ) ENDIF @@ -3454,7 +3454,7 @@ STATIC FUNCTION VouchGetChoice( vrb, row, col, e_col, whn, vld, pic ) ELSEIF type == "L" pic := "Y" ELSEIF type == "C" - maxL := len( vrb ) + maxL := Len( vrb ) pic := "@K" IF ( maxL + col ) > e_col pic += "S" + ltrim( str( e_col - col ) ) @@ -3582,8 +3582,8 @@ FUNCTION VouchMenuMM( mnu_,nInit,msg,lExact,aSel ) DEFAULT lExact TO .f. DEFAULT aSel TO {} - aSel := asize( aSel, len( mnu_ ) ) - FOR i := 1 TO len( mnu_ ) + aSel := asize( aSel, Len( mnu_ ) ) + FOR i := 1 TO Len( mnu_ ) DEFAULT aSel[ i ] TO .t. NEXT @@ -3599,7 +3599,7 @@ FUNCTION VouchMenuMM( mnu_,nInit,msg,lExact,aSel ) B_MSG msg CHOOSE m_ INITIAL n SELECTABLES aSel RESTORE SHADOW AT row()-3,col() WVT .T. INTO n n := max( 1,n ) - getActive():varPut( iif( t,pad( mnu_[n,2],len( nInit ) ),mnu_[n,2] ) ) + getActive():varPut( iif( t,pad( mnu_[n,2],Len( nInit ) ),mnu_[n,2] ) ) RETURN .f. @@ -3654,7 +3654,7 @@ FUNCTION vstk_push() //----------------------------------------------------------------------// FUNCTION vstk_pop() - IF len( s_vid_stk ) > 0 + IF Len( s_vid_stk ) > 0 setcursor( asc( substr( s_vid_stk, 1, 1 ) ) ) //@ asc( substr( s_vid_stk, 2, 1 ) ), asc( substr( s_vid_stk, 3, 1 ) ) SAY "" devpos( asc( substr( s_vid_stk, 2, 1 ) ), asc( substr( s_vid_stk, 3, 1 ) ) ) @@ -3707,27 +3707,27 @@ FUNCTION VouchMsgBox(r1, c1, r2, c2, width, depth, msg_, msgClr, ; oGet := iif( paste, getactive(), oGet ) - IF ( len( msg_) > 0) .AND. (valtype (msg_[1]) == "A" ) + IF ( Len( msg_) > 0) .AND. (valtype (msg_[1]) == "A" ) msg_ := aclone( msg_[ 1 ] ) ENDIF - IF ( len( msg_ ) > 0 ) .AND. ( msg_[1] == NIL ) + IF ( Len( msg_ ) > 0 ) .AND. ( msg_[1] == NIL ) msg_:= {} ENDIF - IF ( len( ch_ ) > 0 ) .AND. ( valtype( ch_[ 1 ] ) = "A" ) + IF ( Len( ch_ ) > 0 ) .AND. ( valtype( ch_[ 1 ] ) = "A" ) ch_:= aclone( ch_[ 1 ] ) ENDIF - IF len( msg_ ) == 0 .AND. len( ch_ ) == 0 + IF Len( msg_ ) == 0 .AND. len( ch_ ) == 0 RETURN .f. ENDIF IF lSlctns IF lNumeric IF empty(num_) - FOR i := 1 TO len (ch_) + FOR i := 1 TO Len (ch_) ch_[i] := ' '+ch_[i] NEXT ELSE - FOR i := 1 TO len (ch_) + FOR i := 1 TO Len (ch_) IF (n := ascan(num_,i))==0 ch_[ i ] := ' '+ch_[i] ELSE @@ -3736,14 +3736,14 @@ FUNCTION VouchMsgBox(r1, c1, r2, c2, width, depth, msg_, msgClr, ; NEXT ENDIF ELSE - FOR i := 1 TO len( ch_ ) + FOR i := 1 TO Len( ch_ ) ch_[ i ] := iif( empty( tagged_ ),' ', iif( tagged_[ i ], CHECKMARK + ' ', ' ' ) ) + ch_[ i ] NEXT ENDIF ENDIF - aeval( msg_, {|s| msgLen := max( msgLen, len( s ) ) } ) - aeval( ch_, {|s| chLen := max( chLen, len( s ) ) } ) + aeval( msg_, {|s| msgLen := max( msgLen, Len( s ) ) } ) + aeval( ch_, {|s| chLen := max( chLen, Len( s ) ) } ) maxlen := max( msgLen, chLen ) aeval( ch_, {|s,i| s := s, ch_[ i ] := pad( ch_[ i ], maxLen ) } ) @@ -3754,7 +3754,7 @@ FUNCTION VouchMsgBox(r1, c1, r2, c2, width, depth, msg_, msgClr, ; aeval( ch_, {|s,i| lSelect_[ i ] := iif( empty( s ), .f., lSelect_[ i ] ) } ) ENDIF IF ascan( lSelect_, {|e| e } ) == 0 - IF len(ch_) > 0 + IF Len(ch_) > 0 RETURN 0 ENDIF ENDIF @@ -3762,7 +3762,7 @@ FUNCTION VouchMsgBox(r1, c1, r2, c2, width, depth, msg_, msgClr, ; nMsg := Len( msg_ ) // nOff := iif( nMsg == 1, 0, 1 ) - boxDeep := iif( len( msg_ )=0,0,len( msg_ )+1 ) + iif( len( ch_ )=0,0,len( ch_ )+1 ) + boxDeep := iif( Len( msg_ )=0,0,len( msg_ )+1 ) + iif( len( ch_ )=0,0,len( ch_ )+1 ) tBoxDeep := boxDeep boxDeep := min( boxDeep, maxrow() - r1 ) boxWide := max( msgLen, chLen ) + 3 @@ -3821,7 +3821,7 @@ FUNCTION VouchMsgBox(r1, c1, r2, c2, width, depth, msg_, msgClr, ; ENDIF ENDIF - IF sel == NIL .OR. sel < 1 .OR. sel > len( ch_ ) + IF sel == NIL .OR. sel < 1 .OR. sel > Len( ch_ ) sel := 1 ENDIF @@ -3838,14 +3838,14 @@ FUNCTION VouchMsgBox(r1, c1, r2, c2, width, depth, msg_, msgClr, ; VouchShadow( r1, c1, r2, c2 ) ENDIF - FOR i = 1 TO min( len( msg_ ), r2 - ( r1 + 1 ) ) + FOR i = 1 TO min( Len( msg_ ), r2 - ( r1 + 1 ) ) devpos( r1 + i, c1 + 2 ) devout( pad( msg_[ i ], c2 - ( c1 + 3 ) ) ) NEXT i mSetCursor( mCrs ) clr := "W+/BG" - IF len( ch_ ) > 0 + IF Len( ch_ ) > 0 IF nMsg > 0 mCrs := mSetCursor(.f.) devpos( r1 + 1 + nMsg, c1 + 1 ) @@ -3859,7 +3859,7 @@ FUNCTION VouchMsgBox(r1, c1, r2, c2, width, depth, msg_, msgClr, ; setcolor( clr + "," + "+W/B" + ",,," + "N" + substr( clr, at( "/", clr ) ) ) aScrolBar := ScrolBarNew( cr1 - 1, c2, r2 /*, colorGet( C_SCROLL ) )*/ ) - nLenScrol := len( ch_ ) + nLenScrol := Len( ch_ ) pmtWidth := c2 - c1 - 3 aeval( ch_, {|e,i| ch_[ i ] := pad( e, pmtWidth ) } ) @@ -3891,7 +3891,7 @@ FUNCTION VouchMsgBox(r1, c1, r2, c2, width, depth, msg_, msgClr, ; IF paste IF valtype( oGet:varGet() ) == "C" oVal := oGet:varGet() - oGet:varPut( pad( ch_[ iif( sel = 0,1,sel ) ], len( oVal ) ) ) + oGet:varPut( pad( ch_[ iif( sel = 0,1,sel ) ], Len( oVal ) ) ) oGet:display() ENDIF ENDIF @@ -3903,13 +3903,13 @@ FUNCTION VouchMsgBox(r1, c1, r2, c2, width, depth, msg_, msgClr, ; IF lSlctns IF !lNumeric - FOR i = 1 TO len( cgo_[CGO_CH_] ) + FOR i = 1 TO Len( cgo_[CGO_CH_] ) IF substr( cgo_[CGO_CH_,i], 1, 1) == CHECKMARK aadd( nSlctns_,i ) ENDIF NEXT ELSE - FOR i := 1 TO len(cgo_[CGO_CH_]) + FOR i := 1 TO Len(cgo_[CGO_CH_]) IF val( left( cgo_[CGO_CH_,i],4 ) )>0 aadd( dd_,{val( left( cgo_[CGO_CH_,i],4 ) ),i} ) ENDIF @@ -3966,7 +3966,7 @@ FUNCTION VouchFunc2( nMode, nElem, nRel, nKey, cgo_ ) CASE nKey == K_F9 // TAG ALL IF cgo_[CGO_LSEL] IF cgo_[CGO_LNUM] - FOR i := 1 TO len( cgo_[CGO_CH_] ) + FOR i := 1 TO Len( cgo_[CGO_CH_] ) IF cgo_[CGO_SEL_] cgo_[CGO_CH_,i] := chr( 251 ) + substr( cgo_[ CGO_CH_,i ], 2 ) ENDIF @@ -3980,7 +3980,7 @@ FUNCTION VouchFunc2( nMode, nElem, nRel, nKey, cgo_ ) ENDIF CASE nKey == K_F10 // UnTAG ALL IF cgo_[CGO_LSEL] - FOR i := 1 TO len( cgo_[CGO_CH_] ) + FOR i := 1 TO Len( cgo_[CGO_CH_] ) cgo_[CGO_CH_,i] := " "+substr( cgo_[CGO_CH_,i],2 ) NEXT RETURN AC_ABORT @@ -3993,13 +3993,13 @@ FUNCTION VouchFunc2( nMode, nElem, nRel, nKey, cgo_ ) IF !cgo_[CGO_LNUM] cgo_[CGO_CH_,cgo_[CGO_POS]] := iif( substr( cgo_[CGO_CH_,cgo_[CGO_POS]],1,1 )==CHECKMARK, ; " ",CHECKMARK )+substr( cgo_[CGO_CH_,cgo_[CGO_POS]],2 ) - cgo_[CGO_POS] := min( cgo_[CGO_POS]+1,len( cgo_[CGO_CH_] ) ) + cgo_[CGO_POS] := min( cgo_[CGO_POS]+1,Len( cgo_[CGO_CH_] ) ) RETURN AC_ABORT ELSE IF( n:=val( substr( cgo_[CGO_CH_,cgo_[CGO_POS]],1,4 ) ) )>0 cgo_[CGO_CH_,cgo_[CGO_POS]] := " "+substr( cgo_[CGO_CH_,cgo_[CGO_POS]],5 ) - cgo_[CGO_POS] := min( cgo_[CGO_POS]+1,len( cgo_[CGO_CH_] ) ) - FOR i := 1 TO len( cgo_[CGO_CH_] ) + cgo_[CGO_POS] := min( cgo_[CGO_POS]+1,Len( cgo_[CGO_CH_] ) ) + FOR i := 1 TO Len( cgo_[CGO_CH_] ) IF( nn := val( left( cgo_[CGO_CH_,i],4 ) ) )>0 IF nn > n nn := nn - 1 @@ -4013,7 +4013,7 @@ FUNCTION VouchFunc2( nMode, nElem, nRel, nKey, cgo_ ) n := 0 aeval( cgo_[CGO_CH_], {|e| n := val( left( e,4 ) ), nn := iif( n>nn,n,nn ) } ) cgo_[CGO_CH_,cgo_[CGO_POS]] := pad( hb_ntos( nn+1 ),4 ) + substr( cgo_[CGO_CH_,cgo_[CGO_POS]],5 ) - cgo_[CGO_POS] := min( cgo_[CGO_POS]+1, len( cgo_[CGO_CH_] ) ) + cgo_[CGO_POS] := min( cgo_[CGO_POS]+1, Len( cgo_[CGO_CH_] ) ) ENDIF RETURN AC_ABORT ENDIF @@ -4047,7 +4047,7 @@ STATIC FUNCTION scan_f( elem, a_, key, nFrom ) LOCAL n := elem, na, c c := lower( chr( key ) ) - na := ascan( a_, {|e| lower( substr( e, nFrom, 1 ) ) == c }, min( elem + 1, len( a_ ) ) ) + na := ascan( a_, {|e| lower( substr( e, nFrom, 1 ) ) == c }, min( elem + 1, Len( a_ ) ) ) IF na == 0 na := ascan( a_,{|e| lower( substr( e, nFrom, 1 ) ) == c },1,elem-1 ) ENDIF @@ -4082,7 +4082,7 @@ STATIC FUNCTION sha_attr( t, l, b, r, new_attr ) old_scr_area := savescreen( t, l, b, r ) new_scr_area = "" - FOR i = 1 TO len( old_scr_area ) STEP 2 + FOR i = 1 TO Len( old_scr_area ) STEP 2 new_scr_area := new_scr_area + substr( old_scr_area, i, 1 ) + chr( new_attr ) NEXT @@ -4110,12 +4110,12 @@ FUNCTION VouchGetSome( msg, vrb, pass, pic, set_, wh, vl, nLastKey ) clr := SetColor() nMaxLen := maxcol() - 7 - nLenMsg := len( msg ) + nLenMsg := Len( msg ) DO CASE CASE dType == 'D' ; nLenVrb := 8 CASE dType == 'N' ; nLenVrb := 17 - CASE dType == 'C' ; nLenVrb := len( vrb ) + CASE dType == 'C' ; nLenVrb := Len( vrb ) CASE dType == 'L' ; nLenVrb := 1 ENDCASE @@ -4606,13 +4606,13 @@ METHOD AChoiceNew:init( nTop, nLft, nBtm, nRgt, acItems, xSelect, ; ::nNumRows := ::nBottom - ::nTop + 1 aeval( ::acItems, {| x | IF( valtype( x ) == "C", aadd( ::acCopy, padr( x, ::nNumCols ) ), .F. ) } ) - ::nItems := len( ::acCopy ) + ::nItems := Len( ::acCopy ) ::alSelect := array( ::nItems ) IF valtype( ::xSelect ) == "A" afill( ::alSelect, .T. ) - FOR nCntr := 1 TO len( ::xSelect ) + FOR nCntr := 1 TO Len( ::xSelect ) IF nCntr <= ::nItems IF valtype( ::xSelect[ nCntr ] ) == "C" IF empty( ::xSelect[ nCntr ] ) @@ -4625,7 +4625,7 @@ METHOD AChoiceNew:init( nTop, nLft, nBtm, nRgt, acItems, xSelect, ; ::alSelect[ nCntr ] := ::xSelect[ nCntr ] ENDIF ELSE - nCntr := len( ::xSelect ) + 1 + nCntr := Len( ::xSelect ) + 1 ENDIF NEXT ELSE @@ -4818,7 +4818,7 @@ METHOD AChoiceNew:DispPageNew() IF INRANGE( 1, nPos, ::nItems ) ::DispLineNew( nPos, nRowPos, nPos == ::nPos ) ELSE - DispOutAt( nRowPos, ::nLeft, space( len( ::acCopy[ 1 ] ) ), ::cLoClr, ::oWin ) + DispOutAt( nRowPos, ::nLeft, space( Len( ::acCopy[ 1 ] ) ), ::cLoClr, ::oWin ) ENDIF NEXT diff --git a/harbour/contrib/hbide/idedict.prg b/harbour/contrib/hbide/idedict.prg index aedc451ac1..e849b957cc 100644 --- a/harbour/contrib/hbide/idedict.prg +++ b/harbour/contrib/hbide/idedict.prg @@ -91,7 +91,7 @@ FUNCTION hbide_loadUserDictionaries( oIde ) #endif LOCAL oDict, i - FOR i := 1 TO len( aDict ) + FOR i := 1 TO Len( aDict ) oDict := IdeDictionary():new( oIde ):create() oDict:load( aDict[ i ] ) @@ -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_ ) ) diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 3c505016b6..fb08a738b7 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -950,7 +950,7 @@ METHOD IdeDocks:stackHorizontally() qObj := qArea:activeSubWindow() qVPort := qArea:viewport() nH := qVPort:height() - nW := qVPort:width() / len( ::oIde:aMdies ) + nW := qVPort:width() / Len( ::oIde:aMdies ) nT := 0 nL := 0 @@ -972,7 +972,7 @@ METHOD IdeDocks:stackVertically() qArea := ::oStackedWidget qObj := qArea:activeSubWindow() qVPort := qArea:viewport() - nH := qVPort:height() / len( ::oIde:aMdies ) + nH := qVPort:height() / Len( ::oIde:aMdies ) nW := qVPort:width() nT := 0 @@ -1471,7 +1471,7 @@ METHOD IdeDocks:buildProjectTree() ::oProjRoot:expand( .t. ) // - FOR i := 1 TO len( ::aProjects ) + FOR i := 1 TO Len( ::aProjects ) ::oIde:updateProjectTree( ::aProjects[ i, 3 ] ) NEXT diff --git a/harbour/contrib/hbide/idedocwriter.prg b/harbour/contrib/hbide/idedocwriter.prg index 08448c6a7e..018602a318 100644 --- a/harbour/contrib/hbide/idedocwriter.prg +++ b/harbour/contrib/hbide/idedocwriter.prg @@ -131,7 +131,7 @@ FUNCTION hbide_ar2paramList( aArg ) LOCAL s, cList := "" FOR EACH s IN aArg s := alltrim( s ) - cList += s + iif( s:__enumIndex() < len( aArg ), ", ", "" ) + cList += s + iif( s:__enumIndex() < Len( aArg ), ", ", "" ) NEXT RETURN cList @@ -141,7 +141,7 @@ FUNCTION hbide_arg2memo( aArg ) LOCAL s, cMemo := "" FOR EACH s IN aArg - cMemo += "<" + s + ">" + iif( s:__enumIndex() < len( aArg ), hb_eol(), "" ) + cMemo += "<" + s + ">" + iif( s:__enumIndex() < Len( aArg ), hb_eol(), "" ) NEXT RETURN cMemo @@ -502,7 +502,7 @@ METHOD IdeDocWriter:pullDocFromSource( nLineFrom, oEdit ) a_:={} IF lDone - FOR i := len( aDoc ) TO 1 STEP -1 + FOR i := Len( aDoc ) TO 1 STEP -1 aadd( a_, aDoc[ i ] ) NEXT ENDIF @@ -522,10 +522,10 @@ METHOD IdeDocWriter:loadCurrentFuncDoc() IF !empty( ::aTags ) nCurLine := oEdit:getLineNo() - IF len( ::aTags ) == 1 + IF Len( ::aTags ) == 1 n := 1 ELSEIF ( n := ascan( ::aTags, {|e_| e_[ 3 ] >= nCurLine } ) ) == 0 - n := len( ::aTags ) + n := Len( ::aTags ) ELSEIF n > 0 n-- ENDIF diff --git a/harbour/contrib/hbide/ideedit.prg b/harbour/contrib/hbide/ideedit.prg index be03097806..8c80b591f9 100644 --- a/harbour/contrib/hbide/ideedit.prg +++ b/harbour/contrib/hbide/ideedit.prg @@ -411,8 +411,8 @@ METHOD IdeEdit:execEvent( nMode, p, p1 ) n := ascan( ::oEditor:aEdits, {|o| o == Self } ) - ::oEM:aActions[ 18, 2 ]:setEnabled( len( ::oEditor:aEdits ) == 0 .OR. ::oEditor:nSplOrient == -1 .OR. ::oEditor:nSplOrient == 1 ) - ::oEM:aActions[ 19, 2 ]:setEnabled( len( ::oEditor:aEdits ) == 0 .OR. ::oEditor:nSplOrient == -1 .OR. ::oEditor:nSplOrient == 2 ) + ::oEM:aActions[ 18, 2 ]:setEnabled( Len( ::oEditor:aEdits ) == 0 .OR. ::oEditor:nSplOrient == -1 .OR. ::oEditor:nSplOrient == 1 ) + ::oEM:aActions[ 19, 2 ]:setEnabled( Len( ::oEditor:aEdits ) == 0 .OR. ::oEditor:nSplOrient == -1 .OR. ::oEditor:nSplOrient == 2 ) ::oEM:aActions[ 21, 2 ]:setEnabled( n > 0 ) IF empty( qAct := ::oEM:qContextMenu:exec( ::qEdit:mapToGlobal( p ) ) ) @@ -499,7 +499,7 @@ METHOD IdeEdit:execEvent( nMode, p, p1 ) ::qEdit:hbGetSelectionInfo() IF ::aSelectionInfo[ 1 ] > -1 .AND. ::aSelectionInfo[ 1 ] == ::aSelectionInfo[ 3 ] - ::oDK:setStatusText( SB_PNL_SELECTEDCHARS, len( ::getSelectedText() ) ) + ::oDK:setStatusText( SB_PNL_SELECTEDCHARS, Len( ::getSelectedText() ) ) ELSE ::oDK:setStatusText( SB_PNL_SELECTEDCHARS, 0 ) ENDIF @@ -837,7 +837,7 @@ STATIC FUNCTION hbide_invert( cBuffer ) LOCAL s, i, c, nLen s := "" - nLen := len( cBuffer ) + nLen := Len( cBuffer ) FOR i := 1 TO nLen c := substr( cBuffer, i, 1 ) IF isAlpha( c ) @@ -962,7 +962,7 @@ METHOD IdeEdit:pasteBlockContents( nMode ) a_:= hbide_blockContents() IF !empty( a_ ) - IF ( len( a_[ 2 ] ) == len( aCopy ) ) .OR. ( len( a_[ 2 ] ) == len( aCopy ) + 1 ) + IF ( Len( a_[ 2 ] ) == len( aCopy ) ) .OR. ( len( a_[ 2 ] ) == len( aCopy ) + 1 ) IF a_[ 2,1 ] == aCopy[ 1 ] nPasteMode := a_[ 1 ] ENDIF @@ -977,9 +977,9 @@ METHOD IdeEdit:pasteBlockContents( nMode ) // SWITCH nPasteMode CASE selectionMode_column - FOR i := 1 TO len( aCopy ) + FOR i := 1 TO Len( aCopy ) qCursor:insertText( aCopy[ i ] ) - IF i < len( aCopy ) + IF i < Len( aCopy ) hbide_qCursorDownInsert( qCursor ) qCursor:movePosition( QTextCursor_EndOfLine, QTextCursor_MoveAnchor ) @@ -993,16 +993,16 @@ METHOD IdeEdit:pasteBlockContents( nMode ) NEXT EXIT CASE selectionMode_stream - FOR i := 1 TO len( aCopy ) + FOR i := 1 TO Len( aCopy ) qCursor:insertText( aCopy[ i ] ) - IF i < len( aCopy ) + IF i < Len( aCopy ) qCursor:insertText( hb_eol() ) ENDIF NEXT EXIT CASE selectionMode_line qCursor:movePosition( QTextCursor_StartOfLine, QTextCursor_MoveAnchor ) - FOR i := 1 TO len( aCopy ) + FOR i := 1 TO Len( aCopy ) qCursor:insertText( aCopy[ i ] ) qCursor:insertBlock() NEXT @@ -1128,7 +1128,7 @@ METHOD IdeEdit:deleteBlockContents( aCord ) METHOD IdeEdit:blockComment() LOCAL nT, nL, nB, nR, nW, i, cLine, qCursor, aCord, nMode, q_ LOCAL cComment := "// " - LOCAL nLen := len( cComment ) + LOCAL nLen := Len( cComment ) IF ::lReadOnly RETURN Self @@ -1386,10 +1386,10 @@ METHOD IdeEdit:currentFunctionIndex() IF !empty( ::aTags ) nCurLine := ::getLineNo() - IF len( ::aTags ) == 1 + IF Len( ::aTags ) == 1 n := 1 ELSEIF ( n := ascan( ::aTags, {|e_| e_[ 3 ] >= nCurLine } ) ) == 0 - n := len( ::aTags ) + n := Len( ::aTags ) ELSEIF n > 0 n-- ENDIF @@ -1403,7 +1403,7 @@ METHOD IdeEdit:toNextFunction() LOCAL n IF ( n := ::currentFunctionIndex() ) >= 0 - IF n < len( ::aTags ) + IF n < Len( ::aTags ) IF ::find( ::aTags[ n+1, 8 ], QTextDocument_FindCaseSensitively ) ::qEdit:centerCursor() ::down() @@ -1599,7 +1599,7 @@ METHOD IdeEdit:setReadOnly( lReadOnly ) /*----------------------------------------------------------------------*/ METHOD IdeEdit:gotoMark( nIndex ) - IF len( ::aBookMarks ) >= nIndex + IF Len( ::aBookMarks ) >= nIndex ::qEdit:hbGotoBookmark( ::aBookMarks[ nIndex ] ) ::qEdit:centerCursor() ENDIF @@ -1627,13 +1627,13 @@ METHOD IdeEdit:setNewMark() IF ( n := ascan( ::aBookMarks, nBlock ) ) > 0 hb_adel( ::aBookMarks, n, .t. ) - ::aMarkTBtns[ len( ::aBookMarks ) + 1 ]:hide() + ::aMarkTBtns[ Len( ::aBookMarks ) + 1 ]:hide() ELSE - IF len( ::aBookMarks ) == 6 + IF Len( ::aBookMarks ) == 6 RETURN Self ENDIF aadd( ::aBookMarks, nBlock ) - n := len( ::aBookMarks ) + n := Len( ::aBookMarks ) ::aMarkTBtns[ n ]:show() ENDIF @@ -1702,7 +1702,7 @@ METHOD IdeEdit:findEx( cText, nFlags, nStart ) ::qEdit:centerCursor() qCursor := ::qEdit:textCursor() - ::qEdit:hbSetSelectionInfo( { qCursor:blockNumber(), qCursor:columnNumber() - len( cText ), ; + ::qEdit:hbSetSelectionInfo( { qCursor:blockNumber(), qCursor:columnNumber() - Len( cText ), ; qCursor:blockNumber(), qCursor:columnNumber(), 1, .t., .f. } ) qCursor:clearSelection() ELSE @@ -1834,8 +1834,8 @@ METHOD IdeEdit:panEnd() LOCAL qCursor := ::getCursor() LOCAL cLine := ::getLine() ::qEdit:hbGetViewportInfo() - IF len( cLine ) - ::aViewportInfo[ 2 ] > ::aViewportInfo[ 4 ] - qCursor:movePosition( QTextCursor_Right, QTextCursor_MoveAnchor, len( cLine ) - ::aViewportInfo[ 2 ] ) + IF Len( cLine ) - ::aViewportInfo[ 2 ] > ::aViewportInfo[ 4 ] + qCursor:movePosition( QTextCursor_Right, QTextCursor_MoveAnchor, Len( cLine ) - ::aViewportInfo[ 2 ] ) ELSE qCursor:movePosition( QTextCursor_EndOfLine ) ENDIF @@ -2163,7 +2163,7 @@ METHOD IdeEdit:insertText( cText ) IF HB_ISSTRING( cText ) .AND. !Empty( cText ) qCursor := ::qEdit:textCursor() - nL := len( cText ) + nL := Len( cText ) nB := qCursor:position() + nL qCursor:beginEditBlock() @@ -2197,9 +2197,9 @@ METHOD IdeEdit:handlePreviousWord( lUpdatePrevWord ) cWord := hbide_getPreviousWord( cText, nCol + 1 ) IF !empty( cWord ) .AND. hbide_isHarbourKeyword( cWord, ::oIde ) - lPrevOnly := left( lower( ltrim( cText ) ), len( cWord ) ) == lower( cWord ) + lPrevOnly := left( lower( ltrim( cText ) ), Len( cWord ) ) == lower( cWord ) - nL := len( cWord ) + nSpace + nL := Len( cWord ) + nSpace nB := qCursor:position() - nL IF lower( ::oEditor:cExt ) $ ".prg,.hb" .AND. ! ::oINI:lSupressHbKWordsToUpper @@ -2672,7 +2672,7 @@ FUNCTION hbide_formatProto_1( cProto, cText, nProtoCol, nCurCol, nRows, nCols ) s := substr( cText, nProtoCol, nCurCol - nProtoCol ) nArgs := 1 - FOR i := 1 TO len( s ) + FOR i := 1 TO Len( s ) IF substr( s, i, 1 ) == "," nArgs++ ENDIF @@ -2687,12 +2687,12 @@ FUNCTION hbide_formatProto_1( cProto, cText, nProtoCol, nCurCol, nRows, nCols ) cArgs := substr( cProto, n + 1, n1 - n - 1 ) aArgs := hb_aTokens( cArgs, "," ) cArgs := "" - nCols := len( cFunc ) + 1 + nCols := Len( cFunc ) + 1 FOR EACH cArg IN aArgs cArg := alltrim( cArg ) nRows++ - nCols := max( nCols, len( cArg ) + 3 ) + nCols := max( nCols, Len( cArg ) + 3 ) cArg := StrTran( cArg, "<", "<" ) cArg := StrTran( cArg, ">", ">" ) @@ -2701,13 +2701,13 @@ FUNCTION hbide_formatProto_1( cProto, cText, nProtoCol, nCurCol, nRows, nCols ) IF nnn == nArgs cArg := "" + cArg + "" ENDIF - IF nnn == len( aArgs ) + IF nnn == Len( aArgs ) cArgs += "
" + " " + cArg ELSE cArgs += "
" + " " + cArg + "" + "," + "" ENDIF NEXT - nCols += iif( nCols <= len( cFunc ), 0, 1 ) + nCols += iif( nCols <= Len( cFunc ), 0, 1 ) //cPro := "

" + "" + cFunc + "" + ; cPro := "

" + "" + cFunc + "" + ; diff --git a/harbour/contrib/hbide/ideeditor.prg b/harbour/contrib/hbide/ideeditor.prg index 92413c2186..5915c0b0cd 100644 --- a/harbour/contrib/hbide/ideeditor.prg +++ b/harbour/contrib/hbide/ideeditor.prg @@ -371,7 +371,7 @@ METHOD IdeEditsManager:getProto( cWord ) LOCAL n, nLen cWord := upper( cWord ) - nLen := len( cWord ) + nLen := Len( cWord ) /* This can be rationalized */ IF ( n := ascan( ::aProtos, {|e| upper( left( e, nLen ) ) == cWord } ) ) > 0 @@ -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 @@ -1415,7 +1415,7 @@ METHOD IdeEditor:destroy() ::qCoEdit := NIL ::qEdit := NIL - DO WHILE len( ::aEdits ) > 0 + DO WHILE Len( ::aEdits ) > 0 oEdit := ::aEdits[ 1 ] hb_adel( ::aEdits, 1, .t. ) oEdit:destroy() @@ -1457,7 +1457,7 @@ METHOD IdeEditor:destroy() METHOD IdeEditor:relay( oEdit ) LOCAL oEdt - IF len( ::aEdits ) == 0 + IF Len( ::aEdits ) == 0 IF ::nSplOrient > -1 ::nSplOrient := -1 ::qLayout:removeWidget( ::qSplitter ) @@ -1535,7 +1535,7 @@ METHOD IdeEditor:prepareBufferToSave( cBuffer ) NEXT cBuffer := "" aeval( a_, {|e| cBuffer += e + cEOL } ) - cBuffer := substr( cBuffer, 1, len( cBuffer ) - len( cEOL ) ) + cBuffer := substr( cBuffer, 1, Len( cBuffer ) - len( cEOL ) ) ENDIF RETURN cBuffer diff --git a/harbour/contrib/hbide/idefindreplace.prg b/harbour/contrib/hbide/idefindreplace.prg index c8a48ef011..4973ff780f 100644 --- a/harbour/contrib/hbide/idefindreplace.prg +++ b/harbour/contrib/hbide/idefindreplace.prg @@ -308,7 +308,7 @@ METHOD IdeSearchReplace:find( cText, lBackward ) ::nCurDirection := iif( lBackward, QTextDocument_FindBackward, 0 ) - IF len( cText ) > 0 + IF Len( cText ) > 0 qCursor := ::qCurEdit:textCursor() IF ::oUI:q_checkRegEx:isChecked() @@ -605,13 +605,13 @@ METHOD IdeFindReplace:replaceSelection( cReplWith ) qCursor := ::qCurEdit:textCursor() IF qCursor:hasSelection() .and. ! empty( cBuffer := qCursor:selectedText() ) - nL := len( cBuffer ) + nL := Len( cBuffer ) nB := qCursor:position() - nL qCursor:beginEditBlock() qCursor:removeSelectedText() qCursor:insertText( cReplWith ) - qCursor:setPosition( nB + len( cReplWith ) ) + qCursor:setPosition( nB + Len( cReplWith ) ) ::qCurEdit:setTextCursor( qCursor ) ::oEM:getEditObjectCurrent():clearSelection() qCursor:endEditBlock() @@ -950,7 +950,7 @@ METHOD IdeFindInFiles:execEvent( cEvent, p ) qCursor := ::oUI:q_editResults:textCursor() nInfo := qCursor:blockNumber() + 1 - IF nInfo <= len( ::aInfo ) .AND. ::aInfo[ nInfo, 1 ] == -2 + IF nInfo <= Len( ::aInfo ) .AND. ::aInfo[ nInfo, 1 ] == -2 cSource := ::aInfo[ nInfo, 2 ] ::oSM:editSource( cSource, 0, 0, 0, NIL, NIL, .f., .t. ) @@ -958,7 +958,7 @@ METHOD IdeFindInFiles:execEvent( cEvent, p ) qCursor:setPosition( 0 ) qCursor:movePosition( QTextCursor_Down, QTextCursor_MoveAnchor, ::aInfo[ nInfo, 3 ] - 1 ) qCursor:movePosition( QTextCursor_Right, QTextCursor_MoveAnchor, ::aInfo[ nInfo, 4 ] - 1 ) - qCursor:movePosition( QTextCursor_Right, QTextCursor_KeepAnchor, len( ::aInfo[ nInfo, 5 ] ) ) + qCursor:movePosition( QTextCursor_Right, QTextCursor_KeepAnchor, Len( ::aInfo[ nInfo, 5 ] ) ) ::oIde:qCurEdit:setTextCursor( qCursor ) ::oIde:manageFocusInEditor() ENDIF @@ -979,7 +979,7 @@ METHOD IdeFindInFiles:replaceAll() IF empty( ::cReplWith := ::oUI:q_comboRepl:currentText() ) RETURN Self ENDIF - nL := len( ::cReplWith ) + nL := Len( ::cReplWith ) IF ! hbide_getYesNo( "Starting REPLACE operation", "No way to interrupt", "Critical" ) RETURN Self @@ -996,7 +996,7 @@ METHOD IdeFindInFiles:replaceAll() qCursor:setPosition( 0 ) qCursor:movePosition( QTextCursor_Down, QTextCursor_MoveAnchor, aFind[ 3 ] - 1 ) qCursor:movePosition( QTextCursor_Right, QTextCursor_MoveAnchor, aFind[ 4 ] - 1 ) - qCursor:movePosition( QTextCursor_Right, QTextCursor_KeepAnchor, len( aFind[ 5 ] ) ) + qCursor:movePosition( QTextCursor_Right, QTextCursor_KeepAnchor, Len( aFind[ 5 ] ) ) ::qCurEdit:setTextCursor( qCursor ) nB := qCursor:position() @@ -1016,76 +1016,74 @@ METHOD IdeFindInFiles:replaceAll() /*----------------------------------------------------------------------*/ METHOD IdeFindInFiles:execContextMenu( p ) - LOCAL nLine, qCursor, qMenu, qAct, cAct, cFind + LOCAL nLine, qCursor, qMenu, qAct, cFind qCursor := ::oUI:q_editResults:textCursor() nLine := qCursor:blockNumber() + 1 - IF nLine <= len( ::aInfo ) - qMenu := QMenu() // ::oUI:q_editResults ) - + IF nLine <= Len( ::aInfo ) + qMenu := QMenu() + qMenu:addAction( "Copy" ) qMenu:addAction( "Select All" ) qMenu:addAction( "Clear" ) qMenu:addAction( "Print" ) qMenu:addAction( "Save as..." ) - qMenu:addSeparator() + qMenu:addSeparator() qMenu:addAction( "Find" ) - qMenu:addSeparator() + qMenu:addSeparator() IF ::aInfo[ nLine, 1 ] == -2 /* Found Line */ qMenu:addAction( "Replace Line" ) ELSEIF ::aInfo[ nLine, 1 ] == -1 /* Source File */ qMenu:addAction( "Open" ) qMenu:addAction( "Replace All" ) ENDIF - qMenu:addSeparator() - qMenu:addAction( "Zom In" ) + qMenu:addSeparator() + qMenu:addAction( "Zom In" ) qMenu:addAction( "Zoom Out" ) - + IF ! empty( qAct := qMenu:exec( ::oUI:q_editResults:mapToGlobal( p ) ) ) - IF valtype( cAct := qAct:text() ) == "C" - - SWITCH cAct - CASE "Save as..." - EXIT - CASE "Find" - IF !empty( cFind := hbide_fetchAString( ::oUI:q_editResults, , "Find what?", "Find" ) ) - ::lNotDblClick := .T. - IF !( ::oUI:q_editResults:find( cFind, 0 ) ) - MsgBox( "Not Found" ) - ENDIF - ENDIF - EXIT - CASE "Print" - ::print() - EXIT - CASE "Clear" - ::oUI:q_editResults:clear() - ::aInfo := {} - EXIT - CASE "Copy" + SWITCH qAct:text() + + CASE "Save as..." + EXIT + CASE "Find" + IF !empty( cFind := hbide_fetchAString( ::oUI:q_editResults, , "Find what?", "Find" ) ) ::lNotDblClick := .T. - ::oUI:q_editResults:copy() - EXIT - CASE "Select All" - ::oUI:q_editResults:selectAll() - EXIT - CASE "Replace Line" - EXIT - CASE "Replace Source" - EXIT - CASE "Zoom In" - ::oUI:q_editResults:zoomIn() - EXIT - CASE "Zoom Out" - ::oUI:q_editResults:zoomOut() - EXIT - ENDSWITCH - ENDIF + IF !( ::oUI:q_editResults:find( cFind, 0 ) ) + MsgBox( "Not Found" ) + ENDIF + ENDIF + EXIT + CASE "Print" + ::print() + EXIT + CASE "Clear" + ::oUI:q_editResults:clear() + ::aInfo := {} + EXIT + CASE "Copy" + ::lNotDblClick := .T. + ::oUI:q_editResults:copy() + EXIT + CASE "Select All" + ::oUI:q_editResults:selectAll() + EXIT + CASE "Replace Line" + EXIT + CASE "Replace Source" + EXIT + CASE "Zoom In" + ::oUI:q_editResults:zoomIn() + EXIT + CASE "Zoom Out" + ::oUI:q_editResults:zoomOut() + EXIT + ENDSWITCH ENDIF ENDIF - RETURN NIL + RETURN NIL /*----------------------------------------------------------------------*/ @@ -1315,7 +1313,7 @@ METHOD IdeFindInFiles:findInABunch( aFiles ) ENDIF ENDIF - IF len( aLines ) > 0 + IF Len( aLines ) > 0 ::showLog( LOG_FINDS, s, aLines ) ::nFounds++ ELSE @@ -1326,8 +1324,8 @@ METHOD IdeFindInFiles:findInABunch( aFiles ) ::nMisses++ ENDIF NEXT - IF nNoMatch == len( aFiles ) - ::showLog( LOG_INFO, "Searched (" + hb_ntos( len( aFiles ) ) + ") files, no matches found" ) + IF nNoMatch == Len( aFiles ) + ::showLog( LOG_INFO, "Searched (" + hb_ntos( Len( aFiles ) ) + ") files, no matches found" ) ENDIF RETURN Self @@ -1373,7 +1371,7 @@ METHOD IdeFindInFiles:showLog( nType, cMsg, aLines ) EXIT CASE LOG_FINDS - cText := F_FILE + "" + cMsg + " ( "+ hb_ntos( len( aLines ) ) + " )" + "" + F_END + cText := F_FILE + "" + cMsg + " ( "+ hb_ntos( Len( aLines ) ) + " )" + "" + F_END ::oUI:q_editResults:append( cText ) ::oUI:q_labelStatus:setText( cText ) aadd( ::aInfo, { -1, cMsg, NIL } ) @@ -1403,8 +1401,8 @@ METHOD IdeFindInFiles:showLog( nType, cMsg, aLines ) //nB := at( cExp, cL ) nB := at( cExp, iif( ::lMatchCase, cL, lower( cL ) ) ) cPre := substr( cL, 1, nB - 1 ) - cPost := substr( cL, nB + len( cExp ) ) - cT := substr( cL, nB, len( cExp ) ) + cPost := substr( cL, nB + Len( cExp ) ) + cT := substr( cL, nB, Len( cExp ) ) cL := hbide_convertHtmlDelimiters( cPre ) + F_SEARCH + "" + hbide_convertHtmlDelimiters( cT ) + ; "" + F_END + hbide_convertHtmlDelimiters( cPost ) @@ -1445,13 +1443,13 @@ METHOD IdeFindInFiles:showLog( nType, cMsg, aLines ) STATIC FUNCTION hbide_buildResultLine( cLine, aM ) LOCAL cT, cR, i - FOR i := 1 TO len( aM ) + FOR i := 1 TO Len( aM ) cR := aM[ i, 1 ] - cT := replicate( chr( 255 ), len( aM[ i, 1 ] ) ) + cT := replicate( chr( 255 ), Len( aM[ i, 1 ] ) ) cLine := strtran( cLine, cR, cT, 1, 1 ) NEXT - FOR i := 1 TO len( aM ) - cR := replicate( chr( 255 ), len( aM[ i, 1 ] ) ) + FOR i := 1 TO Len( aM ) + cR := replicate( chr( 255 ), Len( aM[ i, 1 ] ) ) cT := F_SEARCH + "" + hbide_convertHtmlDelimiters( aM[ i, 1 ] ) + "" + F_END cLine := strtran( cLine, cR, cT, 1, 1 ) NEXT diff --git a/harbour/contrib/hbide/idefunctions.prg b/harbour/contrib/hbide/idefunctions.prg index f448b0e9b2..db67e1e01e 100644 --- a/harbour/contrib/hbide/idefunctions.prg +++ b/harbour/contrib/hbide/idefunctions.prg @@ -158,7 +158,7 @@ METHOD IdeFunctions:execEvent( nMode, p ) DO CASE CASE nMode == "editFunc_textChanged" p := upper( p ) - nLen := len( p ) + nLen := Len( p ) IF ( n := ascan( ::aList, {|e_| left( e_[ 1 ], nLen ) == p } ) ) > 0 ::oUI:q_tableFuncList:setCurrentItem( ::aItems[ n ] ) ENDIF @@ -306,7 +306,7 @@ METHOD IdeFunctions:positionToFunction( cWord, lShowTip ) IF !empty( ::aList ) p := upper( cWord ) - nLen := len( p ) + nLen := Len( p ) IF ( n := ascan( ::aList, {|e_| left( e_[ 1 ], nLen ) == p } ) ) > 0 ::oUI:q_editFunction:setText( cWord ) ::oUI:q_tableFuncList:setCurrentItem( ::aItems[ n ] ) @@ -329,7 +329,7 @@ METHOD IdeFunctions:jumpToFunction( cWord ) IF !empty( ::aList ) p := upper( cWord ) - nLen := len( p ) + nLen := Len( p ) IF ( n := ascan( ::aList, {|e_| left( e_[ 1 ], nLen ) == p } ) ) > 0 ::oUI:q_editFunction:setText( cWord ) ::oUI:q_tableFuncList:setCurrentItem( ::aItems[ n ] ) @@ -348,7 +348,7 @@ METHOD IdeFunctions:openFunction( lCheckDuplicates ) IF ( n := ::oUI:q_tableFuncList:currentRow() ) >= 0 n++ cFunc := ::aList[ n, 1 ] - IF lCheckDuplicates .AND. n < len( ::aList ) .AND. ::aList[ n + 1, 1 ] == cFunc + IF lCheckDuplicates .AND. n < Len( ::aList ) .AND. ::aList[ n + 1, 1 ] == cFunc ::oFunctionsDock:show() ::oUI:q_tableFuncList:setFocus() RETURN lOpened @@ -611,7 +611,7 @@ METHOD IdeFunctions:populateTable() ::buildHeader() oTbl := ::oUI:q_tableFuncList - oTbl:setRowCount( len( ::aList ) ) + oTbl:setRowCount( Len( ::aList ) ) n := 0 FOR EACH a_ IN ::aList diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg index b698e9d060..9c6e1eee6f 100644 --- a/harbour/contrib/hbide/ideharbourhelp.prg +++ b/harbour/contrib/hbide/ideharbourhelp.prg @@ -523,7 +523,7 @@ METHOD IdeHarbourHelp:execEvent( nMode, p, p1 ) CASE "browserView_anchorClicked" cText := lower( p:toString() ) - nLen := len( cText ) + nLen := Len( cText ) IF ( n := ascan( ::aFunctions, {|e_| left( e_[ 6 ], nLen ) == cText } ) ) > 0 ::oUI:q_listIndex:setCurrentItem( ::aFunctions[ n, 5 ] ) ::populateIndexedSelection() @@ -543,7 +543,7 @@ METHOD IdeHarbourHelp:execEvent( nMode, p, p1 ) EXIT CASE "editIndex_textChanged" - IF ( nLen := len( p ) ) > 0 + IF ( nLen := Len( p ) ) > 0 cLower := lower( p ) IF ( n := ascan( ::aFunctions, {|e_| left( e_[ 6 ], nLen ) == cLower } ) ) > 0 ::oUI:q_listIndex:setCurrentItem( ::aFunctions[ n, 5 ] ) @@ -574,13 +574,13 @@ METHOD IdeHarbourHelp:execEvent( nMode, p, p1 ) EXIT CASE "buttonForward_clicked" - IF ::nCurInHist < len( ::aHistory ) + IF ::nCurInHist < Len( ::aHistory ) ::oUI:q_treeDoc:setCurrentItem( ::aNodes[ ::aHistory[ ::nCurInHist + 1 ], 1 ], 0 ) ENDIF EXIT CASE "buttonUp_clicked" - IF ::nCurInHist > 1 .AND. ::nCurInHist <= len( ::aHistory ) + IF ::nCurInHist > 1 .AND. ::nCurInHist <= Len( ::aHistory ) IF ! empty( qTWItem := ::oUI:q_treeDoc:itemAbove( ::oUI:q_treeDoc:currentItem( 0 ) ) ) ::oUI:q_treeDoc:setCurrentItem( qTWItem, 0 ) ENDIF @@ -623,7 +623,7 @@ METHOD IdeHarbourHelp:execEvent( nMode, p, p1 ) IF ( n := ascan( ::aNodes, {|e_| e_[ 5 ] == cText } ) ) > 0 IF ( nn := ascan( ::aHistory, n ) ) == 0 aadd( ::aHistory, n ) - ::nCurInHist := len( ::aHistory ) + ::nCurInHist := Len( ::aHistory ) ELSE ::nCurInHist := nn ENDIF @@ -650,7 +650,7 @@ METHOD IdeHarbourHelp:execEvent( nMode, p, p1 ) METHOD IdeHarbourHelp:jumpToFunction( cFunction ) LOCAL n, nLen - nLen := len( cFunction ) + nLen := Len( cFunction ) cFunction := lower( cFunction ) IF !empty( ::aNodes ) IF ( n := ascan( ::aFunctions, {|e_| lower( left( e_[ 2 ], nLen ) ) == cFunction } ) ) > 0 @@ -784,7 +784,7 @@ STATIC FUNCTION hbide_buildFoldersTree( aNodes, aPaths ) aSubs := hb_aTokens( cPath, "/" ) - FOR i := 1 TO len( aSubs ) + FOR i := 1 TO Len( aSubs ) IF !empty( aSubs[ i ] ) cCPath := hbide_buildPathFromSubs( aSubs, i ) n := ascan( aNodes, {|e_| hb_FileMatch( hbide_pathNormalized( e_[ 4 ], .f. ), hbide_pathNormalized( cRoot + cCPath, .f. ) ) } ) @@ -1069,7 +1069,7 @@ METHOD IdeHarbourHelp:getFunctionPrototypes() IF HB_ISOBJECT( oFunc ) IF !empty( oFunc:aSyntax ) IF "C Prototype" $ oFunc:aSyntax[ 1 ] - aadd( aProto, alltrim( oFunc:aSyntax[ len( oFunc:aSyntax ) ] ) ) + aadd( aProto, alltrim( oFunc:aSyntax[ Len( oFunc:aSyntax ) ] ) ) ELSE aadd( aProto, alltrim( oFunc:aSyntax[ 1 ] ) ) ENDIF @@ -1086,7 +1086,7 @@ METHOD IdeHarbourHelp:getFunctionPrototypes() IF HB_ISOBJECT( oFunc ) IF !empty( oFunc:aSyntax ) IF "C Prototype" $ oFunc:aSyntax[ 1 ] - aadd( aProto, alltrim( oFunc:aSyntax[ len( oFunc:aSyntax ) ] ) ) + aadd( aProto, alltrim( oFunc:aSyntax[ Len( oFunc:aSyntax ) ] ) ) ELSE aadd( aProto, alltrim( oFunc:aSyntax[ 1 ] ) ) ENDIF @@ -1162,7 +1162,7 @@ METHOD IdeHarbourHelp:populateTextFile( cTextFile ) aadd( aHtm, '
' + ' 


' ) IF nParsed > 0 aFn := ::aFuncByFile[ nParsed, 2 ] - IF len( aFn ) > 0 + IF Len( aFn ) > 0 FOR EACH oFunc IN aFn IF HB_ISOBJECT( oFunc ) aadd( aHtm, '
' + hbide_arrayToMemoHtml( oFunc:aSyntax ) + '
' ) @@ -1285,7 +1285,7 @@ METHOD IdeHarbourHelp:buildView( oFunc ) s1 := s ENDIF aadd( aHtm, '' + s + "" + ; - iif( s:__enumIndex() == len( a_ ), "", ", " ) ) + iif( s:__enumIndex() == Len( a_ ), "", ", " ) ) NEXT aadd( aHtm, "" ) ENDIF @@ -1355,7 +1355,7 @@ METHOD IdeHarbourHelp:buildView( oFunc ) s1 := s ENDIF aadd( aHtm, '' + s + "" + ; - iif( s:__enumIndex() == len( a_ ), "", ", " ) ) + iif( s:__enumIndex() == Len( a_ ), "", ", " ) ) NEXT aadd( aHtm, "" ) aadd( aHtm, z ) diff --git a/harbour/contrib/hbide/idehome.prg b/harbour/contrib/hbide/idehome.prg index 4a5d1871e5..08a0d6034a 100644 --- a/harbour/contrib/hbide/idehome.prg +++ b/harbour/contrib/hbide/idehome.prg @@ -409,7 +409,7 @@ METHOD IdeHome:addProjectsInfo( aHtm ) aadd( aHtm, ' ' + left( prp_[ PRJ_PRP_TYPE ], 3 ) ) aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) - aadd( aHtm, ' ' + hb_ntos( len( src_ ) ) ) + aadd( aHtm, ' ' + hb_ntos( Len( src_ ) ) ) aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) aadd( aHtm, ' ' + hbide_pathNormalized( a_[ 1 ], .f. ) ) diff --git a/harbour/contrib/hbide/idemisc.prg b/harbour/contrib/hbide/idemisc.prg index 970093d586..d976654d29 100644 --- a/harbour/contrib/hbide/idemisc.prg +++ b/harbour/contrib/hbide/idemisc.prg @@ -131,7 +131,7 @@ FUNCTION hbide_execPopup( aPops, aqPos, qParent ) qPop := QMenu( iif( HB_ISOBJECT( qParent ), qParent, NIL ) ) qPop:setStyleSheet( GetStyleSheet( "QMenuPop", hbide_setIde():nAnimantionMode ) ) - FOR i := 1 TO len( aPops ) + FOR i := 1 TO Len( aPops ) IF empty( aPops[ i,1 ] ) aadd( qAct_, qPop:addSeparator() ) ELSE @@ -459,7 +459,7 @@ FUNCTION hbide_ar2delString( a_, cDlm ) aeval( a_, {|e| s += e + cDlm } ) - RETURN substr( s, 1, len( s ) - len( cDlm ) ) + RETURN substr( s, 1, Len( s ) - len( cDlm ) ) /*----------------------------------------------------------------------*/ @@ -479,7 +479,7 @@ FUNCTION hbide_arrayToMemoEx( a_ ) aeval( a_, {|e| s += e + hb_eol() } ) - s := substr( s, 1, len( s ) - 2 ) + s := substr( s, 1, Len( s ) - 2 ) RETURN s @@ -504,7 +504,7 @@ FUNCTION hbide_arrayToMemoEx2( a_ ) DO WHILE .t. IF right( s, 2 ) == hb_eol() - s := substr( s, 1, len( s ) - 2 ) + s := substr( s, 1, Len( s ) - 2 ) ELSE EXIT ENDIF @@ -618,13 +618,13 @@ FUNCTION hbide_pathNormalized( cPath ) /*----------------------------------------------------------------------*/ FUNCTION hbide_pathFile( cPath, cFile ) - cPath := iif( right( cPath, 1 ) $ "\/", substr( cPath, 1, len( cPath ) - 1 ), cPath ) + cPath := iif( right( cPath, 1 ) $ "\/", substr( cPath, 1, Len( cPath ) - 1 ), cPath ) RETURN hbide_pathToOSPath( iif( empty( cPath ), cFile, cPath + "\" + cFile ) ) /*----------------------------------------------------------------------*/ FUNCTION hbide_pathStripLastSlash( cPath ) - RETURN iif( right( cPath, 1 ) $ "\/", substr( cPath, 1, len( cPath ) - 1 ), cPath ) + RETURN iif( right( cPath, 1 ) $ "\/", substr( cPath, 1, Len( cPath ) - 1 ), cPath ) /*----------------------------------------------------------------------*/ @@ -942,11 +942,11 @@ function hbide_toString( x, lLineFeed, lInherited, lType, cFile, lForceLineFeed s := iif( lType, "[U]=", "" ) + 'NIL' CASE ( t == "A" ) s := iif( lType, "[A]=", "" ) + "{" - IF len( x ) == 0 + IF Len( x ) == 0 s += " " ELSE s += iif( valtype( x[1] ) == "A" .or. lForceLineFeed, hb_eol(), "" ) - j := len( x ) + j := Len( x ) FOR i := 1 TO j s += iif( valtype( x[i] ) == "A", " ", " " ) + iif( lForceLineFeed, " ", "" ) + hbide_toString( x[i], .F. ) @@ -1045,7 +1045,7 @@ FUNCTION hbide_getUniqueFuncName() LOCAL t, b, c, n t := 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789' - n := len( t ) + n := Len( t ) b := '' DO WHILE Len( b ) != 10 c := Substr( t, HB_RANDOMINT( 1, n ), 1 ) @@ -1551,7 +1551,7 @@ FUNCTION hbide_isPrevParent( cRoot, cPath ) cLRoot := hbide_pathNormalized( cRoot, .t. ) cLPath := hbide_pathNormalized( cPath, .t. ) - IF hb_FileMatch( left( cLPath, len( cLRoot ) ), cLRoot ) + IF hb_FileMatch( left( cLPath, Len( cLRoot ) ), cLRoot ) RETURN .t. ENDIF @@ -1595,8 +1595,8 @@ FUNCTION hbide_stripRoot( cRoot, cPath ) cLRoot := hbide_pathNormalized( cRoot, .t. ) cLPath := hbide_pathNormalized( cPath, .f. ) - IF hb_FileMatch( left( lower( cLPath ), len( cLRoot ) ), cLRoot ) - cP := substr( cLPath, len( cRoot ) + 1 ) + IF hb_FileMatch( left( lower( cLPath ), Len( cLRoot ) ), cLRoot ) + cP := substr( cLPath, Len( cRoot ) + 1 ) RETURN cP ENDIF @@ -1769,7 +1769,7 @@ FUNCTION hbide_string2nArray( s ) b_:= hb_atokens( s, " " ) FOR EACH s IN b_ s := alltrim( s ) - IF len( s ) > 0 + IF Len( s ) > 0 aadd( a_, val( s ) ) ENDIF NEXT diff --git a/harbour/contrib/hbide/ideplugins.prg b/harbour/contrib/hbide/ideplugins.prg index 7afedb1253..45576ed11d 100644 --- a/harbour/contrib/hbide/ideplugins.prg +++ b/harbour/contrib/hbide/ideplugins.prg @@ -244,11 +244,11 @@ FUNCTION hbide_loadPrototypes( cPath ) NEXT ENDIF - nLen := len( b_ ) + nLen := Len( b_ ) FOR EACH s IN b_ i := s:__enumIndex() IF right( s, 1 ) == ";" - s := substr( s, 1, len( s ) - 1 ) + s := substr( s, 1, Len( s ) - 1 ) IF i < nLen b_[ i + 1 ] := s + " " + b_[ i + 1 ] s := "" diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg index 8671d8d1e1..26c6a762f6 100644 --- a/harbour/contrib/hbide/ideprojmanager.prg +++ b/harbour/contrib/hbide/ideprojmanager.prg @@ -257,7 +257,7 @@ CLASS IdeProjManager INHERIT IdeObject METHOD removeProject( cProjectTitle ) METHOD closeProject( cProjectTitle ) - METHOD promptForPath( cObjPathName, cTitle, cObjFileName, cObjPath2, cObjPath3 ) + METHOD promptForPath( oEditPath, cTitle, cObjFileName ) METHOD buildSource( lExecutable ) METHOD buildProject( cProject, lLaunch, lRebuild, lPPO, lViaQt ) METHOD launchProject( cProject, cExe ) @@ -479,7 +479,7 @@ METHOD IdeProjManager:pullHbpData( cHbp ) cHome := hbide_pathStripLastSlash( cHome ) c3rd := "-3rd=" - nL := len( c3rd ) + nL := Len( c3rd ) aData := hbide_fetchHbpData( cHbp ) aOptns := aData[ 1 ] aFiles := aData[ 2 ] @@ -851,10 +851,10 @@ METHOD IdeProjManager:buildInterface() // ::oUI:q_buttonSortZA :connect( "clicked()", {|| ::sortSources( "za" ) } ) // ::oUI:q_buttonSortOrg :connect( "clicked()", {|| ::sortSources( "org" ) } ) ::oUI:q_tabWidget :connect( "currentChanged(int)", {|p| ::updateHbp( p ) } ) - ::oUI:q_buttonChoosePrjLoc:connect( "clicked()", {|| ::PromptForPath( 'editPrjLoctn' , 'Choose Project Location...' ) } ) - ::oUI:q_buttonChooseWd :connect( "clicked()", {|| ::PromptForPath( 'editWrkFolder', 'Choose Working Folder...' ) } ) - ::oUI:q_buttonChooseDest :connect( "clicked()", {|| ::PromptForPath( 'editDstFolder', 'Choose Destination Folder...' ) } ) - ::oUI:q_buttonBackup :connect( "clicked()", {|| ::PromptForPath( 'editBackup' , 'Choose Backup Folder...' ) } ) + ::oUI:q_buttonChoosePrjLoc:connect( "clicked()", {|| ::PromptForPath( ::oUI:q_editPrjLoctn , 'Choose Project Location...' ) } ) + ::oUI:q_buttonChooseWd :connect( "clicked()", {|| ::PromptForPath( ::oUI:q_editWrkFolder, 'Choose Working Folder...' ) } ) + ::oUI:q_buttonChooseDest :connect( "clicked()", {|| ::PromptForPath( ::oUI:q_editDstFolder, 'Choose Destination Folder...' ) } ) + ::oUI:q_buttonBackup :connect( "clicked()", {|| ::PromptForPath( ::oUI:q_editBackup , 'Choose Backup Folder...' ) } ) ::oUI:q_editPrjLoctn :connect( "textChanged(QString)", {|cPath| ::setProjectLocation( cPath ) } ) /* Set monospaced fonts */ @@ -1175,12 +1175,12 @@ METHOD IdeProjManager:selectCurrentProject() FOR EACH p IN ::aProjects IF !empty( t := p[ 3, PRJ_PRP_PROPERTIES, 2, E_oPrjTtl ] ) - oDlg:qObj[ "cbProjects" ]:addItem( t ) + oDlg:q_cbProjects:addItem( t ) ENDIF NEXT oDlg:q_btnCancel:connect( "clicked()", {|| oDlg:oWidget:done( 1 ) } ) - oDlg:q_btnOk :connect( "clicked()", {|| ::setCurrentProject( oDlg:qObj[ "cbProjects" ]:currentText() ), ; + oDlg:q_btnOk :connect( "clicked()", {|| ::setCurrentProject( oDlg:q_cbProjects:currentText() ), ; oDlg:done( 1 ) } ) oDlg:exec() @@ -1322,11 +1322,11 @@ METHOD IdeProjManager:closeProject( cProjectTitle ) /* Prompt for user to select a existing folder * 25/12/2009 - 19:03:09 - vailtom */ -METHOD IdeProjManager:promptForPath( cObjPathName, cTitle, cObjFileName, cObjPath2, cObjPath3 ) +METHOD IdeProjManager:promptForPath( oEditPath, cTitle, cObjFileName ) LOCAL cTemp, cPath, cFile IF HB_ISOBJECT( ::oProject ) - cTemp := ::oUI:qObj[ cObjPathName ]:Text() + cTemp := oEditPath:Text() ELSE cTemp := "" ENDIF @@ -1336,11 +1336,9 @@ METHOD IdeProjManager:promptForPath( cObjPathName, cTitle, cObjFileName, cObjPat ELSE cTemp := hbide_fetchAFile( ::oDlg, cTitle, { { "Harbour IDE Projects", "*.hbp" } }, cTemp ) - IF !Empty( cTemp ) hb_fNameSplit( hbide_pathNormalized( cTemp, .f. ), @cPath, @cFile ) - - ::oUI:qObj[ cObjFileName ]:setText( cFile ) + oEditPath:setText( cFile ) ENDIF ENDIF @@ -1348,18 +1346,10 @@ METHOD IdeProjManager:promptForPath( cObjPathName, cTitle, cObjFileName, cObjPat IF Right( cPath, 1 ) $ '/\' cPath := Left( cPath, Len( cPath ) - 1 ) ENDIF - ::oUI:qObj[ cObjPathName ]:setText( cPath ) - - IF HB_ISSTRING( cObjPath2 ) .AND. Empty( ::oUI:qObj[ cObjPath2 ]:Text() ) - ::oUI:qObj[ cObjPath2 ]:setText( cPath ) - ENDIF - - IF HB_ISSTRING( cObjPath3 ) .AND. Empty( ::oUI:qObj[ cObjPath3 ]:Text() ) - ::oUI:qObj[ cObjPath3 ]:setText( cPath ) - ENDIF + oEditPath:setText( cPath ) ENDIF - ::oUI:qObj[ cObjPathName ]:setFocus() + oEditPath:setFocus() RETURN Self @@ -1641,15 +1631,15 @@ METHOD IdeProjManager:finished( nExitCode, nExitStatus, oProcess ) IF empty( cExe ) cTkn := "hbmk2: Linking... " IF ( n := at( cTkn, cTmp ) ) > 0 - n1 := hb_at( Chr( 10 ), cTmp, n + len( cTkn ) ) - cExe := StrTran( substr( cTmp, n + len( cTkn ), n1 - n - len( cTkn ) ), Chr( 13 ) ) + n1 := hb_at( Chr( 10 ), cTmp, n + Len( cTkn ) ) + cExe := StrTran( substr( cTmp, n + Len( cTkn ), n1 - n - len( cTkn ) ), Chr( 13 ) ) ENDIF ENDIF IF empty( cExe ) cTkn := "hbmk2: Target up to date: " IF ( n := at( cTkn, cTmp ) ) > 0 - n1 := hb_at( Chr( 10 ), cTmp, n + len( cTkn ) ) - cExe := StrTran( substr( cTmp, n + len( cTkn ), n1 - n - len( cTkn ) ), Chr( 13 ) ) + n1 := hb_at( Chr( 10 ), cTmp, n + Len( cTkn ) ) + cExe := StrTran( substr( cTmp, n + Len( cTkn ), n1 - n - len( cTkn ) ), Chr( 13 ) ) ENDIF ENDIF diff --git a/harbour/contrib/hbide/idesaveload.prg b/harbour/contrib/hbide/idesaveload.prg index 1cf7a70518..ecb23684e2 100644 --- a/harbour/contrib/hbide/idesaveload.prg +++ b/harbour/contrib/hbide/idesaveload.prg @@ -438,7 +438,7 @@ METHOD IdeINI:save( cHbideIni ) aadd( txt_, "" ) aadd( txt_, "[PROJECTS]" ) aadd( txt_, " " ) - FOR n := 1 TO len( ::oIde:aProjects ) + FOR n := 1 TO Len( ::oIde:aProjects ) aadd( txt_, "project_" + hb_ntos( n ) + "=" + hbide_pathNormalized( ::oIde:aProjects[ n, 2 ], .f. ) ) NEXT aadd( txt_, " " ) @@ -447,7 +447,7 @@ METHOD IdeINI:save( cHbideIni ) aadd( txt_, "[FILES]" ) aadd( txt_, " " ) nn := 0 - FOR j := 1 TO len( ::oIde:aViews ) + FOR j := 1 TO Len( ::oIde:aViews ) ::oIde:lClosing := .t. ::oDK:setView( ::oIde:aViews[ j ]:oWidget:objectName() ) @@ -477,35 +477,35 @@ METHOD IdeINI:save( cHbideIni ) aadd( txt_, "[FIND]" ) aadd( txt_, " " ) - FOR n := 1 TO len( ::aFind ) + FOR n := 1 TO Len( ::aFind ) aadd( txt_, "find_" + hb_ntos( n ) + "=" + ::aFind[ n ] ) NEXT aadd( txt_, " " ) aadd( txt_, "[REPLACE]" ) aadd( txt_, " " ) - FOR n := 1 TO len( ::aReplace ) + FOR n := 1 TO Len( ::aReplace ) aadd( txt_, "replace_" + hb_ntos( n ) + "=" + ::aReplace[ n ] ) NEXT aadd( txt_, " " ) aadd( txt_, "[RECENTFILES]" ) aadd( txt_, " " ) - FOR n := 1 TO len( ::aRecentFiles ) + FOR n := 1 TO Len( ::aRecentFiles ) aadd( txt_, "recentfile_" + hb_ntos( n ) + "=" + hbide_pathNormalized( ::aRecentFiles[ n ], .f. ) ) NEXT aadd( txt_, " " ) aadd( txt_, "[RECENTPROJECTS]" ) aadd( txt_, " " ) - FOR n := 1 TO len( ::aRecentProjects ) + FOR n := 1 TO Len( ::aRecentProjects ) aadd( txt_, "recentproject_" + hb_ntos( n ) + "=" + hbide_pathNormalized( ::aRecentProjects[ n ], .f. ) ) NEXT aadd( txt_, " " ) aadd( txt_, "[FOLDERS]" ) aadd( txt_, " " ) - FOR n := 1 TO len( ::aFolders ) + FOR n := 1 TO Len( ::aFolders ) aadd( txt_, "folder_" + hb_ntos( n ) + "=" + hbide_pathNormalized( ::aFolders[ n ], .f. ) ) NEXT aadd( txt_, " " ) @@ -519,7 +519,7 @@ METHOD IdeINI:save( cHbideIni ) aadd( txt_, "[TAGGEDPROJECTS]" ) aadd( txt_, " " ) - FOR n := 1 TO len( ::aTaggedProjects ) + FOR n := 1 TO Len( ::aTaggedProjects ) aadd( txt_, "taggedproject_" + hb_ntos( n ) + "=" + ::aTaggedProjects[ n ] ) NEXT aadd( txt_, " " ) @@ -533,14 +533,14 @@ METHOD IdeINI:save( cHbideIni ) aadd( txt_, "[USERTOOLBARS]" ) aadd( txt_, " " ) - FOR n := 1 TO len( ::aUserToolbars ) + FOR n := 1 TO Len( ::aUserToolbars ) aadd( txt_, "usertoolbars_" + hb_ntos( n ) + "=" + hbide_array2string( ::aUserToolbars[ n ], "," ) ) NEXT aadd( txt_, " " ) aadd( txt_, "[KEYWORDS]" ) aadd( txt_, " " ) - FOR n := 1 TO len( ::aKeywords ) + FOR n := 1 TO Len( ::aKeywords ) aadd( txt_, "keyword_" + hb_ntos( n ) + "=" + hbide_array2string( ::aKeywords[ n ], "~" ) ) NEXT aadd( txt_, " " ) @@ -575,14 +575,14 @@ METHOD IdeINI:save( cHbideIni ) aadd( txt_, "[LOGTITLE]" ) aadd( txt_, " " ) - FOR n := 1 TO len( ::aLogTitle ) + FOR n := 1 TO Len( ::aLogTitle ) aadd( txt_, "logtitle_" + hb_ntos( n ) + "=" + ::aLogTitle[ n ] ) NEXT aadd( txt_, " " ) aadd( txt_, "[LOGSOURCES]" ) aadd( txt_, " " ) - FOR n := 1 TO len( ::aLogSources ) + FOR n := 1 TO Len( ::aLogSources ) aadd( txt_, "logsources_" + hb_ntos( n ) + "=" + ::aLogSources[ n ] ) NEXT aadd( txt_, " " ) @@ -973,14 +973,14 @@ FUNCTION hbide_loadSkltns( oIde, cPathSkltns ) cCode := substr( cCode, 2 ) ENDIF IF right( cCode, 1 ) $ chr( 13 ) + chr( 10 ) - cCode := substr( cCode, 1, len( cCode ) - 1 ) + cCode := substr( cCode, 1, Len( cCode ) - 1 ) ENDIF IF right( cCode, 1 ) $ chr( 13 ) + chr( 10 ) - cCode := substr( cCode, 1, len( cCode ) - 1 ) + cCode := substr( cCode, 1, Len( cCode ) - 1 ) ENDIF aadd( oIde:aSkltns, { cSkltn, cCode } ) - s := substr( s, n + len( "" ) ) + s := substr( s, n + Len( "" ) ) ELSE EXIT ENDIF @@ -1384,7 +1384,7 @@ METHOD IdeSetup:retrieve() qItm := ::oUI:q_listTextExt:item( i - 1 ) s += "." + qItm:text() + "," NEXT - s := substr( s, 1, len( s ) - 1 ) + s := substr( s, 1, Len( s ) - 1 ) ::oINI:cTextFileExtensions := s ::oINI:nTmpBkpPrd := val( ::oUI:q_editTmpBkpPrd : text() ) @@ -1679,8 +1679,8 @@ METHOD IdeSetup:execEvent( cEvent, p, p1 ) EXIT CASE "buttonKeyAdd_clicked" - ::populateKeyTableRow( len( ::aKeyItems ) + 1, "", "" ) - ::oUI:q_tableVar:setCurrentItem( ::aKeyItems[ len( ::aKeyItems ), 1 ] ) + ::populateKeyTableRow( Len( ::aKeyItems ) + 1, "", "" ) + ::oUI:q_tableVar:setCurrentItem( ::aKeyItems[ Len( ::aKeyItems ), 1 ] ) EXIT CASE "buttonKeyDel_clicked" @@ -1718,7 +1718,7 @@ METHOD IdeSetup:execEvent( cEvent, p, p1 ) CASE "buttonKeyDown_clicked" nRow := ::oUI:q_tableVar:currentRow() - IF nRow >= 0 .AND. nRow + 1 < len( ::aKeyItems ) + IF nRow >= 0 .AND. nRow + 1 < Len( ::aKeyItems ) nCol := ::oUI:q_tableVar:currentColumn() @@ -1801,7 +1801,7 @@ METHOD IdeSetup:execEvent( cEvent, p, p1 ) qItem:setText( cTheme ) //::oUI:q_listThemes:addItem_1( qItem ) ::oUI:q_listThemes:addItem( qItem ) - ::oUI:q_listThemes:setCurrentRow( len( ::oINI:aAppThemes ) - 1 ) + ::oUI:q_listThemes:setCurrentRow( Len( ::oINI:aAppThemes ) - 1 ) ENDIF EXIT CASE "buttonThmApp_clicked" @@ -1998,7 +1998,7 @@ METHOD IdeSetup:pushThemesData() ENDIF IF !empty( ::oINI:aAppThemes ) ::oUI:q_listThemes:setCurrentRow( -1 ) - ::oUI:q_listThemes:setCurrentRow( len( ::oINI:aAppThemes ) - 1 ) + ::oUI:q_listThemes:setCurrentRow( Len( ::oINI:aAppThemes ) - 1 ) ::oUI:q_listThemes:setCurrentRow( 0 ) ENDIF ::oUI:q_radioSec1:click() @@ -2010,7 +2010,7 @@ METHOD IdeSetup:pushThemesData() METHOD IdeSetup:getThemeData( nTheme ) LOCAL a_, i, aTheme := {} - IF nTheme >= 1 .AND. nTheme <= len( ::oINI:aAppThemes ) + IF nTheme >= 1 .AND. nTheme <= Len( ::oINI:aAppThemes ) a_:= hbide_parseThemeComponent( ::oINI:aAppThemes[ nTheme ] ) FOR i := 2 TO 6 @@ -2027,7 +2027,7 @@ METHOD IdeSetup:getThemeData( nTheme ) METHOD IdeSetup:pushThemeColors( nTheme ) LOCAL n, a_, i, aRGB, nSlot - IF nTheme >= 1 .AND. nTheme <= len( ::oINI:aAppThemes ) + IF nTheme >= 1 .AND. nTheme <= Len( ::oINI:aAppThemes ) a_:= hb_aTokens( ::oINI:aAppThemes[ nTheme ], "," ) aSize( a_, 6 ) DEFAULT a_[ 1 ] TO "" @@ -2105,7 +2105,7 @@ METHOD IdeSetup:pullThemeColors( nSlot ) /*------------------------------------------------------------------------*/ METHOD IdeSetup:populateKeyTableRow( nRow, cTxtCol1, cTxtCol2 ) - LOCAL lAppend := len( ::aKeyItems ) < nRow + LOCAL lAppend := Len( ::aKeyItems ) < nRow LOCAL q0, q1 IF lAppend @@ -2143,9 +2143,9 @@ METHOD IdeSetup:buildKeywords() oTbl:horizontalHeader():setStretchLastSection( .t. ) oTbl:setAlternatingRowColors( .t. ) - oTbl:setColumnCount( len( hdr_ ) ) + oTbl:setColumnCount( Len( hdr_ ) ) oTbl:setShowGrid( .t. ) - FOR n := 1 TO len( hdr_ ) + FOR n := 1 TO Len( hdr_ ) qItm := QTableWidgetItem() qItm:setText( hdr_[ n,1 ] ) oTbl:setHorizontalHeaderItem( n-1, qItm ) diff --git a/harbour/contrib/hbide/ideshortcuts.prg b/harbour/contrib/hbide/ideshortcuts.prg index 05beaacf5f..20c540ed69 100644 --- a/harbour/contrib/hbide/ideshortcuts.prg +++ b/harbour/contrib/hbide/ideshortcuts.prg @@ -321,14 +321,14 @@ METHOD IdeShortcuts:execEvent( nMode, p ) EXIT CASE buttonDelete_clicked nRow := ::oUI:q_tableMacros:currentRow() - IF nRow >= 0 .AND. nRow < len( ::aDftSCuts ) + IF nRow >= 0 .AND. nRow < Len( ::aDftSCuts ) nRow++ IF hbide_getYesNo( "Delete", ::aDftSCuts[ nRow, 1 ], "A Delete Operation Requested" ) hb_adel( ::aDftSCuts, nRow, .t. ) ::clearDftSCuts() ::populateDftSCuts() ENDIF - IF nRow <= len( ::aDftSCuts ) + IF nRow <= Len( ::aDftSCuts ) ::oUI:q_tableMacros:setCurrentCell( nRow - 1, 0 ) ENDIF ENDIF @@ -374,7 +374,7 @@ METHOD IdeShortcuts:execEvent( nMode, p ) aadd( ::aDftSCuts, { ::cName, ::cKey, ::cAlt, ::cCtrl, ::cShift, ::cMenu, ::cBlock, ::cIcon } ) aadd( ::aDftSCutsItms, array( 6 ) ) ::oUI:q_tableMacros:setRowCount( ::oUI:q_tableMacros:rowCount() + 1 ) - ::array2table( len( ::aDftSCuts ), { ::cName, ::cKey, ::cAlt, ::cCtrl, ::cShift, ::cMenu, ::cBlock, ::cIcon } ) + ::array2table( Len( ::aDftSCuts ), { ::cName, ::cKey, ::cAlt, ::cCtrl, ::cShift, ::cMenu, ::cBlock, ::cIcon } ) ELSE MsgBox( "Current shortcut is already defined!" ) ENDIF @@ -384,7 +384,7 @@ METHOD IdeShortcuts:execEvent( nMode, p ) CASE buttonSet_clicked nRow := ::oUI:q_tableMacros:currentRow() - IF nRow >= 0 .AND. nRow < len( ::aDftSCuts ) + IF nRow >= 0 .AND. nRow < Len( ::aDftSCuts ) nRow++ ::controls2vrbls() IF !empty( ::cName ) .AND. !( ::checkDuplicate( ::cKey, ::cAlt, ::cCtrl, ::cShift, nRow ) ) .AND. ::test( ::cBlock, .f. ) @@ -397,7 +397,7 @@ METHOD IdeShortcuts:execEvent( nMode, p ) EXIT CASE tableMacros_itemSelectionChanged nRow := ::oUI:q_tableMacros:currentRow() - IF nRow >= 0 .AND. nRow < len( ::aDftSCuts ) + IF nRow >= 0 .AND. nRow < Len( ::aDftSCuts ) nRow++ ::array2controls( nRow ) ENDIF @@ -412,7 +412,7 @@ METHOD IdeShortcuts:execEvent( nMode, p ) ENDIF EXIT CASE listMethods_currentRowChanged - IF p >= 0 .AND. p < len( ::aMethods ) + IF p >= 0 .AND. p < Len( ::aMethods ) ::oUI:q_texteditSyntax:setPlainText( ::aMethods[ p+1, 3 ] ) ENDIF EXIT @@ -448,7 +448,7 @@ METHOD IdeShortcuts:vrbls2array( nRow ) IF nRow == NIL aadd( ::aDftSCuts, array( 7 ) ) - nRow := len( ::aDftSCuts ) + nRow := Len( ::aDftSCuts ) ENDIF ::aDftSCuts[ nRow, 1 ] := ::cName @@ -573,11 +573,11 @@ METHOD IdeShortcuts:buildUI() oTbl:verticalHeader():hide() oTbl:horizontalHeader():setStretchLastSection( .t. ) oTbl:setAlternatingRowColors( .t. ) - oTbl:setColumnCount( len( hdr_ ) ) + oTbl:setColumnCount( Len( hdr_ ) ) oTbl:setShowGrid( .t. ) oTbl:setSelectionMode( QAbstractItemView_SingleSelection ) oTbl:setSelectionBehavior( QAbstractItemView_SelectRows ) - FOR n := 1 TO len( hdr_ ) + FOR n := 1 TO Len( hdr_ ) qItm := QTableWidgetItem() qItm:setText( hdr_[ n,1 ] ) oTbl:setHorizontalHeaderItem( n-1, qItm ) @@ -651,7 +651,7 @@ METHOD IdeShortcuts:populateDftSCuts() LOCAL oTbl := ::oUI:q_tableMacros LOCAL qApp := QApplication() - oTbl:setRowCount( len( ::aDftSCuts ) ) + oTbl:setRowCount( Len( ::aDftSCuts ) ) nRow := 0 FOR EACH a_ IN ::aDftSCuts diff --git a/harbour/contrib/hbide/ideskeletons.prg b/harbour/contrib/hbide/ideskeletons.prg index 5c18974785..e2cf18b569 100644 --- a/harbour/contrib/hbide/ideskeletons.prg +++ b/harbour/contrib/hbide/ideskeletons.prg @@ -183,7 +183,7 @@ METHOD IdeSkeletons:execEvent( cEvent, p ) IF !empty( cName := hbide_fetchAString( ::oUI:q_listNames, "", "Name", "New Skeleton" ) ) ::oUI:q_listNames:addItem( cName ) aadd( ::oIde:aSkltns, { cName, "" } ) - ::oUI:q_listNames:setCurrentRow( len( ::aSkltns ) - 1 ) + ::oUI:q_listNames:setCurrentRow( Len( ::aSkltns ) - 1 ) ENDIF EXIT @@ -373,7 +373,7 @@ METHOD IdeSkeletons:parseMeta( cMeta ) cKey := upper( cKey ) IF ( nMeta := ascan( ::aMetas, {|e_| e_[ 1 ] == cKey } ) ) == 0 aadd( ::aMetas, { cKey, "" } ) - nMeta := len( ::aMetas ) + nMeta := Len( ::aMetas ) ENDIF ENDIF diff --git a/harbour/contrib/hbide/idestylesheets.prg b/harbour/contrib/hbide/idestylesheets.prg index 80d09e4752..af25f1a0a7 100644 --- a/harbour/contrib/hbide/idestylesheets.prg +++ b/harbour/contrib/hbide/idestylesheets.prg @@ -506,7 +506,7 @@ FUNCTION hbide_buildGradientString( aGrands ) s += "stop:" + hb_ntos( a_[ 1 ] ) + " " + hbide_rgbString( a_[ 2 ], a_[ 3 ], a_[ 4 ] ) + ", " NEXT - RETURN substr( s, 1, len( s ) - 2 ) + RETURN substr( s, 1, hb_BLen( s ) - 2 ) /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/idetags.prg b/harbour/contrib/hbide/idetags.prg index 8c2abaf5bc..0cb0f1ad87 100644 --- a/harbour/contrib/hbide/idetags.prg +++ b/harbour/contrib/hbide/idetags.prg @@ -69,7 +69,7 @@ #include "common.ch" #include "xbp.ch" -#define LEFTEQUAL( l, r ) ( Left( l, Len( r ) ) == r ) +#define LEFTEQUAL( l, r ) ( hb_BLeft( l, hb_BLen( r ) ) == r ) /*----------------------------------------------------------------------*/ @@ -85,7 +85,7 @@ FUNCTION UpdateTags( cModule, aSummary, aSumData, aFuncList, aLines, aText ) aFuncList := {} aLines := {} - FOR i := 1 TO LEN( aSummary ) + FOR i := 1 TO Len( aSummary ) cSyntax := lTrim( Substr( aSummary[ i ], 8 ) ) IF LEFT( cSyntax,14 ) == "HB_FUNC_STATIC" @@ -125,11 +125,11 @@ FUNCTION UpdateTags( cModule, aSummary, aSumData, aFuncList, aLines, aText ) ELSEIF cType == "CLASS" cSyntax := LTrim( SubStr( cSyntax, 7 ) ) ELSE - cSyntax := lTrim( SubStr( cSyntax, Len( cType ) + 1 ) ) + cSyntax := lTrim( SubStr( cSyntax, hb_BLen( cType ) + 1 ) ) ENDIF IF ( n := RAt( "(", cSyntax ) ) > 0 - cName := Trim( Left( cSyntax, n-1 ) ) + cName := Trim( hb_BLeft( cSyntax, n-1 ) ) FOR m := Len( cName ) TO 1 STEP -1 IF ( ! substr( cName, m, 1 ) $ cGoodFuncNameChars ) EXIT diff --git a/harbour/contrib/hbide/idethemes.prg b/harbour/contrib/hbide/idethemes.prg index 46d00a09f7..b18b7d2acb 100644 --- a/harbour/contrib/hbide/idethemes.prg +++ b/harbour/contrib/hbide/idethemes.prg @@ -153,9 +153,9 @@ METHOD IdeThemes:new( oIde, cThemesFile ) METHOD IdeThemes:destroy() IF !empty( ::oSL ) - ::oSL:qObj[ "listOptions" ]:disConnect( "doubleClicked(QModelIndex)" ) - ::oSL:qObj[ "buttonOk" ]:disConnect( "clicked()" ) - ::oSL:qObj[ "buttonCancel" ]:disConnect( "clicked()" ) + ::oSL:q_listOptions :disConnect( "doubleClicked(QModelIndex)" ) + ::oSL:q_buttonOk :disConnect( "clicked()" ) + ::oSL:q_buttonCancel :disConnect( "clicked()" ) ::oSL:destroy() ENDIF @@ -513,7 +513,7 @@ METHOD IdeThemes:mergeUserDictionaries( qHiliter, cTheme ) FOR EACH a_ IN oDict:aItems s += "\b" + a_[ 1 ] + "\b|" NEXT - s := substr( s, 1, len( s ) - 1 ) + s := substr( s, 1, Len( s ) - 1 ) qRegExp := QRegExp() qRegExp:setCaseSensitivity( oDict:lCaseSensitive ) @@ -566,15 +566,15 @@ METHOD IdeThemes:show() /* Fill Themes Dialog Values */ ::oUI:setWindowTitle( GetKeyValue( ::aControls, "dialogTitle" ) ) - ::oUI:qObj[ "checkItalic" ]:setText( GetKeyValue( ::aControls, "checkItalic" , "Italic" ) ) - ::oUI:qObj[ "checkBold" ]:setText( GetKeyValue( ::aControls, "checkBold" , "Bold" ) ) - ::oUI:qObj[ "checkUnderline" ]:setText( GetKeyValue( ::aControls, "checkUnderline", "Underline" ) ) + ::oUI:q_checkItalic :setText( GetKeyValue( ::aControls, "checkItalic" , "Italic" ) ) + ::oUI:q_checkBold :setText( GetKeyValue( ::aControls, "checkBold" , "Bold" ) ) + ::oUI:q_checkUnderline :setText( GetKeyValue( ::aControls, "checkUnderline", "Underline" ) ) // - ::oUI:qObj[ "buttonColor" ]:setText( GetKeyValue( ::aControls, "buttonColor" , "Color" ) ) - ::oUI:qObj[ "buttonSave" ]:setText( GetKeyValue( ::aControls, "buttonSave" , "Save" ) ) - ::oUI:qObj[ "buttonSaveAs" ]:setText( GetKeyValue( ::aControls, "buttonSaveAs" , "SaveAs" ) ) - ::oUI:qObj[ "buttonClose" ]:setText( GetKeyValue( ::aControls, "buttonClose" , "Close" ) ) - ::oUI:qObj[ "buttonCopy" ]:setText( GetKeyValue( ::aControls, "buttonCopy" , "Copy" ) ) + ::oUI:q_buttonColor :setText( GetKeyValue( ::aControls, "buttonColor" , "Color" ) ) + ::oUI:q_buttonSave :setText( GetKeyValue( ::aControls, "buttonSave" , "Save" ) ) + ::oUI:q_buttonSaveAs :setText( GetKeyValue( ::aControls, "buttonSaveAs" , "SaveAs" ) ) + ::oUI:q_buttonClose :setText( GetKeyValue( ::aControls, "buttonClose" , "Close" ) ) + ::oUI:q_buttonCopy :setText( GetKeyValue( ::aControls, "buttonCopy" , "Copy" ) ) aeval( ::aThemes, {|e_| ::oUI:q_listThemes:addItem( e_[ 1 ] ) } ) aeval( ::aItems , {|e_| ::oUI:q_listItems:addItem( e_[ 2 ] ) } ) @@ -623,10 +623,10 @@ METHOD IdeThemes:setAttributes() IF ! ::lCreating aAttr := ::aThemes[ ::nCurTheme, 2, ::nCurItem, 2 ] // - ::oUI:qObj[ "checkItalic" ]:setChecked( aAttr[ THM_ATR_ITALIC ] ) - ::oUI:qObj[ "checkBold" ]:setChecked( aAttr[ THM_ATR_BOLD ] ) - ::oUI:qObj[ "checkUnderline" ]:setChecked( aAttr[ THM_ATR_ULINE ] ) - ::oUI:qObj[ "buttonColor" ]:setStyleSheet( "color: " + Attr2RGBfnRev( aAttr ) + ";" + ; + ::oUI:q_checkItalic :setChecked( aAttr[ THM_ATR_ITALIC ] ) + ::oUI:q_checkBold :setChecked( aAttr[ THM_ATR_BOLD ] ) + ::oUI:q_checkUnderline :setChecked( aAttr[ THM_ATR_ULINE ] ) + ::oUI:q_buttonColor :setStyleSheet( "color: " + Attr2RGBfnRev( aAttr ) + ";" + ; "background-color: " + Attr2RGBfn( aAttr ) + ";" ) ENDIF @@ -731,9 +731,9 @@ METHOD IdeThemes:selectTheme() ::oSL:setWindowTitle( "Available Themes" ) - ::oSL:qObj[ "listOptions" ]:connect( "doubleClicked(QModelIndex)", {|p| ::selectThemeProc( 1, p ) } ) - ::oSL:qObj[ "buttonOk" ]:connect( "clicked()" , {|p| ::selectThemeProc( 2, p ) } ) - ::oSL:qObj[ "buttonCancel" ]:connect( "clicked()" , {|p| ::selectThemeProc( 3, p ) } ) + ::oSL:q_listOptions :connect( "doubleClicked(QModelIndex)", {|p| ::selectThemeProc( 1, p ) } ) + ::oSL:q_buttonOk :connect( "clicked()" , {|p| ::selectThemeProc( 2, p ) } ) + ::oSL:q_buttonCancel:connect( "clicked()" , {|p| ::selectThemeProc( 3, p ) } ) ENDIF oStrList := QStringList() @@ -744,7 +744,7 @@ METHOD IdeThemes:selectTheme() oStrModel := QStringListModel() oStrModel:setStringList( oStrList ) - ::oSL:qObj[ "listOptions" ]:setModel( oStrModel ) + ::oSL:q_listOptions:setModel( oStrModel ) nDone := ::oSL:exec() @@ -761,7 +761,7 @@ METHOD IdeThemes:selectThemeProc( nMode, p ) ::oSL:done( 1 ) CASE nMode == 2 - qModalIndex := ::oSL:qObj[ "listOptions" ]:currentIndex() + qModalIndex := ::oSL:q_listOptions:currentIndex() ::cSelTheme := ::aThemes[ qModalIndex:row() + 1, 1 ] ::oSL:done( 1 ) @@ -790,8 +790,8 @@ METHOD IdeThemes:copy() aItems := aclone( ::aThemes[ ::nCurTheme ] ) aItems[ 1 ] := cTheme aadd( ::aThemes, aItems ) - ::oUI:qObj[ "listThemes" ]:addItem( cTheme ) - ::oUI:qObj[ "listThemes" ]:setCurrentRow( len( ::aThemes ) - 1 ) + ::oUI:q_listThemes:addItem( cTheme ) + ::oUI:q_listThemes:setCurrentRow( Len( ::aThemes ) - 1 ) ENDIF RETURN Self @@ -868,7 +868,7 @@ METHOD IdeThemes:parseINI( lAppend ) nPart := 3 IF ( nTheme := ascan( ::aThemes, {|e_| e_[ 1 ] == cKey } ) ) == 0 aadd( ::aThemes, { cKey, {} } ) - nTheme := len( ::aThemes ) + nTheme := Len( ::aThemes ) ENDIF ELSE nPart := 0 diff --git a/harbour/contrib/hbide/idetools.prg b/harbour/contrib/hbide/idetools.prg index b6ce69ce22..9e3c470756 100644 --- a/harbour/contrib/hbide/idetools.prg +++ b/harbour/contrib/hbide/idetools.prg @@ -290,11 +290,11 @@ METHOD IdeToolsManager:show() oTbl:verticalHeader():hide() oTbl:horizontalHeader():setStretchLastSection( .t. ) oTbl:setAlternatingRowColors( .t. ) - oTbl:setColumnCount( len( hdr_ ) ) + oTbl:setColumnCount( Len( hdr_ ) ) oTbl:setShowGrid( .t. ) oTbl:setSelectionMode( QAbstractItemView_SingleSelection ) oTbl:setSelectionBehavior( QAbstractItemView_SelectRows ) - FOR n := 1 TO len( hdr_ ) + FOR n := 1 TO Len( hdr_ ) qItm := QTableWidgetItem() qItm:setText( hdr_[ n,1 ] ) oTbl:setHorizontalHeaderItem( n-1, qItm ) @@ -501,7 +501,7 @@ METHOD IdeToolsManager:populateButtonsTable( nIndex ) ENDIF NEXT - oTbl:setRowCount( len( a_ ) ) + oTbl:setRowCount( Len( a_ ) ) IF !empty( a_ ) FOR EACH b_ IN a_ @@ -599,7 +599,7 @@ METHOD IdeToolsManager:controls2ini( nIndex ) IF empty( nIndex ) aadd( ::oINI:aTools, {} ) - nIndex := len( ::oINI:aTools ) + nIndex := Len( ::oINI:aTools ) ENDIF ::oINI:aTools[ nIndex ] := { ::oUI:q_editName:text() , ; @@ -759,7 +759,7 @@ METHOD IdeToolsManager:execTool( ... ) LOCAL nIndex, cCmd, cParams, cStayIn, lCapture, lOpen, aParam, cPlugin, a_ aParam := hb_aParams() - IF len( aParam ) == 1 + IF Len( aParam ) == 1 IF ( nIndex := ascan( ::aTools, {|e_| e_[ 1 ] == aParam[ 1 ] } ) ) > 0 hb_fNameSplit( ::aTools[ nIndex, 11 ], , @cPlugin ) @@ -773,7 +773,7 @@ METHOD IdeToolsManager:execTool( ... ) ENDIF - ELSEIF len( aParam ) > 1 + ELSEIF Len( aParam ) > 1 asize( aParam, 5 ) DEFAULT aParam[ 1 ] TO "" diff --git a/harbour/contrib/hbide/ideuisrcmanager.prg b/harbour/contrib/hbide/ideuisrcmanager.prg index 1fd479d5d0..2acb937453 100644 --- a/harbour/contrib/hbide/ideuisrcmanager.prg +++ b/harbour/contrib/hbide/ideuisrcmanager.prg @@ -410,13 +410,13 @@ METHOD IdeUISrcManager:saveMethod() FOR i := n3-1 TO n2 + 1 STEP - 1 hb_adel( ::aSource, i, .t. ) NEXT - FOR i := 1 TO len( aSrc ) + FOR i := 1 TO Len( aSrc ) ::aSource := hb_ains( ::aSource, n2 + i, " " + aSrc[ i ], .t. ) NEXT ELSE n := ascan( ::aSource, {|e| "" $ e } ) ::aSource := hb_ains( ::aSource, ++n, cMtd, .t. ) - FOR i := 1 TO len( aSrc ) + FOR i := 1 TO Len( aSrc ) ::aSource := hb_ains( ::aSource, ++n, " " + aSrc[ i ], .t. ) NEXT ::aSource := hb_ains( ::aSource, ++n, " ", .t. ) @@ -487,7 +487,7 @@ METHOD IdeUISrcManager:loadMethod() FOR i := n2 + 1 TO n3 - 1 cSrc += substr( ::aSource[ i ], 4 ) + chr( 10 ) NEXT - cSrc := substr( cSrc, 1, len( cSrc ) - 1 ) + cSrc := substr( cSrc, 1, Len( cSrc ) - 1 ) ENDIF ENDIF @@ -698,7 +698,7 @@ METHOD IdeUISrcManager:buildWidget( cBuffer, cPath, cName, cExt, aPrg ) ::qMdiSub:move( 10,10 ) ::aStatusPnls[ PNL_UI ]:setText( "UI: " + cName + "" ) - FOR i := 1 to len( aPrg ) + FOR i := 1 to Len( aPrg ) cCode := aPrg[ i ] IF " := " $ cCode IF ! ( "oRootWidget" $ cCode ) .AND. ! ( "LOCAL" $ cCode ) diff --git a/harbour/contrib/hbide/idewizard.prg b/harbour/contrib/hbide/idewizard.prg index 5ecb49a40b..ed20e46d92 100644 --- a/harbour/contrib/hbide/idewizard.prg +++ b/harbour/contrib/hbide/idewizard.prg @@ -169,7 +169,7 @@ METHOD IdeWizard:addIntroPage() aadd( ::aPages, { PAGE_INTRO, page, layout, label } ) - ::oUI:setPage( len( ::aPages ), page ) + ::oUI:setPage( Len( ::aPages ), page ) RETURN Self