fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-01-11 18:12 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* 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.
This commit is contained in:
Pritpal Bedi
2010-01-13 02:36:17 +00:00
parent 20df4144ca
commit cddd2a7e96
229 changed files with 489 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -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

9
harbour/contrib/hbqt/generator/hbqtgen.prg
View File

@@ -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'

2
harbour/contrib/hbqt/qtcore/QBitArray.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QByteArray.cpp
View File

@@ -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 )

12
harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
View File

@@ -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 ) ) );
}
/*

2
harbour/contrib/hbqt/qtcore/QDataStream.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QDate.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QDateTime.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QDir.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QEvent.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QEventLoop.cpp
View File

@@ -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 )

30
harbour/contrib/hbqt/qtcore/QFile.cpp
View File

@@ -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() );
}

2
harbour/contrib/hbqt/qtcore/QFileInfo.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QLatin1Char.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QLatin1String.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QLine.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QLineF.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QList.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QLocale.cpp
View File

@@ -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 )

14
harbour/contrib/hbqt/qtcore/QMimeData.cpp
View File

@@ -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 ) ) );
}
/*

2
harbour/contrib/hbqt/qtcore/QModelIndex.cpp
View File

@@ -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 )

4
harbour/contrib/hbqt/qtcore/QObject.cpp
View File

@@ -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 ) ) );
}
/*

2
harbour/contrib/hbqt/qtcore/QPoint.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QPointF.cpp
View File

@@ -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 )

24
harbour/contrib/hbqt/qtcore/QProcess.cpp
View File

@@ -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 ) ) ) );
}
/*

2
harbour/contrib/hbqt/qtcore/QRect.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QRectF.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QRegExp.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QResource.cpp
View File

@@ -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 )

32
harbour/contrib/hbqt/qtcore/QSettings.cpp
View File

@@ -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 ) ) );
}

6
harbour/contrib/hbqt/qtcore/QSignalMapper.cpp
View File

@@ -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 ) ) );
}
/*

2
harbour/contrib/hbqt/qtcore/QSize.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QSizeF.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QStringList.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QTextDecoder.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QTextEncoder.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QTextStream.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QThread.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QTime.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QTimer.cpp
View File

@@ -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 )

4
harbour/contrib/hbqt/qtcore/QTranslator.cpp
View File

@@ -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 ) ) ) );
}
/*

12
harbour/contrib/hbqt/qtcore/QUiLoader.cpp
View File

@@ -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 ) ) ) );
}
/*

2
harbour/contrib/hbqt/qtcore/QUrl.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/QVariant.cpp
View File

@@ -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 )

18
harbour/contrib/hbqt/qtcore/TQSettings.prg
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QAbstractButton.cpp
View File

@@ -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 ) ) );
}
/*

2
harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp
View File

@@ -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 ) ) );
}
/*

2
harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp
View File

@@ -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 ) ) );
}
/*

12
harbour/contrib/hbqt/qtgui/QAction.cpp
View File

@@ -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 ) ) );
}
/*

6
harbour/contrib/hbqt/qtgui/QActionGroup.cpp
View File

@@ -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 ) ) ) );
}
/*

8
harbour/contrib/hbqt/qtgui/QApplication.cpp
View File

@@ -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 ) ) );
}

2
harbour/contrib/hbqt/qtgui/QBitmap.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QBoxLayout.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QBrush.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QButtonGroup.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QCheckBox.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QClipboard.cpp
View File

@@ -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 ) );
}
/*

2
harbour/contrib/hbqt/qtgui/QColor.cpp
View File

@@ -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 )

4
harbour/contrib/hbqt/qtgui/QColorDialog.cpp
View File

@@ -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 ) ) ) ) );
}
/*

16
harbour/contrib/hbqt/qtgui/QComboBox.cpp
View File

@@ -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 ) ) );
}

4
harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp
View File

@@ -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 ) ) );
}

2
harbour/contrib/hbqt/qtgui/QCommonStyle.cpp
View File

@@ -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 )

6
harbour/contrib/hbqt/qtgui/QCompleter.cpp
View File

@@ -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 ) ) );
}
/*

2
harbour/contrib/hbqt/qtgui/QConicalGradient.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QCursor.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QDateEdit.cpp
View File

@@ -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 )

4
harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp
View File

@@ -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 ) ) );
}
/*

2
harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QDial.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QDialog.cpp
View File

@@ -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 )

6
harbour/contrib/hbqt/qtgui/QDirModel.cpp
View File

@@ -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 ) ) ) ) ) );
}
/*

2
harbour/contrib/hbqt/qtgui/QDockWidget.cpp
View File

@@ -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 )

8
harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp
View File

@@ -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 ) ) ) );
}
/*

6
harbour/contrib/hbqt/qtgui/QErrorMessage.cpp
View File

@@ -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 ) ) );
}

16
harbour/contrib/hbqt/qtgui/QFileDialog.cpp
View File

@@ -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() );
}

2
harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp
View File

@@ -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 )

8
harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp
View File

@@ -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 ) ) ) ) ) );
}
/*

2
harbour/contrib/hbqt/qtgui/QFocusFrame.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QFont.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QFontComboBox.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QFontDatabase.cpp
View File

@@ -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 )

6
harbour/contrib/hbqt/qtgui/QFontDialog.cpp
View File

@@ -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 );
}

2
harbour/contrib/hbqt/qtgui/QFontInfo.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QFontMetrics.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp
View File

@@ -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 )

10
harbour/contrib/hbqt/qtgui/QFormLayout.cpp
View File

@@ -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 ) );
}
/*

2
harbour/contrib/hbqt/qtgui/QFrame.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QGridLayout.cpp
View File

@@ -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 )

4
harbour/contrib/hbqt/qtgui/QGroupBox.cpp
View File

@@ -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 ) ) );
}
/*

2
harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QHeaderView.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QIcon.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QImage.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QImageReader.cpp
View File

@@ -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 )

2
harbour/contrib/hbqt/qtgui/QImageWriter.cpp
View File

@@ -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 )

18
harbour/contrib/hbqt/qtgui/QInputDialog.cpp
View File

@@ -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 );
}

2
harbour/contrib/hbqt/qtgui/QInputEvent.cpp
View File

@@ -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 )

Some files were not shown because too many files have changed in this diff Show More