diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 64d2ea2ec2..8f35f927ae 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-11 18:12 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * contrib/hbqt/generator/hbqtgen.prg
+  * contrib/hbqt/qth/QTextCodec.qth
+  * contrib/hbqt/qtcore/*
+  * contrib/hbqt/qtgui/*
+  * contrib/hbqt/qtnetwork/*
+    + Implemented Linguistic Translation Mechanism base call.
+      The next step is to feed translations into Qt's engine.
+      This means any string sent to QWidgets will be translated 
+      through the language set with hbqt_SetCodecForTr( cCodec ).
+      The translated string is in the context of the widget it 
+      is being applied to.
+
+      TODO: Feed the translations from outer source.
+
 2010-01-12 01:53 UTC+0500 April White (april users.sourceforge.net)
   * contrib/hbbtree/hb_btree.c
     * read-only flag is not hidden when a file is opened
diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg
index 2bc4f870bd..cae6b996aa 100644
--- a/harbour/contrib/hbqt/generator/hbqtgen.prg
+++ b/harbour/contrib/hbqt/generator/hbqtgen.prg
@@ -69,6 +69,7 @@ STATIC aWebkit  := {}
  * Force new GC and Qt interface
  */
 STATIC lNewGCtoQT := .T.
+STATIC s_isObject := .F.
 
 /*----------------------------------------------------------------------*/
 
@@ -397,6 +398,8 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
    nFuncs  := 0
    nCnvrtd := 0
 
+   s_isObject := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "qobject" .and. lower( e_[ 2 ] ) == "no"} ) == 0
+
    /* Body */
    FOR EACH s IN protos_
       cOrg := s
@@ -1039,7 +1042,11 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
                aA[ PRT_DOC  ] := 'l' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'QString'
-               aA[ PRT_BODY ] := 'hbqt_par_QString( ' + cHBIdx + ' )'
+               IF !( s_isObject )
+                  aA[ PRT_BODY ] := 'hbqt_par_QString( ' + cHBIdx + ' )'
+               ELSE
+                  aA[ PRT_BODY ] := cWidget+'::tr( hb_parc( ' + cHBIdx + ' ) )'
+               ENDIF
                aA[ PRT_DOC  ] := 'c' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'FT_Face'
