diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d0844a83c4..b86ebc94ee 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,19 @@ The license applies to all entries newer than 2009-04-28. */ +2012-01-31 20:04 UTC+0100 Viktor Szakats (harbour syenar.net) + * src/rdd/usrrdd/rdds/arrayrdd.prg + * contrib/gtwvg/wvgax.prg + * contrib/hbwin/tests/testgdi.prg + * contrib/hbgd/tests/test_out.prg + * contrib/hbtip/tests/loadhtml.prg + * contrib/hbide/ideactions.prg + * tests/parseini.prg + * examples/httpsrv/cgifunc.prg + * examples/httpsrv/modules/tableservletdb.prg + * examples/httpsrv/session.prg + * HB_HASH() -> { => } + 2012-01-31 16:22 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/src/pp/ppcore.c ! added resetting conditional compilation stack in hb_pp_reset() diff --git a/harbour/contrib/gtwvg/wvgax.prg b/harbour/contrib/gtwvg/wvgax.prg index 4b444fdb55..aaf696d32b 100644 --- a/harbour/contrib/gtwvg/wvgax.prg +++ b/harbour/contrib/gtwvg/wvgax.prg @@ -92,7 +92,7 @@ CLASS WvgActiveXControl FROM WvgWindow DATA lSubStdEvents INIT .f. - DATA hEvents INIT hb_hash() + DATA hEvents INIT { => } DATA hContainer DATA ClassName diff --git a/harbour/contrib/hbgd/tests/test_out.prg b/harbour/contrib/hbgd/tests/test_out.prg index b80cfaf78a..b7ee9d0cd7 100644 --- a/harbour/contrib/hbgd/tests/test_out.prg +++ b/harbour/contrib/hbgd/tests/test_out.prg @@ -19,7 +19,7 @@ PROCEDURE Main(...) LOCAL cPar LOCAL aParams := hb_aParams() LOCAL cQuery := GetEnv( "QUERY_STRING" ) - LOCAL hParams := hb_Hash() + LOCAL hParams := { => } LOCAL cText, cImg, nPt, nWidth, nHeight, cPhoto @@ -211,7 +211,7 @@ PROCEDURE OutJpg( cText, nPitch ) RETURN FUNCTION GetVars( cFields, cSeparator ) - LOCAL hHashVars := hb_Hash() + LOCAL hHashVars := { => } LOCAL aField, cField, aFields LOCAL cName, xValue DEFAULT cSeparator TO "&" @@ -247,7 +247,7 @@ FUNCTION GetVars( cFields, cSeparator ) RETURN hHashVars FUNCTION GetParams( aParams ) - LOCAL hHashVars := hb_Hash() + LOCAL hHashVars := { => } LOCAL aField, cField, aFields LOCAL cName, xValue diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index d3197b7d14..a635100deb 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -78,7 +78,7 @@ CLASS IdeActions INHERIT IdeObject - DATA hActions INIT hb_hash() + DATA hActions INIT { => } METHOD new( oIde ) METHOD create( oIde ) diff --git a/harbour/contrib/hbtip/tests/loadhtml.prg b/harbour/contrib/hbtip/tests/loadhtml.prg index 60fbf83430..3f27fb738a 100644 --- a/harbour/contrib/hbtip/tests/loadhtml.prg +++ b/harbour/contrib/hbtip/tests/loadhtml.prg @@ -13,7 +13,7 @@ PROCEDURE Main oHttp := TIpClientHttp():new( "http://www.google.de/search" ) /* build the Google query */ - hQUery := hb_Hash() + hQUery := { => } hb_hSetCaseMatch( hQuery, .F. ) hQuery["q"] := "Harbour" diff --git a/harbour/contrib/hbwin/tests/testgdi.prg b/harbour/contrib/hbwin/tests/testgdi.prg index f5657dac23..37b69d29d1 100644 --- a/harbour/contrib/hbwin/tests/testgdi.prg +++ b/harbour/contrib/hbwin/tests/testgdi.prg @@ -43,19 +43,19 @@ PROCEDURE Main() ? aRECT[ 1 ], aRECT[ 2 ], aRECT[ 3 ], aRECT[ 4 ] ? "out HASH" - hRECT := hb_hash() + hRECT := { => } ? wapi_DrawText( hDC, "2TEST", hRECT, WIN_DT_CALCRECT ) ? hRECT[ "left" ], hRECT[ "top" ], hRECT[ "bottom" ], hRECT[ "right" ] ? "inout HASH" - hRECT := hb_hash() + hRECT := { => } hRECT[ "left" ] := 300 hRECT[ "top" ] := 350 ? wapi_DrawText( hDC, "3TEST", hRECT, WIN_DT_CALCRECT ) ? hRECT[ "left" ], hRECT[ "top" ], hRECT[ "bottom" ], hRECT[ "right" ] ? "in HASH" - hRECT := hb_hash() + hRECT := { => } hRECT[ "left" ] := 300 hRECT[ "top" ] := 350 hRECT[ "right" ] := 650 diff --git a/harbour/examples/httpsrv/cgifunc.prg b/harbour/examples/httpsrv/cgifunc.prg index 0579a7f0bb..825c36a12c 100644 --- a/harbour/examples/httpsrv/cgifunc.prg +++ b/harbour/examples/httpsrv/cgifunc.prg @@ -63,7 +63,7 @@ MEMVAR _SERVER, _GET, _POST, _COOKIE, _REQUEST, _HTTP_REQUEST FUNCTION uhttpd_GetVars( cFields, cSeparator ) - LOCAL hHashVars := hb_Hash() + LOCAL hHashVars := { => } LOCAL aField, cField, aFields LOCAL cName, xValue DEFAULT cSeparator TO "&" @@ -130,7 +130,7 @@ FUNCTION uhttpd_GetVars( cFields, cSeparator ) */ FUNCTION uhttpd_SplitUrl( cUrl ) - LOCAL hUrl := hb_Hash() + LOCAL hUrl := { => } LOCAL nPos, cTemp, cUserNamePassword, cHostnamePort LOCAL cProto, cHost, cPort, nPort, cUser, cPass, cPath, cQuery, cFragment LOCAL cUri diff --git a/harbour/examples/httpsrv/modules/tableservletdb.prg b/harbour/examples/httpsrv/modules/tableservletdb.prg index 7507c3af85..9037f6e276 100644 --- a/harbour/examples/httpsrv/modules/tableservletdb.prg +++ b/harbour/examples/httpsrv/modules/tableservletdb.prg @@ -71,7 +71,7 @@ FUNCTION HRBMAIN() hGets := _REQUEST - DEFAULT hGets TO hb_Hash() + DEFAULT hGets TO { => } IF HB_HHasKey( hGets, "page" ) @@ -186,7 +186,7 @@ METHOD Read() CLASS TableManager //n := 0 DO WHILE table->( !Eof() ) //.AND. ++n < 50 - hMap := hb_Hash() + hMap := { => } hMap[ "recno" ] := StrZero( table->( RecNo() ), 4 ) hMap[ "name" ] := RTrim( table->first ) + " " + RTrim( table->last ) hMap[ "address" ] := RTrim( table->street ) diff --git a/harbour/examples/httpsrv/session.prg b/harbour/examples/httpsrv/session.prg index d5aecafffc..e8db2af409 100644 --- a/harbour/examples/httpsrv/session.prg +++ b/harbour/examples/httpsrv/session.prg @@ -674,7 +674,7 @@ METHOD SessionDestroy( cID ) CLASS uhttpd_Session //TraceLog( "SessionDestroy() - cID", cID ) DEFAULT cID TO ::cSID - _SESSION := hb_Hash() + _SESSION := { => } ::oCookie:DeleteCookie( ::cName ) //TraceLog( "SessionDestroy() - cID, oCGI:h_Session", cID, DumpValue( oCGI:h_Session ) ) diff --git a/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg b/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg index 1788360536..5afda5d91e 100644 --- a/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg +++ b/harbour/src/rdd/usrrdd/rdds/arrayrdd.prg @@ -135,7 +135,7 @@ STATIC s_nRddID := -1 STATIC FUNCTION AR_INIT( nRDD ) /* Init DBF Hash */ - USRRDD_RDDDATA( nRDD, hb_Hash() ) + USRRDD_RDDDATA( nRDD, { => } ) RETURN HB_SUCCESS diff --git a/harbour/tests/parseini.prg b/harbour/tests/parseini.prg index cb68dd79b5..5fe855ddc4 100644 --- a/harbour/tests/parseini.prg +++ b/harbour/tests/parseini.prg @@ -47,7 +47,7 @@ PROCEDURE Main( cName ) ? ? "Adding section 'Added', with key NEW = new" - hIni[ "Added" ] := hb_Hash() + hIni[ "Added" ] := { => } hIni[ "Added" ][ "NEW" ] := "new" ? "Writing output to parseini_out.ini" @@ -94,7 +94,7 @@ PROCEDURE Main( cName ) ? ? "Adding section 'Added', with key NEW = new" - hIni[ "Added" ] := hb_Hash() + hIni[ "Added" ] := { => } hIni[ "Added" ][ "NEW" ] := "new" ? "Writing output to parseini_out1.ini"