diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index acf68e6fb8..5b98c0817d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,50 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-05 18:48 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.pt_BR.po
+  * utils/hbmk2/hbmk2.hu_HU.po
+  * utils/hbmk2/hbmk2.prg
+    + Added support for C++ input files. Now C++ files will be compiled
+      in a separate pass where native C++ compiler is used, which
+      means that C++ compilation mode is now enforced by using .cpp
+      extension. This also means that it's now possible to build
+      mixed mode projects with both C and C++ input files.
+      Enable with option: -hbcppmm (cmdline) or hbcppmm=yes (in .hbc files)
+         NOTE: Suggestions for better names are welcome.
+      In general, this feature makes -cpp option unnecessary, its
+      only purpose now is to override default mode.
+    ; Please test.
+
+  * utils/hbmk2/hbmk2.prg
+    - Deleted support for link-related macros in C compilation phase,
+      these weren't used anymore inside current hbmk2, so it seems safe,
+      but it's possible nevertheless that it will cause regressions in
+      some exotic use cases.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed parsing -warn option on the commandline and .hbm/.hbp files.
+      [TOMERGE 2.0]
+
+  * contrib/hbqt/generator/hbmk.hbm
+    ! Deleted xhb lib. It's not required and was probably added for
+      "outdebug" stuff.
+
+  * contrib/hbqt/hbqt.hbc
+  * contrib/hbqt/hbqts.hbc
+  * contrib/gtqtc/gtqtcs.hbc
+  * contrib/gtqtc/gtqtc.hbc
+    + Added hbcppmm=yes option. This will force C++ memory allocation
+      functions to be overridden by Harbour mm functions.
+
+  * src/vm/fm.c
+    - Deleted C++ memory allocation functions. This feature now
+      lives inside hbmk2, and it now doesn't require whole Harbour
+      to be built in C++ mode.
+
+  * contrib/hbqt/*
+    * Regenerated.
+
 2010-01-05 14:54 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbct/dummy.c
     + Added dummy stubs for all CT functions which are not yet
diff --git a/harbour/contrib/gtqtc/gtqtc.hbc b/harbour/contrib/gtqtc/gtqtc.hbc
index 8c57ff43a2..7d193d9897 100644
--- a/harbour/contrib/gtqtc/gtqtc.hbc
+++ b/harbour/contrib/gtqtc/gtqtc.hbc
@@ -11,5 +11,8 @@ libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
 {darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
 {darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit
 {allgcc}libs=supc++
+
+hbcppmm=yes
+
 gui=yes
 gt=gtqtc
diff --git a/harbour/contrib/gtqtc/gtqtcs.hbc b/harbour/contrib/gtqtc/gtqtcs.hbc
index 3810cb2d05..324a10949e 100644
--- a/harbour/contrib/gtqtc/gtqtcs.hbc
+++ b/harbour/contrib/gtqtc/gtqtcs.hbc
@@ -6,5 +6,8 @@
 
 libs=QtCore QtGui QtNetwork QtWebKit
 {allgcc}libs=supc++
+
+hbcppmm=yes
+
 gui=yes
 gt=gtqtcs
diff --git a/harbour/contrib/hbqt/generator/hbmk.hbm b/harbour/contrib/hbqt/generator/hbmk.hbm
index 42a8870d3c..172739e229 100644
--- a/harbour/contrib/hbqt/generator/hbmk.hbm
+++ b/harbour/contrib/hbqt/generator/hbmk.hbm
@@ -2,4 +2,4 @@
 # $Id$
 #
 
--w3 -es2 -lxhb
+-w3 -es2
diff --git a/harbour/contrib/hbqt/hbqt.hbc b/harbour/contrib/hbqt/hbqt.hbc
index 3f8005efb8..9eb27a563d 100644
--- a/harbour/contrib/hbqt/hbqt.hbc
+++ b/harbour/contrib/hbqt/hbqt.hbc
@@ -19,5 +19,7 @@ libs=hbqtcore hbqtgui hbqtnetwork
 {darwin}libs=QtUiTools
 {allgcc}libs=supc++
 
+hbcppmm=yes
+
 gui=yes
 gt=gtnul
diff --git a/harbour/contrib/hbqt/hbqts.hbc b/harbour/contrib/hbqt/hbqts.hbc
index f9377f5c8c..e134a0a9ce 100644
--- a/harbour/contrib/hbqt/hbqts.hbc
+++ b/harbour/contrib/hbqt/hbqts.hbc
@@ -14,5 +14,7 @@ libs=hbqtcores hbqtguis hbqtnetworks hbqtwebkits
 {allwin}libs=psapi
 {allgcc}libs=supc++
 
+hbcppmm=yes
+
 gui=yes
 gt=gtnul
diff --git a/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg b/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg
index cbe28b2b08..4b605f83c3 100644
--- a/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg
+++ b/harbour/contrib/hbqt/qtcore/TQAbstractItemModel.prg
@@ -106,8 +106,7 @@ CREATE CLASS QAbstractItemModel INHERIT HbQtObjectHandler, QObject
 METHOD QAbstractItemModel:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractItemModel( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQAbstractListModel.prg b/harbour/contrib/hbqt/qtcore/TQAbstractListModel.prg
index 5bd8007ed6..2530fbfe77 100644
--- a/harbour/contrib/hbqt/qtcore/TQAbstractListModel.prg
+++ b/harbour/contrib/hbqt/qtcore/TQAbstractListModel.prg
@@ -75,8 +75,7 @@ CREATE CLASS QAbstractListModel INHERIT HbQtObjectHandler, QAbstractItemModel
 METHOD QAbstractListModel:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractListModel( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQAbstractTableModel.prg b/harbour/contrib/hbqt/qtcore/TQAbstractTableModel.prg
index 543e918ed0..e7996e4a60 100644
--- a/harbour/contrib/hbqt/qtcore/TQAbstractTableModel.prg
+++ b/harbour/contrib/hbqt/qtcore/TQAbstractTableModel.prg
@@ -75,8 +75,7 @@ CREATE CLASS QAbstractTableModel INHERIT HbQtObjectHandler, QAbstractItemModel
 METHOD QAbstractTableModel:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractTableModel( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQBitArray.prg b/harbour/contrib/hbqt/qtcore/TQBitArray.prg
index 9c87a4a5c5..1b48eba0fe 100644
--- a/harbour/contrib/hbqt/qtcore/TQBitArray.prg
+++ b/harbour/contrib/hbqt/qtcore/TQBitArray.prg
@@ -90,8 +90,7 @@ CREATE CLASS QBitArray INHERIT HbQtObjectHandler
 METHOD QBitArray:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QBitArray( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQByteArray.prg b/harbour/contrib/hbqt/qtcore/TQByteArray.prg
index 69fc7b768c..b91ebcf298 100644
--- a/harbour/contrib/hbqt/qtcore/TQByteArray.prg
+++ b/harbour/contrib/hbqt/qtcore/TQByteArray.prg
@@ -171,8 +171,7 @@ CREATE CLASS QByteArray INHERIT HbQtObjectHandler
 METHOD QByteArray:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QByteArray( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQCoreApplication.prg b/harbour/contrib/hbqt/qtcore/TQCoreApplication.prg
index 06c13d3325..52cdbc5975 100644
--- a/harbour/contrib/hbqt/qtcore/TQCoreApplication.prg
+++ b/harbour/contrib/hbqt/qtcore/TQCoreApplication.prg
@@ -114,8 +114,7 @@ CREATE CLASS QCoreApplication INHERIT HbQtObjectHandler, QObject
 METHOD QCoreApplication:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QCoreApplication( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQDataStream.prg b/harbour/contrib/hbqt/qtcore/TQDataStream.prg
index 8814f8e9f4..b6a90d2b8c 100644
--- a/harbour/contrib/hbqt/qtcore/TQDataStream.prg
+++ b/harbour/contrib/hbqt/qtcore/TQDataStream.prg
@@ -87,8 +87,7 @@ CREATE CLASS QDataStream INHERIT HbQtObjectHandler
 METHOD QDataStream:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDataStream( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQDate.prg b/harbour/contrib/hbqt/qtcore/TQDate.prg
index aa77d8e941..d1ffc90878 100644
--- a/harbour/contrib/hbqt/qtcore/TQDate.prg
+++ b/harbour/contrib/hbqt/qtcore/TQDate.prg
@@ -93,8 +93,7 @@ CREATE CLASS QDate INHERIT HbQtObjectHandler
 METHOD QDate:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDate( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQDateTime.prg b/harbour/contrib/hbqt/qtcore/TQDateTime.prg
index 1d84cef75f..130477ebbe 100644
--- a/harbour/contrib/hbqt/qtcore/TQDateTime.prg
+++ b/harbour/contrib/hbqt/qtcore/TQDateTime.prg
@@ -100,8 +100,7 @@ CREATE CLASS QDateTime INHERIT HbQtObjectHandler
 METHOD QDateTime:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDateTime( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQDir.prg b/harbour/contrib/hbqt/qtcore/TQDir.prg
index d5085718fc..1630a407be 100644
--- a/harbour/contrib/hbqt/qtcore/TQDir.prg
+++ b/harbour/contrib/hbqt/qtcore/TQDir.prg
@@ -126,8 +126,7 @@ CREATE CLASS QDir INHERIT HbQtObjectHandler
 METHOD QDir:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDir( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQEvent.prg b/harbour/contrib/hbqt/qtcore/TQEvent.prg
index 07e7a50127..6cc35d28df 100644
--- a/harbour/contrib/hbqt/qtcore/TQEvent.prg
+++ b/harbour/contrib/hbqt/qtcore/TQEvent.prg
@@ -81,8 +81,7 @@ CREATE CLASS QEvent INHERIT HbQtObjectHandler
 METHOD QEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQEventLoop.prg b/harbour/contrib/hbqt/qtcore/TQEventLoop.prg
index cf8abcf898..3376067225 100644
--- a/harbour/contrib/hbqt/qtcore/TQEventLoop.prg
+++ b/harbour/contrib/hbqt/qtcore/TQEventLoop.prg
@@ -80,8 +80,7 @@ CREATE CLASS QEventLoop INHERIT HbQtObjectHandler, QObject
 METHOD QEventLoop:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QEventLoop( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQFile.prg b/harbour/contrib/hbqt/qtcore/TQFile.prg
index fd15cc3298..96fa6e4e09 100644
--- a/harbour/contrib/hbqt/qtcore/TQFile.prg
+++ b/harbour/contrib/hbqt/qtcore/TQFile.prg
@@ -108,8 +108,7 @@ CREATE CLASS QFile INHERIT HbQtObjectHandler, QIODevice
 METHOD QFile:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFile( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQFileInfo.prg b/harbour/contrib/hbqt/qtcore/TQFileInfo.prg
index 5a4ae8bef6..d04c95a7bf 100644
--- a/harbour/contrib/hbqt/qtcore/TQFileInfo.prg
+++ b/harbour/contrib/hbqt/qtcore/TQFileInfo.prg
@@ -118,8 +118,7 @@ CREATE CLASS QFileInfo INHERIT HbQtObjectHandler
 METHOD QFileInfo:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFileInfo( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQIODevice.prg b/harbour/contrib/hbqt/qtcore/TQIODevice.prg
index 298a9d91e3..2f7500d171 100644
--- a/harbour/contrib/hbqt/qtcore/TQIODevice.prg
+++ b/harbour/contrib/hbqt/qtcore/TQIODevice.prg
@@ -107,8 +107,7 @@ CREATE CLASS QIODevice INHERIT HbQtObjectHandler, QObject
 METHOD QIODevice:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QIODevice( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQLatin1Char.prg b/harbour/contrib/hbqt/qtcore/TQLatin1Char.prg
index 4c473c24d6..69a9fe2924 100644
--- a/harbour/contrib/hbqt/qtcore/TQLatin1Char.prg
+++ b/harbour/contrib/hbqt/qtcore/TQLatin1Char.prg
@@ -76,8 +76,7 @@ CREATE CLASS QLatin1Char INHERIT HbQtObjectHandler
 METHOD QLatin1Char:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QLatin1Char( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQLatin1String.prg b/harbour/contrib/hbqt/qtcore/TQLatin1String.prg
index 0a4e760128..7cea306dcc 100644
--- a/harbour/contrib/hbqt/qtcore/TQLatin1String.prg
+++ b/harbour/contrib/hbqt/qtcore/TQLatin1String.prg
@@ -75,8 +75,7 @@ CREATE CLASS QLatin1String INHERIT HbQtObjectHandler
 METHOD QLatin1String:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QLatin1String( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQLine.prg b/harbour/contrib/hbqt/qtcore/TQLine.prg
index 989c231c3d..5f7fc186ba 100644
--- a/harbour/contrib/hbqt/qtcore/TQLine.prg
+++ b/harbour/contrib/hbqt/qtcore/TQLine.prg
@@ -91,8 +91,7 @@ CREATE CLASS QLine INHERIT HbQtObjectHandler
 METHOD QLine:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QLine( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQLineF.prg b/harbour/contrib/hbqt/qtcore/TQLineF.prg
index bd80d41d1a..e4ff53105d 100644
--- a/harbour/contrib/hbqt/qtcore/TQLineF.prg
+++ b/harbour/contrib/hbqt/qtcore/TQLineF.prg
@@ -101,8 +101,7 @@ CREATE CLASS QLineF INHERIT HbQtObjectHandler
 METHOD QLineF:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QLineF( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQList.prg b/harbour/contrib/hbqt/qtcore/TQList.prg
index d3f8a13218..c13f0c8c4f 100644
--- a/harbour/contrib/hbqt/qtcore/TQList.prg
+++ b/harbour/contrib/hbqt/qtcore/TQList.prg
@@ -114,8 +114,7 @@ CREATE CLASS QList INHERIT HbQtObjectHandler
 METHOD QList:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QList( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQLocale.prg b/harbour/contrib/hbqt/qtcore/TQLocale.prg
index 4a263d6c82..dba3123c20 100644
--- a/harbour/contrib/hbqt/qtcore/TQLocale.prg
+++ b/harbour/contrib/hbqt/qtcore/TQLocale.prg
@@ -122,8 +122,7 @@ CREATE CLASS QLocale INHERIT HbQtObjectHandler
 METHOD QLocale:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QLocale( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQMimeData.prg b/harbour/contrib/hbqt/qtcore/TQMimeData.prg
index a918683634..db923eb7a6 100644
--- a/harbour/contrib/hbqt/qtcore/TQMimeData.prg
+++ b/harbour/contrib/hbqt/qtcore/TQMimeData.prg
@@ -93,8 +93,7 @@ CREATE CLASS QMimeData INHERIT HbQtObjectHandler, QObject
 METHOD QMimeData:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QMimeData( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQModelIndex.prg b/harbour/contrib/hbqt/qtcore/TQModelIndex.prg
index 5be1b29330..842117fefb 100644
--- a/harbour/contrib/hbqt/qtcore/TQModelIndex.prg
+++ b/harbour/contrib/hbqt/qtcore/TQModelIndex.prg
@@ -85,8 +85,7 @@ CREATE CLASS QModelIndex INHERIT HbQtObjectHandler
 METHOD QModelIndex:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QModelIndex( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQObject.prg b/harbour/contrib/hbqt/qtcore/TQObject.prg
index e5a2769887..3c8fc2ec84 100644
--- a/harbour/contrib/hbqt/qtcore/TQObject.prg
+++ b/harbour/contrib/hbqt/qtcore/TQObject.prg
@@ -103,8 +103,7 @@ CREATE CLASS QObject INHERIT HbQtObjectHandler
 METHOD QObject:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QObject( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQPoint.prg b/harbour/contrib/hbqt/qtcore/TQPoint.prg
index c16f4fc83a..25257dc342 100644
--- a/harbour/contrib/hbqt/qtcore/TQPoint.prg
+++ b/harbour/contrib/hbqt/qtcore/TQPoint.prg
@@ -82,8 +82,7 @@ CREATE CLASS QPoint INHERIT HbQtObjectHandler
 METHOD QPoint:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPoint( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQPointF.prg b/harbour/contrib/hbqt/qtcore/TQPointF.prg
index 1675e87499..f7e4bfa7e7 100644
--- a/harbour/contrib/hbqt/qtcore/TQPointF.prg
+++ b/harbour/contrib/hbqt/qtcore/TQPointF.prg
@@ -82,8 +82,7 @@ CREATE CLASS QPointF INHERIT HbQtObjectHandler
 METHOD QPointF:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPointF( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQProcess.prg b/harbour/contrib/hbqt/qtcore/TQProcess.prg
index 311afc243c..6da8108206 100644
--- a/harbour/contrib/hbqt/qtcore/TQProcess.prg
+++ b/harbour/contrib/hbqt/qtcore/TQProcess.prg
@@ -107,8 +107,7 @@ CREATE CLASS QProcess INHERIT HbQtObjectHandler, QIODevice
 METHOD QProcess:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QProcess( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQRect.prg b/harbour/contrib/hbqt/qtcore/TQRect.prg
index 7740b5d29e..42324c6b6f 100644
--- a/harbour/contrib/hbqt/qtcore/TQRect.prg
+++ b/harbour/contrib/hbqt/qtcore/TQRect.prg
@@ -133,8 +133,7 @@ CREATE CLASS QRect INHERIT HbQtObjectHandler
 METHOD QRect:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QRect( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQRectF.prg b/harbour/contrib/hbqt/qtcore/TQRectF.prg
index 9d59a54175..5388e2ae4f 100644
--- a/harbour/contrib/hbqt/qtcore/TQRectF.prg
+++ b/harbour/contrib/hbqt/qtcore/TQRectF.prg
@@ -134,8 +134,7 @@ CREATE CLASS QRectF INHERIT HbQtObjectHandler
 METHOD QRectF:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QRectF( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQRegExp.prg b/harbour/contrib/hbqt/qtcore/TQRegExp.prg
index 48446c0b39..2e75e70392 100644
--- a/harbour/contrib/hbqt/qtcore/TQRegExp.prg
+++ b/harbour/contrib/hbqt/qtcore/TQRegExp.prg
@@ -93,8 +93,7 @@ CREATE CLASS QRegExp INHERIT HbQtObjectHandler
 METHOD QRegExp:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QRegExp( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQResource.prg b/harbour/contrib/hbqt/qtcore/TQResource.prg
index c529d01253..f8dc157d28 100644
--- a/harbour/contrib/hbqt/qtcore/TQResource.prg
+++ b/harbour/contrib/hbqt/qtcore/TQResource.prg
@@ -86,8 +86,7 @@ CREATE CLASS QResource INHERIT HbQtObjectHandler
 METHOD QResource:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QResource( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQSettings.prg b/harbour/contrib/hbqt/qtcore/TQSettings.prg
index df2724e22e..ea7f32fe6d 100644
--- a/harbour/contrib/hbqt/qtcore/TQSettings.prg
+++ b/harbour/contrib/hbqt/qtcore/TQSettings.prg
@@ -102,8 +102,7 @@ CREATE CLASS QSettings INHERIT HbQtObjectHandler, QObject
 METHOD QSettings:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSettings( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQSignalMapper.prg b/harbour/contrib/hbqt/qtcore/TQSignalMapper.prg
index 5e5dbefeb4..9f0a4615ba 100644
--- a/harbour/contrib/hbqt/qtcore/TQSignalMapper.prg
+++ b/harbour/contrib/hbqt/qtcore/TQSignalMapper.prg
@@ -85,8 +85,7 @@ CREATE CLASS QSignalMapper INHERIT HbQtObjectHandler, QObject
 METHOD QSignalMapper:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSignalMapper( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQSize.prg b/harbour/contrib/hbqt/qtcore/TQSize.prg
index f442327e11..ec1b1773df 100644
--- a/harbour/contrib/hbqt/qtcore/TQSize.prg
+++ b/harbour/contrib/hbqt/qtcore/TQSize.prg
@@ -88,8 +88,7 @@ CREATE CLASS QSize INHERIT HbQtObjectHandler
 METHOD QSize:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSize( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQSizeF.prg b/harbour/contrib/hbqt/qtcore/TQSizeF.prg
index 722850ce1d..1902f0fc11 100644
--- a/harbour/contrib/hbqt/qtcore/TQSizeF.prg
+++ b/harbour/contrib/hbqt/qtcore/TQSizeF.prg
@@ -89,8 +89,7 @@ CREATE CLASS QSizeF INHERIT HbQtObjectHandler
 METHOD QSizeF:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSizeF( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQStringList.prg b/harbour/contrib/hbqt/qtcore/TQStringList.prg
index 8b7770f198..f56c4937ff 100644
--- a/harbour/contrib/hbqt/qtcore/TQStringList.prg
+++ b/harbour/contrib/hbqt/qtcore/TQStringList.prg
@@ -109,8 +109,7 @@ CREATE CLASS QStringList INHERIT HbQtObjectHandler, QList
 METHOD QStringList:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStringList( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQTextBoundaryFinder.prg b/harbour/contrib/hbqt/qtcore/TQTextBoundaryFinder.prg
index 168b268746..c739292a41 100644
--- a/harbour/contrib/hbqt/qtcore/TQTextBoundaryFinder.prg
+++ b/harbour/contrib/hbqt/qtcore/TQTextBoundaryFinder.prg
@@ -85,8 +85,7 @@ CREATE CLASS QTextBoundaryFinder INHERIT HbQtObjectHandler
 METHOD QTextBoundaryFinder:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextBoundaryFinder( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQTextCodec.prg b/harbour/contrib/hbqt/qtcore/TQTextCodec.prg
index 1986ac839b..8f5642b0df 100644
--- a/harbour/contrib/hbqt/qtcore/TQTextCodec.prg
+++ b/harbour/contrib/hbqt/qtcore/TQTextCodec.prg
@@ -94,8 +94,7 @@ CREATE CLASS QTextCodec INHERIT HbQtObjectHandler
 METHOD QTextCodec:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextCodec( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQTextDecoder.prg b/harbour/contrib/hbqt/qtcore/TQTextDecoder.prg
index 2808ca4358..2f00fe1ef9 100644
--- a/harbour/contrib/hbqt/qtcore/TQTextDecoder.prg
+++ b/harbour/contrib/hbqt/qtcore/TQTextDecoder.prg
@@ -75,8 +75,7 @@ CREATE CLASS QTextDecoder INHERIT HbQtObjectHandler
 METHOD QTextDecoder:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextDecoder( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQTextEncoder.prg b/harbour/contrib/hbqt/qtcore/TQTextEncoder.prg
index 7760eda81e..b5260ce3f2 100644
--- a/harbour/contrib/hbqt/qtcore/TQTextEncoder.prg
+++ b/harbour/contrib/hbqt/qtcore/TQTextEncoder.prg
@@ -75,8 +75,7 @@ CREATE CLASS QTextEncoder INHERIT HbQtObjectHandler
 METHOD QTextEncoder:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextEncoder( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQTextStream.prg b/harbour/contrib/hbqt/qtcore/TQTextStream.prg
index a3a0cf21c8..93470d455a 100644
--- a/harbour/contrib/hbqt/qtcore/TQTextStream.prg
+++ b/harbour/contrib/hbqt/qtcore/TQTextStream.prg
@@ -110,8 +110,7 @@ CREATE CLASS QTextStream INHERIT HbQtObjectHandler
 METHOD QTextStream:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextStream( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQThread.prg b/harbour/contrib/hbqt/qtcore/TQThread.prg
index 596ecd7bec..ae3e9bee74 100644
--- a/harbour/contrib/hbqt/qtcore/TQThread.prg
+++ b/harbour/contrib/hbqt/qtcore/TQThread.prg
@@ -88,8 +88,7 @@ CREATE CLASS QThread INHERIT HbQtObjectHandler, QObject
 METHOD QThread:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QThread( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQTime.prg b/harbour/contrib/hbqt/qtcore/TQTime.prg
index c63104caa9..36f9666bdd 100644
--- a/harbour/contrib/hbqt/qtcore/TQTime.prg
+++ b/harbour/contrib/hbqt/qtcore/TQTime.prg
@@ -94,8 +94,7 @@ CREATE CLASS QTime INHERIT HbQtObjectHandler
 METHOD QTime:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTime( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQTimer.prg b/harbour/contrib/hbqt/qtcore/TQTimer.prg
index 20e149d8d4..a012028357 100644
--- a/harbour/contrib/hbqt/qtcore/TQTimer.prg
+++ b/harbour/contrib/hbqt/qtcore/TQTimer.prg
@@ -84,8 +84,7 @@ CREATE CLASS QTimer INHERIT HbQtObjectHandler, QObject
 METHOD QTimer:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTimer( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQTranslator.prg b/harbour/contrib/hbqt/qtcore/TQTranslator.prg
index a8d35e823c..25ead4de8b 100644
--- a/harbour/contrib/hbqt/qtcore/TQTranslator.prg
+++ b/harbour/contrib/hbqt/qtcore/TQTranslator.prg
@@ -78,8 +78,7 @@ CREATE CLASS QTranslator INHERIT HbQtObjectHandler, QObject
 METHOD QTranslator:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTranslator( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQUiLoader.prg b/harbour/contrib/hbqt/qtcore/TQUiLoader.prg
index c04117d35a..ba96f3fa59 100644
--- a/harbour/contrib/hbqt/qtcore/TQUiLoader.prg
+++ b/harbour/contrib/hbqt/qtcore/TQUiLoader.prg
@@ -88,8 +88,7 @@ CREATE CLASS QUiLoader INHERIT HbQtObjectHandler, QObject
 METHOD QUiLoader:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QUiLoader( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQUrl.prg b/harbour/contrib/hbqt/qtcore/TQUrl.prg
index 8d32ada623..101fb68f83 100644
--- a/harbour/contrib/hbqt/qtcore/TQUrl.prg
+++ b/harbour/contrib/hbqt/qtcore/TQUrl.prg
@@ -143,8 +143,7 @@ CREATE CLASS QUrl INHERIT HbQtObjectHandler, QWidget
 METHOD QUrl:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QUrl( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtcore/TQVariant.prg b/harbour/contrib/hbqt/qtcore/TQVariant.prg
index bdbacc3906..62acf57ed6 100644
--- a/harbour/contrib/hbqt/qtcore/TQVariant.prg
+++ b/harbour/contrib/hbqt/qtcore/TQVariant.prg
@@ -110,8 +110,7 @@ CREATE CLASS QVariant INHERIT HbQtObjectHandler
 METHOD QVariant:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QVariant( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractButton.prg b/harbour/contrib/hbqt/qtgui/TQAbstractButton.prg
index 0d64f2e66b..13d797bfde 100644
--- a/harbour/contrib/hbqt/qtgui/TQAbstractButton.prg
+++ b/harbour/contrib/hbqt/qtgui/TQAbstractButton.prg
@@ -100,8 +100,7 @@ CREATE CLASS QAbstractButton INHERIT HbQtObjectHandler, QWidget
 METHOD QAbstractButton:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractButton( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractItemDelegate.prg b/harbour/contrib/hbqt/qtgui/TQAbstractItemDelegate.prg
index 42eb28ab81..7f6715cf35 100644
--- a/harbour/contrib/hbqt/qtgui/TQAbstractItemDelegate.prg
+++ b/harbour/contrib/hbqt/qtgui/TQAbstractItemDelegate.prg
@@ -81,8 +81,7 @@ CREATE CLASS QAbstractItemDelegate INHERIT HbQtObjectHandler, QObject
 METHOD QAbstractItemDelegate:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractItemDelegate( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractItemView.prg b/harbour/contrib/hbqt/qtgui/TQAbstractItemView.prg
index 45ff21c651..a656a4330c 100644
--- a/harbour/contrib/hbqt/qtgui/TQAbstractItemView.prg
+++ b/harbour/contrib/hbqt/qtgui/TQAbstractItemView.prg
@@ -137,8 +137,7 @@ CREATE CLASS QAbstractItemView INHERIT HbQtObjectHandler, QAbstractScrollArea
 METHOD QAbstractItemView:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractItemView( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractPrintDialog.prg b/harbour/contrib/hbqt/qtgui/TQAbstractPrintDialog.prg
index d197eb8a15..819128fcb0 100644
--- a/harbour/contrib/hbqt/qtgui/TQAbstractPrintDialog.prg
+++ b/harbour/contrib/hbqt/qtgui/TQAbstractPrintDialog.prg
@@ -84,8 +84,7 @@ CREATE CLASS QAbstractPrintDialog INHERIT HbQtObjectHandler, QDialog
 METHOD QAbstractPrintDialog:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractPrintDialog( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractProxyModel.prg b/harbour/contrib/hbqt/qtgui/TQAbstractProxyModel.prg
index 83435a7502..1d62b56235 100644
--- a/harbour/contrib/hbqt/qtgui/TQAbstractProxyModel.prg
+++ b/harbour/contrib/hbqt/qtgui/TQAbstractProxyModel.prg
@@ -80,8 +80,7 @@ CREATE CLASS QAbstractProxyModel INHERIT HbQtObjectHandler, QAbstractItemModel
 METHOD QAbstractProxyModel:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractProxyModel( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractScrollArea.prg b/harbour/contrib/hbqt/qtgui/TQAbstractScrollArea.prg
index 822bb1197c..65245cdbb4 100644
--- a/harbour/contrib/hbqt/qtgui/TQAbstractScrollArea.prg
+++ b/harbour/contrib/hbqt/qtgui/TQAbstractScrollArea.prg
@@ -88,8 +88,7 @@ CREATE CLASS QAbstractScrollArea INHERIT HbQtObjectHandler, QFrame
 METHOD QAbstractScrollArea:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractScrollArea( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractSlider.prg b/harbour/contrib/hbqt/qtgui/TQAbstractSlider.prg
index 2d839d1336..96ef59f405 100644
--- a/harbour/contrib/hbqt/qtgui/TQAbstractSlider.prg
+++ b/harbour/contrib/hbqt/qtgui/TQAbstractSlider.prg
@@ -98,8 +98,7 @@ CREATE CLASS QAbstractSlider INHERIT HbQtObjectHandler, QWidget
 METHOD QAbstractSlider:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractSlider( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractSpinBox.prg b/harbour/contrib/hbqt/qtgui/TQAbstractSpinBox.prg
index a7b0fb504f..1973d0bda1 100644
--- a/harbour/contrib/hbqt/qtgui/TQAbstractSpinBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQAbstractSpinBox.prg
@@ -100,8 +100,7 @@ CREATE CLASS QAbstractSpinBox INHERIT HbQtObjectHandler, QWidget
 METHOD QAbstractSpinBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractSpinBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQAbstractTextDocumentLayout.prg b/harbour/contrib/hbqt/qtgui/TQAbstractTextDocumentLayout.prg
index 8a13557905..e8543bd3ea 100644
--- a/harbour/contrib/hbqt/qtgui/TQAbstractTextDocumentLayout.prg
+++ b/harbour/contrib/hbqt/qtgui/TQAbstractTextDocumentLayout.prg
@@ -85,8 +85,7 @@ CREATE CLASS QAbstractTextDocumentLayout INHERIT HbQtObjectHandler, QObject
 METHOD QAbstractTextDocumentLayout:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAbstractTextDocumentLayout( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQAction.prg b/harbour/contrib/hbqt/qtgui/TQAction.prg
index 1c5360112c..1917469e7f 100644
--- a/harbour/contrib/hbqt/qtgui/TQAction.prg
+++ b/harbour/contrib/hbqt/qtgui/TQAction.prg
@@ -122,8 +122,7 @@ CREATE CLASS QAction INHERIT HbQtObjectHandler, QObject
 METHOD QAction:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QAction( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQActionGroup.prg b/harbour/contrib/hbqt/qtgui/TQActionGroup.prg
index 91b38fe462..3258d8e2df 100644
--- a/harbour/contrib/hbqt/qtgui/TQActionGroup.prg
+++ b/harbour/contrib/hbqt/qtgui/TQActionGroup.prg
@@ -86,8 +86,7 @@ CREATE CLASS QActionGroup INHERIT HbQtObjectHandler, QObject
 METHOD QActionGroup:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QActionGroup( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQApplication.prg b/harbour/contrib/hbqt/qtgui/TQApplication.prg
index 63936333cd..4c917a4254 100644
--- a/harbour/contrib/hbqt/qtgui/TQApplication.prg
+++ b/harbour/contrib/hbqt/qtgui/TQApplication.prg
@@ -150,8 +150,7 @@ CREATE CLASS QApplication INHERIT HbQtObjectHandler, QCoreApplication
 METHOD QApplication:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QApplication( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQBitmap.prg b/harbour/contrib/hbqt/qtgui/TQBitmap.prg
index 170ad69a0e..e9a3d026dd 100644
--- a/harbour/contrib/hbqt/qtgui/TQBitmap.prg
+++ b/harbour/contrib/hbqt/qtgui/TQBitmap.prg
@@ -78,8 +78,7 @@ CREATE CLASS QBitmap INHERIT HbQtObjectHandler, QPixmap
 METHOD QBitmap:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QBitmap( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQBoxLayout.prg b/harbour/contrib/hbqt/qtgui/TQBoxLayout.prg
index d9b4df9f27..8369318374 100644
--- a/harbour/contrib/hbqt/qtgui/TQBoxLayout.prg
+++ b/harbour/contrib/hbqt/qtgui/TQBoxLayout.prg
@@ -94,8 +94,7 @@ CREATE CLASS QBoxLayout INHERIT HbQtObjectHandler, QLayout
 METHOD QBoxLayout:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QBoxLayout( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQBrush.prg b/harbour/contrib/hbqt/qtgui/TQBrush.prg
index a12df430f8..d83bd923c0 100644
--- a/harbour/contrib/hbqt/qtgui/TQBrush.prg
+++ b/harbour/contrib/hbqt/qtgui/TQBrush.prg
@@ -88,8 +88,7 @@ CREATE CLASS QBrush INHERIT HbQtObjectHandler
 METHOD QBrush:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QBrush( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQButtonGroup.prg b/harbour/contrib/hbqt/qtgui/TQButtonGroup.prg
index db16b3e9c0..7e89cecca7 100644
--- a/harbour/contrib/hbqt/qtgui/TQButtonGroup.prg
+++ b/harbour/contrib/hbqt/qtgui/TQButtonGroup.prg
@@ -84,8 +84,7 @@ CREATE CLASS QButtonGroup INHERIT HbQtObjectHandler, QObject
 METHOD QButtonGroup:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QButtonGroup( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQCalendarWidget.prg b/harbour/contrib/hbqt/qtgui/TQCalendarWidget.prg
index 973c43a2a9..2d66d0ed63 100644
--- a/harbour/contrib/hbqt/qtgui/TQCalendarWidget.prg
+++ b/harbour/contrib/hbqt/qtgui/TQCalendarWidget.prg
@@ -112,8 +112,7 @@ CREATE CLASS QCalendarWidget INHERIT HbQtObjectHandler, QWidget
 METHOD QCalendarWidget:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QCalendarWidget( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQCheckBox.prg b/harbour/contrib/hbqt/qtgui/TQCheckBox.prg
index 19f9f98643..3e83eab4a4 100644
--- a/harbour/contrib/hbqt/qtgui/TQCheckBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQCheckBox.prg
@@ -78,8 +78,7 @@ CREATE CLASS QCheckBox INHERIT HbQtObjectHandler, QAbstractButton
 METHOD QCheckBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QCheckBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQClipboard.prg b/harbour/contrib/hbqt/qtgui/TQClipboard.prg
index a41efb1249..eebfb07377 100644
--- a/harbour/contrib/hbqt/qtgui/TQClipboard.prg
+++ b/harbour/contrib/hbqt/qtgui/TQClipboard.prg
@@ -88,8 +88,7 @@ CREATE CLASS QClipboard INHERIT HbQtObjectHandler, QObject
 METHOD QClipboard:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QClipboard( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQColor.prg b/harbour/contrib/hbqt/qtgui/TQColor.prg
index d1a4b53987..f641f20fc1 100644
--- a/harbour/contrib/hbqt/qtgui/TQColor.prg
+++ b/harbour/contrib/hbqt/qtgui/TQColor.prg
@@ -139,8 +139,7 @@ CREATE CLASS QColor INHERIT HbQtObjectHandler
 METHOD QColor:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QColor( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQColorDialog.prg b/harbour/contrib/hbqt/qtgui/TQColorDialog.prg
index baf8b3b743..1ac60de5ce 100644
--- a/harbour/contrib/hbqt/qtgui/TQColorDialog.prg
+++ b/harbour/contrib/hbqt/qtgui/TQColorDialog.prg
@@ -89,8 +89,7 @@ CREATE CLASS QColorDialog INHERIT HbQtObjectHandler, QDialog
 METHOD QColorDialog:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QColorDialog( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQComboBox.prg b/harbour/contrib/hbqt/qtgui/TQComboBox.prg
index 2a5fa86147..5c0195bd52 100644
--- a/harbour/contrib/hbqt/qtgui/TQComboBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQComboBox.prg
@@ -133,8 +133,7 @@ CREATE CLASS QComboBox INHERIT HbQtObjectHandler, QWidget
 METHOD QComboBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QComboBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQCommandLinkButton.prg b/harbour/contrib/hbqt/qtgui/TQCommandLinkButton.prg
index 373fbb44b8..b906820c09 100644
--- a/harbour/contrib/hbqt/qtgui/TQCommandLinkButton.prg
+++ b/harbour/contrib/hbqt/qtgui/TQCommandLinkButton.prg
@@ -76,8 +76,7 @@ CREATE CLASS QCommandLinkButton INHERIT HbQtObjectHandler, QPushButton
 METHOD QCommandLinkButton:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QCommandLinkButton( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQCommonStyle.prg b/harbour/contrib/hbqt/qtgui/TQCommonStyle.prg
index 4ca104e009..eba504fd35 100644
--- a/harbour/contrib/hbqt/qtgui/TQCommonStyle.prg
+++ b/harbour/contrib/hbqt/qtgui/TQCommonStyle.prg
@@ -74,8 +74,7 @@ CREATE CLASS QCommonStyle INHERIT HbQtObjectHandler, QStyle
 METHOD QCommonStyle:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QCommonStyle( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQCompleter.prg b/harbour/contrib/hbqt/qtgui/TQCompleter.prg
index 747137662d..3d0b81891b 100644
--- a/harbour/contrib/hbqt/qtgui/TQCompleter.prg
+++ b/harbour/contrib/hbqt/qtgui/TQCompleter.prg
@@ -103,8 +103,7 @@ CREATE CLASS QCompleter INHERIT HbQtObjectHandler, QObject
 METHOD QCompleter:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QCompleter( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQConicalGradient.prg b/harbour/contrib/hbqt/qtgui/TQConicalGradient.prg
index bd1b06b5c2..0912efef22 100644
--- a/harbour/contrib/hbqt/qtgui/TQConicalGradient.prg
+++ b/harbour/contrib/hbqt/qtgui/TQConicalGradient.prg
@@ -79,8 +79,7 @@ CREATE CLASS QConicalGradient INHERIT HbQtObjectHandler, QGradient
 METHOD QConicalGradient:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QConicalGradient( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQContextMenuEvent.prg b/harbour/contrib/hbqt/qtgui/TQContextMenuEvent.prg
index 450ba151bb..f0ecb25264 100644
--- a/harbour/contrib/hbqt/qtgui/TQContextMenuEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQContextMenuEvent.prg
@@ -81,8 +81,7 @@ CREATE CLASS QContextMenuEvent INHERIT HbQtObjectHandler, QInputEvent
 METHOD QContextMenuEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QContextMenuEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQCursor.prg b/harbour/contrib/hbqt/qtgui/TQCursor.prg
index 026eff9408..014d92be6f 100644
--- a/harbour/contrib/hbqt/qtgui/TQCursor.prg
+++ b/harbour/contrib/hbqt/qtgui/TQCursor.prg
@@ -83,8 +83,7 @@ CREATE CLASS QCursor INHERIT HbQtObjectHandler
 METHOD QCursor:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QCursor( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDateEdit.prg b/harbour/contrib/hbqt/qtgui/TQDateEdit.prg
index 6a8aa6981e..4b737d69c7 100644
--- a/harbour/contrib/hbqt/qtgui/TQDateEdit.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDateEdit.prg
@@ -74,8 +74,7 @@ CREATE CLASS QDateEdit INHERIT HbQtObjectHandler, QDateTimeEdit
 METHOD QDateEdit:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDateEdit( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDateTimeEdit.prg b/harbour/contrib/hbqt/qtgui/TQDateTimeEdit.prg
index 4cb3c7fbdb..3f3c063076 100644
--- a/harbour/contrib/hbqt/qtgui/TQDateTimeEdit.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDateTimeEdit.prg
@@ -118,8 +118,7 @@ CREATE CLASS QDateTimeEdit INHERIT HbQtObjectHandler, QAbstractSpinBox
 METHOD QDateTimeEdit:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDateTimeEdit( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDesktopWidget.prg b/harbour/contrib/hbqt/qtgui/TQDesktopWidget.prg
index e8890d6b1c..862c574b51 100644
--- a/harbour/contrib/hbqt/qtgui/TQDesktopWidget.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDesktopWidget.prg
@@ -86,8 +86,7 @@ CREATE CLASS QDesktopWidget INHERIT HbQtObjectHandler, QWidget
 METHOD QDesktopWidget:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDesktopWidget( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDial.prg b/harbour/contrib/hbqt/qtgui/TQDial.prg
index 76ca4652c5..a9070c7dd2 100644
--- a/harbour/contrib/hbqt/qtgui/TQDial.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDial.prg
@@ -81,8 +81,7 @@ CREATE CLASS QDial INHERIT HbQtObjectHandler, QAbstractSlider
 METHOD QDial:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDial( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDialog.prg b/harbour/contrib/hbqt/qtgui/TQDialog.prg
index 2e6c9f9d3d..4c3d65a645 100644
--- a/harbour/contrib/hbqt/qtgui/TQDialog.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDialog.prg
@@ -84,8 +84,7 @@ CREATE CLASS QDialog INHERIT HbQtObjectHandler, QWidget
 METHOD QDialog:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDialog( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDirModel.prg b/harbour/contrib/hbqt/qtgui/TQDirModel.prg
index 9f615543ab..df5518733a 100644
--- a/harbour/contrib/hbqt/qtgui/TQDirModel.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDirModel.prg
@@ -111,8 +111,7 @@ CREATE CLASS QDirModel INHERIT HbQtObjectHandler, QAbstractItemModel
 METHOD QDirModel:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDirModel( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDockWidget.prg b/harbour/contrib/hbqt/qtgui/TQDockWidget.prg
index c15e614f2a..92aba521b4 100644
--- a/harbour/contrib/hbqt/qtgui/TQDockWidget.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDockWidget.prg
@@ -86,8 +86,7 @@ CREATE CLASS QDockWidget INHERIT HbQtObjectHandler, QWidget
 METHOD QDockWidget:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDockWidget( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDoubleSpinBox.prg b/harbour/contrib/hbqt/qtgui/TQDoubleSpinBox.prg
index ac4bc6ae48..f1ed2fe870 100644
--- a/harbour/contrib/hbqt/qtgui/TQDoubleSpinBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDoubleSpinBox.prg
@@ -92,8 +92,7 @@ CREATE CLASS QDoubleSpinBox INHERIT HbQtObjectHandler, QAbstractSpinBox
 METHOD QDoubleSpinBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDoubleSpinBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDragEnterEvent.prg b/harbour/contrib/hbqt/qtgui/TQDragEnterEvent.prg
index f70e1e3d0d..478111bd1b 100644
--- a/harbour/contrib/hbqt/qtgui/TQDragEnterEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDragEnterEvent.prg
@@ -74,8 +74,7 @@ CREATE CLASS QDragEnterEvent INHERIT HbQtObjectHandler, QDragMoveEvent
 METHOD QDragEnterEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDragEnterEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDragLeaveEvent.prg b/harbour/contrib/hbqt/qtgui/TQDragLeaveEvent.prg
index e116b59729..7758df7a2e 100644
--- a/harbour/contrib/hbqt/qtgui/TQDragLeaveEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDragLeaveEvent.prg
@@ -74,8 +74,7 @@ CREATE CLASS QDragLeaveEvent INHERIT HbQtObjectHandler, QEvent
 METHOD QDragLeaveEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDragLeaveEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDragMoveEvent.prg b/harbour/contrib/hbqt/qtgui/TQDragMoveEvent.prg
index 6d89c572fe..c38b452ac9 100644
--- a/harbour/contrib/hbqt/qtgui/TQDragMoveEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDragMoveEvent.prg
@@ -79,8 +79,7 @@ CREATE CLASS QDragMoveEvent INHERIT HbQtObjectHandler, QDropEvent
 METHOD QDragMoveEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDragMoveEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQDropEvent.prg b/harbour/contrib/hbqt/qtgui/TQDropEvent.prg
index 32b463e7bf..fcbc7dd15b 100644
--- a/harbour/contrib/hbqt/qtgui/TQDropEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQDropEvent.prg
@@ -84,8 +84,7 @@ CREATE CLASS QDropEvent INHERIT HbQtObjectHandler, QEvent
 METHOD QDropEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QDropEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQErrorMessage.prg b/harbour/contrib/hbqt/qtgui/TQErrorMessage.prg
index d48eb88745..d27130167d 100644
--- a/harbour/contrib/hbqt/qtgui/TQErrorMessage.prg
+++ b/harbour/contrib/hbqt/qtgui/TQErrorMessage.prg
@@ -76,8 +76,7 @@ CREATE CLASS QErrorMessage INHERIT HbQtObjectHandler, QDialog
 METHOD QErrorMessage:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QErrorMessage( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFileDialog.prg b/harbour/contrib/hbqt/qtgui/TQFileDialog.prg
index 4423096feb..e7817f61c3 100644
--- a/harbour/contrib/hbqt/qtgui/TQFileDialog.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFileDialog.prg
@@ -119,8 +119,7 @@ CREATE CLASS QFileDialog INHERIT HbQtObjectHandler, QDialog
 METHOD QFileDialog:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFileDialog( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFileIconProvider.prg b/harbour/contrib/hbqt/qtgui/TQFileIconProvider.prg
index a920cdbcae..832f537e8f 100644
--- a/harbour/contrib/hbqt/qtgui/TQFileIconProvider.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFileIconProvider.prg
@@ -77,8 +77,7 @@ CREATE CLASS QFileIconProvider INHERIT HbQtObjectHandler
 METHOD QFileIconProvider:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFileIconProvider( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFileSystemModel.prg b/harbour/contrib/hbqt/qtgui/TQFileSystemModel.prg
index 64ea224a48..06193799c2 100644
--- a/harbour/contrib/hbqt/qtgui/TQFileSystemModel.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFileSystemModel.prg
@@ -103,8 +103,7 @@ CREATE CLASS QFileSystemModel INHERIT HbQtObjectHandler, QAbstractItemModel
 METHOD QFileSystemModel:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFileSystemModel( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFocusEvent.prg b/harbour/contrib/hbqt/qtgui/TQFocusEvent.prg
index 70ca966dbf..2b8e131443 100644
--- a/harbour/contrib/hbqt/qtgui/TQFocusEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFocusEvent.prg
@@ -77,8 +77,7 @@ CREATE CLASS QFocusEvent INHERIT HbQtObjectHandler, QEvent
 METHOD QFocusEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFocusEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFocusFrame.prg b/harbour/contrib/hbqt/qtgui/TQFocusFrame.prg
index f03ad5f859..a762ed9e7d 100644
--- a/harbour/contrib/hbqt/qtgui/TQFocusFrame.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFocusFrame.prg
@@ -76,8 +76,7 @@ CREATE CLASS QFocusFrame INHERIT HbQtObjectHandler, QWidget
 METHOD QFocusFrame:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFocusFrame( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFont.prg b/harbour/contrib/hbqt/qtgui/TQFont.prg
index abe632c53e..86d79fcef9 100644
--- a/harbour/contrib/hbqt/qtgui/TQFont.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFont.prg
@@ -132,8 +132,7 @@ CREATE CLASS QFont INHERIT HbQtObjectHandler
 METHOD QFont:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFont( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFontComboBox.prg b/harbour/contrib/hbqt/qtgui/TQFontComboBox.prg
index a572a8672d..22da96d44f 100644
--- a/harbour/contrib/hbqt/qtgui/TQFontComboBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFontComboBox.prg
@@ -80,8 +80,7 @@ CREATE CLASS QFontComboBox INHERIT HbQtObjectHandler, QComboBox
 METHOD QFontComboBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFontComboBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFontDatabase.prg b/harbour/contrib/hbqt/qtgui/TQFontDatabase.prg
index 893b625080..01c10ea4fe 100644
--- a/harbour/contrib/hbqt/qtgui/TQFontDatabase.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFontDatabase.prg
@@ -94,8 +94,7 @@ CREATE CLASS QFontDatabase INHERIT HbQtObjectHandler
 METHOD QFontDatabase:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFontDatabase( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFontDialog.prg b/harbour/contrib/hbqt/qtgui/TQFontDialog.prg
index 73d9090e91..c51adf1bc9 100644
--- a/harbour/contrib/hbqt/qtgui/TQFontDialog.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFontDialog.prg
@@ -86,8 +86,7 @@ CREATE CLASS QFontDialog INHERIT HbQtObjectHandler, QDialog
 METHOD QFontDialog:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFontDialog( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFontInfo.prg b/harbour/contrib/hbqt/qtgui/TQFontInfo.prg
index 7d85007722..e51d2f0920 100644
--- a/harbour/contrib/hbqt/qtgui/TQFontInfo.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFontInfo.prg
@@ -86,8 +86,7 @@ CREATE CLASS QFontInfo INHERIT HbQtObjectHandler
 METHOD QFontInfo:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFontInfo( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFontMetrics.prg b/harbour/contrib/hbqt/qtgui/TQFontMetrics.prg
index 93e9bfa619..878c2f2112 100644
--- a/harbour/contrib/hbqt/qtgui/TQFontMetrics.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFontMetrics.prg
@@ -100,8 +100,7 @@ CREATE CLASS QFontMetrics INHERIT HbQtObjectHandler
 METHOD QFontMetrics:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFontMetrics( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFontMetricsF.prg b/harbour/contrib/hbqt/qtgui/TQFontMetricsF.prg
index 66ac3c5a15..481b85990a 100644
--- a/harbour/contrib/hbqt/qtgui/TQFontMetricsF.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFontMetricsF.prg
@@ -99,8 +99,7 @@ CREATE CLASS QFontMetricsF INHERIT HbQtObjectHandler
 METHOD QFontMetricsF:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFontMetricsF( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFormLayout.prg b/harbour/contrib/hbqt/qtgui/TQFormLayout.prg
index 4c79b7ab08..d4d8d1b366 100644
--- a/harbour/contrib/hbqt/qtgui/TQFormLayout.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFormLayout.prg
@@ -110,8 +110,7 @@ CREATE CLASS QFormLayout INHERIT HbQtObjectHandler, QLayout
 METHOD QFormLayout:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFormLayout( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQFrame.prg b/harbour/contrib/hbqt/qtgui/TQFrame.prg
index ae842b5f96..99e8078283 100644
--- a/harbour/contrib/hbqt/qtgui/TQFrame.prg
+++ b/harbour/contrib/hbqt/qtgui/TQFrame.prg
@@ -87,8 +87,7 @@ CREATE CLASS QFrame INHERIT HbQtObjectHandler, QWidget
 METHOD QFrame:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFrame( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQGradient.prg b/harbour/contrib/hbqt/qtgui/TQGradient.prg
index 92388cc836..5e9d072832 100644
--- a/harbour/contrib/hbqt/qtgui/TQGradient.prg
+++ b/harbour/contrib/hbqt/qtgui/TQGradient.prg
@@ -80,8 +80,7 @@ CREATE CLASS QGradient INHERIT HbQtObjectHandler
 METHOD QGradient:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QGradient( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQGridLayout.prg b/harbour/contrib/hbqt/qtgui/TQGridLayout.prg
index 2eb25efc20..e5a5d4e10f 100644
--- a/harbour/contrib/hbqt/qtgui/TQGridLayout.prg
+++ b/harbour/contrib/hbqt/qtgui/TQGridLayout.prg
@@ -100,8 +100,7 @@ CREATE CLASS QGridLayout INHERIT HbQtObjectHandler, QLayout
 METHOD QGridLayout:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QGridLayout( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQGroupBox.prg b/harbour/contrib/hbqt/qtgui/TQGroupBox.prg
index 7ba4853192..28a3b9ad54 100644
--- a/harbour/contrib/hbqt/qtgui/TQGroupBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQGroupBox.prg
@@ -84,8 +84,7 @@ CREATE CLASS QGroupBox INHERIT HbQtObjectHandler, QWidget
 METHOD QGroupBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QGroupBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQHBoxLayout.prg b/harbour/contrib/hbqt/qtgui/TQHBoxLayout.prg
index 1b00209f8e..f267749361 100644
--- a/harbour/contrib/hbqt/qtgui/TQHBoxLayout.prg
+++ b/harbour/contrib/hbqt/qtgui/TQHBoxLayout.prg
@@ -74,8 +74,7 @@ CREATE CLASS QHBoxLayout INHERIT HbQtObjectHandler, QBoxLayout
 METHOD QHBoxLayout:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QHBoxLayout( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQHeaderView.prg b/harbour/contrib/hbqt/qtgui/TQHeaderView.prg
index df4f883976..05da2ce14c 100644
--- a/harbour/contrib/hbqt/qtgui/TQHeaderView.prg
+++ b/harbour/contrib/hbqt/qtgui/TQHeaderView.prg
@@ -131,8 +131,7 @@ CREATE CLASS QHeaderView INHERIT HbQtObjectHandler, QAbstractItemView
 METHOD QHeaderView:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QHeaderView( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQHelpEvent.prg b/harbour/contrib/hbqt/qtgui/TQHelpEvent.prg
index a6ee88546f..2bbd6bcc91 100644
--- a/harbour/contrib/hbqt/qtgui/TQHelpEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQHelpEvent.prg
@@ -80,8 +80,7 @@ CREATE CLASS QHelpEvent INHERIT HbQtObjectHandler
 METHOD QHelpEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QHelpEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQIcon.prg b/harbour/contrib/hbqt/qtgui/TQIcon.prg
index 3291d8f1db..a369f3afc9 100644
--- a/harbour/contrib/hbqt/qtgui/TQIcon.prg
+++ b/harbour/contrib/hbqt/qtgui/TQIcon.prg
@@ -84,8 +84,7 @@ CREATE CLASS QIcon INHERIT HbQtObjectHandler
 METHOD QIcon:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QIcon( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQImage.prg b/harbour/contrib/hbqt/qtgui/TQImage.prg
index eae404384a..c26bc6c463 100644
--- a/harbour/contrib/hbqt/qtgui/TQImage.prg
+++ b/harbour/contrib/hbqt/qtgui/TQImage.prg
@@ -134,8 +134,7 @@ CREATE CLASS QImage INHERIT HbQtObjectHandler
 METHOD QImage:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QImage( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQImageReader.prg b/harbour/contrib/hbqt/qtgui/TQImageReader.prg
index aa9d887c68..e80b16cd61 100644
--- a/harbour/contrib/hbqt/qtgui/TQImageReader.prg
+++ b/harbour/contrib/hbqt/qtgui/TQImageReader.prg
@@ -112,8 +112,7 @@ CREATE CLASS QImageReader INHERIT HbQtObjectHandler
 METHOD QImageReader:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QImageReader( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQImageWriter.prg b/harbour/contrib/hbqt/qtgui/TQImageWriter.prg
index f7125b0cd4..70eb2aa183 100644
--- a/harbour/contrib/hbqt/qtgui/TQImageWriter.prg
+++ b/harbour/contrib/hbqt/qtgui/TQImageWriter.prg
@@ -92,8 +92,7 @@ CREATE CLASS QImageWriter INHERIT HbQtObjectHandler
 METHOD QImageWriter:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QImageWriter( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQInputContext.prg b/harbour/contrib/hbqt/qtgui/TQInputContext.prg
index b9b81ef2e9..0d4d58afc3 100644
--- a/harbour/contrib/hbqt/qtgui/TQInputContext.prg
+++ b/harbour/contrib/hbqt/qtgui/TQInputContext.prg
@@ -85,8 +85,7 @@ CREATE CLASS QInputContext INHERIT HbQtObjectHandler, QObject
 METHOD QInputContext:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QInputContext( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQInputDialog.prg b/harbour/contrib/hbqt/qtgui/TQInputDialog.prg
index bdb6f6024c..8a9c689e23 100644
--- a/harbour/contrib/hbqt/qtgui/TQInputDialog.prg
+++ b/harbour/contrib/hbqt/qtgui/TQInputDialog.prg
@@ -118,8 +118,7 @@ CREATE CLASS QInputDialog INHERIT HbQtObjectHandler, QDialog
 METHOD QInputDialog:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QInputDialog( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQInputEvent.prg b/harbour/contrib/hbqt/qtgui/TQInputEvent.prg
index f7ca529982..a205019b7a 100644
--- a/harbour/contrib/hbqt/qtgui/TQInputEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQInputEvent.prg
@@ -75,8 +75,7 @@ CREATE CLASS QInputEvent INHERIT HbQtObjectHandler, QEvent
 METHOD QInputEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QInputEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQInputMethodEvent.prg b/harbour/contrib/hbqt/qtgui/TQInputMethodEvent.prg
index cbba31a1cd..39f0861428 100644
--- a/harbour/contrib/hbqt/qtgui/TQInputMethodEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQInputMethodEvent.prg
@@ -79,8 +79,7 @@ CREATE CLASS QInputMethodEvent INHERIT HbQtObjectHandler, QEvent
 METHOD QInputMethodEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QInputMethodEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQItemSelection.prg b/harbour/contrib/hbqt/qtgui/TQItemSelection.prg
index 50748eee3d..caa4be177d 100644
--- a/harbour/contrib/hbqt/qtgui/TQItemSelection.prg
+++ b/harbour/contrib/hbqt/qtgui/TQItemSelection.prg
@@ -77,8 +77,7 @@ CREATE CLASS QItemSelection INHERIT HbQtObjectHandler, QList
 METHOD QItemSelection:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QItemSelection( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQItemSelectionModel.prg b/harbour/contrib/hbqt/qtgui/TQItemSelectionModel.prg
index cc8a260c59..c2e39fb648 100644
--- a/harbour/contrib/hbqt/qtgui/TQItemSelectionModel.prg
+++ b/harbour/contrib/hbqt/qtgui/TQItemSelectionModel.prg
@@ -89,8 +89,7 @@ CREATE CLASS QItemSelectionModel INHERIT HbQtObjectHandler, QObject
 METHOD QItemSelectionModel:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QItemSelectionModel( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQKeyEvent.prg b/harbour/contrib/hbqt/qtgui/TQKeyEvent.prg
index c588de85b2..0111f4ff8f 100644
--- a/harbour/contrib/hbqt/qtgui/TQKeyEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQKeyEvent.prg
@@ -83,8 +83,7 @@ CREATE CLASS QKeyEvent INHERIT HbQtObjectHandler, QInputEvent
 METHOD QKeyEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QKeyEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQKeySequence.prg b/harbour/contrib/hbqt/qtgui/TQKeySequence.prg
index d68adfd233..d96cdcdb15 100644
--- a/harbour/contrib/hbqt/qtgui/TQKeySequence.prg
+++ b/harbour/contrib/hbqt/qtgui/TQKeySequence.prg
@@ -80,8 +80,7 @@ CREATE CLASS QKeySequence INHERIT HbQtObjectHandler
 METHOD QKeySequence:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QKeySequence( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQLCDNumber.prg b/harbour/contrib/hbqt/qtgui/TQLCDNumber.prg
index 0f6e85f23e..d5cc8978ac 100644
--- a/harbour/contrib/hbqt/qtgui/TQLCDNumber.prg
+++ b/harbour/contrib/hbqt/qtgui/TQLCDNumber.prg
@@ -93,8 +93,7 @@ CREATE CLASS QLCDNumber INHERIT HbQtObjectHandler, QFrame
 METHOD QLCDNumber:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QLCDNumber( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQLabel.prg b/harbour/contrib/hbqt/qtgui/TQLabel.prg
index 84087135c8..5dfe9bd643 100644
--- a/harbour/contrib/hbqt/qtgui/TQLabel.prg
+++ b/harbour/contrib/hbqt/qtgui/TQLabel.prg
@@ -103,8 +103,7 @@ CREATE CLASS QLabel INHERIT HbQtObjectHandler, QFrame
 METHOD QLabel:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QLabel( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQLayout.prg b/harbour/contrib/hbqt/qtgui/TQLayout.prg
index 36b06e2c06..7432785605 100644
--- a/harbour/contrib/hbqt/qtgui/TQLayout.prg
+++ b/harbour/contrib/hbqt/qtgui/TQLayout.prg
@@ -103,8 +103,7 @@ CREATE CLASS QLayout INHERIT HbQtObjectHandler, QObject, QLayoutItem
 METHOD QLayout:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QLayout( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQLayoutItem.prg b/harbour/contrib/hbqt/qtgui/TQLayoutItem.prg
index 97fad8bc9a..858a993b6f 100644
--- a/harbour/contrib/hbqt/qtgui/TQLayoutItem.prg
+++ b/harbour/contrib/hbqt/qtgui/TQLayoutItem.prg
@@ -91,8 +91,7 @@ CREATE CLASS QLayoutItem INHERIT HbQtObjectHandler
 METHOD QLayoutItem:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QLayoutItem( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQLineEdit.prg b/harbour/contrib/hbqt/qtgui/TQLineEdit.prg
index f4be294257..e37eabeba0 100644
--- a/harbour/contrib/hbqt/qtgui/TQLineEdit.prg
+++ b/harbour/contrib/hbqt/qtgui/TQLineEdit.prg
@@ -129,8 +129,7 @@ CREATE CLASS QLineEdit INHERIT HbQtObjectHandler, QWidget
 METHOD QLineEdit:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QLineEdit( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQLinearGradient.prg b/harbour/contrib/hbqt/qtgui/TQLinearGradient.prg
index eb49c8ca3e..977b85668f 100644
--- a/harbour/contrib/hbqt/qtgui/TQLinearGradient.prg
+++ b/harbour/contrib/hbqt/qtgui/TQLinearGradient.prg
@@ -80,8 +80,7 @@ CREATE CLASS QLinearGradient INHERIT HbQtObjectHandler, QGradient
 METHOD QLinearGradient:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QLinearGradient( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQListView.prg b/harbour/contrib/hbqt/qtgui/TQListView.prg
index 9c6fcc51c3..45684b69ef 100644
--- a/harbour/contrib/hbqt/qtgui/TQListView.prg
+++ b/harbour/contrib/hbqt/qtgui/TQListView.prg
@@ -103,8 +103,7 @@ CREATE CLASS QListView INHERIT HbQtObjectHandler, QAbstractItemView
 METHOD QListView:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QListView( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQListWidget.prg b/harbour/contrib/hbqt/qtgui/TQListWidget.prg
index 55b58568cb..eeee346f2e 100644
--- a/harbour/contrib/hbqt/qtgui/TQListWidget.prg
+++ b/harbour/contrib/hbqt/qtgui/TQListWidget.prg
@@ -104,8 +104,7 @@ CREATE CLASS QListWidget INHERIT HbQtObjectHandler, QListView
 METHOD QListWidget:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QListWidget( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQListWidgetItem.prg b/harbour/contrib/hbqt/qtgui/TQListWidgetItem.prg
index 8bca6203a5..7bbac5be70 100644
--- a/harbour/contrib/hbqt/qtgui/TQListWidgetItem.prg
+++ b/harbour/contrib/hbqt/qtgui/TQListWidgetItem.prg
@@ -109,8 +109,7 @@ CREATE CLASS QListWidgetItem INHERIT HbQtObjectHandler, QWidget
 METHOD QListWidgetItem:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QListWidgetItem( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQMainWindow.prg b/harbour/contrib/hbqt/qtgui/TQMainWindow.prg
index 19356dbc3a..85435c3934 100644
--- a/harbour/contrib/hbqt/qtgui/TQMainWindow.prg
+++ b/harbour/contrib/hbqt/qtgui/TQMainWindow.prg
@@ -122,8 +122,7 @@ CREATE CLASS QMainWindow INHERIT HbQtObjectHandler, QWidget
 METHOD QMainWindow:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QMainWindow( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQMatrix.prg b/harbour/contrib/hbqt/qtgui/TQMatrix.prg
index 78138297cd..a19ea9d155 100644
--- a/harbour/contrib/hbqt/qtgui/TQMatrix.prg
+++ b/harbour/contrib/hbqt/qtgui/TQMatrix.prg
@@ -103,8 +103,7 @@ CREATE CLASS QMatrix INHERIT HbQtObjectHandler
 METHOD QMatrix:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QMatrix( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQMenu.prg b/harbour/contrib/hbqt/qtgui/TQMenu.prg
index 70e47ed592..18d269a4a4 100644
--- a/harbour/contrib/hbqt/qtgui/TQMenu.prg
+++ b/harbour/contrib/hbqt/qtgui/TQMenu.prg
@@ -107,8 +107,7 @@ CREATE CLASS QMenu INHERIT HbQtObjectHandler, QWidget
 METHOD QMenu:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QMenu( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQMenuBar.prg b/harbour/contrib/hbqt/qtgui/TQMenuBar.prg
index 9743bf9326..de054e66d6 100644
--- a/harbour/contrib/hbqt/qtgui/TQMenuBar.prg
+++ b/harbour/contrib/hbqt/qtgui/TQMenuBar.prg
@@ -88,8 +88,7 @@ CREATE CLASS QMenuBar INHERIT HbQtObjectHandler, QWidget
 METHOD QMenuBar:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QMenuBar( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQMessageBox.prg b/harbour/contrib/hbqt/qtgui/TQMessageBox.prg
index b3fe95d089..48ecb0de6f 100644
--- a/harbour/contrib/hbqt/qtgui/TQMessageBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQMessageBox.prg
@@ -112,8 +112,7 @@ CREATE CLASS QMessageBox INHERIT HbQtObjectHandler, QDialog
 METHOD QMessageBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QMessageBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQMouseEvent.prg b/harbour/contrib/hbqt/qtgui/TQMouseEvent.prg
index ca00d1a5d4..037f038931 100644
--- a/harbour/contrib/hbqt/qtgui/TQMouseEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQMouseEvent.prg
@@ -83,8 +83,7 @@ CREATE CLASS QMouseEvent INHERIT HbQtObjectHandler, QInputEvent
 METHOD QMouseEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QMouseEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQMoveEvent.prg b/harbour/contrib/hbqt/qtgui/TQMoveEvent.prg
index eb46a25e39..777211dc05 100644
--- a/harbour/contrib/hbqt/qtgui/TQMoveEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQMoveEvent.prg
@@ -76,8 +76,7 @@ CREATE CLASS QMoveEvent INHERIT HbQtObjectHandler, QEvent
 METHOD QMoveEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QMoveEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQMovie.prg b/harbour/contrib/hbqt/qtgui/TQMovie.prg
index 7e3f0cb46a..33d6908bbb 100644
--- a/harbour/contrib/hbqt/qtgui/TQMovie.prg
+++ b/harbour/contrib/hbqt/qtgui/TQMovie.prg
@@ -102,8 +102,7 @@ CREATE CLASS QMovie INHERIT HbQtObjectHandler, QObject
 METHOD QMovie:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QMovie( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPageSetupDialog.prg b/harbour/contrib/hbqt/qtgui/TQPageSetupDialog.prg
index b0c071df3c..3b59c39f54 100644
--- a/harbour/contrib/hbqt/qtgui/TQPageSetupDialog.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPageSetupDialog.prg
@@ -82,8 +82,7 @@ CREATE CLASS QPageSetupDialog INHERIT HbQtObjectHandler, QDialog
 METHOD QPageSetupDialog:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPageSetupDialog( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPaintDevice.prg b/harbour/contrib/hbqt/qtgui/TQPaintDevice.prg
index 8ae8e6fd09..d40010b605 100644
--- a/harbour/contrib/hbqt/qtgui/TQPaintDevice.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPaintDevice.prg
@@ -86,8 +86,7 @@ CREATE CLASS QPaintDevice INHERIT HbQtObjectHandler
 METHOD QPaintDevice:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPaintDevice( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPaintEvent.prg b/harbour/contrib/hbqt/qtgui/TQPaintEvent.prg
index 6186b3ba16..7eb85e8bfa 100644
--- a/harbour/contrib/hbqt/qtgui/TQPaintEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPaintEvent.prg
@@ -76,8 +76,7 @@ CREATE CLASS QPaintEvent INHERIT HbQtObjectHandler, QEvent
 METHOD QPaintEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPaintEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPainter.prg b/harbour/contrib/hbqt/qtgui/TQPainter.prg
index 81af60af1e..1c3f35e0fb 100644
--- a/harbour/contrib/hbqt/qtgui/TQPainter.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPainter.prg
@@ -256,8 +256,7 @@ CREATE CLASS QPainter INHERIT HbQtObjectHandler
 METHOD QPainter:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPainter( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPainterPath.prg b/harbour/contrib/hbqt/qtgui/TQPainterPath.prg
index ad98a01277..0c25684ab2 100644
--- a/harbour/contrib/hbqt/qtgui/TQPainterPath.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPainterPath.prg
@@ -125,8 +125,7 @@ CREATE CLASS QPainterPath INHERIT HbQtObjectHandler
 METHOD QPainterPath:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPainterPath( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPalette.prg b/harbour/contrib/hbqt/qtgui/TQPalette.prg
index 2e6eed9728..dfeb45c19e 100644
--- a/harbour/contrib/hbqt/qtgui/TQPalette.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPalette.prg
@@ -109,8 +109,7 @@ CREATE CLASS QPalette INHERIT HbQtObjectHandler
 METHOD QPalette:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPalette( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPen.prg b/harbour/contrib/hbqt/qtgui/TQPen.prg
index 38e3844624..d8c17c6962 100644
--- a/harbour/contrib/hbqt/qtgui/TQPen.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPen.prg
@@ -95,8 +95,7 @@ CREATE CLASS QPen INHERIT HbQtObjectHandler
 METHOD QPen:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPen( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPicture.prg b/harbour/contrib/hbqt/qtgui/TQPicture.prg
index cb51bc8bbd..1af0506179 100644
--- a/harbour/contrib/hbqt/qtgui/TQPicture.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPicture.prg
@@ -85,8 +85,7 @@ CREATE CLASS QPicture INHERIT HbQtObjectHandler, QPaintDevice
 METHOD QPicture:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPicture( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPixmap.prg b/harbour/contrib/hbqt/qtgui/TQPixmap.prg
index 753dc28fe4..fa3fcf56cf 100644
--- a/harbour/contrib/hbqt/qtgui/TQPixmap.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPixmap.prg
@@ -114,8 +114,7 @@ CREATE CLASS QPixmap INHERIT HbQtObjectHandler, QPaintDevice
 METHOD QPixmap:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPixmap( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPlainTextEdit.prg b/harbour/contrib/hbqt/qtgui/TQPlainTextEdit.prg
index 84cccb9ff7..b1482b19c8 100644
--- a/harbour/contrib/hbqt/qtgui/TQPlainTextEdit.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPlainTextEdit.prg
@@ -131,8 +131,7 @@ CREATE CLASS QPlainTextEdit INHERIT HbQtObjectHandler, QAbstractScrollArea
 METHOD QPlainTextEdit:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPlainTextEdit( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPolygon.prg b/harbour/contrib/hbqt/qtgui/TQPolygon.prg
index 4c36d6f524..d65fdf0408 100644
--- a/harbour/contrib/hbqt/qtgui/TQPolygon.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPolygon.prg
@@ -87,8 +87,7 @@ CREATE CLASS QPolygon INHERIT HbQtObjectHandler
 METHOD QPolygon:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPolygon( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPolygonF.prg b/harbour/contrib/hbqt/qtgui/TQPolygonF.prg
index a7b76683f7..e8e4c9ced5 100644
--- a/harbour/contrib/hbqt/qtgui/TQPolygonF.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPolygonF.prg
@@ -83,8 +83,7 @@ CREATE CLASS QPolygonF INHERIT HbQtObjectHandler
 METHOD QPolygonF:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPolygonF( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPrintDialog.prg b/harbour/contrib/hbqt/qtgui/TQPrintDialog.prg
index e4b5c2eec0..6d863511a2 100644
--- a/harbour/contrib/hbqt/qtgui/TQPrintDialog.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPrintDialog.prg
@@ -83,8 +83,7 @@ CREATE CLASS QPrintDialog INHERIT HbQtObjectHandler, QAbstractPrintDialog
 METHOD QPrintDialog:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPrintDialog( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPrintEngine.prg b/harbour/contrib/hbqt/qtgui/TQPrintEngine.prg
index 84d757d5b3..2e1cbe015a 100644
--- a/harbour/contrib/hbqt/qtgui/TQPrintEngine.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPrintEngine.prg
@@ -80,8 +80,7 @@ CREATE CLASS QPrintEngine INHERIT HbQtObjectHandler
 METHOD QPrintEngine:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPrintEngine( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPrintPreviewDialog.prg b/harbour/contrib/hbqt/qtgui/TQPrintPreviewDialog.prg
index befc892959..6076c33361 100644
--- a/harbour/contrib/hbqt/qtgui/TQPrintPreviewDialog.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPrintPreviewDialog.prg
@@ -76,8 +76,7 @@ CREATE CLASS QPrintPreviewDialog INHERIT HbQtObjectHandler, QDialog
 METHOD QPrintPreviewDialog:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPrintPreviewDialog( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPrinter.prg b/harbour/contrib/hbqt/qtgui/TQPrinter.prg
index be1b832005..d9d5afefe1 100644
--- a/harbour/contrib/hbqt/qtgui/TQPrinter.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPrinter.prg
@@ -129,8 +129,7 @@ CREATE CLASS QPrinter INHERIT HbQtObjectHandler, QPaintDevice
 METHOD QPrinter:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPrinter( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQProgressBar.prg b/harbour/contrib/hbqt/qtgui/TQProgressBar.prg
index 9c906d12b8..35942df4e0 100644
--- a/harbour/contrib/hbqt/qtgui/TQProgressBar.prg
+++ b/harbour/contrib/hbqt/qtgui/TQProgressBar.prg
@@ -95,8 +95,7 @@ CREATE CLASS QProgressBar INHERIT HbQtObjectHandler, QWidget
 METHOD QProgressBar:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QProgressBar( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQProgressDialog.prg b/harbour/contrib/hbqt/qtgui/TQProgressDialog.prg
index e78ac7be83..45a6820cdf 100644
--- a/harbour/contrib/hbqt/qtgui/TQProgressDialog.prg
+++ b/harbour/contrib/hbqt/qtgui/TQProgressDialog.prg
@@ -98,8 +98,7 @@ CREATE CLASS QProgressDialog INHERIT HbQtObjectHandler, QDialog
 METHOD QProgressDialog:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QProgressDialog( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQPushButton.prg b/harbour/contrib/hbqt/qtgui/TQPushButton.prg
index 2ee540a503..c7048ee8bc 100644
--- a/harbour/contrib/hbqt/qtgui/TQPushButton.prg
+++ b/harbour/contrib/hbqt/qtgui/TQPushButton.prg
@@ -83,8 +83,7 @@ CREATE CLASS QPushButton INHERIT HbQtObjectHandler, QAbstractButton
 METHOD QPushButton:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QPushButton( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQRadialGradient.prg b/harbour/contrib/hbqt/qtgui/TQRadialGradient.prg
index edcab7d874..5a16590298 100644
--- a/harbour/contrib/hbqt/qtgui/TQRadialGradient.prg
+++ b/harbour/contrib/hbqt/qtgui/TQRadialGradient.prg
@@ -82,8 +82,7 @@ CREATE CLASS QRadialGradient INHERIT HbQtObjectHandler, QGradient
 METHOD QRadialGradient:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QRadialGradient( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQRadioButton.prg b/harbour/contrib/hbqt/qtgui/TQRadioButton.prg
index 6f862ae099..cf88b24820 100644
--- a/harbour/contrib/hbqt/qtgui/TQRadioButton.prg
+++ b/harbour/contrib/hbqt/qtgui/TQRadioButton.prg
@@ -74,8 +74,7 @@ CREATE CLASS QRadioButton INHERIT HbQtObjectHandler, QAbstractButton
 METHOD QRadioButton:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QRadioButton( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQRegion.prg b/harbour/contrib/hbqt/qtgui/TQRegion.prg
index c00d207f8a..7c96b242c8 100644
--- a/harbour/contrib/hbqt/qtgui/TQRegion.prg
+++ b/harbour/contrib/hbqt/qtgui/TQRegion.prg
@@ -92,8 +92,7 @@ CREATE CLASS QRegion INHERIT HbQtObjectHandler
 METHOD QRegion:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QRegion( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQResizeEvent.prg b/harbour/contrib/hbqt/qtgui/TQResizeEvent.prg
index 1ff1e50541..bc68a515b5 100644
--- a/harbour/contrib/hbqt/qtgui/TQResizeEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQResizeEvent.prg
@@ -76,8 +76,7 @@ CREATE CLASS QResizeEvent INHERIT HbQtObjectHandler, QEvent
 METHOD QResizeEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QResizeEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQScrollArea.prg b/harbour/contrib/hbqt/qtgui/TQScrollArea.prg
index deef0c9ce9..c323de1802 100644
--- a/harbour/contrib/hbqt/qtgui/TQScrollArea.prg
+++ b/harbour/contrib/hbqt/qtgui/TQScrollArea.prg
@@ -83,8 +83,7 @@ CREATE CLASS QScrollArea INHERIT HbQtObjectHandler, QAbstractScrollArea
 METHOD QScrollArea:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QScrollArea( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQScrollBar.prg b/harbour/contrib/hbqt/qtgui/TQScrollBar.prg
index abcdeb4b65..ddc742ab44 100644
--- a/harbour/contrib/hbqt/qtgui/TQScrollBar.prg
+++ b/harbour/contrib/hbqt/qtgui/TQScrollBar.prg
@@ -74,8 +74,7 @@ CREATE CLASS QScrollBar INHERIT HbQtObjectHandler, QAbstractSlider
 METHOD QScrollBar:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QScrollBar( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQSessionManager.prg b/harbour/contrib/hbqt/qtgui/TQSessionManager.prg
index 9f66bc54e4..2adf7932f0 100644
--- a/harbour/contrib/hbqt/qtgui/TQSessionManager.prg
+++ b/harbour/contrib/hbqt/qtgui/TQSessionManager.prg
@@ -90,8 +90,7 @@ CREATE CLASS QSessionManager INHERIT HbQtObjectHandler, QObject
 METHOD QSessionManager:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSessionManager( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQSizeGrip.prg b/harbour/contrib/hbqt/qtgui/TQSizeGrip.prg
index 2c0aabfc86..d2d1866305 100644
--- a/harbour/contrib/hbqt/qtgui/TQSizeGrip.prg
+++ b/harbour/contrib/hbqt/qtgui/TQSizeGrip.prg
@@ -74,8 +74,7 @@ CREATE CLASS QSizeGrip INHERIT HbQtObjectHandler, QWidget
 METHOD QSizeGrip:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSizeGrip( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQSizePolicy.prg b/harbour/contrib/hbqt/qtgui/TQSizePolicy.prg
index f450ab5a93..75684d4450 100644
--- a/harbour/contrib/hbqt/qtgui/TQSizePolicy.prg
+++ b/harbour/contrib/hbqt/qtgui/TQSizePolicy.prg
@@ -88,8 +88,7 @@ CREATE CLASS QSizePolicy INHERIT HbQtObjectHandler
 METHOD QSizePolicy:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSizePolicy( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQSlider.prg b/harbour/contrib/hbqt/qtgui/TQSlider.prg
index 78021d9379..2a2e692e75 100644
--- a/harbour/contrib/hbqt/qtgui/TQSlider.prg
+++ b/harbour/contrib/hbqt/qtgui/TQSlider.prg
@@ -78,8 +78,7 @@ CREATE CLASS QSlider INHERIT HbQtObjectHandler, QAbstractSlider
 METHOD QSlider:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSlider( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQSound.prg b/harbour/contrib/hbqt/qtgui/TQSound.prg
index 2a9be3556b..28a7104bcf 100644
--- a/harbour/contrib/hbqt/qtgui/TQSound.prg
+++ b/harbour/contrib/hbqt/qtgui/TQSound.prg
@@ -81,8 +81,7 @@ CREATE CLASS QSound INHERIT HbQtObjectHandler
 METHOD QSound:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSound( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQSpacerItem.prg b/harbour/contrib/hbqt/qtgui/TQSpacerItem.prg
index 5918b73915..0041ed5226 100644
--- a/harbour/contrib/hbqt/qtgui/TQSpacerItem.prg
+++ b/harbour/contrib/hbqt/qtgui/TQSpacerItem.prg
@@ -77,8 +77,7 @@ CREATE CLASS QSpacerItem INHERIT HbQtObjectHandler, QLayoutItem
 METHOD QSpacerItem:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSpacerItem( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQSpinBox.prg b/harbour/contrib/hbqt/qtgui/TQSpinBox.prg
index 93473162c4..d44b354fa4 100644
--- a/harbour/contrib/hbqt/qtgui/TQSpinBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQSpinBox.prg
@@ -88,8 +88,7 @@ CREATE CLASS QSpinBox INHERIT HbQtObjectHandler, QAbstractSpinBox
 METHOD QSpinBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSpinBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQSplashScreen.prg b/harbour/contrib/hbqt/qtgui/TQSplashScreen.prg
index 5f0c4df06a..fe31cdee0c 100644
--- a/harbour/contrib/hbqt/qtgui/TQSplashScreen.prg
+++ b/harbour/contrib/hbqt/qtgui/TQSplashScreen.prg
@@ -80,8 +80,7 @@ CREATE CLASS QSplashScreen INHERIT HbQtObjectHandler, QWidget
 METHOD QSplashScreen:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSplashScreen( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQSplitter.prg b/harbour/contrib/hbqt/qtgui/TQSplitter.prg
index ae8d38edb1..7f3fc9456b 100644
--- a/harbour/contrib/hbqt/qtgui/TQSplitter.prg
+++ b/harbour/contrib/hbqt/qtgui/TQSplitter.prg
@@ -95,8 +95,7 @@ CREATE CLASS QSplitter INHERIT HbQtObjectHandler, QFrame
 METHOD QSplitter:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSplitter( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStandardItem.prg b/harbour/contrib/hbqt/qtgui/TQStandardItem.prg
index 101dda6f89..ed37581eca 100644
--- a/harbour/contrib/hbqt/qtgui/TQStandardItem.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStandardItem.prg
@@ -145,8 +145,7 @@ CREATE CLASS QStandardItem INHERIT HbQtObjectHandler
 METHOD QStandardItem:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStandardItem( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStandardItemModel.prg b/harbour/contrib/hbqt/qtgui/TQStandardItemModel.prg
index 9aa7649238..4a4aa6df7a 100644
--- a/harbour/contrib/hbqt/qtgui/TQStandardItemModel.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStandardItemModel.prg
@@ -100,8 +100,7 @@ CREATE CLASS QStandardItemModel INHERIT HbQtObjectHandler, QAbstractItemModeL
 METHOD QStandardItemModel:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStandardItemModel( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStatusBar.prg b/harbour/contrib/hbqt/qtgui/TQStatusBar.prg
index e99644fc55..347eeb15e2 100644
--- a/harbour/contrib/hbqt/qtgui/TQStatusBar.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStatusBar.prg
@@ -84,8 +84,7 @@ CREATE CLASS QStatusBar INHERIT HbQtObjectHandler, QWidget
 METHOD QStatusBar:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStatusBar( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStringListModel.prg b/harbour/contrib/hbqt/qtgui/TQStringListModel.prg
index 1d568065bc..af23bede59 100644
--- a/harbour/contrib/hbqt/qtgui/TQStringListModel.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStringListModel.prg
@@ -82,8 +82,7 @@ CREATE CLASS QStringListModel INHERIT HbQtObjectHandler, QAbstractListModel
 METHOD QStringListModel:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStringListModel( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyle.prg b/harbour/contrib/hbqt/qtgui/TQStyle.prg
index 9ebfd9caa0..5e48b6d8e8 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyle.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyle.prg
@@ -103,8 +103,7 @@ CREATE CLASS QStyle INHERIT HbQtObjectHandler, QObject
 METHOD QStyle:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyle( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleFactory.prg b/harbour/contrib/hbqt/qtgui/TQStyleFactory.prg
index c73574e399..bc8fd95691 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleFactory.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleFactory.prg
@@ -76,8 +76,7 @@ CREATE CLASS QStyleFactory INHERIT HbQtObjectHandler
 METHOD QStyleFactory:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleFactory( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleHintReturn.prg b/harbour/contrib/hbqt/qtgui/TQStyleHintReturn.prg
index 5ad07b650b..7dfb0e9bfa 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleHintReturn.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleHintReturn.prg
@@ -74,8 +74,7 @@ CREATE CLASS QStyleHintReturn INHERIT HbQtObjectHandler
 METHOD QStyleHintReturn:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleHintReturn( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleHintReturnMask.prg b/harbour/contrib/hbqt/qtgui/TQStyleHintReturnMask.prg
index 7b351cd473..787ac2ae71 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleHintReturnMask.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleHintReturnMask.prg
@@ -74,8 +74,7 @@ CREATE CLASS QStyleHintReturnMask INHERIT HbQtObjectHandler, QStyleHintReturn
 METHOD QStyleHintReturnMask:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleHintReturnMask( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleHintReturnVariant.prg b/harbour/contrib/hbqt/qtgui/TQStyleHintReturnVariant.prg
index f3fb16947e..4843a32a7e 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleHintReturnVariant.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleHintReturnVariant.prg
@@ -74,8 +74,7 @@ CREATE CLASS QStyleHintReturnVariant INHERIT HbQtObjectHandler, QStyleHintReturn
 METHOD QStyleHintReturnVariant:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleHintReturnVariant( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOption.prg b/harbour/contrib/hbqt/qtgui/TQStyleOption.prg
index 226000714c..e21211c009 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOption.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOption.prg
@@ -82,8 +82,7 @@ CREATE CLASS QStyleOption INHERIT HbQtObjectHandler
 METHOD QStyleOption:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOption( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionButton.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionButton.prg
index 3c1b9a7d59..a9e4abdbc3 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionButton.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionButton.prg
@@ -78,8 +78,7 @@ CREATE CLASS QStyleOptionButton INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionButton:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionButton( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionComboBox.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionComboBox.prg
index 0d32a171dd..77438849a1 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionComboBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionComboBox.prg
@@ -80,8 +80,7 @@ CREATE CLASS QStyleOptionComboBox INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionComboBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionComboBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionComplex.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionComplex.prg
index 86fb4ee536..f13d2a4646 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionComplex.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionComplex.prg
@@ -76,8 +76,7 @@ CREATE CLASS QStyleOptionComplex INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionComplex:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionComplex( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionDockWidget.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionDockWidget.prg
index 428c6f3b20..eab2c22c7f 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionDockWidget.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionDockWidget.prg
@@ -78,8 +78,7 @@ CREATE CLASS QStyleOptionDockWidget INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionDockWidget:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionDockWidget( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionFocusRect.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionFocusRect.prg
index 00c0321ac5..b143408318 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionFocusRect.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionFocusRect.prg
@@ -75,8 +75,7 @@ CREATE CLASS QStyleOptionFocusRect INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionFocusRect:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionFocusRect( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionFrame.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionFrame.prg
index 45a0a4b92d..a3f36d71be 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionFrame.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionFrame.prg
@@ -76,8 +76,7 @@ CREATE CLASS QStyleOptionFrame INHERIT HbQtObjectHandler, qStyleOption
 METHOD QStyleOptionFrame:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionFrame( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionGroupBox.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionGroupBox.prg
index 8ab25881dd..ae117018af 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionGroupBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionGroupBox.prg
@@ -80,8 +80,7 @@ CREATE CLASS QStyleOptionGroupBox INHERIT HbQtObjectHandler, QStyleOptionComplex
 METHOD QStyleOptionGroupBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionGroupBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionHeader.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionHeader.prg
index 0b7b00033d..74e0005e55 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionHeader.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionHeader.prg
@@ -83,8 +83,7 @@ CREATE CLASS QStyleOptionHeader INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionHeader:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionHeader( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionMenuItem.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionMenuItem.prg
index 6ed0983b65..c59788d5f9 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionMenuItem.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionMenuItem.prg
@@ -84,8 +84,7 @@ CREATE CLASS QStyleOptionMenuItem INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionMenuItem:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionMenuItem( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionProgressBar.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionProgressBar.prg
index 8faf081859..bed5759014 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionProgressBar.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionProgressBar.prg
@@ -80,8 +80,7 @@ CREATE CLASS QStyleOptionProgressBar INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionProgressBar:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionProgressBar( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionSizeGrip.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionSizeGrip.prg
index 411afa5a22..21d00cd7f4 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionSizeGrip.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionSizeGrip.prg
@@ -75,8 +75,7 @@ CREATE CLASS QStyleOptionSizeGrip INHERIT HbQtObjectHandler, QStyleOptionComplex
 METHOD QStyleOptionSizeGrip:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionSizeGrip( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionSlider.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionSlider.prg
index f0607ddf54..3e9352b25a 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionSlider.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionSlider.prg
@@ -86,8 +86,7 @@ CREATE CLASS QStyleOptionSlider INHERIT HbQtObjectHandler, QStyleOptionComplex
 METHOD QStyleOptionSlider:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionSlider( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionSpinBox.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionSpinBox.prg
index 9acfbf8c82..a091e694bb 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionSpinBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionSpinBox.prg
@@ -77,8 +77,7 @@ CREATE CLASS QStyleOptionSpinBox INHERIT HbQtObjectHandler, QStyleOptionComplex
 METHOD QStyleOptionSpinBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionSpinBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTab.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionTab.prg
index d7beac8173..ac5071aae9 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionTab.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionTab.prg
@@ -81,8 +81,7 @@ CREATE CLASS QStyleOptionTab INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionTab:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionTab( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTabBarBase.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionTabBarBase.prg
index f5ecd3abea..a602e6d2b4 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionTabBarBase.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionTabBarBase.prg
@@ -77,8 +77,7 @@ CREATE CLASS QStyleOptionTabBarBase INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionTabBarBase:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionTabBarBase( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTabWidgetFrame.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionTabWidgetFrame.prg
index a1a04afdd6..04ffaf070f 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionTabWidgetFrame.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionTabWidgetFrame.prg
@@ -80,8 +80,7 @@ CREATE CLASS QStyleOptionTabWidgetFrame INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionTabWidgetFrame:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionTabWidgetFrame( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionTitleBar.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionTitleBar.prg
index 1f9037e790..54ca3f4aed 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionTitleBar.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionTitleBar.prg
@@ -78,8 +78,7 @@ CREATE CLASS QStyleOptionTitleBar INHERIT HbQtObjectHandler, QStyleOptionComplex
 METHOD QStyleOptionTitleBar:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionTitleBar( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBar.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBar.prg
index 86a9ce09b0..05e4df437c 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBar.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBar.prg
@@ -80,8 +80,7 @@ CREATE CLASS QStyleOptionToolBar INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionToolBar:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionToolBar( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBox.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBox.prg
index fcf2eff228..37c8310e86 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolBox.prg
@@ -76,8 +76,7 @@ CREATE CLASS QStyleOptionToolBox INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionToolBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionToolBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolButton.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolButton.prg
index 57ec2ae261..598bc748ce 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionToolButton.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionToolButton.prg
@@ -82,8 +82,7 @@ CREATE CLASS QStyleOptionToolButton INHERIT HbQtObjectHandler, QStyleOptionCompl
 METHOD QStyleOptionToolButton:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionToolButton( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyleOptionViewItem.prg b/harbour/contrib/hbqt/qtgui/TQStyleOptionViewItem.prg
index a99d5b5335..d37b6a4064 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyleOptionViewItem.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyleOptionViewItem.prg
@@ -81,8 +81,7 @@ CREATE CLASS QStyleOptionViewItem INHERIT HbQtObjectHandler, QStyleOption
 METHOD QStyleOptionViewItem:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyleOptionViewItem( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStylePainter.prg b/harbour/contrib/hbqt/qtgui/TQStylePainter.prg
index abacf8c4aa..e7420d16e2 100644
--- a/harbour/contrib/hbqt/qtgui/TQStylePainter.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStylePainter.prg
@@ -82,8 +82,7 @@ CREATE CLASS QStylePainter INHERIT HbQtObjectHandler, QPainter
 METHOD QStylePainter:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStylePainter( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQStyledItemDelegate.prg b/harbour/contrib/hbqt/qtgui/TQStyledItemDelegate.prg
index 1a5a04f046..22bc80ce2b 100644
--- a/harbour/contrib/hbqt/qtgui/TQStyledItemDelegate.prg
+++ b/harbour/contrib/hbqt/qtgui/TQStyledItemDelegate.prg
@@ -81,8 +81,7 @@ CREATE CLASS QStyledItemDelegate INHERIT HbQtObjectHandler
 METHOD QStyledItemDelegate:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QStyledItemDelegate( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg b/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg
index e2b87a0e1a..e408fe3e65 100644
--- a/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg
+++ b/harbour/contrib/hbqt/qtgui/TQSyntaxHighlighter.prg
@@ -77,8 +77,7 @@ CREATE CLASS QSyntaxHighlighter INHERIT HbQtObjectHandler, QObject
 METHOD QSyntaxHighlighter:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSyntaxHighlighter( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQSystemTrayIcon.prg b/harbour/contrib/hbqt/qtgui/TQSystemTrayIcon.prg
index 37893f8861..8655cb4ebf 100644
--- a/harbour/contrib/hbqt/qtgui/TQSystemTrayIcon.prg
+++ b/harbour/contrib/hbqt/qtgui/TQSystemTrayIcon.prg
@@ -88,8 +88,7 @@ CREATE CLASS QSystemTrayIcon INHERIT HbQtObjectHandler, QObject
 METHOD QSystemTrayIcon:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSystemTrayIcon( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTabBar.prg b/harbour/contrib/hbqt/qtgui/TQTabBar.prg
index eabb67ba17..e6a61cbce3 100644
--- a/harbour/contrib/hbqt/qtgui/TQTabBar.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTabBar.prg
@@ -118,8 +118,7 @@ CREATE CLASS QTabBar INHERIT HbQtObjectHandler, QWidget
 METHOD QTabBar:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTabBar( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTabWidget.prg b/harbour/contrib/hbqt/qtgui/TQTabWidget.prg
index 1188adb8a0..4b0bb7c43f 100644
--- a/harbour/contrib/hbqt/qtgui/TQTabWidget.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTabWidget.prg
@@ -115,8 +115,7 @@ CREATE CLASS QTabWidget INHERIT HbQtObjectHandler, QWidget
 METHOD QTabWidget:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTabWidget( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTableView.prg b/harbour/contrib/hbqt/qtgui/TQTableView.prg
index 170ad01d18..7d19cf3846 100644
--- a/harbour/contrib/hbqt/qtgui/TQTableView.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTableView.prg
@@ -116,8 +116,7 @@ CREATE CLASS QTableView INHERIT HbQtObjectHandler, QAbstractItemView
 METHOD QTableView:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTableView( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTableWidget.prg b/harbour/contrib/hbqt/qtgui/TQTableWidget.prg
index c43cba3de8..055442455f 100644
--- a/harbour/contrib/hbqt/qtgui/TQTableWidget.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTableWidget.prg
@@ -120,8 +120,7 @@ CREATE CLASS QTableWidget INHERIT HbQtObjectHandler, QTableView
 METHOD QTableWidget:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTableWidget( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTableWidgetItem.prg b/harbour/contrib/hbqt/qtgui/TQTableWidgetItem.prg
index f1497ebe4f..4696d69aab 100644
--- a/harbour/contrib/hbqt/qtgui/TQTableWidgetItem.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTableWidgetItem.prg
@@ -109,8 +109,7 @@ CREATE CLASS QTableWidgetItem INHERIT HbQtObjectHandler
 METHOD QTableWidgetItem:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTableWidgetItem( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTableWidgetSelectionRange.prg b/harbour/contrib/hbqt/qtgui/TQTableWidgetSelectionRange.prg
index 2ac4531dbe..4b064a2499 100644
--- a/harbour/contrib/hbqt/qtgui/TQTableWidgetSelectionRange.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTableWidgetSelectionRange.prg
@@ -80,8 +80,7 @@ CREATE CLASS QTableWidgetSelectionRange INHERIT HbQtObjectHandler
 METHOD QTableWidgetSelectionRange:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTableWidgetSelectionRange( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextBlock.prg b/harbour/contrib/hbqt/qtgui/TQTextBlock.prg
index 0ebfd9bac0..1acfd13f06 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextBlock.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextBlock.prg
@@ -99,8 +99,7 @@ CREATE CLASS QTextBlock INHERIT HbQtObjectHandler
 METHOD QTextBlock:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextBlock( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextBlockFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextBlockFormat.prg
index 1107176836..da10ba3039 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextBlockFormat.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextBlockFormat.prg
@@ -93,8 +93,7 @@ CREATE CLASS QTextBlockFormat INHERIT HbQtObjectHandler, QTextFormat
 METHOD QTextBlockFormat:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextBlockFormat( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextBlockGroup.prg b/harbour/contrib/hbqt/qtgui/TQTextBlockGroup.prg
index 72990cf203..7bca68214a 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextBlockGroup.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextBlockGroup.prg
@@ -74,8 +74,7 @@ CREATE CLASS QTextBlockGroup INHERIT HbQtObjectHandler, QTextObject
 METHOD QTextBlockGroup:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextBlockGroup( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextBrowser.prg b/harbour/contrib/hbqt/qtgui/TQTextBrowser.prg
index 239db9248a..954fbfe3d3 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextBrowser.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextBrowser.prg
@@ -94,8 +94,7 @@ CREATE CLASS QTextBrowser INHERIT HbQtObjectHandler, QTextEdit
 METHOD QTextBrowser:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextBrowser( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextCharFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextCharFormat.prg
index a49b45f5d5..4cddba5c51 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextCharFormat.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextCharFormat.prg
@@ -121,8 +121,7 @@ CREATE CLASS QTextCharFormat INHERIT HbQtObjectHandler, QTextFormat
 METHOD QTextCharFormat:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextCharFormat( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextCursor.prg b/harbour/contrib/hbqt/qtgui/TQTextCursor.prg
index 3dd1e41117..dc5a1c5055 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextCursor.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextCursor.prg
@@ -135,8 +135,7 @@ CREATE CLASS QTextCursor INHERIT HbQtObjectHandler
 METHOD QTextCursor:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextCursor( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextDocument.prg b/harbour/contrib/hbqt/qtgui/TQTextDocument.prg
index 6bdceef743..ef0a28a0df 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextDocument.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextDocument.prg
@@ -140,8 +140,7 @@ CREATE CLASS QTextDocument INHERIT HbQtObjectHandler, QObject
 METHOD QTextDocument:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextDocument( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextDocumentFragment.prg b/harbour/contrib/hbqt/qtgui/TQTextDocumentFragment.prg
index ddac075dec..c91b9e9a4a 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextDocumentFragment.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextDocumentFragment.prg
@@ -81,8 +81,7 @@ CREATE CLASS QTextDocumentFragment INHERIT HbQtObjectHandler
 METHOD QTextDocumentFragment:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextDocumentFragment( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextDocumentWriter.prg b/harbour/contrib/hbqt/qtgui/TQTextDocumentWriter.prg
index 3da1652d56..b910e08261 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextDocumentWriter.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextDocumentWriter.prg
@@ -84,8 +84,7 @@ CREATE CLASS QTextDocumentWriter INHERIT HbQtObjectHandler
 METHOD QTextDocumentWriter:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextDocumentWriter( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextEdit.prg b/harbour/contrib/hbqt/qtgui/TQTextEdit.prg
index f3c810b0ce..45bb7abfcc 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextEdit.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextEdit.prg
@@ -155,8 +155,7 @@ CREATE CLASS QTextEdit INHERIT HbQtObjectHandler, QAbstractScrollArea
 METHOD QTextEdit:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextEdit( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextFormat.prg
index 9953e64d36..e06dc1cd4b 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextFormat.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextFormat.prg
@@ -115,8 +115,7 @@ CREATE CLASS QTextFormat INHERIT HbQtObjectHandler
 METHOD QTextFormat:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextFormat( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextFragment.prg b/harbour/contrib/hbqt/qtgui/TQTextFragment.prg
index 65792bf36e..ee5f2070db 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextFragment.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextFragment.prg
@@ -81,8 +81,7 @@ CREATE CLASS QTextFragment INHERIT HbQtObjectHandler
 METHOD QTextFragment:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextFragment( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextFrame.prg b/harbour/contrib/hbqt/qtgui/TQTextFrame.prg
index e2a811f7c5..aaec90d34e 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextFrame.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextFrame.prg
@@ -81,8 +81,7 @@ CREATE CLASS QTextFrame INHERIT HbQtObjectHandler, QTextObject
 METHOD QTextFrame:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextFrame( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextFrameFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextFrameFormat.prg
index 8df52708c2..d278ba6c0a 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextFrameFormat.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextFrameFormat.prg
@@ -103,8 +103,7 @@ CREATE CLASS QTextFrameFormat INHERIT HbQtObjectHandler, QTextFormat
 METHOD QTextFrameFormat:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextFrameFormat( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextImageFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextImageFormat.prg
index e688837f95..8b32ffd70b 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextImageFormat.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextImageFormat.prg
@@ -81,8 +81,7 @@ CREATE CLASS QTextImageFormat INHERIT HbQtObjectHandler, QTextCharFormat
 METHOD QTextImageFormat:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextImageFormat( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextInlineObject.prg b/harbour/contrib/hbqt/qtgui/TQTextInlineObject.prg
index 70d21e5ea2..4e57c56026 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextInlineObject.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextInlineObject.prg
@@ -87,8 +87,7 @@ CREATE CLASS QTextInlineObject INHERIT HbQtObjectHandler
 METHOD QTextInlineObject:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextInlineObject( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextItem.prg b/harbour/contrib/hbqt/qtgui/TQTextItem.prg
index 91bf6a7361..c617e24f8b 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextItem.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextItem.prg
@@ -80,8 +80,7 @@ CREATE CLASS QTextItem INHERIT HbQtObjectHandler
 METHOD QTextItem:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextItem( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextLayout.prg b/harbour/contrib/hbqt/qtgui/TQTextLayout.prg
index 1c207f6cf2..77492d0a42 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextLayout.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextLayout.prg
@@ -103,8 +103,7 @@ CREATE CLASS QTextLayout INHERIT HbQtObjectHandler
 METHOD QTextLayout:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextLayout( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextLength.prg b/harbour/contrib/hbqt/qtgui/TQTextLength.prg
index bab48252e8..2972b0f1cb 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextLength.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextLength.prg
@@ -77,8 +77,7 @@ CREATE CLASS QTextLength INHERIT HbQtObjectHandler
 METHOD QTextLength:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextLength( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextLine.prg b/harbour/contrib/hbqt/qtgui/TQTextLine.prg
index 2965148b91..49f7d6853f 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextLine.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextLine.prg
@@ -95,8 +95,7 @@ CREATE CLASS QTextLine INHERIT HbQtObjectHandler
 METHOD QTextLine:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextLine( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextListFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextListFormat.prg
index 7d7e4c21d7..833f3ad7b2 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextListFormat.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextListFormat.prg
@@ -79,8 +79,7 @@ CREATE CLASS QTextListFormat INHERIT HbQtObjectHandler, QTextFormat
 METHOD QTextListFormat:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextListFormat( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextObject.prg b/harbour/contrib/hbqt/qtgui/TQTextObject.prg
index d410fa09d8..7b5a7e5ea5 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextObject.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextObject.prg
@@ -78,8 +78,7 @@ CREATE CLASS QTextObject INHERIT HbQtObjectHandler, QObject
 METHOD QTextObject:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextObject( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextOption.prg b/harbour/contrib/hbqt/qtgui/TQTextOption.prg
index 3615597a8e..81ea17ed2d 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextOption.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextOption.prg
@@ -86,8 +86,7 @@ CREATE CLASS QTextOption INHERIT HbQtObjectHandler
 METHOD QTextOption:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextOption( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTextTableFormat.prg b/harbour/contrib/hbqt/qtgui/TQTextTableFormat.prg
index 6e5bf18c8d..83e8ce3389 100644
--- a/harbour/contrib/hbqt/qtgui/TQTextTableFormat.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTextTableFormat.prg
@@ -85,8 +85,7 @@ CREATE CLASS QTextTableFormat INHERIT HbQtObjectHandler, QTextFrameFormat
 METHOD QTextTableFormat:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTextTableFormat( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTimeEdit.prg b/harbour/contrib/hbqt/qtgui/TQTimeEdit.prg
index 3518dabc96..85d058c5ef 100644
--- a/harbour/contrib/hbqt/qtgui/TQTimeEdit.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTimeEdit.prg
@@ -74,8 +74,7 @@ CREATE CLASS QTimeEdit INHERIT HbQtObjectHandler, QDateTimeEdit
 METHOD QTimeEdit:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTimeEdit( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQToolBar.prg b/harbour/contrib/hbqt/qtgui/TQToolBar.prg
index 42f2c75c07..251fb81fdb 100644
--- a/harbour/contrib/hbqt/qtgui/TQToolBar.prg
+++ b/harbour/contrib/hbqt/qtgui/TQToolBar.prg
@@ -102,8 +102,7 @@ CREATE CLASS QToolBar INHERIT HbQtObjectHandler, QWidget
 METHOD QToolBar:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QToolBar( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQToolBox.prg b/harbour/contrib/hbqt/qtgui/TQToolBox.prg
index 20578f6848..235884d4d1 100644
--- a/harbour/contrib/hbqt/qtgui/TQToolBox.prg
+++ b/harbour/contrib/hbqt/qtgui/TQToolBox.prg
@@ -94,8 +94,7 @@ CREATE CLASS QToolBox INHERIT HbQtObjectHandler, QFrame
 METHOD QToolBox:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QToolBox( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQToolButton.prg b/harbour/contrib/hbqt/qtgui/TQToolButton.prg
index e7e9fe0ee4..ae48f08813 100644
--- a/harbour/contrib/hbqt/qtgui/TQToolButton.prg
+++ b/harbour/contrib/hbqt/qtgui/TQToolButton.prg
@@ -87,8 +87,7 @@ CREATE CLASS QToolButton INHERIT HbQtObjectHandler, QAbstractButton
 METHOD QToolButton:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QToolButton( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTransform.prg b/harbour/contrib/hbqt/qtgui/TQTransform.prg
index 912c3ec2d4..4b140cde74 100644
--- a/harbour/contrib/hbqt/qtgui/TQTransform.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTransform.prg
@@ -123,8 +123,7 @@ CREATE CLASS QTransform INHERIT HbQtObjectHandler
 METHOD QTransform:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTransform( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTreeView.prg b/harbour/contrib/hbqt/qtgui/TQTreeView.prg
index d629e693b1..ff93adf678 100644
--- a/harbour/contrib/hbqt/qtgui/TQTreeView.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTreeView.prg
@@ -123,8 +123,7 @@ CREATE CLASS QTreeView INHERIT HbQtObjectHandler, QAbstractItemView
 METHOD QTreeView:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTreeView( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTreeWidget.prg b/harbour/contrib/hbqt/qtgui/TQTreeWidget.prg
index 51761d7e4e..a0219feb4f 100644
--- a/harbour/contrib/hbqt/qtgui/TQTreeWidget.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTreeWidget.prg
@@ -111,8 +111,7 @@ CREATE CLASS QTreeWidget INHERIT HbQtObjectHandler, QTreeView
 METHOD QTreeWidget:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTreeWidget( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQTreeWidgetItem.prg b/harbour/contrib/hbqt/qtgui/TQTreeWidgetItem.prg
index 03bf71abe7..26da1d687d 100644
--- a/harbour/contrib/hbqt/qtgui/TQTreeWidgetItem.prg
+++ b/harbour/contrib/hbqt/qtgui/TQTreeWidgetItem.prg
@@ -126,8 +126,7 @@ CREATE CLASS QTreeWidgetItem INHERIT HbQtObjectHandler
 METHOD QTreeWidgetItem:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QTreeWidgetItem( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQVBoxLayout.prg b/harbour/contrib/hbqt/qtgui/TQVBoxLayout.prg
index 08852c6bc3..e3b4a7596c 100644
--- a/harbour/contrib/hbqt/qtgui/TQVBoxLayout.prg
+++ b/harbour/contrib/hbqt/qtgui/TQVBoxLayout.prg
@@ -74,8 +74,7 @@ CREATE CLASS QVBoxLayout INHERIT HbQtObjectHandler, QBoxLayout
 METHOD QVBoxLayout:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QVBoxLayout( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQValidator.prg b/harbour/contrib/hbqt/qtgui/TQValidator.prg
index 6c1a027692..9889b319c5 100644
--- a/harbour/contrib/hbqt/qtgui/TQValidator.prg
+++ b/harbour/contrib/hbqt/qtgui/TQValidator.prg
@@ -76,8 +76,7 @@ CREATE CLASS QValidator INHERIT HbQtObjectHandler, QObject
 METHOD QValidator:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QValidator( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQWheelEvent.prg b/harbour/contrib/hbqt/qtgui/TQWheelEvent.prg
index 459ffae99e..544e5dceb2 100644
--- a/harbour/contrib/hbqt/qtgui/TQWheelEvent.prg
+++ b/harbour/contrib/hbqt/qtgui/TQWheelEvent.prg
@@ -83,8 +83,7 @@ CREATE CLASS QWheelEvent INHERIT HbQtObjectHandler, QInputEvent
 METHOD QWheelEvent:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QWheelEvent( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQWidget.prg b/harbour/contrib/hbqt/qtgui/TQWidget.prg
index 35f8fc63fd..4aaf2f0f78 100644
--- a/harbour/contrib/hbqt/qtgui/TQWidget.prg
+++ b/harbour/contrib/hbqt/qtgui/TQWidget.prg
@@ -285,8 +285,7 @@ CREATE CLASS QWidget INHERIT HbQtObjectHandler, QObject, QPaintDevice
 METHOD QWidget:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QWidget( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQWidgetAction.prg b/harbour/contrib/hbqt/qtgui/TQWidgetAction.prg
index 61f310f5ee..df0220ff10 100644
--- a/harbour/contrib/hbqt/qtgui/TQWidgetAction.prg
+++ b/harbour/contrib/hbqt/qtgui/TQWidgetAction.prg
@@ -78,8 +78,7 @@ CREATE CLASS QWidgetAction INHERIT HbQtObjectHandler, QAction
 METHOD QWidgetAction:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QWidgetAction( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQWidgetItem.prg b/harbour/contrib/hbqt/qtgui/TQWidgetItem.prg
index ffe47c72b5..9f28ccff18 100644
--- a/harbour/contrib/hbqt/qtgui/TQWidgetItem.prg
+++ b/harbour/contrib/hbqt/qtgui/TQWidgetItem.prg
@@ -76,8 +76,7 @@ CREATE CLASS QWidgetItem INHERIT HbQtObjectHandler, QLayoutItem
 METHOD QWidgetItem:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QWidgetItem( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQWindowsStyle.prg b/harbour/contrib/hbqt/qtgui/TQWindowsStyle.prg
index a34051b8a6..26fb352e95 100644
--- a/harbour/contrib/hbqt/qtgui/TQWindowsStyle.prg
+++ b/harbour/contrib/hbqt/qtgui/TQWindowsStyle.prg
@@ -74,8 +74,7 @@ CREATE CLASS QWindowsStyle INHERIT HbQtObjectHandler, QCommonStyle
 METHOD QWindowsStyle:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QWindowsStyle( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQWizard.prg b/harbour/contrib/hbqt/qtgui/TQWizard.prg
index 8177f9efc5..d519bb2628 100644
--- a/harbour/contrib/hbqt/qtgui/TQWizard.prg
+++ b/harbour/contrib/hbqt/qtgui/TQWizard.prg
@@ -107,8 +107,7 @@ CREATE CLASS QWizard INHERIT HbQtObjectHandler, QDialog
 METHOD QWizard:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QWizard( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtgui/TQWizardPage.prg b/harbour/contrib/hbqt/qtgui/TQWizardPage.prg
index bf3864db33..bdc6fb594f 100644
--- a/harbour/contrib/hbqt/qtgui/TQWizardPage.prg
+++ b/harbour/contrib/hbqt/qtgui/TQWizardPage.prg
@@ -91,8 +91,7 @@ CREATE CLASS QWizardPage INHERIT HbQtObjectHandler, QWidget
 METHOD QWizardPage:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QWizardPage( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtnetwork/TQFtp.prg b/harbour/contrib/hbqt/qtnetwork/TQFtp.prg
index 8616667af2..b5e9f83e1e 100644
--- a/harbour/contrib/hbqt/qtnetwork/TQFtp.prg
+++ b/harbour/contrib/hbqt/qtnetwork/TQFtp.prg
@@ -100,8 +100,7 @@ CREATE CLASS QFtp INHERIT HbQtObjectHandler, QObject
 METHOD QFtp:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QFtp( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttp.prg b/harbour/contrib/hbqt/qtnetwork/TQHttp.prg
index f1fa041b80..80fe13d60a 100644
--- a/harbour/contrib/hbqt/qtnetwork/TQHttp.prg
+++ b/harbour/contrib/hbqt/qtnetwork/TQHttp.prg
@@ -98,8 +98,7 @@ CREATE CLASS QHttp INHERIT HbQtObjectHandler, QObject
 METHOD QHttp:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QHttp( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttpHeader.prg b/harbour/contrib/hbqt/qtnetwork/TQHttpHeader.prg
index f01599c139..4047b3c124 100644
--- a/harbour/contrib/hbqt/qtnetwork/TQHttpHeader.prg
+++ b/harbour/contrib/hbqt/qtnetwork/TQHttpHeader.prg
@@ -92,8 +92,7 @@ CREATE CLASS QHttpHeader INHERIT HbQtObjectHandler
 METHOD QHttpHeader:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QHttpHeader( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttpRequestHeader.prg b/harbour/contrib/hbqt/qtnetwork/TQHttpRequestHeader.prg
index cf17c977d1..cfebd60007 100644
--- a/harbour/contrib/hbqt/qtnetwork/TQHttpRequestHeader.prg
+++ b/harbour/contrib/hbqt/qtnetwork/TQHttpRequestHeader.prg
@@ -79,8 +79,7 @@ CREATE CLASS QHttpRequestHeader INHERIT HbQtObjectHandler, QHttpHeader
 METHOD QHttpRequestHeader:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QHttpRequestHeader( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtnetwork/TQHttpResponseHeader.prg b/harbour/contrib/hbqt/qtnetwork/TQHttpResponseHeader.prg
index b48f94bc12..2dd49355a5 100644
--- a/harbour/contrib/hbqt/qtnetwork/TQHttpResponseHeader.prg
+++ b/harbour/contrib/hbqt/qtnetwork/TQHttpResponseHeader.prg
@@ -79,8 +79,7 @@ CREATE CLASS QHttpResponseHeader INHERIT HbQtObjectHandler, QHttpHeader
 METHOD QHttpResponseHeader:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QHttpResponseHeader( ... )
    RETURN Self
diff --git a/harbour/contrib/hbqt/qtnetwork/TQNetworkRequest.prg b/harbour/contrib/hbqt/qtnetwork/TQNetworkRequest.prg
index ff9af09907..046dd95265 100644
--- a/harbour/contrib/hbqt/qtnetwork/TQNetworkRequest.prg
+++ b/harbour/contrib/hbqt/qtnetwork/TQNetworkRequest.prg
@@ -83,8 +83,7 @@ CREATE CLASS QNetworkRequest INHERIT HbQtObjectHandler
 METHOD QNetworkRequest:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QNetworkRequest( ... )
    RETURN Self
diff --git a/harbour/src/vm/fm.c b/harbour/src/vm/fm.c
index d88507d6ef..d5a11bddb5 100644
--- a/harbour/src/vm/fm.c
+++ b/harbour/src/vm/fm.c
@@ -1404,35 +1404,3 @@ HB_BOOL hb_xtraced( void )
    return HB_FALSE;
 #endif
 }
-
-#if defined( __cplusplus ) && defined( HB_FM_STATISTICS )
-void * operator new[]( size_t nSize )
-{
-   return hb_xgrab( nSize );
-}
-
-void * operator new( size_t nSize )
-{
-   return hb_xgrab( nSize );
-}
-
-void operator delete[]( void * ptr )
-{
-   hb_xfree( ptr );
-}
-
-void operator delete[]( void * ptr, size_t )
-{
-   hb_xfree( ptr );
-}
-
-void operator delete( void * ptr )
-{
-   hb_xfree( ptr );
-}
-
-void operator delete( void * ptr, size_t )
-{
-   hb_xfree( ptr );
-}
-#endif
diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po
index 8407373cf7..637e233957 100644
--- a/harbour/utils/hbmk2/hbmk2.hu_HU.po
+++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po
@@ -104,8 +104,8 @@ msgstr "A sz
 
 #: hbmk2.prg:4128
 #, c-format
-msgid "Warning: C compiler script couldn't be created, continuing in command line."
-msgstr "Figyelem: C fordító parancsállománya ne hozható létre, folytatás parancssorban."
+msgid "Warning: C/C++ compiler script couldn't be created, continuing in command line."
+msgstr "Figyelem: C/C++ fordító parancsállománya ne hozható létre, folytatás parancssorban."
 
 #: hbmk2.prg:7941
 #, c-format
@@ -169,13 +169,13 @@ msgstr "Er
 
 #: hbmk2.prg:4137 hbmk2.prg:4698
 #, c-format
-msgid "C compiler command job #%1$s:"
-msgstr "C fordító parancs. %1$s. szál:"
+msgid "C/C++ compiler command job #%1$s:"
+msgstr "C/C++ fordító parancs. %1$s. szál:"
 
 #: hbmk2.prg:4154 hbmk2.prg:4178 hbmk2.prg:4710
 #, c-format
-msgid "Error: Running C compiler. %1$s"
-msgstr "Hiba: C fordító futtatásakor. %1$s"
+msgid "Error: Running C/C++ compiler. %1$s"
+msgstr "Hiba: C/C++ fordító futtatásakor. %1$s"
 
 #: hbmk2.prg:7082
 #, c-format
@@ -254,8 +254,8 @@ msgstr "%1$s"
 
 #: hbmk2.prg:4139 hbmk2.prg:4700
 #, c-format
-msgid "C compiler command:"
-msgstr "C fordító parancsa:"
+msgid "C/C++ compiler command:"
+msgstr "C/C++ fordító parancsa:"
 
 #: hbmk2.prg:1381
 #, c-format
@@ -269,8 +269,8 @@ msgstr "Er
 
 #: hbmk2.prg:4144
 #, c-format
-msgid "C compiler script:"
-msgstr "C fordító parancsállomány:"
+msgid "C/C++ compiler script:"
+msgstr "C/C++ fordító parancsállomány:"
 
 #: hbmk2.prg:5858
 #, c-format
@@ -529,8 +529,8 @@ msgstr "Hiba: Harbour ford
 
 #: hbmk2.prg:4176 hbmk2.prg:4708
 #, c-format
-msgid "Error: Running C compiler job #%1$s. %2$s"
-msgstr "Hiba: C fordító futtatásakor. %1$s. szál. %2$s"
+msgid "Error: Running C/C++ compiler job #%1$s. %2$s"
+msgstr "Hiba: C/C++ fordító futtatásakor. %1$s. szál. %2$s"
 
 #: hbmk2.prg:4251
 #, c-format
@@ -1019,5 +1019,5 @@ msgstr "c
 
 #: hbmk2.prg:7959
 #, c-format
-msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=<text>\\nLines starting with '#' char are ignored"
-msgstr ".hbc opciók (külön sorokba írandók): libs=[<libnevek>], hbcs=[<.hbc nevek>], gt=[gtnév], syslibs=[<libnevek>], prgflags=[Harbour opciók], cflags=[C fordító opciók], resflags=[erõforrás fordító kapcsolók], ldflags=[szerkesztõ kapcsolók], libpaths=[útvonalak], sources=[forrás fájlok], incpaths=[útvonalak], inctrypaths=[útvonalak], instpaths=[útvonalak], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=<szöveg>\\n'#' karakterrel kezdõdõ sorokat figyelmen kívül hagyja"
+msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=<text>\\nLines starting with '#' char are ignored"
+msgstr ".hbc opciók (külön sorokba írandók): libs=[<libnevek>], hbcs=[<.hbc nevek>], gt=[gtnév], syslibs=[<libnevek>], prgflags=[Harbour opciók], cflags=[C fordító opciók], resflags=[erõforrás fordító kapcsolók], ldflags=[szerkesztõ kapcsolók], libpaths=[útvonalak], sources=[forrás fájlok], incpaths=[útvonalak], inctrypaths=[útvonalak], instpaths=[útvonalak], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=<szöveg>\\n'#' karakterrel kezdõdõ sorokat figyelmen kívül hagyja"
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index f93c195c51..245580a4dd 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -235,6 +235,9 @@ REQUEST hbmk_KEYW
 
 #define _OUT_EOL                Chr( 10 )
 
+#define _CCOMP_PASS_C           1
+#define _CCOMP_PASS_CPP         2
+
 #define _HBMK_lQuiet            1
 #define _HBMK_lInfo             2
 #define _HBMK_cPLAT             3
@@ -292,39 +295,41 @@ REQUEST hbmk_KEYW
 #define _HBMK_nCONF             53
 #define _HBMK_lIGNOREERROR      54
 #define _HBMK_lIMPLIB           55
+#define _HBMK_lHBCPPMM          56
 
-#define _HBMK_lCreateLib        56
-#define _HBMK_lCreateDyn        57
+#define _HBMK_lCreateLib        57
+#define _HBMK_lCreateDyn        58
 
-#define _HBMK_lBLDFLGP          58
-#define _HBMK_lBLDFLGC          59
-#define _HBMK_lBLDFLGL          60
+#define _HBMK_lBLDFLGP          59
+#define _HBMK_lBLDFLGC          60
+#define _HBMK_lBLDFLGL          61
 
-#define _HBMK_cFIRST            61
-#define _HBMK_aPRG              62
-#define _HBMK_aC                63
-#define _HBMK_aRESSRC           64
-#define _HBMK_aRESCMP           65
-#define _HBMK_aOBJUSER          66
-#define _HBMK_aICON             67
-#define _HBMK_hDEPTS            68
+#define _HBMK_cFIRST            62
+#define _HBMK_aPRG              63
+#define _HBMK_aC                64
+#define _HBMK_aCPP              65
+#define _HBMK_aRESSRC           66
+#define _HBMK_aRESCMP           67
+#define _HBMK_aOBJUSER          68
+#define _HBMK_aICON             69
+#define _HBMK_hDEPTS            70
 
-#define _HBMK_aPO               69
-#define _HBMK_cHBL              70
-#define _HBMK_cHBLDir           71
-#define _HBMK_aLNG              72
-#define _HBMK_cPO               73
+#define _HBMK_aPO               71
+#define _HBMK_cHBL              72
+#define _HBMK_cHBLDir           73
+#define _HBMK_aLNG              74
+#define _HBMK_cPO               75
 
-#define _HBMK_lDEBUGTIME        74
-#define _HBMK_lDEBUGINC         75
-#define _HBMK_lDEBUGSTUB        76
-#define _HBMK_lDEBUGI18N        77
+#define _HBMK_lDEBUGTIME        76
+#define _HBMK_lDEBUGINC         77
+#define _HBMK_lDEBUGSTUB        78
+#define _HBMK_lDEBUGI18N        79
 
-#define _HBMK_cCCPATH           78
-#define _HBMK_cCCPREFIX         79
-#define _HBMK_cCCPOSTFIX        80
+#define _HBMK_cCCPATH           80
+#define _HBMK_cCCPREFIX         81
+#define _HBMK_cCCPOSTFIX        82
 
-#define _HBMK_MAX_              80
+#define _HBMK_MAX_              82
 
 #ifndef _HBMK_EMBEDDED_
 
@@ -550,6 +555,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
    LOCAL cLIB_BASE_ZLIB
 
    LOCAL l_cCSTUB
+   LOCAL l_cCPPSTUB
    LOCAL l_cRESSTUB
 
    LOCAL l_cHB_INSTALL_PREFIX
@@ -559,9 +565,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
    LOCAL l_cHB_INC_INSTALL
 
    LOCAL l_aPRG_TODO
-   LOCAL l_aPRG_DONE
    LOCAL l_aC_TODO
-   LOCAL l_aC_DONE
+   LOCAL l_aCPP_TODO
+   LOCAL l_aCGEN_TODO
    LOCAL l_aRESSRC_TODO
    LOCAL l_aLIBSHARED
    LOCAL l_aLIBSHAREDPOST := {}
@@ -644,6 +650,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
    LOCAL cOpt_Dyn
    LOCAL cBin_CompPRG
    LOCAL cBin_CompC
+   LOCAL cBin_CompCPP
+   LOCAL cBin_CompCGEN
    LOCAL cBin_Link
    LOCAL cBin_Res
    LOCAL cBin_Lib
@@ -726,6 +734,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
    hbmk[ _HBMK_nCONF ] := _CONF_RELEASE
    hbmk[ _HBMK_lIGNOREERROR ] := .F.
    hbmk[ _HBMK_lIMPLIB ] := .F.
+   hbmk[ _HBMK_lHBCPPMM ] := .F.
 
    hbmk[ _HBMK_lBLDFLGP ] := .F.
    hbmk[ _HBMK_lBLDFLGC ] := .F.
@@ -1244,7 +1253,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                 hbmk[ _HBMK_cPLAT ] == "darwin" .OR. ;
                 hbmk[ _HBMK_cCOMP ] == "bld"
             hbmk[ _HBMK_cCOMP ] := hb_Version( HB_VERSION_BUILD_COMP )
-            IF AScan( aCOMPSUP, {|tmp| tmp == hbmk[ _HBMK_cCOMP ] } ) == 0
+            IF AScan( aCOMPSUP, { |tmp | tmp == hbmk[ _HBMK_cCOMP ] } ) == 0
                hbmk[ _HBMK_cCOMP ] := NIL
             ENDIF
          ELSE
@@ -1304,7 +1313,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             RETURN 2
          ENDIF
       ELSE
-         IF AScan( aCOMPSUP, {|tmp| tmp == hbmk[ _HBMK_cCOMP ] } ) == 0
+         IF AScan( aCOMPSUP, {| tmp | tmp == hbmk[ _HBMK_cCOMP ] } ) == 0
             hbmk_OutErr( hb_StrFormat( I_( "Error: Compiler value unknown: %1$s" ), hbmk[ _HBMK_cCOMP ] ) )
             RETURN 2
          ENDIF
@@ -1413,6 +1422,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
 
    hbmk[ _HBMK_aPRG ] := {}
    hbmk[ _HBMK_aC ] := {}
+   hbmk[ _HBMK_aCPP ] := {}
    hbmk[ _HBMK_hDEPTS ] := {=>}
    hbmk[ _HBMK_aOPTPRG ] := {}
    hbmk[ _HBMK_aOPTC ] := {}
@@ -1577,16 +1587,19 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
       CASE cParamL == "-ignore"          ; hbmk[ _HBMK_lIGNOREERROR ] := .T.
       CASE cParamL == "-ignore-" .OR. ;
            cParamL == "-noignore"        ; hbmk[ _HBMK_lIGNOREERROR ] := .F.
+      CASE cParamL == "-hbcppmm"         ; hbmk[ _HBMK_lHBCPPMM ]     := .T.
+      CASE cParamL == "-hbcppmm-" .OR. ;
+           cParamL == "-nohbcppmm"       ; hbmk[ _HBMK_lHBCPPMM ]     := .F.
       CASE cParamL == "-strip"           ; hbmk[ _HBMK_lSTRIP ]       := .T.
       CASE cParamL == "-strip-" .OR. ;
            cParamL == "-nostrip"         ; hbmk[ _HBMK_lSTRIP ]       := .F.
 
       CASE cParamL == "-warn" .OR. ;
-           Left( cParamL, 7 ) == "-warn="
+           Left( cParamL, 6 ) == "-warn="
 
            DO CASE
-           CASE SubStr( cParamL, 8 ) == "def" ; hbmk[ _HBMK_nWARN ] := _WARN_DEF
-           CASE SubStr( cParamL, 8 ) == "no"  ; hbmk[ _HBMK_nWARN ] := _WARN_NO
+           CASE SubStr( cParamL, 7 ) == "def" ; hbmk[ _HBMK_nWARN ] := _WARN_DEF
+           CASE SubStr( cParamL, 7 ) == "no"  ; hbmk[ _HBMK_nWARN ] := _WARN_NO
            OTHERWISE                          ; hbmk[ _HBMK_nWARN ] := _WARN_YES
            ENDCASE
 
@@ -1703,8 +1716,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                ENDIF
             ENDIF
             IF !( Lower( cParam ) == "gtnul" )
-               IF AScan( hbmk[ _HBMK_aLIBCOREGT ], {|tmp| Lower( tmp ) == Lower( cParam ) } ) == 0 .AND. ;
-                  AScan( hbmk[ _HBMK_aLIBUSERGT ], {|tmp| Lower( tmp ) == Lower( cParam ) } ) == 0
+               IF AScan( hbmk[ _HBMK_aLIBCOREGT ], {| tmp | Lower( tmp ) == Lower( cParam ) } ) == 0 .AND. ;
+                  AScan( hbmk[ _HBMK_aLIBUSERGT ], {| tmp | Lower( tmp ) == Lower( cParam ) } ) == 0
                   AAddNotEmpty( hbmk[ _HBMK_aLIBUSERGT ], PathSepToTarget( hbmk, cParam ) )
                ENDIF
             ENDIF
@@ -1748,7 +1761,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
 
          cParam := PathNormalize( PathSepToSelf( PathProc( MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, Len( "-instpath=" ) + 1 ) ), aParam[ _PAR_cFileName ] ), aParam[ _PAR_cFileName ] ) ) )
          IF ! Empty( cParam )
-            IF AScan( hbmk[ _HBMK_aINSTPATH ], {|tmp| tmp == cParam } ) == 0
+            IF AScan( hbmk[ _HBMK_aINSTPATH ], {| tmp | tmp == cParam } ) == 0
                AAdd( hbmk[ _HBMK_aINSTPATH ], PathSepToTarget( hbmk, cParam ) )
             ENDIF
          ENDIF
@@ -1758,7 +1771,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
 
          cParam := PathNormalize( PathSepToSelf( PathProc( MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, Len( "-incpath=" ) + 1 ) ), aParam[ _PAR_cFileName ] ), aParam[ _PAR_cFileName ] ) ) )
          IF ! Empty( cParam )
-            IF AScan( hbmk[ _HBMK_aINCPATH ], {|tmp| tmp == cParam } ) == 0
+            IF AScan( hbmk[ _HBMK_aINCPATH ], {| tmp | tmp == cParam } ) == 0
                AAdd( hbmk[ _HBMK_aINCPATH ], PathSepToTarget( hbmk, cParam ) )
             ENDIF
          ENDIF
@@ -1768,7 +1781,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
 
          cParam := PathNormalize( PathSepToSelf( PathProc( MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, Len( "-inctrypath=" ) + 1 ) ), aParam[ _PAR_cFileName ] ), aParam[ _PAR_cFileName ] ) ) )
          IF ! Empty( cParam )
-            IF AScan( hbmk[ _HBMK_aINCTRYPATH ], {|tmp| tmp == cParam } ) == 0
+            IF AScan( hbmk[ _HBMK_aINCTRYPATH ], {| tmp | tmp == cParam } ) == 0
                AAdd( hbmk[ _HBMK_aINCTRYPATH ], PathSepToTarget( hbmk, cParam ) )
             ENDIF
          ENDIF
@@ -1785,7 +1798,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
 
          cParam := PathNormalize( PathSepToSelf( PathProc( MacroProc( hbmk, tmp := ArchCompFilter( hbmk, SubStr( cParam, 3 ) ), aParam[ _PAR_cFileName ] ), aParam[ _PAR_cFileName ] ) ) )
          IF ! Empty( cParam )
-            IF AScan( hbmk[ _HBMK_aINCPATH ], {|tmp| tmp == cParam } ) == 0
+            IF AScan( hbmk[ _HBMK_aINCPATH ], {| tmp | tmp == cParam } ) == 0
                AAdd( hbmk[ _HBMK_aINCPATH ], PathSepToTarget( hbmk, cParam ) )
             ENDIF
          ENDIF
@@ -1988,8 +2001,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             NEXT
          ENDIF
 
-      CASE FN_ExtGet( cParamL ) == ".c" .OR. ;
-           FN_ExtGet( cParamL ) == ".cpp" /* .cc, .cxx, .cx */
+      CASE FN_ExtGet( cParamL ) == ".c"
 
          cParam := ArchCompFilter( hbmk, cParam )
          IF ! Empty( cParam )
