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

2010-05-27 00:45 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* 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*()
This commit is contained in:
Pritpal Bedi
2010-05-27 07:51:42 +00:00
parent 70059b6050
commit d291ccc0c8
34 changed files with 155 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
harbour/ChangeLog
View File

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

1
harbour/contrib/hbqt/doc/en/class_qchar.txt
View File

@@ -29,6 +29,7 @@
An instance of the object of type QChar
$METHODS$
:category() -> nCategory
:combiningClass() -> nUnsigned
:decomposition() -> cQString
:decompositionTag() -> nDecomposition
:digitValue() -> nInt

2
harbour/contrib/hbqt/doc/en/class_qthread.txt
View File

@@ -35,7 +35,7 @@
:setPriority( nPriority ) -> NIL
:setStackSize( nStackSize ) -> NIL
:stackSize() -> nUint
:wait() -> lBool
:wait( nTime ) -> lBool
:idealThreadCount() -> nInt
:yieldCurrentThread() -> NIL
:quit() -> NIL

1
harbour/contrib/hbqt/hbqscintilla/HBQsciScintilla.cpp
View File

@@ -70,6 +70,7 @@
#include "hbqt_hbqsciscintilla.h"
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/QsciAPIs.cpp
View File

@@ -78,6 +78,7 @@
#include <qsciapis.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/QsciAbstractAPIs.cpp
View File

@@ -78,6 +78,7 @@
#include <qsciabstractapis.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/QsciCommand.cpp
View File

@@ -69,6 +69,7 @@
#include <qscicommand.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/QsciCommandSet.cpp
View File

@@ -78,6 +78,7 @@
#include <qscicommandset.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/QsciDocument.cpp
View File

@@ -69,6 +69,7 @@
#include <qscidocument.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/QsciLexer.cpp
View File

@@ -69,6 +69,7 @@
#include <qscilexer.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/QsciLexerCPP.cpp
View File

@@ -81,6 +81,7 @@
#include <qscilexercpp.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/QsciLexerFlagship.cpp
View File

@@ -81,6 +81,7 @@
#include <qscilexerflagship.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/QsciScintilla.cpp
View File

@@ -116,6 +116,7 @@
#include "qsciscintilla.h"
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

2
harbour/contrib/hbqt/hbqscintilla/QsciStyle.cpp
View File

@@ -73,7 +73,7 @@
#include <qscistyle.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*
* QsciStyle (int style=-1)

1
harbour/contrib/hbqt/hbqscintilla/QsciStyledText.cpp
View File

@@ -69,6 +69,7 @@
#include <qscistyledtext.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

70
harbour/contrib/hbqt/hbqscintilla/hbqt_local.h Normal file
View File

@@ -0,0 +1,70 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2010 Pritpal Bedi <pritpal@vouchcac.com>
*
* 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 */

1
harbour/contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth
View File

@@ -66,6 +66,7 @@ Folder = qscintilla
#include "hbqt_hbqsciscintilla.h"
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth
View File

@@ -71,6 +71,7 @@ Folder = hbqscintilla
<CODE>
#include <qsciapis.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth
View File

@@ -71,6 +71,7 @@ Folder = hbqscintilla
<CODE>
#include <qsciabstractapis.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/qth/QsciCommand.qth
View File

@@ -71,6 +71,7 @@ Folder = hbqscintilla
<CODE>
#include <qscicommand.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth
View File

@@ -71,6 +71,7 @@ Folder = hbqscintilla
<CODE>
#include <qscicommandset.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/qth/QsciDocument.qth
View File

@@ -71,6 +71,7 @@ Folder = hbqscintilla
<CODE>
#include <qscidocument.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/qth/QsciLexer.qth
View File

@@ -72,6 +72,7 @@ Destructor = no
<CODE>
#include <qscilexer.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth
View File

@@ -71,6 +71,7 @@ Folder = hbqscintilla
<CODE>
#include <qscilexercpp.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth
View File

@@ -71,6 +71,7 @@ Folder = hbqscintilla
<CODE>
#include <qscilexerflagship.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

1
harbour/contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth
View File

@@ -66,6 +66,7 @@ Folder = hbqscintilla
#include "qsciscintilla.h"
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

2
harbour/contrib/hbqt/hbqscintilla/qth/QsciStyle.qth
View File

@@ -71,7 +71,7 @@ Folder = hbqscintilla
<CODE>
#include <qscistyle.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*
* QsciStyle (int style=-1)

1
harbour/contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth
View File

@@ -71,6 +71,7 @@ Folder = hbqscintilla
<CODE>
#include <qscistyledtext.h>
#include "hbqt_garbage.h"
#include "hbqt_local.h"
/*

14
harbour/contrib/hbqt/hbqt.h
View File

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

17
harbour/contrib/hbqt/qtcore/QChar.cpp
View File

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

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

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

5
harbour/contrib/hbqt/qtcore/TQChar.prg
View File

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

6
harbour/contrib/hbqt/qtcore/TQThread.prg
View File

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

3
harbour/contrib/hbqt/qth/QThread.qth
View File

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