diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0e7644f76d..e66ad97478 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,37 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-05-27 00:45 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth + * contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth + * contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth + * contrib/hbqt/hbqscintilla/qth/QsciCommand.qth + * contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth + * contrib/hbqt/hbqscintilla/qth/QsciDocument.qth + * contrib/hbqt/hbqscintilla/qth/QsciLexer.qth + * contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth + * contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth + * contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth + * contrib/hbqt/hbqscintilla/qth/QsciStyle.qth + * contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth + + * contrib/hbqt/hbqscintilla/QSci*.cpp + + + contrib/hbqt/hbqscintilla/hbqt_local.h + + Localized: hbqt_par_Qsci*() + + * contrib/hbqt/doc/en/class_qchar.txt + * contrib/hbqt/doc/en/class_qthread.txt + * contrib/hbqt/qtcore/QChar.cpp + * contrib/hbqt/qtcore/QThread.cpp + * contrib/hbqt/qtcore/TQChar.prg + * contrib/hbqt/qtcore/TQThread.prg + * contrib/hbqt/qth/QThread.qth + ! Regenerated. + + * contrib/hbqt/hbqt.h + - Removed: hbqt_par_Qsci*() + 2010-05-27 08:11 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/gtwvg/wvgsink.c ! updated WVG OLE code to use new hb_oleVariantUpdate() parameters diff --git a/harbour/contrib/hbqt/doc/en/class_qchar.txt b/harbour/contrib/hbqt/doc/en/class_qchar.txt index 91fbadd24a..94719dcc2a 100644 --- a/harbour/contrib/hbqt/doc/en/class_qchar.txt +++ b/harbour/contrib/hbqt/doc/en/class_qchar.txt @@ -29,6 +29,7 @@ An instance of the object of type QChar $METHODS$ :category() -> nCategory + :combiningClass() -> nUnsigned :decomposition() -> cQString :decompositionTag() -> nDecomposition :digitValue() -> nInt diff --git a/harbour/contrib/hbqt/doc/en/class_qthread.txt b/harbour/contrib/hbqt/doc/en/class_qthread.txt index 9388a96487..e6a3dd02a5 100644 --- a/harbour/contrib/hbqt/doc/en/class_qthread.txt +++ b/harbour/contrib/hbqt/doc/en/class_qthread.txt @@ -35,7 +35,7 @@ :setPriority( nPriority ) -> NIL :setStackSize( nStackSize ) -> NIL :stackSize() -> nUint - :wait() -> lBool + :wait( nTime ) -> lBool :idealThreadCount() -> nInt :yieldCurrentThread() -> NIL :quit() -> NIL diff --git a/harbour/contrib/hbqt/hbqscintilla/HBQsciScintilla.cpp b/harbour/contrib/hbqt/hbqscintilla/HBQsciScintilla.cpp index 6ea4bf1578..67c8e7e48b 100644 --- a/harbour/contrib/hbqt/hbqscintilla/HBQsciScintilla.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/HBQsciScintilla.cpp @@ -70,6 +70,7 @@ #include "hbqt_hbqsciscintilla.h" #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciAPIs.cpp b/harbour/contrib/hbqt/hbqscintilla/QsciAPIs.cpp index c5922e9baf..485e793e58 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciAPIs.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/QsciAPIs.cpp @@ -78,6 +78,7 @@ #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciAbstractAPIs.cpp b/harbour/contrib/hbqt/hbqscintilla/QsciAbstractAPIs.cpp index 55c50c2d9a..4e92465c52 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciAbstractAPIs.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/QsciAbstractAPIs.cpp @@ -78,6 +78,7 @@ #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciCommand.cpp b/harbour/contrib/hbqt/hbqscintilla/QsciCommand.cpp index 8923d357ef..f8b6ca50d6 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciCommand.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/QsciCommand.cpp @@ -69,6 +69,7 @@ #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciCommandSet.cpp b/harbour/contrib/hbqt/hbqscintilla/QsciCommandSet.cpp index 758f223280..5a969f3e5e 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciCommandSet.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/QsciCommandSet.cpp @@ -78,6 +78,7 @@ #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciDocument.cpp b/harbour/contrib/hbqt/hbqscintilla/QsciDocument.cpp index f20f4ad171..79432cddd8 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciDocument.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/QsciDocument.cpp @@ -69,6 +69,7 @@ #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciLexer.cpp b/harbour/contrib/hbqt/hbqscintilla/QsciLexer.cpp index f2e0d58152..b0c98b2d68 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciLexer.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/QsciLexer.cpp @@ -69,6 +69,7 @@ #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciLexerCPP.cpp b/harbour/contrib/hbqt/hbqscintilla/QsciLexerCPP.cpp index cb3c8aceb6..cdd15e282f 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciLexerCPP.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/QsciLexerCPP.cpp @@ -81,6 +81,7 @@ #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciLexerFlagship.cpp b/harbour/contrib/hbqt/hbqscintilla/QsciLexerFlagship.cpp index 11d9f6e0c7..9fbcc2d348 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciLexerFlagship.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/QsciLexerFlagship.cpp @@ -81,6 +81,7 @@ #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciScintilla.cpp b/harbour/contrib/hbqt/hbqscintilla/QsciScintilla.cpp index f40901f3fe..070b7f95ee 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciScintilla.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/QsciScintilla.cpp @@ -116,6 +116,7 @@ #include "qsciscintilla.h" #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciStyle.cpp b/harbour/contrib/hbqt/hbqscintilla/QsciStyle.cpp index a608382ce7..1f71a58f21 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciStyle.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/QsciStyle.cpp @@ -73,7 +73,7 @@ #include #include "hbqt_garbage.h" - +#include "hbqt_local.h" /* * QsciStyle (int style=-1) diff --git a/harbour/contrib/hbqt/hbqscintilla/QsciStyledText.cpp b/harbour/contrib/hbqt/hbqscintilla/QsciStyledText.cpp index ac62196e83..b675a01bb2 100644 --- a/harbour/contrib/hbqt/hbqscintilla/QsciStyledText.cpp +++ b/harbour/contrib/hbqt/hbqscintilla/QsciStyledText.cpp @@ -69,6 +69,7 @@ #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqt_local.h b/harbour/contrib/hbqt/hbqscintilla/hbqt_local.h new file mode 100644 index 0000000000..bf88981f7f --- /dev/null +++ b/harbour/contrib/hbqt/hbqscintilla/hbqt_local.h @@ -0,0 +1,70 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2010 Pritpal Bedi + * + * 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. + * + */ +/*----------------------------------------------------------------------*/ + + +#ifndef __HBQT_LOCAL_H +#define __HBQT_LOCAL_H + +#define hbqt_par_HBQsciScintilla( n ) ( ( HBQsciScintilla * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciScintilla( n ) ( ( QsciScintilla * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciLexer( n ) ( ( QsciLexer * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciLexerCPP( n ) ( ( QsciLexerCPP * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciLexerFlagship( n ) ( ( QsciLexerFlagship * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciAbstractAPIs( n ) ( ( QsciAbstractAPIs * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciAPIs( n ) ( ( QsciAPIs * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciDocument( n ) ( ( QsciDocument * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciStyle( n ) ( ( QsciStyle * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciStyledText( n ) ( ( QsciStyledText * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciCommand( n ) ( ( QsciCommand * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QsciCommandSet( n ) ( ( QsciCommandSet * ) hbqt_gcpointer( n ) ) + +#endif /* __HBQT_LOCAL_H */ diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth b/harbour/contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth index 34fc172a22..7e6cb7ac98 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth @@ -66,6 +66,7 @@ Folder = qscintilla #include "hbqt_hbqsciscintilla.h" #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth index db75d1c1c5..a64d9de4b1 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth @@ -71,6 +71,7 @@ Folder = hbqscintilla #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth index c01c77b9b5..03f6b529cc 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth @@ -71,6 +71,7 @@ Folder = hbqscintilla #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommand.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommand.qth index 01ee0f3053..acf4b536fe 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommand.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommand.qth @@ -71,6 +71,7 @@ Folder = hbqscintilla #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth index b8338d63ec..6f7a724cd8 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth @@ -71,6 +71,7 @@ Folder = hbqscintilla #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciDocument.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciDocument.qth index f5456db117..09d59e4740 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciDocument.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciDocument.qth @@ -71,6 +71,7 @@ Folder = hbqscintilla #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexer.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexer.qth index 7968fa49ec..11fe971bfc 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexer.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexer.qth @@ -72,6 +72,7 @@ Destructor = no #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth index 2028898586..690a46b251 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth @@ -71,6 +71,7 @@ Folder = hbqscintilla #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth index 62bed5e664..8a2f40370d 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth @@ -71,6 +71,7 @@ Folder = hbqscintilla #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth index 356143e8b1..893dbf8663 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth @@ -66,6 +66,7 @@ Folder = hbqscintilla #include "qsciscintilla.h" #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyle.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyle.qth index 4e8cb8c43b..3aeadeec62 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyle.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyle.qth @@ -71,7 +71,7 @@ Folder = hbqscintilla #include #include "hbqt_garbage.h" - +#include "hbqt_local.h" /* * QsciStyle (int style=-1) diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth b/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth index e680c79af4..3cb6d57fa2 100644 --- a/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth +++ b/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth @@ -71,6 +71,7 @@ Folder = hbqscintilla #include #include "hbqt_garbage.h" +#include "hbqt_local.h" /* diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index ed6b6e126f..a4eff6bf2e 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -407,20 +407,6 @@ extern void * hbqt_pPtrFromItem( PHB_ITEM pObj ); #define hbqt_par_HBQTextBlockUserData( n ) ( ( HBQTextBlockUserData * ) hbqt_gcpointer( n ) ) #define hbqt_par_HBSlots( n ) ( ( HBSlots * ) hbqt_gcpointer( n ) ) -#define hbqt_par_HBQsciScintilla( n ) ( ( HBQsciScintilla * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciScintilla( n ) ( ( QsciScintilla * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciLexer( n ) ( ( QsciLexer * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciLexerCPP( n ) ( ( QsciLexerCPP * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciLexerFlagship( n ) ( ( QsciLexerFlagship * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciAbstractAPIs( n ) ( ( QsciAbstractAPIs * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciAPIs( n ) ( ( QsciAPIs * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciDocument( n ) ( ( QsciDocument * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciStyle( n ) ( ( QsciStyle * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciStyledText( n ) ( ( QsciStyledText * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciCommand( n ) ( ( QsciCommand * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QsciCommandSet( n ) ( ( QsciCommandSet * ) hbqt_gcpointer( n ) ) - - #define hbqt_par_QString( n ) ( ( QString ) hb_parcx( n ) ) #define hbqt_par_QRgb( n ) ( hb_parnint( n ) ) #define hbqt_par_Bool( n ) ( hb_parl( n ) ) diff --git a/harbour/contrib/hbqt/qtcore/QChar.cpp b/harbour/contrib/hbqt/qtcore/QChar.cpp index feff9e5191..7192fa015d 100644 --- a/harbour/contrib/hbqt/qtcore/QChar.cpp +++ b/harbour/contrib/hbqt/qtcore/QChar.cpp @@ -75,13 +75,12 @@ */ /* - * Constructed[ 32/35 [ 91.43% ] ] + * Constructed[ 33/35 [ 94.29% ] ] * * *** Unconvered Prototypes *** * ----------------------------- * * uchar cell () const - * unsigned char combiningClass () const * uchar row () const */ @@ -163,6 +162,20 @@ HB_FUNC( QT_QCHAR_CATEGORY ) } } +/* + * unsigned char combiningClass () const + */ +HB_FUNC( QT_QCHAR_COMBININGCLASS ) +{ + QChar * p = hbqt_par_QChar( 1 ); + if( p ) + hb_retni( ( p )->combiningClass() ); + else + { + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QCHAR_COMBININGCLASS FP=hb_retni( ( p )->combiningClass() ); p is NULL" ) ); + } +} + /* * QString decomposition () const */ diff --git a/harbour/contrib/hbqt/qtcore/QThread.cpp b/harbour/contrib/hbqt/qtcore/QThread.cpp index 2ca524d4a9..bb8d8d8a8a 100644 --- a/harbour/contrib/hbqt/qtcore/QThread.cpp +++ b/harbour/contrib/hbqt/qtcore/QThread.cpp @@ -249,16 +249,16 @@ HB_FUNC( QT_QTHREAD_STACKSIZE ) } /* - * bool wait ( unsigned long time = ULONG_MAX ) + * bool wait ( ulong time = ULONG_MAX ) */ HB_FUNC( QT_QTHREAD_WAIT ) { QThread * p = hbqt_par_QThread( 1 ); if( p ) - hb_retl( ( p )->wait() ); + hb_retl( ( p )->wait( ( HB_ISNUM( 2 ) ? ( ulong ) hb_parnint( 2 ) : ULONG_MAX ) ) ); else { - HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTHREAD_WAIT FP=hb_retl( ( p )->wait() ); p is NULL" ) ); + HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTHREAD_WAIT FP=hb_retl( ( p )->wait( ( HB_ISNUM( 2 ) ? ( ulong ) hb_parnint( 2 ) : ULONG_MAX ) ) ); p is NULL" ) ); } } diff --git a/harbour/contrib/hbqt/qtcore/TQChar.prg b/harbour/contrib/hbqt/qtcore/TQChar.prg index a4b003c457..24bd8587ed 100644 --- a/harbour/contrib/hbqt/qtcore/TQChar.prg +++ b/harbour/contrib/hbqt/qtcore/TQChar.prg @@ -68,6 +68,7 @@ CREATE CLASS QChar INHERIT HbQtObjectHandler METHOD new( ... ) METHOD category() + METHOD combiningClass() METHOD decomposition() METHOD decompositionTag() METHOD digitValue() @@ -116,6 +117,10 @@ METHOD QChar:category() RETURN Qt_QChar_category( ::pPtr ) +METHOD QChar:combiningClass() + RETURN Qt_QChar_combiningClass( ::pPtr ) + + METHOD QChar:decomposition() RETURN Qt_QChar_decomposition( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/TQThread.prg b/harbour/contrib/hbqt/qtcore/TQThread.prg index eae9af8f5d..0965f7181b 100644 --- a/harbour/contrib/hbqt/qtcore/TQThread.prg +++ b/harbour/contrib/hbqt/qtcore/TQThread.prg @@ -74,7 +74,7 @@ CREATE CLASS QThread INHERIT HbQtObjectHandler, QObject METHOD setPriority( nPriority ) METHOD setStackSize( nStackSize ) METHOD stackSize() - METHOD wait() + METHOD wait( nTime ) METHOD currentThread() METHOD idealThreadCount() METHOD yieldCurrentThread() @@ -122,8 +122,8 @@ METHOD QThread:stackSize() RETURN Qt_QThread_stackSize( ::pPtr ) -METHOD QThread:wait() - RETURN Qt_QThread_wait( ::pPtr ) +METHOD QThread:wait( nTime ) + RETURN Qt_QThread_wait( ::pPtr, nTime ) METHOD QThread:currentThread() diff --git a/harbour/contrib/hbqt/qth/QThread.qth b/harbour/contrib/hbqt/qth/QThread.qth index f589a2ccdf..244b74500c 100644 --- a/harbour/contrib/hbqt/qth/QThread.qth +++ b/harbour/contrib/hbqt/qth/QThread.qth @@ -87,7 +87,8 @@ Priority priority () const void setPriority ( Priority priority ) void setStackSize ( uint stackSize ) uint stackSize () const -bool wait ( unsigned long time = ULONG_MAX ) +#bool wait ( unsigned long time = ULONG_MAX ) +bool wait ( ulong time = ULONG_MAX ) QThread * currentThread () // Qt::HANDLE currentThreadId ()