@@ -1999,6 +2011,19 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             NEXT
          ENDIF
 
+      CASE FN_ExtGet( cParamL ) == ".cpp" .OR. ;
+           FN_ExtGet( cParamL ) == ".cc" .OR. ;
+           FN_ExtGet( cParamL ) == ".cxx" .OR. ;
+           FN_ExtGet( cParamL ) == ".cx"
+
+         cParam := ArchCompFilter( hbmk, cParam )
+         IF ! Empty( cParam )
+            FOR EACH cParam IN FN_Expand( PathProc( cParam, aParam[ _PAR_cFileName ] ), Empty( aParam[ _PAR_cFileName ] ) )
+               AAdd( hbmk[ _HBMK_aCPP ], PathSepToTarget( hbmk, cParam ) )
+               DEFAULT hbmk[ _HBMK_cFIRST ] TO PathSepToSelf( cParam )
+            NEXT
+         ENDIF
+
       CASE FN_ExtGet( cParamL ) == ".d"
 
          cParam := ArchCompFilter( hbmk, cParam )
@@ -2055,7 +2080,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
    ENDIF
 
    /* Start doing the make process. */
-   IF ! lStopAfterInit .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aOBJUSER ] ) + Len( l_aOBJA ) ) == 0
+   IF ! lStopAfterInit .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) + Len( hbmk[ _HBMK_aOBJUSER ] ) + Len( l_aOBJA ) ) == 0
       hbmk_OutErr( I_( "Error: No source files were specified." ) )
       IF hbmk[ _HBMK_lBEEP ]
          DoBeep( .F. )
