diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7813dd10cc..064a2f12b8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-12 22:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  - contrib/hbqt/gensource
+    ! Unused, deleted.
+
+  * contrib/hbqt/qtgui/*
+  * contrib/hbqt/qtcore/*
+  * contrib/hbqt/qtnetwork/*
+    * Regenerated.
+
 2010-07-12 22:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/make.hbs
     + Added support for HB_CONTRIBS ennvar which is to replace
diff --git a/harbour/contrib/hbqt/qtcore/HBDbfModel.cpp b/harbour/contrib/hbqt/qtcore/HBDbfModel.cpp
index 3e25cd479f..77377f74d1 100644
--- a/harbour/contrib/hbqt/qtcore/HBDbfModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/HBDbfModel.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_HBDbfModel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< HBDbfModel >( ( HBDbfModel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_HBDbfModel;
-   p->type = QT_TYPE_HBDbfModel;
+   p->type = HBQT_TYPE_HBDbfModel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/HBEvents.cpp b/harbour/contrib/hbqt/qtcore/HBEvents.cpp
index 229c4bc4da..09b1578cb4 100644
--- a/harbour/contrib/hbqt/qtcore/HBEvents.cpp
+++ b/harbour/contrib/hbqt/qtcore/HBEvents.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_HBEvents( void * pObj, bool bNew )
    new( & p->ph ) QPointer< HBEvents >( ( HBEvents * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_HBEvents;
-   p->type = QT_TYPE_HBEvents;
+   p->type = HBQT_TYPE_HBEvents;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/HBQAbstractItemModel.cpp b/harbour/contrib/hbqt/qtcore/HBQAbstractItemModel.cpp
index 67c2f47409..4046f5af35 100644
--- a/harbour/contrib/hbqt/qtcore/HBQAbstractItemModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/HBQAbstractItemModel.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_HBQAbstractItemModel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< HBQAbstractItemModel >( ( HBQAbstractItemModel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_HBQAbstractItemModel;
-   p->type = QT_TYPE_HBQAbstractItemModel;
+   p->type = HBQT_TYPE_HBQAbstractItemModel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/HBSlots.cpp b/harbour/contrib/hbqt/qtcore/HBSlots.cpp
index b93e4c5ef9..e11b63fdf4 100644
--- a/harbour/contrib/hbqt/qtcore/HBSlots.cpp
+++ b/harbour/contrib/hbqt/qtcore/HBSlots.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_HBSlots( void * pObj, bool bNew )
    new( & p->ph ) QPointer< HBSlots >( ( HBSlots * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_HBSlots;
-   p->type = QT_TYPE_HBSlots;
+   p->type = HBQT_TYPE_HBSlots;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp
index 38d99a92ac..786afbe3bb 100644
--- a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QAbstractItemModel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractItemModel >( ( QAbstractItemModel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractItemModel;
-   p->type = QT_TYPE_QAbstractItemModel;
+   p->type = HBQT_TYPE_QAbstractItemModel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp
index dbd4656cbd..038ad9f6b4 100644
--- a/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QAbstractListModel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractListModel >( ( QAbstractListModel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractListModel;
-   p->type = QT_TYPE_QAbstractListModel;
+   p->type = HBQT_TYPE_QAbstractListModel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp
index 701c5c9099..1ac97c3c82 100644
--- a/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp
+++ b/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QAbstractTableModel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractTableModel >( ( QAbstractTableModel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractTableModel;
-   p->type = QT_TYPE_QAbstractTableModel;
+   p->type = HBQT_TYPE_QAbstractTableModel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QBitArray.cpp b/harbour/contrib/hbqt/qtcore/QBitArray.cpp
index 970cd0ef3d..ddf45cc134 100644
--- a/harbour/contrib/hbqt/qtcore/QBitArray.cpp
+++ b/harbour/contrib/hbqt/qtcore/QBitArray.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QBitArray( void * pObj, bool bNew )
    p->ph = ( QBitArray * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QBitArray;
-   p->type = QT_TYPE_QBitArray;
+   p->type = HBQT_TYPE_QBitArray;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QBuffer.cpp b/harbour/contrib/hbqt/qtcore/QBuffer.cpp
index 37b8827649..1be6b040d1 100644
--- a/harbour/contrib/hbqt/qtcore/QBuffer.cpp
+++ b/harbour/contrib/hbqt/qtcore/QBuffer.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QBuffer( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QBuffer >( ( QBuffer * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QBuffer;
-   p->type = QT_TYPE_QBuffer;
+   p->type = HBQT_TYPE_QBuffer;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QByteArray.cpp b/harbour/contrib/hbqt/qtcore/QByteArray.cpp
index e35d0a7e74..b3335d3a1d 100644
--- a/harbour/contrib/hbqt/qtcore/QByteArray.cpp
+++ b/harbour/contrib/hbqt/qtcore/QByteArray.cpp
@@ -119,7 +119,7 @@ void * hbqt_gcAllocate_QByteArray( void * pObj, bool bNew )
    p->ph = ( QByteArray * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QByteArray;
-   p->type = QT_TYPE_QByteArray;
+   p->type = HBQT_TYPE_QByteArray;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QChar.cpp b/harbour/contrib/hbqt/qtcore/QChar.cpp
index b8a50ce27b..e82de6f9e4 100644
--- a/harbour/contrib/hbqt/qtcore/QChar.cpp
+++ b/harbour/contrib/hbqt/qtcore/QChar.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QChar( void * pObj, bool bNew )
    p->ph = ( QChar * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QChar;
-   p->type = QT_TYPE_QChar;
+   p->type = HBQT_TYPE_QChar;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
index 003dc48f54..5fac92b07e 100644
--- a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
+++ b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
@@ -106,7 +106,7 @@ void * hbqt_gcAllocate_QCoreApplication( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QCoreApplication >( ( QCoreApplication * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QCoreApplication;
-   p->type = QT_TYPE_QCoreApplication;
+   p->type = HBQT_TYPE_QCoreApplication;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QDataStream.cpp b/harbour/contrib/hbqt/qtcore/QDataStream.cpp
index f78e0a43bb..05c170ab0f 100644
--- a/harbour/contrib/hbqt/qtcore/QDataStream.cpp
+++ b/harbour/contrib/hbqt/qtcore/QDataStream.cpp
@@ -124,7 +124,7 @@ void * hbqt_gcAllocate_QDataStream( void * pObj, bool bNew )
    p->ph = ( QDataStream * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDataStream;
-   p->type = QT_TYPE_QDataStream;
+   p->type = HBQT_TYPE_QDataStream;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QDate.cpp b/harbour/contrib/hbqt/qtcore/QDate.cpp
index 85cabb7983..ba0d3b360c 100644
--- a/harbour/contrib/hbqt/qtcore/QDate.cpp
+++ b/harbour/contrib/hbqt/qtcore/QDate.cpp
@@ -119,7 +119,7 @@ void * hbqt_gcAllocate_QDate( void * pObj, bool bNew )
    p->ph = ( QDate * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDate;
-   p->type = QT_TYPE_QDate;
+   p->type = HBQT_TYPE_QDate;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QDateTime.cpp b/harbour/contrib/hbqt/qtcore/QDateTime.cpp
index 422490e418..44d31e5313 100644
--- a/harbour/contrib/hbqt/qtcore/QDateTime.cpp
+++ b/harbour/contrib/hbqt/qtcore/QDateTime.cpp
@@ -119,7 +119,7 @@ void * hbqt_gcAllocate_QDateTime( void * pObj, bool bNew )
    p->ph = ( QDateTime * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDateTime;
-   p->type = QT_TYPE_QDateTime;
+   p->type = HBQT_TYPE_QDateTime;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QDir.cpp b/harbour/contrib/hbqt/qtcore/QDir.cpp
index 312d649683..92c3bae3c6 100644
--- a/harbour/contrib/hbqt/qtcore/QDir.cpp
+++ b/harbour/contrib/hbqt/qtcore/QDir.cpp
@@ -125,7 +125,7 @@ void * hbqt_gcAllocate_QDir( void * pObj, bool bNew )
    p->ph = ( QDir * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDir;
-   p->type = QT_TYPE_QDir;
+   p->type = HBQT_TYPE_QDir;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QEvent.cpp b/harbour/contrib/hbqt/qtcore/QEvent.cpp
index 791cdbdd43..8421ca1df0 100644
--- a/harbour/contrib/hbqt/qtcore/QEvent.cpp
+++ b/harbour/contrib/hbqt/qtcore/QEvent.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QEvent( void * pObj, bool bNew )
    p->ph = ( QEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QEvent;
-   p->type = QT_TYPE_QEvent;
+   p->type = HBQT_TYPE_QEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp b/harbour/contrib/hbqt/qtcore/QEventLoop.cpp
index bb767b9d0c..7efd9da854 100644
--- a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp
+++ b/harbour/contrib/hbqt/qtcore/QEventLoop.cpp
@@ -132,7 +132,7 @@ void * hbqt_gcAllocate_QEventLoop( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QEventLoop >( ( QEventLoop * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QEventLoop;
-   p->type = QT_TYPE_QEventLoop;
+   p->type = HBQT_TYPE_QEventLoop;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QFile.cpp b/harbour/contrib/hbqt/qtcore/QFile.cpp
index 654d00cb43..3bac1cf698 100644
--- a/harbour/contrib/hbqt/qtcore/QFile.cpp
+++ b/harbour/contrib/hbqt/qtcore/QFile.cpp
@@ -137,7 +137,7 @@ void * hbqt_gcAllocate_QFile( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QFile >( ( QFile * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFile;
-   p->type = QT_TYPE_QFile;
+   p->type = HBQT_TYPE_QFile;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp b/harbour/contrib/hbqt/qtcore/QFileInfo.cpp
index 785f013b47..a4e46babde 100644
--- a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp
+++ b/harbour/contrib/hbqt/qtcore/QFileInfo.cpp
@@ -125,7 +125,7 @@ void * hbqt_gcAllocate_QFileInfo( void * pObj, bool bNew )
    p->ph = ( QFileInfo * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFileInfo;
-   p->type = QT_TYPE_QFileInfo;
+   p->type = HBQT_TYPE_QFileInfo;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QIODevice.cpp b/harbour/contrib/hbqt/qtcore/QIODevice.cpp
index cd799ec989..0c05c05041 100644
--- a/harbour/contrib/hbqt/qtcore/QIODevice.cpp
+++ b/harbour/contrib/hbqt/qtcore/QIODevice.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QIODevice( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QIODevice >( ( QIODevice * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QIODevice;
-   p->type = QT_TYPE_QIODevice;
+   p->type = HBQT_TYPE_QIODevice;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp b/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp
index 54200b32a4..eb93772a29 100644
--- a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp
+++ b/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QLatin1Char( void * pObj, bool bNew )
    p->ph = ( QLatin1Char * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLatin1Char;
-   p->type = QT_TYPE_QLatin1Char;
+   p->type = HBQT_TYPE_QLatin1Char;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp b/harbour/contrib/hbqt/qtcore/QLatin1String.cpp
index 6281cba13c..cad6b6a313 100644
--- a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp
+++ b/harbour/contrib/hbqt/qtcore/QLatin1String.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QLatin1String( void * pObj, bool bNew )
    p->ph = ( QLatin1String * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLatin1String;
-   p->type = QT_TYPE_QLatin1String;
+   p->type = HBQT_TYPE_QLatin1String;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QLine.cpp b/harbour/contrib/hbqt/qtcore/QLine.cpp
index e036881dec..028ae724b2 100644
--- a/harbour/contrib/hbqt/qtcore/QLine.cpp
+++ b/harbour/contrib/hbqt/qtcore/QLine.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QLine( void * pObj, bool bNew )
    p->ph = ( QLine * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLine;
-   p->type = QT_TYPE_QLine;
+   p->type = HBQT_TYPE_QLine;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QLineF.cpp b/harbour/contrib/hbqt/qtcore/QLineF.cpp
index 12dba89389..319f828d2c 100644
--- a/harbour/contrib/hbqt/qtcore/QLineF.cpp
+++ b/harbour/contrib/hbqt/qtcore/QLineF.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QLineF( void * pObj, bool bNew )
    p->ph = ( QLineF * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLineF;
-   p->type = QT_TYPE_QLineF;
+   p->type = HBQT_TYPE_QLineF;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QList.cpp b/harbour/contrib/hbqt/qtcore/QList.cpp
index 63e612b339..27a578f96d 100644
--- a/harbour/contrib/hbqt/qtcore/QList.cpp
+++ b/harbour/contrib/hbqt/qtcore/QList.cpp
@@ -143,7 +143,7 @@ void * hbqt_gcAllocate_QList( void * pObj, bool bNew )
    p->ph = ( QList< void * > * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QList;
-   p->type = QT_TYPE_QList;
+   p->type = HBQT_TYPE_QList;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QLocale.cpp b/harbour/contrib/hbqt/qtcore/QLocale.cpp
index 087338ae00..adc092b401 100644
--- a/harbour/contrib/hbqt/qtcore/QLocale.cpp
+++ b/harbour/contrib/hbqt/qtcore/QLocale.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QLocale( void * pObj, bool bNew )
    p->ph = ( QLocale * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLocale;
-   p->type = QT_TYPE_QLocale;
+   p->type = HBQT_TYPE_QLocale;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QMimeData.cpp b/harbour/contrib/hbqt/qtcore/QMimeData.cpp
index dc4e972e1b..cda19f0e8d 100644
--- a/harbour/contrib/hbqt/qtcore/QMimeData.cpp
+++ b/harbour/contrib/hbqt/qtcore/QMimeData.cpp
@@ -137,7 +137,7 @@ void * hbqt_gcAllocate_QMimeData( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QMimeData >( ( QMimeData * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QMimeData;
-   p->type = QT_TYPE_QMimeData;
+   p->type = HBQT_TYPE_QMimeData;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp b/harbour/contrib/hbqt/qtcore/QModelIndex.cpp
index a942986a1f..18b2d72ce3 100644
--- a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp
+++ b/harbour/contrib/hbqt/qtcore/QModelIndex.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QModelIndex( void * pObj, bool bNew )
    p->ph = ( QModelIndex * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QModelIndex;
-   p->type = QT_TYPE_QModelIndex;
+   p->type = HBQT_TYPE_QModelIndex;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QObject.cpp b/harbour/contrib/hbqt/qtcore/QObject.cpp
index 8be068a752..3a611bbc18 100644
--- a/harbour/contrib/hbqt/qtcore/QObject.cpp
+++ b/harbour/contrib/hbqt/qtcore/QObject.cpp
@@ -144,7 +144,7 @@ void * hbqt_gcAllocate_QObject( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QObject >( ( QObject * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QObject;
-   p->type = QT_TYPE_QObject;
+   p->type = HBQT_TYPE_QObject;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QPoint.cpp b/harbour/contrib/hbqt/qtcore/QPoint.cpp
index 42f1ac77a5..95344be49a 100644
--- a/harbour/contrib/hbqt/qtcore/QPoint.cpp
+++ b/harbour/contrib/hbqt/qtcore/QPoint.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QPoint( void * pObj, bool bNew )
    p->ph = ( QPoint * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPoint;
-   p->type = QT_TYPE_QPoint;
+   p->type = HBQT_TYPE_QPoint;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QPointF.cpp b/harbour/contrib/hbqt/qtcore/QPointF.cpp
index c1dbf9769a..736e346abb 100644
--- a/harbour/contrib/hbqt/qtcore/QPointF.cpp
+++ b/harbour/contrib/hbqt/qtcore/QPointF.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QPointF( void * pObj, bool bNew )
    p->ph = ( QPointF * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPointF;
-   p->type = QT_TYPE_QPointF;
+   p->type = HBQT_TYPE_QPointF;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QProcess.cpp b/harbour/contrib/hbqt/qtcore/QProcess.cpp
index a40bd5686b..c3c6bbf85c 100644
--- a/harbour/contrib/hbqt/qtcore/QProcess.cpp
+++ b/harbour/contrib/hbqt/qtcore/QProcess.cpp
@@ -138,7 +138,7 @@ void * hbqt_gcAllocate_QProcess( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QProcess >( ( QProcess * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QProcess;
-   p->type = QT_TYPE_QProcess;
+   p->type = HBQT_TYPE_QProcess;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QRect.cpp b/harbour/contrib/hbqt/qtcore/QRect.cpp
index d48c93a9ea..54f8fe8ba7 100644
--- a/harbour/contrib/hbqt/qtcore/QRect.cpp
+++ b/harbour/contrib/hbqt/qtcore/QRect.cpp
@@ -119,7 +119,7 @@ void * hbqt_gcAllocate_QRect( void * pObj, bool bNew )
    p->ph = ( QRect * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QRect;
-   p->type = QT_TYPE_QRect;
+   p->type = HBQT_TYPE_QRect;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QRectF.cpp b/harbour/contrib/hbqt/qtcore/QRectF.cpp
index 4534cd8ce1..5b981fbaf9 100644
--- a/harbour/contrib/hbqt/qtcore/QRectF.cpp
+++ b/harbour/contrib/hbqt/qtcore/QRectF.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QRectF( void * pObj, bool bNew )
    p->ph = ( QRectF * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QRectF;
-   p->type = QT_TYPE_QRectF;
+   p->type = HBQT_TYPE_QRectF;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QRegExp.cpp b/harbour/contrib/hbqt/qtcore/QRegExp.cpp
index 8cba25459b..5117d64a1f 100644
--- a/harbour/contrib/hbqt/qtcore/QRegExp.cpp
+++ b/harbour/contrib/hbqt/qtcore/QRegExp.cpp
@@ -122,7 +122,7 @@ void * hbqt_gcAllocate_QRegExp( void * pObj, bool bNew )
    p->ph = ( QRegExp * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QRegExp;
-   p->type = QT_TYPE_QRegExp;
+   p->type = HBQT_TYPE_QRegExp;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QResource.cpp b/harbour/contrib/hbqt/qtcore/QResource.cpp
index 18bce9d2cd..1716df7732 100644
--- a/harbour/contrib/hbqt/qtcore/QResource.cpp
+++ b/harbour/contrib/hbqt/qtcore/QResource.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QResource( void * pObj, bool bNew )
    p->ph = ( QResource * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QResource;
-   p->type = QT_TYPE_QResource;
+   p->type = HBQT_TYPE_QResource;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QSettings.cpp b/harbour/contrib/hbqt/qtcore/QSettings.cpp
index 3a5aa26c61..801c94cfe9 100644
--- a/harbour/contrib/hbqt/qtcore/QSettings.cpp
+++ b/harbour/contrib/hbqt/qtcore/QSettings.cpp
@@ -137,7 +137,7 @@ void * hbqt_gcAllocate_QSettings( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QSettings >( ( QSettings * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSettings;
-   p->type = QT_TYPE_QSettings;
+   p->type = HBQT_TYPE_QSettings;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp b/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp
index ec747220b8..8bb3b32d30 100644
--- a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp
+++ b/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QSignalMapper( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QSignalMapper >( ( QSignalMapper * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSignalMapper;
-   p->type = QT_TYPE_QSignalMapper;
+   p->type = HBQT_TYPE_QSignalMapper;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QSize.cpp b/harbour/contrib/hbqt/qtcore/QSize.cpp
index 366546ebc4..f3eb4147ae 100644
--- a/harbour/contrib/hbqt/qtcore/QSize.cpp
+++ b/harbour/contrib/hbqt/qtcore/QSize.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QSize( void * pObj, bool bNew )
    p->ph = ( QSize * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSize;
-   p->type = QT_TYPE_QSize;
+   p->type = HBQT_TYPE_QSize;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QSizeF.cpp b/harbour/contrib/hbqt/qtcore/QSizeF.cpp
index 6e0787cfbb..65f80cbd61 100644
--- a/harbour/contrib/hbqt/qtcore/QSizeF.cpp
+++ b/harbour/contrib/hbqt/qtcore/QSizeF.cpp
@@ -118,7 +118,7 @@ void * hbqt_gcAllocate_QSizeF( void * pObj, bool bNew )
    p->ph = ( QSizeF * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSizeF;
-   p->type = QT_TYPE_QSizeF;
+   p->type = HBQT_TYPE_QSizeF;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QStringList.cpp b/harbour/contrib/hbqt/qtcore/QStringList.cpp
index ddb3443caf..01a518eab8 100644
--- a/harbour/contrib/hbqt/qtcore/QStringList.cpp
+++ b/harbour/contrib/hbqt/qtcore/QStringList.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QStringList( void * pObj, bool bNew )
    p->ph = ( QStringList * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStringList;
-   p->type = QT_TYPE_QStringList;
+   p->type = HBQT_TYPE_QStringList;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp b/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
index 3113a051cb..6b75485483 100644
--- a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
@@ -125,7 +125,7 @@ void * hbqt_gcAllocate_QTextBoundaryFinder( void * pObj, bool bNew )
    p->ph = ( QTextBoundaryFinder * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextBoundaryFinder;
-   p->type = QT_TYPE_QTextBoundaryFinder;
+   p->type = HBQT_TYPE_QTextBoundaryFinder;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QTextCodec.cpp b/harbour/contrib/hbqt/qtcore/QTextCodec.cpp
index 17b292ccb9..7654f5b12d 100644
--- a/harbour/contrib/hbqt/qtcore/QTextCodec.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTextCodec.cpp
@@ -106,7 +106,7 @@ void * hbqt_gcAllocate_QTextCodec( void * pObj, bool bNew )
    p->ph = ( QTextCodec * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextCodec;
-   p->type = QT_TYPE_QTextCodec;
+   p->type = HBQT_TYPE_QTextCodec;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp b/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp
index dc6f5965ef..3c111a6bec 100644
--- a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QTextDecoder( void * pObj, bool bNew )
    p->ph = ( QTextDecoder * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextDecoder;
-   p->type = QT_TYPE_QTextDecoder;
+   p->type = HBQT_TYPE_QTextDecoder;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp b/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp
index 395ce7022f..73090fa9d0 100644
--- a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QTextEncoder( void * pObj, bool bNew )
    p->ph = ( QTextEncoder * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextEncoder;
-   p->type = QT_TYPE_QTextEncoder;
+   p->type = HBQT_TYPE_QTextEncoder;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QTextStream.cpp b/harbour/contrib/hbqt/qtcore/QTextStream.cpp
index d6b1bd724d..a043636894 100644
--- a/harbour/contrib/hbqt/qtcore/QTextStream.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTextStream.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QTextStream( void * pObj, bool bNew )
    p->ph = ( QTextStream * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextStream;
-   p->type = QT_TYPE_QTextStream;
+   p->type = HBQT_TYPE_QTextStream;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QThread.cpp b/harbour/contrib/hbqt/qtcore/QThread.cpp
index 04052e4037..5bb724cbaa 100644
--- a/harbour/contrib/hbqt/qtcore/QThread.cpp
+++ b/harbour/contrib/hbqt/qtcore/QThread.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QThread( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QThread >( ( QThread * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QThread;
-   p->type = QT_TYPE_QThread;
+   p->type = HBQT_TYPE_QThread;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QTime.cpp b/harbour/contrib/hbqt/qtcore/QTime.cpp
index 5a936c809c..1154f61752 100644
--- a/harbour/contrib/hbqt/qtcore/QTime.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTime.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QTime( void * pObj, bool bNew )
    p->ph = ( QTime * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTime;
-   p->type = QT_TYPE_QTime;
+   p->type = HBQT_TYPE_QTime;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QTimer.cpp b/harbour/contrib/hbqt/qtcore/QTimer.cpp
index f0cb886174..6cd03c2ead 100644
--- a/harbour/contrib/hbqt/qtcore/QTimer.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTimer.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QTimer( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTimer >( ( QTimer * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTimer;
-   p->type = QT_TYPE_QTimer;
+   p->type = HBQT_TYPE_QTimer;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QTranslator.cpp b/harbour/contrib/hbqt/qtcore/QTranslator.cpp
index 7f7d270c08..4efa347721 100644
--- a/harbour/contrib/hbqt/qtcore/QTranslator.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTranslator.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QTranslator( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTranslator >( ( QTranslator * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTranslator;
-   p->type = QT_TYPE_QTranslator;
+   p->type = HBQT_TYPE_QTranslator;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QUiLoader.cpp b/harbour/contrib/hbqt/qtcore/QUiLoader.cpp
index 0c207f3098..6cb806b217 100644
--- a/harbour/contrib/hbqt/qtcore/QUiLoader.cpp
+++ b/harbour/contrib/hbqt/qtcore/QUiLoader.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QUiLoader( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QUiLoader >( ( QUiLoader * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QUiLoader;
-   p->type = QT_TYPE_QUiLoader;
+   p->type = HBQT_TYPE_QUiLoader;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QUrl.cpp b/harbour/contrib/hbqt/qtcore/QUrl.cpp
index 630ed35f7a..cf8c11b9f3 100644
--- a/harbour/contrib/hbqt/qtcore/QUrl.cpp
+++ b/harbour/contrib/hbqt/qtcore/QUrl.cpp
@@ -149,7 +149,7 @@ void * hbqt_gcAllocate_QUrl( void * pObj, bool bNew )
    p->ph = ( QUrl * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QUrl;
-   p->type = QT_TYPE_QUrl;
+   p->type = HBQT_TYPE_QUrl;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtcore/QVariant.cpp b/harbour/contrib/hbqt/qtcore/QVariant.cpp
index 770ba6ab17..99f5e325e3 100644
--- a/harbour/contrib/hbqt/qtcore/QVariant.cpp
+++ b/harbour/contrib/hbqt/qtcore/QVariant.cpp
@@ -177,7 +177,7 @@ void * hbqt_gcAllocate_QVariant( void * pObj, bool bNew )
    p->ph = ( QVariant * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QVariant;
-   p->type = QT_TYPE_QVariant;
+   p->type = HBQT_TYPE_QVariant;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp b/harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp
index 7067b36853..e2e52cfce3 100644
--- a/harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp
+++ b/harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_HBQMainWindow( void * pObj, bool bNew )
    new( & p->ph ) QPointer< HBQMainWindow >( ( HBQMainWindow * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_HBQMainWindow;
-   p->type = QT_TYPE_HBQMainWindow;
+   p->type = HBQT_TYPE_HBQMainWindow;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/HBQPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/HBQPlainTextEdit.cpp
index 267559de96..ad29197f5a 100644
--- a/harbour/contrib/hbqt/qtgui/HBQPlainTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/HBQPlainTextEdit.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_HBQPlainTextEdit( void * pObj, bool bNew )
    new( & p->ph ) QPointer< HBQPlainTextEdit >( ( HBQPlainTextEdit * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_HBQPlainTextEdit;
-   p->type = QT_TYPE_HBQPlainTextEdit;
+   p->type = HBQT_TYPE_HBQPlainTextEdit;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp
index 0d697add56..49e60d4ee7 100644
--- a/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp
+++ b/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_HBQSyntaxHighlighter( void * pObj, bool bNew )
    new( & p->ph ) QPointer< HBQSyntaxHighlighter >( ( HBQSyntaxHighlighter * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_HBQSyntaxHighlighter;
-   p->type = QT_TYPE_HBQSyntaxHighlighter;
+   p->type = HBQT_TYPE_HBQSyntaxHighlighter;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/HBQTableView.cpp b/harbour/contrib/hbqt/qtgui/HBQTableView.cpp
index 4d7c3bf18f..a7344dbf70 100644
--- a/harbour/contrib/hbqt/qtgui/HBQTableView.cpp
+++ b/harbour/contrib/hbqt/qtgui/HBQTableView.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_HBQTableView( void * pObj, bool bNew )
    new( & p->ph ) QPointer< HBQTableView >( ( HBQTableView * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_HBQTableView;
-   p->type = QT_TYPE_HBQTableView;
+   p->type = HBQT_TYPE_HBQTableView;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp b/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp
index 7bb850ea65..998da9348d 100644
--- a/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp
+++ b/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_HBQTextBlockUserData( void * pObj, bool bNew )
    p->ph = ( HBQTextBlockUserData * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_HBQTextBlockUserData;
-   p->type = QT_TYPE_HBQTextBlockUserData;
+   p->type = HBQT_TYPE_HBQTextBlockUserData;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp b/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp
index 052fc1edbd..96e19eedd5 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QAbstractButton( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractButton >( ( QAbstractButton * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractButton;
-   p->type = QT_TYPE_QAbstractButton;
+   p->type = HBQT_TYPE_QAbstractButton;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp
index c96598b4a4..d4407a7839 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp
@@ -104,7 +104,7 @@ void * hbqt_gcAllocate_QAbstractItemDelegate( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractItemDelegate >( ( QAbstractItemDelegate * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractItemDelegate;
-   p->type = QT_TYPE_QAbstractItemDelegate;
+   p->type = HBQT_TYPE_QAbstractItemDelegate;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp b/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp
index 6175404d3d..713e2ceaa9 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp
@@ -111,7 +111,7 @@ void * hbqt_gcAllocate_QAbstractItemView( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractItemView >( ( QAbstractItemView * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractItemView;
-   p->type = QT_TYPE_QAbstractItemView;
+   p->type = HBQT_TYPE_QAbstractItemView;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp
index c13f6240c7..ee2bd890b3 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QAbstractPrintDialog( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractPrintDialog >( ( QAbstractPrintDialog * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractPrintDialog;
-   p->type = QT_TYPE_QAbstractPrintDialog;
+   p->type = HBQT_TYPE_QAbstractPrintDialog;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp b/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp
index cf94b77f12..f47cee92da 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QAbstractProxyModel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractProxyModel >( ( QAbstractProxyModel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractProxyModel;
-   p->type = QT_TYPE_QAbstractProxyModel;
+   p->type = HBQT_TYPE_QAbstractProxyModel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp b/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp
index 409905a364..6b410bebfa 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QAbstractScrollArea( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractScrollArea >( ( QAbstractScrollArea * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractScrollArea;
-   p->type = QT_TYPE_QAbstractScrollArea;
+   p->type = HBQT_TYPE_QAbstractScrollArea;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp b/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp
index 05210fafb6..ac2df4db41 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp
@@ -105,7 +105,7 @@ void * hbqt_gcAllocate_QAbstractSlider( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractSlider >( ( QAbstractSlider * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractSlider;
-   p->type = QT_TYPE_QAbstractSlider;
+   p->type = HBQT_TYPE_QAbstractSlider;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp
index 2373712dd1..b2fa0d4980 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp
@@ -108,7 +108,7 @@ void * hbqt_gcAllocate_QAbstractSpinBox( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractSpinBox >( ( QAbstractSpinBox * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractSpinBox;
-   p->type = QT_TYPE_QAbstractSpinBox;
+   p->type = HBQT_TYPE_QAbstractSpinBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp
index 008b7a1d91..600cb15968 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QAbstractTextDocumentLayout( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAbstractTextDocumentLayout >( ( QAbstractTextDocumentLayout * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAbstractTextDocumentLayout;
-   p->type = QT_TYPE_QAbstractTextDocumentLayout;
+   p->type = HBQT_TYPE_QAbstractTextDocumentLayout;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QAction.cpp b/harbour/contrib/hbqt/qtgui/QAction.cpp
index b91f371445..5187716840 100644
--- a/harbour/contrib/hbqt/qtgui/QAction.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAction.cpp
@@ -147,7 +147,7 @@ void * hbqt_gcAllocate_QAction( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QAction >( ( QAction * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QAction;
-   p->type = QT_TYPE_QAction;
+   p->type = HBQT_TYPE_QAction;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp b/harbour/contrib/hbqt/qtgui/QActionGroup.cpp
index 9be46ae675..9b3438397f 100644
--- a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/QActionGroup.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QActionGroup( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QActionGroup >( ( QActionGroup * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QActionGroup;
-   p->type = QT_TYPE_QActionGroup;
+   p->type = HBQT_TYPE_QActionGroup;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QApplication.cpp b/harbour/contrib/hbqt/qtgui/QApplication.cpp
index d9d08be69e..09ce1814b2 100644
--- a/harbour/contrib/hbqt/qtgui/QApplication.cpp
+++ b/harbour/contrib/hbqt/qtgui/QApplication.cpp
@@ -183,7 +183,7 @@ void * hbqt_gcAllocate_QApplication( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QApplication >( ( QApplication * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QApplication;
-   p->type = QT_TYPE_QApplication;
+   p->type = HBQT_TYPE_QApplication;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QBitmap.cpp b/harbour/contrib/hbqt/qtgui/QBitmap.cpp
index 61c8e39502..3c7d21fdcb 100644
--- a/harbour/contrib/hbqt/qtgui/QBitmap.cpp
+++ b/harbour/contrib/hbqt/qtgui/QBitmap.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QBitmap( void * pObj, bool bNew )
    p->ph = ( QBitmap * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QBitmap;
-   p->type = QT_TYPE_QBitmap;
+   p->type = HBQT_TYPE_QBitmap;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp
index 926433cb67..b727591d59 100644
--- a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp
@@ -142,7 +142,7 @@ void * hbqt_gcAllocate_QBoxLayout( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QBoxLayout >( ( QBoxLayout * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QBoxLayout;
-   p->type = QT_TYPE_QBoxLayout;
+   p->type = HBQT_TYPE_QBoxLayout;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QBrush.cpp b/harbour/contrib/hbqt/qtgui/QBrush.cpp
index b79981cfee..8fa6873f37 100644
--- a/harbour/contrib/hbqt/qtgui/QBrush.cpp
+++ b/harbour/contrib/hbqt/qtgui/QBrush.cpp
@@ -125,7 +125,7 @@ void * hbqt_gcAllocate_QBrush( void * pObj, bool bNew )
    p->ph = ( QBrush * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QBrush;
-   p->type = QT_TYPE_QBrush;
+   p->type = HBQT_TYPE_QBrush;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp b/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp
index 0b7d521fb0..940a025654 100644
--- a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QButtonGroup( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QButtonGroup >( ( QButtonGroup * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QButtonGroup;
-   p->type = QT_TYPE_QButtonGroup;
+   p->type = HBQT_TYPE_QButtonGroup;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp b/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp
index 38f860fae0..3eb1f1e44e 100644
--- a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp
@@ -142,7 +142,7 @@ void * hbqt_gcAllocate_QCalendarWidget( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QCalendarWidget >( ( QCalendarWidget * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QCalendarWidget;
-   p->type = QT_TYPE_QCalendarWidget;
+   p->type = HBQT_TYPE_QCalendarWidget;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp b/harbour/contrib/hbqt/qtgui/QCheckBox.cpp
index c8218c8649..8374aa5e7a 100644
--- a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCheckBox.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QCheckBox( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QCheckBox >( ( QCheckBox * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QCheckBox;
-   p->type = QT_TYPE_QCheckBox;
+   p->type = HBQT_TYPE_QCheckBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QClipboard.cpp b/harbour/contrib/hbqt/qtgui/QClipboard.cpp
index 41ed2f6fc4..32d54b2ed7 100644
--- a/harbour/contrib/hbqt/qtgui/QClipboard.cpp
+++ b/harbour/contrib/hbqt/qtgui/QClipboard.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QClipboard( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QClipboard >( ( QClipboard * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QClipboard;
-   p->type = QT_TYPE_QClipboard;
+   p->type = HBQT_TYPE_QClipboard;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QColor.cpp b/harbour/contrib/hbqt/qtgui/QColor.cpp
index 244d9ffdf8..c7a28f9017 100644
--- a/harbour/contrib/hbqt/qtgui/QColor.cpp
+++ b/harbour/contrib/hbqt/qtgui/QColor.cpp
@@ -125,7 +125,7 @@ void * hbqt_gcAllocate_QColor( void * pObj, bool bNew )
    p->ph = ( QColor * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QColor;
-   p->type = QT_TYPE_QColor;
+   p->type = HBQT_TYPE_QColor;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp b/harbour/contrib/hbqt/qtgui/QColorDialog.cpp
index b3cd473048..79964a09e9 100644
--- a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QColorDialog.cpp
@@ -132,7 +132,7 @@ void * hbqt_gcAllocate_QColorDialog( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QColorDialog >( ( QColorDialog * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QColorDialog;
-   p->type = QT_TYPE_QColorDialog;
+   p->type = HBQT_TYPE_QColorDialog;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/QComboBox.cpp
index 7e1798f778..4abf13192b 100644
--- a/harbour/contrib/hbqt/qtgui/QComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QComboBox.cpp
@@ -132,7 +132,7 @@ void * hbqt_gcAllocate_QComboBox( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QComboBox >( ( QComboBox * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QComboBox;
-   p->type = QT_TYPE_QComboBox;
+   p->type = HBQT_TYPE_QComboBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp b/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp
index f290c1733d..b9290d7bac 100644
--- a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QCommandLinkButton( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QCommandLinkButton >( ( QCommandLinkButton * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QCommandLinkButton;
-   p->type = QT_TYPE_QCommandLinkButton;
+   p->type = HBQT_TYPE_QCommandLinkButton;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp b/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp
index 30db54b976..a5245febbc 100644
--- a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QCommonStyle( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QCommonStyle >( ( QCommonStyle * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QCommonStyle;
-   p->type = QT_TYPE_QCommonStyle;
+   p->type = HBQT_TYPE_QCommonStyle;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QCompleter.cpp b/harbour/contrib/hbqt/qtgui/QCompleter.cpp
index 2a4d2ef563..11c6d6ba79 100644
--- a/harbour/contrib/hbqt/qtgui/QCompleter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCompleter.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QCompleter( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QCompleter >( ( QCompleter * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QCompleter;
-   p->type = QT_TYPE_QCompleter;
+   p->type = HBQT_TYPE_QCompleter;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp b/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp
index e88068e413..84e523ca24 100644
--- a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QConicalGradient( void * pObj, bool bNew )
    p->ph = ( QConicalGradient * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QConicalGradient;
-   p->type = QT_TYPE_QConicalGradient;
+   p->type = HBQT_TYPE_QConicalGradient;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp
index b0a44ed5b4..5328199b59 100644
--- a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QContextMenuEvent( void * pObj, bool bNew )
    p->ph = ( QContextMenuEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QContextMenuEvent;
-   p->type = QT_TYPE_QContextMenuEvent;
+   p->type = HBQT_TYPE_QContextMenuEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QCursor.cpp b/harbour/contrib/hbqt/qtgui/QCursor.cpp
index 2224043d34..33f3da2bcf 100644
--- a/harbour/contrib/hbqt/qtgui/QCursor.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCursor.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QCursor( void * pObj, bool bNew )
    p->ph = ( QCursor * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QCursor;
-   p->type = QT_TYPE_QCursor;
+   p->type = HBQT_TYPE_QCursor;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp b/harbour/contrib/hbqt/qtgui/QDateEdit.cpp
index 41235624e8..5453e2e4d5 100644
--- a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDateEdit.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QDateEdit( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QDateEdit >( ( QDateEdit * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDateEdit;
-   p->type = QT_TYPE_QDateEdit;
+   p->type = HBQT_TYPE_QDateEdit;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp
index 304271bb06..0f33c33818 100644
--- a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QDateTimeEdit( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QDateTimeEdit >( ( QDateTimeEdit * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDateTimeEdit;
-   p->type = QT_TYPE_QDateTimeEdit;
+   p->type = HBQT_TYPE_QDateTimeEdit;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp b/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp
index 571b62157b..df1486ad7c 100644
--- a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QDesktopWidget( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QDesktopWidget >( ( QDesktopWidget * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDesktopWidget;
-   p->type = QT_TYPE_QDesktopWidget;
+   p->type = HBQT_TYPE_QDesktopWidget;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDial.cpp b/harbour/contrib/hbqt/qtgui/QDial.cpp
index 0b9426e10c..cb7b4c4431 100644
--- a/harbour/contrib/hbqt/qtgui/QDial.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDial.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QDial( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QDial >( ( QDial * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDial;
-   p->type = QT_TYPE_QDial;
+   p->type = HBQT_TYPE_QDial;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDialog.cpp b/harbour/contrib/hbqt/qtgui/QDialog.cpp
index 24177b17f2..fa1e4cc955 100644
--- a/harbour/contrib/hbqt/qtgui/QDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDialog.cpp
@@ -131,7 +131,7 @@ void * hbqt_gcAllocate_QDialog( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QDialog >( ( QDialog * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDialog;
-   p->type = QT_TYPE_QDialog;
+   p->type = HBQT_TYPE_QDialog;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDirModel.cpp b/harbour/contrib/hbqt/qtgui/QDirModel.cpp
index f21c3f8f8b..2ebc991d82 100644
--- a/harbour/contrib/hbqt/qtgui/QDirModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDirModel.cpp
@@ -132,7 +132,7 @@ void * hbqt_gcAllocate_QDirModel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QDirModel >( ( QDirModel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDirModel;
-   p->type = QT_TYPE_QDirModel;
+   p->type = HBQT_TYPE_QDirModel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp b/harbour/contrib/hbqt/qtgui/QDockWidget.cpp
index 5a0b15b741..41b531af55 100644
--- a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDockWidget.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QDockWidget( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QDockWidget >( ( QDockWidget * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDockWidget;
-   p->type = QT_TYPE_QDockWidget;
+   p->type = HBQT_TYPE_QDockWidget;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp
index 5575723537..ca02b9e2fa 100644
--- a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QDoubleSpinBox( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QDoubleSpinBox >( ( QDoubleSpinBox * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDoubleSpinBox;
-   p->type = QT_TYPE_QDoubleSpinBox;
+   p->type = HBQT_TYPE_QDoubleSpinBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp b/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp
index 5013596085..06c7e7e2c9 100644
--- a/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QDragEnterEvent( void * pObj, bool bNew )
    p->ph = ( QDragEnterEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDragEnterEvent;
-   p->type = QT_TYPE_QDragEnterEvent;
+   p->type = HBQT_TYPE_QDragEnterEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp b/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp
index 685a6fc291..3939936ad4 100644
--- a/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QDragLeaveEvent( void * pObj, bool bNew )
    p->ph = ( QDragLeaveEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDragLeaveEvent;
-   p->type = QT_TYPE_QDragLeaveEvent;
+   p->type = HBQT_TYPE_QDragLeaveEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp
index e9d3685ca3..d3aadae14a 100644
--- a/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QDragMoveEvent( void * pObj, bool bNew )
    p->ph = ( QDragMoveEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDragMoveEvent;
-   p->type = QT_TYPE_QDragMoveEvent;
+   p->type = HBQT_TYPE_QDragMoveEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QDropEvent.cpp b/harbour/contrib/hbqt/qtgui/QDropEvent.cpp
index e559bd24fe..ba6a852b95 100644
--- a/harbour/contrib/hbqt/qtgui/QDropEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDropEvent.cpp
@@ -109,7 +109,7 @@ void * hbqt_gcAllocate_QDropEvent( void * pObj, bool bNew )
    p->ph = ( QDropEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QDropEvent;
-   p->type = QT_TYPE_QDropEvent;
+   p->type = HBQT_TYPE_QDropEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp b/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp
index 6e677a63f8..a99cf09e81 100644
--- a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp
+++ b/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QErrorMessage( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QErrorMessage >( ( QErrorMessage * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QErrorMessage;
-   p->type = QT_TYPE_QErrorMessage;
+   p->type = HBQT_TYPE_QErrorMessage;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp b/harbour/contrib/hbqt/qtgui/QFileDialog.cpp
index bfd9e14378..f210fa1b4e 100644
--- a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFileDialog.cpp
@@ -153,7 +153,7 @@ void * hbqt_gcAllocate_QFileDialog( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QFileDialog >( ( QFileDialog * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFileDialog;
-   p->type = QT_TYPE_QFileDialog;
+   p->type = HBQT_TYPE_QFileDialog;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp b/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp
index f9e95a90e8..bc6fb5ca0b 100644
--- a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp
@@ -119,7 +119,7 @@ void * hbqt_gcAllocate_QFileIconProvider( void * pObj, bool bNew )
    p->ph = ( QFileIconProvider * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFileIconProvider;
-   p->type = QT_TYPE_QFileIconProvider;
+   p->type = HBQT_TYPE_QFileIconProvider;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp b/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp
index 84cc0f6903..9bc98308d9 100644
--- a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp
@@ -131,7 +131,7 @@ void * hbqt_gcAllocate_QFileSystemModel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QFileSystemModel >( ( QFileSystemModel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFileSystemModel;
-   p->type = QT_TYPE_QFileSystemModel;
+   p->type = HBQT_TYPE_QFileSystemModel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp b/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp
index 20a83445c3..1ee1a5833d 100644
--- a/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QFocusEvent( void * pObj, bool bNew )
    p->ph = ( QFocusEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFocusEvent;
-   p->type = QT_TYPE_QFocusEvent;
+   p->type = HBQT_TYPE_QFocusEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp b/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp
index 2d1ffa5979..9b4b8bb889 100644
--- a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QFocusFrame( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QFocusFrame >( ( QFocusFrame * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFocusFrame;
-   p->type = QT_TYPE_QFocusFrame;
+   p->type = HBQT_TYPE_QFocusFrame;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFont.cpp b/harbour/contrib/hbqt/qtgui/QFont.cpp
index 959ba636fe..a94bf27c3f 100644
--- a/harbour/contrib/hbqt/qtgui/QFont.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFont.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QFont( void * pObj, bool bNew )
    p->ph = ( QFont * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFont;
-   p->type = QT_TYPE_QFont;
+   p->type = HBQT_TYPE_QFont;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp b/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp
index 7141d5ea15..4d4cc6b633 100644
--- a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp
@@ -132,7 +132,7 @@ void * hbqt_gcAllocate_QFontComboBox( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QFontComboBox >( ( QFontComboBox * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFontComboBox;
-   p->type = QT_TYPE_QFontComboBox;
+   p->type = HBQT_TYPE_QFontComboBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
index 47c597b34c..775ef6caea 100644
--- a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QFontDatabase( void * pObj, bool bNew )
    p->ph = ( QFontDatabase * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFontDatabase;
-   p->type = QT_TYPE_QFontDatabase;
+   p->type = HBQT_TYPE_QFontDatabase;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp b/harbour/contrib/hbqt/qtgui/QFontDialog.cpp
index fe8df33307..258e659182 100644
--- a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontDialog.cpp
@@ -132,7 +132,7 @@ void * hbqt_gcAllocate_QFontDialog( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QFontDialog >( ( QFontDialog * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFontDialog;
-   p->type = QT_TYPE_QFontDialog;
+   p->type = HBQT_TYPE_QFontDialog;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp b/harbour/contrib/hbqt/qtgui/QFontInfo.cpp
index 754526f114..1f627aa595 100644
--- a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontInfo.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QFontInfo( void * pObj, bool bNew )
    p->ph = ( QFontInfo * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFontInfo;
-   p->type = QT_TYPE_QFontInfo;
+   p->type = HBQT_TYPE_QFontInfo;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp b/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp
index 1aa553979f..2120473580 100644
--- a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp
@@ -118,7 +118,7 @@ void * hbqt_gcAllocate_QFontMetrics( void * pObj, bool bNew )
    p->ph = ( QFontMetrics * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFontMetrics;
-   p->type = QT_TYPE_QFontMetrics;
+   p->type = HBQT_TYPE_QFontMetrics;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp b/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp
index 5ec438ae1a..92c256a9dc 100644
--- a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp
@@ -119,7 +119,7 @@ void * hbqt_gcAllocate_QFontMetricsF( void * pObj, bool bNew )
    p->ph = ( QFontMetricsF * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFontMetricsF;
-   p->type = QT_TYPE_QFontMetricsF;
+   p->type = HBQT_TYPE_QFontMetricsF;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp b/harbour/contrib/hbqt/qtgui/QFormLayout.cpp
index 5b4a66f26a..4033717c7f 100644
--- a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFormLayout.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QFormLayout( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QFormLayout >( ( QFormLayout * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFormLayout;
-   p->type = QT_TYPE_QFormLayout;
+   p->type = HBQT_TYPE_QFormLayout;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QFrame.cpp b/harbour/contrib/hbqt/qtgui/QFrame.cpp
index 09c7cfe1b1..769ed076f6 100644
--- a/harbour/contrib/hbqt/qtgui/QFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFrame.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QFrame( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QFrame >( ( QFrame * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFrame;
-   p->type = QT_TYPE_QFrame;
+   p->type = HBQT_TYPE_QFrame;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QGradient.cpp b/harbour/contrib/hbqt/qtgui/QGradient.cpp
index 58426f5cbf..b12f49f4f8 100644
--- a/harbour/contrib/hbqt/qtgui/QGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/QGradient.cpp
@@ -106,7 +106,7 @@ void * hbqt_gcAllocate_QGradient( void * pObj, bool bNew )
    p->ph = ( QGradient * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QGradient;
-   p->type = QT_TYPE_QGradient;
+   p->type = HBQT_TYPE_QGradient;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp b/harbour/contrib/hbqt/qtgui/QGridLayout.cpp
index ef80c8df3a..58fbae410a 100644
--- a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QGridLayout.cpp
@@ -141,7 +141,7 @@ void * hbqt_gcAllocate_QGridLayout( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QGridLayout >( ( QGridLayout * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QGridLayout;
-   p->type = QT_TYPE_QGridLayout;
+   p->type = HBQT_TYPE_QGridLayout;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp b/harbour/contrib/hbqt/qtgui/QGroupBox.cpp
index 1e46a1bda8..13b5c88792 100644
--- a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QGroupBox.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QGroupBox( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QGroupBox >( ( QGroupBox * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QGroupBox;
-   p->type = QT_TYPE_QGroupBox;
+   p->type = HBQT_TYPE_QGroupBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp
index f1313f5a7a..41b6221977 100644
--- a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QHBoxLayout( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QHBoxLayout >( ( QHBoxLayout * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QHBoxLayout;
-   p->type = QT_TYPE_QHBoxLayout;
+   p->type = HBQT_TYPE_QHBoxLayout;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp b/harbour/contrib/hbqt/qtgui/QHeaderView.cpp
index 3e00ddaa20..baf6772707 100644
--- a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp
+++ b/harbour/contrib/hbqt/qtgui/QHeaderView.cpp
@@ -131,7 +131,7 @@ void * hbqt_gcAllocate_QHeaderView( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QHeaderView >( ( QHeaderView * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QHeaderView;
-   p->type = QT_TYPE_QHeaderView;
+   p->type = HBQT_TYPE_QHeaderView;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp
index 570974c9b2..e9e71d3fff 100644
--- a/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QHelpEvent( void * pObj, bool bNew )
    p->ph = ( QHelpEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QHelpEvent;
-   p->type = QT_TYPE_QHelpEvent;
+   p->type = HBQT_TYPE_QHelpEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QHideEvent.cpp b/harbour/contrib/hbqt/qtgui/QHideEvent.cpp
index 45106038c5..eccd198107 100644
--- a/harbour/contrib/hbqt/qtgui/QHideEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QHideEvent.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QHideEvent( void * pObj, bool bNew )
    p->ph = ( QHideEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QHideEvent;
-   p->type = QT_TYPE_QHideEvent;
+   p->type = HBQT_TYPE_QHideEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QIcon.cpp b/harbour/contrib/hbqt/qtgui/QIcon.cpp
index 8b1750b964..b441e64c67 100644
--- a/harbour/contrib/hbqt/qtgui/QIcon.cpp
+++ b/harbour/contrib/hbqt/qtgui/QIcon.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QIcon( void * pObj, bool bNew )
    p->ph = ( QIcon * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QIcon;
-   p->type = QT_TYPE_QIcon;
+   p->type = HBQT_TYPE_QIcon;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QImage.cpp b/harbour/contrib/hbqt/qtgui/QImage.cpp
index 2971d6e856..5c31679e50 100644
--- a/harbour/contrib/hbqt/qtgui/QImage.cpp
+++ b/harbour/contrib/hbqt/qtgui/QImage.cpp
@@ -147,7 +147,7 @@ void * hbqt_gcAllocate_QImage( void * pObj, bool bNew )
    p->ph = ( QImage * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QImage;
-   p->type = QT_TYPE_QImage;
+   p->type = HBQT_TYPE_QImage;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QImageReader.cpp b/harbour/contrib/hbqt/qtgui/QImageReader.cpp
index 29a6aecfa9..9e89cc051e 100644
--- a/harbour/contrib/hbqt/qtgui/QImageReader.cpp
+++ b/harbour/contrib/hbqt/qtgui/QImageReader.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QImageReader( void * pObj, bool bNew )
    p->ph = ( QImageReader * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QImageReader;
-   p->type = QT_TYPE_QImageReader;
+   p->type = HBQT_TYPE_QImageReader;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp b/harbour/contrib/hbqt/qtgui/QImageWriter.cpp
index 2ca0b8f45f..246bc18341 100644
--- a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QImageWriter.cpp
@@ -122,7 +122,7 @@ void * hbqt_gcAllocate_QImageWriter( void * pObj, bool bNew )
    p->ph = ( QImageWriter * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QImageWriter;
-   p->type = QT_TYPE_QImageWriter;
+   p->type = HBQT_TYPE_QImageWriter;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp b/harbour/contrib/hbqt/qtgui/QInputDialog.cpp
index 11fdec1420..0fc382c08d 100644
--- a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QInputDialog.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QInputDialog( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QInputDialog >( ( QInputDialog * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QInputDialog;
-   p->type = QT_TYPE_QInputDialog;
+   p->type = HBQT_TYPE_QInputDialog;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp b/harbour/contrib/hbqt/qtgui/QInputEvent.cpp
index ac8e11f646..7423622fae 100644
--- a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QInputEvent.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QInputEvent( void * pObj, bool bNew )
    p->ph = ( QInputEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QInputEvent;
-   p->type = QT_TYPE_QInputEvent;
+   p->type = HBQT_TYPE_QInputEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp b/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp
index f4122e03ce..e78aa5a508 100644
--- a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QInputMethodEvent( void * pObj, bool bNew )
    p->ph = ( QInputMethodEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QInputMethodEvent;
-   p->type = QT_TYPE_QInputMethodEvent;
+   p->type = HBQT_TYPE_QInputMethodEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/QItemDelegate.cpp
index e0a92449c2..2a92b99804 100644
--- a/harbour/contrib/hbqt/qtgui/QItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/QItemDelegate.cpp
@@ -131,7 +131,7 @@ void * hbqt_gcAllocate_QItemDelegate( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QItemDelegate >( ( QItemDelegate * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QItemDelegate;
-   p->type = QT_TYPE_QItemDelegate;
+   p->type = HBQT_TYPE_QItemDelegate;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QItemEditorCreatorBase.cpp b/harbour/contrib/hbqt/qtgui/QItemEditorCreatorBase.cpp
index 45fefd0e20..be3a8ede82 100644
--- a/harbour/contrib/hbqt/qtgui/QItemEditorCreatorBase.cpp
+++ b/harbour/contrib/hbqt/qtgui/QItemEditorCreatorBase.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QItemEditorCreatorBase( void * pObj, bool bNew )
    p->ph = ( QItemEditorCreatorBase * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QItemEditorCreatorBase;
-   p->type = QT_TYPE_QItemEditorCreatorBase;
+   p->type = HBQT_TYPE_QItemEditorCreatorBase;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QItemEditorFactory.cpp b/harbour/contrib/hbqt/qtgui/QItemEditorFactory.cpp
index 2d64e8b8a5..985fb48aca 100644
--- a/harbour/contrib/hbqt/qtgui/QItemEditorFactory.cpp
+++ b/harbour/contrib/hbqt/qtgui/QItemEditorFactory.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QItemEditorFactory( void * pObj, bool bNew )
    p->ph = ( QItemEditorFactory * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QItemEditorFactory;
-   p->type = QT_TYPE_QItemEditorFactory;
+   p->type = HBQT_TYPE_QItemEditorFactory;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp b/harbour/contrib/hbqt/qtgui/QItemSelection.cpp
index f37f09a445..a2d827bc65 100644
--- a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp
+++ b/harbour/contrib/hbqt/qtgui/QItemSelection.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QItemSelection( void * pObj, bool bNew )
    p->ph = ( QItemSelection * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QItemSelection;
-   p->type = QT_TYPE_QItemSelection;
+   p->type = HBQT_TYPE_QItemSelection;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp b/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp
index 2f836bc381..bdc4e66aa3 100644
--- a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp
@@ -132,7 +132,7 @@ void * hbqt_gcAllocate_QItemSelectionModel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QItemSelectionModel >( ( QItemSelectionModel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QItemSelectionModel;
-   p->type = QT_TYPE_QItemSelectionModel;
+   p->type = HBQT_TYPE_QItemSelectionModel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp b/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp
index 7477f825d3..6b084269e0 100644
--- a/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QKeyEvent( void * pObj, bool bNew )
    p->ph = ( QKeyEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QKeyEvent;
-   p->type = QT_TYPE_QKeyEvent;
+   p->type = HBQT_TYPE_QKeyEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp b/harbour/contrib/hbqt/qtgui/QKeySequence.cpp
index 449ce6a1b1..388bfece8f 100644
--- a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp
+++ b/harbour/contrib/hbqt/qtgui/QKeySequence.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QKeySequence( void * pObj, bool bNew )
    p->ph = ( QKeySequence * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QKeySequence;
-   p->type = QT_TYPE_QKeySequence;
+   p->type = HBQT_TYPE_QKeySequence;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp b/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp
index 479c8dcf33..0a6b6c1e84 100644
--- a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp
+++ b/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QLCDNumber( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QLCDNumber >( ( QLCDNumber * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLCDNumber;
-   p->type = QT_TYPE_QLCDNumber;
+   p->type = HBQT_TYPE_QLCDNumber;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QLabel.cpp b/harbour/contrib/hbqt/qtgui/QLabel.cpp
index 54dd2dc5f2..6ae4430e41 100644
--- a/harbour/contrib/hbqt/qtgui/QLabel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QLabel.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QLabel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QLabel >( ( QLabel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLabel;
-   p->type = QT_TYPE_QLabel;
+   p->type = HBQT_TYPE_QLabel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QLayout.cpp b/harbour/contrib/hbqt/qtgui/QLayout.cpp
index 86c1c8aff1..11ae8aa11d 100644
--- a/harbour/contrib/hbqt/qtgui/QLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QLayout.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QLayout( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QLayout >( ( QLayout * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLayout;
-   p->type = QT_TYPE_QLayout;
+   p->type = HBQT_TYPE_QLayout;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp
index 32d0b8a827..4209e3b46f 100644
--- a/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QLayoutItem( void * pObj, bool bNew )
    p->ph = ( QLayoutItem * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLayoutItem;
-   p->type = QT_TYPE_QLayoutItem;
+   p->type = HBQT_TYPE_QLayoutItem;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp b/harbour/contrib/hbqt/qtgui/QLineEdit.cpp
index a6f67fc55a..8cbac03136 100644
--- a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QLineEdit.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QLineEdit( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QLineEdit >( ( QLineEdit * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLineEdit;
-   p->type = QT_TYPE_QLineEdit;
+   p->type = HBQT_TYPE_QLineEdit;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp b/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp
index b0a64a16fb..df470cbe50 100644
--- a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QLinearGradient( void * pObj, bool bNew )
    p->ph = ( QLinearGradient * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QLinearGradient;
-   p->type = QT_TYPE_QLinearGradient;
+   p->type = HBQT_TYPE_QLinearGradient;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QListView.cpp b/harbour/contrib/hbqt/qtgui/QListView.cpp
index c31307ec4a..733fee4e82 100644
--- a/harbour/contrib/hbqt/qtgui/QListView.cpp
+++ b/harbour/contrib/hbqt/qtgui/QListView.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QListView( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QListView >( ( QListView * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QListView;
-   p->type = QT_TYPE_QListView;
+   p->type = HBQT_TYPE_QListView;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QListWidget.cpp b/harbour/contrib/hbqt/qtgui/QListWidget.cpp
index b90bc47c39..64c9653c2c 100644
--- a/harbour/contrib/hbqt/qtgui/QListWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QListWidget.cpp
@@ -137,7 +137,7 @@ void * hbqt_gcAllocate_QListWidget( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QListWidget >( ( QListWidget * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QListWidget;
-   p->type = QT_TYPE_QListWidget;
+   p->type = HBQT_TYPE_QListWidget;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp
index 04bbeee153..337192adac 100644
--- a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QListWidgetItem( void * pObj, bool bNew )
    p->ph = ( QListWidgetItem * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QListWidgetItem;
-   p->type = QT_TYPE_QListWidgetItem;
+   p->type = HBQT_TYPE_QListWidgetItem;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp b/harbour/contrib/hbqt/qtgui/QMainWindow.cpp
index ede0c77ceb..b6598fd267 100644
--- a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMainWindow.cpp
@@ -156,7 +156,7 @@ void * hbqt_gcAllocate_QMainWindow( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QMainWindow >( ( QMainWindow * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QMainWindow;
-   p->type = QT_TYPE_QMainWindow;
+   p->type = HBQT_TYPE_QMainWindow;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QMatrix.cpp b/harbour/contrib/hbqt/qtgui/QMatrix.cpp
index 1abd942453..f8f5098480 100644
--- a/harbour/contrib/hbqt/qtgui/QMatrix.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMatrix.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QMatrix( void * pObj, bool bNew )
    p->ph = ( QMatrix * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QMatrix;
-   p->type = QT_TYPE_QMatrix;
+   p->type = HBQT_TYPE_QMatrix;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QMdiArea.cpp b/harbour/contrib/hbqt/qtgui/QMdiArea.cpp
index 8f6971885b..727190a4f8 100644
--- a/harbour/contrib/hbqt/qtgui/QMdiArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMdiArea.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QMdiArea( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QMdiArea >( ( QMdiArea * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QMdiArea;
-   p->type = QT_TYPE_QMdiArea;
+   p->type = HBQT_TYPE_QMdiArea;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp b/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp
index d75e9d5f87..04a4199f6a 100644
--- a/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QMdiSubWindow( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QMdiSubWindow >( ( QMdiSubWindow * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QMdiSubWindow;
-   p->type = QT_TYPE_QMdiSubWindow;
+   p->type = HBQT_TYPE_QMdiSubWindow;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QMenu.cpp b/harbour/contrib/hbqt/qtgui/QMenu.cpp
index 70fb9e7b4a..6819f0bddf 100644
--- a/harbour/contrib/hbqt/qtgui/QMenu.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMenu.cpp
@@ -142,7 +142,7 @@ void * hbqt_gcAllocate_QMenu( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QMenu >( ( QMenu * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QMenu;
-   p->type = QT_TYPE_QMenu;
+   p->type = HBQT_TYPE_QMenu;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp
index 6767b2bba2..3e5cce8e08 100644
--- a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QMenuBar( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QMenuBar >( ( QMenuBar * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QMenuBar;
-   p->type = QT_TYPE_QMenuBar;
+   p->type = HBQT_TYPE_QMenuBar;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp b/harbour/contrib/hbqt/qtgui/QMessageBox.cpp
index 79c32a2bdc..eb501e3860 100644
--- a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMessageBox.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QMessageBox( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QMessageBox >( ( QMessageBox * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QMessageBox;
-   p->type = QT_TYPE_QMessageBox;
+   p->type = HBQT_TYPE_QMessageBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp
index 36a935c9c1..67b8e235e4 100644
--- a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QMouseEvent( void * pObj, bool bNew )
    p->ph = ( QMouseEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QMouseEvent;
-   p->type = QT_TYPE_QMouseEvent;
+   p->type = HBQT_TYPE_QMouseEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp
index dd6ecfe5bc..37a2634e44 100644
--- a/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QMoveEvent( void * pObj, bool bNew )
    p->ph = ( QMoveEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QMoveEvent;
-   p->type = QT_TYPE_QMoveEvent;
+   p->type = HBQT_TYPE_QMoveEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QMovie.cpp b/harbour/contrib/hbqt/qtgui/QMovie.cpp
index 8cb69ba437..f35d1ed69d 100644
--- a/harbour/contrib/hbqt/qtgui/QMovie.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMovie.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QMovie( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QMovie >( ( QMovie * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QMovie;
-   p->type = QT_TYPE_QMovie;
+   p->type = HBQT_TYPE_QMovie;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp b/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp
index 755ca8000a..21e771cdf4 100644
--- a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp
@@ -132,7 +132,7 @@ void * hbqt_gcAllocate_QPageSetupDialog( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QPageSetupDialog >( ( QPageSetupDialog * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPageSetupDialog;
-   p->type = QT_TYPE_QPageSetupDialog;
+   p->type = HBQT_TYPE_QPageSetupDialog;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp b/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp
index 6d31005909..1af34bb50a 100644
--- a/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QPaintDevice( void * pObj, bool bNew )
    p->ph = ( QPaintDevice * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPaintDevice;
-   p->type = QT_TYPE_QPaintDevice;
+   p->type = HBQT_TYPE_QPaintDevice;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp b/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp
index 93da116623..59c1e35d36 100644
--- a/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp
@@ -110,7 +110,7 @@ void * hbqt_gcAllocate_QPaintEngine( void * pObj, bool bNew )
    p->ph = ( QPaintEngine * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPaintEngine;
-   p->type = QT_TYPE_QPaintEngine;
+   p->type = HBQT_TYPE_QPaintEngine;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp b/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp
index 8962f45e72..ee794ae12c 100644
--- a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QPaintEvent( void * pObj, bool bNew )
    p->ph = ( QPaintEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPaintEvent;
-   p->type = QT_TYPE_QPaintEvent;
+   p->type = HBQT_TYPE_QPaintEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPainter.cpp b/harbour/contrib/hbqt/qtgui/QPainter.cpp
index b1bef76caf..c3713e4ea9 100644
--- a/harbour/contrib/hbqt/qtgui/QPainter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPainter.cpp
@@ -136,7 +136,7 @@ void * hbqt_gcAllocate_QPainter( void * pObj, bool bNew )
    p->ph = ( QPainter * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPainter;
-   p->type = QT_TYPE_QPainter;
+   p->type = HBQT_TYPE_QPainter;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp b/harbour/contrib/hbqt/qtgui/QPainterPath.cpp
index dc386d14ec..774dd63d4b 100644
--- a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPainterPath.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QPainterPath( void * pObj, bool bNew )
    p->ph = ( QPainterPath * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPainterPath;
-   p->type = QT_TYPE_QPainterPath;
+   p->type = HBQT_TYPE_QPainterPath;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPalette.cpp b/harbour/contrib/hbqt/qtgui/QPalette.cpp
index 59045af2ab..f6596fed99 100644
--- a/harbour/contrib/hbqt/qtgui/QPalette.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPalette.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QPalette( void * pObj, bool bNew )
    p->ph = ( QPalette * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPalette;
-   p->type = QT_TYPE_QPalette;
+   p->type = HBQT_TYPE_QPalette;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPen.cpp b/harbour/contrib/hbqt/qtgui/QPen.cpp
index f243649007..b66cdc31b9 100644
--- a/harbour/contrib/hbqt/qtgui/QPen.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPen.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QPen( void * pObj, bool bNew )
    p->ph = ( QPen * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPen;
-   p->type = QT_TYPE_QPen;
+   p->type = HBQT_TYPE_QPen;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPicture.cpp b/harbour/contrib/hbqt/qtgui/QPicture.cpp
index 8398eb3bee..f43dd276ec 100644
--- a/harbour/contrib/hbqt/qtgui/QPicture.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPicture.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QPicture( void * pObj, bool bNew )
    p->ph = ( QPicture * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPicture;
-   p->type = QT_TYPE_QPicture;
+   p->type = HBQT_TYPE_QPicture;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPixmap.cpp b/harbour/contrib/hbqt/qtgui/QPixmap.cpp
index 39a2490225..63fa813ad6 100644
--- a/harbour/contrib/hbqt/qtgui/QPixmap.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPixmap.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QPixmap( void * pObj, bool bNew )
    p->ph = ( QPixmap * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPixmap;
-   p->type = QT_TYPE_QPixmap;
+   p->type = HBQT_TYPE_QPixmap;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPlainTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/QPlainTextDocumentLayout.cpp
index 760c23604d..cc0cdf717d 100644
--- a/harbour/contrib/hbqt/qtgui/QPlainTextDocumentLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPlainTextDocumentLayout.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QPlainTextDocumentLayout( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QPlainTextDocumentLayout >( ( QPlainTextDocumentLayout * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPlainTextDocumentLayout;
-   p->type = QT_TYPE_QPlainTextDocumentLayout;
+   p->type = HBQT_TYPE_QPlainTextDocumentLayout;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp
index 75711cb28a..8e1df707b6 100644
--- a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp
@@ -142,7 +142,7 @@ void * hbqt_gcAllocate_QPlainTextEdit( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QPlainTextEdit >( ( QPlainTextEdit * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPlainTextEdit;
-   p->type = QT_TYPE_QPlainTextEdit;
+   p->type = HBQT_TYPE_QPlainTextEdit;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPolygon.cpp b/harbour/contrib/hbqt/qtgui/QPolygon.cpp
index bf2a354a9c..04021afc05 100644
--- a/harbour/contrib/hbqt/qtgui/QPolygon.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPolygon.cpp
@@ -119,7 +119,7 @@ void * hbqt_gcAllocate_QPolygon( void * pObj, bool bNew )
    p->ph = ( QPolygon * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPolygon;
-   p->type = QT_TYPE_QPolygon;
+   p->type = HBQT_TYPE_QPolygon;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp b/harbour/contrib/hbqt/qtgui/QPolygonF.cpp
index 092719bb64..09f1269f82 100644
--- a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPolygonF.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QPolygonF( void * pObj, bool bNew )
    p->ph = ( QPolygonF * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPolygonF;
-   p->type = QT_TYPE_QPolygonF;
+   p->type = HBQT_TYPE_QPolygonF;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp
index 18c9b8538f..11f2fd0b35 100644
--- a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QPrintDialog( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QPrintDialog >( ( QPrintDialog * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPrintDialog;
-   p->type = QT_TYPE_QPrintDialog;
+   p->type = HBQT_TYPE_QPrintDialog;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp b/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp
index a1a8b60a58..7a9cc60556 100644
--- a/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp
@@ -104,7 +104,7 @@ void * hbqt_gcAllocate_QPrintEngine( void * pObj, bool bNew )
    p->ph = ( QPrintEngine * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPrintEngine;
-   p->type = QT_TYPE_QPrintEngine;
+   p->type = HBQT_TYPE_QPrintEngine;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp b/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp
index 6b70b119a5..0bcb83cf45 100644
--- a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QPrintPreviewDialog( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QPrintPreviewDialog >( ( QPrintPreviewDialog * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPrintPreviewDialog;
-   p->type = QT_TYPE_QPrintPreviewDialog;
+   p->type = HBQT_TYPE_QPrintPreviewDialog;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPrinter.cpp b/harbour/contrib/hbqt/qtgui/QPrinter.cpp
index 541747fac4..c42b01e46e 100644
--- a/harbour/contrib/hbqt/qtgui/QPrinter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPrinter.cpp
@@ -131,7 +131,7 @@ void * hbqt_gcAllocate_QPrinter( void * pObj, bool bNew )
    p->ph = ( QPrinter * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPrinter;
-   p->type = QT_TYPE_QPrinter;
+   p->type = HBQT_TYPE_QPrinter;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp b/harbour/contrib/hbqt/qtgui/QProgressBar.cpp
index 8c1ea31837..21dfa0a9a7 100644
--- a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QProgressBar.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QProgressBar( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QProgressBar >( ( QProgressBar * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QProgressBar;
-   p->type = QT_TYPE_QProgressBar;
+   p->type = HBQT_TYPE_QProgressBar;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp b/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp
index 935c19bbbf..4181c4d2d2 100644
--- a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QProgressDialog( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QProgressDialog >( ( QProgressDialog * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QProgressDialog;
-   p->type = QT_TYPE_QProgressDialog;
+   p->type = HBQT_TYPE_QProgressDialog;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QPushButton.cpp b/harbour/contrib/hbqt/qtgui/QPushButton.cpp
index 78b3fea479..3c5bbc7dc9 100644
--- a/harbour/contrib/hbqt/qtgui/QPushButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPushButton.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QPushButton( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QPushButton >( ( QPushButton * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QPushButton;
-   p->type = QT_TYPE_QPushButton;
+   p->type = HBQT_TYPE_QPushButton;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp b/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp
index a91aa0330f..09fe4ec80a 100644
--- a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp
@@ -125,7 +125,7 @@ void * hbqt_gcAllocate_QRadialGradient( void * pObj, bool bNew )
    p->ph = ( QRadialGradient * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QRadialGradient;
-   p->type = QT_TYPE_QRadialGradient;
+   p->type = HBQT_TYPE_QRadialGradient;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp b/harbour/contrib/hbqt/qtgui/QRadioButton.cpp
index 58647f5947..d63c29f76b 100644
--- a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QRadioButton.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QRadioButton( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QRadioButton >( ( QRadioButton * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QRadioButton;
-   p->type = QT_TYPE_QRadioButton;
+   p->type = HBQT_TYPE_QRadioButton;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QRegion.cpp b/harbour/contrib/hbqt/qtgui/QRegion.cpp
index 759cb59365..f930ebf85b 100644
--- a/harbour/contrib/hbqt/qtgui/QRegion.cpp
+++ b/harbour/contrib/hbqt/qtgui/QRegion.cpp
@@ -138,7 +138,7 @@ void * hbqt_gcAllocate_QRegion( void * pObj, bool bNew )
    p->ph = ( QRegion * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QRegion;
-   p->type = QT_TYPE_QRegion;
+   p->type = HBQT_TYPE_QRegion;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp
index 0bc87fed4b..1fc97a462d 100644
--- a/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QResizeEvent( void * pObj, bool bNew )
    p->ph = ( QResizeEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QResizeEvent;
-   p->type = QT_TYPE_QResizeEvent;
+   p->type = HBQT_TYPE_QResizeEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp b/harbour/contrib/hbqt/qtgui/QScrollArea.cpp
index f716b15a72..9511c70275 100644
--- a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/QScrollArea.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QScrollArea( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QScrollArea >( ( QScrollArea * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QScrollArea;
-   p->type = QT_TYPE_QScrollArea;
+   p->type = HBQT_TYPE_QScrollArea;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp b/harbour/contrib/hbqt/qtgui/QScrollBar.cpp
index 2631b464e4..dc808031c6 100644
--- a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QScrollBar.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QScrollBar( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QScrollBar >( ( QScrollBar * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QScrollBar;
-   p->type = QT_TYPE_QScrollBar;
+   p->type = HBQT_TYPE_QScrollBar;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp b/harbour/contrib/hbqt/qtgui/QSessionManager.cpp
index 56ca61ee89..92986d2e6d 100644
--- a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSessionManager.cpp
@@ -104,7 +104,7 @@ void * hbqt_gcAllocate_QSessionManager( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QSessionManager >( ( QSessionManager * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSessionManager;
-   p->type = QT_TYPE_QSessionManager;
+   p->type = HBQT_TYPE_QSessionManager;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QShowEvent.cpp b/harbour/contrib/hbqt/qtgui/QShowEvent.cpp
index a0019734e5..a9a0dc3778 100644
--- a/harbour/contrib/hbqt/qtgui/QShowEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QShowEvent.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QShowEvent( void * pObj, bool bNew )
    p->ph = ( QShowEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QShowEvent;
-   p->type = QT_TYPE_QShowEvent;
+   p->type = HBQT_TYPE_QShowEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp
index 3e6161a936..a1f74b97c1 100644
--- a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QSizeGrip( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QSizeGrip >( ( QSizeGrip * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSizeGrip;
-   p->type = QT_TYPE_QSizeGrip;
+   p->type = HBQT_TYPE_QSizeGrip;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp b/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp
index 5d303a9ba4..90384b4364 100644
--- a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp
@@ -124,7 +124,7 @@ void * hbqt_gcAllocate_QSizePolicy( void * pObj, bool bNew )
    p->ph = ( QSizePolicy * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSizePolicy;
-   p->type = QT_TYPE_QSizePolicy;
+   p->type = HBQT_TYPE_QSizePolicy;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QSlider.cpp b/harbour/contrib/hbqt/qtgui/QSlider.cpp
index 4f08951656..9b1380ac08 100644
--- a/harbour/contrib/hbqt/qtgui/QSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSlider.cpp
@@ -132,7 +132,7 @@ void * hbqt_gcAllocate_QSlider( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QSlider >( ( QSlider * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSlider;
-   p->type = QT_TYPE_QSlider;
+   p->type = HBQT_TYPE_QSlider;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QSound.cpp b/harbour/contrib/hbqt/qtgui/QSound.cpp
index 672587e2da..c8984c8e6b 100644
--- a/harbour/contrib/hbqt/qtgui/QSound.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSound.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QSound( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QSound >( ( QSound * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSound;
-   p->type = QT_TYPE_QSound;
+   p->type = HBQT_TYPE_QSound;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp b/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp
index feee1716db..6da09fe360 100644
--- a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QSpacerItem( void * pObj, bool bNew )
    p->ph = ( QSpacerItem * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSpacerItem;
-   p->type = QT_TYPE_QSpacerItem;
+   p->type = HBQT_TYPE_QSpacerItem;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QSpinBox.cpp
index 356ebe0ba9..035e181097 100644
--- a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSpinBox.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QSpinBox( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QSpinBox >( ( QSpinBox * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSpinBox;
-   p->type = QT_TYPE_QSpinBox;
+   p->type = HBQT_TYPE_QSpinBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp b/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp
index 8a63dba29c..66736a18f8 100644
--- a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QSplashScreen( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QSplashScreen >( ( QSplashScreen * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSplashScreen;
-   p->type = QT_TYPE_QSplashScreen;
+   p->type = HBQT_TYPE_QSplashScreen;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QSplitter.cpp b/harbour/contrib/hbqt/qtgui/QSplitter.cpp
index aec5c10f13..c2babf4399 100644
--- a/harbour/contrib/hbqt/qtgui/QSplitter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSplitter.cpp
@@ -141,7 +141,7 @@ void * hbqt_gcAllocate_QSplitter( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QSplitter >( ( QSplitter * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSplitter;
-   p->type = QT_TYPE_QSplitter;
+   p->type = HBQT_TYPE_QSplitter;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStackedWidget.cpp b/harbour/contrib/hbqt/qtgui/QStackedWidget.cpp
index b2d96743a0..b66fc0ea54 100644
--- a/harbour/contrib/hbqt/qtgui/QStackedWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStackedWidget.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QStackedWidget( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QStackedWidget >( ( QStackedWidget * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStackedWidget;
-   p->type = QT_TYPE_QStackedWidget;
+   p->type = HBQT_TYPE_QStackedWidget;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp b/harbour/contrib/hbqt/qtgui/QStandardItem.cpp
index c9de05925c..41b5180087 100644
--- a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStandardItem.cpp
@@ -137,7 +137,7 @@ void * hbqt_gcAllocate_QStandardItem( void * pObj, bool bNew )
    p->ph = ( QStandardItem * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStandardItem;
-   p->type = QT_TYPE_QStandardItem;
+   p->type = HBQT_TYPE_QStandardItem;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp b/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp
index 476c117082..a2aeff9878 100644
--- a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp
@@ -144,7 +144,7 @@ void * hbqt_gcAllocate_QStandardItemModel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QStandardItemModel >( ( QStandardItemModel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStandardItemModel;
-   p->type = QT_TYPE_QStandardItemModel;
+   p->type = HBQT_TYPE_QStandardItemModel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp b/harbour/contrib/hbqt/qtgui/QStatusBar.cpp
index 2392d6299e..7891acd8b1 100644
--- a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStatusBar.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QStatusBar( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QStatusBar >( ( QStatusBar * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStatusBar;
-   p->type = QT_TYPE_QStatusBar;
+   p->type = HBQT_TYPE_QStatusBar;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp b/harbour/contrib/hbqt/qtgui/QStringListModel.cpp
index d191980c1f..9df10a360b 100644
--- a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStringListModel.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QStringListModel( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QStringListModel >( ( QStringListModel * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStringListModel;
-   p->type = QT_TYPE_QStringListModel;
+   p->type = HBQT_TYPE_QStringListModel;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyle.cpp b/harbour/contrib/hbqt/qtgui/QStyle.cpp
index ae458b54d3..9142ce1949 100644
--- a/harbour/contrib/hbqt/qtgui/QStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyle.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QStyle( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QStyle >( ( QStyle * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyle;
-   p->type = QT_TYPE_QStyle;
+   p->type = HBQT_TYPE_QStyle;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp b/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp
index ff4010fb83..4978ffddb6 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QStyleFactory( void * pObj, bool bNew )
    p->ph = ( QStyleFactory * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleFactory;
-   p->type = QT_TYPE_QStyleFactory;
+   p->type = HBQT_TYPE_QStyleFactory;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp b/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp
index 12a6d2bb33..a1b629f4f1 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QStyleHintReturn( void * pObj, bool bNew )
    p->ph = ( QStyleHintReturn * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleHintReturn;
-   p->type = QT_TYPE_QStyleHintReturn;
+   p->type = HBQT_TYPE_QStyleHintReturn;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp b/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp
index c4bfdd883c..b35c502ffa 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp
@@ -114,7 +114,7 @@ void * hbqt_gcAllocate_QStyleHintReturnMask( void * pObj, bool bNew )
    p->ph = ( QStyleHintReturnMask * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleHintReturnMask;
-   p->type = QT_TYPE_QStyleHintReturnMask;
+   p->type = HBQT_TYPE_QStyleHintReturnMask;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp b/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp
index a17348781f..d21c33e354 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QStyleHintReturnVariant( void * pObj, bool bNew )
    p->ph = ( QStyleHintReturnVariant * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleHintReturnVariant;
-   p->type = QT_TYPE_QStyleHintReturnVariant;
+   p->type = HBQT_TYPE_QStyleHintReturnVariant;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp b/harbour/contrib/hbqt/qtgui/QStyleOption.cpp
index d6812d0504..050534d515 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOption.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QStyleOption( void * pObj, bool bNew )
    p->ph = ( QStyleOption * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOption;
-   p->type = QT_TYPE_QStyleOption;
+   p->type = HBQT_TYPE_QStyleOption;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp
index b586eec9fe..88dada39a7 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QStyleOptionButton( void * pObj, bool bNew )
    p->ph = ( QStyleOptionButton * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionButton;
-   p->type = QT_TYPE_QStyleOptionButton;
+   p->type = HBQT_TYPE_QStyleOptionButton;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp
index 93ccd3c3f6..3bfbc7d370 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionComboBox( void * pObj, bool bNew )
    p->ph = ( QStyleOptionComboBox * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionComboBox;
-   p->type = QT_TYPE_QStyleOptionComboBox;
+   p->type = HBQT_TYPE_QStyleOptionComboBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp
index b70dd025f4..60010ce117 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionComplex( void * pObj, bool bNew )
    p->ph = ( QStyleOptionComplex * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionComplex;
-   p->type = QT_TYPE_QStyleOptionComplex;
+   p->type = HBQT_TYPE_QStyleOptionComplex;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp
index 8c6b7a1ad7..ee22fc35bf 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionDockWidget( void * pObj, bool bNew )
    p->ph = ( QStyleOptionDockWidget * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionDockWidget;
-   p->type = QT_TYPE_QStyleOptionDockWidget;
+   p->type = HBQT_TYPE_QStyleOptionDockWidget;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp
index 5844300c6d..53ab506387 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionFocusRect( void * pObj, bool bNew )
    p->ph = ( QStyleOptionFocusRect * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionFocusRect;
-   p->type = QT_TYPE_QStyleOptionFocusRect;
+   p->type = HBQT_TYPE_QStyleOptionFocusRect;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp
index e9ccb1f8b8..ccde979804 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionFrame( void * pObj, bool bNew )
    p->ph = ( QStyleOptionFrame * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionFrame;
-   p->type = QT_TYPE_QStyleOptionFrame;
+   p->type = HBQT_TYPE_QStyleOptionFrame;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp
index d6e4af8370..cba0016a88 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionGroupBox( void * pObj, bool bNew )
    p->ph = ( QStyleOptionGroupBox * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionGroupBox;
-   p->type = QT_TYPE_QStyleOptionGroupBox;
+   p->type = HBQT_TYPE_QStyleOptionGroupBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp
index aebe1c4ce2..dd0fd05a07 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp
@@ -124,7 +124,7 @@ void * hbqt_gcAllocate_QStyleOptionHeader( void * pObj, bool bNew )
    p->ph = ( QStyleOptionHeader * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionHeader;
-   p->type = QT_TYPE_QStyleOptionHeader;
+   p->type = HBQT_TYPE_QStyleOptionHeader;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp
index 7b4b8a586c..550d280793 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QStyleOptionMenuItem( void * pObj, bool bNew )
    p->ph = ( QStyleOptionMenuItem * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionMenuItem;
-   p->type = QT_TYPE_QStyleOptionMenuItem;
+   p->type = HBQT_TYPE_QStyleOptionMenuItem;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp
index da29f444de..afab0f02d7 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp
@@ -122,7 +122,7 @@ void * hbqt_gcAllocate_QStyleOptionProgressBar( void * pObj, bool bNew )
    p->ph = ( QStyleOptionProgressBar * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionProgressBar;
-   p->type = QT_TYPE_QStyleOptionProgressBar;
+   p->type = HBQT_TYPE_QStyleOptionProgressBar;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp
index e79ab49cf3..b6d783f966 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionSizeGrip( void * pObj, bool bNew )
    p->ph = ( QStyleOptionSizeGrip * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionSizeGrip;
-   p->type = QT_TYPE_QStyleOptionSizeGrip;
+   p->type = HBQT_TYPE_QStyleOptionSizeGrip;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp
index a5461e5b33..2afd2dbdf6 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionSlider( void * pObj, bool bNew )
    p->ph = ( QStyleOptionSlider * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionSlider;
-   p->type = QT_TYPE_QStyleOptionSlider;
+   p->type = HBQT_TYPE_QStyleOptionSlider;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp
index 1c99f3fca7..72287a62f5 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionSpinBox( void * pObj, bool bNew )
    p->ph = ( QStyleOptionSpinBox * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionSpinBox;
-   p->type = QT_TYPE_QStyleOptionSpinBox;
+   p->type = HBQT_TYPE_QStyleOptionSpinBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp
index 54465b0a3f..a8eee528fe 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp
@@ -125,7 +125,7 @@ void * hbqt_gcAllocate_QStyleOptionTab( void * pObj, bool bNew )
    p->ph = ( QStyleOptionTab * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionTab;
-   p->type = QT_TYPE_QStyleOptionTab;
+   p->type = HBQT_TYPE_QStyleOptionTab;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp
index 005fa0bd1c..595221b59f 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionTabBarBase( void * pObj, bool bNew )
    p->ph = ( QStyleOptionTabBarBase * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionTabBarBase;
-   p->type = QT_TYPE_QStyleOptionTabBarBase;
+   p->type = HBQT_TYPE_QStyleOptionTabBarBase;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp
index db5006e428..e9a5c18f8e 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionTabWidgetFrame( void * pObj, bool bNew )
    p->ph = ( QStyleOptionTabWidgetFrame * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionTabWidgetFrame;
-   p->type = QT_TYPE_QStyleOptionTabWidgetFrame;
+   p->type = HBQT_TYPE_QStyleOptionTabWidgetFrame;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp
index 8a54b6ed71..933ba93668 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionTitleBar( void * pObj, bool bNew )
    p->ph = ( QStyleOptionTitleBar * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionTitleBar;
-   p->type = QT_TYPE_QStyleOptionTitleBar;
+   p->type = HBQT_TYPE_QStyleOptionTitleBar;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp
index 0eb16a6c9a..2871e13c03 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp
@@ -124,7 +124,7 @@ void * hbqt_gcAllocate_QStyleOptionToolBar( void * pObj, bool bNew )
    p->ph = ( QStyleOptionToolBar * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionToolBar;
-   p->type = QT_TYPE_QStyleOptionToolBar;
+   p->type = HBQT_TYPE_QStyleOptionToolBar;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp
index 1eeca20161..70311a5cc7 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionToolBox( void * pObj, bool bNew )
    p->ph = ( QStyleOptionToolBox * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionToolBox;
-   p->type = QT_TYPE_QStyleOptionToolBox;
+   p->type = HBQT_TYPE_QStyleOptionToolBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp
index c9e4cf110e..3816750880 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QStyleOptionToolButton( void * pObj, bool bNew )
    p->ph = ( QStyleOptionToolButton * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionToolButton;
-   p->type = QT_TYPE_QStyleOptionToolButton;
+   p->type = HBQT_TYPE_QStyleOptionToolButton;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp
index 63ee1c0af2..1f907691f0 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp
@@ -122,7 +122,7 @@ void * hbqt_gcAllocate_QStyleOptionViewItem( void * pObj, bool bNew )
    p->ph = ( QStyleOptionViewItem * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyleOptionViewItem;
-   p->type = QT_TYPE_QStyleOptionViewItem;
+   p->type = HBQT_TYPE_QStyleOptionViewItem;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp b/harbour/contrib/hbqt/qtgui/QStylePainter.cpp
index 4fc39eb4e9..537cf7d134 100644
--- a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStylePainter.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QStylePainter( void * pObj, bool bNew )
    p->ph = ( QStylePainter * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStylePainter;
-   p->type = QT_TYPE_QStylePainter;
+   p->type = HBQT_TYPE_QStylePainter;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp
index 017f05010e..d9c8025047 100644
--- a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QStyledItemDelegate( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QStyledItemDelegate >( ( QStyledItemDelegate * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QStyledItemDelegate;
-   p->type = QT_TYPE_QStyledItemDelegate;
+   p->type = HBQT_TYPE_QStyledItemDelegate;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp
index 1ac9c1fa4e..1cb029cfe9 100644
--- a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QSyntaxHighlighter( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QSyntaxHighlighter >( ( QSyntaxHighlighter * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSyntaxHighlighter;
-   p->type = QT_TYPE_QSyntaxHighlighter;
+   p->type = HBQT_TYPE_QSyntaxHighlighter;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp
index 142a1f5177..404cbbb84b 100644
--- a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QSystemTrayIcon( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QSystemTrayIcon >( ( QSystemTrayIcon * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QSystemTrayIcon;
-   p->type = QT_TYPE_QSystemTrayIcon;
+   p->type = HBQT_TYPE_QSystemTrayIcon;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTabBar.cpp b/harbour/contrib/hbqt/qtgui/QTabBar.cpp
index 5161825f0c..3eb38c53df 100644
--- a/harbour/contrib/hbqt/qtgui/QTabBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTabBar.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QTabBar( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTabBar >( ( QTabBar * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTabBar;
-   p->type = QT_TYPE_QTabBar;
+   p->type = HBQT_TYPE_QTabBar;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp
index f6a11917e5..777c6859e8 100644
--- a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp
@@ -141,7 +141,7 @@ void * hbqt_gcAllocate_QTabWidget( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTabWidget >( ( QTabWidget * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTabWidget;
-   p->type = QT_TYPE_QTabWidget;
+   p->type = HBQT_TYPE_QTabWidget;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTableView.cpp b/harbour/contrib/hbqt/qtgui/QTableView.cpp
index d1ca88ffc6..7d158c6b04 100644
--- a/harbour/contrib/hbqt/qtgui/QTableView.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTableView.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QTableView( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTableView >( ( QTableView * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTableView;
-   p->type = QT_TYPE_QTableView;
+   p->type = HBQT_TYPE_QTableView;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp b/harbour/contrib/hbqt/qtgui/QTableWidget.cpp
index b7a30aab4d..fb858b9217 100644
--- a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTableWidget.cpp
@@ -141,7 +141,7 @@ void * hbqt_gcAllocate_QTableWidget( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTableWidget >( ( QTableWidget * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTableWidget;
-   p->type = QT_TYPE_QTableWidget;
+   p->type = HBQT_TYPE_QTableWidget;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp
index bfe0d08bce..4a01848b73 100644
--- a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QTableWidgetItem( void * pObj, bool bNew )
    p->ph = ( QTableWidgetItem * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTableWidgetItem;
-   p->type = QT_TYPE_QTableWidgetItem;
+   p->type = HBQT_TYPE_QTableWidgetItem;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp b/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp
index 554d1b974e..6b729b4a5e 100644
--- a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QTableWidgetSelectionRange( void * pObj, bool bNew )
    p->ph = ( QTableWidgetSelectionRange * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTableWidgetSelectionRange;
-   p->type = QT_TYPE_QTableWidgetSelectionRange;
+   p->type = HBQT_TYPE_QTableWidgetSelectionRange;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp b/harbour/contrib/hbqt/qtgui/QTextBlock.cpp
index d10b3acf9d..c54daf58f0 100644
--- a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextBlock.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QTextBlock( void * pObj, bool bNew )
    p->ph = ( QTextBlock * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextBlock;
-   p->type = QT_TYPE_QTextBlock;
+   p->type = HBQT_TYPE_QTextBlock;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp
index cc3097db84..e9db980eaf 100644
--- a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QTextBlockFormat( void * pObj, bool bNew )
    p->ph = ( QTextBlockFormat * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextBlockFormat;
-   p->type = QT_TYPE_QTextBlockFormat;
+   p->type = HBQT_TYPE_QTextBlockFormat;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp b/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp
index e0cf8ba83e..1de1ace59f 100644
--- a/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QTextBlockGroup( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTextBlockGroup >( ( QTextBlockGroup * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextBlockGroup;
-   p->type = QT_TYPE_QTextBlockGroup;
+   p->type = HBQT_TYPE_QTextBlockGroup;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp b/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp
index 6beb4a33ac..d49cd15480 100644
--- a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QTextBrowser( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTextBrowser >( ( QTextBrowser * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextBrowser;
-   p->type = QT_TYPE_QTextBrowser;
+   p->type = HBQT_TYPE_QTextBrowser;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp
index 1c06aa4979..af1c572604 100644
--- a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QTextCharFormat( void * pObj, bool bNew )
    p->ph = ( QTextCharFormat * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextCharFormat;
-   p->type = QT_TYPE_QTextCharFormat;
+   p->type = HBQT_TYPE_QTextCharFormat;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp b/harbour/contrib/hbqt/qtgui/QTextCursor.cpp
index a44b58709d..f819d1efb0 100644
--- a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextCursor.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QTextCursor( void * pObj, bool bNew )
    p->ph = ( QTextCursor * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextCursor;
-   p->type = QT_TYPE_QTextCursor;
+   p->type = HBQT_TYPE_QTextCursor;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp b/harbour/contrib/hbqt/qtgui/QTextDocument.cpp
index 82ca68741f..53f109ce99 100644
--- a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextDocument.cpp
@@ -146,7 +146,7 @@ void * hbqt_gcAllocate_QTextDocument( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTextDocument >( ( QTextDocument * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextDocument;
-   p->type = QT_TYPE_QTextDocument;
+   p->type = HBQT_TYPE_QTextDocument;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp b/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp
index 6ac132afa3..3b7242efbd 100644
--- a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp
@@ -119,7 +119,7 @@ void * hbqt_gcAllocate_QTextDocumentFragment( void * pObj, bool bNew )
    p->ph = ( QTextDocumentFragment * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextDocumentFragment;
-   p->type = QT_TYPE_QTextDocumentFragment;
+   p->type = HBQT_TYPE_QTextDocumentFragment;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp b/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp
index aa1187c1b9..b470738f02 100644
--- a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp
@@ -118,7 +118,7 @@ void * hbqt_gcAllocate_QTextDocumentWriter( void * pObj, bool bNew )
    p->ph = ( QTextDocumentWriter * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextDocumentWriter;
-   p->type = QT_TYPE_QTextDocumentWriter;
+   p->type = HBQT_TYPE_QTextDocumentWriter;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp b/harbour/contrib/hbqt/qtgui/QTextEdit.cpp
index d396a07056..ea4ed3e96a 100644
--- a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextEdit.cpp
@@ -146,7 +146,7 @@ void * hbqt_gcAllocate_QTextEdit( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTextEdit >( ( QTextEdit * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextEdit;
-   p->type = QT_TYPE_QTextEdit;
+   p->type = HBQT_TYPE_QTextEdit;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextFormat.cpp
index 7528252e31..f478b2c14f 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextFormat.cpp
@@ -141,7 +141,7 @@ void * hbqt_gcAllocate_QTextFormat( void * pObj, bool bNew )
    p->ph = ( QTextFormat * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextFormat;
-   p->type = QT_TYPE_QTextFormat;
+   p->type = HBQT_TYPE_QTextFormat;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp b/harbour/contrib/hbqt/qtgui/QTextFragment.cpp
index b199bacffb..2f29618f78 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextFragment.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QTextFragment( void * pObj, bool bNew )
    p->ph = ( QTextFragment * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextFragment;
-   p->type = QT_TYPE_QTextFragment;
+   p->type = HBQT_TYPE_QTextFragment;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp b/harbour/contrib/hbqt/qtgui/QTextFrame.cpp
index 6b8de0b357..d585402a8f 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextFrame.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QTextFrame( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTextFrame >( ( QTextFrame * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextFrame;
-   p->type = QT_TYPE_QTextFrame;
+   p->type = HBQT_TYPE_QTextFrame;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp
index d45ce1d5cd..5af05367d3 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp
@@ -125,7 +125,7 @@ void * hbqt_gcAllocate_QTextFrameFormat( void * pObj, bool bNew )
    p->ph = ( QTextFrameFormat * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextFrameFormat;
-   p->type = QT_TYPE_QTextFrameFormat;
+   p->type = HBQT_TYPE_QTextFrameFormat;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp
index b3a5101f27..e8199a4a71 100644
--- a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QTextImageFormat( void * pObj, bool bNew )
    p->ph = ( QTextImageFormat * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextImageFormat;
-   p->type = QT_TYPE_QTextImageFormat;
+   p->type = HBQT_TYPE_QTextImageFormat;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp b/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp
index 3f137f7046..cad7507d56 100644
--- a/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QTextInlineObject( void * pObj, bool bNew )
    p->ph = ( QTextInlineObject * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextInlineObject;
-   p->type = QT_TYPE_QTextInlineObject;
+   p->type = HBQT_TYPE_QTextInlineObject;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextItem.cpp b/harbour/contrib/hbqt/qtgui/QTextItem.cpp
index 355c4bdf82..b2190b292c 100644
--- a/harbour/contrib/hbqt/qtgui/QTextItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextItem.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QTextItem( void * pObj, bool bNew )
    p->ph = ( QTextItem * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextItem;
-   p->type = QT_TYPE_QTextItem;
+   p->type = HBQT_TYPE_QTextItem;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp b/harbour/contrib/hbqt/qtgui/QTextLayout.cpp
index 52163f9918..560f47071a 100644
--- a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextLayout.cpp
@@ -136,7 +136,7 @@ void * hbqt_gcAllocate_QTextLayout( void * pObj, bool bNew )
    p->ph = ( QTextLayout * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextLayout;
-   p->type = QT_TYPE_QTextLayout;
+   p->type = HBQT_TYPE_QTextLayout;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextLength.cpp b/harbour/contrib/hbqt/qtgui/QTextLength.cpp
index 3e19c7bc7a..fe86900938 100644
--- a/harbour/contrib/hbqt/qtgui/QTextLength.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextLength.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QTextLength( void * pObj, bool bNew )
    p->ph = ( QTextLength * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextLength;
-   p->type = QT_TYPE_QTextLength;
+   p->type = HBQT_TYPE_QTextLength;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextLine.cpp b/harbour/contrib/hbqt/qtgui/QTextLine.cpp
index eb6478b651..e6e7fae082 100644
--- a/harbour/contrib/hbqt/qtgui/QTextLine.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextLine.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QTextLine( void * pObj, bool bNew )
    p->ph = ( QTextLine * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextLine;
-   p->type = QT_TYPE_QTextLine;
+   p->type = HBQT_TYPE_QTextLine;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextList.cpp b/harbour/contrib/hbqt/qtgui/QTextList.cpp
index 6baeecb122..9abbb5a97d 100644
--- a/harbour/contrib/hbqt/qtgui/QTextList.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextList.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QTextList( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTextList >( ( QTextList * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextList;
-   p->type = QT_TYPE_QTextList;
+   p->type = HBQT_TYPE_QTextList;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp
index ad6b8c0bd8..16328f4b9b 100644
--- a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp
@@ -119,7 +119,7 @@ void * hbqt_gcAllocate_QTextListFormat( void * pObj, bool bNew )
    p->ph = ( QTextListFormat * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextListFormat;
-   p->type = QT_TYPE_QTextListFormat;
+   p->type = HBQT_TYPE_QTextListFormat;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextObject.cpp b/harbour/contrib/hbqt/qtgui/QTextObject.cpp
index e5e95d0a9f..0f2df53190 100644
--- a/harbour/contrib/hbqt/qtgui/QTextObject.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextObject.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QTextObject( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTextObject >( ( QTextObject * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextObject;
-   p->type = QT_TYPE_QTextObject;
+   p->type = HBQT_TYPE_QTextObject;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextOption.cpp b/harbour/contrib/hbqt/qtgui/QTextOption.cpp
index e5f4f40385..eff42fe383 100644
--- a/harbour/contrib/hbqt/qtgui/QTextOption.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextOption.cpp
@@ -139,7 +139,7 @@ void * hbqt_gcAllocate_QTextOption( void * pObj, bool bNew )
    p->ph = ( QTextOption * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextOption;
-   p->type = QT_TYPE_QTextOption;
+   p->type = HBQT_TYPE_QTextOption;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp
index 5b336eb7cb..5c05ef8131 100644
--- a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp
@@ -124,7 +124,7 @@ void * hbqt_gcAllocate_QTextTableFormat( void * pObj, bool bNew )
    p->ph = ( QTextTableFormat * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTextTableFormat;
-   p->type = QT_TYPE_QTextTableFormat;
+   p->type = HBQT_TYPE_QTextTableFormat;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp
index eac17ec939..4ad224289e 100644
--- a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QTimeEdit( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTimeEdit >( ( QTimeEdit * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTimeEdit;
-   p->type = QT_TYPE_QTimeEdit;
+   p->type = HBQT_TYPE_QTimeEdit;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QToolBar.cpp b/harbour/contrib/hbqt/qtgui/QToolBar.cpp
index 86cbbdcff2..684c1f44c8 100644
--- a/harbour/contrib/hbqt/qtgui/QToolBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QToolBar.cpp
@@ -138,7 +138,7 @@ void * hbqt_gcAllocate_QToolBar( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QToolBar >( ( QToolBar * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QToolBar;
-   p->type = QT_TYPE_QToolBar;
+   p->type = HBQT_TYPE_QToolBar;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QToolBox.cpp b/harbour/contrib/hbqt/qtgui/QToolBox.cpp
index 54616b2700..abd4f398b5 100644
--- a/harbour/contrib/hbqt/qtgui/QToolBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QToolBox.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QToolBox( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QToolBox >( ( QToolBox * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QToolBox;
-   p->type = QT_TYPE_QToolBox;
+   p->type = HBQT_TYPE_QToolBox;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QToolButton.cpp b/harbour/contrib/hbqt/qtgui/QToolButton.cpp
index f51630af43..a2e8df659a 100644
--- a/harbour/contrib/hbqt/qtgui/QToolButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QToolButton.cpp
@@ -131,7 +131,7 @@ void * hbqt_gcAllocate_QToolButton( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QToolButton >( ( QToolButton * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QToolButton;
-   p->type = QT_TYPE_QToolButton;
+   p->type = HBQT_TYPE_QToolButton;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTransform.cpp b/harbour/contrib/hbqt/qtgui/QTransform.cpp
index e7d6dfcc40..aa240151c9 100644
--- a/harbour/contrib/hbqt/qtgui/QTransform.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTransform.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QTransform( void * pObj, bool bNew )
    p->ph = ( QTransform * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTransform;
-   p->type = QT_TYPE_QTransform;
+   p->type = HBQT_TYPE_QTransform;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTreeView.cpp b/harbour/contrib/hbqt/qtgui/QTreeView.cpp
index 6a6bbea9f2..e438dfecd3 100644
--- a/harbour/contrib/hbqt/qtgui/QTreeView.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTreeView.cpp
@@ -139,7 +139,7 @@ void * hbqt_gcAllocate_QTreeView( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTreeView >( ( QTreeView * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTreeView;
-   p->type = QT_TYPE_QTreeView;
+   p->type = HBQT_TYPE_QTreeView;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp b/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp
index c99cb3b6a8..18057907ea 100644
--- a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp
@@ -141,7 +141,7 @@ void * hbqt_gcAllocate_QTreeWidget( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QTreeWidget >( ( QTreeWidget * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTreeWidget;
-   p->type = QT_TYPE_QTreeWidget;
+   p->type = HBQT_TYPE_QTreeWidget;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp
index 4b0d69d827..2da05fa3a6 100644
--- a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp
@@ -140,7 +140,7 @@ void * hbqt_gcAllocate_QTreeWidgetItem( void * pObj, bool bNew )
    p->ph = ( QTreeWidgetItem * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QTreeWidgetItem;
-   p->type = QT_TYPE_QTreeWidgetItem;
+   p->type = HBQT_TYPE_QTreeWidgetItem;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp
index 31025d7bf6..6b76d6048a 100644
--- a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QVBoxLayout( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QVBoxLayout >( ( QVBoxLayout * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QVBoxLayout;
-   p->type = QT_TYPE_QVBoxLayout;
+   p->type = HBQT_TYPE_QVBoxLayout;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QValidator.cpp b/harbour/contrib/hbqt/qtgui/QValidator.cpp
index 67dfb8a592..f07daafe57 100644
--- a/harbour/contrib/hbqt/qtgui/QValidator.cpp
+++ b/harbour/contrib/hbqt/qtgui/QValidator.cpp
@@ -104,7 +104,7 @@ void * hbqt_gcAllocate_QValidator( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QValidator >( ( QValidator * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QValidator;
-   p->type = QT_TYPE_QValidator;
+   p->type = HBQT_TYPE_QValidator;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp
index 10f2c9368a..c4e4586ff3 100644
--- a/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QWheelEvent( void * pObj, bool bNew )
    p->ph = ( QWheelEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QWheelEvent;
-   p->type = QT_TYPE_QWheelEvent;
+   p->type = HBQT_TYPE_QWheelEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QWidget.cpp b/harbour/contrib/hbqt/qtgui/QWidget.cpp
index a91d6cb610..4c2ad78b99 100644
--- a/harbour/contrib/hbqt/qtgui/QWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWidget.cpp
@@ -171,7 +171,7 @@ void * hbqt_gcAllocate_QWidget( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QWidget >( ( QWidget * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QWidget;
-   p->type = QT_TYPE_QWidget;
+   p->type = HBQT_TYPE_QWidget;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp b/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp
index 7eeb9a65f8..5104a72dfb 100644
--- a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QWidgetAction( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QWidgetAction >( ( QWidgetAction * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QWidgetAction;
-   p->type = QT_TYPE_QWidgetAction;
+   p->type = HBQT_TYPE_QWidgetAction;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp
index d6e49bc786..4a67731ff5 100644
--- a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QWidgetItem( void * pObj, bool bNew )
    p->ph = ( QWidgetItem * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QWidgetItem;
-   p->type = QT_TYPE_QWidgetItem;
+   p->type = HBQT_TYPE_QWidgetItem;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QWindowStateChangeEvent.cpp b/harbour/contrib/hbqt/qtgui/QWindowStateChangeEvent.cpp
index 12a1fa7b1b..2507a7ab79 100644
--- a/harbour/contrib/hbqt/qtgui/QWindowStateChangeEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWindowStateChangeEvent.cpp
@@ -100,7 +100,7 @@ void * hbqt_gcAllocate_QWindowStateChangeEvent( void * pObj, bool bNew )
    p->ph = ( QWindowStateChangeEvent * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QWindowStateChangeEvent;
-   p->type = QT_TYPE_QWindowStateChangeEvent;
+   p->type = HBQT_TYPE_QWindowStateChangeEvent;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp b/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp
index b6359c35be..dab84b604c 100644
--- a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QWindowsStyle( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QWindowsStyle >( ( QWindowsStyle * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QWindowsStyle;
-   p->type = QT_TYPE_QWindowsStyle;
+   p->type = HBQT_TYPE_QWindowsStyle;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QWizard.cpp b/harbour/contrib/hbqt/qtgui/QWizard.cpp
index db6dc7d42c..81f89e8628 100644
--- a/harbour/contrib/hbqt/qtgui/QWizard.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWizard.cpp
@@ -145,7 +145,7 @@ void * hbqt_gcAllocate_QWizard( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QWizard >( ( QWizard * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QWizard;
-   p->type = QT_TYPE_QWizard;
+   p->type = HBQT_TYPE_QWizard;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp b/harbour/contrib/hbqt/qtgui/QWizardPage.cpp
index 5b585983f9..f5d4481a19 100644
--- a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWizardPage.cpp
@@ -125,7 +125,7 @@ void * hbqt_gcAllocate_QWizardPage( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QWizardPage >( ( QWizardPage * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QWizardPage;
-   p->type = QT_TYPE_QWizardPage;
+   p->type = HBQT_TYPE_QWizardPage;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp b/harbour/contrib/hbqt/qtnetwork/QFtp.cpp
index 065a7e5985..7be5803d99 100644
--- a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/QFtp.cpp
@@ -150,7 +150,7 @@ void * hbqt_gcAllocate_QFtp( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QFtp >( ( QFtp * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QFtp;
-   p->type = QT_TYPE_QFtp;
+   p->type = HBQT_TYPE_QFtp;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp b/harbour/contrib/hbqt/qtnetwork/QHttp.cpp
index 496c905f46..f8e136aada 100644
--- a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/QHttp.cpp
@@ -150,7 +150,7 @@ void * hbqt_gcAllocate_QHttp( void * pObj, bool bNew )
    new( & p->ph ) QPointer< QHttp >( ( QHttp * ) pObj );
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QHttp;
-   p->type = QT_TYPE_QHttp;
+   p->type = HBQT_TYPE_QHttp;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp
index 9c7a653ac8..5ae54e65ee 100644
--- a/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp
@@ -112,7 +112,7 @@ void * hbqt_gcAllocate_QHttpHeader( void * pObj, bool bNew )
    p->ph = ( QHttpHeader * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QHttpHeader;
-   p->type = QT_TYPE_QHttpHeader;
+   p->type = HBQT_TYPE_QHttpHeader;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp
index 255fc8e728..cd74844a1c 100644
--- a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QHttpRequestHeader( void * pObj, bool bNew )
    p->ph = ( QHttpRequestHeader * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QHttpRequestHeader;
-   p->type = QT_TYPE_QHttpRequestHeader;
+   p->type = HBQT_TYPE_QHttpRequestHeader;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp
index 7ff0ccd6d0..e548e1b3ca 100644
--- a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QHttpResponseHeader( void * pObj, bool bNew )
    p->ph = ( QHttpResponseHeader * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QHttpResponseHeader;
-   p->type = QT_TYPE_QHttpResponseHeader;
+   p->type = HBQT_TYPE_QHttpResponseHeader;
 
    if( bNew )
    {
diff --git a/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp b/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp
index 5504ed66b0..30ef56aef7 100644
--- a/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp
@@ -122,7 +122,7 @@ void * hbqt_gcAllocate_QNetworkRequest( void * pObj, bool bNew )
    p->ph = ( QNetworkRequest * ) pObj;
    p->bNew = bNew;
    p->func = hbqt_gcRelease_QNetworkRequest;
-   p->type = QT_TYPE_QNetworkRequest;
+   p->type = HBQT_TYPE_QNetworkRequest;
 
    if( bNew )
    {