diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 216077fc19..93b9ec1739 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,22 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-11 15:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/qtgui/QInputContext.cpp + ! Deleted hbqt_getmemused() reference. + How could this file not be updated automatically? + + * contrib/hbqt/qtgui/QInputContext.cpp + * contrib/hbqt/qtcore/QChar.cpp + * contrib/hbqt/qtcore/TQChar.prg + ! Added missing SVN props. + + * contrib/hbqt/hbqt.h + * contrib/hbqt/hbqt.hbc + * contrib/hbqt/hbqt_base.cpp + * contrib/hbqt/hbqts.hbc + - Deleted Windows specific memory tracing. + 2010-04-11 15:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/hbqt_destruct.cpp + Added trace calls. (pls correct me if there is a typo, diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index f25390d43b..a4eff6bf2e 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -88,8 +88,6 @@ HB_GARBAGE_FUNC( Q_release ); extern void * hbqt_gcpointer( int iParam ); extern const HB_GC_FUNCS * hbqt_gcFuncs( void ); -extern int hbqt_getmemused( void ); - extern void * hbqt_pPtrFromObj( int iParam ); extern void * hbqt_pPtrFromItem( PHB_ITEM pObj ); diff --git a/harbour/contrib/hbqt/hbqt.hbc b/harbour/contrib/hbqt/hbqt.hbc index 6434a8dda4..a4151918a1 100644 --- a/harbour/contrib/hbqt/hbqt.hbc +++ b/harbour/contrib/hbqt/hbqt.hbc @@ -11,7 +11,6 @@ libs=hbqtcore hbqtgui hbqtnetwork {win}libs=version shlwapi {allwin}libs=QtCore4 QtGui4 QtNetwork4 QtUiTools -{allwin}libs=psapi {os2}libs=QtCore4 QtGui4 QtNet4 QtUiTools {linux}libs=QtCore QtGui QtNetwork QtUiTools {darwin}libs=/Library/Frameworks/QtCore.framework/QtCore diff --git a/harbour/contrib/hbqt/hbqt_base.cpp b/harbour/contrib/hbqt/hbqt_base.cpp index da95657f4d..f2b58a48d8 100644 --- a/harbour/contrib/hbqt/hbqt_base.cpp +++ b/harbour/contrib/hbqt/hbqt_base.cpp @@ -105,61 +105,4 @@ HB_FUNC( HBQT_ISEQUALGCQTPOINTER ) } } -#if defined( HB_OS_WIN ) - #include - #include -#endif - -int hbqt_getmemused( void ) -{ -#if defined( HB_OS_WIN ) -#if _WIN32_WINNT >= 0x0501 -#ifdef __GNUC__ -// MingW32 doesn't have this struct in psapi.h -typedef struct _PROCESS_MEMORY_COUNTERS_EX -{ - DWORD cb; - DWORD PageFaultCount; - SIZE_T PeakWorkingSetSize; - SIZE_T WorkingSetSize; - SIZE_T QuotaPeakPagedPoolUsage; - SIZE_T QuotaPagedPoolUsage; - SIZE_T QuotaPeakNonPagedPoolUsage; - SIZE_T QuotaNonPagedPoolUsage; - SIZE_T PagefileUsage; - SIZE_T PeakPagefileUsage; - SIZE_T PrivateUsage; -} PROCESS_MEMORY_COUNTERS_EX, * PPROCESS_MEMORY_COUNTERS_EX; -#endif -#endif -#endif - int size = 0; -#if defined( HB_OS_WIN ) - HANDLE hProcess; -#if _WIN32_WINNT >= 0x0501 - PROCESS_MEMORY_COUNTERS_EX pmc; -#else - PROCESS_MEMORY_COUNTERS pmc; -#endif - hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, GetCurrentProcessId() ); - if( hProcess == NULL ) - return 0; - - pmc.cb = sizeof( pmc ); - if( GetProcessMemoryInfo( hProcess, ( PROCESS_MEMORY_COUNTERS * ) &pmc, sizeof( pmc ) ) ) -#if _WIN32_WINNT >= 0x0501 - size = ( int ) pmc.PrivateUsage / 1024; -#else - size = ( int ) pmc.WorkingSetSize / 1024; -#endif - CloseHandle( hProcess ); -#endif - return size; -} - -HB_FUNC( HBQT_GETMEMUSED ) -{ - hb_retni( hbqt_getmemused() ); -} - #endif // #if QT_VERSION >= 0x040500 diff --git a/harbour/contrib/hbqt/hbqts.hbc b/harbour/contrib/hbqt/hbqts.hbc index e6a81bf17e..4635e4f1f8 100644 --- a/harbour/contrib/hbqt/hbqts.hbc +++ b/harbour/contrib/hbqt/hbqts.hbc @@ -11,7 +11,6 @@ libs=hbqtcores hbqtguis hbqtnetworks hbqtwebkits {win}libs=version shlwapi {allwin}libs=QtCore QtGui QtNetwork QtWebKit QtUiTools -{allwin}libs=psapi {allgcc}libs=supc++ {win|os2}hbcppmm=yes diff --git a/harbour/contrib/hbqt/qtcore/QChar.cpp b/harbour/contrib/hbqt/qtcore/QChar.cpp index 698ca5aff0..326683476f 100644 --- a/harbour/contrib/hbqt/qtcore/QChar.cpp +++ b/harbour/contrib/hbqt/qtcore/QChar.cpp @@ -1,411 +1,411 @@ -/* - * $Id: hbqtgen.prg 14150 2010-03-13 01:28:47Z vouchcac $ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -/* - * Harbour Project source code: - * QT wrapper main header - * - * Copyright 2009-2010 Pritpal Bedi - * - * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ -/*----------------------------------------------------------------------*/ - -#include "../hbqt.h" - -/*----------------------------------------------------------------------*/ -#if QT_VERSION >= 0x040500 -/*----------------------------------------------------------------------*/ - -/* - * enum Category { Mark_NonSpacing, Mark_SpacingCombining, Mark_Enclosing, Number_DecimalDigit, ..., NoCategory } - * enum Decomposition { NoDecomposition, Canonical, Circle, Compat, ..., Wide } - * enum Direction { DirAL, DirAN, DirB, DirBN, ..., DirWS } - * enum Joining { Center, Dual, OtherJoining, Right } - * enum SpecialCharacter { Null, Nbsp, ReplacementCharacter, ObjectReplacementCharacter, ..., LineSeparator } - * enum UnicodeVersion { Unicode_1_1, Unicode_2_0, Unicode_2_1_2, Unicode_3_0, ..., Unicode_Unassigned } - */ - -/* - * Constructed[ 32/35 [ 91.43% ] ] - * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * uchar cell () const - * unsigned char combiningClass () const - * uchar row () const - */ - -#include - -#include - - -/* - * QChar () - * QChar ( char ch ) - * QChar ( uchar ch ) - * QChar ( QLatin1Char ch ) - * QChar ( uchar cell, uchar row ) - * QChar ( ushort code ) - * QChar ( short code ) - * QChar ( uint code ) - * QChar ( int code ) - * QChar ( SpecialCharacter ch ) - */ - -typedef struct -{ - void * ph; - bool bNew; - QT_G_FUNC_PTR func; -} QGC_POINTER_QChar; - -QT_G_FUNC( hbqt_gcRelease_QChar ) -{ - HB_SYMBOL_UNUSED( Cargo ); - QGC_POINTER * p = ( QGC_POINTER * ) Cargo; - - if( p && p->bNew ) - { - p->ph = NULL; - } -} - -void * hbqt_gcAllocate_QChar( void * pObj, bool bNew ) -{ - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); - - p->ph = pObj; - p->bNew = bNew; - p->func = hbqt_gcRelease_QChar; - - if( bNew ) - { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p _new_QChar", pObj ) ); - } - else - { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p NOT_new_QChar", pObj ) ); - } - return p; -} - -HB_FUNC( QT_QCHAR ) -{ - void * pObj = NULL; - - pObj = new QChar() ; - - hb_retptrGC( hbqt_gcAllocate_QChar( pObj, true ) ); -} - -/* - * Category category () const - */ -HB_FUNC( QT_QCHAR_CATEGORY ) -{ - hb_retni( ( QChar::Category ) hbqt_par_QChar( 1 )->category() ); -} - -/* - * QString decomposition () const - */ -HB_FUNC( QT_QCHAR_DECOMPOSITION ) -{ - hb_retc( hbqt_par_QChar( 1 )->decomposition().toAscii().data() ); -} - -/* - * Decomposition decompositionTag () const - */ -HB_FUNC( QT_QCHAR_DECOMPOSITIONTAG ) -{ - hb_retni( ( QChar::Decomposition ) hbqt_par_QChar( 1 )->decompositionTag() ); -} - -/* - * int digitValue () const - */ -HB_FUNC( QT_QCHAR_DIGITVALUE ) -{ - hb_retni( hbqt_par_QChar( 1 )->digitValue() ); -} - -/* - * Direction direction () const - */ -HB_FUNC( QT_QCHAR_DIRECTION ) -{ - hb_retni( ( QChar::Direction ) hbqt_par_QChar( 1 )->direction() ); -} - -/* - * bool hasMirrored () const - */ -HB_FUNC( QT_QCHAR_HASMIRRORED ) -{ - hb_retl( hbqt_par_QChar( 1 )->hasMirrored() ); -} - -/* - * bool isDigit () const - */ -HB_FUNC( QT_QCHAR_ISDIGIT ) -{ - hb_retl( hbqt_par_QChar( 1 )->isDigit() ); -} - -/* - * bool isHighSurrogate () const - */ -HB_FUNC( QT_QCHAR_ISHIGHSURROGATE ) -{ - hb_retl( hbqt_par_QChar( 1 )->isHighSurrogate() ); -} - -/* - * bool isLetter () const - */ -HB_FUNC( QT_QCHAR_ISLETTER ) -{ - hb_retl( hbqt_par_QChar( 1 )->isLetter() ); -} - -/* - * bool isLetterOrNumber () const - */ -HB_FUNC( QT_QCHAR_ISLETTERORNUMBER ) -{ - hb_retl( hbqt_par_QChar( 1 )->isLetterOrNumber() ); -} - -/* - * bool isLowSurrogate () const - */ -HB_FUNC( QT_QCHAR_ISLOWSURROGATE ) -{ - hb_retl( hbqt_par_QChar( 1 )->isLowSurrogate() ); -} - -/* - * bool isLower () const - */ -HB_FUNC( QT_QCHAR_ISLOWER ) -{ - hb_retl( hbqt_par_QChar( 1 )->isLower() ); -} - -/* - * bool isMark () const - */ -HB_FUNC( QT_QCHAR_ISMARK ) -{ - hb_retl( hbqt_par_QChar( 1 )->isMark() ); -} - -/* - * bool isNull () const - */ -HB_FUNC( QT_QCHAR_ISNULL ) -{ - hb_retl( hbqt_par_QChar( 1 )->isNull() ); -} - -/* - * bool isNumber () const - */ -HB_FUNC( QT_QCHAR_ISNUMBER ) -{ - hb_retl( hbqt_par_QChar( 1 )->isNumber() ); -} - -/* - * bool isPrint () const - */ -HB_FUNC( QT_QCHAR_ISPRINT ) -{ - hb_retl( hbqt_par_QChar( 1 )->isPrint() ); -} - -/* - * bool isPunct () const - */ -HB_FUNC( QT_QCHAR_ISPUNCT ) -{ - hb_retl( hbqt_par_QChar( 1 )->isPunct() ); -} - -/* - * bool isSpace () const - */ -HB_FUNC( QT_QCHAR_ISSPACE ) -{ - hb_retl( hbqt_par_QChar( 1 )->isSpace() ); -} - -/* - * bool isSymbol () const - */ -HB_FUNC( QT_QCHAR_ISSYMBOL ) -{ - hb_retl( hbqt_par_QChar( 1 )->isSymbol() ); -} - -/* - * bool isTitleCase () const - */ -HB_FUNC( QT_QCHAR_ISTITLECASE ) -{ - hb_retl( hbqt_par_QChar( 1 )->isTitleCase() ); -} - -/* - * bool isUpper () const - */ -HB_FUNC( QT_QCHAR_ISUPPER ) -{ - hb_retl( hbqt_par_QChar( 1 )->isUpper() ); -} - -/* - * Joining joining () const - */ -HB_FUNC( QT_QCHAR_JOINING ) -{ - hb_retni( ( QChar::Joining ) hbqt_par_QChar( 1 )->joining() ); -} - -/* - * QChar mirroredChar () const - */ -HB_FUNC( QT_QCHAR_MIRROREDCHAR ) -{ - hb_retptrGC( hbqt_gcAllocate_QChar( new QChar( hbqt_par_QChar( 1 )->mirroredChar() ), true ) ); -} - -/* - * char toAscii () const - */ -HB_FUNC( QT_QCHAR_TOASCII ) -{ - hb_retni( hbqt_par_QChar( 1 )->toAscii() ); -} - -/* - * QChar toCaseFolded () const - */ -HB_FUNC( QT_QCHAR_TOCASEFOLDED ) -{ - hb_retptrGC( hbqt_gcAllocate_QChar( new QChar( hbqt_par_QChar( 1 )->toCaseFolded() ), true ) ); -} - -/* - * char toLatin1 () const - */ -HB_FUNC( QT_QCHAR_TOLATIN1 ) -{ - hb_retni( hbqt_par_QChar( 1 )->toLatin1() ); -} - -/* - * QChar toLower () const - */ -HB_FUNC( QT_QCHAR_TOLOWER ) -{ - hb_retptrGC( hbqt_gcAllocate_QChar( new QChar( hbqt_par_QChar( 1 )->toLower() ), true ) ); -} - -/* - * QChar toTitleCase () const - */ -HB_FUNC( QT_QCHAR_TOTITLECASE ) -{ - hb_retptrGC( hbqt_gcAllocate_QChar( new QChar( hbqt_par_QChar( 1 )->toTitleCase() ), true ) ); -} - -/* - * QChar toUpper () const - */ -HB_FUNC( QT_QCHAR_TOUPPER ) -{ - hb_retptrGC( hbqt_gcAllocate_QChar( new QChar( hbqt_par_QChar( 1 )->toUpper() ), true ) ); -} - -/* - * ushort & unicode () - */ -HB_FUNC( QT_QCHAR_UNICODE ) -{ - hb_retni( hbqt_par_QChar( 1 )->unicode() ); -} - -/* - * ushort unicode () const - */ -HB_FUNC( QT_QCHAR_UNICODE_1 ) -{ - hb_retni( hbqt_par_QChar( 1 )->unicode() ); -} - -/* - * UnicodeVersion unicodeVersion () const - */ -HB_FUNC( QT_QCHAR_UNICODEVERSION ) -{ - hb_retni( ( QChar::UnicodeVersion ) hbqt_par_QChar( 1 )->unicodeVersion() ); -} - - -/*----------------------------------------------------------------------*/ -#endif /* #if QT_VERSION >= 0x040500 */ -/*----------------------------------------------------------------------*/ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + +#include "../hbqt.h" + +/*----------------------------------------------------------------------*/ +#if QT_VERSION >= 0x040500 +/*----------------------------------------------------------------------*/ + +/* + * enum Category { Mark_NonSpacing, Mark_SpacingCombining, Mark_Enclosing, Number_DecimalDigit, ..., NoCategory } + * enum Decomposition { NoDecomposition, Canonical, Circle, Compat, ..., Wide } + * enum Direction { DirAL, DirAN, DirB, DirBN, ..., DirWS } + * enum Joining { Center, Dual, OtherJoining, Right } + * enum SpecialCharacter { Null, Nbsp, ReplacementCharacter, ObjectReplacementCharacter, ..., LineSeparator } + * enum UnicodeVersion { Unicode_1_1, Unicode_2_0, Unicode_2_1_2, Unicode_3_0, ..., Unicode_Unassigned } + */ + +/* + * Constructed[ 32/35 [ 91.43% ] ] + * + * *** Unconvered Prototypes *** + * ----------------------------- + * + * uchar cell () const + * unsigned char combiningClass () const + * uchar row () const + */ + +#include + +#include + + +/* + * QChar () + * QChar ( char ch ) + * QChar ( uchar ch ) + * QChar ( QLatin1Char ch ) + * QChar ( uchar cell, uchar row ) + * QChar ( ushort code ) + * QChar ( short code ) + * QChar ( uint code ) + * QChar ( int code ) + * QChar ( SpecialCharacter ch ) + */ + +typedef struct +{ + void * ph; + bool bNew; + QT_G_FUNC_PTR func; +} QGC_POINTER_QChar; + +QT_G_FUNC( hbqt_gcRelease_QChar ) +{ + HB_SYMBOL_UNUSED( Cargo ); + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + + if( p && p->bNew ) + { + p->ph = NULL; + } +} + +void * hbqt_gcAllocate_QChar( void * pObj, bool bNew ) +{ + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); + + p->ph = pObj; + p->bNew = bNew; + p->func = hbqt_gcRelease_QChar; + + if( bNew ) + { + HB_TRACE( HB_TR_DEBUG, ( "ph=%p _new_QChar", pObj ) ); + } + else + { + HB_TRACE( HB_TR_DEBUG, ( "ph=%p NOT_new_QChar", pObj ) ); + } + return p; +} + +HB_FUNC( QT_QCHAR ) +{ + void * pObj = NULL; + + pObj = new QChar() ; + + hb_retptrGC( hbqt_gcAllocate_QChar( pObj, true ) ); +} + +/* + * Category category () const + */ +HB_FUNC( QT_QCHAR_CATEGORY ) +{ + hb_retni( ( QChar::Category ) hbqt_par_QChar( 1 )->category() ); +} + +/* + * QString decomposition () const + */ +HB_FUNC( QT_QCHAR_DECOMPOSITION ) +{ + hb_retc( hbqt_par_QChar( 1 )->decomposition().toAscii().data() ); +} + +/* + * Decomposition decompositionTag () const + */ +HB_FUNC( QT_QCHAR_DECOMPOSITIONTAG ) +{ + hb_retni( ( QChar::Decomposition ) hbqt_par_QChar( 1 )->decompositionTag() ); +} + +/* + * int digitValue () const + */ +HB_FUNC( QT_QCHAR_DIGITVALUE ) +{ + hb_retni( hbqt_par_QChar( 1 )->digitValue() ); +} + +/* + * Direction direction () const + */ +HB_FUNC( QT_QCHAR_DIRECTION ) +{ + hb_retni( ( QChar::Direction ) hbqt_par_QChar( 1 )->direction() ); +} + +/* + * bool hasMirrored () const + */ +HB_FUNC( QT_QCHAR_HASMIRRORED ) +{ + hb_retl( hbqt_par_QChar( 1 )->hasMirrored() ); +} + +/* + * bool isDigit () const + */ +HB_FUNC( QT_QCHAR_ISDIGIT ) +{ + hb_retl( hbqt_par_QChar( 1 )->isDigit() ); +} + +/* + * bool isHighSurrogate () const + */ +HB_FUNC( QT_QCHAR_ISHIGHSURROGATE ) +{ + hb_retl( hbqt_par_QChar( 1 )->isHighSurrogate() ); +} + +/* + * bool isLetter () const + */ +HB_FUNC( QT_QCHAR_ISLETTER ) +{ + hb_retl( hbqt_par_QChar( 1 )->isLetter() ); +} + +/* + * bool isLetterOrNumber () const + */ +HB_FUNC( QT_QCHAR_ISLETTERORNUMBER ) +{ + hb_retl( hbqt_par_QChar( 1 )->isLetterOrNumber() ); +} + +/* + * bool isLowSurrogate () const + */ +HB_FUNC( QT_QCHAR_ISLOWSURROGATE ) +{ + hb_retl( hbqt_par_QChar( 1 )->isLowSurrogate() ); +} + +/* + * bool isLower () const + */ +HB_FUNC( QT_QCHAR_ISLOWER ) +{ + hb_retl( hbqt_par_QChar( 1 )->isLower() ); +} + +/* + * bool isMark () const + */ +HB_FUNC( QT_QCHAR_ISMARK ) +{ + hb_retl( hbqt_par_QChar( 1 )->isMark() ); +} + +/* + * bool isNull () const + */ +HB_FUNC( QT_QCHAR_ISNULL ) +{ + hb_retl( hbqt_par_QChar( 1 )->isNull() ); +} + +/* + * bool isNumber () const + */ +HB_FUNC( QT_QCHAR_ISNUMBER ) +{ + hb_retl( hbqt_par_QChar( 1 )->isNumber() ); +} + +/* + * bool isPrint () const + */ +HB_FUNC( QT_QCHAR_ISPRINT ) +{ + hb_retl( hbqt_par_QChar( 1 )->isPrint() ); +} + +/* + * bool isPunct () const + */ +HB_FUNC( QT_QCHAR_ISPUNCT ) +{ + hb_retl( hbqt_par_QChar( 1 )->isPunct() ); +} + +/* + * bool isSpace () const + */ +HB_FUNC( QT_QCHAR_ISSPACE ) +{ + hb_retl( hbqt_par_QChar( 1 )->isSpace() ); +} + +/* + * bool isSymbol () const + */ +HB_FUNC( QT_QCHAR_ISSYMBOL ) +{ + hb_retl( hbqt_par_QChar( 1 )->isSymbol() ); +} + +/* + * bool isTitleCase () const + */ +HB_FUNC( QT_QCHAR_ISTITLECASE ) +{ + hb_retl( hbqt_par_QChar( 1 )->isTitleCase() ); +} + +/* + * bool isUpper () const + */ +HB_FUNC( QT_QCHAR_ISUPPER ) +{ + hb_retl( hbqt_par_QChar( 1 )->isUpper() ); +} + +/* + * Joining joining () const + */ +HB_FUNC( QT_QCHAR_JOINING ) +{ + hb_retni( ( QChar::Joining ) hbqt_par_QChar( 1 )->joining() ); +} + +/* + * QChar mirroredChar () const + */ +HB_FUNC( QT_QCHAR_MIRROREDCHAR ) +{ + hb_retptrGC( hbqt_gcAllocate_QChar( new QChar( hbqt_par_QChar( 1 )->mirroredChar() ), true ) ); +} + +/* + * char toAscii () const + */ +HB_FUNC( QT_QCHAR_TOASCII ) +{ + hb_retni( hbqt_par_QChar( 1 )->toAscii() ); +} + +/* + * QChar toCaseFolded () const + */ +HB_FUNC( QT_QCHAR_TOCASEFOLDED ) +{ + hb_retptrGC( hbqt_gcAllocate_QChar( new QChar( hbqt_par_QChar( 1 )->toCaseFolded() ), true ) ); +} + +/* + * char toLatin1 () const + */ +HB_FUNC( QT_QCHAR_TOLATIN1 ) +{ + hb_retni( hbqt_par_QChar( 1 )->toLatin1() ); +} + +/* + * QChar toLower () const + */ +HB_FUNC( QT_QCHAR_TOLOWER ) +{ + hb_retptrGC( hbqt_gcAllocate_QChar( new QChar( hbqt_par_QChar( 1 )->toLower() ), true ) ); +} + +/* + * QChar toTitleCase () const + */ +HB_FUNC( QT_QCHAR_TOTITLECASE ) +{ + hb_retptrGC( hbqt_gcAllocate_QChar( new QChar( hbqt_par_QChar( 1 )->toTitleCase() ), true ) ); +} + +/* + * QChar toUpper () const + */ +HB_FUNC( QT_QCHAR_TOUPPER ) +{ + hb_retptrGC( hbqt_gcAllocate_QChar( new QChar( hbqt_par_QChar( 1 )->toUpper() ), true ) ); +} + +/* + * ushort & unicode () + */ +HB_FUNC( QT_QCHAR_UNICODE ) +{ + hb_retni( hbqt_par_QChar( 1 )->unicode() ); +} + +/* + * ushort unicode () const + */ +HB_FUNC( QT_QCHAR_UNICODE_1 ) +{ + hb_retni( hbqt_par_QChar( 1 )->unicode() ); +} + +/* + * UnicodeVersion unicodeVersion () const + */ +HB_FUNC( QT_QCHAR_UNICODEVERSION ) +{ + hb_retni( ( QChar::UnicodeVersion ) hbqt_par_QChar( 1 )->unicodeVersion() ); +} + + +/*----------------------------------------------------------------------*/ +#endif /* #if QT_VERSION >= 0x040500 */ +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtcore/TQChar.prg b/harbour/contrib/hbqt/qtcore/TQChar.prg index d59907baac..a4b003c457 100644 --- a/harbour/contrib/hbqt/qtcore/TQChar.prg +++ b/harbour/contrib/hbqt/qtcore/TQChar.prg @@ -1,241 +1,241 @@ -/* - * $Id: hbqtgen.prg 14150 2010-03-13 01:28:47Z vouchcac $ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -/* - * Harbour Project source code: - * QT wrapper main header - * - * Copyright 2009-2010 Pritpal Bedi - * - * Copyright 2009 Marcos Antonio Gambeta - * www - http://www.harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ -/*----------------------------------------------------------------------*/ - - -#include "hbclass.ch" - - -CREATE CLASS QChar INHERIT HbQtObjectHandler - - METHOD new( ... ) - - METHOD category() - METHOD decomposition() - METHOD decompositionTag() - METHOD digitValue() - METHOD direction() - METHOD hasMirrored() - METHOD isDigit() - METHOD isHighSurrogate() - METHOD isLetter() - METHOD isLetterOrNumber() - METHOD isLowSurrogate() - METHOD isLower() - METHOD isMark() - METHOD isNull() - METHOD isNumber() - METHOD isPrint() - METHOD isPunct() - METHOD isSpace() - METHOD isSymbol() - METHOD isTitleCase() - METHOD isUpper() - METHOD joining() - METHOD mirroredChar() - METHOD toAscii() - METHOD toCaseFolded() - METHOD toLatin1() - METHOD toLower() - METHOD toTitleCase() - METHOD toUpper() - METHOD unicode() - METHOD unicode_1() - METHOD unicodeVersion() - - ENDCLASS - - -METHOD QChar:new( ... ) - LOCAL p - FOR EACH p IN { ... } - hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) - NEXT - ::pPtr := Qt_QChar( ... ) - RETURN Self - - -METHOD QChar:category() - RETURN Qt_QChar_category( ::pPtr ) - - -METHOD QChar:decomposition() - RETURN Qt_QChar_decomposition( ::pPtr ) - - -METHOD QChar:decompositionTag() - RETURN Qt_QChar_decompositionTag( ::pPtr ) - - -METHOD QChar:digitValue() - RETURN Qt_QChar_digitValue( ::pPtr ) - - -METHOD QChar:direction() - RETURN Qt_QChar_direction( ::pPtr ) - - -METHOD QChar:hasMirrored() - RETURN Qt_QChar_hasMirrored( ::pPtr ) - - -METHOD QChar:isDigit() - RETURN Qt_QChar_isDigit( ::pPtr ) - - -METHOD QChar:isHighSurrogate() - RETURN Qt_QChar_isHighSurrogate( ::pPtr ) - - -METHOD QChar:isLetter() - RETURN Qt_QChar_isLetter( ::pPtr ) - - -METHOD QChar:isLetterOrNumber() - RETURN Qt_QChar_isLetterOrNumber( ::pPtr ) - - -METHOD QChar:isLowSurrogate() - RETURN Qt_QChar_isLowSurrogate( ::pPtr ) - - -METHOD QChar:isLower() - RETURN Qt_QChar_isLower( ::pPtr ) - - -METHOD QChar:isMark() - RETURN Qt_QChar_isMark( ::pPtr ) - - -METHOD QChar:isNull() - RETURN Qt_QChar_isNull( ::pPtr ) - - -METHOD QChar:isNumber() - RETURN Qt_QChar_isNumber( ::pPtr ) - - -METHOD QChar:isPrint() - RETURN Qt_QChar_isPrint( ::pPtr ) - - -METHOD QChar:isPunct() - RETURN Qt_QChar_isPunct( ::pPtr ) - - -METHOD QChar:isSpace() - RETURN Qt_QChar_isSpace( ::pPtr ) - - -METHOD QChar:isSymbol() - RETURN Qt_QChar_isSymbol( ::pPtr ) - - -METHOD QChar:isTitleCase() - RETURN Qt_QChar_isTitleCase( ::pPtr ) - - -METHOD QChar:isUpper() - RETURN Qt_QChar_isUpper( ::pPtr ) - - -METHOD QChar:joining() - RETURN Qt_QChar_joining( ::pPtr ) - - -METHOD QChar:mirroredChar() - RETURN Qt_QChar_mirroredChar( ::pPtr ) - - -METHOD QChar:toAscii() - RETURN Qt_QChar_toAscii( ::pPtr ) - - -METHOD QChar:toCaseFolded() - RETURN Qt_QChar_toCaseFolded( ::pPtr ) - - -METHOD QChar:toLatin1() - RETURN Qt_QChar_toLatin1( ::pPtr ) - - -METHOD QChar:toLower() - RETURN Qt_QChar_toLower( ::pPtr ) - - -METHOD QChar:toTitleCase() - RETURN Qt_QChar_toTitleCase( ::pPtr ) - - -METHOD QChar:toUpper() - RETURN Qt_QChar_toUpper( ::pPtr ) - - -METHOD QChar:unicode() - RETURN Qt_QChar_unicode( ::pPtr ) - - -METHOD QChar:unicode_1() - RETURN Qt_QChar_unicode_1( ::pPtr ) - - -METHOD QChar:unicodeVersion() - RETURN Qt_QChar_unicodeVersion( ::pPtr ) - +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009-2010 Pritpal Bedi + * + * Copyright 2009 Marcos Antonio Gambeta + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + + +#include "hbclass.ch" + + +CREATE CLASS QChar INHERIT HbQtObjectHandler + + METHOD new( ... ) + + METHOD category() + METHOD decomposition() + METHOD decompositionTag() + METHOD digitValue() + METHOD direction() + METHOD hasMirrored() + METHOD isDigit() + METHOD isHighSurrogate() + METHOD isLetter() + METHOD isLetterOrNumber() + METHOD isLowSurrogate() + METHOD isLower() + METHOD isMark() + METHOD isNull() + METHOD isNumber() + METHOD isPrint() + METHOD isPunct() + METHOD isSpace() + METHOD isSymbol() + METHOD isTitleCase() + METHOD isUpper() + METHOD joining() + METHOD mirroredChar() + METHOD toAscii() + METHOD toCaseFolded() + METHOD toLatin1() + METHOD toLower() + METHOD toTitleCase() + METHOD toUpper() + METHOD unicode() + METHOD unicode_1() + METHOD unicodeVersion() + + ENDCLASS + + +METHOD QChar:new( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + ::pPtr := Qt_QChar( ... ) + RETURN Self + + +METHOD QChar:category() + RETURN Qt_QChar_category( ::pPtr ) + + +METHOD QChar:decomposition() + RETURN Qt_QChar_decomposition( ::pPtr ) + + +METHOD QChar:decompositionTag() + RETURN Qt_QChar_decompositionTag( ::pPtr ) + + +METHOD QChar:digitValue() + RETURN Qt_QChar_digitValue( ::pPtr ) + + +METHOD QChar:direction() + RETURN Qt_QChar_direction( ::pPtr ) + + +METHOD QChar:hasMirrored() + RETURN Qt_QChar_hasMirrored( ::pPtr ) + + +METHOD QChar:isDigit() + RETURN Qt_QChar_isDigit( ::pPtr ) + + +METHOD QChar:isHighSurrogate() + RETURN Qt_QChar_isHighSurrogate( ::pPtr ) + + +METHOD QChar:isLetter() + RETURN Qt_QChar_isLetter( ::pPtr ) + + +METHOD QChar:isLetterOrNumber() + RETURN Qt_QChar_isLetterOrNumber( ::pPtr ) + + +METHOD QChar:isLowSurrogate() + RETURN Qt_QChar_isLowSurrogate( ::pPtr ) + + +METHOD QChar:isLower() + RETURN Qt_QChar_isLower( ::pPtr ) + + +METHOD QChar:isMark() + RETURN Qt_QChar_isMark( ::pPtr ) + + +METHOD QChar:isNull() + RETURN Qt_QChar_isNull( ::pPtr ) + + +METHOD QChar:isNumber() + RETURN Qt_QChar_isNumber( ::pPtr ) + + +METHOD QChar:isPrint() + RETURN Qt_QChar_isPrint( ::pPtr ) + + +METHOD QChar:isPunct() + RETURN Qt_QChar_isPunct( ::pPtr ) + + +METHOD QChar:isSpace() + RETURN Qt_QChar_isSpace( ::pPtr ) + + +METHOD QChar:isSymbol() + RETURN Qt_QChar_isSymbol( ::pPtr ) + + +METHOD QChar:isTitleCase() + RETURN Qt_QChar_isTitleCase( ::pPtr ) + + +METHOD QChar:isUpper() + RETURN Qt_QChar_isUpper( ::pPtr ) + + +METHOD QChar:joining() + RETURN Qt_QChar_joining( ::pPtr ) + + +METHOD QChar:mirroredChar() + RETURN Qt_QChar_mirroredChar( ::pPtr ) + + +METHOD QChar:toAscii() + RETURN Qt_QChar_toAscii( ::pPtr ) + + +METHOD QChar:toCaseFolded() + RETURN Qt_QChar_toCaseFolded( ::pPtr ) + + +METHOD QChar:toLatin1() + RETURN Qt_QChar_toLatin1( ::pPtr ) + + +METHOD QChar:toLower() + RETURN Qt_QChar_toLower( ::pPtr ) + + +METHOD QChar:toTitleCase() + RETURN Qt_QChar_toTitleCase( ::pPtr ) + + +METHOD QChar:toUpper() + RETURN Qt_QChar_toUpper( ::pPtr ) + + +METHOD QChar:unicode() + RETURN Qt_QChar_unicode( ::pPtr ) + + +METHOD QChar:unicode_1() + RETURN Qt_QChar_unicode_1( ::pPtr ) + + +METHOD QChar:unicodeVersion() + RETURN Qt_QChar_unicodeVersion( ::pPtr ) + diff --git a/harbour/contrib/hbqt/qtgui/QInputContext.cpp b/harbour/contrib/hbqt/qtgui/QInputContext.cpp index 42adb53664..1dc1bbbbea 100644 --- a/harbour/contrib/hbqt/qtgui/QInputContext.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputContext.cpp @@ -115,7 +115,7 @@ void * hbqt_gcAllocate_QInputContext( void * pObj, bool bNew ) if( bNew ) { new( & p->pq ) QPointer< QInputContext >( ( QInputContext * ) pObj ); - HB_TRACE( HB_TR_DEBUG, ( " _new_QInputContext ph=%p %i B %i KB", pObj, ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) ); + HB_TRACE( HB_TR_DEBUG, ( " _new_QInputContext ph=%p", pObj ) ); } return p; }