@@ -2179,8 +2204,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
       /* Assemble library list */
 
       IF ! Empty( hbmk[ _HBMK_cGT ] ) .AND. !( Lower( hbmk[ _HBMK_cGT ] ) == "gtnul" )
-         IF AScan( hbmk[ _HBMK_aLIBCOREGT ], {|tmp| Lower( tmp ) == Lower( hbmk[ _HBMK_cGT ] ) } ) == 0 .AND. ;
-            AScan( hbmk[ _HBMK_aLIBUSERGT ], {|tmp| Lower( tmp ) == Lower( hbmk[ _HBMK_cGT ] ) } ) == 0
+         IF AScan( hbmk[ _HBMK_aLIBCOREGT ], {| tmp | Lower( tmp ) == Lower( hbmk[ _HBMK_cGT ] ) } ) == 0 .AND. ;
+            AScan( hbmk[ _HBMK_aLIBUSERGT ], {| tmp | Lower( tmp ) == Lower( hbmk[ _HBMK_cGT ] ) } ) == 0
             AAdd( hbmk[ _HBMK_aLIBUSERGT ], hbmk[ _HBMK_cGT ] )
          ENDIF
       ENDIF
@@ -2246,14 +2271,18 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ENDIF
          DO CASE
          CASE hbmk[ _HBMK_cCOMP ] == "icc"
