2012-01-11 23:56 UTC+0100 Viktor Szakats (harbour syenar.net)

* src/rdd/dbtotal.prg
  * contrib/hbqt/qtcore/hbqt_misc.prg
  * contrib/hbide/idemisc.prg
  * contrib/hbide/hbqreportsmanager.prg
    % '&("{||" + c + "}")' -> HB_MACROBLOCK()

  * contrib/hbqt/qtcore/hbqtcore.hbx
  * contrib/hbqt/qtcore/hbqt_misc.prg
  * contrib/hbxbp/xbpbrowse.prg
    ! typo in public function name: HBQT_PROMOTWIDGET() -> HBQT_PROMOTEWIDGET()
      [INCOMPATIBLE]

  * ChangeLog
    ! added incompatible flag to relevant part of latest entry

harbour/ChangeLog

@@ -16,6 +16,22 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-01-11 23:56 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * src/rdd/dbtotal.prg
+  * contrib/hbqt/qtcore/hbqt_misc.prg
+  * contrib/hbide/idemisc.prg
+  * contrib/hbide/hbqreportsmanager.prg
+    % '&("{||" + c + "}")' -> HB_MACROBLOCK()
+
+  * contrib/hbqt/qtcore/hbqtcore.hbx
+  * contrib/hbqt/qtcore/hbqt_misc.prg
+  * contrib/hbxbp/xbpbrowse.prg
+    ! typo in public function name: HBQT_PROMOTWIDGET() -> HBQT_PROMOTEWIDGET()
+      [INCOMPATIBLE]
+
+  * ChangeLog
+    ! added incompatible flag to relevant part of latest entry
+
 2012-01-11 19:25 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * contrib/hbcairo/core.c
     ! fixed typo
@@ -33,9 +49,10 @@
       pointer caused random GPF later
 
   * src/rtl/hbsockhb.c
-    * changed .prg level hb_socketSetBlockingIO() return value 
+    * changed .prg level hb_socketSetBlockingIO() return value
       type from lSuccess to nSuccess, to have the same return
       value meaning precision as C level function
+      [INCOMPATIBLE]
 
   * src/rtl/hbsockhb.c
   * include/harbour.hbx

harbour/contrib/hbide/hbqreportsmanager.prg

@@ -1453,7 +1453,7 @@ STATIC FUNCTION rmgr_evalAsArray( cStr )
    LOCAL a_, bErr := ErrorBlock( {|| break() } )
 
    BEGIN SEQUENCE
-      a_:= eval( &( "{|| " + cStr + "}" ) )
+      a_:= Eval( hb_macroBlock( cStr ) )
    RECOVER
       a_:= {}
    ENDSEQUENCE

harbour/contrib/hbide/idemisc.prg

@@ -375,7 +375,7 @@ FUNCTION hbide_evalAsString( cExp )
    LOCAL cValue
 
    BEGIN SEQUENCE WITH { || break() }
-      cValue := eval( &( "{|| " + cExp + "}" ) )
+      cValue := Eval( hb_macroBlock( cExp ) )
    RECOVER
       cValue := cExp
    END SEQUENCE
@@ -392,7 +392,7 @@ FUNCTION hbide_evalAsIs( cExp )
    LOCAL xValue
 
    BEGIN SEQUENCE WITH { || break() }
-      xValue := eval( &( "{|| " + cExp + "}" ) )
+      xValue := Eval( hb_macroBlock( cExp ) )
    RECOVER
       xValue := cExp
    END SEQUENCE

harbour/contrib/hbqt/qtcore/hbqt_misc.prg

@@ -219,8 +219,8 @@ METHOD HbQtObjectHandler:_destroy()
 
 /*----------------------------------------------------------------------*/
 
-FUNCTION hbqt_promotWidget( oWidget, cWidgetTo )
-   LOCAL oObj := Eval( &( "{|| HB_" + cWidgetTo + "() }" ) )
+FUNCTION hbqt_promoteWidget( oWidget, cWidgetTo )
+   LOCAL oObj := Eval( hb_macroBlock( "HB_" + cWidgetTo + "()" ) )
 
    oObj:pPtr := oWidget:pPtr
 

harbour/contrib/hbqt/qtcore/hbqtcore.hbx

@@ -31,7 +31,7 @@ DYNAMIC HBQSTRING
 DYNAMIC HBQTOBJECTHANDLER
 DYNAMIC HBQT_ISEQUAL
 DYNAMIC HBQT_ISOBJECT
-DYNAMIC HBQT_PROMOTWIDGET
+DYNAMIC HBQT_PROMOTEWIDGET
 DYNAMIC HB_HBQEVENTS
 DYNAMIC HB_HBQSLOTS
 DYNAMIC HB_HBQSTRING

harbour/contrib/hbxbp/xbpbrowse.prg

@@ -971,7 +971,7 @@ METHOD XbpBrowse:manageFrameResized()
 /*----------------------------------------------------------------------*/
 
 METHOD XbpBrowse:manageCommitData( qWidget )
-   LOCAL cTxt    := hbqt_promotWidget( qWidget, "QLineEdit" ):text()
+   LOCAL cTxt    := hbqt_promoteWidget( qWidget, "QLineEdit" ):text()
    LOCAL oCol    := ::columns[ ::colPos ]
    LOCAL cTyp    := valtype( eval( oCol:block ) )
 

harbour/src/rdd/dbtotal.prg

@@ -82,7 +82,7 @@ FUNCTION __dbTotal( cFile, xKey, aFields,;
    LOCAL lError := .F.
 
    IF ISCHARACTER( xWhile )
-      bWhileBlock := &("{||" + xWhile + "}")
+      bWhileBlock := hb_macroBlock( xWhile )
       lRest := .T.
    ELSEIF ISBLOCK( xWhile )
       bWhileBlock := xWhile
@@ -92,7 +92,7 @@ FUNCTION __dbTotal( cFile, xKey, aFields,;
    ENDIF
 
    IF ISCHARACTER( xFor )
-      bForBlock := &("{||" + xFor + "}")
+      bForBlock := hb_macroBlock( xFor )
    ELSEIF ISBLOCK( xFor )
       bForBlock := xFor
    ELSE
@@ -130,7 +130,7 @@ FUNCTION __dbTotal( cFile, xKey, aFields,;
       ENDIF
 
       IF ISCHARACTER( xKey )
-         bKeyBlock := &("{||" + xKey + "}")
+         bKeyBlock := hb_macroBlock( xKey )
       ELSEIF ISBLOCK( xKey )
          bKeyBlock := xKey
       ELSE