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

2011-03-09 09:07 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/gtwvt/gtwvt.c
    * Indenting.

  * INSTALL
    + Added new ghostscript link. [Tamas Tevesz]
      (left the old one as it has some information the new one doesn't)

  * contrib/hbqt/hbmk2_qt.hbs
  * contrib/hbqt/qtgui/qth/*.qth
  * contrib/hbqt/qtcore/hbqt_pointer.cpp
  * contrib/hbqt/qtcore/hbqt.h
  * contrib/hbqt/qtcore/qth/*.qth
  * contrib/hbqt/qtnetwork/qth/*.qth
  * contrib/hbqt/qscintilla/qth/*.qth
  * contrib/hbqt/qtdesigner/qth/*.qth
    + Patch to move wrapper code to C++. [Francesco Perillo]
    * My mods:
         - Restored the way registerResource() is implemented.
           (TODO: needs generic solution)
         - Formatting, some cleanups.
         - Minor corrections in generated code format (more TBD)
         - Deleted some unused code
         - Refixed strcpy() usage.
         - Added C++ puller for __QT* symbol.
         - Added manual version of HBQEventsFromPointer() which is still needed
           by hbqtcore. (TOFIX)
      Please test.
    ; TOFIX: Remove remaining generated .prg, holding this code:
             FUNCTION QtClass( ... )
                RETURN HB_QtClass():new( ... )
             Any takers?
This commit is contained in:
Viktor Szakats
2011-03-09 08:10:56 +00:00
parent e129a1f268
commit 4908697aa5
114 changed files with 691 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
harbour/ChangeLog
View File

@@ -16,6 +16,39 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-03-09 09:07 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/gtwvt/gtwvt.c
* Indenting.
* INSTALL
+ Added new ghostscript link. [Tamas Tevesz]
(left the old one as it has some information the new one doesn't)
* contrib/hbqt/hbmk2_qt.hbs
* contrib/hbqt/qtgui/qth/*.qth
* contrib/hbqt/qtcore/hbqt_pointer.cpp
* contrib/hbqt/qtcore/hbqt.h
* contrib/hbqt/qtcore/qth/*.qth
* contrib/hbqt/qtnetwork/qth/*.qth
* contrib/hbqt/qscintilla/qth/*.qth
* contrib/hbqt/qtdesigner/qth/*.qth
+ Patch to move wrapper code to C++. [Francesco Perillo]
* My mods:
- Restored the way registerResource() is implemented.
(TODO: needs generic solution)
- Formatting, some cleanups.
- Minor corrections in generated code format (more TBD)
- Deleted some unused code
- Refixed strcpy() usage.
- Added C++ puller for __QT* symbol.
- Added manual version of HBQEventsFromPointer() which is still needed
by hbqtcore. (TOFIX)
Please test.
; TOFIX: Remove remaining generated .prg, holding this code:
FUNCTION QtClass( ... )
RETURN HB_QtClass():new( ... )
Any takers?
2011-03-08 23:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbgs/core.c
* HB_GSAPI_REVISION() changed to return integer result like the

1
harbour/INSTALL
View File

@@ -1513,6 +1513,7 @@ HARBOUR
HB_WITH_GD - GD Graphics Library [multiplatform, free, open-source]
http://www.boutell.com/gd/
HB_WITH_GS - Ghostscript [multiplatform, free, open-source]
http://www.ghostscript.com/
http://pages.cs.wisc.edu/~ghost/
HB_WITH_JPEG - jpeglib [multiplatform, free, open-source]
http://www.ijg.org/

720
harbour/contrib/hbqt/hbmk2_qt.hbs
View File

File diff suppressed because it is too large Load Diff

2
harbour/contrib/hbqt/qscintilla/qth/QsciDocument.qth
View File

@@ -36,7 +36,7 @@ Folder = hbqscintilla
*/
HB_FUNC( QT_QSCIDOCUMENT )
{
if( HB_ISPOINTER( 1 ) )
if( HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QsciDocument( *hbqt_par_QsciDocument( 1 ) ) );
}

4
harbour/contrib/hbqt/qscintilla/qth/QsciLexerCPP.qth
View File

@@ -36,7 +36,7 @@ Folder = hbqscintilla
*/
HB_FUNC( QT_QSCILEXERCPP )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QsciLexerCPP( hbqt_par_QObject( 1 ) ) );
}
@@ -44,7 +44,7 @@ HB_FUNC( QT_QSCILEXERCPP )
{
__HB_RETPTRGC__( new QsciLexerCPP( 0, hb_parl( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISLOG( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISLOG( 2 ) )
{
__HB_RETPTRGC__( new QsciLexerCPP( hbqt_par_QObject( 1 ), hb_parl( 2 ) ) );
}

4
harbour/contrib/hbqt/qscintilla/qth/QsciLexerFlagship.qth
View File

@@ -36,7 +36,7 @@ Folder = hbqscintilla
*/
HB_FUNC( QT_QSCILEXERFLAGSHIP )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QsciLexerFlagship( hbqt_par_QObject( 1 ) ) );
}
@@ -44,7 +44,7 @@ HB_FUNC( QT_QSCILEXERFLAGSHIP )
{
__HB_RETPTRGC__( new QsciLexerFlagship( 0, hb_parl( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISLOG( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISLOG( 2 ) )
{
__HB_RETPTRGC__( new QsciLexerFlagship( hbqt_par_QObject( 1 ), hb_parl( 2 ) ) );
}

2
harbour/contrib/hbqt/qscintilla/qth/QsciScintilla.qth
View File

@@ -73,7 +73,7 @@ Folder = hbqscintilla
*/
HB_FUNC( QT_QSCISCINTILLA )
{
if( HB_ISPOINTER( 1 ) )
if( HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QsciScintilla( hbqt_par_QWidget( 1 ) ) );
}

2
harbour/contrib/hbqt/qscintilla/qth/QsciStyledText.qth
View File

@@ -40,7 +40,7 @@ HB_FUNC( QT_QSCISTYLEDTEXT )
{
__HB_RETPTRGC__( new QsciStyledText( hbqt_par_QString( 1 ), hb_parni( 2 ) ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QsciStyledText( hbqt_par_QString( 1 ), *hbqt_par_QsciStyle( 2 ) ) );
}

6
harbour/contrib/hbqt/qtcore/hbqt.h
View File

@@ -97,13 +97,17 @@ extern HB_EXPORT void * hbqt_gcpointer( int iParam );
extern HB_EXPORT void * hbqt_detachgcpointer( int iParam );
extern HB_EXPORT const HB_GC_FUNCS * hbqt_gcFuncs( void );
extern HB_EXPORT void * hbqt_pPtrFromObj( int iParam );
extern HB_EXPORT int hbqt_IsObjectType( int iParam, HB_U32 iType );
extern HB_EXPORT int hbqt_isObjectType( int iParam, HB_U32 iType ); /* check if parameter iParam is EXACTLY of type iType */
extern HB_EXPORT void hbqt_errRT_ARG( void );
extern HB_EXPORT PHB_ITEM hbqt_defineClassBegin( const char* szClsName, PHB_ITEM s_oClass, const char* szParentClsStr );
extern HB_EXPORT void hbqt_defineClassEnd( PHB_ITEM s_oClass, PHB_ITEM oClass );
extern HB_EXPORT void * hbqt_getqtptr( void );
extern HB_EXPORT PHB_ITEM hbqt_create_object( void * pObject, const char * pszObjectName );
extern HB_EXPORT PHB_ITEM hbqt_create_objectGC( void * pObject, const char * pszObjectName );
extern HB_EXPORT void hbqt_itemPushReturn( void* ptr, PHB_ITEM pSelf );
extern HB_EXPORT void hbqt_set_pptr( void * ptr, PHB_ITEM pSelf );
extern HB_EXPORT HBQT_GC_T * hbqt_getObjectGC( int iParam ); /* returns a pointer to the HBQT_GC_T area */
HB_EXTERN_END
#define hbqt_par_QString( n ) ( ( QString ) hb_parcx( n ) )

8
harbour/contrib/hbqt/qtcore/hbqt_misc.prg
View File

@@ -121,6 +121,14 @@ METHOD HbQtObjectHandler:onError()
/*----------------------------------------------------------------------*/
/* TOFIX: Eliminate that */
STATIC FUNCTION HBQEventsFromPointer( ... )
LOCAL p
FOR EACH p IN { ... }
hb_pvalue( p:__enumIndex(), __hbqt_ptr( p ) )
NEXT
RETURN HB_HBQEvents():fromPointer( ... )
METHOD HbQtObjectHandler:connect( cnEvent, bBlock )
LOCAL nResult

173
harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp
View File

@@ -55,7 +55,9 @@
#include "hbqt.h"
#include "hbapi.h"
#include "hbapiitm.h"
#include "hbapicls.h"
#include "hbinit.h"
#include "hbapierr.h"
#include "hbvm.h"
@@ -175,34 +177,135 @@ void * hbqt_gcpointer( int iParam )
void * hbqt_pPtrFromObj( int iParam )
{
static PHB_DYNS s_pDyns_hPPtrAssign = NULL;
PHB_ITEM pObj;
void * pointer;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_pPtrFromObj( %d )", iParam ) );
if( ! s_pDyns_hPPtrAssign )
s_pDyns_hPPtrAssign = hb_dynsymGetCase( "PPTR" );
pObj = hb_param( iParam, HB_IT_ANY );
if( hb_itemType( pObj ) == HB_IT_OBJECT )
{
hb_vmPushSymbol( hb_dynsymSymbol( hb_dynsymFindName( "PPTR" ) ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_pPtrFromObj= IS_OBJECT" ) );
hb_vmPushDynSym( s_pDyns_hPPtrAssign );
hb_vmPush( pObj );
hb_vmSend( 0 );
return hbqt_gcpointer( -1 );
pointer = hbqt_gcpointer( -1 );
if ( iParam == 0 && ! pointer )
hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
return pointer;
}
else if( hb_itemType( pObj ) == HB_IT_POINTER )
return hbqt_gcpointer( iParam );
{
HB_TRACE( HB_TR_DEBUG, ( "hbqt_pPtrFromObj= IS_POINTER" ) );
pointer = hbqt_gcpointer( iParam );
if ( iParam == 0 && ! pointer )
hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
return pointer;
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "hbqt_pPtrFromObj(): returns NULL" ) );
if ( iParam == 0 )
hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
return NULL; /* TODO: Still better if RTE. */
}
}
int hbqt_IsObjectType( int iParam, HB_U32 iType )
void hbqt_set_pptr( void * ptr, PHB_ITEM pSelf )
{
static PHB_DYNS s_pDyns_hPPtrAssign = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_set_pptr( ptr =%p, pSelf=%p )", ptr, pSelf ) );
// get the position of _PPTR member, the
// leading underscore because I want to write to it
if( ! s_pDyns_hPPtrAssign )
s_pDyns_hPPtrAssign = hb_dynsymGetCase( "_PPTR" );
if( pSelf == NULL )
{
HB_TRACE( HB_TR_DEBUG, ( "hbqt_set_pptr(): returns NULL" ) );
return; /* TODO: Still better if RTE. */
}
// push the _PPTR address
hb_vmPushDynSym( s_pDyns_hPPtrAssign );
// push the instance we want change _PPTR value
// it was already on the stack, but we push a pointer to it
hb_vmPush( pSelf );
// push the actual value
hb_vmPushPointerGC( ptr );
// run the command with 1 parameter
hb_vmSend( 1 );
}
void hbqt_itemPushReturn( void* ptr, PHB_ITEM pSelf )
{
HB_TRACE( HB_TR_DEBUG, ( "itemPushReturn( ptr =%p, pSelf=%p )", ptr, pSelf ) );
// get the position of _PPTR member, the
// leading underscore because I want to write to it
if( pSelf == NULL )
pSelf = hb_stackSelfItem();
hbqt_set_pptr( ptr, pSelf );
if( hb_stackReturnItem() != pSelf )
hb_itemReturn( pSelf );
}
HBQT_GC_T * hbqt_getObjectGC( int iParam )
{
static PHB_DYNS s_pDyns_hPPtr= NULL;
PHB_ITEM pItem;
if( ! s_pDyns_hPPtr)
s_pDyns_hPPtr = hb_dynsymGetCase( "PPTR" );
if( ( pItem = hb_param( iParam, HB_IT_OBJECT ) ) != NULL )
{
HBQT_GC_T * p;
hb_vmPushDynSym( s_pDyns_hPPtr );
hb_vmPush( pItem );
hb_vmSend( 0 );
pItem = hb_param( -1, HB_IT_POINTER );
if( pItem )
{
p = ( HBQT_GC_T * ) hb_itemGetPtrGC( pItem, hbqt_gcFuncs() );
return p;
}
}
/* hbqt_errRT_ARG(); */ /* NOTE: Could not check type for whatever reason */
return NULL;
}
int hbqt_isObjectType( int iParam, HB_U32 iType )
{
PHB_ITEM pItem;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_IsObjectType( %d )", iParam ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_isObjectType( %d )", iParam ) );
if( ( pItem = hb_param( iParam, HB_IT_OBJECT ) ) != NULL )
{
@@ -329,7 +432,7 @@ HB_FUNC( __HBQT_SETUTF8 )
hb_vmSetCDP( cdp );
}
PHB_ITEM hbqt_defineClassBegin( const char* szClsName, PHB_ITEM s_oClass, const char* szParentClsStr )
PHB_ITEM hbqt_defineClassBegin( const char* szClsName, PHB_ITEM s_oClass, const char * szParentClsStr )
{
static PHB_DYNS s__CLSLOCKDEF = NULL;
@@ -343,45 +446,50 @@ PHB_ITEM hbqt_defineClassBegin( const char* szClsName, PHB_ITEM s_oClass, const
hb_vmPushItemRef( s_oClass );
hb_vmDo( 1 );
if( hb_itemGetL( hb_stackReturnItem() ) )
if( hb_itemGetL( hb_stackReturnItem() ) && szParentClsStr )
{
static PHB_DYNS s___HBCLASS = NULL;
char * pszParentClsBuffer = hb_strdup( szParentClsStr );
char* szSingleClsName;
if( s___HBCLASS == NULL )
s___HBCLASS = hb_dynsymGetCase( "HBCLASS" );
PHB_ITEM pClsName = hb_itemNew( NULL );
PHB_ITEM pSuper = hb_itemNew( NULL );
if( szParentClsStr )
PHB_ITEM pSym_ClsFunc = hb_itemNew( NULL );
hb_itemPutC( pClsName, szClsName );
/* array with parent classes (at least ONE) */
hb_arrayNew( pSuper, 0 );
HB_TRACE( HB_TR_DEBUG, ("%s: dCB 3", szClsName ) );
szSingleClsName = strtok( pszParentClsBuffer, " ," );
PHB_ITEM pItem = hb_itemNew( NULL );
while( szSingleClsName != NULL )
{
hb_arrayNew( pSuper, 0 );
char * pszParentClsBuffer = hb_strdup( szParentClsStr );
char * szSingleClsName;
szSingleClsName = strtok( pszParentClsBuffer, " ," );
PHB_ITEM pItem = hb_itemNew( NULL );
while( szSingleClsName != NULL )
{
hb_itemPutC( pItem, szSingleClsName );
hb_arrayAdd( pSuper, hb_itemPutSymbol( pItem, hb_dynsymGetCase( szSingleClsName )->pSymbol ) );
szSingleClsName = strtok( NULL, " ," );
}
hb_itemRelease( pItem );
hb_xfree( pszParentClsBuffer );
hb_itemPutC( pItem, szSingleClsName );
hb_arrayAdd( pSuper, hb_itemPutSymbol( pItem, hb_dynsymGetCase( szSingleClsName )->pSymbol ) );
szSingleClsName = strtok( NULL, " ," );
}
hb_itemRelease( pItem );
hb_itemPutSymbol( pSym_ClsFunc, hb_dynsymGetCase( szClsName )->pSymbol );
hb_vmPushDynSym( s___HBCLASS );
hb_vmPushNil();
hb_vmDo( 0 );
PHB_ITEM pClsName = hb_itemNew( NULL );
hb_itemPutC( pClsName, szClsName );
// TODO: change this hack
char test[ HB_SYMBOL_NAME_LEN + 1 ];
hb_snprintf( test, sizeof( test ), "HB_%s", szClsName );
PHB_ITEM pSym_ClsFunc = hb_itemNew( NULL );
hb_itemPutSymbol( pSym_ClsFunc, hb_dynsymGetCase( szClsName )->pSymbol );
hb_itemPutSymbol( pSym_ClsFunc, hb_dynsymGetCase( test )->pSymbol );
hb_objSendMsg( hb_stackReturnItem(), "New", 3, pClsName, pSuper, pSym_ClsFunc );
@@ -393,11 +501,6 @@ PHB_ITEM hbqt_defineClassBegin( const char* szClsName, PHB_ITEM s_oClass, const
hb_objSendMsg( oClass, "Create", 0 );
hb_objSendMsg( oClass, "Instance", 0 );
#if 0
PHB_ITEM pDataName = hb_itemNew( NULL );
hb_itemPutC( pDataName, "PPTR" );
hb_objSendMsg( oClass, "AddData", 1, pDataName );
#endif
}
return oClass;

62
harbour/contrib/hbqt/qtcore/hbqtcore.hbx
View File

@@ -28,11 +28,8 @@
#endif
DYNAMIC HBQEVENTS
DYNAMIC HBQEVENTSFROMPOINTER
DYNAMIC HBQSLOTS
DYNAMIC HBQSLOTSFROMPOINTER
DYNAMIC HBQSTRING
DYNAMIC HBQSTRINGFROMPOINTER
DYNAMIC HBQTOBJECTHANDLER
DYNAMIC HBQT_FINDCHILD
DYNAMIC HBQT_ISEQUAL
@@ -100,124 +97,65 @@ DYNAMIC HB_QTRANSLATOR
DYNAMIC HB_QURL
DYNAMIC HB_QVARIANT
DYNAMIC QABSTRACTITEMMODEL
DYNAMIC QABSTRACTITEMMODELFROMPOINTER
DYNAMIC QABSTRACTLISTMODEL
DYNAMIC QABSTRACTLISTMODELFROMPOINTER
DYNAMIC QABSTRACTTABLEMODEL
DYNAMIC QABSTRACTTABLEMODELFROMPOINTER
DYNAMIC QBITARRAY
DYNAMIC QBITARRAYFROMPOINTER
DYNAMIC QBUFFER
DYNAMIC QBUFFERFROMPOINTER
DYNAMIC QBYTEARRAY
DYNAMIC QBYTEARRAYFROMPOINTER
DYNAMIC QCHAR
DYNAMIC QCHARFROMPOINTER
DYNAMIC QCOREAPPLICATION
DYNAMIC QCOREAPPLICATIONFROMPOINTER
DYNAMIC QDATASTREAM
DYNAMIC QDATASTREAMFROMPOINTER
DYNAMIC QDATE
DYNAMIC QDATEFROMPOINTER
DYNAMIC QDATETIME
DYNAMIC QDATETIMEFROMPOINTER
DYNAMIC QDIR
DYNAMIC QDIRFROMPOINTER
DYNAMIC QEVENT
DYNAMIC QEVENTFROMPOINTER
DYNAMIC QEVENTLOOP
DYNAMIC QEVENTLOOPFROMPOINTER
DYNAMIC QFILE
DYNAMIC QFILEFROMPOINTER
DYNAMIC QFILEINFO
DYNAMIC QFILEINFOFROMPOINTER
DYNAMIC QGENERICARGUMENT
DYNAMIC QGENERICARGUMENTFROMPOINTER
DYNAMIC QGENERICRETURNARGUMENT
DYNAMIC QGENERICRETURNARGUMENTFROMPOINTER
DYNAMIC QIODEVICE
DYNAMIC QIODEVICEFROMPOINTER
DYNAMIC QLATIN1CHAR
DYNAMIC QLATIN1CHARFROMPOINTER
DYNAMIC QLATIN1STRING
DYNAMIC QLATIN1STRINGFROMPOINTER
DYNAMIC QLINE
DYNAMIC QLINEF
DYNAMIC QLINEFFROMPOINTER
DYNAMIC QLINEFROMPOINTER
DYNAMIC QLIST
DYNAMIC QLISTFROMPOINTER
DYNAMIC QLOCALE
DYNAMIC QLOCALEFROMPOINTER
DYNAMIC QMETACLASSINFO
DYNAMIC QMETACLASSINFOFROMPOINTER
DYNAMIC QMETAENUM
DYNAMIC QMETAENUMFROMPOINTER
DYNAMIC QMETAMETHOD
DYNAMIC QMETAMETHODFROMPOINTER
DYNAMIC QMETAOBJECT
DYNAMIC QMETAOBJECTFROMPOINTER
DYNAMIC QMETAPROPERTY
DYNAMIC QMETAPROPERTYFROMPOINTER
DYNAMIC QMETATYPE
DYNAMIC QMETATYPEFROMPOINTER
DYNAMIC QMIMEDATA
DYNAMIC QMIMEDATAFROMPOINTER
DYNAMIC QMODELINDEX
DYNAMIC QMODELINDEXFROMPOINTER
DYNAMIC QOBJECT
DYNAMIC QOBJECTFROMPOINTER
DYNAMIC QPOINT
DYNAMIC QPOINTF
DYNAMIC QPOINTFFROMPOINTER
DYNAMIC QPOINTFROMPOINTER
DYNAMIC QPROCESS
DYNAMIC QPROCESSFROMPOINTER
DYNAMIC QRECT
DYNAMIC QRECTF
DYNAMIC QRECTFFROMPOINTER
DYNAMIC QRECTFROMPOINTER
DYNAMIC QREGEXP
DYNAMIC QREGEXPFROMPOINTER
DYNAMIC QRESOURCE
DYNAMIC QRESOURCEFROMPOINTER
DYNAMIC QSETTINGS
DYNAMIC QSETTINGSFROMPOINTER
DYNAMIC QSHAREDBUILD
DYNAMIC QSIGNALMAPPER
DYNAMIC QSIGNALMAPPERFROMPOINTER
DYNAMIC QSIZE
DYNAMIC QSIZEF
DYNAMIC QSIZEFFROMPOINTER
DYNAMIC QSIZEFROMPOINTER
DYNAMIC QSTRINGLIST
DYNAMIC QSTRINGLISTFROMPOINTER
DYNAMIC QSTRINGREF
DYNAMIC QSTRINGREFFROMPOINTER
DYNAMIC QTEXTBOUNDARYFINDER
DYNAMIC QTEXTBOUNDARYFINDERFROMPOINTER
DYNAMIC QTEXTCODEC
DYNAMIC QTEXTCODECFROMPOINTER
DYNAMIC QTEXTDECODER
DYNAMIC QTEXTDECODERFROMPOINTER
DYNAMIC QTEXTENCODER
DYNAMIC QTEXTENCODERFROMPOINTER
DYNAMIC QTEXTSTREAM
DYNAMIC QTEXTSTREAMFROMPOINTER
DYNAMIC QTHREAD
DYNAMIC QTHREADFROMPOINTER
DYNAMIC QTIME
DYNAMIC QTIMEFROMPOINTER
DYNAMIC QTIMELINE
DYNAMIC QTIMELINEFROMPOINTER
DYNAMIC QTIMER
DYNAMIC QTIMERFROMPOINTER
DYNAMIC QTRANSLATOR
DYNAMIC QTRANSLATORFROMPOINTER
DYNAMIC QURL
DYNAMIC QURLFROMPOINTER
DYNAMIC QVARIANT
DYNAMIC QVARIANTFROMPOINTER
DYNAMIC QVERSION
DYNAMIC __HBQTCORE
DYNAMIC __HBQT_ERROR

2
harbour/contrib/hbqt/qtcore/qth/QAbstractEventDispatcher.qth
View File

@@ -27,7 +27,7 @@ New =
*/
HB_FUNC( QT_QABSTRACTEVENTDISPATCHER )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QAbstractEventDispatcher( hbqt_par_QObject( 1 ) ) );
}

2
harbour/contrib/hbqt/qtcore/qth/QGenericArgument.qth
View File

@@ -38,7 +38,7 @@ HB_FUNC( QT_QGENERICARGUMENT )
{
__HB_RETPTRGC__( new QGenericArgument( hb_parc( 1 ), 0 ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QGenericArgument( hb_parc( 1 ), hb_parptr( 2 ) ) );
}

2
harbour/contrib/hbqt/qtcore/qth/QGenericReturnArgument.qth
View File

@@ -38,7 +38,7 @@ HB_FUNC( QT_QGENERICRETURNARGUMENT )
{
__HB_RETPTRGC__( new QGenericReturnArgument( hb_parc( 1 ), 0 ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QGenericReturnArgument( hb_parc( 1 ), hb_parptr( 2 ) ) );
}

2
harbour/contrib/hbqt/qtcore/qth/QIODevice.qth
View File

@@ -29,7 +29,7 @@ Constructor = no
*/
HB_FUNC( QT_QIODEVICE )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
// __HB_RETPTRGC__( new QIODevice( hbqt_par_QObject( 1 ) ) );
}

4
harbour/contrib/hbqt/qtcore/qth/QLine.qth
View File

@@ -30,11 +30,11 @@ New =
*/
HB_FUNC( QT_QLINE )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QLine( *hbqt_par_QLine( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QLine( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) );
}

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

@@ -33,7 +33,7 @@ HB_FUNC( QT_QPOINT )
{
__HB_RETPTRGC__( new QPoint( hb_parni( 1 ), hb_parni( 2 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QPoint( *hbqt_par_QPoint( 1 ) ) );
}

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

@@ -33,7 +33,7 @@ HB_FUNC( QT_QPOINTF )
{
__HB_RETPTRGC__( new QPointF( ( qreal ) hb_parnd( 1 ), ( qreal ) hb_parnd( 2 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QPointF( *hbqt_par_QPoint( 1 ) ) );
}

2
harbour/contrib/hbqt/qtcore/qth/QProcess.qth
View File

@@ -27,7 +27,7 @@ New =
*/
HB_FUNC( QT_QPROCESS )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QProcess( hbqt_par_QObject( 1 ) ) );
}

4
harbour/contrib/hbqt/qtcore/qth/QRect.qth
View File

@@ -31,11 +31,11 @@ New =
*/
HB_FUNC( QT_QRECT )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QRect( *hbqt_par_QRect( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QRect( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) );
}

4
harbour/contrib/hbqt/qtcore/qth/QRectF.qth
View File

@@ -31,11 +31,11 @@ New =
*/
HB_FUNC( QT_QRECTF )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QRectF( *hbqt_par_QRectF( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QRectF( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) );
}

36
harbour/contrib/hbqt/qtcore/qth/QResource.qth
View File

@@ -48,8 +48,40 @@ void setFileName ( const QString & file )
void setLocale ( const QLocale & locale )
qint64 size () const
bool registerResource ( const QString & rccFileName, const QString & mapRoot = QString() )
bool registerResource ( const uchar * rccData, const QString & mapRoot = QString() )
bool registerResource ( const QString & rccFileName, const QString & mapRoot = QString() ) {
QResource * _resource = ( QResource * ) hbqt_pPtrFromObj( 0 );
if( _resource )
{
int pcount = hb_pcount();
if( pcount <= 2 && HB_ISCHAR( 1 ) && ( pcount < 2 || HB_ISCHAR( 2 ) ) )
{
void * pText1 = NULL;
void * pText2 = NULL;
hb_retl( _resource->registerResource( hb_parstr_utf8( 1, &pText1, NULL ), hb_parstr_utf8( 2, &pText2, NULL ) ) ); /* REM A1 */
hb_strfree( pText1 );
hb_strfree( pText2 );
}
else
hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
}
bool registerResource_1 ( const uchar * rccData, const QString & mapRoot = QString() ) {
QResource * _resource = ( QResource * ) hbqt_pPtrFromObj( 0 );
if( _resource )
{
int pcount = hb_pcount();
if( pcount <= 2 && HB_ISCHAR( 1 ) && ( pcount < 2 || HB_ISCHAR( 2 ) ) )
{
void * pText = NULL;
hb_retl( _resource->registerResource( ( const uchar * ) hb_parc( 1 ), hb_parstr_utf8( 2, &pText, NULL ) ) ); /* REM A1 */
hb_strfree( pText );
}
else
hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
}
QStringList searchPaths ()
bool unregisterResource ( const QString & rccFileName, const QString & mapRoot = QString() )
bool unregisterResource ( const uchar * rccData, const QString & mapRoot = QString() )

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

@@ -33,7 +33,7 @@ HB_FUNC( QT_QSIZE )
{
__HB_RETPTRGC__( new QSize( hb_parni( 1 ), hb_parni( 2 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QSize( *hbqt_par_QSize( 1 ) ) );
}

2
harbour/contrib/hbqt/qtcore/qth/QStringRef.qth
View File

@@ -35,7 +35,7 @@ HB_FUNC( QT_QSTRINGREF )
{
__HB_RETPTRGC__( new QStringRef( ( const QString *) hb_parcx( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QStringRef( * hbqt_par_QStringRef( 1 ) ) );
}

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

@@ -35,7 +35,7 @@ HB_FUNC( QT_QURL )
{
__HB_RETPTRGC__( new QUrl( hbqt_par_QString( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QUrl( *hbqt_par_QUrl( 1 ) ) );
}

2
harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormEditorInterface.qth
View File

@@ -38,7 +38,7 @@ folder = hbqtdesigner
*/
HB_FUNC( QT_QDESIGNERFORMEDITORINTERFACE )
{
if( HB_ISPOINTER( 1 ) )
if( HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QDesignerFormEditorInterface( hbqt_par_QObject( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/HBQGraphicsItem.qth
View File

@@ -34,7 +34,7 @@ HB_FUNC( QT_HBQGRAPHICSITEM )
{
__HB_RETPTRGC__( new HBQGraphicsItem( hb_parni( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new HBQGraphicsItem( hb_parni( 1 ), hbqt_par_QGraphicsItem( 2 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/HBQGraphicsScene.qth
View File

@@ -29,7 +29,7 @@ New =
*/
HB_FUNC( QT_HBQGRAPHICSSCENE )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new HBQGraphicsScene( hbqt_par_QObject( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/HBQPlainTextEdit.qth
View File

@@ -37,7 +37,7 @@ HB_FUNC( QT_HBQPLAINTEXTEDIT )
{
__HB_RETPTRGC__( new HBQPlainTextEdit() );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new HBQPlainTextEdit( hbqt_par_QWidget( 1 ) ) );
}

14
harbour/contrib/hbqt/qtgui/qth/QAction.qth
View File

@@ -32,12 +32,16 @@ Calls = QT_QAction
*/
HB_FUNC( QT_QACTION )
{
if( HB_ISPOINTER( 1 ) )
__HB_RETPTRGC__( new QAction( hbqt_par_QObject( 1 ) ) );
else if( HB_ISPOINTER( 2 ) )
__HB_RETPTRGC__( new QAction( hbqt_par_QString( 1 ), hbqt_par_QObject( 2 ) ) );
else if( HB_ISPOINTER( 3 ) )
int pcount;
pcount = hb_pcount();
if( pcount==3 && HB_ISOBJECT( 1 ) && HB_ISOBJECT(2) && HB_ISOBJECT( 3 ) )
__HB_RETPTRGC__( new QAction( *hbqt_par_QIcon( 1 ), hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ) ) );
else if( pcount==2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT(2) )
__HB_RETPTRGC__( new QAction( hbqt_par_QString( 1 ), hbqt_par_QObject( 2 ) ) );
else if( pcount == 1 && HB_ISOBJECT( 1 ) )
__HB_RETPTRGC__( new QAction( hbqt_par_QObject( 1 ) ) );
else
hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
</CODE>

2
harbour/contrib/hbqt/qtgui/qth/QActionGroup.qth
View File

@@ -26,7 +26,7 @@ New =
*/
HB_FUNC( QT_QACTIONGROUP )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QActionGroup( hbqt_par_QObject( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QApplication.qth
View File

@@ -44,7 +44,7 @@ HB_EXTERN_END
HB_FUNC( QT_QAPPLICATION )
{
//__HB_RETPTRGC__( ( QApplication * ) __hbqtgui_app() );
hb_retptr( __hbqtgui_app() );
hbqt_itemPushReturn( hbqt_gcAllocate_QApplication( (void *) __hbqtgui_app(), false) , hb_stackSelfItem() );
}
HB_FUNC( QT_QAPPLICATION_EXECUTE )

4
harbour/contrib/hbqt/qtgui/qth/QBitmap.qth
View File

@@ -32,7 +32,7 @@ New =
*/
HB_FUNC( QT_QBITMAP )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QBitmap( *hbqt_par_QBitmap( 1 ) ) );
}
@@ -48,7 +48,7 @@ HB_FUNC( QT_QBITMAP )
{
__HB_RETPTRGC__( new QBitmap( hb_parni( 1 ), hb_parni( 2 ) ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
if( ( QString ) "QPixmap" == hbqt_par_QString( 1 ) )
{

35
harbour/contrib/hbqt/qtgui/qth/QBrush.qth
View File

@@ -38,9 +38,9 @@ New =
*/
HB_FUNC( QT_QBRUSH )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
HBQT_GC_T * q = ( HBQT_GC_T * ) hbqt_getObjectGC( 1 );
if( q )
{
if( q->type == HBQT_TYPE_QBrush )
@@ -77,43 +77,18 @@ HB_FUNC( QT_QBRUSH )
{
__HB_RETPTRGC__( new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), ( Qt::BrushStyle ) hb_parni( 2 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISNUM( 2 ) )
{
__HB_RETPTRGC__( new QBrush( *hbqt_par_QColor( 1 ), ( Qt::BrushStyle ) hb_parni( 2 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QBrush( *hbqt_par_QColor( 1 ), *hbqt_par_QPixmap( 2 ) ) );
}
else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), *hbqt_par_QPixmap( 2 ) ) );
}
else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
{
QString objName = hbqt_par_QString( 1 );
if( objName == ( QString ) "QPixmap" )
{
__HB_RETPTRGC__( new QBrush( *hbqt_par_QPixmap( 2 ) ) );
}
else if( objName == ( QString ) "QImage" )
{
__HB_RETPTRGC__( new QBrush( *hbqt_par_QImage( 2 ) ) );
}
else if( objName == ( QString ) "QGradient" )
{
__HB_RETPTRGC__( new QBrush( *hbqt_par_QGradient( 2 ) ) );
}
else if( objName == ( QString ) "QColor" )
{
__HB_RETPTRGC__( new QBrush( *hbqt_par_QColor( 2 ), HB_ISNUM( 3 ) ? ( Qt::BrushStyle ) hb_parni( 3 ) : Qt::SolidPattern ) );
}
else
{
__HB_RETPTRGC__( new QBrush() );
}
}
else
{
__HB_RETPTRGC__( new QBrush() );

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

@@ -27,7 +27,7 @@ New =
*/
HB_FUNC( QT_QBUTTONGROUP )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QButtonGroup( hbqt_par_QObject( 1 ) ) );
}

11
harbour/contrib/hbqt/qtgui/qth/QColor.qth
View File

@@ -48,7 +48,7 @@ HB_FUNC( QT_QCOLOR )
{
__HB_RETPTRGC__( new QColor( hbqt_par_QString( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QColor( *hbqt_par_QColor( 1 ) ) );
}
@@ -60,15 +60,10 @@ HB_FUNC( QT_QCOLOR )
{
__HB_RETPTRGC__( new QColor( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) );
}
else
{
__HB_RETPTRGC__( new QColor() );
}
else hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
else
{
__HB_RETPTRGC__( new QColor() );
}
hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
</CODE>

2
harbour/contrib/hbqt/qtgui/qth/QComboBox.qth
View File

@@ -30,7 +30,7 @@ Calls = QT_QComboBox
*/
HB_FUNC( QT_QCOMBOBOX )
{
__HB_RETPTRGC__( new QComboBox( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) );
__HB_RETPTRGC__( new QComboBox( hb_pcount() == 1 && HB_ISOBJECT( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) );
}
</CODE>

6
harbour/contrib/hbqt/qtgui/qth/QContextMenuEvent.qth
View File

@@ -28,15 +28,15 @@ New =
*/
HB_FUNC( QT_QCONTEXTMENUEVENT )
{
if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISPOINTER( 2 ) )
if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QContextMenuEvent( ( QContextMenuEvent::Reason ) hb_parni( 1 ), *hbqt_par_QPoint( 2 ) ) );
}
else if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISPOINTER( 2 ) && HB_ISPOINTER( 3 ) )
else if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISOBJECT( 2 ) && HB_ISOBJECT( 3 ) )
{
__HB_RETPTRGC__( new QContextMenuEvent( ( QContextMenuEvent::Reason ) hb_parni( 1 ), *hbqt_par_QPoint( 2 ), *hbqt_par_QPoint( 3 ) ) );
}
else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISPOINTER( 2 ) && HB_ISPOINTER( 3 ) && HB_ISNUM( 4 ) )
else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISOBJECT( 2 ) && HB_ISOBJECT( 3 ) && HB_ISNUM( 4 ) )
{
__HB_RETPTRGC__( new QContextMenuEvent( ( QContextMenuEvent::Reason ) hb_parni( 1 ), *hbqt_par_QPoint( 2 ), *hbqt_par_QPoint( 3 ), ( Qt::KeyboardModifiers ) hb_parni( 4 ) ) );
}

6
harbour/contrib/hbqt/qtgui/qth/QCursor.qth
View File

@@ -39,11 +39,11 @@ HB_FUNC( QT_QCURSOR )
{
__HB_RETPTRGC__( new QCursor( ( Qt::CursorShape ) hb_parni( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QCursor( *hbqt_par_QCursor( 1 ) ) );
}
else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
QString objName = hbqt_par_QString( 1 );
@@ -56,7 +56,7 @@ HB_FUNC( QT_QCURSOR )
__HB_RETPTRGC__( new QCursor() );
}
}
else if( hb_pcount() >= 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() >= 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QCursor( *hbqt_par_QBitmap( 1 ), *hbqt_par_QBitmap( 2 ), HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1, HB_ISNUM( 4 ) ? hb_parni( 4 ) : -1 ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QDoubleValidator.qth
View File

@@ -31,9 +31,9 @@ HB_FUNC( QT_QDOUBLEVALIDATOR )
{
if( hb_pcount() >= 3 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) )
{
__HB_RETPTRGC__( new QDoubleValidator( hb_parnd( 1 ), hb_parnd( 2 ), hb_parni( 3 ), HB_ISPOINTER( 4 ) ? hbqt_par_QObject( 4 ) : 0 ) );
__HB_RETPTRGC__( new QDoubleValidator( hb_parnd( 1 ), hb_parnd( 2 ), hb_parni( 3 ), HB_ISOBJECT( 4 ) ? hbqt_par_QObject( 4 ) : 0 ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QDoubleValidator( hbqt_par_QObject( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QDragEnterEvent.qth
View File

@@ -28,7 +28,7 @@ Constructor = no
*/
HB_FUNC( QT_QDRAGENTEREVENT )
{
if( hb_pcount() == 5 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) && HB_ISNUM( 4 ) && HB_ISNUM( 5 ) )
if( hb_pcount() == 5 && HB_ISOBJECT( 1 ) && HB_ISNUM( 2 ) && HB_ISOBJECT( 3 ) && HB_ISNUM( 4 ) && HB_ISNUM( 5 ) )
{
__HB_RETPTRGC__( new QDragEnterEvent( *hbqt_par_QPoint( 1 ), ( Qt::DropActions ) hb_parni( 2 ), hbqt_par_QMimeData( 3 ), ( Qt::MouseButtons ) hb_parni( 4 ), ( Qt::KeyboardModifiers ) hb_parni( 5 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QDragMoveEvent.qth
View File

@@ -29,7 +29,7 @@ Constructor = no
*/
HB_FUNC( QT_QDRAGMOVEEVENT )
{
if( hb_pcount() >= 5 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) && HB_ISNUM( 4 ) && HB_ISNUM( 5 ) )
if( hb_pcount() >= 5 && HB_ISOBJECT( 1 ) && HB_ISNUM( 2 ) && HB_ISOBJECT( 3 ) && HB_ISNUM( 4 ) && HB_ISNUM( 5 ) )
{
__HB_RETPTRGC__( new QDragMoveEvent( *hbqt_par_QPoint( 1 ), ( Qt::DropActions ) hb_parni( 2 ), hbqt_par_QMimeData( 3 ), ( Qt::MouseButtons ) hb_parni( 4 ), ( Qt::KeyboardModifiers ) hb_parni( 5 ), ( QEvent::Type ) ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : QEvent::DragMove ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QDropEvent.qth
View File

@@ -28,7 +28,7 @@ Constructor = no
*/
HB_FUNC( QT_QDROPEVENT )
{
if( hb_pcount() >= 5 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) && HB_ISNUM( 4 ) && HB_ISNUM( 5 ) )
if( hb_pcount() >= 5 && HB_ISOBJECT( 1 ) && HB_ISNUM( 2 ) && HB_ISOBJECT( 3 ) && HB_ISNUM( 4 ) && HB_ISNUM( 5 ) )
{
__HB_RETPTRGC__( new QDropEvent( *hbqt_par_QPoint( 1 ), ( Qt::DropActions ) hb_parni( 2 ), hbqt_par_QMimeData( 3 ), ( Qt::MouseButtons ) hb_parni( 4 ), ( Qt::KeyboardModifiers ) hb_parni( 5 ), ( QEvent::Type ) ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : QEvent::Drop ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QFileDialog.qth
View File

@@ -27,11 +27,11 @@ New = pParent, nFlags
*/
HB_FUNC( QT_QFILEDIALOG )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QFileDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) 0 ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISNUM( 2 ) )
{
__HB_RETPTRGC__( new QFileDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QFont.qth
View File

@@ -46,11 +46,11 @@ HB_FUNC( QT_QFONT )
{
__HB_RETPTRGC__( new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parl( 4 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QFont( *hbqt_par_QFont( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QFont( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QFontDialog.qth
View File

@@ -26,11 +26,11 @@ New = pParent
*/
HB_FUNC( QT_QFONTDIALOG )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QFontDialog( hbqt_par_QWidget( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QFontDialog( *hbqt_par_QFont( 1 ), hbqt_par_QWidget( 2 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QFontInfo.qth
View File

@@ -27,11 +27,11 @@ New = pParent
*/
HB_FUNC( QT_QFONTINFO )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QFontInfo( *hbqt_par_QFontInfo( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QFontInfo( *hbqt_par_QFont( 2 ) ) );
}

6
harbour/contrib/hbqt/qtgui/qth/QFontMetrics.qth
View File

@@ -31,18 +31,18 @@ New =
*/
HB_FUNC( QT_QFONTMETRICS )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QFontMetrics( *hbqt_par_QFontMetrics( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
if( hbqt_par_QString( 1 ) == ( QString ) "QFont" )
{
__HB_RETPTRGC__( new QFontMetrics( *hbqt_par_QFont( 2 ) ) );
}
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QFontMetrics( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) );
}

6
harbour/contrib/hbqt/qtgui/qth/QFontMetricsF.qth
View File

@@ -32,11 +32,11 @@ New =
*/
HB_FUNC( QT_QFONTMETRICSF )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QFontMetricsF( *hbqt_par_QFontMetricsF( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
if( hbqt_par_QString( 1 ) == ( QString ) "QFont" )
{
@@ -47,7 +47,7 @@ HB_FUNC( QT_QFONTMETRICSF )
__HB_RETPTRGC__( new QFontMetricsF( *hbqt_par_QFontMetrics( 2 ) ) );
}
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QFontMetricsF( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) );
}

8
harbour/contrib/hbqt/qtgui/qth/QGraphicsEllipseItem.qth
View File

@@ -32,14 +32,14 @@ HB_FUNC( QT_QGRAPHICSELLIPSEITEM )
{
if( hb_pcount() >= 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) )
{
__HB_RETPTRGC__( new QGraphicsEllipseItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsEllipseItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISOBJECT( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) );
}
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
HBQT_GC_T * p = ( HBQT_GC_T * ) hbqt_pPtrFromObj( 1 );
if( p->type == HBQT_TYPE_QRectF )
{
__HB_RETPTRGC__( new QGraphicsEllipseItem( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsEllipseItem( *hbqt_par_QRectF( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
}
else
{

2
harbour/contrib/hbqt/qtgui/qth/QGraphicsGridLayout.qth
View File

@@ -28,7 +28,7 @@ New =
*/
HB_FUNC( QT_QGRAPHICSGRIDLAYOUT )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsGridLayout( hbqt_par_QGraphicsLayoutItem( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QGraphicsItemAnimation.qth
View File

@@ -30,7 +30,7 @@ New =
*/
HB_FUNC( QT_QGRAPHICSITEMANIMATION )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsItemAnimation( hbqt_par_QObject( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QGraphicsItemGroup.qth
View File

@@ -28,7 +28,7 @@ New =
*/
HB_FUNC( QT_QGRAPHICSITEMGROUP )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsItemGroup( hbqt_par_QGraphicsItem( 1 ) ) );
}

8
harbour/contrib/hbqt/qtgui/qth/QGraphicsLineItem.qth
View File

@@ -33,14 +33,14 @@ HB_FUNC( QT_QGRAPHICSLINEITEM )
{
if( hb_pcount() >= 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) )
{
__HB_RETPTRGC__( new QGraphicsLineItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsLineItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISOBJECT( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) );
}
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
HBQT_GC_T * p = ( HBQT_GC_T * ) hbqt_pPtrFromObj( 1 );
if( p->type == HBQT_TYPE_QLineF )
{
__HB_RETPTRGC__( new QGraphicsLineItem( *hbqt_par_QLineF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsLineItem( *hbqt_par_QLineF( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
}
else
{

4
harbour/contrib/hbqt/qtgui/qth/QGraphicsLinearLayout.qth
View File

@@ -33,9 +33,9 @@ HB_FUNC( QT_QGRAPHICSLINEARLAYOUT )
{
if( HB_ISNUM( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsLinearLayout( ( Qt::Orientation ) hb_parni( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsLayoutItem( 2 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsLinearLayout( ( Qt::Orientation ) hb_parni( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QGraphicsLayoutItem( 2 ) : 0 ) ) );
}
else if( HB_ISPOINTER( 1 ) )
else if( HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsLinearLayout( hbqt_par_QGraphicsLayoutItem( 1 ) ) );
}

6
harbour/contrib/hbqt/qtgui/qth/QGraphicsPathItem.qth
View File

@@ -29,12 +29,12 @@ New =
*/
HB_FUNC( QT_QGRAPHICSPATHITEM )
{
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
HBQT_GC_T * p = ( HBQT_GC_T * ) hbqt_pPtrFromObj( 1 );
if( p->type == HBQT_TYPE_QPainterPath )
{
__HB_RETPTRGC__( new QGraphicsPathItem( *hbqt_par_QPainterPath( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsPathItem( *hbqt_par_QPainterPath( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
}
else
{

6
harbour/contrib/hbqt/qtgui/qth/QGraphicsPixmapItem.qth
View File

@@ -29,12 +29,12 @@ New =
*/
HB_FUNC( QT_QGRAPHICSPIXMAPITEM )
{
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
HBQT_GC_T * p = ( HBQT_GC_T * ) hbqt_pPtrFromObj( 1 );
if( p->type == HBQT_TYPE_QPixmap )
{
__HB_RETPTRGC__( new QGraphicsPixmapItem( *hbqt_par_QPixmap( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsPixmapItem( *hbqt_par_QPixmap( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
}
else
{

6
harbour/contrib/hbqt/qtgui/qth/QGraphicsPolygonItem.qth
View File

@@ -29,12 +29,12 @@ New =
*/
HB_FUNC( QT_QGRAPHICSPOLYGONITEM )
{
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
HBQT_GC_T * p = ( HBQT_GC_T * ) hbqt_pPtrFromObj( 1 );
if( p->type == HBQT_TYPE_QPolygonF )
{
__HB_RETPTRGC__( new QGraphicsPolygonItem( *hbqt_par_QPolygonF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsPolygonItem( *hbqt_par_QPolygonF( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
}
else
{

2
harbour/contrib/hbqt/qtgui/qth/QGraphicsProxyWidget.qth
View File

@@ -28,7 +28,7 @@ New =
*/
HB_FUNC( QT_QGRAPHICSPROXYWIDGET )
{
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsProxyWidget( hbqt_par_QGraphicsItem( 1 ), ( Qt::WindowFlags ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 0 ) ) );
}

8
harbour/contrib/hbqt/qtgui/qth/QGraphicsRectItem.qth
View File

@@ -32,14 +32,14 @@ HB_FUNC( QT_QGRAPHICSRECTITEM )
{
if( hb_pcount() >= 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) )
{
__HB_RETPTRGC__( new QGraphicsRectItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsRectItem( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISOBJECT( 5 ) ? hbqt_par_QGraphicsItem( 5 ) : 0 ) ) );
}
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
HBQT_GC_T * p = ( HBQT_GC_T * ) hbqt_pPtrFromObj( 1 );
if( p->type == HBQT_TYPE_QRectF )
{
__HB_RETPTRGC__( new QGraphicsRectItem( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsRectItem( *hbqt_par_QRectF( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QGraphicsItem( 2 ) : 0 ) ) );
}
else
{

8
harbour/contrib/hbqt/qtgui/qth/QGraphicsScene.qth
View File

@@ -32,14 +32,14 @@ HB_FUNC( QT_QGRAPHICSSCENE )
{
if( hb_pcount() >= 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) )
{
__HB_RETPTRGC__( new QGraphicsScene( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QObject( 5 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsScene( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISOBJECT( 5 ) ? hbqt_par_QObject( 5 ) : 0 ) ) );
}
else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
HBQT_GC_T * p = ( HBQT_GC_T * ) hbqt_pPtrFromObj( 1 );
if( p->type == HBQT_TYPE_QRectF )
{
__HB_RETPTRGC__( new QGraphicsScene( *hbqt_par_QRectF( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QObject( 2 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsScene( *hbqt_par_QRectF( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QObject( 2 ) : 0 ) ) );
}
else
{

4
harbour/contrib/hbqt/qtgui/qth/QGraphicsSimpleTextItem.qth
View File

@@ -34,9 +34,9 @@ HB_FUNC( QT_QGRAPHICSSIMPLETEXTITEM )
{
if( HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsSimpleTextItem( hbqt_par_QString( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsSimpleTextItem( hbqt_par_QString( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) );
}
else if( HB_ISPOINTER( 1 ) )
else if( HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsSimpleTextItem( hbqt_par_QGraphicsItem( 1 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QGraphicsSvgItem.qth
View File

@@ -32,9 +32,9 @@ HB_FUNC( QT_QGRAPHICSSVGITEM )
{
if( HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsSvgItem( hbqt_par_QString( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsSvgItem( hbqt_par_QString( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) );
}
else if( HB_ISPOINTER( 1 ) )
else if( HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsSvgItem( hbqt_par_QGraphicsItem( 1 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QGraphicsTextItem.qth
View File

@@ -36,9 +36,9 @@ HB_FUNC( QT_QGRAPHICSTEXTITEM )
{
if( HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsTextItem( hbqt_par_QString( 1 ), ( HB_ISPOINTER( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsTextItem( hbqt_par_QString( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QGraphicsItem( 1 ) : 0 ) ) );
}
else if( HB_ISPOINTER( 1 ) )
else if( HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsTextItem( hbqt_par_QGraphicsItem( 1 ) ) );
}

6
harbour/contrib/hbqt/qtgui/qth/QGraphicsView.qth
View File

@@ -29,15 +29,15 @@ New =
*/
HB_FUNC( QT_QGRAPHICSVIEW )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsView( hbqt_par_QWidget( 1 ) ) );
}
else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
if( ( QString ) "QGraphicsScene" == hbqt_par_QString( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsView( hbqt_par_QGraphicsScene( 2 ), ( HB_ISPOINTER( 3 ) ? hbqt_par_QWidget( 3 ) : 0 ) ) );
__HB_RETPTRGC__( new QGraphicsView( hbqt_par_QGraphicsScene( 2 ), ( HB_ISOBJECT( 3 ) ? hbqt_par_QWidget( 3 ) : 0 ) ) );
}
else
{

2
harbour/contrib/hbqt/qtgui/qth/QGraphicsWidget.qth
View File

@@ -28,7 +28,7 @@ New =
*/
HB_FUNC( QT_QGRAPHICSWIDGET )
{
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGraphicsWidget( hbqt_par_QGraphicsItem( 1 ), ( Qt::WindowFlags ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 0 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QHelpEvent.qth
View File

@@ -28,7 +28,7 @@ Destructor =
*/
HB_FUNC( QT_QHELPEVENT )
{
if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISPOINTER( 2 ) && HB_ISPOINTER( 3 ) )
if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISOBJECT( 2 ) && HB_ISOBJECT( 3 ) )
{
__HB_RETPTRGC__( new QHelpEvent( ( QEvent::Type ) hb_parni( 1 ), *hbqt_par_QPoint( 2 ), *hbqt_par_QPoint( 3 ) ) );
}

41
harbour/contrib/hbqt/qtgui/qth/QIcon.qth
View File

@@ -33,33 +33,22 @@ New =
*/
HB_FUNC( QT_QICON )
{
if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QIcon( hbqt_par_QString( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
{
HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
if( q )
{
if( q->type == HBQT_TYPE_QIcon )
{
__HB_RETPTRGC__( new QIcon( *hbqt_par_QIcon( 1 ) ) );
}
else if( q->type == HBQT_TYPE_QPixmap )
{
__HB_RETPTRGC__( new QIcon( *hbqt_par_QPixmap( 1 ) ) );
}
}
else
{
__HB_RETPTRGC__( new QIcon( *hbqt_par_QIcon( 1 ) ) );
}
}
int pcount = hb_pcount();
if( pcount == 0 )
__HB_RETPTRGC__( new QIcon() );
else
{
__HB_RETPTRGC__( new QIcon() );
}
if( pcount == 1 )
{
if ( HB_ISCHAR( 1 ) )
__HB_RETPTRGC__( new QIcon( hbqt_par_QString( 1 ) ) );
else if( hb_pcount() == 1 && hbqt_isObjectType( 1, HBQT_TYPE_QIcon ) )
__HB_RETPTRGC__( new QIcon( *hbqt_par_QIcon( 1 ) ) );
else if( hb_pcount() == 1 && hbqt_isObjectType( 1, HBQT_TYPE_QPixmap ) )
__HB_RETPTRGC__( new QIcon( *hbqt_par_QPixmap( 1 ) ) );
else hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
else hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
</CODE>

4
harbour/contrib/hbqt/qtgui/qth/QImage.qth
View File

@@ -43,7 +43,7 @@ HB_FUNC( QT_QIMAGE )
{
__HB_RETPTRGC__( new QImage( hbqt_par_QString( 1 ), ( const char * ) 0 ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QImage( *hbqt_par_QImage( 1 ) ) );
}
@@ -51,7 +51,7 @@ HB_FUNC( QT_QIMAGE )
{
__HB_RETPTRGC__( new QImage( hbqt_par_QString( 1 ), ( const char * ) hb_parcx( 2 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISNUM( 2 ) )
{
__HB_RETPTRGC__( new QImage( *hbqt_par_QSize( 1 ), ( QImage::Format ) hb_parni( 2 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QInputMethodEvent.qth
View File

@@ -29,7 +29,7 @@ Destructor =
*/
HB_FUNC( QT_QINPUTMETHODEVENT )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QInputMethodEvent( *hbqt_par_QInputMethodEvent( 1 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QIntValidator.qth
View File

@@ -29,11 +29,11 @@ Destructor =
*/
HB_FUNC( QT_QINTVALIDATOR )
{
if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) )
if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISOBJECT( 3 ) )
{
__HB_RETPTRGC__( new QIntValidator( hb_parni( 1 ), hb_parni( 2 ), hbqt_par_QObject( 3 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QIntValidator( hbqt_par_QObject( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QItemDelegate.qth
View File

@@ -34,7 +34,7 @@ New =
*/
HB_FUNC( QT_QITEMDELEGATE )
{
if( HB_ISPOINTER( 1 ) )
if( HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QItemDelegate( hbqt_par_QObject( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QItemEditorFactory.qth
View File

@@ -35,7 +35,7 @@ New =
*/
HB_FUNC( QT_QITEMEDITORFACTORY )
{
if( HB_ISPOINTER( 1 ) )
if( HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QItemEditorFactory() );
}

2
harbour/contrib/hbqt/qtgui/qth/QItemSelectionModel.qth
View File

@@ -29,7 +29,7 @@ Destructor =
*/
HB_FUNC( QT_QITEMSELECTIONMODEL )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QItemSelectionModel( hbqt_par_QAbstractItemModel( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QKeyEvent.qth
View File

@@ -33,7 +33,7 @@ HB_FUNC( QT_QKEYEVENT )
{
__HB_RETPTRGC__( new QKeyEvent( ( QEvent::Type ) hb_parni( 1 ), hb_parni( 2 ), ( Qt::KeyboardModifiers ) hb_parni( 3 ), HB_ISCHAR( 4 ) ? hbqt_par_QString( 4 ) : QString(), HB_ISLOG( 5 ) ? hb_parl( 5 ) : false, HB_ISNUM( 6 ) ? hb_parni( 6 ) : 1 ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QKeyEvent( *hbqt_par_QKeyEvent( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QKeySequence.qth
View File

@@ -32,7 +32,7 @@ New =
*/
HB_FUNC( QT_QKEYSEQUENCE )
{
if( HB_ISPOINTER( 1 ) )
if( HB_ISOBJECT( 1 ) )
__HB_RETPTRGC__( new QKeySequence( *hbqt_par_QKeySequence( 1 ) ) );
else if( HB_ISCHAR( 1 ) )
__HB_RETPTRGC__( new QKeySequence( hbqt_par_QString( 1 ) ) );

4
harbour/contrib/hbqt/qtgui/qth/QLinearGradient.qth
View File

@@ -29,11 +29,11 @@ New =
*/
HB_FUNC( QT_QLINEARGRADIENT )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QLinearGradient( *hbqt_par_QLinearGradient( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QLinearGradient( *hbqt_par_QPointF( 1 ), *hbqt_par_QPointF( 2 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QListWidget.qth
View File

@@ -26,7 +26,7 @@ New = pParent
*/
HB_FUNC( QT_QLISTWIDGET )
{
__HB_RETPTRGC__( new QListWidget( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) );
__HB_RETPTRGC__( new QListWidget( HB_ISOBJECT( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) );
}
</CODE>

2
harbour/contrib/hbqt/qtgui/qth/QMdiArea.qth
View File

@@ -32,7 +32,7 @@ New =
*/
HB_FUNC( QT_QMDIAREA )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QMdiArea( hbqt_par_QWidget( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QMdiSubWindow.qth
View File

@@ -32,7 +32,7 @@ New =
*/
HB_FUNC( QT_QMDISUBWINDOW )
{
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QMdiSubWindow( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QMenu.qth
View File

@@ -29,11 +29,11 @@ HB_FUNC( QT_QMENU )
{
if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QMenu( hbqt_par_QString( 1 ), HB_ISPOINTER( 2 ) ? hbqt_par_QWidget( 2 ) : 0 ) );
__HB_RETPTRGC__( new QMenu( hbqt_par_QString( 1 ), HB_ISOBJECT( 2 ) ? hbqt_par_QWidget( 2 ) : 0 ) );
}
else
{
__HB_RETPTRGC__( new QMenu( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) );
__HB_RETPTRGC__( new QMenu( HB_ISOBJECT( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) );
}
}
</CODE>

2
harbour/contrib/hbqt/qtgui/qth/QMenuBar.qth
View File

@@ -26,7 +26,7 @@ New = pParent
*/
HB_FUNC( QT_QMENUBAR )
{
__HB_RETPTRGC__( new QMenuBar( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) );
__HB_RETPTRGC__( new QMenuBar( HB_ISOBJECT( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) );
}
</CODE>

2
harbour/contrib/hbqt/qtgui/qth/QMouseEvent.qth
View File

@@ -29,7 +29,7 @@ New =
*/
HB_FUNC( QT_QMOUSEEVENT )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QMouseEvent( *hbqt_par_QMouseEvent( 1 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QMoveEvent.qth
View File

@@ -29,11 +29,11 @@ Constructor = no
*/
HB_FUNC( QT_QMOVEEVENT )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QMoveEvent( *hbqt_par_QMoveEvent( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QMoveEvent( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) );
}

8
harbour/contrib/hbqt/qtgui/qth/QPaintEvent.qth
View File

@@ -28,13 +28,15 @@ New =
*/
HB_FUNC( QT_QPAINTEVENT )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
if( hbqt_IsObjectType( 1, HBQT_TYPE_QRegion ) )
QString objName = ( QString ) hbqt_par_QString( 1 );
if( objName == ( QString ) "QRect" )
{
__HB_RETPTRGC__( new QPaintEvent( *hbqt_par_QRegion( 1 ) ) );
}
else if( hbqt_IsObjectType( 1, HBQT_TYPE_QRect ) )
else if( objName == ( QString ) "QRegion" )
{
__HB_RETPTRGC__( new QPaintEvent( *hbqt_par_QRect( 1 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QPainter.qth
View File

@@ -26,7 +26,7 @@ New = pDevice
*/
HB_FUNC( QT_QPAINTER )
{
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QPainter( hbqt_par_QPaintDevice( 1 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QPalette.qth
View File

@@ -38,11 +38,11 @@ HB_FUNC( QT_QPALETTE )
{
__HB_RETPTRGC__( new QPalette( ( Qt::GlobalColor ) hb_parni( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QPalette( *hbqt_par_QPalette( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QPalette( *hbqt_par_QColor( 1 ), *hbqt_par_QColor( 2 ) ) );
}

6
harbour/contrib/hbqt/qtgui/qth/QPen.qth
View File

@@ -36,11 +36,11 @@ HB_FUNC( QT_QPEN )
{
__HB_RETPTRGC__( new QPen( ( Qt::PenStyle ) hb_parni( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QPen( *hbqt_par_QPen( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
QString objName = ( QString ) hbqt_par_QString( 1 );
@@ -53,7 +53,7 @@ HB_FUNC( QT_QPEN )
__HB_RETPTRGC__( new QPen() );
}
}
else if( hb_pcount() >= 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) )
else if( hb_pcount() >= 2 && HB_ISOBJECT( 1 ) && HB_ISNUM( 2 ) )
{
Qt::PenStyle iStyle = HB_ISNUM( 3 ) ? ( Qt::PenStyle ) hb_parni( 3 ) : Qt::SolidLine;
Qt::PenCapStyle iCap = HB_ISNUM( 4 ) ? ( Qt::PenCapStyle ) hb_parni( 4 ) : Qt::SquareCap;

2
harbour/contrib/hbqt/qtgui/qth/QPicture.qth
View File

@@ -39,7 +39,7 @@ HB_FUNC( QT_QPICTURE )
{
__HB_RETPTRGC__( new QPicture( hb_parni( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QPicture( *hbqt_par_QPicture( 1 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QPixmap.qth
View File

@@ -38,9 +38,9 @@ HB_FUNC( QT_QPIXMAP )
{
__HB_RETPTRGC__( new QPixmap( hbqt_par_QString( 1 ), ( const char * ) 0, Qt::AutoColor ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
HBQT_GC_T * q = ( HBQT_GC_T * ) hbqt_pPtrFromObj( 1 );
if( q )
{
if( q->type == HBQT_TYPE_QPixmap )

2
harbour/contrib/hbqt/qtgui/qth/QPlainTextDocumentLayout.qth
View File

@@ -28,7 +28,7 @@ New =
*/
HB_FUNC( QT_QPLAINTEXTDOCUMENTLAYOUT )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QPlainTextDocumentLayout( hbqt_par_QTextDocument( 1 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QPlainTextEdit.qth
View File

@@ -36,11 +36,11 @@ HB_FUNC( QT_QPLAINTEXTEDIT )
{
__HB_RETPTRGC__( new QPlainTextEdit() );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QPlainTextEdit( hbqt_par_QWidget( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QPlainTextEdit( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QPrintPreviewDialog.qth
View File

@@ -27,7 +27,7 @@ New = pParent, nFlags
*/
HB_FUNC( QT_QPRINTPREVIEWDIALOG )
{
if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) )
if( hb_pcount() >= 2 && HB_ISOBJECT( 2 ) )
__HB_RETPTRGC__( new QPrintPreviewDialog( hbqt_par_QPrinter( 1 ), hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ) );
else
__HB_RETPTRGC__( new QPrintPreviewDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );

2
harbour/contrib/hbqt/qtgui/qth/QPrinter.qth
View File

@@ -29,7 +29,7 @@ New =
*/
HB_FUNC( QT_QPRINTER )
{
if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QPrinter( *hbqt_par_QPrinterInfo( 1 ), ( QPrinter::PrinterMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QPrinter::ScreenResolution ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QPrinterInfo.qth
View File

@@ -73,11 +73,11 @@ New =
*/
HB_FUNC( QT_QPRINTERINFO )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QPrinterInfo( *hbqt_par_QPrinterInfo( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QPrinterInfo( *hbqt_par_QPrinter( 2 ) ) );
}

6
harbour/contrib/hbqt/qtgui/qth/QRadialGradient.qth
View File

@@ -32,15 +32,15 @@ New =
*/
HB_FUNC( QT_QRADIALGRADIENT )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QRadialGradient( *hbqt_par_QRadialGradient( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISNUM( 2 ) )
{
__HB_RETPTRGC__( new QRadialGradient( *hbqt_par_QPointF( 1 ), hb_parnd( 2 ) ) );
}
else if( hb_pcount() == 3 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) )
else if( hb_pcount() == 3 && HB_ISOBJECT( 1 ) && HB_ISNUM( 2 ) && HB_ISOBJECT( 3 ) )
{
__HB_RETPTRGC__( new QRadialGradient( *hbqt_par_QPointF( 1 ), hb_parnd( 2 ), *hbqt_par_QPointF( 3 ) ) );
}

4
harbour/contrib/hbqt/qtgui/qth/QRegExpValidator.qth
View File

@@ -29,11 +29,11 @@ Destructor =
*/
HB_FUNC( QT_QREGEXPVALIDATOR )
{
if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QRegExpValidator( *hbqt_par_QRegExp( 1 ), hbqt_par_QObject( 2 ) ) );
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QRegExpValidator( hbqt_par_QObject( 1 ) ) );
}

6
harbour/contrib/hbqt/qtgui/qth/QRegion.qth
View File

@@ -33,7 +33,7 @@ New = nX, nY, nWidth, nHeight, nType
*/
HB_FUNC( QT_QREGION )
{
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QRegion( *hbqt_par_QRegion( 1 ) ) );
}
@@ -41,7 +41,7 @@ HB_FUNC( QT_QREGION )
{
__HB_RETPTRGC__( new QRegion( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), HB_ISNUM( 5 ) ? ( QRegion::RegionType ) hb_parni( 5 ) : QRegion::Rectangle ) );
}
else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
if( ( QString ) "QPolygon" == hbqt_par_QString( 1 ) )
{
@@ -60,7 +60,7 @@ HB_FUNC( QT_QREGION )
__HB_RETPTRGC__( new QRegion() );
}
}
else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) )
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISNUM( 2 ) )
{
__HB_RETPTRGC__( new QRegion( *hbqt_par_QRect( 1 ), ( QRegion::RegionType ) hb_parni( 2 ) ) );
}

2
harbour/contrib/hbqt/qtgui/qth/QResizeEvent.qth
View File

@@ -28,7 +28,7 @@ Constructor =
*/
HB_FUNC( QT_QRESIZEEVENT )
{
if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) )
if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QResizeEvent( *hbqt_par_QSize( 1 ), *hbqt_par_QSize( 2 ) ) );
}

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