-            cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], "icpc", "icc" )
+            cBin_CompCPP := "icpc"
+            cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], cBin_CompCPP, "icc" )
             AAdd( hbmk[ _HBMK_aOPTC ], "-D_GNU_SOURCE" )
          CASE hbmk[ _HBMK_cCOMP ] == "clang"
             cBin_CompC := hbmk[ _HBMK_cCCPREFIX ] + "clang" + hbmk[ _HBMK_cCCPOSTFIX ]
+            cBin_CompCPP := cBin_CompC
          CASE hbmk[ _HBMK_cCOMP ] == "open64"
-            cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], "openCC", "opencc" )
+            cBin_CompCPP := "openCC"
+            cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], cBin_CompCPP, "opencc" )
          OTHERWISE
-            cBin_CompC := hbmk[ _HBMK_cCCPREFIX ] + iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], "g++", "gcc" ) + hbmk[ _HBMK_cCCPOSTFIX ]
+            cBin_CompCPP := hbmk[ _HBMK_cCCPREFIX ] + "g++" + hbmk[ _HBMK_cCCPOSTFIX ]
+            cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], cBin_CompCPP, hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] )
          ENDCASE
          cOpt_CompC := "-c"
          IF hbmk[ _HBMK_lOPTIM ]
@@ -2329,7 +2358,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             ENDIF
          ENDIF
          IF lStopAfterCComp
