From 255c10acc278ce08fcaee8b5aac7003084b16fb4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 23 Apr 2010 07:35:39 +0000 Subject: [PATCH] 2010-04-23 09:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbide/idemisc.prg % Deleted unused code. --- harbour/ChangeLog | 8 ++- harbour/contrib/hbide/idemisc.prg | 116 ------------------------------ 2 files changed, 6 insertions(+), 118 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 47303cbb48..ed012880da 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,12 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-23 09:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbide/idemisc.prg + % Deleted unused code. + 2010-04-22 10:47 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/hbqt_hbqplaintextedit.cpp * contrib/hbide/ideeditor.prg * contrib/hbide/ideshortcuts.prg - ! Fixed few artifacts belonging to function prototype display + ! Fixed few artifacts belonging to function prototype display as tooltip and code completion behavior. 2010-04-23 02:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) @@ -44,7 +48,7 @@ * config/win/watcom.mk * config/linux/watcom.mk * config/os2/watcom.mk - + Upped 'HB_BUILD_WARN=no' warning level for msvc/icc + + Upped 'HB_BUILD_WARN=no' warning level for watcom compilers to '-w1'. (matching hbmk2 -warn=low level) 2010-04-23 01:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/contrib/hbide/idemisc.prg b/harbour/contrib/hbide/idemisc.prg index 7931f428a0..b80a0d03f3 100644 --- a/harbour/contrib/hbide/idemisc.prg +++ b/harbour/contrib/hbide/idemisc.prg @@ -340,122 +340,6 @@ FUNCTION hbide_evalAsString( cExp ) /*----------------------------------------------------------------------*/ -FUNCTION hbide_fetchHbiStructFromBuffer( cBuffer ) - RETURN hbide_pullHbiStruct( hb_atokens( cBuffer, _EOL ) ) - -/*----------------------------------------------------------------------*/ - -FUNCTION hbide_fetchHbiStructFromFile( cProject ) - RETURN hbide_pullHbiStruct( hbide_readSource( cProject ) ) - -/*----------------------------------------------------------------------*/ - -FUNCTION hbide_strip3rd( s ) - LOCAL n - IF ( n := at( "-3rd=", s ) ) > 0 - RETURN substr( s, n + 5 ) - ENDIF - RETURN s - -/*----------------------------------------------------------------------*/ - -STATIC FUNCTION hbide_pullHbiStruct( a_ ) - LOCAL n, s, nPart, cKey, cVal, ss, c3rd - LOCAL aPrp := { "Type", "Title", "Location", "WorkingFolder", "DestinationFolder", ; - "Output", "LaunchParams", "LaunchProgram", "BackupFolder" } - - LOCAL a1_0 := afill( array( PRJ_PRP_PRP_VRBLS ), "" ) - LOCAL a1_1 := {} - LOCAL a2_0 := {} - LOCAL a2_1 := {} - LOCAL a3_0 := {} - LOCAL a3_1 := {} - LOCAL a4_0 := {} - LOCAL a4_1 := {} - - IF ascan( a_, {|e| "-3rd=[ HBIDEVERSION ]" $ e } ) == 0 - c3rd := "" - ELSE - c3rd := "-3rd=" - ENDIF - - IF .t. - FOR EACH ss IN a_ - s := alltrim( ss ) - IF !empty( s ) - DO CASE - CASE s == c3rd + "[ HBIDEVERSION ]" - nPart := 0 - * nPart := PRJ_PRP_VERSION - CASE s == c3rd + "[ PROPERTIES ]" - nPart := PRJ_PRP_PROPERTIES - CASE s == c3rd + "[ FLAGS ]" - nPart := PRJ_PRP_FLAGS - CASE s == c3rd + "[ SOURCES ]" - nPart := PRJ_PRP_SOURCES - CASE s == c3rd + "[ METADATA ]" - nPart := PRJ_PRP_METADATA - OTHERWISE - s := hbide_strip3rd( s ) - DO CASE - CASE nPart == PRJ_PRP_PROPERTIES - IF ( n := at( "=", s ) ) > 0 - cKey := alltrim( substr( s, 1, n-1 ) ) - cVal := alltrim( substr( s, n+1 ) ) - IF ( n := ascan( aPrp, cKey ) ) > 0 - a1_0[ n ] := cVal - ENDIF - ENDIF - CASE nPart == PRJ_PRP_FLAGS - aadd( a2_0, s ) - - CASE nPart == PRJ_PRP_SOURCES - aadd( a3_0, s ) - - CASE nPart == PRJ_PRP_METADATA - IF !empty( c3rd ) - s := strtran( s, c3rd, "" ) - ENDIF - aadd( a4_0, s ) - IF !( "#" == left( s,1 ) ) - IF ( n := at( "=", s ) ) > 0 - cKey := alltrim( substr( s, 1, n-1 ) ) - cVal := hbide_evalAsString( alltrim( substr( s, n+1 ) ) ) - aadd( a4_1, { "<"+ cKey +">", cVal } ) - ENDIF - ENDIF - ENDCASE - ENDCASE - ENDIF - NEXT - - /* General Properties */ - FOR EACH s IN a1_0 - aadd( a1_1, hbide_parseWithMetaData( s, a4_1 ) ) - NEXT - - /* Parse Flags */ - IF !empty( a2_0 ) - FOR EACH s IN a2_0 - aadd( a2_1, hbide_parseWithMetaData( s, a4_1 ) ) - NEXT - ENDIF - - /* Parse Files */ - IF !empty( a3_0 ) - FOR EACH s IN a3_0 - IF !( "#" == left( s,1 ) ) .and. !empty( s ) - aadd( a3_1, hbide_parseWithMetaData( s, a4_1 ) ) - ENDIF - NEXT - ENDIF - - ENDIF - - RETURN { { a1_0, a1_1 }, { a2_0, a2_1 }, { a3_0, a3_1 }, { a4_0, a4_1 } } - -/*----------------------------------------------------------------------*/ - FUNCTION hbide_setupMetaKeys( a_ ) LOCAL s, n, cKey, cVal LOCAL a4_1 := {}