diff --git a/harbour/contrib/hbqt/qtcore/QBitArray.cpp b/harbour/contrib/hbqt/qtcore/QBitArray.cpp
index a03d6068ba..5062ac348d 100644
--- a/harbour/contrib/hbqt/qtcore/QBitArray.cpp
+++ b/harbour/contrib/hbqt/qtcore/QBitArray.cpp
@@ -102,7 +102,7 @@ void * hbqt_gcAllocate_QBitArray( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QBitArray;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QBitArray                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QBITARRAY )
diff --git a/harbour/contrib/hbqt/qtcore/QByteArray.cpp b/harbour/contrib/hbqt/qtcore/QByteArray.cpp
index b1faaa7aa6..593ad9f808 100644
--- a/harbour/contrib/hbqt/qtcore/QByteArray.cpp
+++ b/harbour/contrib/hbqt/qtcore/QByteArray.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QByteArray( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QByteArray;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QByteArray                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QBYTEARRAY )
diff --git a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
index 7fe24b64a7..b30a1f694f 100644
--- a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
+++ b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
@@ -102,7 +102,7 @@ HB_FUNC( QT_QCOREAPPLICATION_NOTIFY )
  */
 HB_FUNC( QT_QCOREAPPLICATION_ADDLIBRARYPATH )
 {
-   hbqt_par_QCoreApplication( 1 )->addLibraryPath( hbqt_par_QString( 2 ) );
+   hbqt_par_QCoreApplication( 1 )->addLibraryPath( QCoreApplication::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -270,7 +270,7 @@ HB_FUNC( QT_QCOREAPPLICATION_PROCESSEVENTS_1 )
  */
 HB_FUNC( QT_QCOREAPPLICATION_REMOVELIBRARYPATH )
 {
-   hbqt_par_QCoreApplication( 1 )->removeLibraryPath( hbqt_par_QString( 2 ) );
+   hbqt_par_QCoreApplication( 1 )->removeLibraryPath( QCoreApplication::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -326,7 +326,7 @@ HB_FUNC( QT_QCOREAPPLICATION_SENDPOSTEDEVENTS_1 )
  */
 HB_FUNC( QT_QCOREAPPLICATION_SETAPPLICATIONNAME )
 {
-   hbqt_par_QCoreApplication( 1 )->setApplicationName( hbqt_par_QString( 2 ) );
+   hbqt_par_QCoreApplication( 1 )->setApplicationName( QCoreApplication::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -334,7 +334,7 @@ HB_FUNC( QT_QCOREAPPLICATION_SETAPPLICATIONNAME )
  */
 HB_FUNC( QT_QCOREAPPLICATION_SETAPPLICATIONVERSION )
 {
-   hbqt_par_QCoreApplication( 1 )->setApplicationVersion( hbqt_par_QString( 2 ) );
+   hbqt_par_QCoreApplication( 1 )->setApplicationVersion( QCoreApplication::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -358,7 +358,7 @@ HB_FUNC( QT_QCOREAPPLICATION_SETLIBRARYPATHS )
  */
 HB_FUNC( QT_QCOREAPPLICATION_SETORGANIZATIONDOMAIN )
 {
-   hbqt_par_QCoreApplication( 1 )->setOrganizationDomain( hbqt_par_QString( 2 ) );
+   hbqt_par_QCoreApplication( 1 )->setOrganizationDomain( QCoreApplication::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -366,7 +366,7 @@ HB_FUNC( QT_QCOREAPPLICATION_SETORGANIZATIONDOMAIN )
  */
 HB_FUNC( QT_QCOREAPPLICATION_SETORGANIZATIONNAME )
 {
-   hbqt_par_QCoreApplication( 1 )->setOrganizationName( hbqt_par_QString( 2 ) );
+   hbqt_par_QCoreApplication( 1 )->setOrganizationName( QCoreApplication::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtcore/QDataStream.cpp b/harbour/contrib/hbqt/qtcore/QDataStream.cpp
index 8117e3d74b..7a7e99d992 100644
--- a/harbour/contrib/hbqt/qtcore/QDataStream.cpp
+++ b/harbour/contrib/hbqt/qtcore/QDataStream.cpp
@@ -110,7 +110,7 @@ void * hbqt_gcAllocate_QDataStream( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QDataStream;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDataStream                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDATASTREAM )
diff --git a/harbour/contrib/hbqt/qtcore/QDate.cpp b/harbour/contrib/hbqt/qtcore/QDate.cpp
index 1f3b9efc0e..815abc1b82 100644
--- a/harbour/contrib/hbqt/qtcore/QDate.cpp
+++ b/harbour/contrib/hbqt/qtcore/QDate.cpp
@@ -105,7 +105,7 @@ void * hbqt_gcAllocate_QDate( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QDate;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDate                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDATE )
diff --git a/harbour/contrib/hbqt/qtcore/QDateTime.cpp b/harbour/contrib/hbqt/qtcore/QDateTime.cpp
index 75351fdb4e..c0ffc017c6 100644
--- a/harbour/contrib/hbqt/qtcore/QDateTime.cpp
+++ b/harbour/contrib/hbqt/qtcore/QDateTime.cpp
@@ -105,7 +105,7 @@ void * hbqt_gcAllocate_QDateTime( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QDateTime;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDateTime                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDATETIME )
diff --git a/harbour/contrib/hbqt/qtcore/QDir.cpp b/harbour/contrib/hbqt/qtcore/QDir.cpp
index 1e6b316b3a..4a1b062571 100644
--- a/harbour/contrib/hbqt/qtcore/QDir.cpp
+++ b/harbour/contrib/hbqt/qtcore/QDir.cpp
@@ -111,7 +111,7 @@ void * hbqt_gcAllocate_QDir( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QDir;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDir                        %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDIR )
diff --git a/harbour/contrib/hbqt/qtcore/QEvent.cpp b/harbour/contrib/hbqt/qtcore/QEvent.cpp
index 6f74846fcc..b4efc2fa97 100644
--- a/harbour/contrib/hbqt/qtcore/QEvent.cpp
+++ b/harbour/contrib/hbqt/qtcore/QEvent.cpp
@@ -106,7 +106,7 @@ void * hbqt_gcAllocate_QEvent( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QEvent;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QEvent                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QEVENT )
diff --git a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp b/harbour/contrib/hbqt/qtcore/QEventLoop.cpp
index 9f0ca13fac..1f4774d952 100644
--- a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp
+++ b/harbour/contrib/hbqt/qtcore/QEventLoop.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QEventLoop( void * pObj )
    p->func = hbqt_gcRelease_QEventLoop;
    new( & p->pq ) QPointer< QEventLoop >( ( QEventLoop * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QEventLoop                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QEVENTLOOP )
diff --git a/harbour/contrib/hbqt/qtcore/QFile.cpp b/harbour/contrib/hbqt/qtcore/QFile.cpp
index eca362dc24..a24a618cad 100644
--- a/harbour/contrib/hbqt/qtcore/QFile.cpp
+++ b/harbour/contrib/hbqt/qtcore/QFile.cpp
@@ -139,7 +139,7 @@ void * hbqt_gcAllocate_QFile( void * pObj )
    p->func = hbqt_gcRelease_QFile;
    new( & p->pq ) QPointer< QFile >( ( QFile * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFile                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFILE )
@@ -174,7 +174,7 @@ HB_FUNC( QT_QFILE_CLOSE )
  */
 HB_FUNC( QT_QFILE_COPY )
 {
-   hb_retl( hbqt_par_QFile( 1 )->copy( hbqt_par_QString( 2 ) ) );
+   hb_retl( hbqt_par_QFile( 1 )->copy( QFile::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -230,7 +230,7 @@ HB_FUNC( QT_QFILE_ISSEQUENTIAL )
  */
 HB_FUNC( QT_QFILE_LINK )
 {
-   hb_retl( hbqt_par_QFile( 1 )->link( hbqt_par_QString( 2 ) ) );
+   hb_retl( hbqt_par_QFile( 1 )->link( QFile::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -278,7 +278,7 @@ HB_FUNC( QT_QFILE_REMOVE )
  */
 HB_FUNC( QT_QFILE_RENAME )
 {
-   hb_retl( hbqt_par_QFile( 1 )->rename( hbqt_par_QString( 2 ) ) );
+   hb_retl( hbqt_par_QFile( 1 )->rename( QFile::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -294,7 +294,7 @@ HB_FUNC( QT_QFILE_RESIZE )
  */
 HB_FUNC( QT_QFILE_SETFILENAME )
 {
-   hbqt_par_QFile( 1 )->setFileName( hbqt_par_QString( 2 ) );
+   hbqt_par_QFile( 1 )->setFileName( QFile::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -334,7 +334,7 @@ HB_FUNC( QT_QFILE_UNSETERROR )
  */
 HB_FUNC( QT_QFILE_COPY_1 )
 {
-   hb_retl( hbqt_par_QFile( 1 )->copy( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) );
+   hb_retl( hbqt_par_QFile( 1 )->copy( QFile::tr( hb_parc( 2 ) ), QFile::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -358,7 +358,7 @@ HB_FUNC( QT_QFILE_DECODENAME_1 )
  */
 HB_FUNC( QT_QFILE_ENCODENAME )
 {
-   hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QFile( 1 )->encodeName( hbqt_par_QString( 2 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QFile( 1 )->encodeName( QFile::tr( hb_parc( 2 ) ) ) ) ) );
 }
 
 /*
@@ -366,7 +366,7 @@ HB_FUNC( QT_QFILE_ENCODENAME )
  */
 HB_FUNC( QT_QFILE_EXISTS_1 )
 {
-   hb_retl( hbqt_par_QFile( 1 )->exists( hbqt_par_QString( 2 ) ) );
+   hb_retl( hbqt_par_QFile( 1 )->exists( QFile::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -374,7 +374,7 @@ HB_FUNC( QT_QFILE_EXISTS_1 )
  */
 HB_FUNC( QT_QFILE_LINK_1 )
 {
-   hb_retl( hbqt_par_QFile( 1 )->link( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) );
+   hb_retl( hbqt_par_QFile( 1 )->link( QFile::tr( hb_parc( 2 ) ), QFile::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -382,7 +382,7 @@ HB_FUNC( QT_QFILE_LINK_1 )
  */
 HB_FUNC( QT_QFILE_PERMISSIONS_1 )
 {
-   hb_retni( ( QFile::Permissions ) hbqt_par_QFile( 1 )->permissions( hbqt_par_QString( 2 ) ) );
+   hb_retni( ( QFile::Permissions ) hbqt_par_QFile( 1 )->permissions( QFile::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -390,7 +390,7 @@ HB_FUNC( QT_QFILE_PERMISSIONS_1 )
  */
 HB_FUNC( QT_QFILE_REMOVE_1 )
 {
-   hb_retl( hbqt_par_QFile( 1 )->remove( hbqt_par_QString( 2 ) ) );
+   hb_retl( hbqt_par_QFile( 1 )->remove( QFile::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -398,7 +398,7 @@ HB_FUNC( QT_QFILE_REMOVE_1 )
  */
 HB_FUNC( QT_QFILE_RENAME_1 )
 {
-   hb_retl( hbqt_par_QFile( 1 )->rename( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) );
+   hb_retl( hbqt_par_QFile( 1 )->rename( QFile::tr( hb_parc( 2 ) ), QFile::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -406,7 +406,7 @@ HB_FUNC( QT_QFILE_RENAME_1 )
  */
 HB_FUNC( QT_QFILE_RESIZE_1 )
 {
-   hb_retl( hbqt_par_QFile( 1 )->resize( hbqt_par_QString( 2 ), hb_parnint( 3 ) ) );
+   hb_retl( hbqt_par_QFile( 1 )->resize( QFile::tr( hb_parc( 2 ) ), hb_parnint( 3 ) ) );
 }
 
 /*
@@ -414,7 +414,7 @@ HB_FUNC( QT_QFILE_RESIZE_1 )
  */
 HB_FUNC( QT_QFILE_SETPERMISSIONS_1 )
 {
-   hb_retl( hbqt_par_QFile( 1 )->setPermissions( hbqt_par_QString( 2 ), ( QFile::Permissions ) hb_parni( 3 ) ) );
+   hb_retl( hbqt_par_QFile( 1 )->setPermissions( QFile::tr( hb_parc( 2 ) ), ( QFile::Permissions ) hb_parni( 3 ) ) );
 }
 
 /*
@@ -422,7 +422,7 @@ HB_FUNC( QT_QFILE_SETPERMISSIONS_1 )
  */
 HB_FUNC( QT_QFILE_SYMLINKTARGET_1 )
 {
-   hb_retc( hbqt_par_QFile( 1 )->symLinkTarget( hbqt_par_QString( 2 ) ).toAscii().data() );
+   hb_retc( hbqt_par_QFile( 1 )->symLinkTarget( QFile::tr( hb_parc( 2 ) ) ).toAscii().data() );
 }
 
 
diff --git a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp b/harbour/contrib/hbqt/qtcore/QFileInfo.cpp
index 86ef586001..49d3036d0b 100644
--- a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp
+++ b/harbour/contrib/hbqt/qtcore/QFileInfo.cpp
@@ -111,7 +111,7 @@ void * hbqt_gcAllocate_QFileInfo( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QFileInfo;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFileInfo                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFILEINFO )
diff --git a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp b/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp
index 79b6da5906..08a10caa15 100644
--- a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp
+++ b/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QLatin1Char( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QLatin1Char;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QLatin1Char                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLATIN1CHAR )
diff --git a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp b/harbour/contrib/hbqt/qtcore/QLatin1String.cpp
index 21d5ceccd7..cef6922072 100644
--- a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp
+++ b/harbour/contrib/hbqt/qtcore/QLatin1String.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QLatin1String( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QLatin1String;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QLatin1String               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLATIN1STRING )
diff --git a/harbour/contrib/hbqt/qtcore/QLine.cpp b/harbour/contrib/hbqt/qtcore/QLine.cpp
index 769423712d..8c2baf2692 100644
--- a/harbour/contrib/hbqt/qtcore/QLine.cpp
+++ b/harbour/contrib/hbqt/qtcore/QLine.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QLine( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QLine;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QLine                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLINE )
diff --git a/harbour/contrib/hbqt/qtcore/QLineF.cpp b/harbour/contrib/hbqt/qtcore/QLineF.cpp
index 40bf12c2df..c602abd317 100644
--- a/harbour/contrib/hbqt/qtcore/QLineF.cpp
+++ b/harbour/contrib/hbqt/qtcore/QLineF.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QLineF( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QLineF;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QLineF                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLINEF )
diff --git a/harbour/contrib/hbqt/qtcore/QList.cpp b/harbour/contrib/hbqt/qtcore/QList.cpp
index 53b18f4ff9..4fa5ed8a68 100644
--- a/harbour/contrib/hbqt/qtcore/QList.cpp
+++ b/harbour/contrib/hbqt/qtcore/QList.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QList( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QList;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QList                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLIST )
diff --git a/harbour/contrib/hbqt/qtcore/QLocale.cpp b/harbour/contrib/hbqt/qtcore/QLocale.cpp
index c6c4159320..4093d6cd81 100644
--- a/harbour/contrib/hbqt/qtcore/QLocale.cpp
+++ b/harbour/contrib/hbqt/qtcore/QLocale.cpp
@@ -131,7 +131,7 @@ void * hbqt_gcAllocate_QLocale( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QLocale;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QLocale                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLOCALE )
diff --git a/harbour/contrib/hbqt/qtcore/QMimeData.cpp b/harbour/contrib/hbqt/qtcore/QMimeData.cpp
index ac2c72f46f..f708d419ab 100644
--- a/harbour/contrib/hbqt/qtcore/QMimeData.cpp
+++ b/harbour/contrib/hbqt/qtcore/QMimeData.cpp
@@ -139,7 +139,7 @@ void * hbqt_gcAllocate_QMimeData( void * pObj )
    p->func = hbqt_gcRelease_QMimeData;
    new( & p->pq ) QPointer< QMimeData >( ( QMimeData * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QMimeData                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QMIMEDATA )
@@ -171,7 +171,7 @@ HB_FUNC( QT_QMIMEDATA_COLORDATA )
  */
 HB_FUNC( QT_QMIMEDATA_DATA )
 {
-   hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QMimeData( 1 )->data( hbqt_par_QString( 2 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QMimeData( 1 )->data( QMimeData::tr( hb_parc( 2 ) ) ) ) ) );
 }
 
 /*
@@ -195,7 +195,7 @@ HB_FUNC( QT_QMIMEDATA_HASCOLOR )
  */
 HB_FUNC( QT_QMIMEDATA_HASFORMAT )
 {
-   hb_retl( hbqt_par_QMimeData( 1 )->hasFormat( hbqt_par_QString( 2 ) ) );
+   hb_retl( hbqt_par_QMimeData( 1 )->hasFormat( QMimeData::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -251,7 +251,7 @@ HB_FUNC( QT_QMIMEDATA_IMAGEDATA )
  */
 HB_FUNC( QT_QMIMEDATA_REMOVEFORMAT )
 {
-   hbqt_par_QMimeData( 1 )->removeFormat( hbqt_par_QString( 2 ) );
+   hbqt_par_QMimeData( 1 )->removeFormat( QMimeData::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -267,7 +267,7 @@ HB_FUNC( QT_QMIMEDATA_SETCOLORDATA )
  */
 HB_FUNC( QT_QMIMEDATA_SETDATA )
 {
-   hbqt_par_QMimeData( 1 )->setData( hbqt_par_QString( 2 ), *hbqt_par_QByteArray( 3 ) );
+   hbqt_par_QMimeData( 1 )->setData( QMimeData::tr( hb_parc( 2 ) ), *hbqt_par_QByteArray( 3 ) );
 }
 
 /*
@@ -275,7 +275,7 @@ HB_FUNC( QT_QMIMEDATA_SETDATA )
  */
 HB_FUNC( QT_QMIMEDATA_SETHTML )
 {
-   hbqt_par_QMimeData( 1 )->setHtml( hbqt_par_QString( 2 ) );
+   hbqt_par_QMimeData( 1 )->setHtml( QMimeData::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -291,7 +291,7 @@ HB_FUNC( QT_QMIMEDATA_SETIMAGEDATA )
  */
 HB_FUNC( QT_QMIMEDATA_SETTEXT )
 {
-   hbqt_par_QMimeData( 1 )->setText( hbqt_par_QString( 2 ) );
+   hbqt_par_QMimeData( 1 )->setText( QMimeData::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp b/harbour/contrib/hbqt/qtcore/QModelIndex.cpp
index d2b3ab7398..333cb6ff63 100644
--- a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp
+++ b/harbour/contrib/hbqt/qtcore/QModelIndex.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QModelIndex( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QModelIndex;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QModelIndex                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QMODELINDEX )
diff --git a/harbour/contrib/hbqt/qtcore/QObject.cpp b/harbour/contrib/hbqt/qtcore/QObject.cpp
index ee729b75c0..869ec45c1e 100644
--- a/harbour/contrib/hbqt/qtcore/QObject.cpp
+++ b/harbour/contrib/hbqt/qtcore/QObject.cpp
@@ -146,7 +146,7 @@ void * hbqt_gcAllocate_QObject( void * pObj )
    p->func = hbqt_gcRelease_QObject;
    new( & p->pq ) QPointer< QObject >( ( QObject * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QObject                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QOBJECT )
@@ -306,7 +306,7 @@ HB_FUNC( QT_QOBJECT_REMOVEEVENTFILTER )
  */
 HB_FUNC( QT_QOBJECT_SETOBJECTNAME )
 {
-   hbqt_par_QObject( 1 )->setObjectName( hbqt_par_QString( 2 ) );
+   hbqt_par_QObject( 1 )->setObjectName( QObject::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtcore/QPoint.cpp b/harbour/contrib/hbqt/qtcore/QPoint.cpp
index 19d6282ce8..500aac4f98 100644
--- a/harbour/contrib/hbqt/qtcore/QPoint.cpp
+++ b/harbour/contrib/hbqt/qtcore/QPoint.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QPoint( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPoint;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPoint                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPOINT )
diff --git a/harbour/contrib/hbqt/qtcore/QPointF.cpp b/harbour/contrib/hbqt/qtcore/QPointF.cpp
index 8574255b97..46a8bcf442 100644
--- a/harbour/contrib/hbqt/qtcore/QPointF.cpp
+++ b/harbour/contrib/hbqt/qtcore/QPointF.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QPointF( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPointF;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPointF                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPOINTF )
diff --git a/harbour/contrib/hbqt/qtcore/QProcess.cpp b/harbour/contrib/hbqt/qtcore/QProcess.cpp
index 7f76553bef..b63a3b71c1 100644
--- a/harbour/contrib/hbqt/qtcore/QProcess.cpp
+++ b/harbour/contrib/hbqt/qtcore/QProcess.cpp
@@ -140,7 +140,7 @@ void * hbqt_gcAllocate_QProcess( void * pObj )
    p->func = hbqt_gcRelease_QProcess;
    new( & p->pq ) QPointer< QProcess >( ( QProcess * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QProcess                    %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPROCESS )
@@ -275,7 +275,7 @@ HB_FUNC( QT_QPROCESS_SETREADCHANNEL )
  */
 HB_FUNC( QT_QPROCESS_SETSTANDARDERRORFILE )
 {
-   hbqt_par_QProcess( 1 )->setStandardErrorFile( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QProcess::OpenMode ) hb_parni( 3 ) : ( QProcess::OpenMode ) QProcess::Truncate ) );
+   hbqt_par_QProcess( 1 )->setStandardErrorFile( QProcess::tr( hb_parc( 2 ) ), ( HB_ISNUM( 3 ) ? ( QProcess::OpenMode ) hb_parni( 3 ) : ( QProcess::OpenMode ) QProcess::Truncate ) );
 }
 
 /*
@@ -283,7 +283,7 @@ HB_FUNC( QT_QPROCESS_SETSTANDARDERRORFILE )
  */
 HB_FUNC( QT_QPROCESS_SETSTANDARDINPUTFILE )
 {
-   hbqt_par_QProcess( 1 )->setStandardInputFile( hbqt_par_QString( 2 ) );
+   hbqt_par_QProcess( 1 )->setStandardInputFile( QProcess::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -291,7 +291,7 @@ HB_FUNC( QT_QPROCESS_SETSTANDARDINPUTFILE )
  */
 HB_FUNC( QT_QPROCESS_SETSTANDARDOUTPUTFILE )
 {
-   hbqt_par_QProcess( 1 )->setStandardOutputFile( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QProcess::OpenMode ) hb_parni( 3 ) : ( QProcess::OpenMode ) QProcess::Truncate ) );
+   hbqt_par_QProcess( 1 )->setStandardOutputFile( QProcess::tr( hb_parc( 2 ) ), ( HB_ISNUM( 3 ) ? ( QProcess::OpenMode ) hb_parni( 3 ) : ( QProcess::OpenMode ) QProcess::Truncate ) );
 }
 
 /*
@@ -307,7 +307,7 @@ HB_FUNC( QT_QPROCESS_SETSTANDARDOUTPUTPROCESS )
  */
 HB_FUNC( QT_QPROCESS_SETWORKINGDIRECTORY )
 {
-   hbqt_par_QProcess( 1 )->setWorkingDirectory( hbqt_par_QString( 2 ) );
+   hbqt_par_QProcess( 1 )->setWorkingDirectory( QProcess::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -315,7 +315,7 @@ HB_FUNC( QT_QPROCESS_SETWORKINGDIRECTORY )
  */
 HB_FUNC( QT_QPROCESS_START )
 {
-   hbqt_par_QProcess( 1 )->start( hbqt_par_QString( 2 ), *hbqt_par_QStringList( 3 ), ( HB_ISNUM( 4 ) ? ( QProcess::OpenMode ) hb_parni( 4 ) : ( QProcess::OpenMode ) QProcess::ReadWrite ) );
+   hbqt_par_QProcess( 1 )->start( QProcess::tr( hb_parc( 2 ) ), *hbqt_par_QStringList( 3 ), ( HB_ISNUM( 4 ) ? ( QProcess::OpenMode ) hb_parni( 4 ) : ( QProcess::OpenMode ) QProcess::ReadWrite ) );
 }
 
 /*
@@ -323,7 +323,7 @@ HB_FUNC( QT_QPROCESS_START )
  */
 HB_FUNC( QT_QPROCESS_START_1 )
 {
-   hbqt_par_QProcess( 1 )->start( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QProcess::OpenMode ) hb_parni( 3 ) : ( QProcess::OpenMode ) QProcess::ReadWrite ) );
+   hbqt_par_QProcess( 1 )->start( QProcess::tr( hb_parc( 2 ) ), ( HB_ISNUM( 3 ) ? ( QProcess::OpenMode ) hb_parni( 3 ) : ( QProcess::OpenMode ) QProcess::ReadWrite ) );
 }
 
 /*
@@ -363,7 +363,7 @@ HB_FUNC( QT_QPROCESS_WORKINGDIRECTORY )
  */
 HB_FUNC( QT_QPROCESS_EXECUTE )
 {
-   hb_retni( hbqt_par_QProcess( 1 )->execute( hbqt_par_QString( 2 ), *hbqt_par_QStringList( 3 ) ) );
+   hb_retni( hbqt_par_QProcess( 1 )->execute( QProcess::tr( hb_parc( 2 ) ), *hbqt_par_QStringList( 3 ) ) );
 }
 
 /*
@@ -371,7 +371,7 @@ HB_FUNC( QT_QPROCESS_EXECUTE )
  */
 HB_FUNC( QT_QPROCESS_EXECUTE_1 )
 {
-   hb_retni( hbqt_par_QProcess( 1 )->execute( hbqt_par_QString( 2 ) ) );
+   hb_retni( hbqt_par_QProcess( 1 )->execute( QProcess::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -381,7 +381,7 @@ HB_FUNC( QT_QPROCESS_STARTDETACHED )
 {
    qint64 iPid = 0;
 
-   hb_retl( hbqt_par_QProcess( 1 )->startDetached( hbqt_par_QString( 2 ), *hbqt_par_QStringList( 3 ), hbqt_par_QString( 4 ), &iPid ) );
+   hb_retl( hbqt_par_QProcess( 1 )->startDetached( QProcess::tr( hb_parc( 2 ) ), *hbqt_par_QStringList( 3 ), QProcess::tr( hb_parc( 4 ) ), &iPid ) );
 
    hb_stornint( iPid, 5 );
 }
@@ -391,7 +391,7 @@ HB_FUNC( QT_QPROCESS_STARTDETACHED )
  */
 HB_FUNC( QT_QPROCESS_STARTDETACHED_1 )
 {
-   hb_retl( hbqt_par_QProcess( 1 )->startDetached( hbqt_par_QString( 2 ), *hbqt_par_QStringList( 3 ) ) );
+   hb_retl( hbqt_par_QProcess( 1 )->startDetached( QProcess::tr( hb_parc( 2 ) ), *hbqt_par_QStringList( 3 ) ) );
 }
 
 /*
@@ -399,7 +399,7 @@ HB_FUNC( QT_QPROCESS_STARTDETACHED_1 )
  */
 HB_FUNC( QT_QPROCESS_STARTDETACHED_2 )
 {
-   hb_retl( hbqt_par_QProcess( 1 )->startDetached( hbqt_par_QString( 2 ) ) );
+   hb_retl( hbqt_par_QProcess( 1 )->startDetached( QProcess::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtcore/QRect.cpp b/harbour/contrib/hbqt/qtcore/QRect.cpp
index 92ca27895c..af3b4f8df5 100644
--- a/harbour/contrib/hbqt/qtcore/QRect.cpp
+++ b/harbour/contrib/hbqt/qtcore/QRect.cpp
@@ -105,7 +105,7 @@ void * hbqt_gcAllocate_QRect( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QRect;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QRect                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QRECT )
diff --git a/harbour/contrib/hbqt/qtcore/QRectF.cpp b/harbour/contrib/hbqt/qtcore/QRectF.cpp
index bd86a2da9e..41ef82b04c 100644
--- a/harbour/contrib/hbqt/qtcore/QRectF.cpp
+++ b/harbour/contrib/hbqt/qtcore/QRectF.cpp
@@ -106,7 +106,7 @@ void * hbqt_gcAllocate_QRectF( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QRectF;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QRectF                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QRECTF )
diff --git a/harbour/contrib/hbqt/qtcore/QRegExp.cpp b/harbour/contrib/hbqt/qtcore/QRegExp.cpp
index cfc61b3889..7ac522e1b1 100644
--- a/harbour/contrib/hbqt/qtcore/QRegExp.cpp
+++ b/harbour/contrib/hbqt/qtcore/QRegExp.cpp
@@ -108,7 +108,7 @@ void * hbqt_gcAllocate_QRegExp( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QRegExp;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QRegExp                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QREGEXP )
diff --git a/harbour/contrib/hbqt/qtcore/QResource.cpp b/harbour/contrib/hbqt/qtcore/QResource.cpp
index 7b206f0d7b..79b6ff036c 100644
--- a/harbour/contrib/hbqt/qtcore/QResource.cpp
+++ b/harbour/contrib/hbqt/qtcore/QResource.cpp
@@ -102,7 +102,7 @@ void * hbqt_gcAllocate_QResource( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QResource;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QResource                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QRESOURCE )
diff --git a/harbour/contrib/hbqt/qtcore/QSettings.cpp b/harbour/contrib/hbqt/qtcore/QSettings.cpp
index c3360997bb..47a4e41c9a 100644
--- a/harbour/contrib/hbqt/qtcore/QSettings.cpp
+++ b/harbour/contrib/hbqt/qtcore/QSettings.cpp
@@ -93,12 +93,12 @@ typedef struct
   QPointer< QSettings > pq;
 } QGC_POINTER_QSettings;
 
-QT_G_FUNC( release_QSettings )
+QT_G_FUNC( hbqt_gcRelease_QSettings )
 {
    QGC_POINTER_QSettings * p = ( QGC_POINTER_QSettings * ) Cargo;
 
-   HB_TRACE( HB_TR_DEBUG, ( "release_QSettings                    p=%p", p));
-   HB_TRACE( HB_TR_DEBUG, ( "release_QSettings                   ph=%p pq=%p", p->ph, (void *)(p->pq)));
+   HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSettings                    p=%p", p));
+   HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSettings                   ph=%p pq=%p", p->ph, (void *)(p->pq)));
 
    if( p && p->ph && p->pq )
    {
@@ -118,16 +118,16 @@ QT_G_FUNC( release_QSettings )
             break;
          }
          p->ph = NULL;
-         HB_TRACE( HB_TR_DEBUG, ( "release_QSettings                   Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
+         HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcRelease_QSettings                   Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
       }
       else
       {
-         HB_TRACE( HB_TR_DEBUG, ( "NO release_QSettings                   Object Name Missing!" ) );
+         HB_TRACE( HB_TR_DEBUG, ( "NO hbqt_gcRelease_QSettings                   Object Name Missing!" ) );
       }
    }
    else
    {
-      HB_TRACE( HB_TR_DEBUG, ( "DEL release_QSettings                   Object Already deleted!" ) );
+      HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_QSettings                   Object Already deleted!" ) );
    }
 }
 
@@ -136,10 +136,10 @@ void * hbqt_gcAllocate_QSettings( void * pObj )
    QGC_POINTER_QSettings * p = ( QGC_POINTER_QSettings * ) hb_gcAllocate( sizeof( QGC_POINTER_QSettings ), hbqt_gcFuncs() );
 
    p->ph = pObj;
-   p->func = release_QSettings;
+   p->func = hbqt_gcRelease_QSettings;
    new( & p->pq ) QPointer< QSettings >( ( QSettings * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSettings                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSETTINGS )
@@ -182,7 +182,7 @@ HB_FUNC( QT_QSETTINGS_APPLICATIONNAME )
  */
 HB_FUNC( QT_QSETTINGS_BEGINGROUP )
 {
-   hbqt_par_QSettings( 1 )->beginGroup( hbqt_par_QString( 2 ) );
+   hbqt_par_QSettings( 1 )->beginGroup( QSettings::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -190,7 +190,7 @@ HB_FUNC( QT_QSETTINGS_BEGINGROUP )
  */
 HB_FUNC( QT_QSETTINGS_BEGINREADARRAY )
 {
-   hb_retni( hbqt_par_QSettings( 1 )->beginReadArray( hbqt_par_QString( 2 ) ) );
+   hb_retni( hbqt_par_QSettings( 1 )->beginReadArray( QSettings::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -198,7 +198,7 @@ HB_FUNC( QT_QSETTINGS_BEGINREADARRAY )
  */
 HB_FUNC( QT_QSETTINGS_BEGINWRITEARRAY )
 {
-   hbqt_par_QSettings( 1 )->beginWriteArray( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) );
+   hbqt_par_QSettings( 1 )->beginWriteArray( QSettings::tr( hb_parc( 2 ) ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) );
 }
 
 /*
@@ -230,7 +230,7 @@ HB_FUNC( QT_QSETTINGS_CLEAR )
  */
 HB_FUNC( QT_QSETTINGS_CONTAINS )
 {
-   hb_retl( hbqt_par_QSettings( 1 )->contains( hbqt_par_QString( 2 ) ) );
+   hb_retl( hbqt_par_QSettings( 1 )->contains( QSettings::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -310,7 +310,7 @@ HB_FUNC( QT_QSETTINGS_ORGANIZATIONNAME )
  */
 HB_FUNC( QT_QSETTINGS_REMOVE )
 {
-   hbqt_par_QSettings( 1 )->remove( hbqt_par_QString( 2 ) );
+   hbqt_par_QSettings( 1 )->remove( QSettings::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -358,7 +358,7 @@ HB_FUNC( QT_QSETTINGS_SETINICODEC_1 )
  */
 HB_FUNC( QT_QSETTINGS_SETVALUE )
 {
-   hbqt_par_QSettings( 1 )->setValue( hbqt_par_QString( 2 ), *hbqt_par_QVariant( 3 ) );
+   hbqt_par_QSettings( 1 )->setValue( QSettings::tr( hb_parc( 2 ) ), *hbqt_par_QVariant( 3 ) );
 }
 
 /*
@@ -382,7 +382,7 @@ HB_FUNC( QT_QSETTINGS_SYNC )
  */
 HB_FUNC( QT_QSETTINGS_VALUE )
 {
-   hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QSettings( 1 )->value( hbqt_par_QString( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QSettings( 1 )->value( QSettings::tr( hb_parc( 2 ) ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ) ) ) );
 }
 
 /*
@@ -406,7 +406,7 @@ HB_FUNC( QT_QSETTINGS_SETDEFAULTFORMAT )
  */
 HB_FUNC( QT_QSETTINGS_SETPATH )
 {
-   hbqt_par_QSettings( 1 )->setPath( ( QSettings::Format ) hb_parni( 2 ), ( QSettings::Scope ) hb_parni( 3 ), hbqt_par_QString( 4 ) );
+   hbqt_par_QSettings( 1 )->setPath( ( QSettings::Format ) hb_parni( 2 ), ( QSettings::Scope ) hb_parni( 3 ), QSettings::tr( hb_parc( 4 ) ) );
 }
 
 
diff --git a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp b/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp
index 233cd5fb69..2c76de4a86 100644
--- a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp
+++ b/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QSignalMapper( void * pObj )
    p->func = hbqt_gcRelease_QSignalMapper;
    new( & p->pq ) QPointer< QSignalMapper >( ( QSignalMapper * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSignalMapper               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSIGNALMAPPER )
@@ -153,7 +153,7 @@ HB_FUNC( QT_QSIGNALMAPPER_MAPPING )
  */
 HB_FUNC( QT_QSIGNALMAPPER_MAPPING_1 )
 {
-   hb_retptr( ( QObject* ) hbqt_par_QSignalMapper( 1 )->mapping( hbqt_par_QString( 2 ) ) );
+   hb_retptr( ( QObject* ) hbqt_par_QSignalMapper( 1 )->mapping( QSignalMapper::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -193,7 +193,7 @@ HB_FUNC( QT_QSIGNALMAPPER_SETMAPPING )
  */
 HB_FUNC( QT_QSIGNALMAPPER_SETMAPPING_1 )
 {
-   hbqt_par_QSignalMapper( 1 )->setMapping( hbqt_par_QObject( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QSignalMapper( 1 )->setMapping( hbqt_par_QObject( 2 ), QSignalMapper::tr( hb_parc( 3 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtcore/QSize.cpp b/harbour/contrib/hbqt/qtcore/QSize.cpp
index cb6308f251..cba25502c5 100644
--- a/harbour/contrib/hbqt/qtcore/QSize.cpp
+++ b/harbour/contrib/hbqt/qtcore/QSize.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QSize( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QSize;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSize                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSIZE )
diff --git a/harbour/contrib/hbqt/qtcore/QSizeF.cpp b/harbour/contrib/hbqt/qtcore/QSizeF.cpp
index 1b9206db7a..767698fc1f 100644
--- a/harbour/contrib/hbqt/qtcore/QSizeF.cpp
+++ b/harbour/contrib/hbqt/qtcore/QSizeF.cpp
@@ -104,7 +104,7 @@ void * hbqt_gcAllocate_QSizeF( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QSizeF;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSizeF                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSIZEF )
diff --git a/harbour/contrib/hbqt/qtcore/QStringList.cpp b/harbour/contrib/hbqt/qtcore/QStringList.cpp
index ffdd6769fc..7158a92b9a 100644
--- a/harbour/contrib/hbqt/qtcore/QStringList.cpp
+++ b/harbour/contrib/hbqt/qtcore/QStringList.cpp
@@ -122,7 +122,7 @@ void * hbqt_gcAllocate_QStringList( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStringList;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStringList                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTRINGLIST )
diff --git a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp b/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
index 4130ab1fd3..81f6ecbbe2 100644
--- a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
@@ -111,7 +111,7 @@ void * hbqt_gcAllocate_QTextBoundaryFinder( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextBoundaryFinder;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextBoundaryFinder         %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTBOUNDARYFINDER )
diff --git a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp b/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp
index f851dab792..51c1350918 100644
--- a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp
@@ -102,7 +102,7 @@ void * hbqt_gcAllocate_QTextDecoder( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextDecoder;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextDecoder                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTDECODER )
diff --git a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp b/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp
index 2c6d26df64..d75e96fe63 100644
--- a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp
@@ -102,7 +102,7 @@ void * hbqt_gcAllocate_QTextEncoder( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextEncoder;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextEncoder                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTENCODER )
diff --git a/harbour/contrib/hbqt/qtcore/QTextStream.cpp b/harbour/contrib/hbqt/qtcore/QTextStream.cpp
index 5d37a743cd..5a8e896f3a 100644
--- a/harbour/contrib/hbqt/qtcore/QTextStream.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTextStream.cpp
@@ -122,7 +122,7 @@ void * hbqt_gcAllocate_QTextStream( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextStream;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextStream                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTSTREAM )
diff --git a/harbour/contrib/hbqt/qtcore/QThread.cpp b/harbour/contrib/hbqt/qtcore/QThread.cpp
index 4a88c2b8c2..6116102bee 100644
--- a/harbour/contrib/hbqt/qtcore/QThread.cpp
+++ b/harbour/contrib/hbqt/qtcore/QThread.cpp
@@ -132,7 +132,7 @@ void * hbqt_gcAllocate_QThread( void * pObj )
    p->func = hbqt_gcRelease_QThread;
    new( & p->pq ) QPointer< QThread >( ( QThread * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QThread                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTHREAD )
diff --git a/harbour/contrib/hbqt/qtcore/QTime.cpp b/harbour/contrib/hbqt/qtcore/QTime.cpp
index 2c25f3f579..003803fd5f 100644
--- a/harbour/contrib/hbqt/qtcore/QTime.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTime.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QTime( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTime;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTime                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTIME )
diff --git a/harbour/contrib/hbqt/qtcore/QTimer.cpp b/harbour/contrib/hbqt/qtcore/QTimer.cpp
index c901767443..63b5d6be71 100644
--- a/harbour/contrib/hbqt/qtcore/QTimer.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTimer.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QTimer( void * pObj )
    p->func = hbqt_gcRelease_QTimer;
    new( & p->pq ) QPointer< QTimer >( ( QTimer * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTimer                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTIMER )
diff --git a/harbour/contrib/hbqt/qtcore/QTranslator.cpp b/harbour/contrib/hbqt/qtcore/QTranslator.cpp
index c27fd7ad55..42cfbbe202 100644
--- a/harbour/contrib/hbqt/qtcore/QTranslator.cpp
+++ b/harbour/contrib/hbqt/qtcore/QTranslator.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QTranslator( void * pObj )
    p->func = hbqt_gcRelease_QTranslator;
    new( & p->pq ) QPointer< QTranslator >( ( QTranslator * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTranslator                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTRANSLATOR )
@@ -152,7 +152,7 @@ HB_FUNC( QT_QTRANSLATOR_ISEMPTY )
  */
 HB_FUNC( QT_QTRANSLATOR_LOAD )
 {
-   hb_retl( hbqt_par_QTranslator( 1 )->load( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ), hbqt_par_QString( 4 ), hbqt_par_QString( 5 ) ) );
+   hb_retl( hbqt_par_QTranslator( 1 )->load( QTranslator::tr( hb_parc( 2 ) ), QTranslator::tr( hb_parc( 3 ) ), QTranslator::tr( hb_parc( 4 ) ), QTranslator::tr( hb_parc( 5 ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtcore/QUiLoader.cpp b/harbour/contrib/hbqt/qtcore/QUiLoader.cpp
index 0945b02a19..53c2b82955 100644
--- a/harbour/contrib/hbqt/qtcore/QUiLoader.cpp
+++ b/harbour/contrib/hbqt/qtcore/QUiLoader.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QUiLoader( void * pObj )
    p->func = hbqt_gcRelease_QUiLoader;
    new( & p->pq ) QPointer< QUiLoader >( ( QUiLoader * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QUiLoader                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QUILOADER )
@@ -153,7 +153,7 @@ HB_FUNC( QT_QUILOADER )
  */
 HB_FUNC( QT_QUILOADER_ADDPLUGINPATH )
 {
-   hbqt_par_QUiLoader( 1 )->addPluginPath( hbqt_par_QString( 2 ) );
+   hbqt_par_QUiLoader( 1 )->addPluginPath( QUiLoader::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -185,7 +185,7 @@ HB_FUNC( QT_QUILOADER_CLEARPLUGINPATHS )
  */
 HB_FUNC( QT_QUILOADER_CREATEACTION )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QUiLoader( 1 )->createAction( hbqt_par_QObject( 2 ), hbqt_par_QString( 3 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QUiLoader( 1 )->createAction( hbqt_par_QObject( 2 ), QUiLoader::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -193,7 +193,7 @@ HB_FUNC( QT_QUILOADER_CREATEACTION )
  */
 HB_FUNC( QT_QUILOADER_CREATEACTIONGROUP )
 {
-   hb_retptr( ( QActionGroup* ) hbqt_par_QUiLoader( 1 )->createActionGroup( hbqt_par_QObject( 2 ), hbqt_par_QString( 3 ) ) );
+   hb_retptr( ( QActionGroup* ) hbqt_par_QUiLoader( 1 )->createActionGroup( hbqt_par_QObject( 2 ), QUiLoader::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -201,7 +201,7 @@ HB_FUNC( QT_QUILOADER_CREATEACTIONGROUP )
  */
 HB_FUNC( QT_QUILOADER_CREATELAYOUT )
 {
-   hb_retptr( ( QLayout* ) hbqt_par_QUiLoader( 1 )->createLayout( hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ), hbqt_par_QString( 4 ) ) );
+   hb_retptr( ( QLayout* ) hbqt_par_QUiLoader( 1 )->createLayout( QUiLoader::tr( hb_parc( 2 ) ), hbqt_par_QObject( 3 ), QUiLoader::tr( hb_parc( 4 ) ) ) );
 }
 
 /*
@@ -209,7 +209,7 @@ HB_FUNC( QT_QUILOADER_CREATELAYOUT )
  */
 HB_FUNC( QT_QUILOADER_CREATEWIDGET )
 {
-   hb_retptr( ( QWidget* ) hbqt_par_QUiLoader( 1 )->createWidget( hbqt_par_QString( 2 ), hbqt_par_QWidget( 3 ), hbqt_par_QString( 4 ) ) );
+   hb_retptr( ( QWidget* ) hbqt_par_QUiLoader( 1 )->createWidget( QUiLoader::tr( hb_parc( 2 ) ), hbqt_par_QWidget( 3 ), QUiLoader::tr( hb_parc( 4 ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtcore/QUrl.cpp b/harbour/contrib/hbqt/qtcore/QUrl.cpp
index 23ab2c9e2f..cbc201acce 100644
--- a/harbour/contrib/hbqt/qtcore/QUrl.cpp
+++ b/harbour/contrib/hbqt/qtcore/QUrl.cpp
@@ -136,7 +136,7 @@ void * hbqt_gcAllocate_QUrl( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QUrl;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QUrl                        %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QURL )
diff --git a/harbour/contrib/hbqt/qtcore/QVariant.cpp b/harbour/contrib/hbqt/qtcore/QVariant.cpp
index 368f42a62b..315ce39e2a 100644
--- a/harbour/contrib/hbqt/qtcore/QVariant.cpp
+++ b/harbour/contrib/hbqt/qtcore/QVariant.cpp
@@ -165,7 +165,7 @@ void * hbqt_gcAllocate_QVariant( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QVariant;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QVariant                    %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QVARIANT )
diff --git a/harbour/contrib/hbqt/qtcore/TQSettings.prg b/harbour/contrib/hbqt/qtcore/TQSettings.prg
index 5235312c83..a75f3a3379 100644
--- a/harbour/contrib/hbqt/qtcore/TQSettings.prg
+++ b/harbour/contrib/hbqt/qtcore/TQSettings.prg
@@ -63,12 +63,9 @@
 #include "hbclass.ch"
 
 
-CREATE CLASS QSettings INHERIT QObject
-
-   VAR     pPtr
+CREATE CLASS QSettings INHERIT HbQtObjectHandler, QObject
 
    METHOD  new()
-   METHOD  configure( xObject )
 
    METHOD  allKeys()
    METHOD  applicationName()
@@ -104,27 +101,16 @@ CREATE CLASS QSettings INHERIT QObject
 
    ENDCLASS
 
-/*----------------------------------------------------------------------*/
 
 METHOD QSettings:new( ... )
    LOCAL p
    FOR EACH p IN { ... }
-      p := hbqt_ptr( p )
-      hb_pvalue( p:__enumIndex(), p )
+      hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )
    NEXT
    ::pPtr := Qt_QSettings( ... )
    RETURN Self
 
 
-METHOD QSettings:configure( xObject )
-   IF hb_isObject( xObject )
-      ::pPtr := xObject:pPtr
-   ELSEIF hb_isPointer( xObject )
-      ::pPtr := xObject
-   ENDIF
-   RETURN Self
-
-
 METHOD QSettings:allKeys()
    RETURN Qt_QSettings_allKeys( ::pPtr )
 
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp b/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp
index 457f5e927c..6213d54208 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp
@@ -233,7 +233,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_SETSHORTCUT )
  */
 HB_FUNC( QT_QABSTRACTBUTTON_SETTEXT )
 {
-   hbqt_par_QAbstractButton( 1 )->setText( hbqt_par_QString( 2 ) );
+   hbqt_par_QAbstractButton( 1 )->setText( QAbstractButton::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp b/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp
index dcd2548bd1..8b8b8d9dfd 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp
@@ -235,7 +235,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_ITEMDELEGATEFORROW )
  */
 HB_FUNC( QT_QABSTRACTITEMVIEW_KEYBOARDSEARCH )
 {
-   hbqt_par_QAbstractItemView( 1 )->keyboardSearch( hbqt_par_QString( 2 ) );
+   hbqt_par_QAbstractItemView( 1 )->keyboardSearch( QAbstractItemView::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp
index d26d012993..fd885c3954 100644
--- a/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp
@@ -224,7 +224,7 @@ HB_FUNC( QT_QABSTRACTSPINBOX_SETREADONLY )
  */
 HB_FUNC( QT_QABSTRACTSPINBOX_SETSPECIALVALUETEXT )
 {
-   hbqt_par_QAbstractSpinBox( 1 )->setSpecialValueText( hbqt_par_QString( 2 ) );
+   hbqt_par_QAbstractSpinBox( 1 )->setSpecialValueText( QAbstractSpinBox::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QAction.cpp b/harbour/contrib/hbqt/qtgui/QAction.cpp
index ebf7f26d3e..71ce0ed9b3 100644
--- a/harbour/contrib/hbqt/qtgui/QAction.cpp
+++ b/harbour/contrib/hbqt/qtgui/QAction.cpp
@@ -148,7 +148,7 @@ void * hbqt_gcAllocate_QAction( void * pObj )
    p->func = hbqt_gcRelease_QAction;
    new( & p->pq ) QPointer< QAction >( ( QAction * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QAction                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QACTION )
@@ -345,7 +345,7 @@ HB_FUNC( QT_QACTION_SETICON )
  */
 HB_FUNC( QT_QACTION_SETICONTEXT )
 {
-   hbqt_par_QAction( 1 )->setIconText( hbqt_par_QString( 2 ) );
+   hbqt_par_QAction( 1 )->setIconText( QAction::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -409,7 +409,7 @@ HB_FUNC( QT_QACTION_SETSHORTCUTS )
  */
 HB_FUNC( QT_QACTION_SETSTATUSTIP )
 {
-   hbqt_par_QAction( 1 )->setStatusTip( hbqt_par_QString( 2 ) );
+   hbqt_par_QAction( 1 )->setStatusTip( QAction::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -417,7 +417,7 @@ HB_FUNC( QT_QACTION_SETSTATUSTIP )
  */
 HB_FUNC( QT_QACTION_SETTEXT )
 {
-   hbqt_par_QAction( 1 )->setText( hbqt_par_QString( 2 ) );
+   hbqt_par_QAction( 1 )->setText( QAction::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -425,7 +425,7 @@ HB_FUNC( QT_QACTION_SETTEXT )
  */
 HB_FUNC( QT_QACTION_SETTOOLTIP )
 {
-   hbqt_par_QAction( 1 )->setToolTip( hbqt_par_QString( 2 ) );
+   hbqt_par_QAction( 1 )->setToolTip( QAction::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -433,7 +433,7 @@ HB_FUNC( QT_QACTION_SETTOOLTIP )
  */
 HB_FUNC( QT_QACTION_SETWHATSTHIS )
 {
-   hbqt_par_QAction( 1 )->setWhatsThis( hbqt_par_QString( 2 ) );
+   hbqt_par_QAction( 1 )->setWhatsThis( QAction::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp b/harbour/contrib/hbqt/qtgui/QActionGroup.cpp
index 96021bf7b9..df00796153 100644
--- a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/QActionGroup.cpp
@@ -137,7 +137,7 @@ void * hbqt_gcAllocate_QActionGroup( void * pObj )
    p->func = hbqt_gcRelease_QActionGroup;
    new( & p->pq ) QPointer< QActionGroup >( ( QActionGroup * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QActionGroup                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QACTIONGROUP )
@@ -164,7 +164,7 @@ HB_FUNC( QT_QACTIONGROUP_ADDACTION )
  */
 HB_FUNC( QT_QACTIONGROUP_ADDACTION_1 )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QActionGroup( 1 )->addAction( hbqt_par_QString( 2 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QActionGroup( 1 )->addAction( QActionGroup::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -172,7 +172,7 @@ HB_FUNC( QT_QACTIONGROUP_ADDACTION_1 )
  */
 HB_FUNC( QT_QACTIONGROUP_ADDACTION_2 )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QActionGroup( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QActionGroup( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), QActionGroup::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QApplication.cpp b/harbour/contrib/hbqt/qtgui/QApplication.cpp
index 9beac9ade2..20af55df93 100644
--- a/harbour/contrib/hbqt/qtgui/QApplication.cpp
+++ b/harbour/contrib/hbqt/qtgui/QApplication.cpp
@@ -203,7 +203,7 @@ void * hbqt_gcAllocate_QApplication( void * pObj )
    p->func = hbqt_gcRelease_QApplication;
    new( & p->pq ) QPointer< QApplication >( ( QApplication * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QApplication                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QAPPLICATION )
@@ -619,7 +619,7 @@ HB_FUNC( QT_QAPPLICATION_SETGLOBALSTRUT )
  */
 HB_FUNC( QT_QAPPLICATION_SETGRAPHICSSYSTEM )
 {
-   hbqt_par_QApplication( 1 )->setGraphicsSystem( hbqt_par_QString( 2 ) );
+   hbqt_par_QApplication( 1 )->setGraphicsSystem( QApplication::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -691,7 +691,7 @@ HB_FUNC( QT_QAPPLICATION_SETSTYLE )
  */
 HB_FUNC( QT_QAPPLICATION_SETSTYLE_1 )
 {
-   hb_retptr( ( QStyle* ) hbqt_par_QApplication( 1 )->setStyle( hbqt_par_QString( 2 ) ) );
+   hb_retptr( ( QStyle* ) hbqt_par_QApplication( 1 )->setStyle( QApplication::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -819,7 +819,7 @@ HB_FUNC( QT_QAPPLICATION_CLOSEALLWINDOWS )
  */
 HB_FUNC( QT_QAPPLICATION_SETSTYLESHEET )
 {
-   hbqt_par_QApplication( 1 )->setStyleSheet( hbqt_par_QString( 2 ) );
+   hbqt_par_QApplication( 1 )->setStyleSheet( QApplication::tr( hb_parc( 2 ) ) );
 }
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QBitmap.cpp b/harbour/contrib/hbqt/qtgui/QBitmap.cpp
index 6c5bf5f7a0..15849c798c 100644
--- a/harbour/contrib/hbqt/qtgui/QBitmap.cpp
+++ b/harbour/contrib/hbqt/qtgui/QBitmap.cpp
@@ -106,7 +106,7 @@ void * hbqt_gcAllocate_QBitmap( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QBitmap;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QBitmap                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QBITMAP )
diff --git a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp
index c23b475f79..f264f9e3b6 100644
--- a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QBoxLayout( void * pObj )
    p->func = hbqt_gcRelease_QBoxLayout;
    new( & p->pq ) QPointer< QBoxLayout >( ( QBoxLayout * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QBoxLayout                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QBOXLAYOUT )
diff --git a/harbour/contrib/hbqt/qtgui/QBrush.cpp b/harbour/contrib/hbqt/qtgui/QBrush.cpp
index bd01ea1c66..d08bcd8d0d 100644
--- a/harbour/contrib/hbqt/qtgui/QBrush.cpp
+++ b/harbour/contrib/hbqt/qtgui/QBrush.cpp
@@ -111,7 +111,7 @@ void * hbqt_gcAllocate_QBrush( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QBrush;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QBrush                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QBRUSH )
diff --git a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp b/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp
index d7d30ba533..e68529e99f 100644
--- a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp
+++ b/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp
@@ -138,7 +138,7 @@ void * hbqt_gcAllocate_QButtonGroup( void * pObj )
    p->func = hbqt_gcRelease_QButtonGroup;
    new( & p->pq ) QPointer< QButtonGroup >( ( QButtonGroup * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QButtonGroup                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QBUTTONGROUP )
diff --git a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp b/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp
index 4c908da0ce..9b94a4454f 100644
--- a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp
@@ -144,7 +144,7 @@ void * hbqt_gcAllocate_QCalendarWidget( void * pObj )
    p->func = hbqt_gcRelease_QCalendarWidget;
    new( & p->pq ) QPointer< QCalendarWidget >( ( QCalendarWidget * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QCalendarWidget             %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QCALENDARWIDGET )
diff --git a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp b/harbour/contrib/hbqt/qtgui/QCheckBox.cpp
index 404cd84665..2007c7d703 100644
--- a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCheckBox.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QCheckBox( void * pObj )
    p->func = hbqt_gcRelease_QCheckBox;
    new( & p->pq ) QPointer< QCheckBox >( ( QCheckBox * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QCheckBox                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QCHECKBOX )
diff --git a/harbour/contrib/hbqt/qtgui/QClipboard.cpp b/harbour/contrib/hbqt/qtgui/QClipboard.cpp
index 25229e27d3..bef815e3e6 100644
--- a/harbour/contrib/hbqt/qtgui/QClipboard.cpp
+++ b/harbour/contrib/hbqt/qtgui/QClipboard.cpp
@@ -179,7 +179,7 @@ HB_FUNC( QT_QCLIPBOARD_SETPIXMAP )
  */
 HB_FUNC( QT_QCLIPBOARD_SETTEXT )
 {
-   hbqt_par_QClipboard( 1 )->setText( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QClipboard::Mode ) hb_parni( 3 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) );
+   hbqt_par_QClipboard( 1 )->setText( QClipboard::tr( hb_parc( 2 ) ), ( HB_ISNUM( 3 ) ? ( QClipboard::Mode ) hb_parni( 3 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QColor.cpp b/harbour/contrib/hbqt/qtgui/QColor.cpp
index e3605338e0..d08ccf0507 100644
--- a/harbour/contrib/hbqt/qtgui/QColor.cpp
+++ b/harbour/contrib/hbqt/qtgui/QColor.cpp
@@ -111,7 +111,7 @@ void * hbqt_gcAllocate_QColor( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QColor;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QColor                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QCOLOR )
diff --git a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp b/harbour/contrib/hbqt/qtgui/QColorDialog.cpp
index 43209cbe10..91366be86e 100644
--- a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QColorDialog.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QColorDialog( void * pObj )
    p->func = hbqt_gcRelease_QColorDialog;
    new( & p->pq ) QPointer< QColorDialog >( ( QColorDialog * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QColorDialog                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QCOLORDIALOG )
@@ -245,7 +245,7 @@ HB_FUNC( QT_QCOLORDIALOG_CUSTOMCOUNT )
  */
 HB_FUNC( QT_QCOLORDIALOG_GETCOLOR )
 {
-   hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ), hbqt_par_QString( 4 ), ( QColorDialog::ColorDialogOptions ) hb_parni( 5 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ), QColorDialog::tr( hb_parc( 4 ) ), ( QColorDialog::ColorDialogOptions ) hb_parni( 5 ) ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/QComboBox.cpp
index c5e7c92c2d..89112615f0 100644
--- a/harbour/contrib/hbqt/qtgui/QComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QComboBox.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QComboBox( void * pObj )
    p->func = hbqt_gcRelease_QComboBox;
    new( & p->pq ) QPointer< QComboBox >( ( QComboBox * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QComboBox                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QCOMBOBOX )
@@ -150,7 +150,7 @@ HB_FUNC( QT_QCOMBOBOX )
  */
 HB_FUNC( QT_QCOMBOBOX_ADDITEM )
 {
-   hbqt_par_QComboBox( 1 )->addItem( hbqt_par_QString( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) );
+   hbqt_par_QComboBox( 1 )->addItem( QComboBox::tr( hb_parc( 2 ) ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) );
 }
 
 /*
@@ -158,7 +158,7 @@ HB_FUNC( QT_QCOMBOBOX_ADDITEM )
  */
 HB_FUNC( QT_QCOMBOBOX_ADDITEM_1 )
 {
-   hbqt_par_QComboBox( 1 )->addItem( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) );
+   hbqt_par_QComboBox( 1 )->addItem( QIcon( hbqt_par_QString( 2 ) ), QComboBox::tr( hb_parc( 3 ) ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) );
 }
 
 /*
@@ -222,7 +222,7 @@ HB_FUNC( QT_QCOMBOBOX_FINDDATA )
  */
 HB_FUNC( QT_QCOMBOBOX_FINDTEXT )
 {
-   hb_retni( hbqt_par_QComboBox( 1 )->findText( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::MatchFlags ) hb_parni( 3 ) : ( Qt::MatchFlags ) Qt::MatchExactly | Qt::MatchCaseSensitive ) ) );
+   hb_retni( hbqt_par_QComboBox( 1 )->findText( QComboBox::tr( hb_parc( 2 ) ), ( HB_ISNUM( 3 ) ? ( Qt::MatchFlags ) hb_parni( 3 ) : ( Qt::MatchFlags ) Qt::MatchExactly | Qt::MatchCaseSensitive ) ) );
 }
 
 /*
@@ -254,7 +254,7 @@ HB_FUNC( QT_QCOMBOBOX_ICONSIZE )
  */
 HB_FUNC( QT_QCOMBOBOX_INSERTITEM )
 {
-   hbqt_par_QComboBox( 1 )->insertItem( hb_parni( 2 ), hbqt_par_QString( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) );
+   hbqt_par_QComboBox( 1 )->insertItem( hb_parni( 2 ), QComboBox::tr( hb_parc( 3 ) ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) );
 }
 
 /*
@@ -262,7 +262,7 @@ HB_FUNC( QT_QCOMBOBOX_INSERTITEM )
  */
 HB_FUNC( QT_QCOMBOBOX_INSERTITEM_1 )
 {
-   hbqt_par_QComboBox( 1 )->insertItem( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ), hbqt_par_QString( 4 ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QVariant( 5 ) : QVariant() ) );
+   hbqt_par_QComboBox( 1 )->insertItem( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ), QComboBox::tr( hb_parc( 4 ) ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QVariant( 5 ) : QVariant() ) );
 }
 
 /*
@@ -470,7 +470,7 @@ HB_FUNC( QT_QCOMBOBOX_SETITEMICON )
  */
 HB_FUNC( QT_QCOMBOBOX_SETITEMTEXT )
 {
-   hbqt_par_QComboBox( 1 )->setItemText( hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QComboBox( 1 )->setItemText( hb_parni( 2 ), QComboBox::tr( hb_parc( 3 ) ) );
 }
 
 /*
@@ -614,7 +614,7 @@ HB_FUNC( QT_QCOMBOBOX_SETCURRENTINDEX )
  */
 HB_FUNC( QT_QCOMBOBOX_SETEDITTEXT )
 {
-   hbqt_par_QComboBox( 1 )->setEditText( hbqt_par_QString( 2 ) );
+   hbqt_par_QComboBox( 1 )->setEditText( QComboBox::tr( hb_parc( 2 ) ) );
 }
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp b/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp
index ecb081ecb9..cb0d388764 100644
--- a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QCommandLinkButton( void * pObj )
    p->func = hbqt_gcRelease_QCommandLinkButton;
    new( & p->pq ) QPointer< QCommandLinkButton >( ( QCommandLinkButton * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QCommandLinkButton          %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QCOMMANDLINKBUTTON )
@@ -154,7 +154,7 @@ HB_FUNC( QT_QCOMMANDLINKBUTTON_DESCRIPTION )
  */
 HB_FUNC( QT_QCOMMANDLINKBUTTON_SETDESCRIPTION )
 {
-   hbqt_par_QCommandLinkButton( 1 )->setDescription( hbqt_par_QString( 2 ) );
+   hbqt_par_QCommandLinkButton( 1 )->setDescription( QCommandLinkButton::tr( hb_parc( 2 ) ) );
 }
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp b/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp
index db17c23908..6aabada47c 100644
--- a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QCommonStyle( void * pObj )
    p->func = hbqt_gcRelease_QCommonStyle;
    new( & p->pq ) QPointer< QCommonStyle >( ( QCommonStyle * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QCommonStyle                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QCOMMONSTYLE )
diff --git a/harbour/contrib/hbqt/qtgui/QCompleter.cpp b/harbour/contrib/hbqt/qtgui/QCompleter.cpp
index ea63435fc8..412712312f 100644
--- a/harbour/contrib/hbqt/qtgui/QCompleter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCompleter.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QCompleter( void * pObj )
    p->func = hbqt_gcRelease_QCompleter;
    new( & p->pq ) QPointer< QCompleter >( ( QCompleter * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QCompleter                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QCOMPLETER )
@@ -335,7 +335,7 @@ HB_FUNC( QT_QCOMPLETER_SETWIDGET )
  */
 HB_FUNC( QT_QCOMPLETER_SPLITPATH )
 {
-   hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QCompleter( 1 )->splitPath( hbqt_par_QString( 2 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QCompleter( 1 )->splitPath( QCompleter::tr( hb_parc( 2 ) ) ) ) ) );
 }
 
 /*
@@ -367,7 +367,7 @@ HB_FUNC( QT_QCOMPLETER_COMPLETE )
  */
 HB_FUNC( QT_QCOMPLETER_SETCOMPLETIONPREFIX )
 {
-   hbqt_par_QCompleter( 1 )->setCompletionPrefix( hbqt_par_QString( 2 ) );
+   hbqt_par_QCompleter( 1 )->setCompletionPrefix( QCompleter::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp b/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp
index e67b2538b8..0fdd8b9be5 100644
--- a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp
@@ -109,7 +109,7 @@ void * hbqt_gcAllocate_QConicalGradient( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QConicalGradient;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QConicalGradient            %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QCONICALGRADIENT )
diff --git a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp
index 678fac07e5..57c6a5e73e 100644
--- a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp
@@ -106,7 +106,7 @@ void * hbqt_gcAllocate_QContextMenuEvent( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QContextMenuEvent;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QContextMenuEvent           %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QCONTEXTMENUEVENT )
diff --git a/harbour/contrib/hbqt/qtgui/QCursor.cpp b/harbour/contrib/hbqt/qtgui/QCursor.cpp
index babde29590..816e89c30f 100644
--- a/harbour/contrib/hbqt/qtgui/QCursor.cpp
+++ b/harbour/contrib/hbqt/qtgui/QCursor.cpp
@@ -108,7 +108,7 @@ void * hbqt_gcAllocate_QCursor( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QCursor;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QCursor                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QCURSOR )
diff --git a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp b/harbour/contrib/hbqt/qtgui/QDateEdit.cpp
index f73625575b..0e8c815324 100644
--- a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDateEdit.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QDateEdit( void * pObj )
    p->func = hbqt_gcRelease_QDateEdit;
    new( & p->pq ) QPointer< QDateEdit >( ( QDateEdit * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDateEdit                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDATEEDIT )
diff --git a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp
index 55eee9f4d7..ef9440419d 100644
--- a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp
@@ -136,7 +136,7 @@ void * hbqt_gcAllocate_QDateTimeEdit( void * pObj )
    p->func = hbqt_gcRelease_QDateTimeEdit;
    new( & p->pq ) QPointer< QDateTimeEdit >( ( QDateTimeEdit * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDateTimeEdit               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDATETIMEEDIT )
@@ -384,7 +384,7 @@ HB_FUNC( QT_QDATETIMEEDIT_SETDATETIMERANGE )
  */
 HB_FUNC( QT_QDATETIMEEDIT_SETDISPLAYFORMAT )
 {
-   hbqt_par_QDateTimeEdit( 1 )->setDisplayFormat( hbqt_par_QString( 2 ) );
+   hbqt_par_QDateTimeEdit( 1 )->setDisplayFormat( QDateTimeEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp b/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp
index a057a07c15..8d8ff9d69a 100644
--- a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QDesktopWidget( void * pObj )
    p->func = hbqt_gcRelease_QDesktopWidget;
    new( & p->pq ) QPointer< QDesktopWidget >( ( QDesktopWidget * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDesktopWidget              %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDESKTOPWIDGET )
diff --git a/harbour/contrib/hbqt/qtgui/QDial.cpp b/harbour/contrib/hbqt/qtgui/QDial.cpp
index 9d7905f8f7..b63bee185d 100644
--- a/harbour/contrib/hbqt/qtgui/QDial.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDial.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QDial( void * pObj )
    p->func = hbqt_gcRelease_QDial;
    new( & p->pq ) QPointer< QDial >( ( QDial * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDial                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDIAL )
diff --git a/harbour/contrib/hbqt/qtgui/QDialog.cpp b/harbour/contrib/hbqt/qtgui/QDialog.cpp
index 5755ff9339..1222753935 100644
--- a/harbour/contrib/hbqt/qtgui/QDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDialog.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QDialog( void * pObj )
    p->func = hbqt_gcRelease_QDialog;
    new( & p->pq ) QPointer< QDialog >( ( QDialog * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDialog                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDIALOG )
diff --git a/harbour/contrib/hbqt/qtgui/QDirModel.cpp b/harbour/contrib/hbqt/qtgui/QDirModel.cpp
index bf5ee38160..74eccd8d8d 100644
--- a/harbour/contrib/hbqt/qtgui/QDirModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDirModel.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QDirModel( void * pObj )
    p->func = hbqt_gcRelease_QDirModel;
    new( & p->pq ) QPointer< QDirModel >( ( QDirModel * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDirModel                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDIRMODEL )
@@ -254,7 +254,7 @@ HB_FUNC( QT_QDIRMODEL_INDEX )
  */
 HB_FUNC( QT_QDIRMODEL_INDEX_1 )
 {
-   hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->index( QDirModel::tr( hb_parc( 2 ) ), hb_parni( 3 ) ) ) ) );
 }
 
 /*
@@ -294,7 +294,7 @@ HB_FUNC( QT_QDIRMODEL_MIMETYPES )
  */
 HB_FUNC( QT_QDIRMODEL_MKDIR )
 {
-   hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), QDirModel::tr( hb_parc( 3 ) ) ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp b/harbour/contrib/hbqt/qtgui/QDockWidget.cpp
index b5db99fdd5..b5f91231f6 100644
--- a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDockWidget.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QDockWidget( void * pObj )
    p->func = hbqt_gcRelease_QDockWidget;
    new( & p->pq ) QPointer< QDockWidget >( ( QDockWidget * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDockWidget                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDOCKWIDGET )
diff --git a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp
index bb27e32fe6..b6ba0f315c 100644
--- a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QDoubleSpinBox( void * pObj )
    p->func = hbqt_gcRelease_QDoubleSpinBox;
    new( & p->pq ) QPointer< QDoubleSpinBox >( ( QDoubleSpinBox * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QDoubleSpinBox              %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QDOUBLESPINBOX )
@@ -208,7 +208,7 @@ HB_FUNC( QT_QDOUBLESPINBOX_SETMINIMUM )
  */
 HB_FUNC( QT_QDOUBLESPINBOX_SETPREFIX )
 {
-   hbqt_par_QDoubleSpinBox( 1 )->setPrefix( hbqt_par_QString( 2 ) );
+   hbqt_par_QDoubleSpinBox( 1 )->setPrefix( QDoubleSpinBox::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -232,7 +232,7 @@ HB_FUNC( QT_QDOUBLESPINBOX_SETSINGLESTEP )
  */
 HB_FUNC( QT_QDOUBLESPINBOX_SETSUFFIX )
 {
-   hbqt_par_QDoubleSpinBox( 1 )->setSuffix( hbqt_par_QString( 2 ) );
+   hbqt_par_QDoubleSpinBox( 1 )->setSuffix( QDoubleSpinBox::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -272,7 +272,7 @@ HB_FUNC( QT_QDOUBLESPINBOX_VALUE )
  */
 HB_FUNC( QT_QDOUBLESPINBOX_VALUEFROMTEXT )
 {
-   hb_retnd( hbqt_par_QDoubleSpinBox( 1 )->valueFromText( hbqt_par_QString( 2 ) ) );
+   hb_retnd( hbqt_par_QDoubleSpinBox( 1 )->valueFromText( QDoubleSpinBox::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp b/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp
index fe58a9b606..e0ad31818a 100644
--- a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp
+++ b/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QErrorMessage( void * pObj )
    p->func = hbqt_gcRelease_QErrorMessage;
    new( & p->pq ) QPointer< QErrorMessage >( ( QErrorMessage * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QErrorMessage               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QERRORMESSAGE )
@@ -145,7 +145,7 @@ HB_FUNC( QT_QERRORMESSAGE )
  */
 HB_FUNC( QT_QERRORMESSAGE_SHOWMESSAGE )
 {
-   hbqt_par_QErrorMessage( 1 )->showMessage( hbqt_par_QString( 2 ) );
+   hbqt_par_QErrorMessage( 1 )->showMessage( QErrorMessage::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -153,7 +153,7 @@ HB_FUNC( QT_QERRORMESSAGE_SHOWMESSAGE )
  */
 HB_FUNC( QT_QERRORMESSAGE_SHOWMESSAGE_1 )
 {
-   hbqt_par_QErrorMessage( 1 )->showMessage( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QErrorMessage( 1 )->showMessage( QErrorMessage::tr( hb_parc( 2 ) ), QErrorMessage::tr( hb_parc( 3 ) ) );
 }
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp b/harbour/contrib/hbqt/qtgui/QFileDialog.cpp
index e5003323fc..c00d4d65bd 100644
--- a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFileDialog.cpp
@@ -156,7 +156,7 @@ void * hbqt_gcAllocate_QFileDialog( void * pObj )
    p->func = hbqt_gcRelease_QFileDialog;
    new( & p->pq ) QPointer< QFileDialog >( ( QFileDialog * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFileDialog                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFILEDIALOG )
@@ -327,7 +327,7 @@ HB_FUNC( QT_QFILEDIALOG_SAVESTATE )
  */
 HB_FUNC( QT_QFILEDIALOG_SELECTFILE )
 {
-   hbqt_par_QFileDialog( 1 )->selectFile( hbqt_par_QString( 2 ) );
+   hbqt_par_QFileDialog( 1 )->selectFile( QFileDialog::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -335,7 +335,7 @@ HB_FUNC( QT_QFILEDIALOG_SELECTFILE )
  */
 HB_FUNC( QT_QFILEDIALOG_SELECTNAMEFILTER )
 {
-   hbqt_par_QFileDialog( 1 )->selectNameFilter( hbqt_par_QString( 2 ) );
+   hbqt_par_QFileDialog( 1 )->selectNameFilter( QFileDialog::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -375,7 +375,7 @@ HB_FUNC( QT_QFILEDIALOG_SETCONFIRMOVERWRITE )
  */
 HB_FUNC( QT_QFILEDIALOG_SETDEFAULTSUFFIX )
 {
-   hbqt_par_QFileDialog( 1 )->setDefaultSuffix( hbqt_par_QString( 2 ) );
+   hbqt_par_QFileDialog( 1 )->setDefaultSuffix( QFileDialog::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -383,7 +383,7 @@ HB_FUNC( QT_QFILEDIALOG_SETDEFAULTSUFFIX )
  */
 HB_FUNC( QT_QFILEDIALOG_SETDIRECTORY )
 {
-   hbqt_par_QFileDialog( 1 )->setDirectory( hbqt_par_QString( 2 ) );
+   hbqt_par_QFileDialog( 1 )->setDirectory( QFileDialog::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -439,7 +439,7 @@ HB_FUNC( QT_QFILEDIALOG_SETITEMDELEGATE )
  */
 HB_FUNC( QT_QFILEDIALOG_SETLABELTEXT )
 {
-   hbqt_par_QFileDialog( 1 )->setLabelText( ( QFileDialog::DialogLabel ) hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QFileDialog( 1 )->setLabelText( ( QFileDialog::DialogLabel ) hb_parni( 2 ), QFileDialog::tr( hb_parc( 3 ) ) );
 }
 
 /*
@@ -447,7 +447,7 @@ HB_FUNC( QT_QFILEDIALOG_SETLABELTEXT )
  */
 HB_FUNC( QT_QFILEDIALOG_SETNAMEFILTER )
 {
-   hbqt_par_QFileDialog( 1 )->setNameFilter( hbqt_par_QString( 2 ) );
+   hbqt_par_QFileDialog( 1 )->setNameFilter( QFileDialog::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -535,7 +535,7 @@ HB_FUNC( QT_QFILEDIALOG_VIEWMODE )
  */
 HB_FUNC( QT_QFILEDIALOG_GETEXISTINGDIRECTORY )
 {
-   hb_retc( hbqt_par_QFileDialog( 1 )->getExistingDirectory( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ), hbqt_par_QString( 4 ), ( HB_ISNUM( 5 ) ? ( QFileDialog::Options ) hb_parni( 5 ) : ( QFileDialog::Options ) QFileDialog::ShowDirsOnly ) ).toAscii().data() );
+   hb_retc( hbqt_par_QFileDialog( 1 )->getExistingDirectory( hbqt_par_QWidget( 2 ), QFileDialog::tr( hb_parc( 3 ) ), QFileDialog::tr( hb_parc( 4 ) ), ( HB_ISNUM( 5 ) ? ( QFileDialog::Options ) hb_parni( 5 ) : ( QFileDialog::Options ) QFileDialog::ShowDirsOnly ) ).toAscii().data() );
 }
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp b/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp
index f9492a2e2a..1e0c23a51d 100644
--- a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp
@@ -105,7 +105,7 @@ void * hbqt_gcAllocate_QFileIconProvider( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QFileIconProvider;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFileIconProvider           %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFILEICONPROVIDER )
diff --git a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp b/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp
index bec216e691..53d93db377 100644
--- a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QFileSystemModel( void * pObj )
    p->func = hbqt_gcRelease_QFileSystemModel;
    new( & p->pq ) QPointer< QFileSystemModel >( ( QFileSystemModel * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFileSystemModel            %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFILESYSTEMMODEL )
@@ -197,7 +197,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_FILTER )
  */
 HB_FUNC( QT_QFILESYSTEMMODEL_INDEX )
 {
-   hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->index( QFileSystemModel::tr( hb_parc( 2 ) ), hb_parni( 3 ) ) ) ) );
 }
 
 /*
@@ -237,7 +237,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_MIMETYPES )
  */
 HB_FUNC( QT_QFILESYSTEMMODEL_MKDIR )
 {
-   hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), QFileSystemModel::tr( hb_parc( 3 ) ) ) ) ) );
 }
 
 /*
@@ -357,7 +357,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_SETRESOLVESYMLINKS )
  */
 HB_FUNC( QT_QFILESYSTEMMODEL_SETROOTPATH )
 {
-   hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->setRootPath( hbqt_par_QString( 2 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->setRootPath( QFileSystemModel::tr( hb_parc( 2 ) ) ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp b/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp
index 1c501d73c2..a4a960b6cf 100644
--- a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QFocusFrame( void * pObj )
    p->func = hbqt_gcRelease_QFocusFrame;
    new( & p->pq ) QPointer< QFocusFrame >( ( QFocusFrame * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFocusFrame                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFOCUSFRAME )
diff --git a/harbour/contrib/hbqt/qtgui/QFont.cpp b/harbour/contrib/hbqt/qtgui/QFont.cpp
index c8efcce604..826d8e03fb 100644
--- a/harbour/contrib/hbqt/qtgui/QFont.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFont.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QFont( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QFont;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFont                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFONT )
diff --git a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp b/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp
index c9577a8bd0..b067d80459 100644
--- a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QFontComboBox( void * pObj )
    p->func = hbqt_gcRelease_QFontComboBox;
    new( & p->pq ) QPointer< QFontComboBox >( ( QFontComboBox * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFontComboBox               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFONTCOMBOBOX )
diff --git a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
index b4ed950a2c..683dc945c0 100644
--- a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
@@ -119,7 +119,7 @@ void * hbqt_gcAllocate_QFontDatabase( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QFontDatabase;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFontDatabase               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFONTDATABASE )
diff --git a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp b/harbour/contrib/hbqt/qtgui/QFontDialog.cpp
index 08e79c84e6..483d68f289 100644
--- a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontDialog.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QFontDialog( void * pObj )
    p->func = hbqt_gcRelease_QFontDialog;
    new( & p->pq ) QPointer< QFontDialog >( ( QFontDialog * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFontDialog                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFONTDIALOG )
@@ -219,7 +219,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT )
 {
    bool iOk = 0;
 
-   hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_QString( 5 ), ( QFontDialog::FontDialogOptions ) hb_parni( 6 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), QFontDialog::tr( hb_parc( 5 ) ), ( QFontDialog::FontDialogOptions ) hb_parni( 6 ) ) ) ) );
 
    hb_stornl( iOk, 2 );
 }
@@ -243,7 +243,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT_2 )
 {
    bool iOk = 0;
 
-   hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_QString( 5 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), QFontDialog::tr( hb_parc( 5 ) ) ) ) ) );
 
    hb_stornl( iOk, 2 );
 }
diff --git a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp b/harbour/contrib/hbqt/qtgui/QFontInfo.cpp
index 4e84cfd36c..69ba4e2950 100644
--- a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontInfo.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QFontInfo( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QFontInfo;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFontInfo                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFONTINFO )
diff --git a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp b/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp
index c48f982f5c..d86c3fda1f 100644
--- a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp
@@ -104,7 +104,7 @@ void * hbqt_gcAllocate_QFontMetrics( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QFontMetrics;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFontMetrics                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFONTMETRICS )
diff --git a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp b/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp
index f572fa0d36..c349472530 100644
--- a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp
@@ -105,7 +105,7 @@ void * hbqt_gcAllocate_QFontMetricsF( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QFontMetricsF;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFontMetricsF               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFONTMETRICSF )
diff --git a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp b/harbour/contrib/hbqt/qtgui/QFormLayout.cpp
index caaff1d870..0b4c48c99e 100644
--- a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFormLayout.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QFormLayout( void * pObj )
    p->func = hbqt_gcRelease_QFormLayout;
    new( & p->pq ) QPointer< QFormLayout >( ( QFormLayout * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFormLayout                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFORMLAYOUT )
@@ -175,7 +175,7 @@ HB_FUNC( QT_QFORMLAYOUT_ADDROW_2 )
  */
 HB_FUNC( QT_QFORMLAYOUT_ADDROW_3 )
 {
-   hbqt_par_QFormLayout( 1 )->addRow( hbqt_par_QString( 2 ), hbqt_par_QWidget( 3 ) );
+   hbqt_par_QFormLayout( 1 )->addRow( QFormLayout::tr( hb_parc( 2 ) ), hbqt_par_QWidget( 3 ) );
 }
 
 /*
@@ -183,7 +183,7 @@ HB_FUNC( QT_QFORMLAYOUT_ADDROW_3 )
  */
 HB_FUNC( QT_QFORMLAYOUT_ADDROW_4 )
 {
-   hbqt_par_QFormLayout( 1 )->addRow( hbqt_par_QString( 2 ), hbqt_par_QLayout( 3 ) );
+   hbqt_par_QFormLayout( 1 )->addRow( QFormLayout::tr( hb_parc( 2 ) ), hbqt_par_QLayout( 3 ) );
 }
 
 /*
@@ -289,7 +289,7 @@ HB_FUNC( QT_QFORMLAYOUT_INSERTROW_2 )
  */
 HB_FUNC( QT_QFORMLAYOUT_INSERTROW_3 )
 {
-   hbqt_par_QFormLayout( 1 )->insertRow( hb_parni( 2 ), hbqt_par_QString( 3 ), hbqt_par_QWidget( 4 ) );
+   hbqt_par_QFormLayout( 1 )->insertRow( hb_parni( 2 ), QFormLayout::tr( hb_parc( 3 ) ), hbqt_par_QWidget( 4 ) );
 }
 
 /*
@@ -297,7 +297,7 @@ HB_FUNC( QT_QFORMLAYOUT_INSERTROW_3 )
  */
 HB_FUNC( QT_QFORMLAYOUT_INSERTROW_4 )
 {
-   hbqt_par_QFormLayout( 1 )->insertRow( hb_parni( 2 ), hbqt_par_QString( 3 ), hbqt_par_QLayout( 4 ) );
+   hbqt_par_QFormLayout( 1 )->insertRow( hb_parni( 2 ), QFormLayout::tr( hb_parc( 3 ) ), hbqt_par_QLayout( 4 ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QFrame.cpp b/harbour/contrib/hbqt/qtgui/QFrame.cpp
index 33602c8c98..d806476a70 100644
--- a/harbour/contrib/hbqt/qtgui/QFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/QFrame.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QFrame( void * pObj )
    p->func = hbqt_gcRelease_QFrame;
    new( & p->pq ) QPointer< QFrame >( ( QFrame * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFrame                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFRAME )
diff --git a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp b/harbour/contrib/hbqt/qtgui/QGridLayout.cpp
index 10e1d92886..a36796feb4 100644
--- a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QGridLayout.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QGridLayout( void * pObj )
    p->func = hbqt_gcRelease_QGridLayout;
    new( & p->pq ) QPointer< QGridLayout >( ( QGridLayout * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QGridLayout                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QGRIDLAYOUT )
diff --git a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp b/harbour/contrib/hbqt/qtgui/QGroupBox.cpp
index 7ed25b3562..c90571e8e9 100644
--- a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QGroupBox.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QGroupBox( void * pObj )
    p->func = hbqt_gcRelease_QGroupBox;
    new( & p->pq ) QPointer< QGroupBox >( ( QGroupBox * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QGroupBox                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QGROUPBOX )
@@ -202,7 +202,7 @@ HB_FUNC( QT_QGROUPBOX_SETFLAT )
  */
 HB_FUNC( QT_QGROUPBOX_SETTITLE )
 {
-   hbqt_par_QGroupBox( 1 )->setTitle( hbqt_par_QString( 2 ) );
+   hbqt_par_QGroupBox( 1 )->setTitle( QGroupBox::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp
index b2748d1851..d90a4416d9 100644
--- a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QHBoxLayout( void * pObj )
    p->func = hbqt_gcRelease_QHBoxLayout;
    new( & p->pq ) QPointer< QHBoxLayout >( ( QHBoxLayout * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QHBoxLayout                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QHBOXLAYOUT )
diff --git a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp b/harbour/contrib/hbqt/qtgui/QHeaderView.cpp
index bf947a2275..3312e44879 100644
--- a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp
+++ b/harbour/contrib/hbqt/qtgui/QHeaderView.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QHeaderView( void * pObj )
    p->func = hbqt_gcRelease_QHeaderView;
    new( & p->pq ) QPointer< QHeaderView >( ( QHeaderView * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QHeaderView                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QHEADERVIEW )
diff --git a/harbour/contrib/hbqt/qtgui/QIcon.cpp b/harbour/contrib/hbqt/qtgui/QIcon.cpp
index a3386428ce..226689c7f5 100644
--- a/harbour/contrib/hbqt/qtgui/QIcon.cpp
+++ b/harbour/contrib/hbqt/qtgui/QIcon.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QIcon( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QIcon;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QIcon                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QICON )
diff --git a/harbour/contrib/hbqt/qtgui/QImage.cpp b/harbour/contrib/hbqt/qtgui/QImage.cpp
index 2a016b69c0..e553430a09 100644
--- a/harbour/contrib/hbqt/qtgui/QImage.cpp
+++ b/harbour/contrib/hbqt/qtgui/QImage.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QImage( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QImage;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QImage                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QIMAGE )
diff --git a/harbour/contrib/hbqt/qtgui/QImageReader.cpp b/harbour/contrib/hbqt/qtgui/QImageReader.cpp
index 5f2e38afb4..41c3976182 100644
--- a/harbour/contrib/hbqt/qtgui/QImageReader.cpp
+++ b/harbour/contrib/hbqt/qtgui/QImageReader.cpp
@@ -118,7 +118,7 @@ void * hbqt_gcAllocate_QImageReader( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QImageReader;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QImageReader                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QIMAGEREADER )
diff --git a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp b/harbour/contrib/hbqt/qtgui/QImageWriter.cpp
index 998d3c22a0..2e628445f6 100644
--- a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QImageWriter.cpp
@@ -117,7 +117,7 @@ void * hbqt_gcAllocate_QImageWriter( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QImageWriter;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QImageWriter                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QIMAGEWRITER )
diff --git a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp b/harbour/contrib/hbqt/qtgui/QInputDialog.cpp
index 2f4d14eaec..a5cc8d5611 100644
--- a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QInputDialog.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QInputDialog( void * pObj )
    p->func = hbqt_gcRelease_QInputDialog;
    new( & p->pq ) QPointer< QInputDialog >( ( QInputDialog * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QInputDialog                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QINPUTDIALOG )
@@ -287,7 +287,7 @@ HB_FUNC( QT_QINPUTDIALOG_OPTIONS )
  */
 HB_FUNC( QT_QINPUTDIALOG_SETCANCELBUTTONTEXT )
 {
-   hbqt_par_QInputDialog( 1 )->setCancelButtonText( hbqt_par_QString( 2 ) );
+   hbqt_par_QInputDialog( 1 )->setCancelButtonText( QInputDialog::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -399,7 +399,7 @@ HB_FUNC( QT_QINPUTDIALOG_SETINTVALUE )
  */
 HB_FUNC( QT_QINPUTDIALOG_SETLABELTEXT )
 {
-   hbqt_par_QInputDialog( 1 )->setLabelText( hbqt_par_QString( 2 ) );
+   hbqt_par_QInputDialog( 1 )->setLabelText( QInputDialog::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -407,7 +407,7 @@ HB_FUNC( QT_QINPUTDIALOG_SETLABELTEXT )
  */
 HB_FUNC( QT_QINPUTDIALOG_SETOKBUTTONTEXT )
 {
-   hbqt_par_QInputDialog( 1 )->setOkButtonText( hbqt_par_QString( 2 ) );
+   hbqt_par_QInputDialog( 1 )->setOkButtonText( QInputDialog::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -439,7 +439,7 @@ HB_FUNC( QT_QINPUTDIALOG_SETTEXTECHOMODE )
  */
 HB_FUNC( QT_QINPUTDIALOG_SETTEXTVALUE )
 {
-   hbqt_par_QInputDialog( 1 )->setTextValue( hbqt_par_QString( 2 ) );
+   hbqt_par_QInputDialog( 1 )->setTextValue( QInputDialog::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -473,7 +473,7 @@ HB_FUNC( QT_QINPUTDIALOG_GETDOUBLE )
 {
    bool iOk = 0;
 
-   hb_retnd( hbqt_par_QInputDialog( 1 )->getDouble( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ), hbqt_par_QString( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ), ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : 1 ), &iOk, ( Qt::WindowFlags ) hb_parni( 10 ) ) );
+   hb_retnd( hbqt_par_QInputDialog( 1 )->getDouble( hbqt_par_QWidget( 2 ), QInputDialog::tr( hb_parc( 3 ) ), QInputDialog::tr( hb_parc( 4 ) ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ), ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : 1 ), &iOk, ( Qt::WindowFlags ) hb_parni( 10 ) ) );
 
    hb_stornl( iOk, 9 );
 }
@@ -485,7 +485,7 @@ HB_FUNC( QT_QINPUTDIALOG_GETINT )
 {
    bool iOk = 0;
 
-   hb_retni( hbqt_par_QInputDialog( 1 )->getInt( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ), hbqt_par_QString( 4 ), hb_parni( 5 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : -2147483647 ), ( HB_ISNUM( 7 ) ? hb_parni( 7 ) : 2147483647 ), ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : 1 ), &iOk, ( Qt::WindowFlags ) hb_parni( 10 ) ) );
+   hb_retni( hbqt_par_QInputDialog( 1 )->getInt( hbqt_par_QWidget( 2 ), QInputDialog::tr( hb_parc( 3 ) ), QInputDialog::tr( hb_parc( 4 ) ), hb_parni( 5 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : -2147483647 ), ( HB_ISNUM( 7 ) ? hb_parni( 7 ) : 2147483647 ), ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : 1 ), &iOk, ( Qt::WindowFlags ) hb_parni( 10 ) ) );
 
    hb_stornl( iOk, 9 );
 }
@@ -497,7 +497,7 @@ HB_FUNC( QT_QINPUTDIALOG_GETITEM )
 {
    bool iOk = 0;
 
-   hb_retc( hbqt_par_QInputDialog( 1 )->getItem( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ), hbqt_par_QString( 4 ), *hbqt_par_QStringList( 5 ), hb_parni( 6 ), hb_parl( 7 ), &iOk, ( Qt::WindowFlags ) hb_parni( 9 ) ).toAscii().data() );
+   hb_retc( hbqt_par_QInputDialog( 1 )->getItem( hbqt_par_QWidget( 2 ), QInputDialog::tr( hb_parc( 3 ) ), QInputDialog::tr( hb_parc( 4 ) ), *hbqt_par_QStringList( 5 ), hb_parni( 6 ), hb_parl( 7 ), &iOk, ( Qt::WindowFlags ) hb_parni( 9 ) ).toAscii().data() );
 
    hb_stornl( iOk, 8 );
 }
@@ -509,7 +509,7 @@ HB_FUNC( QT_QINPUTDIALOG_GETTEXT )
 {
    bool iOk = 0;
 
-   hb_retc( hbqt_par_QInputDialog( 1 )->getText( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ), hbqt_par_QString( 4 ), ( HB_ISNUM( 5 ) ? ( QLineEdit::EchoMode ) hb_parni( 5 ) : ( QLineEdit::EchoMode ) QLineEdit::Normal ), hbqt_par_QString( 6 ), &iOk, ( Qt::WindowFlags ) hb_parni( 8 ) ).toAscii().data() );
+   hb_retc( hbqt_par_QInputDialog( 1 )->getText( hbqt_par_QWidget( 2 ), QInputDialog::tr( hb_parc( 3 ) ), QInputDialog::tr( hb_parc( 4 ) ), ( HB_ISNUM( 5 ) ? ( QLineEdit::EchoMode ) hb_parni( 5 ) : ( QLineEdit::EchoMode ) QLineEdit::Normal ), QInputDialog::tr( hb_parc( 6 ) ), &iOk, ( Qt::WindowFlags ) hb_parni( 8 ) ).toAscii().data() );
 
    hb_stornl( iOk, 7 );
 }
diff --git a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp b/harbour/contrib/hbqt/qtgui/QInputEvent.cpp
index fefc61bc4a..40be579426 100644
--- a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QInputEvent.cpp
@@ -102,7 +102,7 @@ void * hbqt_gcAllocate_QInputEvent( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QInputEvent;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QInputEvent                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QINPUTEVENT )
diff --git a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp b/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp
index 61a7aa2b48..209a4f8968 100644
--- a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp
@@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QInputMethodEvent( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QInputMethodEvent;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QInputMethodEvent           %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QINPUTMETHODEVENT )
diff --git a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp b/harbour/contrib/hbqt/qtgui/QItemSelection.cpp
index 3894ce74c4..302bbce5a2 100644
--- a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp
+++ b/harbour/contrib/hbqt/qtgui/QItemSelection.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QItemSelection( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QItemSelection;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QItemSelection              %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QITEMSELECTION )
diff --git a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp b/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp
index bdff39964b..525eab9f87 100644
--- a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QItemSelectionModel( void * pObj )
    p->func = hbqt_gcRelease_QItemSelectionModel;
    new( & p->pq ) QPointer< QItemSelectionModel >( ( QItemSelectionModel * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QItemSelectionModel         %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QITEMSELECTIONMODEL )
diff --git a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp b/harbour/contrib/hbqt/qtgui/QKeySequence.cpp
index 05d17584d2..248ee08633 100644
--- a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp
+++ b/harbour/contrib/hbqt/qtgui/QKeySequence.cpp
@@ -121,7 +121,7 @@ void * hbqt_gcAllocate_QKeySequence( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QKeySequence;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QKeySequence                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QKEYSEQUENCE )
diff --git a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp b/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp
index fb3f0862d2..7ddcf92e57 100644
--- a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp
+++ b/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QLCDNumber( void * pObj )
    p->func = hbqt_gcRelease_QLCDNumber;
    new( & p->pq ) QPointer< QLCDNumber >( ( QLCDNumber * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QLCDNumber                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLCDNUMBER )
@@ -239,7 +239,7 @@ HB_FUNC( QT_QLCDNUMBER_VALUE )
  */
 HB_FUNC( QT_QLCDNUMBER_DISPLAY )
 {
-   hbqt_par_QLCDNumber( 1 )->display( hbqt_par_QString( 2 ) );
+   hbqt_par_QLCDNumber( 1 )->display( QLCDNumber::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QLabel.cpp b/harbour/contrib/hbqt/qtgui/QLabel.cpp
index 4d91f78afd..7b4feaa9c4 100644
--- a/harbour/contrib/hbqt/qtgui/QLabel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QLabel.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QLabel( void * pObj )
    p->func = hbqt_gcRelease_QLabel;
    new( & p->pq ) QPointer< QLabel >( ( QLabel * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QLabel                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLABEL )
@@ -370,7 +370,7 @@ HB_FUNC( QT_QLABEL_SETPIXMAP )
  */
 HB_FUNC( QT_QLABEL_SETTEXT )
 {
-   hbqt_par_QLabel( 1 )->setText( hbqt_par_QString( 2 ) );
+   hbqt_par_QLabel( 1 )->setText( QLabel::tr( hb_parc( 2 ) ) );
 }
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp b/harbour/contrib/hbqt/qtgui/QLineEdit.cpp
index 5f5433d057..fcb3fb2edb 100644
--- a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QLineEdit.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QLineEdit( void * pObj )
    p->func = hbqt_gcRelease_QLineEdit;
    new( & p->pq ) QPointer< QLineEdit >( ( QLineEdit * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QLineEdit                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLINEEDIT )
@@ -336,7 +336,7 @@ HB_FUNC( QT_QLINEEDIT_INPUTMASK )
  */
 HB_FUNC( QT_QLINEEDIT_INSERT )
 {
-   hbqt_par_QLineEdit( 1 )->insert( hbqt_par_QString( 2 ) );
+   hbqt_par_QLineEdit( 1 )->insert( QLineEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -456,7 +456,7 @@ HB_FUNC( QT_QLINEEDIT_SETFRAME )
  */
 HB_FUNC( QT_QLINEEDIT_SETINPUTMASK )
 {
-   hbqt_par_QLineEdit( 1 )->setInputMask( hbqt_par_QString( 2 ) );
+   hbqt_par_QLineEdit( 1 )->setInputMask( QLineEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -584,7 +584,7 @@ HB_FUNC( QT_QLINEEDIT_SELECTALL )
  */
 HB_FUNC( QT_QLINEEDIT_SETTEXT )
 {
-   hbqt_par_QLineEdit( 1 )->setText( hbqt_par_QString( 2 ) );
+   hbqt_par_QLineEdit( 1 )->setText( QLineEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp b/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp
index 45ca7b5ca8..f62741287f 100644
--- a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp
@@ -109,7 +109,7 @@ void * hbqt_gcAllocate_QLinearGradient( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QLinearGradient;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QLinearGradient             %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLINEARGRADIENT )
diff --git a/harbour/contrib/hbqt/qtgui/QListView.cpp b/harbour/contrib/hbqt/qtgui/QListView.cpp
index 392dc91e5e..24e233c45d 100644
--- a/harbour/contrib/hbqt/qtgui/QListView.cpp
+++ b/harbour/contrib/hbqt/qtgui/QListView.cpp
@@ -137,7 +137,7 @@ void * hbqt_gcAllocate_QListView( void * pObj )
    p->func = hbqt_gcRelease_QListView;
    new( & p->pq ) QPointer< QListView >( ( QListView * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QListView                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLISTVIEW )
diff --git a/harbour/contrib/hbqt/qtgui/QListWidget.cpp b/harbour/contrib/hbqt/qtgui/QListWidget.cpp
index 9498fbe497..3a3337ce28 100644
--- a/harbour/contrib/hbqt/qtgui/QListWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QListWidget.cpp
@@ -139,7 +139,7 @@ void * hbqt_gcAllocate_QListWidget( void * pObj )
    p->func = hbqt_gcRelease_QListWidget;
    new( & p->pq ) QPointer< QListWidget >( ( QListWidget * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QListWidget                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLISTWIDGET )
@@ -155,7 +155,7 @@ HB_FUNC( QT_QLISTWIDGET )
  */
 HB_FUNC( QT_QLISTWIDGET_ADDITEM )
 {
-   hbqt_par_QListWidget( 1 )->addItem( hbqt_par_QString( 2 ) );
+   hbqt_par_QListWidget( 1 )->addItem( QListWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -227,7 +227,7 @@ HB_FUNC( QT_QLISTWIDGET_INSERTITEM )
  */
 HB_FUNC( QT_QLISTWIDGET_INSERTITEM_1 )
 {
-   hbqt_par_QListWidget( 1 )->insertItem( hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QListWidget( 1 )->insertItem( hb_parni( 2 ), QListWidget::tr( hb_parc( 3 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp
index 2dcc2a9d90..96ba9bf789 100644
--- a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp
@@ -109,7 +109,7 @@ void * hbqt_gcAllocate_QListWidgetItem( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QListWidgetItem;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QListWidgetItem             %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QLISTWIDGETITEM )
diff --git a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp b/harbour/contrib/hbqt/qtgui/QMainWindow.cpp
index da916c7b9e..b02ff88fcc 100644
--- a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMainWindow.cpp
@@ -206,7 +206,7 @@ HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR_1 )
  */
 HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR_2 )
 {
-   hb_retptr( ( QToolBar* ) hbqt_par_QMainWindow( 1 )->addToolBar( hbqt_par_QString( 2 ) ) );
+   hb_retptr( ( QToolBar* ) hbqt_par_QMainWindow( 1 )->addToolBar( QMainWindow::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QMatrix.cpp b/harbour/contrib/hbqt/qtgui/QMatrix.cpp
index 2d50ab55ad..3fb8c1c515 100644
--- a/harbour/contrib/hbqt/qtgui/QMatrix.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMatrix.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QMatrix( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QMatrix;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QMatrix                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QMATRIX )
diff --git a/harbour/contrib/hbqt/qtgui/QMenu.cpp b/harbour/contrib/hbqt/qtgui/QMenu.cpp
index 2476f70151..8508361bc4 100644
--- a/harbour/contrib/hbqt/qtgui/QMenu.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMenu.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QMenu( void * pObj )
    p->func = hbqt_gcRelease_QMenu;
    new( & p->pq ) QPointer< QMenu >( ( QMenu * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QMenu                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QMENU )
@@ -177,7 +177,7 @@ HB_FUNC( QT_QMENU_ACTIVEACTION )
  */
 HB_FUNC( QT_QMENU_ADDACTION )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( hbqt_par_QString( 2 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( QMenu::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -185,7 +185,7 @@ HB_FUNC( QT_QMENU_ADDACTION )
  */
 HB_FUNC( QT_QMENU_ADDACTION_1 )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), QMenu::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -193,7 +193,7 @@ HB_FUNC( QT_QMENU_ADDACTION_1 )
  */
 HB_FUNC( QT_QMENU_ADDACTION_2 )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ), *hbqt_par_QKeySequence( 5 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( QMenu::tr( hb_parc( 2 ) ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ), *hbqt_par_QKeySequence( 5 ) ) );
 }
 
 /*
@@ -201,7 +201,7 @@ HB_FUNC( QT_QMENU_ADDACTION_2 )
  */
 HB_FUNC( QT_QMENU_ADDACTION_3 )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), QMenu::tr( hb_parc( 3 ) ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ) );
 }
 
 /*
@@ -225,7 +225,7 @@ HB_FUNC( QT_QMENU_ADDMENU )
  */
 HB_FUNC( QT_QMENU_ADDMENU_1 )
 {
-   hb_retptr( ( QMenu* ) hbqt_par_QMenu( 1 )->addMenu( hbqt_par_QString( 2 ) ) );
+   hb_retptr( ( QMenu* ) hbqt_par_QMenu( 1 )->addMenu( QMenu::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -233,7 +233,7 @@ HB_FUNC( QT_QMENU_ADDMENU_1 )
  */
 HB_FUNC( QT_QMENU_ADDMENU_2 )
 {
-   hb_retptr( ( QMenu* ) hbqt_par_QMenu( 1 )->addMenu( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
+   hb_retptr( ( QMenu* ) hbqt_par_QMenu( 1 )->addMenu( QIcon( hbqt_par_QString( 2 ) ), QMenu::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -401,7 +401,7 @@ HB_FUNC( QT_QMENU_SETTEAROFFENABLED )
  */
 HB_FUNC( QT_QMENU_SETTITLE )
 {
-   hbqt_par_QMenu( 1 )->setTitle( hbqt_par_QString( 2 ) );
+   hbqt_par_QMenu( 1 )->setTitle( QMenu::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp
index e8d31e76da..da1a7326c9 100644
--- a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QMenuBar( void * pObj )
    p->func = hbqt_gcRelease_QMenuBar;
    new( & p->pq ) QPointer< QMenuBar >( ( QMenuBar * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QMenuBar                    %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QMENUBAR )
@@ -153,7 +153,7 @@ HB_FUNC( QT_QMENUBAR_ACTIVEACTION )
  */
 HB_FUNC( QT_QMENUBAR_ADDACTION )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->addAction( hbqt_par_QString( 2 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->addAction( QMenuBar::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -161,7 +161,7 @@ HB_FUNC( QT_QMENUBAR_ADDACTION )
  */
 HB_FUNC( QT_QMENUBAR_ADDACTION_1 )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->addAction( hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->addAction( QMenuBar::tr( hb_parc( 2 ) ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ) ) );
 }
 
 /*
@@ -185,7 +185,7 @@ HB_FUNC( QT_QMENUBAR_ADDMENU )
  */
 HB_FUNC( QT_QMENUBAR_ADDMENU_1 )
 {
-   hb_retptr( ( QMenu* ) hbqt_par_QMenuBar( 1 )->addMenu( hbqt_par_QString( 2 ) ) );
+   hb_retptr( ( QMenu* ) hbqt_par_QMenuBar( 1 )->addMenu( QMenuBar::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -193,7 +193,7 @@ HB_FUNC( QT_QMENUBAR_ADDMENU_1 )
  */
 HB_FUNC( QT_QMENUBAR_ADDMENU_2 )
 {
-   hb_retptr( ( QMenu* ) hbqt_par_QMenuBar( 1 )->addMenu( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
+   hb_retptr( ( QMenu* ) hbqt_par_QMenuBar( 1 )->addMenu( QIcon( hbqt_par_QString( 2 ) ), QMenuBar::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp b/harbour/contrib/hbqt/qtgui/QMessageBox.cpp
index a25fe85c8e..ea5e706053 100644
--- a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMessageBox.cpp
@@ -146,7 +146,7 @@ void * hbqt_gcAllocate_QMessageBox( void * pObj )
    p->func = hbqt_gcRelease_QMessageBox;
    new( & p->pq ) QPointer< QMessageBox >( ( QMessageBox * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QMessageBox                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QMESSAGEBOX )
@@ -170,7 +170,7 @@ HB_FUNC( QT_QMESSAGEBOX_ADDBUTTON )
  */
 HB_FUNC( QT_QMESSAGEBOX_ADDBUTTON_1 )
 {
-   hb_retptr( ( QPushButton* ) hbqt_par_QMessageBox( 1 )->addButton( hbqt_par_QString( 2 ), ( QMessageBox::ButtonRole ) hb_parni( 3 ) ) );
+   hb_retptr( ( QPushButton* ) hbqt_par_QMessageBox( 1 )->addButton( QMessageBox::tr( hb_parc( 2 ) ), ( QMessageBox::ButtonRole ) hb_parni( 3 ) ) );
 }
 
 /*
@@ -290,7 +290,7 @@ HB_FUNC( QT_QMESSAGEBOX_SETDEFAULTBUTTON_1 )
  */
 HB_FUNC( QT_QMESSAGEBOX_SETDETAILEDTEXT )
 {
-   hbqt_par_QMessageBox( 1 )->setDetailedText( hbqt_par_QString( 2 ) );
+   hbqt_par_QMessageBox( 1 )->setDetailedText( QMessageBox::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -330,7 +330,7 @@ HB_FUNC( QT_QMESSAGEBOX_SETICONPIXMAP )
  */
 HB_FUNC( QT_QMESSAGEBOX_SETINFORMATIVETEXT )
 {
-   hbqt_par_QMessageBox( 1 )->setInformativeText( hbqt_par_QString( 2 ) );
+   hbqt_par_QMessageBox( 1 )->setInformativeText( QMessageBox::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -346,7 +346,7 @@ HB_FUNC( QT_QMESSAGEBOX_SETSTANDARDBUTTONS )
  */
 HB_FUNC( QT_QMESSAGEBOX_SETTEXT )
 {
-   hbqt_par_QMessageBox( 1 )->setText( hbqt_par_QString( 2 ) );
+   hbqt_par_QMessageBox( 1 )->setText( QMessageBox::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -370,7 +370,7 @@ HB_FUNC( QT_QMESSAGEBOX_SETWINDOWMODALITY )
  */
 HB_FUNC( QT_QMESSAGEBOX_SETWINDOWTITLE )
 {
-   hbqt_par_QMessageBox( 1 )->setWindowTitle( hbqt_par_QString( 2 ) );
+   hbqt_par_QMessageBox( 1 )->setWindowTitle( QMessageBox::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -410,7 +410,7 @@ HB_FUNC( QT_QMESSAGEBOX_TEXTFORMAT )
  */
 HB_FUNC( QT_QMESSAGEBOX_ABOUT )
 {
-   hbqt_par_QMessageBox( 1 )->about( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ), hbqt_par_QString( 4 ) );
+   hbqt_par_QMessageBox( 1 )->about( hbqt_par_QWidget( 2 ), QMessageBox::tr( hb_parc( 3 ) ), QMessageBox::tr( hb_parc( 4 ) ) );
 }
 
 /*
@@ -418,7 +418,7 @@ HB_FUNC( QT_QMESSAGEBOX_ABOUT )
  */
 HB_FUNC( QT_QMESSAGEBOX_ABOUTQT )
 {
-   hbqt_par_QMessageBox( 1 )->aboutQt( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QMessageBox( 1 )->aboutQt( hbqt_par_QWidget( 2 ), QMessageBox::tr( hb_parc( 3 ) ) );
 }
 
 /*
@@ -426,7 +426,7 @@ HB_FUNC( QT_QMESSAGEBOX_ABOUTQT )
  */
 HB_FUNC( QT_QMESSAGEBOX_CRITICAL )
 {
-   hb_retni( ( QMessageBox::StandardButton ) hbqt_par_QMessageBox( 1 )->critical( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ), hbqt_par_QString( 4 ), ( HB_ISNUM( 5 ) ? ( QMessageBox::StandardButtons ) hb_parni( 5 ) : ( QMessageBox::StandardButtons ) QMessageBox::Ok ), ( HB_ISNUM( 6 ) ? ( QMessageBox::StandardButton ) hb_parni( 6 ) : ( QMessageBox::StandardButton ) QMessageBox::NoButton ) ) );
+   hb_retni( ( QMessageBox::StandardButton ) hbqt_par_QMessageBox( 1 )->critical( hbqt_par_QWidget( 2 ), QMessageBox::tr( hb_parc( 3 ) ), QMessageBox::tr( hb_parc( 4 ) ), ( HB_ISNUM( 5 ) ? ( QMessageBox::StandardButtons ) hb_parni( 5 ) : ( QMessageBox::StandardButtons ) QMessageBox::Ok ), ( HB_ISNUM( 6 ) ? ( QMessageBox::StandardButton ) hb_parni( 6 ) : ( QMessageBox::StandardButton ) QMessageBox::NoButton ) ) );
 }
 
 /*
@@ -434,7 +434,7 @@ HB_FUNC( QT_QMESSAGEBOX_CRITICAL )
  */
 HB_FUNC( QT_QMESSAGEBOX_INFORMATION )
 {
-   hb_retni( ( QMessageBox::StandardButton ) hbqt_par_QMessageBox( 1 )->information( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ), hbqt_par_QString( 4 ), ( HB_ISNUM( 5 ) ? ( QMessageBox::StandardButtons ) hb_parni( 5 ) : ( QMessageBox::StandardButtons ) QMessageBox::Ok ), ( HB_ISNUM( 6 ) ? ( QMessageBox::StandardButton ) hb_parni( 6 ) : ( QMessageBox::StandardButton ) QMessageBox::NoButton ) ) );
+   hb_retni( ( QMessageBox::StandardButton ) hbqt_par_QMessageBox( 1 )->information( hbqt_par_QWidget( 2 ), QMessageBox::tr( hb_parc( 3 ) ), QMessageBox::tr( hb_parc( 4 ) ), ( HB_ISNUM( 5 ) ? ( QMessageBox::StandardButtons ) hb_parni( 5 ) : ( QMessageBox::StandardButtons ) QMessageBox::Ok ), ( HB_ISNUM( 6 ) ? ( QMessageBox::StandardButton ) hb_parni( 6 ) : ( QMessageBox::StandardButton ) QMessageBox::NoButton ) ) );
 }
 
 /*
@@ -442,7 +442,7 @@ HB_FUNC( QT_QMESSAGEBOX_INFORMATION )
  */
 HB_FUNC( QT_QMESSAGEBOX_QUESTION )
 {
-   hb_retni( ( QMessageBox::StandardButton ) hbqt_par_QMessageBox( 1 )->question( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ), hbqt_par_QString( 4 ), ( HB_ISNUM( 5 ) ? ( QMessageBox::StandardButtons ) hb_parni( 5 ) : ( QMessageBox::StandardButtons ) QMessageBox::Ok ), ( HB_ISNUM( 6 ) ? ( QMessageBox::StandardButton ) hb_parni( 6 ) : ( QMessageBox::StandardButton ) QMessageBox::NoButton ) ) );
+   hb_retni( ( QMessageBox::StandardButton ) hbqt_par_QMessageBox( 1 )->question( hbqt_par_QWidget( 2 ), QMessageBox::tr( hb_parc( 3 ) ), QMessageBox::tr( hb_parc( 4 ) ), ( HB_ISNUM( 5 ) ? ( QMessageBox::StandardButtons ) hb_parni( 5 ) : ( QMessageBox::StandardButtons ) QMessageBox::Ok ), ( HB_ISNUM( 6 ) ? ( QMessageBox::StandardButton ) hb_parni( 6 ) : ( QMessageBox::StandardButton ) QMessageBox::NoButton ) ) );
 }
 
 /*
@@ -450,7 +450,7 @@ HB_FUNC( QT_QMESSAGEBOX_QUESTION )
  */
 HB_FUNC( QT_QMESSAGEBOX_WARNING )
 {
-   hb_retni( ( QMessageBox::StandardButton ) hbqt_par_QMessageBox( 1 )->warning( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ), hbqt_par_QString( 4 ), ( HB_ISNUM( 5 ) ? ( QMessageBox::StandardButtons ) hb_parni( 5 ) : ( QMessageBox::StandardButtons ) QMessageBox::Ok ), ( HB_ISNUM( 6 ) ? ( QMessageBox::StandardButton ) hb_parni( 6 ) : ( QMessageBox::StandardButton ) QMessageBox::NoButton ) ) );
+   hb_retni( ( QMessageBox::StandardButton ) hbqt_par_QMessageBox( 1 )->warning( hbqt_par_QWidget( 2 ), QMessageBox::tr( hb_parc( 3 ) ), QMessageBox::tr( hb_parc( 4 ) ), ( HB_ISNUM( 5 ) ? ( QMessageBox::StandardButtons ) hb_parni( 5 ) : ( QMessageBox::StandardButtons ) QMessageBox::Ok ), ( HB_ISNUM( 6 ) ? ( QMessageBox::StandardButton ) hb_parni( 6 ) : ( QMessageBox::StandardButton ) QMessageBox::NoButton ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp
index 1a909f20c3..549cd886c8 100644
--- a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QMouseEvent( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QMouseEvent;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QMouseEvent                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QMOUSEEVENT )
diff --git a/harbour/contrib/hbqt/qtgui/QMovie.cpp b/harbour/contrib/hbqt/qtgui/QMovie.cpp
index 245a00639f..e59ebb4821 100644
--- a/harbour/contrib/hbqt/qtgui/QMovie.cpp
+++ b/harbour/contrib/hbqt/qtgui/QMovie.cpp
@@ -137,7 +137,7 @@ void * hbqt_gcAllocate_QMovie( void * pObj )
    p->func = hbqt_gcRelease_QMovie;
    new( & p->pq ) QPointer< QMovie >( ( QMovie * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QMovie                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QMOVIE )
@@ -297,7 +297,7 @@ HB_FUNC( QT_QMOVIE_SETDEVICE )
  */
 HB_FUNC( QT_QMOVIE_SETFILENAME )
 {
-   hbqt_par_QMovie( 1 )->setFileName( hbqt_par_QString( 2 ) );
+   hbqt_par_QMovie( 1 )->setFileName( QMovie::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp b/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp
index 45be99c02e..cd245c3af9 100644
--- a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QPageSetupDialog( void * pObj )
    p->func = hbqt_gcRelease_QPageSetupDialog;
    new( & p->pq ) QPointer< QPageSetupDialog >( ( QPageSetupDialog * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPageSetupDialog            %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPAGESETUPDIALOG )
diff --git a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp b/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp
index 7019607fee..1af1ca30c0 100644
--- a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp
@@ -102,7 +102,7 @@ void * hbqt_gcAllocate_QPaintEvent( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPaintEvent;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPaintEvent                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPAINTEVENT )
diff --git a/harbour/contrib/hbqt/qtgui/QPainter.cpp b/harbour/contrib/hbqt/qtgui/QPainter.cpp
index eedfc41b7a..487c835587 100644
--- a/harbour/contrib/hbqt/qtgui/QPainter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPainter.cpp
@@ -122,7 +122,7 @@ void * hbqt_gcAllocate_QPainter( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPainter;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPainter                    %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPAINTER )
diff --git a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp b/harbour/contrib/hbqt/qtgui/QPainterPath.cpp
index 69a4c2b838..cbc65398f6 100644
--- a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPainterPath.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QPainterPath( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPainterPath;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPainterPath                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPAINTERPATH )
diff --git a/harbour/contrib/hbqt/qtgui/QPalette.cpp b/harbour/contrib/hbqt/qtgui/QPalette.cpp
index ca5ba7ab7c..7db2588537 100644
--- a/harbour/contrib/hbqt/qtgui/QPalette.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPalette.cpp
@@ -112,7 +112,7 @@ void * hbqt_gcAllocate_QPalette( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPalette;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPalette                    %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPALETTE )
diff --git a/harbour/contrib/hbqt/qtgui/QPen.cpp b/harbour/contrib/hbqt/qtgui/QPen.cpp
index ef7c076599..f05ad8beff 100644
--- a/harbour/contrib/hbqt/qtgui/QPen.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPen.cpp
@@ -116,7 +116,7 @@ void * hbqt_gcAllocate_QPen( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPen;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPen                        %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPEN )
diff --git a/harbour/contrib/hbqt/qtgui/QPicture.cpp b/harbour/contrib/hbqt/qtgui/QPicture.cpp
index db1e3e2fa6..886facc85d 100644
--- a/harbour/contrib/hbqt/qtgui/QPicture.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPicture.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QPicture( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPicture;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPicture                    %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPICTURE )
diff --git a/harbour/contrib/hbqt/qtgui/QPixmap.cpp b/harbour/contrib/hbqt/qtgui/QPixmap.cpp
index fbce8607f6..b53e80bb64 100644
--- a/harbour/contrib/hbqt/qtgui/QPixmap.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPixmap.cpp
@@ -112,7 +112,7 @@ void * hbqt_gcAllocate_QPixmap( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPixmap;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPixmap                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPIXMAP )
diff --git a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp
index 3e82713ec3..29a5d079e8 100644
--- a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp
@@ -149,7 +149,7 @@ void * hbqt_gcAllocate_QPlainTextEdit( void * pObj )
    p->func = hbqt_gcRelease_QPlainTextEdit;
    new( & p->pq ) QPointer< QPlainTextEdit >( ( QPlainTextEdit * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPlainTextEdit              %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPLAINTEXTEDIT )
@@ -284,7 +284,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_ENSURECURSORVISIBLE )
  */
 HB_FUNC( QT_QPLAINTEXTEDIT_FIND )
 {
-   hb_retl( hbqt_par_QPlainTextEdit( 1 )->find( hbqt_par_QString( 2 ), ( QTextDocument::FindFlags ) hb_parni( 3 ) ) );
+   hb_retl( hbqt_par_QPlainTextEdit( 1 )->find( QPlainTextEdit::tr( hb_parc( 2 ) ), ( QTextDocument::FindFlags ) hb_parni( 3 ) ) );
 }
 
 /*
@@ -404,7 +404,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_SETDOCUMENT )
  */
 HB_FUNC( QT_QPLAINTEXTEDIT_SETDOCUMENTTITLE )
 {
-   hbqt_par_QPlainTextEdit( 1 )->setDocumentTitle( hbqt_par_QString( 2 ) );
+   hbqt_par_QPlainTextEdit( 1 )->setDocumentTitle( QPlainTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -540,7 +540,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_WORDWRAPMODE )
  */
 HB_FUNC( QT_QPLAINTEXTEDIT_APPENDHTML )
 {
-   hbqt_par_QPlainTextEdit( 1 )->appendHtml( hbqt_par_QString( 2 ) );
+   hbqt_par_QPlainTextEdit( 1 )->appendHtml( QPlainTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -548,7 +548,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_APPENDHTML )
  */
 HB_FUNC( QT_QPLAINTEXTEDIT_APPENDPLAINTEXT )
 {
-   hbqt_par_QPlainTextEdit( 1 )->appendPlainText( hbqt_par_QString( 2 ) );
+   hbqt_par_QPlainTextEdit( 1 )->appendPlainText( QPlainTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -588,7 +588,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_CUT )
  */
 HB_FUNC( QT_QPLAINTEXTEDIT_INSERTPLAINTEXT )
 {
-   hbqt_par_QPlainTextEdit( 1 )->insertPlainText( hbqt_par_QString( 2 ) );
+   hbqt_par_QPlainTextEdit( 1 )->insertPlainText( QPlainTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -620,7 +620,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_SELECTALL )
  */
 HB_FUNC( QT_QPLAINTEXTEDIT_SETPLAINTEXT )
 {
-   hbqt_par_QPlainTextEdit( 1 )->setPlainText( hbqt_par_QString( 2 ) );
+   hbqt_par_QPlainTextEdit( 1 )->setPlainText( QPlainTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QPolygon.cpp b/harbour/contrib/hbqt/qtgui/QPolygon.cpp
index e1d06920bb..6ae2fc31e6 100644
--- a/harbour/contrib/hbqt/qtgui/QPolygon.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPolygon.cpp
@@ -105,7 +105,7 @@ void * hbqt_gcAllocate_QPolygon( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPolygon;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPolygon                    %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPOLYGON )
diff --git a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp b/harbour/contrib/hbqt/qtgui/QPolygonF.cpp
index 9069347317..bfa1206b0b 100644
--- a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPolygonF.cpp
@@ -106,7 +106,7 @@ void * hbqt_gcAllocate_QPolygonF( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPolygonF;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPolygonF                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPOLYGONF )
diff --git a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp
index ccfcd1b07b..f2890b63ee 100644
--- a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QPrintDialog( void * pObj )
    p->func = hbqt_gcRelease_QPrintDialog;
    new( & p->pq ) QPointer< QPrintDialog >( ( QPrintDialog * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPrintDialog                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPRINTDIALOG )
diff --git a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp b/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp
index df695ef294..5467b819b8 100644
--- a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QPrintPreviewDialog( void * pObj )
    p->func = hbqt_gcRelease_QPrintPreviewDialog;
    new( & p->pq ) QPointer< QPrintPreviewDialog >( ( QPrintPreviewDialog * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPrintPreviewDialog         %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPRINTPREVIEWDIALOG )
diff --git a/harbour/contrib/hbqt/qtgui/QPrinter.cpp b/harbour/contrib/hbqt/qtgui/QPrinter.cpp
index 2d0481a3c5..bebabbe5ef 100644
--- a/harbour/contrib/hbqt/qtgui/QPrinter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPrinter.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QPrinter( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QPrinter;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPrinter                    %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPRINTER )
diff --git a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp b/harbour/contrib/hbqt/qtgui/QProgressBar.cpp
index 3fd448816b..fbe632f0b9 100644
--- a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QProgressBar.cpp
@@ -132,7 +132,7 @@ void * hbqt_gcAllocate_QProgressBar( void * pObj )
    p->func = hbqt_gcRelease_QProgressBar;
    new( & p->pq ) QPointer< QProgressBar >( ( QProgressBar * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QProgressBar                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPROGRESSBAR )
@@ -212,7 +212,7 @@ HB_FUNC( QT_QPROGRESSBAR_SETALIGNMENT )
  */
 HB_FUNC( QT_QPROGRESSBAR_SETFORMAT )
 {
-   hbqt_par_QProgressBar( 1 )->setFormat( hbqt_par_QString( 2 ) );
+   hbqt_par_QProgressBar( 1 )->setFormat( QProgressBar::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp b/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp
index 880b98b3c3..028b14929e 100644
--- a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp
+++ b/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QProgressDialog( void * pObj )
    p->func = hbqt_gcRelease_QProgressDialog;
    new( & p->pq ) QPointer< QProgressDialog >( ( QProgressDialog * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QProgressDialog             %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPROGRESSDIALOG )
@@ -282,7 +282,7 @@ HB_FUNC( QT_QPROGRESSDIALOG_RESET )
  */
 HB_FUNC( QT_QPROGRESSDIALOG_SETCANCELBUTTONTEXT )
 {
-   hbqt_par_QProgressDialog( 1 )->setCancelButtonText( hbqt_par_QString( 2 ) );
+   hbqt_par_QProgressDialog( 1 )->setCancelButtonText( QProgressDialog::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -290,7 +290,7 @@ HB_FUNC( QT_QPROGRESSDIALOG_SETCANCELBUTTONTEXT )
  */
 HB_FUNC( QT_QPROGRESSDIALOG_SETLABELTEXT )
 {
-   hbqt_par_QProgressDialog( 1 )->setLabelText( hbqt_par_QString( 2 ) );
+   hbqt_par_QProgressDialog( 1 )->setLabelText( QProgressDialog::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QPushButton.cpp b/harbour/contrib/hbqt/qtgui/QPushButton.cpp
index 18c2784ef3..a361f76d46 100644
--- a/harbour/contrib/hbqt/qtgui/QPushButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QPushButton.cpp
@@ -131,7 +131,7 @@ void * hbqt_gcAllocate_QPushButton( void * pObj )
    p->func = hbqt_gcRelease_QPushButton;
    new( & p->pq ) QPointer< QPushButton >( ( QPushButton * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QPushButton                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QPUSHBUTTON )
diff --git a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp b/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp
index 7ba85894d1..336437569b 100644
--- a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp
+++ b/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp
@@ -111,7 +111,7 @@ void * hbqt_gcAllocate_QRadialGradient( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QRadialGradient;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QRadialGradient             %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QRADIALGRADIENT )
diff --git a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp b/harbour/contrib/hbqt/qtgui/QRadioButton.cpp
index 601270801c..a22a21a7f6 100644
--- a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QRadioButton.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QRadioButton( void * pObj )
    p->func = hbqt_gcRelease_QRadioButton;
    new( & p->pq ) QPointer< QRadioButton >( ( QRadioButton * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QRadioButton                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QRADIOBUTTON )
diff --git a/harbour/contrib/hbqt/qtgui/QRegion.cpp b/harbour/contrib/hbqt/qtgui/QRegion.cpp
index dd8108eeb9..0fd53c2907 100644
--- a/harbour/contrib/hbqt/qtgui/QRegion.cpp
+++ b/harbour/contrib/hbqt/qtgui/QRegion.cpp
@@ -124,7 +124,7 @@ void * hbqt_gcAllocate_QRegion( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QRegion;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QRegion                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QREGION )
diff --git a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp b/harbour/contrib/hbqt/qtgui/QScrollArea.cpp
index 07414e66c2..7a4f196b9b 100644
--- a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp
+++ b/harbour/contrib/hbqt/qtgui/QScrollArea.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QScrollArea( void * pObj )
    p->func = hbqt_gcRelease_QScrollArea;
    new( & p->pq ) QPointer< QScrollArea >( ( QScrollArea * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QScrollArea                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSCROLLAREA )
diff --git a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp b/harbour/contrib/hbqt/qtgui/QScrollBar.cpp
index 0d19872869..84bd9ddf47 100644
--- a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QScrollBar.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QScrollBar( void * pObj )
    p->func = hbqt_gcRelease_QScrollBar;
    new( & p->pq ) QPointer< QScrollBar >( ( QScrollBar * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QScrollBar                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSCROLLBAR )
diff --git a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp b/harbour/contrib/hbqt/qtgui/QSessionManager.cpp
index cb346cbd34..43aa0c88ca 100644
--- a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSessionManager.cpp
@@ -188,7 +188,7 @@ HB_FUNC( QT_QSESSIONMANAGER_SETDISCARDCOMMAND )
  */
 HB_FUNC( QT_QSESSIONMANAGER_SETMANAGERPROPERTY )
 {
-   hbqt_par_QSessionManager( 1 )->setManagerProperty( hbqt_par_QString( 2 ), *hbqt_par_QStringList( 3 ) );
+   hbqt_par_QSessionManager( 1 )->setManagerProperty( QSessionManager::tr( hb_parc( 2 ) ), *hbqt_par_QStringList( 3 ) );
 }
 
 /*
@@ -196,7 +196,7 @@ HB_FUNC( QT_QSESSIONMANAGER_SETMANAGERPROPERTY )
  */
 HB_FUNC( QT_QSESSIONMANAGER_SETMANAGERPROPERTY_1 )
 {
-   hbqt_par_QSessionManager( 1 )->setManagerProperty( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QSessionManager( 1 )->setManagerProperty( QSessionManager::tr( hb_parc( 2 ) ), QSessionManager::tr( hb_parc( 3 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp
index b50a8066f7..4739d97fa6 100644
--- a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QSizeGrip( void * pObj )
    p->func = hbqt_gcRelease_QSizeGrip;
    new( & p->pq ) QPointer< QSizeGrip >( ( QSizeGrip * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSizeGrip                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSIZEGRIP )
diff --git a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp b/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp
index e996036bb0..89cae5b746 100644
--- a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp
@@ -110,7 +110,7 @@ void * hbqt_gcAllocate_QSizePolicy( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QSizePolicy;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSizePolicy                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSIZEPOLICY )
diff --git a/harbour/contrib/hbqt/qtgui/QSlider.cpp b/harbour/contrib/hbqt/qtgui/QSlider.cpp
index 3a4f792c45..655ee56876 100644
--- a/harbour/contrib/hbqt/qtgui/QSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSlider.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QSlider( void * pObj )
    p->func = hbqt_gcRelease_QSlider;
    new( & p->pq ) QPointer< QSlider >( ( QSlider * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSlider                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSLIDER )
diff --git a/harbour/contrib/hbqt/qtgui/QSound.cpp b/harbour/contrib/hbqt/qtgui/QSound.cpp
index d291971154..2738a8c49f 100644
--- a/harbour/contrib/hbqt/qtgui/QSound.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSound.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QSound( void * pObj )
    p->func = hbqt_gcRelease_QSound;
    new( & p->pq ) QPointer< QSound >( ( QSound * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSound                      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSOUND )
@@ -193,7 +193,7 @@ HB_FUNC( QT_QSOUND_ISAVAILABLE )
  */
 HB_FUNC( QT_QSOUND_PLAY )
 {
-   hbqt_par_QSound( 1 )->play( hbqt_par_QString( 2 ) );
+   hbqt_par_QSound( 1 )->play( QSound::tr( hb_parc( 2 ) ) );
 }
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp b/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp
index 78d800a76a..d64c7a21fc 100644
--- a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QSpacerItem( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QSpacerItem;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSpacerItem                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSPACERITEM )
diff --git a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QSpinBox.cpp
index 1ddf85a2cf..d06bef7a40 100644
--- a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSpinBox.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QSpinBox( void * pObj )
    p->func = hbqt_gcRelease_QSpinBox;
    new( & p->pq ) QPointer< QSpinBox >( ( QSpinBox * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSpinBox                    %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSPINBOX )
@@ -192,7 +192,7 @@ HB_FUNC( QT_QSPINBOX_SETMINIMUM )
  */
 HB_FUNC( QT_QSPINBOX_SETPREFIX )
 {
-   hbqt_par_QSpinBox( 1 )->setPrefix( hbqt_par_QString( 2 ) );
+   hbqt_par_QSpinBox( 1 )->setPrefix( QSpinBox::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -216,7 +216,7 @@ HB_FUNC( QT_QSPINBOX_SETSINGLESTEP )
  */
 HB_FUNC( QT_QSPINBOX_SETSUFFIX )
 {
-   hbqt_par_QSpinBox( 1 )->setSuffix( hbqt_par_QString( 2 ) );
+   hbqt_par_QSpinBox( 1 )->setSuffix( QSpinBox::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp b/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp
index c29c8c18de..1d622aa6d1 100644
--- a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QSplashScreen( void * pObj )
    p->func = hbqt_gcRelease_QSplashScreen;
    new( & p->pq ) QPointer< QSplashScreen >( ( QSplashScreen * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSplashScreen               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSPLASHSCREEN )
@@ -186,7 +186,7 @@ HB_FUNC( QT_QSPLASHSCREEN_CLEARMESSAGE )
  */
 HB_FUNC( QT_QSPLASHSCREEN_SHOWMESSAGE )
 {
-   hbqt_par_QSplashScreen( 1 )->showMessage( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::AlignLeft ), *hbqt_par_QColor( 4 ) );
+   hbqt_par_QSplashScreen( 1 )->showMessage( QSplashScreen::tr( hb_parc( 2 ) ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::AlignLeft ), *hbqt_par_QColor( 4 ) );
 }
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QSplitter.cpp b/harbour/contrib/hbqt/qtgui/QSplitter.cpp
index eaa555c273..7f727c5e0f 100644
--- a/harbour/contrib/hbqt/qtgui/QSplitter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSplitter.cpp
@@ -140,7 +140,7 @@ void * hbqt_gcAllocate_QSplitter( void * pObj )
    p->func = hbqt_gcRelease_QSplitter;
    new( & p->pq ) QPointer< QSplitter >( ( QSplitter * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSplitter                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSPLITTER )
diff --git a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp b/harbour/contrib/hbqt/qtgui/QStandardItem.cpp
index 7fb87262a2..2bdcb79d15 100644
--- a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStandardItem.cpp
@@ -125,7 +125,7 @@ void * hbqt_gcAllocate_QStandardItem( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStandardItem;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStandardItem               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTANDARDITEM )
diff --git a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp b/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp
index 286ad0ae5a..ba79bcf020 100644
--- a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp
@@ -145,7 +145,7 @@ void * hbqt_gcAllocate_QStandardItemModel( void * pObj )
    p->func = hbqt_gcRelease_QStandardItemModel;
    new( & p->pq ) QPointer< QStandardItemModel >( ( QStandardItemModel * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStandardItemModel          %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTANDARDITEMMODEL )
diff --git a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp b/harbour/contrib/hbqt/qtgui/QStatusBar.cpp
index 4eaafe3555..f84c72a09f 100644
--- a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStatusBar.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QStatusBar( void * pObj )
    p->func = hbqt_gcRelease_QStatusBar;
    new( & p->pq ) QPointer< QStatusBar >( ( QStatusBar * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStatusBar                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTATUSBAR )
@@ -217,7 +217,7 @@ HB_FUNC( QT_QSTATUSBAR_CLEARMESSAGE )
  */
 HB_FUNC( QT_QSTATUSBAR_SHOWMESSAGE )
 {
-   hbqt_par_QStatusBar( 1 )->showMessage( hbqt_par_QString( 2 ), hb_parni( 3 ) );
+   hbqt_par_QStatusBar( 1 )->showMessage( QStatusBar::tr( hb_parc( 2 ) ), hb_parni( 3 ) );
 }
 
 
diff --git a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp b/harbour/contrib/hbqt/qtgui/QStringListModel.cpp
index 7813704d6f..e3b982e850 100644
--- a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStringListModel.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QStringListModel( void * pObj )
    p->func = hbqt_gcRelease_QStringListModel;
    new( & p->pq ) QPointer< QStringListModel >( ( QStringListModel * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStringListModel            %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTRINGLISTMODEL )
diff --git a/harbour/contrib/hbqt/qtgui/QStyle.cpp b/harbour/contrib/hbqt/qtgui/QStyle.cpp
index 2a474be3df..96e4256cc9 100644
--- a/harbour/contrib/hbqt/qtgui/QStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyle.cpp
@@ -136,7 +136,7 @@ HB_FUNC( QT_QSTYLE_DRAWITEMPIXMAP )
  */
 HB_FUNC( QT_QSTYLE_DRAWITEMTEXT )
 {
-   hbqt_par_QStyle( 1 )->drawItemText( hbqt_par_QPainter( 2 ), *hbqt_par_QRect( 3 ), hb_parni( 4 ), *hbqt_par_QPalette( 5 ), hb_parl( 6 ), hbqt_par_QString( 7 ), ( HB_ISNUM( 8 ) ? ( QPalette::ColorRole ) hb_parni( 8 ) : ( QPalette::ColorRole ) QPalette::NoRole ) );
+   hbqt_par_QStyle( 1 )->drawItemText( hbqt_par_QPainter( 2 ), *hbqt_par_QRect( 3 ), hb_parni( 4 ), *hbqt_par_QPalette( 5 ), hb_parl( 6 ), QStyle::tr( hb_parc( 7 ) ), ( HB_ISNUM( 8 ) ? ( QPalette::ColorRole ) hb_parni( 8 ) : ( QPalette::ColorRole ) QPalette::NoRole ) );
 }
 
 /*
@@ -176,7 +176,7 @@ HB_FUNC( QT_QSTYLE_ITEMPIXMAPRECT )
  */
 HB_FUNC( QT_QSTYLE_ITEMTEXTRECT )
 {
-   hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->itemTextRect( *hbqt_par_QFontMetrics( 2 ), *hbqt_par_QRect( 3 ), hb_parni( 4 ), hb_parl( 5 ), hbqt_par_QString( 6 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->itemTextRect( *hbqt_par_QFontMetrics( 2 ), *hbqt_par_QRect( 3 ), hb_parni( 4 ), hb_parl( 5 ), QStyle::tr( hb_parc( 6 ) ) ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp b/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp
index 2643881481..268728f749 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QStyleFactory( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleFactory;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleFactory               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEFACTORY )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp b/harbour/contrib/hbqt/qtgui/QStyleOption.cpp
index 59e690516c..aa203301dd 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOption.cpp
@@ -109,7 +109,7 @@ void * hbqt_gcAllocate_QStyleOption( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOption;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOption                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTION )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp
index 24497b27fe..c53691803d 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp
@@ -109,7 +109,7 @@ void * hbqt_gcAllocate_QStyleOptionButton( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionButton;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionButton          %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONBUTTON )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp
index 2bcb3ad1f1..02153bfec2 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionComboBox( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionComboBox;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionComboBox        %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp
index 294723c988..07ddded0b9 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionComplex( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionComplex;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionComplex         %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONCOMPLEX )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp
index bb83b59b5c..291fc6d96c 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionDockWidget( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionDockWidget;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionDockWidget      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp
index af8860b470..f57d43c377 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionFocusRect( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionFocusRect;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionFocusRect       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONFOCUSRECT )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp
index 9a1c0d3b91..9276706552 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionFrame( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionFrame;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionFrame           %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONFRAME )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp
index 0a92425df4..b80cefa226 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionGroupBox( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionGroupBox;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionGroupBox        %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONGROUPBOX )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp
index 682e0f514a..915a04fb91 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp
@@ -110,7 +110,7 @@ void * hbqt_gcAllocate_QStyleOptionHeader( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionHeader;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionHeader          %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONHEADER )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp
index 5109e6c1e8..8a1f4cf251 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp
@@ -109,7 +109,7 @@ void * hbqt_gcAllocate_QStyleOptionMenuItem( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionMenuItem;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionMenuItem        %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONMENUITEM )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp
index 59b6ffec91..d089ad843f 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp
@@ -108,7 +108,7 @@ void * hbqt_gcAllocate_QStyleOptionProgressBar( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionProgressBar;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionProgressBar     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp
index f6711a2fbf..6737db588b 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionSizeGrip( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionSizeGrip;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionSizeGrip        %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONSIZEGRIP )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp
index c1aaade070..a70429536b 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionSlider( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionSlider;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionSlider          %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONSLIDER )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp
index 4b7f256920..757425aecf 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionSpinBox( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionSpinBox;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionSpinBox         %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONSPINBOX )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp
index b31cbc2a73..b96e255fda 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp
@@ -111,7 +111,7 @@ void * hbqt_gcAllocate_QStyleOptionTab( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionTab;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionTab             %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONTAB )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp
index 9b16e8bfbb..9c628404ca 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionTabBarBase( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionTabBarBase;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionTabBarBase      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONTABBARBASE )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp
index 9a9cd2991b..3dbf0335bb 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionTabWidgetFrame( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionTabWidgetFrame;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionTabWidgetFrame  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp
index a3a2248b4a..aad54ccb93 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionTitleBar( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionTitleBar;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionTitleBar        %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONTITLEBAR )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp
index c24ac297fc..16e0eebae1 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp
@@ -110,7 +110,7 @@ void * hbqt_gcAllocate_QStyleOptionToolBar( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionToolBar;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionToolBar         %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONTOOLBAR )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp
index 83474541fe..35905e2da8 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QStyleOptionToolBox( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionToolBox;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionToolBox         %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONTOOLBOX )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp
index c237477d89..65a6eabe70 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp
@@ -109,7 +109,7 @@ void * hbqt_gcAllocate_QStyleOptionToolButton( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionToolButton;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionToolButton      %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON )
diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp
index 4570cc9f4b..b163a2ceb2 100644
--- a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp
@@ -108,7 +108,7 @@ void * hbqt_gcAllocate_QStyleOptionViewItem( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStyleOptionViewItem;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyleOptionViewItem        %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEOPTIONVIEWITEM )
diff --git a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp b/harbour/contrib/hbqt/qtgui/QStylePainter.cpp
index 3d8ac89b8a..bec6a03c30 100644
--- a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStylePainter.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QStylePainter( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QStylePainter;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStylePainter               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEPAINTER )
diff --git a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp
index 9934e4ca1a..ac5cb54722 100644
--- a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp
+++ b/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QStyledItemDelegate( void * pObj )
    p->func = hbqt_gcRelease_QStyledItemDelegate;
    new( & p->pq ) QPointer< QStyledItemDelegate >( ( QStyledItemDelegate * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QStyledItemDelegate         %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSTYLEDITEMDELEGATE )
diff --git a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp
index 05217262af..34d765f052 100644
--- a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp
@@ -131,7 +131,7 @@ void * hbqt_gcAllocate_QSyntaxHighlighter( void * pObj )
    p->func = hbqt_gcRelease_QSyntaxHighlighter;
    new( & p->pq ) QPointer< QSyntaxHighlighter >( ( QSyntaxHighlighter * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSyntaxHighlighter          %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSYNTAXHIGHLIGHTER )
diff --git a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp
index aaf591a296..89612fee5a 100644
--- a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp
+++ b/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp
@@ -135,7 +135,7 @@ void * hbqt_gcAllocate_QSystemTrayIcon( void * pObj )
    p->func = hbqt_gcRelease_QSystemTrayIcon;
    new( & p->pq ) QPointer< QSystemTrayIcon >( ( QSystemTrayIcon * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QSystemTrayIcon             %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QSYSTEMTRAYICON )
@@ -199,7 +199,7 @@ HB_FUNC( QT_QSYSTEMTRAYICON_SETICON )
  */
 HB_FUNC( QT_QSYSTEMTRAYICON_SETTOOLTIP )
 {
-   hbqt_par_QSystemTrayIcon( 1 )->setToolTip( hbqt_par_QString( 2 ) );
+   hbqt_par_QSystemTrayIcon( 1 )->setToolTip( QSystemTrayIcon::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -207,7 +207,7 @@ HB_FUNC( QT_QSYSTEMTRAYICON_SETTOOLTIP )
  */
 HB_FUNC( QT_QSYSTEMTRAYICON_SHOWMESSAGE )
 {
-   hbqt_par_QSystemTrayIcon( 1 )->showMessage( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ), ( HB_ISNUM( 4 ) ? ( QSystemTrayIcon::MessageIcon ) hb_parni( 4 ) : ( QSystemTrayIcon::MessageIcon ) QSystemTrayIcon::Information ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 10000 ) );
+   hbqt_par_QSystemTrayIcon( 1 )->showMessage( QSystemTrayIcon::tr( hb_parc( 2 ) ), QSystemTrayIcon::tr( hb_parc( 3 ) ), ( HB_ISNUM( 4 ) ? ( QSystemTrayIcon::MessageIcon ) hb_parni( 4 ) : ( QSystemTrayIcon::MessageIcon ) QSystemTrayIcon::Information ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 10000 ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QTabBar.cpp b/harbour/contrib/hbqt/qtgui/QTabBar.cpp
index 9832530b98..6fab008a90 100644
--- a/harbour/contrib/hbqt/qtgui/QTabBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTabBar.cpp
@@ -136,7 +136,7 @@ void * hbqt_gcAllocate_QTabBar( void * pObj )
    p->func = hbqt_gcRelease_QTabBar;
    new( & p->pq ) QPointer< QTabBar >( ( QTabBar * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTabBar                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTABBAR )
@@ -152,7 +152,7 @@ HB_FUNC( QT_QTABBAR )
  */
 HB_FUNC( QT_QTABBAR_ADDTAB )
 {
-   hb_retni( hbqt_par_QTabBar( 1 )->addTab( hbqt_par_QString( 2 ) ) );
+   hb_retni( hbqt_par_QTabBar( 1 )->addTab( QTabBar::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -216,7 +216,7 @@ HB_FUNC( QT_QTABBAR_ICONSIZE )
  */
 HB_FUNC( QT_QTABBAR_INSERTTAB )
 {
-   hb_retni( hbqt_par_QTabBar( 1 )->insertTab( hb_parni( 2 ), hbqt_par_QString( 3 ) ) );
+   hb_retni( hbqt_par_QTabBar( 1 )->insertTab( hb_parni( 2 ), QTabBar::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -352,7 +352,7 @@ HB_FUNC( QT_QTABBAR_SETTABENABLED )
  */
 HB_FUNC( QT_QTABBAR_SETTABTEXT )
 {
-   hbqt_par_QTabBar( 1 )->setTabText( hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QTabBar( 1 )->setTabText( hb_parni( 2 ), QTabBar::tr( hb_parc( 3 ) ) );
 }
 
 /*
@@ -368,7 +368,7 @@ HB_FUNC( QT_QTABBAR_SETTABTEXTCOLOR )
  */
 HB_FUNC( QT_QTABBAR_SETTABTOOLTIP )
 {
-   hbqt_par_QTabBar( 1 )->setTabToolTip( hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QTabBar( 1 )->setTabToolTip( hb_parni( 2 ), QTabBar::tr( hb_parc( 3 ) ) );
 }
 
 /*
@@ -376,7 +376,7 @@ HB_FUNC( QT_QTABBAR_SETTABTOOLTIP )
  */
 HB_FUNC( QT_QTABBAR_SETTABWHATSTHIS )
 {
-   hbqt_par_QTabBar( 1 )->setTabWhatsThis( hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QTabBar( 1 )->setTabWhatsThis( hb_parni( 2 ), QTabBar::tr( hb_parc( 3 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp
index c995674bc9..be9b10da8a 100644
--- a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp
@@ -134,7 +134,7 @@ void * hbqt_gcAllocate_QTabWidget( void * pObj )
    p->func = hbqt_gcRelease_QTabWidget;
    new( & p->pq ) QPointer< QTabWidget >( ( QTabWidget * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTabWidget                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTABWIDGET )
@@ -150,7 +150,7 @@ HB_FUNC( QT_QTABWIDGET )
  */
 HB_FUNC( QT_QTABWIDGET_ADDTAB )
 {
-   hb_retni( hbqt_par_QTabWidget( 1 )->addTab( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ) ) );
+   hb_retni( hbqt_par_QTabWidget( 1 )->addTab( hbqt_par_QWidget( 2 ), QTabWidget::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -158,7 +158,7 @@ HB_FUNC( QT_QTABWIDGET_ADDTAB )
  */
 HB_FUNC( QT_QTABWIDGET_ADDTAB_1 )
 {
-   hb_retni( hbqt_par_QTabWidget( 1 )->addTab( hbqt_par_QWidget( 2 ), QIcon( hbqt_par_QString( 3 ) ), hbqt_par_QString( 4 ) ) );
+   hb_retni( hbqt_par_QTabWidget( 1 )->addTab( hbqt_par_QWidget( 2 ), QIcon( hbqt_par_QString( 3 ) ), QTabWidget::tr( hb_parc( 4 ) ) ) );
 }
 
 /*
@@ -238,7 +238,7 @@ HB_FUNC( QT_QTABWIDGET_INDEXOF )
  */
 HB_FUNC( QT_QTABWIDGET_INSERTTAB )
 {
-   hb_retni( hbqt_par_QTabWidget( 1 )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), hbqt_par_QString( 4 ) ) );
+   hb_retni( hbqt_par_QTabWidget( 1 )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QTabWidget::tr( hb_parc( 4 ) ) ) );
 }
 
 /*
@@ -246,7 +246,7 @@ HB_FUNC( QT_QTABWIDGET_INSERTTAB )
  */
 HB_FUNC( QT_QTABWIDGET_INSERTTAB_1 )
 {
-   hb_retni( hbqt_par_QTabWidget( 1 )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QIcon( hbqt_par_QString( 4 ) ), hbqt_par_QString( 5 ) ) );
+   hb_retni( hbqt_par_QTabWidget( 1 )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QIcon( hbqt_par_QString( 4 ) ), QTabWidget::tr( hb_parc( 5 ) ) ) );
 }
 
 /*
@@ -350,7 +350,7 @@ HB_FUNC( QT_QTABWIDGET_SETTABSHAPE )
  */
 HB_FUNC( QT_QTABWIDGET_SETTABTEXT )
 {
-   hbqt_par_QTabWidget( 1 )->setTabText( hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QTabWidget( 1 )->setTabText( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) );
 }
 
 /*
@@ -358,7 +358,7 @@ HB_FUNC( QT_QTABWIDGET_SETTABTEXT )
  */
 HB_FUNC( QT_QTABWIDGET_SETTABTOOLTIP )
 {
-   hbqt_par_QTabWidget( 1 )->setTabToolTip( hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QTabWidget( 1 )->setTabToolTip( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) );
 }
 
 /*
@@ -366,7 +366,7 @@ HB_FUNC( QT_QTABWIDGET_SETTABTOOLTIP )
  */
 HB_FUNC( QT_QTABWIDGET_SETTABWHATSTHIS )
 {
-   hbqt_par_QTabWidget( 1 )->setTabWhatsThis( hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QTabWidget( 1 )->setTabWhatsThis( hb_parni( 2 ), QTabWidget::tr( hb_parc( 3 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QTableView.cpp b/harbour/contrib/hbqt/qtgui/QTableView.cpp
index e99fac579b..ee27642376 100644
--- a/harbour/contrib/hbqt/qtgui/QTableView.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTableView.cpp
@@ -131,7 +131,7 @@ void * hbqt_gcAllocate_QTableView( void * pObj )
    p->func = hbqt_gcRelease_QTableView;
    new( & p->pq ) QPointer< QTableView >( ( QTableView * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTableView                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTABLEVIEW )
diff --git a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp b/harbour/contrib/hbqt/qtgui/QTableWidget.cpp
index dc99653921..fa429e88e1 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 )
    p->func = hbqt_gcRelease_QTableWidget;
    new( & p->pq ) QPointer< QTableWidget >( ( QTableWidget * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTableWidget                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTABLEWIDGET )
diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp
index f389d2a5ac..380f86daaa 100644
--- a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp
@@ -109,7 +109,7 @@ void * hbqt_gcAllocate_QTableWidgetItem( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTableWidgetItem;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTableWidgetItem            %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTABLEWIDGETITEM )
diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp b/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp
index 33d59981c0..e88d89b1b5 100644
--- a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QTableWidgetSelectionRange( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTableWidgetSelectionRange;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTableWidgetSelectionRange  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTABLEWIDGETSELECTIONRANGE )
diff --git a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp b/harbour/contrib/hbqt/qtgui/QTextBlock.cpp
index 31d0554787..e8beee47d2 100644
--- a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextBlock.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QTextBlock( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextBlock;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextBlock                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTBLOCK )
diff --git a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp
index 9289af74fc..fb41c43e0c 100644
--- a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp
@@ -120,7 +120,7 @@ void * hbqt_gcAllocate_QTextBlockFormat( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextBlockFormat;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextBlockFormat            %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTBLOCKFORMAT )
diff --git a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp b/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp
index a66553646e..a076662c17 100644
--- a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp
@@ -128,7 +128,7 @@ void * hbqt_gcAllocate_QTextBrowser( void * pObj )
    p->func = hbqt_gcRelease_QTextBrowser;
    new( & p->pq ) QPointer< QTextBrowser >( ( QTextBrowser * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextBrowser                %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTBROWSER )
diff --git a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp
index aecc84e12e..81874deb16 100644
--- a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QTextCharFormat( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextCharFormat;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextCharFormat             %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTCHARFORMAT )
diff --git a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp b/harbour/contrib/hbqt/qtgui/QTextCursor.cpp
index 5162bf65b9..ab540cc113 100644
--- a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextCursor.cpp
@@ -114,7 +114,7 @@ void * hbqt_gcAllocate_QTextCursor( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextCursor;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextCursor                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTCURSOR )
diff --git a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp b/harbour/contrib/hbqt/qtgui/QTextDocument.cpp
index 58dc0cbab7..6b6d65a265 100644
--- a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextDocument.cpp
@@ -152,7 +152,7 @@ void * hbqt_gcAllocate_QTextDocument( void * pObj )
    p->func = hbqt_gcRelease_QTextDocument;
    new( & p->pq ) QPointer< QTextDocument >( ( QTextDocument * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextDocument               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTDOCUMENT )
@@ -280,7 +280,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_END )
  */
 HB_FUNC( QT_QTEXTDOCUMENT_FIND )
 {
-   hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( QTextDocument::tr( hb_parc( 2 ) ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) );
 }
 
 /*
@@ -296,7 +296,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND_1 )
  */
 HB_FUNC( QT_QTEXTDOCUMENT_FIND_2 )
 {
-   hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( QTextDocument::tr( hb_parc( 2 ) ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) );
 }
 
 /*
@@ -520,7 +520,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_SETDEFAULTFONT )
  */
 HB_FUNC( QT_QTEXTDOCUMENT_SETDEFAULTSTYLESHEET )
 {
-   hbqt_par_QTextDocument( 1 )->setDefaultStyleSheet( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextDocument( 1 )->setDefaultStyleSheet( QTextDocument::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -552,7 +552,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_SETDOCUMENTMARGIN )
  */
 HB_FUNC( QT_QTEXTDOCUMENT_SETHTML )
 {
-   hbqt_par_QTextDocument( 1 )->setHtml( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextDocument( 1 )->setHtml( QTextDocument::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -576,7 +576,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_SETMAXIMUMBLOCKCOUNT )
  */
 HB_FUNC( QT_QTEXTDOCUMENT_SETMETAINFORMATION )
 {
-   hbqt_par_QTextDocument( 1 )->setMetaInformation( ( QTextDocument::MetaInformation ) hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QTextDocument( 1 )->setMetaInformation( ( QTextDocument::MetaInformation ) hb_parni( 2 ), QTextDocument::tr( hb_parc( 3 ) ) );
 }
 
 /*
@@ -592,7 +592,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_SETPAGESIZE )
  */
 HB_FUNC( QT_QTEXTDOCUMENT_SETPLAINTEXT )
 {
-   hbqt_par_QTextDocument( 1 )->setPlainText( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextDocument( 1 )->setPlainText( QTextDocument::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp b/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp
index 0a45591d59..64064eeb79 100644
--- a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp
@@ -105,7 +105,7 @@ void * hbqt_gcAllocate_QTextDocumentFragment( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextDocumentFragment;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextDocumentFragment       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT )
diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp b/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp
index 1f6c83428f..8a2017feb0 100644
--- a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp
@@ -104,7 +104,7 @@ void * hbqt_gcAllocate_QTextDocumentWriter( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextDocumentWriter;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextDocumentWriter         %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTDOCUMENTWRITER )
diff --git a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp b/harbour/contrib/hbqt/qtgui/QTextEdit.cpp
index 78c31df4e5..f1bc5cdd95 100644
--- a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextEdit.cpp
@@ -145,7 +145,7 @@ void * hbqt_gcAllocate_QTextEdit( void * pObj )
    p->func = hbqt_gcRelease_QTextEdit;
    new( & p->pq ) QPointer< QTextEdit >( ( QTextEdit * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextEdit                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTEDIT )
@@ -292,7 +292,7 @@ HB_FUNC( QT_QTEXTEDIT_ENSURECURSORVISIBLE )
  */
 HB_FUNC( QT_QTEXTEDIT_FIND )
 {
-   hb_retl( hbqt_par_QTextEdit( 1 )->find( hbqt_par_QString( 2 ), ( QTextDocument::FindFlags ) hb_parni( 3 ) ) );
+   hb_retl( hbqt_par_QTextEdit( 1 )->find( QTextEdit::tr( hb_parc( 2 ) ), ( QTextDocument::FindFlags ) hb_parni( 3 ) ) );
 }
 
 /*
@@ -452,7 +452,7 @@ HB_FUNC( QT_QTEXTEDIT_SETDOCUMENT )
  */
 HB_FUNC( QT_QTEXTEDIT_SETDOCUMENTTITLE )
 {
-   hbqt_par_QTextEdit( 1 )->setDocumentTitle( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextEdit( 1 )->setDocumentTitle( QTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -612,7 +612,7 @@ HB_FUNC( QT_QTEXTEDIT_WORDWRAPMODE )
  */
 HB_FUNC( QT_QTEXTEDIT_APPEND )
 {
-   hbqt_par_QTextEdit( 1 )->append( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextEdit( 1 )->append( QTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -644,7 +644,7 @@ HB_FUNC( QT_QTEXTEDIT_CUT )
  */
 HB_FUNC( QT_QTEXTEDIT_INSERTHTML )
 {
-   hbqt_par_QTextEdit( 1 )->insertHtml( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextEdit( 1 )->insertHtml( QTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -652,7 +652,7 @@ HB_FUNC( QT_QTEXTEDIT_INSERTHTML )
  */
 HB_FUNC( QT_QTEXTEDIT_INSERTPLAINTEXT )
 {
-   hbqt_par_QTextEdit( 1 )->insertPlainText( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextEdit( 1 )->insertPlainText( QTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -676,7 +676,7 @@ HB_FUNC( QT_QTEXTEDIT_REDO )
  */
 HB_FUNC( QT_QTEXTEDIT_SCROLLTOANCHOR )
 {
-   hbqt_par_QTextEdit( 1 )->scrollToAnchor( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextEdit( 1 )->scrollToAnchor( QTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -708,7 +708,7 @@ HB_FUNC( QT_QTEXTEDIT_SETCURRENTFONT )
  */
 HB_FUNC( QT_QTEXTEDIT_SETFONTFAMILY )
 {
-   hbqt_par_QTextEdit( 1 )->setFontFamily( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextEdit( 1 )->setFontFamily( QTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -748,7 +748,7 @@ HB_FUNC( QT_QTEXTEDIT_SETFONTWEIGHT )
  */
 HB_FUNC( QT_QTEXTEDIT_SETHTML )
 {
-   hbqt_par_QTextEdit( 1 )->setHtml( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextEdit( 1 )->setHtml( QTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -756,7 +756,7 @@ HB_FUNC( QT_QTEXTEDIT_SETHTML )
  */
 HB_FUNC( QT_QTEXTEDIT_SETPLAINTEXT )
 {
-   hbqt_par_QTextEdit( 1 )->setPlainText( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextEdit( 1 )->setPlainText( QTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -764,7 +764,7 @@ HB_FUNC( QT_QTEXTEDIT_SETPLAINTEXT )
  */
 HB_FUNC( QT_QTEXTEDIT_SETTEXT )
 {
-   hbqt_par_QTextEdit( 1 )->setText( hbqt_par_QString( 2 ) );
+   hbqt_par_QTextEdit( 1 )->setText( QTextEdit::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextFormat.cpp
index 8aa5492b9b..c621400067 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextFormat.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QTextFormat( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextFormat;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextFormat                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTFORMAT )
diff --git a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp b/harbour/contrib/hbqt/qtgui/QTextFragment.cpp
index df9135f745..c18078139c 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextFragment.cpp
@@ -102,7 +102,7 @@ void * hbqt_gcAllocate_QTextFragment( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextFragment;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextFragment               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTFRAGMENT )
diff --git a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp b/harbour/contrib/hbqt/qtgui/QTextFrame.cpp
index 6145f2a09e..833b1c2c01 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextFrame.cpp
@@ -144,7 +144,7 @@ void * hbqt_gcAllocate_QTextFrame( void * pObj )
    p->func = hbqt_gcRelease_QTextFrame;
    new( & p->pq ) QPointer< QTextFrame >( ( QTextFrame * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextFrame                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTFRAME )
diff --git a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp
index 5b204d0b9b..c6b28fac2b 100644
--- a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp
@@ -111,7 +111,7 @@ void * hbqt_gcAllocate_QTextFrameFormat( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextFrameFormat;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextFrameFormat            %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTFRAMEFORMAT )
diff --git a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp
index db9854f19a..bf4542749e 100644
--- a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp
@@ -102,7 +102,7 @@ void * hbqt_gcAllocate_QTextImageFormat( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextImageFormat;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextImageFormat            %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTIMAGEFORMAT )
diff --git a/harbour/contrib/hbqt/qtgui/QTextItem.cpp b/harbour/contrib/hbqt/qtgui/QTextItem.cpp
index 67d30b5649..04cb0cfee7 100644
--- a/harbour/contrib/hbqt/qtgui/QTextItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextItem.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QTextItem( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextItem;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextItem                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTITEM )
diff --git a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp b/harbour/contrib/hbqt/qtgui/QTextLayout.cpp
index 06a58eb3bd..1cb8ebddcb 100644
--- a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextLayout.cpp
@@ -119,7 +119,7 @@ void * hbqt_gcAllocate_QTextLayout( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextLayout;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextLayout                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTLAYOUT )
diff --git a/harbour/contrib/hbqt/qtgui/QTextLength.cpp b/harbour/contrib/hbqt/qtgui/QTextLength.cpp
index 52673a246f..819d0f6204 100644
--- a/harbour/contrib/hbqt/qtgui/QTextLength.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextLength.cpp
@@ -106,7 +106,7 @@ void * hbqt_gcAllocate_QTextLength( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextLength;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextLength                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTLENGTH )
diff --git a/harbour/contrib/hbqt/qtgui/QTextLine.cpp b/harbour/contrib/hbqt/qtgui/QTextLine.cpp
index 152390b13a..3cf3112ea5 100644
--- a/harbour/contrib/hbqt/qtgui/QTextLine.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextLine.cpp
@@ -106,7 +106,7 @@ void * hbqt_gcAllocate_QTextLine( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextLine;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextLine                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTLINE )
diff --git a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp
index f4a0bc3bd0..7e7d8e4ea0 100644
--- a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp
@@ -105,7 +105,7 @@ void * hbqt_gcAllocate_QTextListFormat( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextListFormat;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextListFormat             %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTLISTFORMAT )
diff --git a/harbour/contrib/hbqt/qtgui/QTextOption.cpp b/harbour/contrib/hbqt/qtgui/QTextOption.cpp
index 543295bc8a..4cbe6535e9 100644
--- a/harbour/contrib/hbqt/qtgui/QTextOption.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextOption.cpp
@@ -123,7 +123,7 @@ void * hbqt_gcAllocate_QTextOption( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextOption;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextOption                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTOPTION )
diff --git a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp
index 659625fc8b..44fad778ba 100644
--- a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp
@@ -110,7 +110,7 @@ void * hbqt_gcAllocate_QTextTableFormat( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTextTableFormat;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTextTableFormat            %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTEXTTABLEFORMAT )
diff --git a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp
index aa995f61f1..4ee28a103a 100644
--- a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QTimeEdit( void * pObj )
    p->func = hbqt_gcRelease_QTimeEdit;
    new( & p->pq ) QPointer< QTimeEdit >( ( QTimeEdit * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTimeEdit                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTIMEEDIT )
diff --git a/harbour/contrib/hbqt/qtgui/QToolBar.cpp b/harbour/contrib/hbqt/qtgui/QToolBar.cpp
index 5eeb2ffd36..1502b1b0c3 100644
--- a/harbour/contrib/hbqt/qtgui/QToolBar.cpp
+++ b/harbour/contrib/hbqt/qtgui/QToolBar.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QToolBar( void * pObj )
    p->func = hbqt_gcRelease_QToolBar;
    new( & p->pq ) QPointer< QToolBar >( ( QToolBar * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QToolBar                    %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTOOLBAR )
@@ -173,7 +173,7 @@ HB_FUNC( QT_QTOOLBAR_ADDACTION )
  */
 HB_FUNC( QT_QTOOLBAR_ADDACTION_1 )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( hbqt_par_QString( 2 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( QToolBar::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -181,7 +181,7 @@ HB_FUNC( QT_QTOOLBAR_ADDACTION_1 )
  */
 HB_FUNC( QT_QTOOLBAR_ADDACTION_2 )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), QToolBar::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -189,7 +189,7 @@ HB_FUNC( QT_QTOOLBAR_ADDACTION_2 )
  */
 HB_FUNC( QT_QTOOLBAR_ADDACTION_3 )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( QToolBar::tr( hb_parc( 2 ) ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ) ) );
 }
 
 /*
@@ -197,7 +197,7 @@ HB_FUNC( QT_QTOOLBAR_ADDACTION_3 )
  */
 HB_FUNC( QT_QTOOLBAR_ADDACTION_4 )
 {
-   hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ) ) );
+   hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), QToolBar::tr( hb_parc( 3 ) ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QToolBox.cpp b/harbour/contrib/hbqt/qtgui/QToolBox.cpp
index b825ca88b9..6ee8df7e1c 100644
--- a/harbour/contrib/hbqt/qtgui/QToolBox.cpp
+++ b/harbour/contrib/hbqt/qtgui/QToolBox.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QToolBox( void * pObj )
    p->func = hbqt_gcRelease_QToolBox;
    new( & p->pq ) QPointer< QToolBox >( ( QToolBox * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QToolBox                    %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTOOLBOX )
@@ -145,7 +145,7 @@ HB_FUNC( QT_QTOOLBOX )
  */
 HB_FUNC( QT_QTOOLBOX_ADDITEM )
 {
-   hb_retni( hbqt_par_QToolBox( 1 )->addItem( hbqt_par_QWidget( 2 ), QIcon( hbqt_par_QString( 3 ) ), hbqt_par_QString( 4 ) ) );
+   hb_retni( hbqt_par_QToolBox( 1 )->addItem( hbqt_par_QWidget( 2 ), QIcon( hbqt_par_QString( 3 ) ), QToolBox::tr( hb_parc( 4 ) ) ) );
 }
 
 /*
@@ -153,7 +153,7 @@ HB_FUNC( QT_QTOOLBOX_ADDITEM )
  */
 HB_FUNC( QT_QTOOLBOX_ADDITEM_1 )
 {
-   hb_retni( hbqt_par_QToolBox( 1 )->addItem( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ) ) );
+   hb_retni( hbqt_par_QToolBox( 1 )->addItem( hbqt_par_QWidget( 2 ), QToolBox::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -193,7 +193,7 @@ HB_FUNC( QT_QTOOLBOX_INDEXOF )
  */
 HB_FUNC( QT_QTOOLBOX_INSERTITEM )
 {
-   hb_retni( hbqt_par_QToolBox( 1 )->insertItem( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QIcon( hbqt_par_QString( 4 ) ), hbqt_par_QString( 5 ) ) );
+   hb_retni( hbqt_par_QToolBox( 1 )->insertItem( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QIcon( hbqt_par_QString( 4 ) ), QToolBox::tr( hb_parc( 5 ) ) ) );
 }
 
 /*
@@ -201,7 +201,7 @@ HB_FUNC( QT_QTOOLBOX_INSERTITEM )
  */
 HB_FUNC( QT_QTOOLBOX_INSERTITEM_1 )
 {
-   hb_retni( hbqt_par_QToolBox( 1 )->insertItem( hb_parni( 2 ), hbqt_par_QWidget( 3 ), hbqt_par_QString( 4 ) ) );
+   hb_retni( hbqt_par_QToolBox( 1 )->insertItem( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QToolBox::tr( hb_parc( 4 ) ) ) );
 }
 
 /*
@@ -265,7 +265,7 @@ HB_FUNC( QT_QTOOLBOX_SETITEMICON )
  */
 HB_FUNC( QT_QTOOLBOX_SETITEMTEXT )
 {
-   hbqt_par_QToolBox( 1 )->setItemText( hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QToolBox( 1 )->setItemText( hb_parni( 2 ), QToolBox::tr( hb_parc( 3 ) ) );
 }
 
 /*
@@ -273,7 +273,7 @@ HB_FUNC( QT_QTOOLBOX_SETITEMTEXT )
  */
 HB_FUNC( QT_QTOOLBOX_SETITEMTOOLTIP )
 {
-   hbqt_par_QToolBox( 1 )->setItemToolTip( hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QToolBox( 1 )->setItemToolTip( hb_parni( 2 ), QToolBox::tr( hb_parc( 3 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QToolButton.cpp b/harbour/contrib/hbqt/qtgui/QToolButton.cpp
index c1b00d546f..bc347dc516 100644
--- a/harbour/contrib/hbqt/qtgui/QToolButton.cpp
+++ b/harbour/contrib/hbqt/qtgui/QToolButton.cpp
@@ -133,7 +133,7 @@ void * hbqt_gcAllocate_QToolButton( void * pObj )
    p->func = hbqt_gcRelease_QToolButton;
    new( & p->pq ) QPointer< QToolButton >( ( QToolButton * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QToolButton                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTOOLBUTTON )
diff --git a/harbour/contrib/hbqt/qtgui/QTransform.cpp b/harbour/contrib/hbqt/qtgui/QTransform.cpp
index 332f38b8f5..68a6a5fd8e 100644
--- a/harbour/contrib/hbqt/qtgui/QTransform.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTransform.cpp
@@ -107,7 +107,7 @@ void * hbqt_gcAllocate_QTransform( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTransform;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTransform                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTRANSFORM )
diff --git a/harbour/contrib/hbqt/qtgui/QTreeView.cpp b/harbour/contrib/hbqt/qtgui/QTreeView.cpp
index 34765b4afd..a7c1e26ff3 100644
--- a/harbour/contrib/hbqt/qtgui/QTreeView.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTreeView.cpp
@@ -141,7 +141,7 @@ void * hbqt_gcAllocate_QTreeView( void * pObj )
    p->func = hbqt_gcRelease_QTreeView;
    new( & p->pq ) QPointer< QTreeView >( ( QTreeView * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTreeView                   %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTREEVIEW )
diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp b/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp
index 883370cf0e..03c663131b 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 )
    p->func = hbqt_gcRelease_QTreeWidget;
    new( & p->pq ) QPointer< QTreeWidget >( ( QTreeWidget * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTreeWidget                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTREEWIDGET )
@@ -349,7 +349,7 @@ HB_FUNC( QT_QTREEWIDGET_SETHEADERITEM )
  */
 HB_FUNC( QT_QTREEWIDGET_SETHEADERLABEL )
 {
-   hbqt_par_QTreeWidget( 1 )->setHeaderLabel( hbqt_par_QString( 2 ) );
+   hbqt_par_QTreeWidget( 1 )->setHeaderLabel( QTreeWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp
index 9ee88d270d..7ce7be3145 100644
--- a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp
@@ -126,7 +126,7 @@ void * hbqt_gcAllocate_QTreeWidgetItem( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QTreeWidgetItem;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QTreeWidgetItem             %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QTREEWIDGETITEM )
diff --git a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp
index 02adbd46b5..f946a628fb 100644
--- a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp
+++ b/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QVBoxLayout( void * pObj )
    p->func = hbqt_gcRelease_QVBoxLayout;
    new( & p->pq ) QPointer< QVBoxLayout >( ( QVBoxLayout * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QVBoxLayout                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QVBOXLAYOUT )
diff --git a/harbour/contrib/hbqt/qtgui/QWidget.cpp b/harbour/contrib/hbqt/qtgui/QWidget.cpp
index 87cdf95ce5..903e8f23e4 100644
--- a/harbour/contrib/hbqt/qtgui/QWidget.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWidget.cpp
@@ -167,7 +167,7 @@ void * hbqt_gcAllocate_QWidget( void * pObj )
    p->func = hbqt_gcRelease_QWidget;
    new( & p->pq ) QPointer< QWidget >( ( QWidget * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QWidget                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QWIDGET )
@@ -969,7 +969,7 @@ HB_FUNC( QT_QWIDGET_SETACCEPTDROPS )
  */
 HB_FUNC( QT_QWIDGET_SETACCESSIBLEDESCRIPTION )
 {
-   hbqt_par_QWidget( 1 )->setAccessibleDescription( hbqt_par_QString( 2 ) );
+   hbqt_par_QWidget( 1 )->setAccessibleDescription( QWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -977,7 +977,7 @@ HB_FUNC( QT_QWIDGET_SETACCESSIBLEDESCRIPTION )
  */
 HB_FUNC( QT_QWIDGET_SETACCESSIBLENAME )
 {
-   hbqt_par_QWidget( 1 )->setAccessibleName( hbqt_par_QString( 2 ) );
+   hbqt_par_QWidget( 1 )->setAccessibleName( QWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -1321,7 +1321,7 @@ HB_FUNC( QT_QWIDGET_SETSIZEPOLICY )
  */
 HB_FUNC( QT_QWIDGET_SETSTATUSTIP )
 {
-   hbqt_par_QWidget( 1 )->setStatusTip( hbqt_par_QString( 2 ) );
+   hbqt_par_QWidget( 1 )->setStatusTip( QWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -1337,7 +1337,7 @@ HB_FUNC( QT_QWIDGET_SETSTYLE )
  */
 HB_FUNC( QT_QWIDGET_SETTOOLTIP )
 {
-   hbqt_par_QWidget( 1 )->setToolTip( hbqt_par_QString( 2 ) );
+   hbqt_par_QWidget( 1 )->setToolTip( QWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -1353,7 +1353,7 @@ HB_FUNC( QT_QWIDGET_SETUPDATESENABLED )
  */
 HB_FUNC( QT_QWIDGET_SETWHATSTHIS )
 {
-   hbqt_par_QWidget( 1 )->setWhatsThis( hbqt_par_QString( 2 ) );
+   hbqt_par_QWidget( 1 )->setWhatsThis( QWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -1361,7 +1361,7 @@ HB_FUNC( QT_QWIDGET_SETWHATSTHIS )
  */
 HB_FUNC( QT_QWIDGET_SETWINDOWFILEPATH )
 {
-   hbqt_par_QWidget( 1 )->setWindowFilePath( hbqt_par_QString( 2 ) );
+   hbqt_par_QWidget( 1 )->setWindowFilePath( QWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -1385,7 +1385,7 @@ HB_FUNC( QT_QWIDGET_SETWINDOWICON )
  */
 HB_FUNC( QT_QWIDGET_SETWINDOWICONTEXT )
 {
-   hbqt_par_QWidget( 1 )->setWindowIconText( hbqt_par_QString( 2 ) );
+   hbqt_par_QWidget( 1 )->setWindowIconText( QWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -1409,7 +1409,7 @@ HB_FUNC( QT_QWIDGET_SETWINDOWOPACITY )
  */
 HB_FUNC( QT_QWIDGET_SETWINDOWROLE )
 {
-   hbqt_par_QWidget( 1 )->setWindowRole( hbqt_par_QString( 2 ) );
+   hbqt_par_QWidget( 1 )->setWindowRole( QWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -1801,7 +1801,7 @@ HB_FUNC( QT_QWIDGET_SETHIDDEN )
  */
 HB_FUNC( QT_QWIDGET_SETSTYLESHEET )
 {
-   hbqt_par_QWidget( 1 )->setStyleSheet( hbqt_par_QString( 2 ) );
+   hbqt_par_QWidget( 1 )->setStyleSheet( QWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -1825,7 +1825,7 @@ HB_FUNC( QT_QWIDGET_SETWINDOWMODIFIED )
  */
 HB_FUNC( QT_QWIDGET_SETWINDOWTITLE )
 {
-   hbqt_par_QWidget( 1 )->setWindowTitle( hbqt_par_QString( 2 ) );
+   hbqt_par_QWidget( 1 )->setWindowTitle( QWidget::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp b/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp
index 70ebbda269..85ebe5cbc9 100644
--- a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp
@@ -129,7 +129,7 @@ void * hbqt_gcAllocate_QWidgetAction( void * pObj )
    p->func = hbqt_gcRelease_QWidgetAction;
    new( & p->pq ) QPointer< QWidgetAction >( ( QWidgetAction * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QWidgetAction               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QWIDGETACTION )
diff --git a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp
index fb47d2256e..0d380a5261 100644
--- a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp
@@ -101,7 +101,7 @@ void * hbqt_gcAllocate_QWidgetItem( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QWidgetItem;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QWidgetItem                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QWIDGETITEM )
diff --git a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp b/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp
index 9ab6af48a3..3044f97955 100644
--- a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp
@@ -130,7 +130,7 @@ void * hbqt_gcAllocate_QWindowsStyle( void * pObj )
    p->func = hbqt_gcRelease_QWindowsStyle;
    new( & p->pq ) QPointer< QWindowsStyle >( ( QWindowsStyle * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QWindowsStyle               %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QWINDOWSSTYLE )
diff --git a/harbour/contrib/hbqt/qtgui/QWizard.cpp b/harbour/contrib/hbqt/qtgui/QWizard.cpp
index f59e2acf21..d8c0e85514 100644
--- a/harbour/contrib/hbqt/qtgui/QWizard.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWizard.cpp
@@ -149,7 +149,7 @@ void * hbqt_gcAllocate_QWizard( void * pObj )
    p->func = hbqt_gcRelease_QWizard;
    new( & p->pq ) QPointer< QWizard >( ( QWizard * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QWizard                     %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QWIZARD )
@@ -205,7 +205,7 @@ HB_FUNC( QT_QWIZARD_CURRENTPAGE )
  */
 HB_FUNC( QT_QWIZARD_FIELD )
 {
-   hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QWizard( 1 )->field( hbqt_par_QString( 2 ) ) ) ) );
+   hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QWizard( 1 )->field( QWizard::tr( hb_parc( 2 ) ) ) ) ) );
 }
 
 /*
@@ -269,7 +269,7 @@ HB_FUNC( QT_QWIZARD_SETBUTTON )
  */
 HB_FUNC( QT_QWIZARD_SETBUTTONTEXT )
 {
-   hbqt_par_QWizard( 1 )->setButtonText( ( QWizard::WizardButton ) hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QWizard( 1 )->setButtonText( ( QWizard::WizardButton ) hb_parni( 2 ), QWizard::tr( hb_parc( 3 ) ) );
 }
 
 /*
@@ -285,7 +285,7 @@ HB_FUNC( QT_QWIZARD_SETDEFAULTPROPERTY )
  */
 HB_FUNC( QT_QWIZARD_SETFIELD )
 {
-   hbqt_par_QWizard( 1 )->setField( hbqt_par_QString( 2 ), *hbqt_par_QVariant( 3 ) );
+   hbqt_par_QWizard( 1 )->setField( QWizard::tr( hb_parc( 2 ) ), *hbqt_par_QVariant( 3 ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp b/harbour/contrib/hbqt/qtgui/QWizardPage.cpp
index 9e72bd0445..052aee758d 100644
--- a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp
+++ b/harbour/contrib/hbqt/qtgui/QWizardPage.cpp
@@ -127,7 +127,7 @@ void * hbqt_gcAllocate_QWizardPage( void * pObj )
    p->func = hbqt_gcRelease_QWizardPage;
    new( & p->pq ) QPointer< QWizardPage >( ( QWizardPage * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QWizardPage                 %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QWIZARDPAGE )
@@ -207,7 +207,7 @@ HB_FUNC( QT_QWIZARDPAGE_PIXMAP )
  */
 HB_FUNC( QT_QWIZARDPAGE_SETBUTTONTEXT )
 {
-   hbqt_par_QWizardPage( 1 )->setButtonText( ( QWizard::WizardButton ) hb_parni( 2 ), hbqt_par_QString( 3 ) );
+   hbqt_par_QWizardPage( 1 )->setButtonText( ( QWizard::WizardButton ) hb_parni( 2 ), QWizardPage::tr( hb_parc( 3 ) ) );
 }
 
 /*
@@ -239,7 +239,7 @@ HB_FUNC( QT_QWIZARDPAGE_SETPIXMAP )
  */
 HB_FUNC( QT_QWIZARDPAGE_SETSUBTITLE )
 {
-   hbqt_par_QWizardPage( 1 )->setSubTitle( hbqt_par_QString( 2 ) );
+   hbqt_par_QWizardPage( 1 )->setSubTitle( QWizardPage::tr( hb_parc( 2 ) ) );
 }
 
 /*
@@ -247,7 +247,7 @@ HB_FUNC( QT_QWIZARDPAGE_SETSUBTITLE )
  */
 HB_FUNC( QT_QWIZARDPAGE_SETTITLE )
 {
-   hbqt_par_QWizardPage( 1 )->setTitle( hbqt_par_QString( 2 ) );
+   hbqt_par_QWizardPage( 1 )->setTitle( QWizardPage::tr( hb_parc( 2 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qth/QTextCodec.qth b/harbour/contrib/hbqt/qth/QTextCodec.qth
index 984f9fa490..576a927308 100644
--- a/harbour/contrib/hbqt/qth/QTextCodec.qth
+++ b/harbour/contrib/hbqt/qth/QTextCodec.qth
@@ -55,6 +55,7 @@
 ;
 
 <CLASS>
+QObject  = no
 Inherits = 
 Type     = Core
 New      = 
diff --git a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp b/harbour/contrib/hbqt/qtnetwork/QFtp.cpp
index 2f8ea6d656..2576627dc1 100644
--- a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/QFtp.cpp
@@ -152,7 +152,7 @@ void * hbqt_gcAllocate_QFtp( void * pObj )
    p->func = hbqt_gcRelease_QFtp;
    new( & p->pq ) QPointer< QFtp >( ( QFtp * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QFtp                        %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QFTP )
@@ -176,7 +176,7 @@ HB_FUNC( QT_QFTP_BYTESAVAILABLE )
  */
 HB_FUNC( QT_QFTP_CD )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->cd( hbqt_par_QString( 2 ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->cd( QFtp::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -200,7 +200,7 @@ HB_FUNC( QT_QFTP_CLOSE )
  */
 HB_FUNC( QT_QFTP_CONNECTTOHOST )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->connectToHost( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 21 ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->connectToHost( QFtp::tr( hb_parc( 2 ) ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 21 ) ) );
 }
 
 /*
@@ -248,7 +248,7 @@ HB_FUNC( QT_QFTP_ERRORSTRING )
  */
 HB_FUNC( QT_QFTP_GET )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->get( hbqt_par_QString( 2 ), hbqt_par_QIODevice( 3 ), ( HB_ISNUM( 4 ) ? ( QFtp::TransferType ) hb_parni( 4 ) : ( QFtp::TransferType ) QFtp::Binary ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->get( QFtp::tr( hb_parc( 2 ) ), hbqt_par_QIODevice( 3 ), ( HB_ISNUM( 4 ) ? ( QFtp::TransferType ) hb_parni( 4 ) : ( QFtp::TransferType ) QFtp::Binary ) ) );
 }
 
 /*
@@ -264,7 +264,7 @@ HB_FUNC( QT_QFTP_HASPENDINGCOMMANDS )
  */
 HB_FUNC( QT_QFTP_LIST )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->list( hbqt_par_QString( 2 ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->list( QFtp::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -272,7 +272,7 @@ HB_FUNC( QT_QFTP_LIST )
  */
 HB_FUNC( QT_QFTP_LOGIN )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->login( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->login( QFtp::tr( hb_parc( 2 ) ), QFtp::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -280,7 +280,7 @@ HB_FUNC( QT_QFTP_LOGIN )
  */
 HB_FUNC( QT_QFTP_MKDIR )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->mkdir( hbqt_par_QString( 2 ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->mkdir( QFtp::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -288,7 +288,7 @@ HB_FUNC( QT_QFTP_MKDIR )
  */
 HB_FUNC( QT_QFTP_PUT )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->put( hbqt_par_QIODevice( 2 ), hbqt_par_QString( 3 ), ( HB_ISNUM( 4 ) ? ( QFtp::TransferType ) hb_parni( 4 ) : ( QFtp::TransferType ) QFtp::Binary ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->put( hbqt_par_QIODevice( 2 ), QFtp::tr( hb_parc( 3 ) ), ( HB_ISNUM( 4 ) ? ( QFtp::TransferType ) hb_parni( 4 ) : ( QFtp::TransferType ) QFtp::Binary ) ) );
 }
 
 /*
@@ -296,7 +296,7 @@ HB_FUNC( QT_QFTP_PUT )
  */
 HB_FUNC( QT_QFTP_PUT_1 )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->put( *hbqt_par_QByteArray( 2 ), hbqt_par_QString( 3 ), ( HB_ISNUM( 4 ) ? ( QFtp::TransferType ) hb_parni( 4 ) : ( QFtp::TransferType ) QFtp::Binary ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->put( *hbqt_par_QByteArray( 2 ), QFtp::tr( hb_parc( 3 ) ), ( HB_ISNUM( 4 ) ? ( QFtp::TransferType ) hb_parni( 4 ) : ( QFtp::TransferType ) QFtp::Binary ) ) );
 }
 
 /*
@@ -304,7 +304,7 @@ HB_FUNC( QT_QFTP_PUT_1 )
  */
 HB_FUNC( QT_QFTP_RAWCOMMAND )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->rawCommand( hbqt_par_QString( 2 ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->rawCommand( QFtp::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -320,7 +320,7 @@ HB_FUNC( QT_QFTP_READALL )
  */
 HB_FUNC( QT_QFTP_REMOVE )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->remove( hbqt_par_QString( 2 ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->remove( QFtp::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -328,7 +328,7 @@ HB_FUNC( QT_QFTP_REMOVE )
  */
 HB_FUNC( QT_QFTP_RENAME )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->rename( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->rename( QFtp::tr( hb_parc( 2 ) ), QFtp::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
@@ -336,7 +336,7 @@ HB_FUNC( QT_QFTP_RENAME )
  */
 HB_FUNC( QT_QFTP_RMDIR )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->rmdir( hbqt_par_QString( 2 ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->rmdir( QFtp::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -344,7 +344,7 @@ HB_FUNC( QT_QFTP_RMDIR )
  */
 HB_FUNC( QT_QFTP_SETPROXY )
 {
-   hb_retni( hbqt_par_QFtp( 1 )->setProxy( hbqt_par_QString( 2 ), hb_parni( 3 ) ) );
+   hb_retni( hbqt_par_QFtp( 1 )->setProxy( QFtp::tr( hb_parc( 2 ) ), hb_parni( 3 ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp b/harbour/contrib/hbqt/qtnetwork/QHttp.cpp
index a10aafbb78..174bb0006b 100644
--- a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/QHttp.cpp
@@ -152,7 +152,7 @@ void * hbqt_gcAllocate_QHttp( void * pObj )
    p->func = hbqt_gcRelease_QHttp;
    new( & p->pq ) QPointer< QHttp >( ( QHttp * ) pObj );
    HB_TRACE( HB_TR_DEBUG, ( "          new_QHttp                       %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QHTTP )
@@ -240,7 +240,7 @@ HB_FUNC( QT_QHTTP_ERRORSTRING )
  */
 HB_FUNC( QT_QHTTP_GET )
 {
-   hb_retni( hbqt_par_QHttp( 1 )->get( hbqt_par_QString( 2 ), hbqt_par_QIODevice( 3 ) ) );
+   hb_retni( hbqt_par_QHttp( 1 )->get( QHttp::tr( hb_parc( 2 ) ), hbqt_par_QIODevice( 3 ) ) );
 }
 
 /*
@@ -256,7 +256,7 @@ HB_FUNC( QT_QHTTP_HASPENDINGREQUESTS )
  */
 HB_FUNC( QT_QHTTP_HEAD )
 {
-   hb_retni( hbqt_par_QHttp( 1 )->head( hbqt_par_QString( 2 ) ) );
+   hb_retni( hbqt_par_QHttp( 1 )->head( QHttp::tr( hb_parc( 2 ) ) ) );
 }
 
 /*
@@ -272,7 +272,7 @@ HB_FUNC( QT_QHTTP_LASTRESPONSE )
  */
 HB_FUNC( QT_QHTTP_POST )
 {
-   hb_retni( hbqt_par_QHttp( 1 )->post( hbqt_par_QString( 2 ), hbqt_par_QIODevice( 3 ), hbqt_par_QIODevice( 4 ) ) );
+   hb_retni( hbqt_par_QHttp( 1 )->post( QHttp::tr( hb_parc( 2 ) ), hbqt_par_QIODevice( 3 ), hbqt_par_QIODevice( 4 ) ) );
 }
 
 /*
@@ -280,7 +280,7 @@ HB_FUNC( QT_QHTTP_POST )
  */
 HB_FUNC( QT_QHTTP_POST_1 )
 {
-   hb_retni( hbqt_par_QHttp( 1 )->post( hbqt_par_QString( 2 ), *hbqt_par_QByteArray( 3 ), hbqt_par_QIODevice( 4 ) ) );
+   hb_retni( hbqt_par_QHttp( 1 )->post( QHttp::tr( hb_parc( 2 ) ), *hbqt_par_QByteArray( 3 ), hbqt_par_QIODevice( 4 ) ) );
 }
 
 /*
@@ -312,7 +312,7 @@ HB_FUNC( QT_QHTTP_REQUEST_1 )
  */
 HB_FUNC( QT_QHTTP_SETHOST )
 {
-   hb_retni( hbqt_par_QHttp( 1 )->setHost( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 80 ) ) );
+   hb_retni( hbqt_par_QHttp( 1 )->setHost( QHttp::tr( hb_parc( 2 ) ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 80 ) ) );
 }
 
 /*
@@ -320,7 +320,7 @@ HB_FUNC( QT_QHTTP_SETHOST )
  */
 HB_FUNC( QT_QHTTP_SETHOST_1 )
 {
-   hb_retni( hbqt_par_QHttp( 1 )->setHost( hbqt_par_QString( 2 ), ( QHttp::ConnectionMode ) hb_parni( 3 ), hb_parni( 4 ) ) );
+   hb_retni( hbqt_par_QHttp( 1 )->setHost( QHttp::tr( hb_parc( 2 ) ), ( QHttp::ConnectionMode ) hb_parni( 3 ), hb_parni( 4 ) ) );
 }
 
 /*
@@ -328,7 +328,7 @@ HB_FUNC( QT_QHTTP_SETHOST_1 )
  */
 HB_FUNC( QT_QHTTP_SETPROXY )
 {
-   hb_retni( hbqt_par_QHttp( 1 )->setProxy( hbqt_par_QString( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ), hbqt_par_QString( 5 ) ) );
+   hb_retni( hbqt_par_QHttp( 1 )->setProxy( QHttp::tr( hb_parc( 2 ) ), hb_parni( 3 ), QHttp::tr( hb_parc( 4 ) ), QHttp::tr( hb_parc( 5 ) ) ) );
 }
 
 /*
@@ -336,7 +336,7 @@ HB_FUNC( QT_QHTTP_SETPROXY )
  */
 HB_FUNC( QT_QHTTP_SETUSER )
 {
-   hb_retni( hbqt_par_QHttp( 1 )->setUser( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) );
+   hb_retni( hbqt_par_QHttp( 1 )->setUser( QHttp::tr( hb_parc( 2 ) ), QHttp::tr( hb_parc( 3 ) ) ) );
 }
 
 /*
diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp
index a69adb19eb..c0274e8a68 100644
--- a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QHttpRequestHeader( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QHttpRequestHeader;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QHttpRequestHeader          %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QHTTPREQUESTHEADER )
diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp
index 60e6f00433..d8eef62364 100644
--- a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp
+++ b/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp
@@ -103,7 +103,7 @@ void * hbqt_gcAllocate_QHttpResponseHeader( void * pObj )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QHttpResponseHeader;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QHttpResponseHeader         %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QHTTPRESPONSEHEADER )
diff --git a/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp b/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp
index 65748e1c10..5dc2dfc800 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 )
    p->ph = pObj;
    p->func = hbqt_gcRelease_QNetworkRequest;
    HB_TRACE( HB_TR_DEBUG, ( "          new_QNetworkRequest             %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
-   return( p );
+   return p;
 }
 
 HB_FUNC( QT_QNETWORKREQUEST )