-            IF ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ] .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
+            IF ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ] .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) ) == 1
                IF hbmk[ _HBMK_cPLAT ] $ "darwin|sunos"
                   AAdd( hbmk[ _HBMK_aOPTC ], "-o {OO}" )
                ELSE
@@ -2439,7 +2468,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          cLibPrefix := "-l"
          cLibExt := ""
          cObjExt := ".o"
-         cBin_CompC := hbmk[ _HBMK_cCCPREFIX ] + iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], "g++", "gcc" ) + hbmk[ _HBMK_cCCPOSTFIX ] + cCCEXT
+         cBin_CompCPP := hbmk[ _HBMK_cCCPREFIX ] + "g++" + hbmk[ _HBMK_cCCPOSTFIX ] + cCCEXT
+         cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], cBin_CompCPP, hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] + cCCEXT )
          cOpt_CompC := "-c"
          IF hbmk[ _HBMK_lOPTIM ]
             cOpt_CompC += " -O3"
@@ -2474,9 +2504,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          cOpt_Lib := "{FA} rcs {OL} {LO}"
          cLibObjPrefix := NIL
          IF ! Empty( hbmk[ _HBMK_cCCPATH ] )
-            cBin_Lib   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Lib, nCmd_Esc )
-            cBin_CompC := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompC, nCmd_Esc )
-            cBin_Link  := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Link, nCmd_Esc )
+            cBin_Lib     := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Lib, nCmd_Esc )
+            cBin_CompCPP := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompCPP, nCmd_Esc )
+            cBin_CompC   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompC, nCmd_Esc )
+            cBin_Link    := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Link, nCmd_Esc )
          ENDIF
          IF !( hbmk[ _HBMK_cPLAT ] == "wce" )
             IF hbmk[ _HBMK_lGUI ]
@@ -2510,7 +2541,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             ENDIF
          ENDIF
          IF lStopAfterCComp
-            IF ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ] .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
+            IF ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ] .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) ) == 1
                AAdd( hbmk[ _HBMK_aOPTC ], "-o{OO}" )
             ENDIF
          ELSE
@@ -2553,7 +2584,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          cLibPrefix := "-l"
          cLibExt := ""
          cObjExt := ".o"
-         cBin_CompC := hbmk[ _HBMK_cCCPREFIX ] + iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], "g++", "gcc" ) + hbmk[ _HBMK_cCCPOSTFIX ] + cCCEXT
+         cBin_CompCPP := hbmk[ _HBMK_cCCPREFIX ] + "g++" + hbmk[ _HBMK_cCCPOSTFIX ] + cCCEXT
+         cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], cBin_CompCPP, hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] + cCCEXT )
          cOpt_CompC := "-c"
          IF hbmk[ _HBMK_lOPTIM ]
             cOpt_CompC += " -O3"
@@ -2611,7 +2643,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ENDIF
          /* OS/2 needs a space between -o and file name following it */
          IF lStopAfterCComp
-            IF ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ] .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
+            IF ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ] .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) ) == 1
                AAdd( hbmk[ _HBMK_aOPTC ], "-o {OO}" )
             ENDIF
          ELSE
@@ -2631,10 +2663,11 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ENDIF
 
          IF ! Empty( hbmk[ _HBMK_cCCPATH ] )
-            cBin_Lib   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Lib, nCmd_Esc )
-            cBin_CompC := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompC, nCmd_Esc )
-            cBin_Link  := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Link, nCmd_Esc )
-            cBin_Res   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Res, nCmd_Esc )
+            cBin_Lib     := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Lib, nCmd_Esc )
+            cBin_CompCPP := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompCPP, nCmd_Esc )
+            cBin_CompC   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompC, nCmd_Esc )
+            cBin_Link    := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Link, nCmd_Esc )
+            cBin_Res     := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Res, nCmd_Esc )
          ENDIF
 
       CASE hbmk[ _HBMK_cPLAT ] == "dos" .AND. hbmk[ _HBMK_cCOMP ] == "djgpp"
@@ -2646,7 +2679,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          cLibPrefix := "-l"
          cLibExt := ""
          cObjExt := ".o"
-         cBin_CompC := hbmk[ _HBMK_cCCPREFIX ] + iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], "gpp", "gcc" ) + hbmk[ _HBMK_cCCPOSTFIX ] + cCCEXT
+         cBin_CompCPP := hbmk[ _HBMK_cCCPREFIX ] + "gpp" + hbmk[ _HBMK_cCCPOSTFIX ] + cCCEXT
+         cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], cBin_CompCPP, hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] + cCCEXT )
          cOpt_CompC := "-c"
          IF hbmk[ _HBMK_lOPTIM ]
             cOpt_CompC += " -O3"
@@ -2694,7 +2728,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             ENDIF
          ENDIF
          IF lStopAfterCComp
-            IF ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ] .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
+            IF ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ] .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) ) == 1
                AAdd( hbmk[ _HBMK_aOPTC ], "-o{OO}" )
             ENDIF
          ELSE
@@ -2709,9 +2743,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                                                    "harbour" + cLibExt ) }
 
          IF ! Empty( hbmk[ _HBMK_cCCPATH ] )
-            cBin_Lib   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Lib, nCmd_Esc )
-            cBin_CompC := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompC, nCmd_Esc )
-            cBin_Link  := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Link, nCmd_Esc )
+            cBin_Lib     := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Lib, nCmd_Esc )
+            cBin_CompCPP := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompCPP, nCmd_Esc )
+            cBin_CompC   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompC, nCmd_Esc )
+            cBin_Link    := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Link, nCmd_Esc )
          ENDIF
 
       /* Watcom family */
@@ -2740,8 +2775,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
 
          cLibPathPrefix := "LIBPATH "
          cLibPathSep := " "
+         cBin_CompCPP := "wpp386" + cCCEXT
          IF hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ]
-            cBin_CompC := "wpp386" + cCCEXT
+            cBin_CompC := cBin_CompCPP
          ELSE
             cBin_CompC := "wcc386" + cCCEXT
          ENDIF
@@ -2782,7 +2818,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             cOpt_CompC += " {LC}"
          ENDIF
          IF lStopAfterCComp .AND. ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ]
-            IF ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
+            IF ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) ) == 1
                AAdd( hbmk[ _HBMK_aOPTC ], "-fo={OO}" )
             ELSE
                AAdd( hbmk[ _HBMK_aOPTC ], "-fo={OD}" )
@@ -2903,6 +2939,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          cLibObjPrefix := "-+ "
          cOptIncMask := "-I{DI}"
          cBin_CompC := "bcc32.exe"
+         cBin_CompCPP := cBin_CompC
          cOpt_CompC := "-c -q -tWM"
          IF hbmk[ _HBMK_lOPTIM ]
             cOpt_CompC += " -d -6 -O2 -OS -Ov -Oi -Oc"
@@ -2944,7 +2981,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             ENDIF
          ELSE
             IF lStopAfterCComp .AND. ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ]
-               IF ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
+               IF ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) ) == 1
                   AAdd( hbmk[ _HBMK_aOPTC ], "-o{OO}" )
                ELSE
                   AAdd( hbmk[ _HBMK_aOPTC ], "-n{OD}" )
@@ -3015,6 +3052,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             cBin_Link := "link.exe"
             cBin_Dyn := cBin_Link
          ENDIF
+         cBin_CompCPP := cBin_CompC
          nCmd_Esc := _ESC_DBLQUOTE
          cOpt_Lib := "-nologo {FA} -out:{OL} {LO}"
          cOpt_Dyn := "{FD} -dll -out:{OD} {DL} {LO} {LL} {LB} {LS}"
@@ -3084,7 +3122,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             ENDIF
          ELSE
             IF lStopAfterCComp .AND. ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ]
-               IF ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
+               IF ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) ) == 1
                   AAdd( hbmk[ _HBMK_aOPTC ], "-Fo{OO}" )
                ELSE
                   AAdd( hbmk[ _HBMK_aOPTC ], "-Fo{OD}" )
@@ -3147,6 +3185,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             cBin_Link := "polink.exe"
             cBin_Res := "porc.exe"
          ENDIF
+         cBin_CompCPP := cBin_CompC
          cBin_Dyn := cBin_Link
          cOpt_CompC := "-c -Ze"
          IF !( hbmk[ _HBMK_cCOMP ] == "poccarm" ) .AND. ;
@@ -3233,7 +3272,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ELSE
             cOpt_Lib := "{FA} rc {OL} {LO}"
          ENDIF
-         cBin_CompC := hbmk[ _HBMK_cCCPREFIX ] + iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], "sunCC", "suncc" ) + hbmk[ _HBMK_cCCPOSTFIX ]
+         cBin_CompCPP := hbmk[ _HBMK_cCCPREFIX ] + "sunCC" + hbmk[ _HBMK_cCCPOSTFIX ]
+         cBin_CompC := iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], cBin_CompCPP, hbmk[ _HBMK_cCCPREFIX ] + "suncc" + hbmk[ _HBMK_cCCPOSTFIX ] )
          cOpt_CompC := "-c {FC}"
          IF hbmk[ _HBMK_lOPTIM ]
             AAdd( hbmk[ _HBMK_aOPTC ], "-fast" )
@@ -3283,7 +3323,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             ENDIF
          ENDIF
          IF lStopAfterCComp
-            IF ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ] .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) ) == 1
+            IF ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ] .AND. ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) ) == 1
                AAdd( hbmk[ _HBMK_aOPTC ], "-o {OO}" )
             ENDIF
          ELSE
@@ -3337,8 +3377,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ENDIF
 
          IF ! Empty( hbmk[ _HBMK_cCCPATH ] )
-            cBin_CompC := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompC, nCmd_Esc )
-            cBin_Link  := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Link, nCmd_Esc )
+            cBin_CompCPP := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompCPP, nCmd_Esc )
+            cBin_CompC   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompC, nCmd_Esc )
+            cBin_Link    := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Link, nCmd_Esc )
          ENDIF
 
       ENDCASE
@@ -3451,7 +3492,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
 
       IF hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lREBUILD ]
          l_aC_TODO := {}
-         l_aC_DONE := {}
          FOR EACH tmp IN hbmk[ _HBMK_aC ]
             IF hbmk[ _HBMK_lDEBUGINC ]
                hbmk_OutStd( hb_StrFormat( "debuginc: C %1$s %2$s", tmp, FN_DirExtSet( tmp, cWorkDir, cObjExt ) ) )
@@ -3461,13 +3501,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                tmp1 > tmp2 .OR. ;
                ( hbmk[ _HBMK_nHEAD ] != _HEAD_OFF .AND. FindNewerHeaders( hbmk, tmp, NIL, tmp2, ! Empty( hbmk[ _HBMK_aINCTRYPATH ] ), .T., cBin_CompC, nCmd_Esc, @headstate ) )
                AAdd( l_aC_TODO, tmp )
-            ELSE
-               AAdd( l_aC_DONE, tmp )
             ENDIF
          NEXT
       ELSE
          l_aC_TODO := AClone( hbmk[ _HBMK_aC ] )
-         l_aC_DONE := {}
       ENDIF
 
       /* Header dir detection if needed and if FindNewerHeaders() wasn't called yet. */
@@ -3478,6 +3515,37 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
       ENDIF
    ENDIF
 
+   /* Do header detection and create incremental file list for .cpp files */
+
+   IF ! lSkipBuild .AND. ! lStopAfterInit .AND. ! lStopAfterHarbour
+
+      headstate := NIL
+
+      IF hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lREBUILD ]
+         l_aCPP_TODO := {}
+         FOR EACH tmp IN hbmk[ _HBMK_aCPP ]
+            IF hbmk[ _HBMK_lDEBUGINC ]
+               hbmk_OutStd( hb_StrFormat( "debuginc: C++ %1$s %2$s", tmp, FN_DirExtSet( tmp, cWorkDir, cObjExt ) ) )
+            ENDIF
+            IF ! hb_FGetDateTime( FN_DirExtSet( tmp, cWorkDir, cObjExt ), @tmp2 ) .OR. ;
+               ! hb_FGetDateTime( tmp, @tmp1 ) .OR. ;
+               tmp1 > tmp2 .OR. ;
+               ( hbmk[ _HBMK_nHEAD ] != _HEAD_OFF .AND. FindNewerHeaders( hbmk, tmp, NIL, tmp2, ! Empty( hbmk[ _HBMK_aINCTRYPATH ] ), .T., cBin_CompCPP, nCmd_Esc, @headstate ) )
+               AAdd( l_aCPP_TODO, tmp )
+            ENDIF
+         NEXT
+      ELSE
+         l_aCPP_TODO := AClone( hbmk[ _HBMK_aCPP ] )
+      ENDIF
+
+      /* Header dir detection if needed and if FindNewerHeaders() wasn't called yet. */
+      IF ! Empty( hbmk[ _HBMK_aINCTRYPATH ] ) .AND. ! Empty( l_aCPP_TODO ) .AND. headstate == NIL
+         FOR EACH tmp IN l_aCPP_TODO
+            FindNewerHeaders( hbmk, tmp, NIL, NIL, .T., .T., cBin_CompCPP, nCmd_Esc, @headstate )
+         NEXT
+      ENDIF
+   ENDIF
+
    /* Create incremental file list for .prg files */
 
    IF ! lSkipBuild .AND. ! lStopAfterInit .AND. ! lStopAfterHarbour .AND. hbmk[ _HBMK_nHBMODE ] != _HBMODE_RAW_C
@@ -3678,7 +3746,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                   AAdd( array, "HB_GT_" + Upper( SubStr( hbmk[ _HBMK_cGT ], 3 ) ) )
                ENDIF
                IF ! Empty( hbmk[ _HBMK_aLIBUSERGT ] )
-                  AEval( hbmk[ _HBMK_aLIBUSERGT ], {|tmp| AAdd( array, "HB_GT_" + Upper( SubStr( tmp, 3 ) ) ) } )
+                  AEval( hbmk[ _HBMK_aLIBUSERGT ], {| tmp | AAdd( array, "HB_GT_" + Upper( SubStr( tmp, 3 ) ) ) } )
                ENDIF
 
                /* Build C stub */
@@ -3688,9 +3756,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                         ''                                                                        + Chr( 10 ) +;
                         '#include "hbapi.h"'                                                      + Chr( 10 )
                IF ! Empty( array ) .OR. l_cCMAIN != NIL
-                  AEval( array, {|tmp, i| array[ i ] := FuncNameEncode( tmp ) } )
+                  AEval( array, {| tmp, i | array[ i ] := FuncNameEncode( tmp ) } )
                   cFile += ''                                                                     + Chr( 10 )
-                  AEval( array, {|tmp| cFile += 'HB_FUNC_EXTERN( ' + tmp + ' );'                  + Chr( 10 ) } )
+                  AEval( array, {| tmp | cFile += 'HB_FUNC_EXTERN( ' + tmp + ' );'                + Chr( 10 ) } )
                   IF l_cCMAIN != NIL
                      cFile += ''                                                                  + Chr( 10 )
                      cFile += 'HB_EXTERN_C void ' + l_cCMAIN + '( void );'                        + Chr( 10 )
@@ -3698,7 +3766,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                   cFile += ''                                                                     + Chr( 10 )
                   cFile += 'void _hb_lnk_ForceLink_hbmk( void )'                                  + Chr( 10 )
                   cFile += '{'                                                                    + Chr( 10 )
-                  AEval( array, {|tmp| cFile += '   HB_FUNC_EXEC( ' + tmp + ' );'                 + Chr( 10 ) } )
+                  AEval( array, {| tmp | cFile += '   HB_FUNC_EXEC( ' + tmp + ' );'               + Chr( 10 ) } )
                   IF l_cCMAIN != NIL
                      cFile += ''                                                                  + Chr( 10 )
                      cFile += '   ' + l_cCMAIN + '();'                                            + Chr( 10 )
@@ -3774,7 +3842,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                ELSE
                   hbmk_OutErr( I_( "Warning: Stub helper .c program couldn't be created." ) )
                   IF ! hbmk[ _HBMK_lINC ]
-                     AEval( ListDirExt( hbmk[ _HBMK_aPRG ], cWorkDir, ".c", .T. ), {|tmp| FErase( tmp ) } )
+                     AEval( ListDirExt( hbmk[ _HBMK_aPRG ], cWorkDir, ".c", .T. ), {| tmp | FErase( tmp ) } )
                   ENDIF
                   IF hbmk[ _HBMK_lBEEP ]
                      DoBeep( .F. )
@@ -3788,6 +3856,94 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             ENDIF
          ENDIF
 
+         /* HACK: Override memory allocation functions for apps that request it. */
+         IF ! lStopAfterCComp .AND. ;
+            ! Empty( cBin_CompCPP ) .AND. ;
+            hbmk[ _HBMK_lHBCPPMM ]
+
+            l_cCPPSTUB := DirAddPathSep( cWorkDir ) + "_hbmkcpp.cpp"
+
+            IF ! l_lCLEAN
+
+               /* Build C++ stub */
+               /* Use the same EOL for all platforms to avoid unnecessary rebuilds. */
+               cFile := '/* This temp source file was generated by hbmk2 tool. */'                + Chr( 10 ) +;
+                        '/* You can safely delete it. */'                                         + Chr( 10 ) +;
+                        ''                                                                        + Chr( 10 ) +;
+                        '#include "hbapi.h"'                                                      + Chr( 10 ) +;
+                        ''                                                                        + Chr( 10 ) +;
+                        '#if defined( __cplusplus )'                                              + Chr( 10 ) +;
+                        ''                                                                        + Chr( 10 ) +;
+                        'void * operator new[]( size_t nSize )'                                   + Chr( 10 ) +;
+                        '{'                                                                       + Chr( 10 ) +;
+                        '   return hb_xgrab( nSize );'                                            + Chr( 10 ) +;
+                        '}'                                                                       + Chr( 10 ) +;
+                        ''                                                                        + Chr( 10 ) +;
+                        'void * operator new( size_t nSize )'                                     + Chr( 10 ) +;
+                        '{'                                                                       + Chr( 10 ) +;
+                        '   return hb_xgrab( nSize );'                                            + Chr( 10 ) +;
+                        '}'                                                                       + Chr( 10 ) +;
+                        ''                                                                        + Chr( 10 ) +;
+                        'void operator delete[]( void * ptr )'                                    + Chr( 10 ) +;
+                        '{'                                                                       + Chr( 10 ) +;
+                        '   hb_xfree( ptr );'                                                     + Chr( 10 ) +;
+                        '}'                                                                       + Chr( 10 ) +;
+                        ''                                                                        + Chr( 10 ) +;
+                        'void operator delete[]( void * ptr, size_t )'                            + Chr( 10 ) +;
+                        '{'                                                                       + Chr( 10 ) +;
+                        '   hb_xfree( ptr );'                                                     + Chr( 10 ) +;
+                        '}'                                                                       + Chr( 10 ) +;
+                        ''                                                                        + Chr( 10 ) +;
+                        'void operator delete( void * ptr )'                                      + Chr( 10 ) +;
+                        '{'                                                                       + Chr( 10 ) +;
+                        '   hb_xfree( ptr );'                                                     + Chr( 10 ) +;
+                        '}'                                                                       + Chr( 10 ) +;
+                        ''                                                                        + Chr( 10 ) +;
+                        'void operator delete( void * ptr, size_t )'                              + Chr( 10 ) +;
+                        '{'                                                                       + Chr( 10 ) +;
+                        '   hb_xfree( ptr );'                                                     + Chr( 10 ) +;
+                        '}'                                                                       + Chr( 10 ) +;
+                        ''                                                                        + Chr( 10 ) +;
+                        '#endif'                                                                  + Chr( 10 )
+
+               IF hbmk[ _HBMK_lINC ]
+                  IF hbmk[ _HBMK_lREBUILD ] .OR. !( hb_MemoRead( l_cCPPSTUB ) == cFile )
+                     fhnd := FCreate( l_cCPPSTUB )
+                  ELSE
+                     fhnd := NIL
+                  ENDIF
+               ELSE
+                  fhnd := hb_FTempCreateEx( @l_cCPPSTUB, NIL, "hbmk_", ".cpp" )
+               ENDIF
+               IF fhnd == NIL
+                  AAdd( hbmk[ _HBMK_aCPP ], l_cCPPSTUB )
+               ELSEIF fhnd != F_ERROR
+                  FWrite( fhnd, cFile )
+                  FClose( fhnd )
+
+                  IF hbmk[ _HBMK_lDEBUGSTUB ]
+                     OutStd( "C++ stub dump:" + _OUT_EOL )
+                     OutStd( cFile )
+                  ENDIF
+                  AAdd( hbmk[ _HBMK_aCPP ], l_cCPPSTUB )
+                  AAdd( l_aCPP_TODO, l_cCPPSTUB )
+               ELSE
+                  hbmk_OutErr( I_( "Warning: Stub helper .cpp program couldn't be created." ) )
+                  IF ! hbmk[ _HBMK_lINC ]
+                     AEval( ListDirExt( hbmk[ _HBMK_aPRG ], cWorkDir, ".c", .T. ), {| tmp | FErase( tmp ) } )
+                  ENDIF
+                  IF hbmk[ _HBMK_lBEEP ]
+                     DoBeep( .F. )
+                  ENDIF
+                  RETURN 5
+               ENDIF
+               /* Don't delete stub in workdir in incremental mode. */
+               IF hbmk[ _HBMK_lINC ]
+                  l_cCPPSTUB := NIL
+               ENDIF
+            ENDIF
+         ENDIF
+
          IF ! hbmk[ _HBMK_lSHARED ]
             IF ! Empty( cLIB_BASE_PCRE ) .AND. hb_FileExists( _HBLIB_FULLPATH( cLIB_BASE_PCRE ) )
                AAdd( l_aLIBSYS, cLIB_BASE_PCRE )
@@ -3843,7 +3999,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                   [vszakats] */
          l_aOBJ := {}
       ELSE
-         l_aOBJ := ListDirExt( ArrayJoin( hbmk[ _HBMK_aPRG ], hbmk[ _HBMK_aC ] ), cWorkDir, cObjExt, .T. )
+         l_aOBJ := ListDirExt( ArrayAJoin( { hbmk[ _HBMK_aPRG ], hbmk[ _HBMK_aC ], hbmk[ _HBMK_aCPP ] } ), cWorkDir, cObjExt, .T. )
       ENDIF
       hbmk[ _HBMK_aOBJUSER ] := ListCook( hbmk[ _HBMK_aOBJUSER ], cObjExt )
 
@@ -3902,9 +4058,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                      '/* You can safely delete it. */'                                         + Chr( 10 ) +;
                      ''                                                                        + Chr( 10 )
             IF hbmk[ _HBMK_cPLAT ] == "os2"
-               AEval( hbmk[ _HBMK_aICON ], {|tmp, tmp1| cFile += 'ICON ' + hb_ntos( tmp1 ) + ' DISCARDABLE "' + FN_Escape( PathSepToTarget( hbmk, tmp ), _ESC_BACKSLASH ) + '"' + Chr( 10 ) } )
+               AEval( hbmk[ _HBMK_aICON ], {| tmp, tmp1 | cFile += 'ICON ' + hb_ntos( tmp1 ) + ' DISCARDABLE "' + FN_Escape( PathSepToTarget( hbmk, tmp ), _ESC_BACKSLASH ) + '"' + Chr( 10 ) } )
             ELSE
-               AEval( hbmk[ _HBMK_aICON ], {|tmp, tmp1| cFile += 'ICON' + hb_ntos( tmp1 ) + ' ICON DISCARDABLE "' + FN_Escape( PathSepToTarget( hbmk, tmp ), _ESC_BACKSLASH ) + '"' + Chr( 10 ) } )
+               AEval( hbmk[ _HBMK_aICON ], {| tmp, tmp1 | cFile += 'ICON' + hb_ntos( tmp1 ) + ' ICON DISCARDABLE "' + FN_Escape( PathSepToTarget( hbmk, tmp ), _ESC_BACKSLASH ) + '"' + Chr( 10 ) } )
             ENDIF
 
             IF hbmk[ _HBMK_lINC ]
@@ -4036,7 +4192,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
 
          IF hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lREBUILD ]
             l_aPRG_TODO := {}
-            l_aPRG_DONE := {}
 
             FOR EACH tmp IN hbmk[ _HBMK_aPRG ]
                IF LEFTEQUAL( tmp, "@" ) .AND. Lower( FN_ExtGet( tmp ) ) == ".clp"
@@ -4053,154 +4208,159 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
                   ! hb_FGetDateTime( FN_DirExtSet( tmp3, cWorkDir, cObjExt ), @tmp2 ) .OR. ;
                   tmp1 > tmp2
                   AAdd( l_aPRG_TODO, tmp )
-               ELSE
-                  AAdd( l_aPRG_DONE, tmp )
                ENDIF
             NEXT
          ELSE
             l_aPRG_TODO := hbmk[ _HBMK_aPRG ]
-            l_aPRG_DONE := {}
          ENDIF
       ENDIF
 
-      IF nErrorLevel == 0 .AND. ( Len( l_aPRG_TODO ) + Len( l_aC_TODO ) + iif( Empty( cBin_Link ), Len( hbmk[ _HBMK_aOBJUSER ] ) + Len( l_aOBJA ), 0 ) ) > 0 .AND. ! l_lCLEAN
+      IF ! l_lCLEAN
 
-         IF ! Empty( cBin_CompC )
+         FOR EACH tmp3 IN { _CCOMP_PASS_C, _CCOMP_PASS_CPP }
 
-            IF hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ]
-               hbmk_OutStd( I_( "Compiling..." ) )
-            ENDIF
-
-            /* Compiling */
-
-            nOpt_Esc := iif( "{SCRIPT}" $ cOpt_CompC, nScr_Esc, nCmd_Esc )
-
-            /* Order is significant */
-            cOpt_CompC := StrTran( cOpt_CompC, "{FC}"  , iif( hbmk[ _HBMK_lBLDFLGC ], hb_Version( HB_VERSION_FLAG_C ) + " ", "" ) +;
-                                                         GetEnv( "HB_USER_CFLAGS" ) + " " + ArrayToList( hbmk[ _HBMK_aOPTC ] ) )
-            cOpt_CompC := StrTran( cOpt_CompC, "{LR}"  , ArrayToList( ArrayJoin( ListDirExt( hbmk[ _HBMK_aRESSRC ], cWorkDir, cResExt ), hbmk[ _HBMK_aRESCMP ] ),, nOpt_Esc ) )
-            cOpt_CompC := StrTran( cOpt_CompC, "{LO}"  , ArrayToList( ArrayAJoin( { hbmk[ _HBMK_aOBJUSER ], ListCook( l_aPRG_DONE, cObjExt ), ListCook( l_aC_DONE, cObjExt ) } ),, nOpt_Esc, cObjPrefix ) )
-            cOpt_CompC := StrTran( cOpt_CompC, "{LS}"  , ArrayToList( ArrayJoin( ListDirExt( hbmk[ _HBMK_aRESSRC ], "", cResExt ), hbmk[ _HBMK_aRESCMP ] ),, nOpt_Esc, cResPrefix ) )
-            cOpt_CompC := StrTran( cOpt_CompC, "{LA}"  , ArrayToList( l_aOBJA,, nOpt_Esc ) )
-            cOpt_CompC := StrTran( cOpt_CompC, "{LL}"  , ArrayToList( l_aLIB,, nOpt_Esc, cLibPrefix ) )
-            cOpt_CompC := StrTran( cOpt_CompC, "{LB}"  , ArrayToList( l_aLIBA,, nOpt_Esc ) )
-            cOpt_CompC := StrTran( cOpt_CompC, "{OD}"  , FN_Escape( PathSepToTarget( hbmk, FN_DirGet( l_cPROGNAME ) ), nOpt_Esc ) )
-            cOpt_CompC := StrTran( cOpt_CompC, "{OE}"  , FN_Escape( PathSepToTarget( hbmk, l_cPROGNAME ), nOpt_Esc ) )
-            cOpt_CompC := StrTran( cOpt_CompC, "{OM}"  , FN_Escape( PathSepToTarget( hbmk, FN_ExtSet( l_cPROGNAME, ".map" ) ), nOpt_Esc ) )
-            cOpt_CompC := StrTran( cOpt_CompC, "{DL}"  , ArrayToList( hbmk[ _HBMK_aLIBPATH ], cLibPathSep, nOpt_Esc, cLibPathPrefix ) )
-            cOpt_CompC := StrTran( cOpt_CompC, "{DB}"  , l_cHB_BIN_INSTALL )
-            cOpt_CompC := StrTran( cOpt_CompC, "{DI}"  , FN_Escape( l_cHB_INC_INSTALL, nOpt_Esc ) )
-
-            IF "{IC}" $ cOpt_CompC
-
-               aThreads := {}
-               FOR EACH aTODO IN ArraySplit( ArrayJoin( ListDirExt( l_aPRG_TODO, cWorkDir, ".c", .T. ), l_aC_TODO ), l_nJOBS )
-                  IF hb_mtvm() .AND. Len( aTODO:__enumBase() ) > 1
-                     AAdd( aThreads, hb_threadStart( @CompileCLoop(), hbmk, aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cObjExt, nOpt_Esc, aTODO:__enumIndex(), Len( aTODO:__enumBase() ) ) )
-                  ELSE
-                     IF ! CompileCLoop( hbmk, aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cObjExt, nOpt_Esc, 0, 0 )
-                        IF ! hbmk[ _HBMK_lIGNOREERROR ]
-                           nErrorLevel := 6
-                           EXIT
-                        ENDIF
-                     ENDIF
-                  ENDIF
-               NEXT
-
-               IF hb_mtvm() .AND. Len( aThreads ) > 1
-                  FOR EACH thread IN aThreads
-                     hb_threadJoin( thread, @tmp )
-                     IF ! tmp
-                        IF ! hbmk[ _HBMK_lIGNOREERROR ]
-                           nErrorLevel := 6
-                        ENDIF
-                     ENDIF
-                  NEXT
-               ENDIF
+            IF tmp3 == _CCOMP_PASS_C
+               l_aCGEN_TODO := ArrayJoin( ListDirExt( l_aPRG_TODO, cWorkDir, ".c", .T. ), l_aC_TODO )
+               cBin_CompCGEN := cBin_CompC
             ELSE
-               cOpt_CompC := StrTran( cOpt_CompC, "{OO}"  , FN_Escape( PathSepToTarget( hbmk, FN_ExtSet( l_cPROGNAME, cObjExt ) ), nOpt_Esc ) )
-               cOpt_CompC := StrTran( cOpt_CompC, "{OW}"  , FN_Escape( PathSepToTarget( hbmk, cWorkDir ), nOpt_Esc ) )
+               l_aCGEN_TODO := AClone( l_aCPP_TODO )
+               cBin_CompCGEN := cBin_CompCPP
+            ENDIF
 
-               aThreads := {}
-               FOR EACH aTODO IN ArraySplit( ArrayJoin( ListDirExt( l_aPRG_TODO, cWorkDir, ".c", .T. ), l_aC_TODO ), l_nJOBS )
+            IF nErrorLevel == 0 .AND. Len( l_aCGEN_TODO ) > 0
 
-                  cOpt_CompCLoop := AllTrim( StrTran( cOpt_CompC, "{LC}"  , ArrayToList( aTODO,, nOpt_Esc ) ) )
+               IF ! Empty( cBin_CompCGEN )
 
-                  /* Handle moving the whole command line to a script, if requested. */
-                  cScriptFile := NIL
-                  IF "{SCRIPT}" $ cOpt_CompCLoop
-                     fhnd := hb_FTempCreateEx( @cScriptFile, NIL, NIL, ".cpl" )
-                     IF fhnd != F_ERROR
-                        FWrite( fhnd, StrTran( cOpt_CompCLoop, "{SCRIPT}" ) )
-                        FClose( fhnd )
-                        cOpt_CompCLoop := "@" + cScriptFile
+                  IF hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ]
+                     IF tmp3 == _CCOMP_PASS_C
+                        hbmk_OutStd( I_( "Compiling..." ) )
                      ELSE
-                        hbmk_OutErr( I_( "Warning: C compiler script couldn't be created, continuing in command line." ) )
+                        hbmk_OutStd( I_( "Compiling C++..." ) )
                      ENDIF
                   ENDIF
 
-                  cCommand := cBin_CompC + " " + cOpt_CompCLoop
+                  /* Compiling */
 
-                  IF hbmk[ _HBMK_lTRACE ]
-                     IF ! hbmk[ _HBMK_lQuiet ]
-                        IF Len( aTODO:__enumBase() ) > 1
-                           hbmk_OutStd( hb_StrFormat( I_( "C compiler command job #%1$s:" ), hb_ntos( aTODO:__enumIndex() ) ) )
+                  nOpt_Esc := iif( "{SCRIPT}" $ cOpt_CompC, nScr_Esc, nCmd_Esc )
+
+                  /* Order is significant */
+                  cOpt_CompC := StrTran( cOpt_CompC, "{FC}"  , iif( hbmk[ _HBMK_lBLDFLGC ], hb_Version( HB_VERSION_FLAG_C ) + " ", "" ) +;
+                                                               GetEnv( "HB_USER_CFLAGS" ) + " " + ArrayToList( hbmk[ _HBMK_aOPTC ] ) )
+                  cOpt_CompC := StrTran( cOpt_CompC, "{OD}"  , FN_Escape( PathSepToTarget( hbmk, FN_DirGet( l_cPROGNAME ) ), nOpt_Esc ) )
+                  cOpt_CompC := StrTran( cOpt_CompC, "{DI}"  , FN_Escape( l_cHB_INC_INSTALL, nOpt_Esc ) )
+
+                  IF "{IC}" $ cOpt_CompC
+
+                     aThreads := {}
+                     FOR EACH aTODO IN ArraySplit( l_aCGEN_TODO, l_nJOBS )
+                        IF hb_mtvm() .AND. Len( aTODO:__enumBase() ) > 1
+                           AAdd( aThreads, hb_threadStart( @CompileCLoop(), hbmk, aTODO, cBin_CompCGEN, cOpt_CompC, cWorkDir, cObjExt, nOpt_Esc, aTODO:__enumIndex(), Len( aTODO:__enumBase() ) ) )
                         ELSE
-                           hbmk_OutStd( I_( "C compiler command:" ) )
+                           IF ! CompileCLoop( hbmk, aTODO, cBin_CompCGEN, cOpt_CompC, cWorkDir, cObjExt, nOpt_Esc, 0, 0 )
+                              IF ! hbmk[ _HBMK_lIGNOREERROR ]
+                                 nErrorLevel := 6
+                                 EXIT
+                              ENDIF
+                           ENDIF
                         ENDIF
-                     ENDIF
-                     OutStd( cCommand + _OUT_EOL )
-                     IF ! Empty( cScriptFile )
-                        hbmk_OutStd( I_( "C compiler script:" ) )
-                        OutStd( hb_MemoRead( cScriptFile ) + _OUT_EOL )
-                     ENDIF
-                  ENDIF
+                     NEXT
 
-                  IF ! hbmk[ _HBMK_lDONTEXEC ]
-                     IF hb_mtvm() .AND. Len( aTODO:__enumBase() ) > 1
-                        AAdd( aThreads, { hb_threadStart( @hb_processRun(), cCommand ), cCommand } )
-                     ELSE
-                        IF ( tmp := hb_processRun( cCommand ) ) != 0
-                           hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler. %1$s" ), hb_ntos( tmp ) ) )
+                     IF hb_mtvm() .AND. Len( aThreads ) > 1
+                        FOR EACH thread IN aThreads
+                           hb_threadJoin( thread, @tmp )
+                           IF ! tmp
+                              IF ! hbmk[ _HBMK_lIGNOREERROR ]
+                                 nErrorLevel := 6
+                              ENDIF
+                           ENDIF
+                        NEXT
+                     ENDIF
+                  ELSE
+                     cOpt_CompC := StrTran( cOpt_CompC, "{OO}"  , FN_Escape( PathSepToTarget( hbmk, FN_ExtSet( l_cPROGNAME, cObjExt ) ), nOpt_Esc ) )
+                     cOpt_CompC := StrTran( cOpt_CompC, "{OW}"  , FN_Escape( PathSepToTarget( hbmk, cWorkDir ), nOpt_Esc ) )
+
+                     aThreads := {}
+                     FOR EACH aTODO IN ArraySplit( l_aCGEN_TODO, l_nJOBS )
+
+                        cOpt_CompCLoop := AllTrim( StrTran( cOpt_CompC, "{LC}"  , ArrayToList( aTODO,, nOpt_Esc ) ) )
+
+                        /* Handle moving the whole command line to a script, if requested. */
+                        cScriptFile := NIL
+                        IF "{SCRIPT}" $ cOpt_CompCLoop
+                           fhnd := hb_FTempCreateEx( @cScriptFile, NIL, NIL, ".cpl" )
+                           IF fhnd != F_ERROR
+                              FWrite( fhnd, StrTran( cOpt_CompCLoop, "{SCRIPT}" ) )
+                              FClose( fhnd )
+                              cOpt_CompCLoop := "@" + cScriptFile
+                           ELSE
+                              hbmk_OutErr( I_( "Warning: C/C++ compiler script couldn't be created, continuing in command line." ) )
+                           ENDIF
+                        ENDIF
+
+                        cCommand := cBin_CompCGEN + " " + cOpt_CompCLoop
+
+                        IF hbmk[ _HBMK_lTRACE ]
                            IF ! hbmk[ _HBMK_lQuiet ]
-                              OutErr( cCommand + _OUT_EOL )
+                              IF Len( aTODO:__enumBase() ) > 1
+                                 hbmk_OutStd( hb_StrFormat( I_( "C/C++ compiler command job #%1$s:" ), hb_ntos( aTODO:__enumIndex() ) ) )
+                              ELSE
+                                 hbmk_OutStd( I_( "C/C++ compiler command:" ) )
+                              ENDIF
                            ENDIF
-                           IF ! hbmk[ _HBMK_lIGNOREERROR ]
-                              nErrorLevel := 6
-                              EXIT
+                           OutStd( cCommand + _OUT_EOL )
+                           IF ! Empty( cScriptFile )
+                              hbmk_OutStd( I_( "C/C++ compiler script:" ) )
+                              OutStd( hb_MemoRead( cScriptFile ) + _OUT_EOL )
                            ENDIF
                         ENDIF
+
+                        IF ! hbmk[ _HBMK_lDONTEXEC ]
+                           IF hb_mtvm() .AND. Len( aTODO:__enumBase() ) > 1
+                              AAdd( aThreads, { hb_threadStart( @hb_processRun(), cCommand ), cCommand } )
+                           ELSE
+                              IF ( tmp := hb_processRun( cCommand ) ) != 0
+                                 hbmk_OutErr( hb_StrFormat( I_( "Error: Running C/C++ compiler. %1$s" ), hb_ntos( tmp ) ) )
+                                 IF ! hbmk[ _HBMK_lQuiet ]
+                                    OutErr( cCommand + _OUT_EOL )
+                                 ENDIF
+                                 IF ! hbmk[ _HBMK_lIGNOREERROR ]
+                                    nErrorLevel := 6
+                                    EXIT
+                                 ENDIF
+                              ENDIF
+                           ENDIF
+                        ENDIF
+
+                        IF ! Empty( cScriptFile )
+                           FErase( cScriptFile )
+                        ENDIF
+                     NEXT
+
+                     IF hb_mtvm() .AND. Len( aThreads ) > 1
+                        FOR EACH thread IN aThreads
+                           hb_threadJoin( thread[ 1 ], @tmp )
+                           IF tmp != 0
+                              IF Len( aThreads ) > 1
+                                 hbmk_OutErr( hb_StrFormat( I_( "Error: Running C/C++ compiler job #%1$s. %2$s" ), hb_ntos( thread:__enumIndex() ), hb_ntos( tmp ) ) )
+                              ELSE
+                                 hbmk_OutErr( hb_StrFormat( I_( "Error: Running C/C++ compiler. %1$s" ), hb_ntos( tmp ) ) )
+                              ENDIF
+                              IF ! hbmk[ _HBMK_lQuiet ]
+                                 OutErr( thread[ 2 ] + _OUT_EOL )
+                              ENDIF
+                              IF ! hbmk[ _HBMK_lIGNOREERROR ]
+                                 nErrorLevel := 6
+                              ENDIF
+                           ENDIF
+                        NEXT
                      ENDIF
                   ENDIF
-
-                  IF ! Empty( cScriptFile )
-                     FErase( cScriptFile )
-                  ENDIF
-               NEXT
-
-               IF hb_mtvm() .AND. Len( aThreads ) > 1
-                  FOR EACH thread IN aThreads
-                     hb_threadJoin( thread[ 1 ], @tmp )
-                     IF tmp != 0
-                        IF Len( aThreads ) > 1
-                           hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler job #%1$s. %2$s" ), hb_ntos( thread:__enumIndex() ), hb_ntos( tmp ) ) )
-                        ELSE
-                           hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler. %1$s" ), hb_ntos( tmp ) ) )
-                        ENDIF
-                        IF ! hbmk[ _HBMK_lQuiet ]
-                           OutErr( thread[ 2 ] + _OUT_EOL )
-                        ENDIF
-                        IF ! hbmk[ _HBMK_lIGNOREERROR ]
-                           nErrorLevel := 6
-                        ENDIF
-                     ENDIF
-                  NEXT
+               ELSE
+                  hbmk_OutErr( I_( "Error: C/C++ command isn't implemented for this platform/compiler." ) )
+                  nErrorLevel := 8
                ENDIF
             ENDIF
-         ELSE
-            hbmk_OutErr( I_( "Error: This platform/compiler isn't implemented." ) )
-            nErrorLevel := 8
-         ENDIF
+         NEXT
       ENDIF
 
       IF nErrorLevel == 0
@@ -4488,22 +4648,26 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          FErase( l_cCSTUB )
          FErase( FN_DirExtSet( l_cCSTUB, cWorkDir, cObjExt ) )
       ENDIF
+      IF ! Empty( l_cCPPSTUB )
+         FErase( l_cCPPSTUB )
+         FErase( FN_DirExtSet( l_cCPPSTUB, cWorkDir, cObjExt ) )
+      ENDIF
       IF ! Empty( l_cRESSTUB )
          FErase( l_cRESSTUB )
          FErase( FN_DirExtSet( l_cRESSTUB, cWorkDir, cResExt ) )
       ENDIF
       IF ! hbmk[ _HBMK_lINC ] .OR. l_lCLEAN
-         AEval( ListDirExt( hbmk[ _HBMK_aPRG ], cWorkDir, ".c", .T. ), {|tmp| FErase( tmp ) } )
+         AEval( ListDirExt( hbmk[ _HBMK_aPRG ], cWorkDir, ".c", .T. ), {| tmp | FErase( tmp ) } )
       ENDIF
       IF ! lStopAfterCComp .OR. hbmk[ _HBMK_lCreateLib ] .OR. hbmk[ _HBMK_lCreateDyn ]
          IF ! hbmk[ _HBMK_lINC ] .OR. l_lCLEAN
             IF ! Empty( cResExt )
-               AEval( ListDirExt( hbmk[ _HBMK_aRESSRC ], cWorkDir, cResExt ), {|tmp| FErase( tmp ) } )
+               AEval( ListDirExt( hbmk[ _HBMK_aRESSRC ], cWorkDir, cResExt ), {| tmp | FErase( tmp ) } )
             ENDIF
-            AEval( l_aOBJ, {|tmp| FErase( tmp ) } )
+            AEval( l_aOBJ, {| tmp | FErase( tmp ) } )
          ENDIF
       ENDIF
-      AEval( l_aCLEAN, {|tmp| FErase( tmp ) } )
+      AEval( l_aCLEAN, {| tmp | FErase( tmp ) } )
       IF l_lCLEAN
          DirUnbuild( cWorkDir )
       ENDIF
@@ -4705,9 +4869,9 @@ STATIC FUNCTION CompileCLoop( hbmk, aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cOb
       IF hbmk[ _HBMK_lTRACE ]
          IF ! hbmk[ _HBMK_lQuiet ]
             IF nJobs > 1
-               hbmk_OutStd( hb_StrFormat( I_( "C compiler command job #%1$s:" ), hb_ntos( nJob ) ) )
+               hbmk_OutStd( hb_StrFormat( I_( "C/C++ compiler command job #%1$s:" ), hb_ntos( nJob ) ) )
             ELSE
-               hbmk_OutStd( I_( "C compiler command:" ) )
+               hbmk_OutStd( I_( "C/C++ compiler command:" ) )
             ENDIF
          ENDIF
          OutStd( cCommand + _OUT_EOL )
@@ -4715,9 +4879,9 @@ STATIC FUNCTION CompileCLoop( hbmk, aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cOb
 
       IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp1 := hb_processRun( cCommand ) ) != 0
          IF nJobs > 1
-            hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler job #%1$s. %2$s" ), hb_ntos( nJob ), hb_ntos( tmp1 ) ) )
+            hbmk_OutErr( hb_StrFormat( I_( "Error: Running C/C++ compiler job #%1$s. %2$s" ), hb_ntos( nJob ), hb_ntos( tmp1 ) ) )
          ELSE
-            hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler. %1$s" ), hb_ntos( tmp1 ) ) )
+            hbmk_OutErr( hb_StrFormat( I_( "Error: Running C/C++ compiler. %1$s" ), hb_ntos( tmp1 ) ) )
          ENDIF
          IF ! hbmk[ _HBMK_lQuiet ]
             OutErr( cCommand + _OUT_EOL )
@@ -4916,7 +5080,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc
    ELSEIF lCMode .AND. hbmk[ _HBMK_nHEAD ] == _HEAD_NATIVE .AND. hbmk[ _HBMK_cCOMP ] $ "gcc|mingw|mingw64|mingwarm|cygwin|djgpp|gccomf|clang|open64"
 
       IF hbmk[ _HBMK_lDEBUGINC ]
-         hbmk_OutStd( hb_StrFormat( "debuginc: Calling C compiler to detect dependencies of %1$s", cFileName ) )
+         hbmk_OutStd( hb_StrFormat( "debuginc: Calling C/C++ compiler to detect dependencies of %1$s", cFileName ) )
       ENDIF
 
       tmp := ""
@@ -5303,7 +5467,7 @@ STATIC FUNCTION ArraySplit( arrayIn, nChunksReq )
 
 STATIC FUNCTION AAddNew( array, xItem )
 
-   IF AScan( array, {|tmp| tmp == xItem } ) == 0
+   IF AScan( array, {| tmp | tmp == xItem } ) == 0
       AAdd( array, xItem )
    ENDIF
 
@@ -5879,9 +6043,13 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
                CASE FN_ExtGet( cItem ) == ".o" .OR. ;
                     FN_ExtGet( cItem ) == ".obj"
                   AAddNew( hbmk[ _HBMK_aOBJUSER ], PathSepToTarget( hbmk, cItem ) )
-               CASE FN_ExtGet( cItem ) == ".c" .OR. ;
-                    FN_ExtGet( cItem ) == ".cpp" /* .cc, .cxx, .cx */
+               CASE FN_ExtGet( cItem ) == ".c"
                   AAddNew( hbmk[ _HBMK_aC ], PathSepToTarget( hbmk, cItem ) )
+               CASE FN_ExtGet( cItem ) == ".cpp" .OR. ;
+                    FN_ExtGet( cItem ) == ".cc" .OR. ;
+                    FN_ExtGet( cItem ) == ".cxx" .OR. ;
+                    FN_ExtGet( cItem ) == ".cx"
+                  AAddNew( hbmk[ _HBMK_aCPP ], PathSepToTarget( hbmk, cItem ) )
                CASE FN_ExtGet( cItem ) == ".d"
                   deplst_read( hbmk[ _HBMK_hDEPTS ], PathSepToSelf( cItem ) )
                CASE FN_ExtGet( cItem ) == ".po" .OR. ;
@@ -5938,7 +6106,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
                ENDIF
             ELSE
                cItem := PathSepToTarget( hbmk, cItem )
-               IF AScan( hbmk[ _HBMK_aLIBUSER ], {|tmp| tmp == cItem } ) == 0
+               IF AScan( hbmk[ _HBMK_aLIBUSER ], {| tmp | tmp == cItem } ) == 0
                   AAddNotEmpty( hbmk[ _HBMK_aLIBUSER ], cItem )
                ENDIF
             ENDIF
@@ -5947,7 +6115,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
       CASE Lower( Left( cLine, Len( "syslibs="      ) ) ) == "syslibs="      ; cLine := SubStr( cLine, Len( "syslibs="      ) + 1 )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             cItem := PathSepToTarget( hbmk, MacroProc( hbmk, StrStripQuote( cItem ), cFileName ) )
-            IF AScan( hbmk[ _HBMK_aLIBUSERSYS ], {|tmp| tmp == cItem } ) == 0
+            IF AScan( hbmk[ _HBMK_aLIBUSERSYS ], {| tmp | tmp == cItem } ) == 0
                AAddNotEmpty( hbmk[ _HBMK_aLIBUSERSYS ], cItem )
             ENDIF
          NEXT
@@ -5985,7 +6153,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             cItem := PathNormalize( PathSepToSelf( PathProc( MacroProc( hbmk, StrStripQuote( cItem ), cFileName ), FN_DirGet( cFileName ) ) ) )
             IF ! Empty( cItem )
-               IF AScan( hbmk[ _HBMK_aLIBPATH ], {|tmp| tmp == cItem } ) == 0
+               IF AScan( hbmk[ _HBMK_aLIBPATH ], {| tmp | tmp == cItem } ) == 0
                   AAdd( hbmk[ _HBMK_aLIBPATH ], PathSepToTarget( hbmk, cItem ) )
                ENDIF
             ENDIF
@@ -5995,7 +6163,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             cItem := PathNormalize( PathSepToSelf( PathProc( MacroProc( hbmk, StrStripQuote( cItem ), cFileName ), FN_DirGet( cFileName ) ) ) )
             IF ! Empty( cItem )
-               IF AScan( hbmk[ _HBMK_aINCPATH ], {|tmp| tmp == cItem } ) == 0
+               IF AScan( hbmk[ _HBMK_aINCPATH ], {| tmp | tmp == cItem } ) == 0
                   AAdd( hbmk[ _HBMK_aINCPATH ], PathSepToTarget( hbmk, cItem ) )
                ENDIF
             ENDIF
@@ -6005,7 +6173,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             cItem := PathNormalize( PathSepToSelf( PathProc( MacroProc( hbmk, StrStripQuote( cItem ), cFileName ), FN_DirGet( cFileName ) ) ) )
             IF ! Empty( cItem )
-               IF AScan( hbmk[ _HBMK_aINCTRYPATH ], {|tmp| tmp == cItem } ) == 0
+               IF AScan( hbmk[ _HBMK_aINCTRYPATH ], {| tmp | tmp == cItem } ) == 0
                   AAdd( hbmk[ _HBMK_aINCTRYPATH ], PathSepToTarget( hbmk, cItem ) )
                ENDIF
             ENDIF
@@ -6015,7 +6183,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             cItem := PathNormalize( PathSepToSelf( PathProc( MacroProc( hbmk, StrStripQuote( cItem ), cFileName ), FN_DirGet( cFileName ) ) ) )
             IF ! Empty( cItem )
-               IF AScan( hbmk[ _HBMK_aINSTPATH ], {|tmp| tmp == cItem } ) == 0
+               IF AScan( hbmk[ _HBMK_aINSTPATH ], {| tmp | tmp == cItem } ) == 0
                   AAdd( hbmk[ _HBMK_aINSTPATH ], PathSepToTarget( hbmk, cItem ) )
                ENDIF
             ENDIF
@@ -6030,7 +6198,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
       CASE Lower( Left( cLine, Len( "prgflags="     ) ) ) == "prgflags="     ; cLine := SubStr( cLine, Len( "prgflags="     ) + 1 )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             cItem := PathSepToTarget( hbmk, MacroProc( hbmk, StrStripQuote( cItem ), cFileName ) )
-            IF AScan( hbmk[ _HBMK_aOPTPRG ], {|tmp| tmp == cItem } ) == 0
+            IF AScan( hbmk[ _HBMK_aOPTPRG ], {| tmp | tmp == cItem } ) == 0
                AAddNotEmpty( hbmk[ _HBMK_aOPTPRG ], cItem )
             ENDIF
          NEXT
@@ -6038,7 +6206,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
       CASE Lower( Left( cLine, Len( "cflags="       ) ) ) == "cflags="       ; cLine := SubStr( cLine, Len( "cflags="       ) + 1 )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             cItem := MacroProc( hbmk, StrStripQuote( cItem ), cFileName )
-            IF AScan( hbmk[ _HBMK_aOPTC ], {|tmp| tmp == cItem } ) == 0
+            IF AScan( hbmk[ _HBMK_aOPTC ], {| tmp | tmp == cItem } ) == 0
                AAddNotEmpty( hbmk[ _HBMK_aOPTC ], cItem )
             ENDIF
          NEXT
@@ -6046,7 +6214,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
       CASE Lower( Left( cLine, Len( "resflags="     ) ) ) == "resflags="     ; cLine := SubStr( cLine, Len( "resflags="     ) + 1 )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             cItem := MacroProc( hbmk, StrStripQuote( cItem ), cFileName )
-            IF AScan( hbmk[ _HBMK_aOPTRES ], {|tmp| tmp == cItem } ) == 0
+            IF AScan( hbmk[ _HBMK_aOPTRES ], {| tmp | tmp == cItem } ) == 0
                AAddNotEmpty( hbmk[ _HBMK_aOPTRES ], cItem )
             ENDIF
          NEXT
@@ -6054,7 +6222,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
       CASE Lower( Left( cLine, Len( "ldflags="      ) ) ) == "ldflags="      ; cLine := SubStr( cLine, Len( "ldflags="      ) + 1 )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             cItem := MacroProc( hbmk, StrStripQuote( cItem ), cFileName )
-            IF AScan( hbmk[ _HBMK_aOPTL ], {|tmp| tmp == cItem } ) == 0
+            IF AScan( hbmk[ _HBMK_aOPTL ], {| tmp | tmp == cItem } ) == 0
                AAddNotEmpty( hbmk[ _HBMK_aOPTL ], cItem )
             ENDIF
          NEXT
@@ -6121,6 +6289,12 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
          CASE ValueIsF( cLine ) ; hbmk[ _HBMK_lIMPLIB ] := .F.
          ENDCASE
 
+      CASE Lower( Left( cLine, Len( "hbcppmm="      ) ) ) == "hbcppmm="      ; cLine := SubStr( cLine, Len( "hbcppmm="      ) + 1 )
+         DO CASE
+         CASE ValueIsT( cLine ) ; hbmk[ _HBMK_lHBCPPMM ] := .T.
+         CASE ValueIsF( cLine ) ; hbmk[ _HBMK_lHBCPPMM ] := .F.
+         ENDCASE
+
       CASE Lower( Left( cLine, Len( "strip="        ) ) ) == "strip="        ; cLine := SubStr( cLine, Len( "strip="        ) + 1 )
          DO CASE
          CASE ValueIsT( cLine ) ; hbmk[ _HBMK_lSTRIP ] := .T.
@@ -6180,8 +6354,8 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
                cLine := NIL
             ENDIF
             IF ! Empty( cLine ) .AND. !( Lower( cLine ) == "gtnul" )
-               IF AScan( hbmk[ _HBMK_aLIBCOREGT ], {|tmp| Lower( tmp ) == Lower( cLine ) } ) == 0 .AND. ;
-                  AScan( hbmk[ _HBMK_aLIBUSERGT ], {|tmp| Lower( tmp ) == Lower( cLine ) } ) == 0
+               IF AScan( hbmk[ _HBMK_aLIBCOREGT ], {| tmp | Lower( tmp ) == Lower( cLine ) } ) == 0 .AND. ;
+                  AScan( hbmk[ _HBMK_aLIBUSERGT ], {| tmp | Lower( tmp ) == Lower( cLine ) } ) == 0
                   AAddNotEmpty( hbmk[ _HBMK_aLIBUSERGT ], PathSepToTarget( hbmk, cLine ) )
                ENDIF
             ENDIF
@@ -6195,8 +6369,8 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
                ENDIF
             ENDIF
             IF ! Empty( cLine ) .AND. !( Lower( cLine ) == "gtnul" )
-               IF AScan( hbmk[ _HBMK_aLIBCOREGT ], {|tmp| Lower( tmp ) == Lower( cLine ) } ) == 0 .AND. ;
-                  AScan( hbmk[ _HBMK_aLIBUSERGT ], {|tmp| Lower( tmp ) == Lower( cLine ) } ) == 0
+               IF AScan( hbmk[ _HBMK_aLIBCOREGT ], {| tmp | Lower( tmp ) == Lower( cLine ) } ) == 0 .AND. ;
+                  AScan( hbmk[ _HBMK_aLIBUSERGT ], {| tmp | Lower( tmp ) == Lower( cLine ) } ) == 0
                   AAddNotEmpty( hbmk[ _HBMK_aLIBUSERGT ], PathSepToTarget( hbmk, cLine ) )
                ENDIF
             ENDIF
@@ -6209,8 +6383,8 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
 
 STATIC FUNCTION IsGTRequested( hbmk, cWhichGT )
    /* Check if it's a core/user GT. */
-   RETURN AScan( hbmk[ _HBMK_aLIBCOREGT ], {|tmp| Lower( tmp ) == cWhichGT } ) > 0 .OR. ;
-          AScan( hbmk[ _HBMK_aLIBUSERGT ], {|tmp| Lower( tmp ) == cWhichGT } ) > 0
+   RETURN AScan( hbmk[ _HBMK_aLIBCOREGT ], {| tmp | Lower( tmp ) == cWhichGT } ) > 0 .OR. ;
+          AScan( hbmk[ _HBMK_aLIBUSERGT ], {| tmp | Lower( tmp ) == cWhichGT } ) > 0
 
 STATIC FUNCTION StrStripQuote( cString )
    RETURN iif( Left( cString, 1 ) == '"' .AND. Right( cString, 1 ) == '"',;
@@ -7534,7 +7708,7 @@ STATIC PROCEDURE convert_hbmake_to_hbp( cSrcName, cDstName )
                EXIT
             CASE "TOPMODULE"
                IF !( cValue == cMAIN )
-                  tmp := AScan( aDst, {|tmp| tmp == cValue } )
+                  tmp := AScan( aDst, {| tmp | tmp == cValue } )
                   IF tmp > 0
                      hb_ADel( aDst, tmp, .T. )
                      hb_AIns( aDst, 1, cValue, .T. )
@@ -7878,6 +8052,7 @@ STATIC PROCEDURE ShowHelp( lLong )
       { "-[no]trace"        , I_( "show commands executed" ) },;
       { "-[no]beep"         , I_( "enable (or disable) single beep on successful exit, double beep on failure" ) },;
       { "-[no]ignore"       , I_( "ignore errors when running compiler tools (default: off)" ) },;
+      { "-[no]hbcppmm"      , I_( "forces to override standard C++ memory management functions with Harbour ones" ) },;
       { "-nohblib[-]"       , I_( "do not use static core Harbour libraries when linking" ) },;
       { "-nolibgrouping[-]" , I_( "disable library grouping on gcc based compilers" ) },;
       { "-nomiscsyslib[-]"  , I_( "don't add extra list of system libraries to default library list" ) },;
@@ -7961,7 +8136,7 @@ STATIC PROCEDURE ShowHelp( lLong )
       hb_StrFormat( I_( "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk2 directory. The file format is the same as .hbc." ), _HBMK_CFG_NAME ),;
       hb_StrFormat( I_( "%1$s make script in current directory is always processed if it exists." ), _HBMK_AUTOHBM_NAME ),;
       I_( ".hbc config files in current dir are automatically processed." ),;
-      I_( ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=<text>\nLines starting with '#' char are ignored" ),;
+      I_( ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=<text>\nLines starting with '#' char are ignored" ),;
       I_( "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][<plat>|<comp>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}" ),;
       I_( "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${<envvar>}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." ),;
       I_( 'Options accepting macros also support command substitution. Enclose command inside ``, and, if the command contains space, also enclose in double quotes. F.e. "-cflag=`wx-config --cflags`", or ldflags={unix&gcc}"`wx-config --libs`".' ),;
@@ -7970,15 +8145,15 @@ STATIC PROCEDURE ShowHelp( lLong )
 
    DEFAULT lLong TO .F.
 
-   AEval( aText_Basic, {|tmp| OutStd( tmp + _OUT_EOL ) } )
-   AEval( aOpt_Basic, {|tmp| OutOpt( tmp ) } )
+   AEval( aText_Basic, {| tmp | OutStd( tmp + _OUT_EOL ) } )
+   AEval( aOpt_Basic, {| tmp | OutOpt( tmp ) } )
    IF lLong
-      AEval( aOpt_Long, {|tmp| OutOpt( tmp ) } )
-      AEval( aText_Notes, {|tmp| OutStd( tmp + _OUT_EOL ) } )
-      AEval( aNotes, {|tmp| OutNote( tmp ) } )
-      AEval( aText_Supp, {|tmp| OutStd( tmp + _OUT_EOL ) } )
+      AEval( aOpt_Long, {| tmp | OutOpt( tmp ) } )
+      AEval( aText_Notes, {| tmp | OutStd( tmp + _OUT_EOL ) } )
+      AEval( aNotes, {| tmp | OutNote( tmp ) } )
+      AEval( aText_Supp, {| tmp | OutStd( tmp + _OUT_EOL ) } )
    ELSE
-      AEval( aOpt_Help, {|tmp| OutOpt( tmp ) } )
+      AEval( aOpt_Help, {| tmp | OutOpt( tmp ) } )
    ENDIF
 
    RETURN
diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po
index 2d48f7c87f..4ee8cf85e6 100644
--- a/harbour/utils/hbmk2/hbmk2.pt_BR.po
+++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po
@@ -147,8 +147,8 @@ msgstr "Processando script local: %1$s"
 
 #: hbmk2.prg:4127
 #, c-format
-msgid "Warning: C compiler script couldn't be created, continuing in command line."
-msgstr "Atenção: Script para o compilador C não pode ser criado, continuando com a linha de comando."
+msgid "Warning: C/C++ compiler script couldn't be created, continuing in command line."
+msgstr "Atenção: Script para o compilador C/C++ não pode ser criado, continuando com a linha de comando."
 
 #: hbmk2.prg:4457
 #, c-format
@@ -243,8 +243,8 @@ msgstr "Criando cabe
 #: hbmk2.prg:4175
 #: hbmk2.prg:4707
 #, c-format
-msgid "Error: Running C compiler job #%1$s. %2$s"
-msgstr "Erro: Executando o compilador C - tarefa #%1$s. %2$s"
+msgid "Error: Running C/C++ compiler job #%1$s. %2$s"
+msgstr "Erro: Executando o compilador C/C++ - tarefa #%1$s. %2$s"
 
 #: hbmk2.prg:3515
 #, c-format
@@ -294,8 +294,8 @@ msgstr "Compilando..."
 #: hbmk2.prg:4136
 #: hbmk2.prg:4697
 #, c-format
-msgid "C compiler command job #%1$s:"
-msgstr "Comando do Compilador C - tarefa #%1$s:"
+msgid "C/C++ compiler command job #%1$s:"
+msgstr "Comando do Compilador C/C++ - tarefa #%1$s:"
 
 #: hbmk2.prg:4412
 #, c-format
@@ -399,8 +399,8 @@ msgstr "copiar o alvo para <path>. Se <path> for um diret
 #: hbmk2.prg:4138
 #: hbmk2.prg:4699
 #, c-format
-msgid "C compiler command:"
-msgstr "Comando do compilador C:"
+msgid "C/C++ compiler command:"
+msgstr "Comando do compilador C/C++:"
 
 #: hbmk2.prg:7960
 #, c-format
@@ -521,10 +521,10 @@ msgstr "arquivos .hbc na pasta corrente ser
 #: hbmk2.prg:7960
 #, c-format
 msgid ""
-".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=<text>\\n"
+".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=<text>\\n"
 "Lines starting with '#' char are ignored"
 msgstr ""
-"As opções em um arquivo .hbc devem estar em linhas separadas e são: libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], prgflags=[flags do Harbour], cflags=[flags do compilador C], resflags=[flags do compilador de recursos], ldflags=[flags do linkeditor], libpaths=[paths], sources=[módulos fontes], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=<text>\\n"
+"As opções em um arquivo .hbc devem estar em linhas separadas e são: libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], prgflags=[flags do Harbour], cflags=[flags do compilador C], resflags=[flags do compilador de recursos], ldflags=[flags do linkeditor], libpaths=[paths], sources=[módulos fontes], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=<text>\\n"
 "Linhas iniciadas com '#' são interpretadas como comentários e serão ignoradas"
 
 #: hbmk2.prg:7942
@@ -852,15 +852,15 @@ msgstr "criar (ou n
 
 #: hbmk2.prg:4143
 #, c-format
-msgid "C compiler script:"
-msgstr "Script do compilador C:"
+msgid "C/C++ compiler script:"
+msgstr "Script do compilador C/C++:"
 
 #: hbmk2.prg:4153
 #: hbmk2.prg:4177
 #: hbmk2.prg:4709
 #, c-format
-msgid "Error: Running C compiler. %1$s"
-msgstr "Erro: Executando compilador C. %1$s"
+msgid "Error: Running C/C++ compiler. %1$s"
+msgstr "Erro: Executando compilador C/C++. %1$s"
 
 #: hbmk2.prg:4190
 #, c-format