From 9a31c0c4024580c59201ab07af783ea70d8c71b2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 19 Sep 2010 23:06:54 +0000 Subject: [PATCH] 2010-09-20 00:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtcore/hbqtcore.hbm * contrib/hbqt/qtcore/hbqtcore.hbc - contrib/hbqt/qtcore/hbqt_hbevents.cpp + contrib/hbqt/qtcore/hbqt_hbqevents.cpp - contrib/hbqt/qtcore/hbqt_hbslots.cpp + contrib/hbqt/qtcore/hbqt_hbqslots.cpp - contrib/hbqt/qtcore/hbqt_hbevents.h + contrib/hbqt/qtcore/hbqt_hbqevents.h - contrib/hbqt/qtcore/hbqt_hbslots.h + contrib/hbqt/qtcore/hbqt_hbqslots.h * contrib/hbqt/qtcore/g/filelist.hbm * contrib/hbqt/qtcore/g/hbqtcore.h - contrib/hbqt/qtcore/g/HBEvents.cpp + contrib/hbqt/qtcore/g/HBQEvents.cpp - contrib/hbqt/qtcore/g/HBSlots.cpp + contrib/hbqt/qtcore/g/HBQSlots.cpp - contrib/hbqt/qtcore/qth/HBEvents.qth + contrib/hbqt/qtcore/qth/HBQEvents.qth - contrib/hbqt/qtcore/qth/HBSlots.qth + contrib/hbqt/qtcore/qth/HBQSlots.qth - contrib/hbqt/qtcore/doc/en/class_hbevents.txt + contrib/hbqt/qtcore/doc/en/class_hbqevents.txt - contrib/hbqt/qtcore/doc/en/class_hbslots.txt + contrib/hbqt/qtcore/doc/en/class_hbqslots.txt * contrib/hbqt/utils/qtcore.qtp ! Renamed HBSLOTS -> HBQSLOTS ! Renamed HBEVENTS -> HBQEVENTS * contrib/hbqt/qtgui/hbqtgui.hbx * contrib/hbqt/qtcore/hbqtcore.hbx * contrib/hbqt/qtnetwork/hbqtnetwork.hbx * Regenerated after several recent changes. * contrib/hbqt/tests/testres.prg * contrib/hbqt/tests/demoqt.prg * contrib/hbqt/tests/dialogqt.prg * contrib/hbqt/tests/testbrow.prg * contrib/hbqt/tests/testqaim.prg * contrib/hbxbp/tests/demoxbp.prg * contrib/hbxbp/tests/dialogqt.prg * contrib/hbide/idemain.prg * Changed 'REQUEST HB_QT' -> 'REQUEST HB_QTGUI' * contrib/hbnetio/utils/netiosrv.prg ! Fixed one type prefix in constant name. --- harbour/ChangeLog | 55 ++- harbour/contrib/hbide/idemain.prg | 2 +- harbour/contrib/hbnetio/utils/netiosrv.prg | 14 +- ...class_hbevents.txt => class_hbqevents.txt} | 18 +- .../{class_hbslots.txt => class_hbqslots.txt} | 18 +- .../qtcore/g/{HBEvents.cpp => HBQEvents.cpp} | 60 +-- .../qtcore/g/{HBSlots.cpp => HBQSlots.cpp} | 64 +-- harbour/contrib/hbqt/qtcore/g/filelist.hbm | 8 +- harbour/contrib/hbqt/qtcore/g/hbqtcore.h | 16 +- .../{hbqt_hbevents.cpp => hbqt_hbqevents.cpp} | 26 +- .../{hbqt_hbevents.h => hbqt_hbqevents.h} | 6 +- .../{hbqt_hbslots.cpp => hbqt_hbqslots.cpp} | 402 +++++++++--------- .../{hbqt_hbslots.h => hbqt_hbqslots.h} | 6 +- harbour/contrib/hbqt/qtcore/hbqtcore.hbc | 2 +- harbour/contrib/hbqt/qtcore/hbqtcore.hbm | 8 +- harbour/contrib/hbqt/qtcore/hbqtcore.hbx | 63 ++- .../qth/{HBEvents.qth => HBQEvents.qth} | 10 +- .../qtcore/qth/{HBSlots.qth => HBQSlots.qth} | 10 +- harbour/contrib/hbqt/qtgui/hbqtgui.hbx | 261 ++++++++++++ .../contrib/hbqt/qtnetwork/hbqtnetwork.hbx | 6 + harbour/contrib/hbqt/tests/demoqt.prg | 2 +- harbour/contrib/hbqt/tests/dialogqt.prg | 2 +- harbour/contrib/hbqt/tests/testbrow.prg | 2 +- harbour/contrib/hbqt/tests/testqaim.prg | 2 +- harbour/contrib/hbqt/tests/testres.prg | 2 +- harbour/contrib/hbqt/utils/qtcore.qtp | 4 +- harbour/contrib/hbxbp/tests/demoxbp.prg | 2 +- harbour/contrib/hbxbp/tests/dialogqt.prg | 2 +- 28 files changed, 721 insertions(+), 352 deletions(-) rename harbour/contrib/hbqt/qtcore/doc/en/{class_hbevents.txt => class_hbqevents.txt} (64%) rename harbour/contrib/hbqt/qtcore/doc/en/{class_hbslots.txt => class_hbqslots.txt} (66%) rename harbour/contrib/hbqt/qtcore/g/{HBEvents.cpp => HBQEvents.cpp} (72%) rename harbour/contrib/hbqt/qtcore/g/{HBSlots.cpp => HBQSlots.cpp} (73%) rename harbour/contrib/hbqt/qtcore/{hbqt_hbevents.cpp => hbqt_hbqevents.cpp} (91%) rename harbour/contrib/hbqt/qtcore/{hbqt_hbevents.h => hbqt_hbqevents.h} (97%) rename harbour/contrib/hbqt/qtcore/{hbqt_hbslots.cpp => hbqt_hbqslots.cpp} (69%) rename harbour/contrib/hbqt/qtcore/{hbqt_hbslots.h => hbqt_hbqslots.h} (99%) rename harbour/contrib/hbqt/qtcore/qth/{HBEvents.qth => HBQEvents.qth} (95%) rename harbour/contrib/hbqt/qtcore/qth/{HBSlots.qth => HBQSlots.qth} (96%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a78beac3f5..cdddaedff8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,53 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-20 00:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/qtcore/hbqtcore.hbm + * contrib/hbqt/qtcore/hbqtcore.hbc + - contrib/hbqt/qtcore/hbqt_hbevents.cpp + + contrib/hbqt/qtcore/hbqt_hbqevents.cpp + - contrib/hbqt/qtcore/hbqt_hbslots.cpp + + contrib/hbqt/qtcore/hbqt_hbqslots.cpp + - contrib/hbqt/qtcore/hbqt_hbevents.h + + contrib/hbqt/qtcore/hbqt_hbqevents.h + - contrib/hbqt/qtcore/hbqt_hbslots.h + + contrib/hbqt/qtcore/hbqt_hbqslots.h + * contrib/hbqt/qtcore/g/filelist.hbm + * contrib/hbqt/qtcore/g/hbqtcore.h + - contrib/hbqt/qtcore/g/HBEvents.cpp + + contrib/hbqt/qtcore/g/HBQEvents.cpp + - contrib/hbqt/qtcore/g/HBSlots.cpp + + contrib/hbqt/qtcore/g/HBQSlots.cpp + - contrib/hbqt/qtcore/qth/HBEvents.qth + + contrib/hbqt/qtcore/qth/HBQEvents.qth + - contrib/hbqt/qtcore/qth/HBSlots.qth + + contrib/hbqt/qtcore/qth/HBQSlots.qth + - contrib/hbqt/qtcore/doc/en/class_hbevents.txt + + contrib/hbqt/qtcore/doc/en/class_hbqevents.txt + - contrib/hbqt/qtcore/doc/en/class_hbslots.txt + + contrib/hbqt/qtcore/doc/en/class_hbqslots.txt + * contrib/hbqt/utils/qtcore.qtp + ! Renamed HBSLOTS -> HBQSLOTS + ! Renamed HBEVENTS -> HBQEVENTS + + * contrib/hbqt/qtgui/hbqtgui.hbx + * contrib/hbqt/qtcore/hbqtcore.hbx + * contrib/hbqt/qtnetwork/hbqtnetwork.hbx + * Regenerated after several recent changes. + + * contrib/hbqt/tests/testres.prg + * contrib/hbqt/tests/demoqt.prg + * contrib/hbqt/tests/dialogqt.prg + * contrib/hbqt/tests/testbrow.prg + * contrib/hbqt/tests/testqaim.prg + * contrib/hbxbp/tests/demoxbp.prg + * contrib/hbxbp/tests/dialogqt.prg + * contrib/hbide/idemain.prg + * Changed 'REQUEST HB_QT' -> 'REQUEST HB_QTGUI' + + * contrib/hbnetio/utils/netiosrv.prg + ! Fixed one type prefix in constant name. + 2010-09-19 21:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/qtcore/hbqtcore.hbx * contrib/hbqt/qtcore/hbqt_destruct.cpp @@ -31,7 +78,7 @@ HB_QTGUI puller will automatically pull HB_QTCORE. ! Fixed to use HB_QTCORE and HB_QTGUI puller symbols instead of former HB_QT. Please change your code. - ; TODO: Changed HB_QT to HB_QTGUI. + ; TODO: Change HB_QT to HB_QTGUI. [DONE] ; TODO: Delete HB_QT * contrib/hbqt/qtgui/g/QApplication.cpp @@ -63,9 +110,9 @@ * contrib/hbqt/qtgui/qth/QApplication.qth ! QTextCodec::codecForLocale() => QTextCodec::codecForName( "UTF8" ) - This synchronizes the codepage used by hbQT for its translation - operations. It is not needed in QCoreApplication() because - for all types of hbQT based applications QApplication() is + This synchronizes the codepage used by hbQT for its translation + operations. It is not needed in QCoreApplication() because + for all types of hbQT based applications QApplication() is ever to be called as first line. TODO: needed an option for users to set Harbour's recognized codepages. diff --git a/harbour/contrib/hbide/idemain.prg b/harbour/contrib/hbide/idemain.prg index c9712385ab..ab16de4971 100644 --- a/harbour/contrib/hbide/idemain.prg +++ b/harbour/contrib/hbide/idemain.prg @@ -88,7 +88,7 @@ REQUEST __HBEXTERN__HBQTNETWORK__ /*----------------------------------------------------------------------*/ -REQUEST HB_QT +REQUEST HB_QTGUI REQUEST DBFCDX REQUEST DBFNTX diff --git a/harbour/contrib/hbnetio/utils/netiosrv.prg b/harbour/contrib/hbnetio/utils/netiosrv.prg index 83c1593dbc..b30e13c6b6 100644 --- a/harbour/contrib/hbnetio/utils/netiosrv.prg +++ b/harbour/contrib/hbnetio/utils/netiosrv.prg @@ -46,7 +46,7 @@ REQUEST HB_MT #define _NETIOSRV_cRootDir 3 #define _NETIOSRV_lRPC 4 #define _NETIOSRV_cRPCFFileName 5 -#define _NETIOSRV_cRPCFHRB 6 +#define _NETIOSRV_hRPCFHRB 6 #define _NETIOSRV_lEncryption 7 #define _NETIOSRV_pListenSocket 8 #define _NETIOSRV_MAX_ 8 @@ -113,17 +113,17 @@ PROCEDURE Main( ... ) cFile := HB_COMPILEBUF( HB_ARGV( 0 ), "-n2", "-w", "-es2", "-q0",; "-D" + "__HBSCRIPT__HBNETIOSRV", netiosrv[ _NETIOSRV_cRPCFFileName ] ) IF cFile != NIL - netiosrv[ _NETIOSRV_cRPCFHRB ] := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile ) + netiosrv[ _NETIOSRV_hRPCFHRB ] := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, cFile ) ENDIF EXIT OTHERWISE - netiosrv[ _NETIOSRV_cRPCFHRB ] := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, netiosrv[ _NETIOSRV_cRPCFFileName ] ) + netiosrv[ _NETIOSRV_hRPCFHRB ] := hb_hrbLoad( HB_HRB_BIND_FORCELOCAL, netiosrv[ _NETIOSRV_cRPCFFileName ] ) EXIT ENDSWITCH - netiosrv[ _NETIOSRV_lRPC ] := ! Empty( netiosrv[ _NETIOSRV_cRPCFHRB ] ) .AND. ! Empty( hb_hrbGetFunSym( netiosrv[ _NETIOSRV_cRPCFHRB ], _RPC_FILTER ) ) + netiosrv[ _NETIOSRV_lRPC ] := ! Empty( netiosrv[ _NETIOSRV_hRPCFHRB ] ) .AND. ! Empty( hb_hrbGetFunSym( netiosrv[ _NETIOSRV_hRPCFHRB ], _RPC_FILTER ) ) IF ! netiosrv[ _NETIOSRV_lRPC ] netiosrv[ _NETIOSRV_cRPCFFileName ] := NIL - netiosrv[ _NETIOSRV_cRPCFHRB ] := NIL + netiosrv[ _NETIOSRV_hRPCFHRB ] := NIL ENDIF CASE Lower( cParam ) == "-rpc" netiosrv[ _NETIOSRV_lRPC ] := .T. @@ -144,7 +144,7 @@ PROCEDURE Main( ... ) netio_mtserver( netiosrv[ _NETIOSRV_nPort ],; netiosrv[ _NETIOSRV_cIFAddr ],; netiosrv[ _NETIOSRV_cRootDir ],; - iif( Empty( netiosrv[ _NETIOSRV_cRPCFHRB ] ), netiosrv[ _NETIOSRV_lRPC ], hb_hrbGetFunSym( netiosrv[ _NETIOSRV_cRPCFHRB ], _RPC_FILTER ) ),; + iif( Empty( netiosrv[ _NETIOSRV_hRPCFHRB ] ), netiosrv[ _NETIOSRV_lRPC ], hb_hrbGetFunSym( netiosrv[ _NETIOSRV_hRPCFHRB ], _RPC_FILTER ) ),; cPassword ) netiosrv[ _NETIOSRV_lEncryption ] := ! Empty( cPassword ) @@ -285,7 +285,7 @@ STATIC PROCEDURE ShowConfig( netiosrv ) QQOut( "Root filesystem: " + netiosrv[ _NETIOSRV_cRootDir ], hb_eol() ) QQOut( "RPC support: " + iif( netiosrv[ _NETIOSRV_lRPC ], "enabled", "disabled" ), hb_eol() ) QQOut( "Encryption: " + iif( netiosrv[ _NETIOSRV_lEncryption ], "enabled", "disabled" ), hb_eol() ) - QQOut( "RPC filter module: " + iif( Empty( netiosrv[ _NETIOSRV_cRPCFHRB ] ), iif( netiosrv[ _NETIOSRV_lRPC ], "not set (WARNING: unsafe open server)", "not set" ), netiosrv[ _NETIOSRV_cRPCFFileName ] ), hb_eol() ) + QQOut( "RPC filter module: " + iif( Empty( netiosrv[ _NETIOSRV_hRPCFHRB ] ), iif( netiosrv[ _NETIOSRV_lRPC ], "not set (WARNING: unsafe open server)", "not set" ), netiosrv[ _NETIOSRV_cRPCFFileName ] ), hb_eol() ) RETURN diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_hbevents.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_hbqevents.txt similarity index 64% rename from harbour/contrib/hbqt/qtcore/doc/en/class_hbevents.txt rename to harbour/contrib/hbqt/qtcore/doc/en/class_hbqevents.txt index 4c72bd51d4..52199d1863 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_hbevents.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_hbqevents.txt @@ -6,25 +6,25 @@ * $TEMPLATE$ * Class * $NAME$ - * HBEvents() + * HBQEvents() * $CATEGORY$ * Harbour Bindings for Qt * $SUBCATEGORY$ * GUI * $EXTERNALLINK$ - * http://doc.trolltech.com/4.5/hbevents.html + * http://doc.trolltech.com/4.5/hbqevents.html * $ONELINER$ - * Creates a new HBEvents object. + * Creates a new HBQEvents object. * $INHERITS$ * QObject * $SYNTAX$ - * HBEvents():new( ... ) - * HBEvents():from( pPtr_OR_oObj_of_type_HBEvents ) - * HBEvents():configure( pPtr_OR_oObj_of_type_HBEvents ) + * HBQEvents():new( ... ) + * HBQEvents():from( pPtr_OR_oObj_of_type_HBQEvents ) + * HBQEvents():configure( pPtr_OR_oObj_of_type_HBQEvents ) * $ARGUMENTS$ * * $RETURNS$ - * An instance of the object of type HBEvents + * An instance of the object of type HBQEvents * $METHODS$ * :hbConnect( xObj, nEvent, xBlock ) -> lBool * :hbDisconnect( xObj, nEvent ) -> lBool @@ -45,8 +45,8 @@ * $VERSION$ * 4.5 or upper * $FILES$ - * Harbour source: contrib/hbqt/qtcore/THBEvents.prg - * C++ wrappers : contrib/hbqt/qtcore/HBEvents.cpp + * Harbour source: contrib/hbqt/qtcore/THBQEvents.prg + * C++ wrappers : contrib/hbqt/qtcore/HBQEvents.cpp * Library : hbqtcore * $SEEALSO$ * QObject diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_hbslots.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_hbqslots.txt similarity index 66% rename from harbour/contrib/hbqt/qtcore/doc/en/class_hbslots.txt rename to harbour/contrib/hbqt/qtcore/doc/en/class_hbqslots.txt index 1a83db8ad4..8621a31981 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_hbslots.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_hbqslots.txt @@ -6,25 +6,25 @@ * $TEMPLATE$ * Class * $NAME$ - * HBSlots() + * HBQSlots() * $CATEGORY$ * Harbour Bindings for Qt * $SUBCATEGORY$ * GUI * $EXTERNALLINK$ - * http://doc.trolltech.com/4.5/hbslots.html + * http://doc.trolltech.com/4.5/hbqslots.html * $ONELINER$ - * Creates a new HBSlots object. + * Creates a new HBQSlots object. * $INHERITS$ * QObject * $SYNTAX$ - * HBSlots():new( ... ) - * HBSlots():from( pPtr_OR_oObj_of_type_HBSlots ) - * HBSlots():configure( pPtr_OR_oObj_of_type_HBSlots ) + * HBQSlots():new( ... ) + * HBQSlots():from( pPtr_OR_oObj_of_type_HBQSlots ) + * HBQSlots():configure( pPtr_OR_oObj_of_type_HBQSlots ) * $ARGUMENTS$ * * $RETURNS$ - * An instance of the object of type HBSlots + * An instance of the object of type HBQSlots * $METHODS$ * :hbConnect( xPObj, pSlot, xBBlock ) -> lBool * :hbDisconnect( xObj, pSlot ) -> lBool @@ -46,8 +46,8 @@ * $VERSION$ * 4.5 or upper * $FILES$ - * Harbour source: contrib/hbqt/qtcore/THBSlots.prg - * C++ wrappers : contrib/hbqt/qtcore/HBSlots.cpp + * Harbour source: contrib/hbqt/qtcore/THBQSlots.prg + * C++ wrappers : contrib/hbqt/qtcore/HBQSlots.cpp * Library : hbqtcore * $SEEALSO$ * QObject diff --git a/harbour/contrib/hbqt/qtcore/g/HBEvents.cpp b/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp similarity index 72% rename from harbour/contrib/hbqt/qtcore/g/HBEvents.cpp rename to harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp index bb514482ac..b82fd96661 100644 --- a/harbour/contrib/hbqt/qtcore/g/HBEvents.cpp +++ b/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp @@ -68,27 +68,27 @@ #include #include -#include "hbqt_hbevents.h" +#include "hbqt_hbqevents.h" /* - * HBEvents() - * ~HBEvents() + * HBQEvents() + * ~HBQEvents() * */ typedef struct { - QPointer< HBEvents > ph; + QPointer< HBQEvents > ph; bool bNew; PHBQT_GC_FUNC func; int type; -} HBQT_GC_T_HBEvents; +} HBQT_GC_T_HBQEvents; -HBQT_GC_FUNC( hbqt_gcRelease_HBEvents ) +HBQT_GC_FUNC( hbqt_gcRelease_HBQEvents ) { - HBEvents * ph = NULL ; - HBQT_GC_T_HBEvents * p = ( HBQT_GC_T_HBEvents * ) Cargo; + HBQEvents * ph = NULL ; + HBQT_GC_T_HBQEvents * p = ( HBQT_GC_T_HBQEvents * ) Cargo; if( p && p->bNew && p->ph ) { @@ -98,65 +98,65 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBEvents ) const QMetaObject * m = ( ph )->metaObject(); if( ( QString ) m->className() != ( QString ) "QObject" ) { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p %p YES_rel_HBEvents /.\\ ", (void*) ph, (void*) p->ph ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p %p YES_rel_HBQEvents /.\\ ", (void*) ph, (void*) p->ph ) ); delete ( p->ph ); - HB_TRACE( HB_TR_DEBUG, ( "ph=%p %p YES_rel_HBEvents \\./ ", (void*) ph, (void*) p->ph ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p %p YES_rel_HBQEvents \\./ ", (void*) ph, (void*) p->ph ) ); p->ph = NULL; } else { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p NO__rel_HBEvents ", ph ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p NO__rel_HBQEvents ", ph ) ); p->ph = NULL; } } else { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p DEL_rel_HBEvents : Object already deleted!", ph ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p DEL_rel_HBQEvents : Object already deleted!", ph ) ); p->ph = NULL; } } else { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p PTR_rel_HBEvents : Object not created with new=true", ph ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p PTR_rel_HBQEvents : Object not created with new=true", ph ) ); p->ph = NULL; } } -void * hbqt_gcAllocate_HBEvents( void * pObj, bool bNew ) +void * hbqt_gcAllocate_HBQEvents( void * pObj, bool bNew ) { - HBQT_GC_T_HBEvents * p = ( HBQT_GC_T_HBEvents * ) hb_gcAllocate( sizeof( HBQT_GC_T_HBEvents ), hbqt_gcFuncs() ); + HBQT_GC_T_HBQEvents * p = ( HBQT_GC_T_HBQEvents * ) hb_gcAllocate( sizeof( HBQT_GC_T_HBQEvents ), hbqt_gcFuncs() ); - new( & p->ph ) QPointer< HBEvents >( ( HBEvents * ) pObj ); + new( & p->ph ) QPointer< HBQEvents >( ( HBQEvents * ) pObj ); p->bNew = bNew; - p->func = hbqt_gcRelease_HBEvents; - p->type = HBQT_TYPE_HBEvents; + p->func = hbqt_gcRelease_HBQEvents; + p->type = HBQT_TYPE_HBQEvents; if( bNew ) { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p _new_HBEvents under p->pq", pObj ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p _new_HBQEvents under p->pq", pObj ) ); } else { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p NOT_new_HBEvents", pObj ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p NOT_new_HBQEvents", pObj ) ); } return p; } -HB_FUNC( QT_HBEVENTS ) +HB_FUNC( QT_HBQEVENTS ) { - HBEvents * pObj = NULL; + HBQEvents * pObj = NULL; - pObj = new HBEvents() ; + pObj = new HBQEvents() ; - hb_retptrGC( hbqt_gcAllocate_HBEvents( ( void * ) pObj, true ) ); + hb_retptrGC( hbqt_gcAllocate_HBQEvents( ( void * ) pObj, true ) ); } /* * bool hbConnect( PHB_ITEM obj, int event, PHB_ITEM block ) */ -HB_FUNC( QT_HBEVENTS_HBCONNECT ) +HB_FUNC( QT_HBQEVENTS_HBCONNECT ) { - HBEvents * p = hbqt_par_HBEvents( 1 ); + HBQEvents * p = hbqt_par_HBQEvents( 1 ); if( p ) { hb_retl( ( p )->hbConnect( hb_param( 2, HB_IT_ANY ), hb_parni( 3 ), hb_param( 4, HB_IT_ANY ) ) ); @@ -166,9 +166,9 @@ HB_FUNC( QT_HBEVENTS_HBCONNECT ) /* * bool hbDisconnect( PHB_ITEM obj, int event ) */ -HB_FUNC( QT_HBEVENTS_HBDISCONNECT ) +HB_FUNC( QT_HBQEVENTS_HBDISCONNECT ) { - HBEvents * p = hbqt_par_HBEvents( 1 ); + HBQEvents * p = hbqt_par_HBQEvents( 1 ); if( p ) { hb_retl( ( p )->hbDisconnect( hb_param( 2, HB_IT_ANY ), hb_parni( 3 ) ) ); @@ -178,9 +178,9 @@ HB_FUNC( QT_HBEVENTS_HBDISCONNECT ) /* * bool hbClear() */ -HB_FUNC( QT_HBEVENTS_HBCLEAR ) +HB_FUNC( QT_HBQEVENTS_HBCLEAR ) { - HBEvents * p = hbqt_par_HBEvents( 1 ); + HBQEvents * p = hbqt_par_HBQEvents( 1 ); if( p ) { hb_retl( ( p )->hbClear() ); diff --git a/harbour/contrib/hbqt/qtcore/g/HBSlots.cpp b/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp similarity index 73% rename from harbour/contrib/hbqt/qtcore/g/HBSlots.cpp rename to harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp index 7b5294df08..77dfdd1041 100644 --- a/harbour/contrib/hbqt/qtcore/g/HBSlots.cpp +++ b/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp @@ -68,26 +68,26 @@ #include #include -#include "hbqt_hbslots.h" +#include "hbqt_hbqslots.h" /* - * HBSlots() - * ~HBSlots() + * HBQSlots() + * ~HBQSlots() */ typedef struct { - QPointer< HBSlots > ph; + QPointer< HBQSlots > ph; bool bNew; PHBQT_GC_FUNC func; int type; -} HBQT_GC_T_HBSlots; +} HBQT_GC_T_HBQSlots; -HBQT_GC_FUNC( hbqt_gcRelease_HBSlots ) +HBQT_GC_FUNC( hbqt_gcRelease_HBQSlots ) { - HBSlots * ph = NULL ; - HBQT_GC_T_HBSlots * p = ( HBQT_GC_T_HBSlots * ) Cargo; + HBQSlots * ph = NULL ; + HBQT_GC_T_HBQSlots * p = ( HBQT_GC_T_HBQSlots * ) Cargo; if( p && p->bNew && p->ph ) { @@ -97,65 +97,65 @@ HBQT_GC_FUNC( hbqt_gcRelease_HBSlots ) const QMetaObject * m = ( ph )->metaObject(); if( ( QString ) m->className() != ( QString ) "QObject" ) { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p %p YES_rel_HBSlots /.\\ ", (void*) ph, (void*) p->ph ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p %p YES_rel_HBQSlots /.\\ ", (void*) ph, (void*) p->ph ) ); delete ( p->ph ); - HB_TRACE( HB_TR_DEBUG, ( "ph=%p %p YES_rel_HBSlots \\./ ", (void*) ph, (void*) p->ph ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p %p YES_rel_HBQSlots \\./ ", (void*) ph, (void*) p->ph ) ); p->ph = NULL; } else { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p NO__rel_HBSlots ", ph ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p NO__rel_HBQSlots ", ph ) ); p->ph = NULL; } } else { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p DEL_rel_HBSlots : Object already deleted!", ph ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p DEL_rel_HBQSlots : Object already deleted!", ph ) ); p->ph = NULL; } } else { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p PTR_rel_HBSlots : Object not created with new=true", ph ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p PTR_rel_HBQSlots : Object not created with new=true", ph ) ); p->ph = NULL; } } -void * hbqt_gcAllocate_HBSlots( void * pObj, bool bNew ) +void * hbqt_gcAllocate_HBQSlots( void * pObj, bool bNew ) { - HBQT_GC_T_HBSlots * p = ( HBQT_GC_T_HBSlots * ) hb_gcAllocate( sizeof( HBQT_GC_T_HBSlots ), hbqt_gcFuncs() ); + HBQT_GC_T_HBQSlots * p = ( HBQT_GC_T_HBQSlots * ) hb_gcAllocate( sizeof( HBQT_GC_T_HBQSlots ), hbqt_gcFuncs() ); - new( & p->ph ) QPointer< HBSlots >( ( HBSlots * ) pObj ); + new( & p->ph ) QPointer< HBQSlots >( ( HBQSlots * ) pObj ); p->bNew = bNew; - p->func = hbqt_gcRelease_HBSlots; - p->type = HBQT_TYPE_HBSlots; + p->func = hbqt_gcRelease_HBQSlots; + p->type = HBQT_TYPE_HBQSlots; if( bNew ) { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p _new_HBSlots under p->pq", pObj ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p _new_HBQSlots under p->pq", pObj ) ); } else { - HB_TRACE( HB_TR_DEBUG, ( "ph=%p NOT_new_HBSlots", pObj ) ); + HB_TRACE( HB_TR_DEBUG, ( "ph=%p NOT_new_HBQSlots", pObj ) ); } return p; } -HB_FUNC( QT_HBSLOTS ) +HB_FUNC( QT_HBQSLOTS ) { - HBSlots * pObj = NULL; + HBQSlots * pObj = NULL; - pObj = new HBSlots() ; + pObj = new HBQSlots() ; - hb_retptrGC( hbqt_gcAllocate_HBSlots( ( void * ) pObj, true ) ); + hb_retptrGC( hbqt_gcAllocate_HBQSlots( ( void * ) pObj, true ) ); } /* * bool hbConnect( PHB_ITEM pObj, const char * slot, PHB_ITEM bBlock ) */ -HB_FUNC( QT_HBSLOTS_HBCONNECT ) +HB_FUNC( QT_HBQSLOTS_HBCONNECT ) { - HBSlots * p = hbqt_par_HBSlots( 1 ); + HBQSlots * p = hbqt_par_HBQSlots( 1 ); if( p ) { hb_retl( ( p )->hbConnect( hb_param( 2, HB_IT_ANY ), hbqt_par_char( 3 ), hb_param( 4, HB_IT_ANY ) ) ); @@ -165,9 +165,9 @@ HB_FUNC( QT_HBSLOTS_HBCONNECT ) /* * bool hbDisconnect( PHB_ITEM obj, const char * slot ) */ -HB_FUNC( QT_HBSLOTS_HBDISCONNECT ) +HB_FUNC( QT_HBQSLOTS_HBDISCONNECT ) { - HBSlots * p = hbqt_par_HBSlots( 1 ); + HBQSlots * p = hbqt_par_HBQSlots( 1 ); if( p ) { hb_retl( ( p )->hbDisconnect( hb_param( 2, HB_IT_ANY ), hbqt_par_char( 3 ) ) ); @@ -177,9 +177,9 @@ HB_FUNC( QT_HBSLOTS_HBDISCONNECT ) /* * bool hbIsConnected( PHB_ITEM obj, const char * slot ) */ -HB_FUNC( QT_HBSLOTS_HBISCONNECTED ) +HB_FUNC( QT_HBQSLOTS_HBISCONNECTED ) { - HBSlots * p = hbqt_par_HBSlots( 1 ); + HBQSlots * p = hbqt_par_HBQSlots( 1 ); if( p ) { hb_retl( ( p )->hbIsConnected( hb_param( 2, HB_IT_ANY ), hbqt_par_char( 3 ) ) ); @@ -189,9 +189,9 @@ HB_FUNC( QT_HBSLOTS_HBISCONNECTED ) /* * bool hbClear() */ -HB_FUNC( QT_HBSLOTS_HBCLEAR ) +HB_FUNC( QT_HBQSLOTS_HBCLEAR ) { - HBSlots * p = hbqt_par_HBSlots( 1 ); + HBQSlots * p = hbqt_par_HBQSlots( 1 ); if( p ) { hb_retl( ( p )->hbClear() ); diff --git a/harbour/contrib/hbqt/qtcore/g/filelist.hbm b/harbour/contrib/hbqt/qtcore/g/filelist.hbm index 38b0ad3544..5e471d972e 100644 --- a/harbour/contrib/hbqt/qtcore/g/filelist.hbm +++ b/harbour/contrib/hbqt/qtcore/g/filelist.hbm @@ -9,8 +9,8 @@ # -------------------------------------------------------------------- hbqtcore_extern.prg -HBEvents.cpp -HBSlots.cpp +HBQEvents.cpp +HBQSlots.cpp HBQString.cpp QAbstractItemModel.cpp QAbstractListModel.cpp @@ -64,8 +64,8 @@ QTranslator.cpp QUrl.cpp QVariant.cpp -THBEvents.prg -THBSlots.prg +THBQEvents.prg +THBQSlots.prg THBQString.prg TQAbstractItemModel.prg TQAbstractListModel.prg diff --git a/harbour/contrib/hbqt/qtcore/g/hbqtcore.h b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h index 024e2f65b5..2e4f487b99 100644 --- a/harbour/contrib/hbqt/qtcore/g/hbqtcore.h +++ b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h @@ -15,8 +15,8 @@ HB_EXTERN_BEGIN -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBEvents ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBSlots ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBQEvents ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBQSlots ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_HBQString ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QAbstractItemModel ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QAbstractListModel ); @@ -70,8 +70,8 @@ extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QTranslator ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QUrl ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QVariant ); -extern HB_EXPORT void * hbqt_gcAllocate_HBEvents( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_HBSlots( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_HBQEvents( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_HBQSlots( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_HBQString( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QAbstractItemModel( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QAbstractListModel( void * pObj, bool bNew ); @@ -127,8 +127,8 @@ extern HB_EXPORT void * hbqt_gcAllocate_QVariant( void * pObj, bool bNew ); HB_EXTERN_END -#define hbqt_par_HBEvents( n ) ( ( HBEvents * ) hbqt_gcpointer( n ) ) -#define hbqt_par_HBSlots( n ) ( ( HBSlots * ) hbqt_gcpointer( n ) ) +#define hbqt_par_HBQEvents( n ) ( ( HBQEvents * ) hbqt_gcpointer( n ) ) +#define hbqt_par_HBQSlots( n ) ( ( HBQSlots * ) hbqt_gcpointer( n ) ) #define hbqt_par_HBQString( n ) ( ( HBQString * ) hbqt_gcpointer( n ) ) #define hbqt_par_QAbstractItemModel( n ) ( ( QAbstractItemModel * ) hbqt_gcpointer( n ) ) #define hbqt_par_QAbstractListModel( n ) ( ( QAbstractListModel * ) hbqt_gcpointer( n ) ) @@ -182,8 +182,8 @@ HB_EXTERN_END #define hbqt_par_QUrl( n ) ( ( QUrl * ) hbqt_gcpointer( n ) ) #define hbqt_par_QVariant( n ) ( ( QVariant * ) hbqt_gcpointer( n ) ) -#define HBQT_TYPE_HBEvents 0x44355450 -#define HBQT_TYPE_HBSlots 0xCDC96C4E +#define HBQT_TYPE_HBQEvents 0xCFEFBC47 +#define HBQT_TYPE_HBQSlots 0xA9999114 #define HBQT_TYPE_HBQString 0x02D659A4 #define HBQT_TYPE_QAbstractItemModel 0xA364960B #define HBQT_TYPE_QAbstractListModel 0x2E9A0D19 diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbevents.cpp b/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp similarity index 91% rename from harbour/contrib/hbqt/qtcore/hbqt_hbevents.cpp rename to harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp index 74896d3dcb..c2347fe0c6 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbevents.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp @@ -61,19 +61,19 @@ #if QT_VERSION >= 0x040500 -#include "hbqt_hbevents.h" +#include "hbqt_hbqevents.h" #include #include -HBEvents::HBEvents( QObject * parent ) : QObject( parent ) +HBQEvents::HBQEvents( QObject * parent ) : QObject( parent ) { } /* QUESTION: Shouldn't all events be disconnected at this point? */ -HBEvents::~HBEvents() +HBQEvents::~HBQEvents() { - HB_TRACE( HB_TR_DEBUG, ( " HBEvents::~HBEvents()" ) ); + HB_TRACE( HB_TR_DEBUG, ( " HBQEvents::~HBQEvents()" ) ); int i; for( i = 0; i < listBlock.size(); i++ ) @@ -87,7 +87,7 @@ HBEvents::~HBEvents() listBlock.clear(); } -bool HBEvents::hbConnect( PHB_ITEM pObj, int iEvent, PHB_ITEM bBlock ) +bool HBQEvents::hbConnect( PHB_ITEM pObj, int iEvent, PHB_ITEM bBlock ) { HB_SYMBOL_UNUSED( pObj ); HB_SYMBOL_UNUSED( iEvent ); @@ -112,7 +112,7 @@ bool HBEvents::hbConnect( PHB_ITEM pObj, int iEvent, PHB_ITEM bBlock ) return false; } -bool HBEvents::hbDisconnect( PHB_ITEM pObj, int iEvent ) +bool HBQEvents::hbDisconnect( PHB_ITEM pObj, int iEvent ) { HB_SYMBOL_UNUSED( pObj ); @@ -137,9 +137,9 @@ bool HBEvents::hbDisconnect( PHB_ITEM pObj, int iEvent ) return false; } -bool HBEvents::hbClear() +bool HBQEvents::hbClear() { - HB_TRACE( HB_TR_DEBUG, ( " HBEvents::hbClear()" ) ); + HB_TRACE( HB_TR_DEBUG, ( " HBQEvents::hbClear()" ) ); int i; for( i = 0; i < listBlock.size(); i++ ) @@ -154,7 +154,7 @@ bool HBEvents::hbClear() return true; } -bool HBEvents::eventFilter( QObject * object, QEvent * event ) +bool HBQEvents::eventFilter( QObject * object, QEvent * event ) { QEvent::Type eventtype = event->type(); @@ -186,7 +186,7 @@ bool HBEvents::eventFilter( QObject * object, QEvent * event ) HB_FUNC( QT_EVENTS_CONNECT ) { HB_BOOL bRet = HB_FALSE; - HBEvents * t_events = hbqt_par_HBEvents( 1 ); + HBQEvents * t_events = hbqt_par_HBQEvents( 1 ); if( t_events ) { @@ -218,7 +218,7 @@ HB_FUNC( QT_EVENTS_CONNECT ) HB_FUNC( QT_EVENTS_DISCONNECT ) { HB_BOOL bRet = HB_FALSE; - HBEvents * t_events = hbqt_par_HBEvents( 1 ); + HBQEvents * t_events = hbqt_par_HBQEvents( 1 ); if( t_events ) { @@ -252,9 +252,9 @@ HB_FUNC( QT_EVENTS_NEW ) { void * pObj = NULL; - pObj = ( HBEvents * ) new HBEvents(); + pObj = ( HBQEvents * ) new HBQEvents(); - hb_retptrGC( hbqt_gcAllocate_HBEvents( pObj, true ) ); + hb_retptrGC( hbqt_gcAllocate_HBQEvents( pObj, true ) ); } #endif diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbevents.h b/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.h similarity index 97% rename from harbour/contrib/hbqt/qtcore/hbqt_hbevents.h rename to harbour/contrib/hbqt/qtcore/hbqt_hbqevents.h index e22f1f3c9c..12a35ae306 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbevents.h +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.h @@ -63,13 +63,13 @@ #include #include -class HBEvents: public QObject +class HBQEvents: public QObject { Q_OBJECT public: - HBEvents( QObject *parent = 0 ); - ~HBEvents(); + HBQEvents( QObject *parent = 0 ); + ~HBQEvents(); QList listBlock; bool hbConnect( PHB_ITEM pObj, int iEvent, PHB_ITEM bBlock ); diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbslots.cpp b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp similarity index 69% rename from harbour/contrib/hbqt/qtcore/hbqt_hbslots.cpp rename to harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp index 191cf6f446..f3f28c59bb 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbslots.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp @@ -61,13 +61,13 @@ #if QT_VERSION >= 0x040500 -#include "hbqt_hbslots.h" +#include "hbqt_hbqslots.h" #include /*----------------------------------------------------------------------*/ -static bool connect_signal( QString signal, QObject * object, HBSlots * t_slots ) +static bool connect_signal( QString signal, QObject * object, HBQSlots * t_slots ) { if( signal == ( QString ) "customContextMenuRequested(QPoint)" ) return object->connect( object, SIGNAL( customContextMenuRequested( const QPoint & ) ), t_slots, SLOT( customContextMenuRequested( const QPoint & ) ), Qt::AutoConnection ); @@ -454,7 +454,7 @@ static bool disconnect_signal( QObject * object, const char * signal ) /*----------------------------------------------------------------------*/ -static void hbqt_SlotsExec( HBSlots * t_slots, QObject * object, const char * pszEvent ) +static void hbqt_SlotsExec( HBQSlots * t_slots, QObject * object, const char * pszEvent ) { if( object ) { @@ -467,7 +467,7 @@ static void hbqt_SlotsExec( HBSlots * t_slots, QObject * object, const char * ps } } -static void hbqt_SlotsExecBool( HBSlots * t_slots, QObject * object, const char * pszEvent, bool bBool ) +static void hbqt_SlotsExecBool( HBQSlots * t_slots, QObject * object, const char * pszEvent, bool bBool ) { if( object ) { @@ -482,7 +482,7 @@ static void hbqt_SlotsExecBool( HBSlots * t_slots, QObject * object, const char } } -static void hbqt_SlotsExecInt( HBSlots * t_slots, QObject * object, const char * pszEvent, int iValue ) +static void hbqt_SlotsExecInt( HBQSlots * t_slots, QObject * object, const char * pszEvent, int iValue ) { if( object ) { @@ -497,7 +497,7 @@ static void hbqt_SlotsExecInt( HBSlots * t_slots, QObject * object, const char * } } -static void hbqt_SlotsExecIntInt( HBSlots * t_slots, QObject * object, const char * pszEvent, int iValue1, int iValue2 ) +static void hbqt_SlotsExecIntInt( HBQSlots * t_slots, QObject * object, const char * pszEvent, int iValue1, int iValue2 ) { if( object ) { @@ -514,7 +514,7 @@ static void hbqt_SlotsExecIntInt( HBSlots * t_slots, QObject * object, const cha } } -static void hbqt_SlotsExecIntIntInt( HBSlots * t_slots, QObject * object, const char * pszEvent, int iValue1, int iValue2, int iValue3 ) +static void hbqt_SlotsExecIntIntInt( HBQSlots * t_slots, QObject * object, const char * pszEvent, int iValue1, int iValue2, int iValue3 ) { if( object ) { @@ -533,7 +533,7 @@ static void hbqt_SlotsExecIntIntInt( HBSlots * t_slots, QObject * object, const } } -static void hbqt_SlotsExecIntIntIntInt( HBSlots * t_slots, QObject * object, const char * pszEvent, int iValue1, int iValue2, int iValue3, int iValue4 ) +static void hbqt_SlotsExecIntIntIntInt( HBQSlots * t_slots, QObject * object, const char * pszEvent, int iValue1, int iValue2, int iValue3, int iValue4 ) { if( object ) { @@ -554,7 +554,7 @@ static void hbqt_SlotsExecIntIntIntInt( HBSlots * t_slots, QObject * object, con } } -static void hbqt_SlotsExecString( HBSlots * t_slots, QObject * object, const char * pszEvent, const QString & string ) +static void hbqt_SlotsExecString( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QString & string ) { if( object ) { @@ -569,7 +569,7 @@ static void hbqt_SlotsExecString( HBSlots * t_slots, QObject * object, const cha } } -static void hbqt_SlotsExecModel( HBSlots * t_slots, QObject * object, const char * pszEvent, const QModelIndex & index ) +static void hbqt_SlotsExecModel( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QModelIndex & index ) { if( object ) { @@ -585,7 +585,7 @@ static void hbqt_SlotsExecModel( HBSlots * t_slots, QObject * object, const char } } -static void hbqt_SlotsExecModelModel( HBSlots * t_slots, QObject * object, const char * pszEvent, const QModelIndex & index1, const QModelIndex & index2 ) +static void hbqt_SlotsExecModelModel( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QModelIndex & index1, const QModelIndex & index2 ) { if( object ) { @@ -604,7 +604,7 @@ static void hbqt_SlotsExecModelModel( HBSlots * t_slots, QObject * object, const } } -static void hbqt_SlotsExecItemSelItemSel( HBSlots * t_slots, QObject * object, const char * pszEvent, const QItemSelection & index1, const QItemSelection & index2 ) +static void hbqt_SlotsExecItemSelItemSel( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QItemSelection & index1, const QItemSelection & index2 ) { if( object ) { @@ -623,7 +623,7 @@ static void hbqt_SlotsExecItemSelItemSel( HBSlots * t_slots, QObject * object, c } } -static void hbqt_SlotsExecTextCharFormat( HBSlots * t_slots, QObject * object, const char * pszEvent, const QTextCharFormat & f ) +static void hbqt_SlotsExecTextCharFormat( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QTextCharFormat & f ) { if( object ) { @@ -639,7 +639,7 @@ static void hbqt_SlotsExecTextCharFormat( HBSlots * t_slots, QObject * object, c } } -static void hbqt_SlotsExecFont( HBSlots * t_slots, QObject * object, const char * pszEvent, const QFont & font ) +static void hbqt_SlotsExecFont( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QFont & font ) { if( object ) { @@ -655,7 +655,7 @@ static void hbqt_SlotsExecFont( HBSlots * t_slots, QObject * object, const char } } -static void hbqt_SlotsExecQTextCursor( HBSlots * t_slots, QObject * object, const char * pszEvent, const QTextCursor & cursor ) +static void hbqt_SlotsExecQTextCursor( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QTextCursor & cursor ) { if( object ) { @@ -671,7 +671,7 @@ static void hbqt_SlotsExecQTextCursor( HBSlots * t_slots, QObject * object, cons } } -static void hbqt_SlotsExecStringList( HBSlots * t_slots, QObject * object, const char * pszEvent, const QStringList & stringList ) +static void hbqt_SlotsExecStringList( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QStringList & stringList ) { if( object ) { @@ -687,7 +687,7 @@ static void hbqt_SlotsExecStringList( HBSlots * t_slots, QObject * object, const } } -static void hbqt_SlotsExecPointer( HBSlots * t_slots, QObject * object, const char * pszEvent, void * p1 ) +static void hbqt_SlotsExecPointer( HBQSlots * t_slots, QObject * object, const char * pszEvent, void * p1 ) { if( object ) { @@ -702,7 +702,7 @@ static void hbqt_SlotsExecPointer( HBSlots * t_slots, QObject * object, const ch } } -static void hbqt_SlotsExecPointerInt( HBSlots * t_slots, QObject * object, const char * pszEvent, void * pP1, int iInt ) +static void hbqt_SlotsExecPointerInt( HBQSlots * t_slots, QObject * object, const char * pszEvent, void * pP1, int iInt ) { if( object ) { @@ -719,7 +719,7 @@ static void hbqt_SlotsExecPointerInt( HBSlots * t_slots, QObject * object, const } } -static void hbqt_SlotsExecPointerPointer( HBSlots * t_slots, QObject * object, const char * pszEvent, void * pP1, void * pP2 ) +static void hbqt_SlotsExecPointerPointer( HBQSlots * t_slots, QObject * object, const char * pszEvent, void * pP1, void * pP2 ) { if( object ) { @@ -736,7 +736,7 @@ static void hbqt_SlotsExecPointerPointer( HBSlots * t_slots, QObject * object, c } } -static void hbqt_SlotsExecQRectInt( HBSlots * t_slots, QObject * object, const char * pszEvent, const QRect & r, int dy ) +static void hbqt_SlotsExecQRectInt( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QRect & r, int dy ) { if( object ) { @@ -754,7 +754,7 @@ static void hbqt_SlotsExecQRectInt( HBSlots * t_slots, QObject * object, const c } } -static void hbqt_SlotsExecQPoint( HBSlots * t_slots, QObject * object, const char * pszEvent, const QPoint & pos ) +static void hbqt_SlotsExecQPoint( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QPoint & pos ) { if( object ) { @@ -770,7 +770,7 @@ static void hbqt_SlotsExecQPoint( HBSlots * t_slots, QObject * object, const cha } } -static void hbqt_SlotsExecQRectF( HBSlots * t_slots, QObject * object, const char * pszEvent, const QRectF & rect ) +static void hbqt_SlotsExecQRectF( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QRectF & rect ) { if( object ) { @@ -786,7 +786,7 @@ static void hbqt_SlotsExecQRectF( HBSlots * t_slots, QObject * object, const cha } } -static void hbqt_SlotsExecQUrl( HBSlots * t_slots, QObject * object, const char * pszEvent, const QUrl & link ) +static void hbqt_SlotsExecQUrl( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QUrl & link ) { if( object ) { @@ -802,7 +802,7 @@ static void hbqt_SlotsExecQUrl( HBSlots * t_slots, QObject * object, const char } } -static void hbqt_SlotsExecQDate( HBSlots * t_slots, QObject * object, const char * pszEvent, const QDate & date ) +static void hbqt_SlotsExecQDate( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QDate & date ) { if( object ) { @@ -818,7 +818,7 @@ static void hbqt_SlotsExecQDate( HBSlots * t_slots, QObject * object, const char } } -static void hbqt_SlotsExecQDateTime( HBSlots * t_slots, QObject * object, const char * pszEvent, const QDateTime & datetime ) +static void hbqt_SlotsExecQDateTime( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QDateTime & datetime ) { if( object ) { @@ -834,7 +834,7 @@ static void hbqt_SlotsExecQDateTime( HBSlots * t_slots, QObject * object, const } } -static void hbqt_SlotsExecQTime( HBSlots * t_slots, QObject * object, const char * pszEvent, const QTime & time ) +static void hbqt_SlotsExecQTime( HBQSlots * t_slots, QObject * object, const char * pszEvent, const QTime & time ) { if( object ) { @@ -851,11 +851,11 @@ static void hbqt_SlotsExecQTime( HBSlots * t_slots, QObject * object, const char } -HBSlots::HBSlots( QObject* parent ) : QObject( parent ) +HBQSlots::HBQSlots( QObject* parent ) : QObject( parent ) { } -HBSlots::~HBSlots() +HBQSlots::~HBQSlots() { int i; @@ -863,7 +863,7 @@ HBSlots::~HBSlots() { if( listBlock[ i ] != NULL ) { -//HB_TRACE( HB_TR_DEBUG, ( "......HBSlots::~HBSlots()...... [ Un-disConnected Slot ]" ) ); +//HB_TRACE( HB_TR_DEBUG, ( "......HBQSlots::~HBQSlots()...... [ Un-disConnected Slot ]" ) ); hb_itemRelease( listBlock.at( i ) ); listBlock[ i ] = NULL; } @@ -874,7 +874,7 @@ HBSlots::~HBSlots() listBlock.clear(); } -bool HBSlots::hbIsConnected( PHB_ITEM pObj, const char * slot ) +bool HBQSlots::hbIsConnected( PHB_ITEM pObj, const char * slot ) { HB_SYMBOL_UNUSED( pObj ); @@ -882,7 +882,7 @@ bool HBSlots::hbIsConnected( PHB_ITEM pObj, const char * slot ) return isConnected( object, slot ); } -bool HBSlots::isConnected( QObject * object, const char * slot ) +bool HBQSlots::isConnected( QObject * object, const char * slot ) { int i; @@ -899,7 +899,7 @@ bool HBSlots::isConnected( QObject * object, const char * slot ) return false; } -bool HBSlots::hbConnect( PHB_ITEM pObj, const char * slot, PHB_ITEM bBlock ) +bool HBQSlots::hbConnect( PHB_ITEM pObj, const char * slot, PHB_ITEM bBlock ) { HB_SYMBOL_UNUSED( pObj ); HB_SYMBOL_UNUSED( bBlock ); @@ -930,7 +930,7 @@ HB_TRACE( HB_TR_DEBUG, ( "AAA 5" ) ); return false; } -bool HBSlots::hbDisconnect( PHB_ITEM pObj, const char * signal ) +bool HBQSlots::hbDisconnect( PHB_ITEM pObj, const char * signal ) { HB_SYMBOL_UNUSED( pObj ); @@ -956,7 +956,7 @@ bool HBSlots::hbDisconnect( PHB_ITEM pObj, const char * signal ) return false; } -bool HBSlots::hbClear() +bool HBQSlots::hbClear() { int i; @@ -972,192 +972,192 @@ bool HBSlots::hbClear() return true; } /* Generic Key and Mouse Events emitted by subclass objects */ -void HBSlots::customContextMenuRequested( const QPoint & pos ) { hbqt_SlotsExecQPoint( this, qobject_cast( sender() ), "customContextMenuRequested(QPoint)", pos ); } -void HBSlots::keyPressEvent( QKeyEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "keyPressEvent()", event ); } -void HBSlots::keyReleaseEvent( QKeyEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "keyReleaseEvent()", event ); } -void HBSlots::mouseMoveEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "mouseMoveEvent()", event ); } -void HBSlots::mouseDoubleClickEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "mouseDoubleClickEvent()", event ); } -void HBSlots::mousePressEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "mousePressEvent()", event ); } -void HBSlots::mouseReleaseEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "mouseReleaseEvent()", event ); } -void HBSlots::wheelEvent( QWheelEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "wheelEvent()", event ); } -void HBSlots::resizeEvent( QResizeEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "resizeEvent()", event ); } -void HBSlots::triggered( bool checked ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "triggered(bool)", checked ); } -void HBSlots::hovered( QAction * action ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "hovered(action)", action ); } -void HBSlots::clicked() { hbqt_SlotsExec( this, qobject_cast( sender() ), "clicked()" ); } -void HBSlots::returnPressed() { hbqt_SlotsExec( this, qobject_cast( sender() ), "returnPressed()" ); } -void HBSlots::viewportEntered() { hbqt_SlotsExec( this, qobject_cast( sender() ), "viewportEntered()" ); } -void HBSlots::pressed() { hbqt_SlotsExec( this, qobject_cast( sender() ), "pressed()" ); } -void HBSlots::released() { hbqt_SlotsExec( this, qobject_cast( sender() ), "released()" ); } -void HBSlots::triggered() { hbqt_SlotsExec( this, qobject_cast( sender() ), "triggered()" ); } -void HBSlots::hovered() { hbqt_SlotsExec( this, qobject_cast( sender() ), "hovered()" ); } -void HBSlots::stateChanged( int state ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "stateChanged(int)", state ); } -void HBSlots::activated( int index ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "activated(int)", index ); } -void HBSlots::currentIndexChanged( int index ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "currentIndexChanged(int)", index ); } -void HBSlots::currentChanged( int index ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "currentChanged(int)", index ); } -void HBSlots::highlighted( int index ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "highlighted(int)", index ); } -void HBSlots::clicked( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "clicked(QModelIndex)", index ); } -void HBSlots::doubleClicked( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "doubleClicked(QModelIndex)", index ); } -void HBSlots::entered( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "entered(QModelIndex)", index ); } -void HBSlots::actionTriggered( int action ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "actionTriggered(int)", action ); } -void HBSlots::rangeChanged( int min, int max ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "rangeChanged(int)", min, max ); } -void HBSlots::sliderMoved( int value ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sliderMoved(int)", value ); } -void HBSlots::sliderPressed() { hbqt_SlotsExec( this, qobject_cast( sender() ), "sliderPressed()" ); } -void HBSlots::sliderReleased() { hbqt_SlotsExec( this, qobject_cast( sender() ), "sliderReleased()" ); } -void HBSlots::valueChanged( int value ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "valueChanged(int)", value ); } -void HBSlots::cursorPositionChanged( int iOld, int iNew ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cursorPositionChanged(int,int)", iOld, iNew ); } -void HBSlots::editingFinished() { hbqt_SlotsExec( this, qobject_cast( sender() ), "editingFinished()" ); } -void HBSlots::selectionChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "selectionChanged()" ); } -void HBSlots::textChanged( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "textChanged(QString)", text ); } -void HBSlots::textEdited( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "textEdited(QString)", text ); } +void HBQSlots::customContextMenuRequested( const QPoint & pos ) { hbqt_SlotsExecQPoint( this, qobject_cast( sender() ), "customContextMenuRequested(QPoint)", pos ); } +void HBQSlots::keyPressEvent( QKeyEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "keyPressEvent()", event ); } +void HBQSlots::keyReleaseEvent( QKeyEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "keyReleaseEvent()", event ); } +void HBQSlots::mouseMoveEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "mouseMoveEvent()", event ); } +void HBQSlots::mouseDoubleClickEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "mouseDoubleClickEvent()", event ); } +void HBQSlots::mousePressEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "mousePressEvent()", event ); } +void HBQSlots::mouseReleaseEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "mouseReleaseEvent()", event ); } +void HBQSlots::wheelEvent( QWheelEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "wheelEvent()", event ); } +void HBQSlots::resizeEvent( QResizeEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "resizeEvent()", event ); } +void HBQSlots::triggered( bool checked ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "triggered(bool)", checked ); } +void HBQSlots::hovered( QAction * action ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "hovered(action)", action ); } +void HBQSlots::clicked() { hbqt_SlotsExec( this, qobject_cast( sender() ), "clicked()" ); } +void HBQSlots::returnPressed() { hbqt_SlotsExec( this, qobject_cast( sender() ), "returnPressed()" ); } +void HBQSlots::viewportEntered() { hbqt_SlotsExec( this, qobject_cast( sender() ), "viewportEntered()" ); } +void HBQSlots::pressed() { hbqt_SlotsExec( this, qobject_cast( sender() ), "pressed()" ); } +void HBQSlots::released() { hbqt_SlotsExec( this, qobject_cast( sender() ), "released()" ); } +void HBQSlots::triggered() { hbqt_SlotsExec( this, qobject_cast( sender() ), "triggered()" ); } +void HBQSlots::hovered() { hbqt_SlotsExec( this, qobject_cast( sender() ), "hovered()" ); } +void HBQSlots::stateChanged( int state ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "stateChanged(int)", state ); } +void HBQSlots::activated( int index ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "activated(int)", index ); } +void HBQSlots::currentIndexChanged( int index ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "currentIndexChanged(int)", index ); } +void HBQSlots::currentChanged( int index ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "currentChanged(int)", index ); } +void HBQSlots::highlighted( int index ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "highlighted(int)", index ); } +void HBQSlots::clicked( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "clicked(QModelIndex)", index ); } +void HBQSlots::doubleClicked( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "doubleClicked(QModelIndex)", index ); } +void HBQSlots::entered( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "entered(QModelIndex)", index ); } +void HBQSlots::actionTriggered( int action ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "actionTriggered(int)", action ); } +void HBQSlots::rangeChanged( int min, int max ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "rangeChanged(int)", min, max ); } +void HBQSlots::sliderMoved( int value ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sliderMoved(int)", value ); } +void HBQSlots::sliderPressed() { hbqt_SlotsExec( this, qobject_cast( sender() ), "sliderPressed()" ); } +void HBQSlots::sliderReleased() { hbqt_SlotsExec( this, qobject_cast( sender() ), "sliderReleased()" ); } +void HBQSlots::valueChanged( int value ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "valueChanged(int)", value ); } +void HBQSlots::cursorPositionChanged( int iOld, int iNew ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cursorPositionChanged(int,int)", iOld, iNew ); } +void HBQSlots::editingFinished() { hbqt_SlotsExec( this, qobject_cast( sender() ), "editingFinished()" ); } +void HBQSlots::selectionChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "selectionChanged()" ); } +void HBQSlots::textChanged( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "textChanged(QString)", text ); } +void HBQSlots::textEdited( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "textEdited(QString)", text ); } /* TreeViewobject */ -void HBSlots::currentItemChanged( QTreeWidgetItem * current, QTreeWidgetItem * previous ) { hbqt_SlotsExecPointerPointer( this, qobject_cast( sender() ), "currentItemChanged(QTWItem)", current, previous ); } -void HBSlots::itemActivated( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemActivated(QTWItem)", item, column ); } -void HBSlots::itemChanged( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemChanged(QTWItem)", item, column ); } -void HBSlots::itemClicked( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemClicked(QTWItem)", item, column ); } -void HBSlots::itemDoubleClicked( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemDoubleClicked(QTWItem)", item, column ); } -void HBSlots::itemEntered( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemEntered(QTWItem)", item, column ); } -void HBSlots::itemPressed( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemPressed(QTWItem)", item, column ); } -void HBSlots::itemExpanded( QTreeWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemExpanded(QTWItem)", item ); } -void HBSlots::itemCollapsed( QTreeWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemCollapsed(QTWItem)", item ); } -void HBSlots::itemSelectionChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "itemSelectionChanged()" ); } +void HBQSlots::currentItemChanged( QTreeWidgetItem * current, QTreeWidgetItem * previous ) { hbqt_SlotsExecPointerPointer( this, qobject_cast( sender() ), "currentItemChanged(QTWItem)", current, previous ); } +void HBQSlots::itemActivated( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemActivated(QTWItem)", item, column ); } +void HBQSlots::itemChanged( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemChanged(QTWItem)", item, column ); } +void HBQSlots::itemClicked( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemClicked(QTWItem)", item, column ); } +void HBQSlots::itemDoubleClicked( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemDoubleClicked(QTWItem)", item, column ); } +void HBQSlots::itemEntered( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemEntered(QTWItem)", item, column ); } +void HBQSlots::itemPressed( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "itemPressed(QTWItem)", item, column ); } +void HBQSlots::itemExpanded( QTreeWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemExpanded(QTWItem)", item ); } +void HBQSlots::itemCollapsed( QTreeWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemCollapsed(QTWItem)", item ); } +void HBQSlots::itemSelectionChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "itemSelectionChanged()" ); } /* QDialog (s)*/ -void HBSlots::currentFontChanged( const QFont & font ) { hbqt_SlotsExecFont( this, qobject_cast( sender() ), "currentFontChanged(QFont)", font ); } -void HBSlots::fontSelected( const QFont & font ) { hbqt_SlotsExecFont( this, qobject_cast( sender() ), "fontSelected(QFont)", font ); } -void HBSlots::accepted() { hbqt_SlotsExec( this, qobject_cast( sender() ), "accepted()" ); } -void HBSlots::finished( int result ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "finished(int)", result ); } -void HBSlots::rejected() { hbqt_SlotsExec( this, qobject_cast( sender() ), "rejected()" ); } -void HBSlots::currentChanged( const QString & path ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "currentChanged(QString)", path ); } -void HBSlots::directoryEntered( const QString & directory ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "directoryEntered(QString)", directory ); } -void HBSlots::fileSelected( const QString & file ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "fileSelected(QString)", file ); } -void HBSlots::filesSelected( const QStringList & selected ) { hbqt_SlotsExecStringList( this, qobject_cast( sender() ), "filesSelected(QStringList)", selected ); } -void HBSlots::filterSelected( const QString & filter ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "filterSelected(QString)", filter ); } +void HBQSlots::currentFontChanged( const QFont & font ) { hbqt_SlotsExecFont( this, qobject_cast( sender() ), "currentFontChanged(QFont)", font ); } +void HBQSlots::fontSelected( const QFont & font ) { hbqt_SlotsExecFont( this, qobject_cast( sender() ), "fontSelected(QFont)", font ); } +void HBQSlots::accepted() { hbqt_SlotsExec( this, qobject_cast( sender() ), "accepted()" ); } +void HBQSlots::finished( int result ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "finished(int)", result ); } +void HBQSlots::rejected() { hbqt_SlotsExec( this, qobject_cast( sender() ), "rejected()" ); } +void HBQSlots::currentChanged( const QString & path ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "currentChanged(QString)", path ); } +void HBQSlots::directoryEntered( const QString & directory ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "directoryEntered(QString)", directory ); } +void HBQSlots::fileSelected( const QString & file ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "fileSelected(QString)", file ); } +void HBQSlots::filesSelected( const QStringList & selected ) { hbqt_SlotsExecStringList( this, qobject_cast( sender() ), "filesSelected(QStringList)", selected ); } +void HBQSlots::filterSelected( const QString & filter ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "filterSelected(QString)", filter ); } /* QPrintDialog */ -void HBSlots::accepted( QPrinter * printer ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "accepted(QPrinter)", printer ); } +void HBQSlots::accepted( QPrinter * printer ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "accepted(QPrinter)", printer ); } /* QTextEdit */ -void HBSlots::copyAvailable( bool yes ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "copyAvailable(bool)", yes ); } -void HBSlots::currentCharFormatChanged( const QTextCharFormat & f ) { hbqt_SlotsExecTextCharFormat( this, qobject_cast( sender() ), "currentCharFormatChanged(QTextCharFormat)", f ); } -void HBSlots::cursorPositionChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "cursorPositionChanged()" ); } -void HBSlots::redoAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "redoAvailable(bool)", available ); } -void HBSlots::textChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "textChanged()" ); } -void HBSlots::undoAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "undoAvailable(bool)", available ); } -void HBSlots::timeout() { hbqt_SlotsExec( this, qobject_cast( sender() ), "timeout()" ); } -void HBSlots::scrollContentsBy( int x, int y ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "scrollContentsBy(int,int)", x, y ); } -void HBSlots::geometriesChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "geometriesChanged()" ); } -void HBSlots::sectionAutoResize( int logicalIndex, QHeaderView::ResizeMode mode ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "sectionAutoResize(int,int)", logicalIndex, mode ); } -void HBSlots::sectionClicked( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sectionClicked(int)", logicalIndex ); } -void HBSlots::sectionCountChanged( int oldCount, int newCount ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "sectionCountChanged(int,int)", oldCount, newCount ); } -void HBSlots::sectionDoubleClicked( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sectionDoubleClicked(int)", logicalIndex ); } -void HBSlots::sectionEntered( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sectionEntered(int)", logicalIndex ); } -void HBSlots::sectionHandleDoubleClicked( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sectionHandleDoubleClicked(int)", logicalIndex ); } -void HBSlots::sectionMoved( int logicalIndex, int oldVisualIndex, int newVisualIndex ) { hbqt_SlotsExecIntIntInt( this, qobject_cast( sender() ), "sectionMoved(int,int,int)", logicalIndex, oldVisualIndex, newVisualIndex ); } -void HBSlots::sectionPressed( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sectionPressed(int)", logicalIndex ); } -void HBSlots::sectionResized( int logicalIndex, int oldSize, int newSize ) { hbqt_SlotsExecIntIntInt( this, qobject_cast( sender() ), "sectionResized(int,int,int)", logicalIndex, oldSize, newSize ); } -void HBSlots::sortIndicatorChanged( int logicalIndex, Qt::SortOrder order ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "sortIndicatorChanged(int,int)", logicalIndex, order ); } -void HBSlots::buttonClicked( int id ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "buttonClicked(int)", id ); } -void HBSlots::buttonPressed( int id ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "buttonPressed(int)", id ); } -void HBSlots::buttonReleased( int id ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "buttonReleased(int)", id ); } -void HBSlots::linkActivated( const QString & link ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "linkActivated(QString)", link ); } -void HBSlots::linkHovered( const QString & link ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "linkHovered(QString)", link ); } -void HBSlots::tabCloseRequested( int index ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "tabCloseRequested(int)", index ); } -void HBSlots::paintRequested( QPrinter * printer ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "paintRequested(QPrinter)", printer ); } +void HBQSlots::copyAvailable( bool yes ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "copyAvailable(bool)", yes ); } +void HBQSlots::currentCharFormatChanged( const QTextCharFormat & f ) { hbqt_SlotsExecTextCharFormat( this, qobject_cast( sender() ), "currentCharFormatChanged(QTextCharFormat)", f ); } +void HBQSlots::cursorPositionChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "cursorPositionChanged()" ); } +void HBQSlots::redoAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "redoAvailable(bool)", available ); } +void HBQSlots::textChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "textChanged()" ); } +void HBQSlots::undoAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "undoAvailable(bool)", available ); } +void HBQSlots::timeout() { hbqt_SlotsExec( this, qobject_cast( sender() ), "timeout()" ); } +void HBQSlots::scrollContentsBy( int x, int y ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "scrollContentsBy(int,int)", x, y ); } +void HBQSlots::geometriesChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "geometriesChanged()" ); } +void HBQSlots::sectionAutoResize( int logicalIndex, QHeaderView::ResizeMode mode ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "sectionAutoResize(int,int)", logicalIndex, mode ); } +void HBQSlots::sectionClicked( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sectionClicked(int)", logicalIndex ); } +void HBQSlots::sectionCountChanged( int oldCount, int newCount ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "sectionCountChanged(int,int)", oldCount, newCount ); } +void HBQSlots::sectionDoubleClicked( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sectionDoubleClicked(int)", logicalIndex ); } +void HBQSlots::sectionEntered( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sectionEntered(int)", logicalIndex ); } +void HBQSlots::sectionHandleDoubleClicked( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sectionHandleDoubleClicked(int)", logicalIndex ); } +void HBQSlots::sectionMoved( int logicalIndex, int oldVisualIndex, int newVisualIndex ) { hbqt_SlotsExecIntIntInt( this, qobject_cast( sender() ), "sectionMoved(int,int,int)", logicalIndex, oldVisualIndex, newVisualIndex ); } +void HBQSlots::sectionPressed( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "sectionPressed(int)", logicalIndex ); } +void HBQSlots::sectionResized( int logicalIndex, int oldSize, int newSize ) { hbqt_SlotsExecIntIntInt( this, qobject_cast( sender() ), "sectionResized(int,int,int)", logicalIndex, oldSize, newSize ); } +void HBQSlots::sortIndicatorChanged( int logicalIndex, Qt::SortOrder order ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "sortIndicatorChanged(int,int)", logicalIndex, order ); } +void HBQSlots::buttonClicked( int id ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "buttonClicked(int)", id ); } +void HBQSlots::buttonPressed( int id ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "buttonPressed(int)", id ); } +void HBQSlots::buttonReleased( int id ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "buttonReleased(int)", id ); } +void HBQSlots::linkActivated( const QString & link ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "linkActivated(QString)", link ); } +void HBQSlots::linkHovered( const QString & link ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "linkHovered(QString)", link ); } +void HBQSlots::tabCloseRequested( int index ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "tabCloseRequested(int)", index ); } +void HBQSlots::paintRequested( QPrinter * printer ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "paintRequested(QPrinter)", printer ); } /* QIODevice */ -void HBSlots::aboutToClose() { hbqt_SlotsExec( this, qobject_cast( sender() ), "aboutToClose()" ); } -void HBSlots::bytesWritten( qint64 bytes ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "bytesWritten(int)", bytes ); } -void HBSlots::readChannelFinished() { hbqt_SlotsExec( this, qobject_cast( sender() ), "readChannelFinished()" ); } -void HBSlots::readyRead() { hbqt_SlotsExec( this, qobject_cast( sender() ), "readyRead()" ); } +void HBQSlots::aboutToClose() { hbqt_SlotsExec( this, qobject_cast( sender() ), "aboutToClose()" ); } +void HBQSlots::bytesWritten( qint64 bytes ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "bytesWritten(int)", bytes ); } +void HBQSlots::readChannelFinished() { hbqt_SlotsExec( this, qobject_cast( sender() ), "readChannelFinished()" ); } +void HBQSlots::readyRead() { hbqt_SlotsExec( this, qobject_cast( sender() ), "readyRead()" ); } /* QProcess */ -void HBSlots::error( QProcess::ProcessError error ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "error(error)", error ); } -void HBSlots::finished( int exitCode, QProcess::ExitStatus exitStatus ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "finished(int,int)", exitCode, exitStatus ); } -void HBSlots::readyReadStandardError() { hbqt_SlotsExec( this, qobject_cast( sender() ), "readyReadStandardError()" ); } -void HBSlots::readyReadStandardOutput() { hbqt_SlotsExec( this, qobject_cast( sender() ), "readyReadStandardOutput()" ); } -void HBSlots::started() { hbqt_SlotsExec( this, qobject_cast( sender() ), "started()" ); } -void HBSlots::stateChanged( QProcess::ProcessState newState ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "stateChanged(int)", newState ); } +void HBQSlots::error( QProcess::ProcessError error ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "error(error)", error ); } +void HBQSlots::finished( int exitCode, QProcess::ExitStatus exitStatus ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "finished(int,int)", exitCode, exitStatus ); } +void HBQSlots::readyReadStandardError() { hbqt_SlotsExec( this, qobject_cast( sender() ), "readyReadStandardError()" ); } +void HBQSlots::readyReadStandardOutput() { hbqt_SlotsExec( this, qobject_cast( sender() ), "readyReadStandardOutput()" ); } +void HBQSlots::started() { hbqt_SlotsExec( this, qobject_cast( sender() ), "started()" ); } +void HBQSlots::stateChanged( QProcess::ProcessState newState ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "stateChanged(int)", newState ); } /* QComboBox */ -void HBSlots::activated( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "activated(QString)", text ); } -void HBSlots::currentIndexChanged( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "currentIndexChanged(QString)", text ); } -void HBSlots::editTextChanged( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "editTextChanged(QString)", text ); } -void HBSlots::highlighted( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "highlighted(QString)", text ); } +void HBQSlots::activated( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "activated(QString)", text ); } +void HBQSlots::currentIndexChanged( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "currentIndexChanged(QString)", text ); } +void HBQSlots::editTextChanged( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "editTextChanged(QString)", text ); } +void HBQSlots::highlighted( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "highlighted(QString)", text ); } /* QTextDocument */ -void HBSlots::blockCountChanged( int newBlockCount ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "blockCountChanged(int)", newBlockCount ); } -void HBSlots::contentsChange( int position, int charsRemoved, int charsAdded ) { hbqt_SlotsExecIntIntInt( this, qobject_cast( sender() ), "contentsChange(int,int,int)", position, charsRemoved, charsAdded ); } -void HBSlots::contentsChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "contentsChanged()" ); } -void HBSlots::cursorPositionChanged( const QTextCursor & cursor ) { hbqt_SlotsExecQTextCursor( this, qobject_cast( sender() ), "cursorPositionChanged(QTextCursor)", cursor ); } -void HBSlots::documentLayoutChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "documentLayoutChanged()" ); } -void HBSlots::modificationChanged( bool changed ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "modificationChanged(bool)", changed ); } -void HBSlots::undoCommandAdded() { hbqt_SlotsExec( this, qobject_cast( sender() ), "undoCommandAdded()" ); } +void HBQSlots::blockCountChanged( int newBlockCount ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "blockCountChanged(int)", newBlockCount ); } +void HBQSlots::contentsChange( int position, int charsRemoved, int charsAdded ) { hbqt_SlotsExecIntIntInt( this, qobject_cast( sender() ), "contentsChange(int,int,int)", position, charsRemoved, charsAdded ); } +void HBQSlots::contentsChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "contentsChanged()" ); } +void HBQSlots::cursorPositionChanged( const QTextCursor & cursor ) { hbqt_SlotsExecQTextCursor( this, qobject_cast( sender() ), "cursorPositionChanged(QTextCursor)", cursor ); } +void HBQSlots::documentLayoutChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "documentLayoutChanged()" ); } +void HBQSlots::modificationChanged( bool changed ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "modificationChanged(bool)", changed ); } +void HBQSlots::undoCommandAdded() { hbqt_SlotsExec( this, qobject_cast( sender() ), "undoCommandAdded()" ); } /* QPlainTextEdit */ -void HBSlots::updateRequest( const QRect & rect, int dy ) { hbqt_SlotsExecQRectInt( this, qobject_cast( sender() ), "updateRequest(QRect,int)", rect, dy ); } +void HBQSlots::updateRequest( const QRect & rect, int dy ) { hbqt_SlotsExecQRectInt( this, qobject_cast( sender() ), "updateRequest(QRect,int)", rect, dy ); } /* QItemSelectionModel */ -void HBSlots::currentChanged( const QModelIndex & currentIndex, const QModelIndex & previousIndex ) { hbqt_SlotsExecModelModel( this, qobject_cast( sender() ), "currentChanged(QModelIndex,QModelIndex)", currentIndex, previousIndex ); } -void HBSlots::currentColumnChanged( const QModelIndex & currentIndex, const QModelIndex & previousIndex ) { hbqt_SlotsExecModelModel( this, qobject_cast( sender() ), "currentColumnChanged(QModelIndex,QModelIndex)", currentIndex, previousIndex ); } -void HBSlots::currentRowChanged( const QModelIndex & currentIndex, const QModelIndex & previousIndex ) { hbqt_SlotsExecModelModel( this, qobject_cast( sender() ), "currentRowChanged(QModelIndex,QModelIndex)", currentIndex, previousIndex ); } -void HBSlots::selectionChanged( const QItemSelection & selected, const QItemSelection & deselected ) { hbqt_SlotsExecItemSelItemSel( this, qobject_cast( sender() ), "selectionChanged(QItemSelection,QItemSelection)", selected, deselected ); } +void HBQSlots::currentChanged( const QModelIndex & currentIndex, const QModelIndex & previousIndex ) { hbqt_SlotsExecModelModel( this, qobject_cast( sender() ), "currentChanged(QModelIndex,QModelIndex)", currentIndex, previousIndex ); } +void HBQSlots::currentColumnChanged( const QModelIndex & currentIndex, const QModelIndex & previousIndex ) { hbqt_SlotsExecModelModel( this, qobject_cast( sender() ), "currentColumnChanged(QModelIndex,QModelIndex)", currentIndex, previousIndex ); } +void HBQSlots::currentRowChanged( const QModelIndex & currentIndex, const QModelIndex & previousIndex ) { hbqt_SlotsExecModelModel( this, qobject_cast( sender() ), "currentRowChanged(QModelIndex,QModelIndex)", currentIndex, previousIndex ); } +void HBQSlots::selectionChanged( const QItemSelection & selected, const QItemSelection & deselected ) { hbqt_SlotsExecItemSelItemSel( this, qobject_cast( sender() ), "selectionChanged(QItemSelection,QItemSelection)", selected, deselected ); } /* QListWidget */ -void HBSlots::currentRowChanged( int currentRow ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "currentRowChanged(int)", currentRow ); } -void HBSlots::currentTextChanged( const QString & currentText ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "currentTextChanged(QString)", currentText ); } -void HBSlots::currentItemChanged( QListWidgetItem * current, QListWidgetItem * previous ) { hbqt_SlotsExecPointerPointer( this, qobject_cast( sender() ), "currentItemChanged(QLWItem,QLWItem)", current, previous ); } -void HBSlots::itemActivated( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemActivated(QLWItem)", item ); } -void HBSlots::itemChanged( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemChanged(QLWItem)", item ); } -void HBSlots::itemClicked( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemClicked(QLWItem)", item ); } -void HBSlots::itemDoubleClicked( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemDoubleClicked(QLWItem)", item ); } -void HBSlots::itemEntered( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemEntered(QLWItem)", item ); } -void HBSlots::itemPressed( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemPressed(QLWItem)", item ); } +void HBQSlots::currentRowChanged( int currentRow ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "currentRowChanged(int)", currentRow ); } +void HBQSlots::currentTextChanged( const QString & currentText ) { hbqt_SlotsExecString( this, qobject_cast( sender() ), "currentTextChanged(QString)", currentText ); } +void HBQSlots::currentItemChanged( QListWidgetItem * current, QListWidgetItem * previous ) { hbqt_SlotsExecPointerPointer( this, qobject_cast( sender() ), "currentItemChanged(QLWItem,QLWItem)", current, previous ); } +void HBQSlots::itemActivated( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemActivated(QLWItem)", item ); } +void HBQSlots::itemChanged( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemChanged(QLWItem)", item ); } +void HBQSlots::itemClicked( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemClicked(QLWItem)", item ); } +void HBQSlots::itemDoubleClicked( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemDoubleClicked(QLWItem)", item ); } +void HBQSlots::itemEntered( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemEntered(QLWItem)", item ); } +void HBQSlots::itemPressed( QListWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemPressed(QLWItem)", item ); } /* QTableWidget */ -void HBSlots::cellActivated( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellActivated(int,int)", row, column ); } -void HBSlots::cellChanged( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellChanged(int,int)", row, column ); } -void HBSlots::cellClicked( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellClicked(int,int)", row, column ); } -void HBSlots::cellDoubleClicked( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellDoubleClicked(int,int)", row, column ); } -void HBSlots::cellEntered( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellEntered(int,int)", row, column ); } -void HBSlots::cellPressed( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellEntered(int,int)", row, column ); } -void HBSlots::currentCellChanged( int currentRow, int currentColumn, int previousRow, int previousColumn ) { hbqt_SlotsExecIntIntIntInt( this, qobject_cast( sender() ), "currentCellChanged(int,int,int,int)", currentRow, currentColumn, previousRow, previousColumn ); } -void HBSlots::currentItemChanged( QTableWidgetItem * current, QTableWidgetItem * previous ) { hbqt_SlotsExecPointerPointer( this, qobject_cast( sender() ), "currentItemChanged(QTblWItem,QLWItem)", current, previous ); } -void HBSlots::itemActivated( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemActivated(QTblWItem)", item ); } -void HBSlots::itemChanged( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemChanged(QTblWItem)", item ); } -void HBSlots::itemClicked( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemClicked(QTblWItem)", item ); } -void HBSlots::itemDoubleClicked( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemDoubleClicked(QTblWItem)", item ); } -void HBSlots::itemEntered( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemEntered(QTblWItem)", item ); } -void HBSlots::itemPressed( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemPressed(QTblWItem)", item ); } +void HBQSlots::cellActivated( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellActivated(int,int)", row, column ); } +void HBQSlots::cellChanged( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellChanged(int,int)", row, column ); } +void HBQSlots::cellClicked( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellClicked(int,int)", row, column ); } +void HBQSlots::cellDoubleClicked( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellDoubleClicked(int,int)", row, column ); } +void HBQSlots::cellEntered( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellEntered(int,int)", row, column ); } +void HBQSlots::cellPressed( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "cellEntered(int,int)", row, column ); } +void HBQSlots::currentCellChanged( int currentRow, int currentColumn, int previousRow, int previousColumn ) { hbqt_SlotsExecIntIntIntInt( this, qobject_cast( sender() ), "currentCellChanged(int,int,int,int)", currentRow, currentColumn, previousRow, previousColumn ); } +void HBQSlots::currentItemChanged( QTableWidgetItem * current, QTableWidgetItem * previous ) { hbqt_SlotsExecPointerPointer( this, qobject_cast( sender() ), "currentItemChanged(QTblWItem,QLWItem)", current, previous ); } +void HBQSlots::itemActivated( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemActivated(QTblWItem)", item ); } +void HBQSlots::itemChanged( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemChanged(QTblWItem)", item ); } +void HBQSlots::itemClicked( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemClicked(QTblWItem)", item ); } +void HBQSlots::itemDoubleClicked( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemDoubleClicked(QTblWItem)", item ); } +void HBQSlots::itemEntered( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemEntered(QTblWItem)", item ); } +void HBQSlots::itemPressed( QTableWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "itemPressed(QTblWItem)", item ); } /* QTextBrowser */ -void HBSlots::anchorClicked( const QUrl & link ) { hbqt_SlotsExecQUrl( this, qobject_cast( sender() ), "anchorClicked(QUrl)", link ); } -void HBSlots::backwardAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "backwardAvailable(bool)", available ); } -void HBSlots::forwardAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "forwardAvailable(bool)", available ); } -void HBSlots::highlighted( const QUrl & link ) { hbqt_SlotsExecQUrl( this, qobject_cast( sender() ), "highlighted(QUrl)", link ); } -void HBSlots::historyChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "historyChanged()" ); } -void HBSlots::sourceChanged( const QUrl & src ) { hbqt_SlotsExecQUrl( this, qobject_cast( sender() ), "sourceChanged(QUrl)", src ); } +void HBQSlots::anchorClicked( const QUrl & link ) { hbqt_SlotsExecQUrl( this, qobject_cast( sender() ), "anchorClicked(QUrl)", link ); } +void HBQSlots::backwardAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "backwardAvailable(bool)", available ); } +void HBQSlots::forwardAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "forwardAvailable(bool)", available ); } +void HBQSlots::highlighted( const QUrl & link ) { hbqt_SlotsExecQUrl( this, qobject_cast( sender() ), "highlighted(QUrl)", link ); } +void HBQSlots::historyChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "historyChanged()" ); } +void HBQSlots::sourceChanged( const QUrl & src ) { hbqt_SlotsExecQUrl( this, qobject_cast( sender() ), "sourceChanged(QUrl)", src ); } /* QDockWidget */ -void HBSlots::allowedAreasChanged( Qt::DockWidgetAreas allowedAreas ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "allowedAreasChanged(int)", allowedAreas ); } -void HBSlots::dockLocationChanged( Qt::DockWidgetArea area ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "dockLocationChanged(int)", area ); } -void HBSlots::featuresChanged( QDockWidget::DockWidgetFeatures features ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "featuresChanged(int)", features ); } -void HBSlots::topLevelChanged( bool topLevel ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "topLevelChanged(bool)", topLevel ); } -void HBSlots::visibilityChanged( bool visible ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "visibilityChanged(bool)", visible ); } +void HBQSlots::allowedAreasChanged( Qt::DockWidgetAreas allowedAreas ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "allowedAreasChanged(int)", allowedAreas ); } +void HBQSlots::dockLocationChanged( Qt::DockWidgetArea area ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "dockLocationChanged(int)", area ); } +void HBQSlots::featuresChanged( QDockWidget::DockWidgetFeatures features ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "featuresChanged(int)", features ); } +void HBQSlots::topLevelChanged( bool topLevel ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "topLevelChanged(bool)", topLevel ); } +void HBQSlots::visibilityChanged( bool visible ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "visibilityChanged(bool)", visible ); } /* QCompleter */ -void HBSlots::activated( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "activated(QModelIndex)", index ); } -void HBSlots::highlighted( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "highlighted(QModelIndex)", index ); } +void HBQSlots::activated( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "activated(QModelIndex)", index ); } +void HBQSlots::highlighted( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "highlighted(QModelIndex)", index ); } /* QAbstractButton */ -void HBSlots::toggled( bool checked ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "toggled(bool)", checked ); } +void HBQSlots::toggled( bool checked ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "toggled(bool)", checked ); } /* QSystemTrayIcon */ -void HBSlots::activated( QSystemTrayIcon::ActivationReason reason ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "activated(QSystemTrayIcon::ActivationReason)", reason ); } +void HBQSlots::activated( QSystemTrayIcon::ActivationReason reason ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "activated(QSystemTrayIcon::ActivationReason)", reason ); } /* QMdiArea */ -void HBSlots::subWindowActivated( QMdiSubWindow * window ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "subWindowActivated(QMdiSubWindow)", window ); } +void HBQSlots::subWindowActivated( QMdiSubWindow * window ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "subWindowActivated(QMdiSubWindow)", window ); } /* QMdiSubWindow */ -void HBSlots::aboutToActivate() { hbqt_SlotsExec( this, qobject_cast( sender() ), "aboutToActivate()" ); } -void HBSlots::windowStateChanged( Qt::WindowStates oldState, Qt::WindowStates newState ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "windowStateChanged(Qt::WindowStates,Qt::WindowStates)", oldState, newState ); } +void HBQSlots::aboutToActivate() { hbqt_SlotsExec( this, qobject_cast( sender() ), "aboutToActivate()" ); } +void HBQSlots::windowStateChanged( Qt::WindowStates oldState, Qt::WindowStates newState ) { hbqt_SlotsExecIntInt( this, qobject_cast( sender() ), "windowStateChanged(Qt::WindowStates,Qt::WindowStates)", oldState, newState ); } /* QAbstractItemDelegate */ -void HBSlots::closeEditor( QWidget * editor, QAbstractItemDelegate::EndEditHint hint ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "closeEditor(QWidget,int)", editor, hint ); } -void HBSlots::commitData( QWidget * editor ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "commitData(QWidget)", editor ); } -void HBSlots::sizeHintChanged( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "sizeHintChanged(QModelIndex)", index ); } +void HBQSlots::closeEditor( QWidget * editor, QAbstractItemDelegate::EndEditHint hint ) { hbqt_SlotsExecPointerInt( this, qobject_cast( sender() ), "closeEditor(QWidget,int)", editor, hint ); } +void HBQSlots::commitData( QWidget * editor ) { hbqt_SlotsExecPointer( this, qobject_cast( sender() ), "commitData(QWidget)", editor ); } +void HBQSlots::sizeHintChanged( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast( sender() ), "sizeHintChanged(QModelIndex)", index ); } /* QGraphicsScene */ -void HBSlots::sceneRectChanged( const QRectF & rect ) { hbqt_SlotsExecQRectF( this, qobject_cast( sender() ), "sceneRectChanged(QRectF)", rect ); } +void HBQSlots::sceneRectChanged( const QRectF & rect ) { hbqt_SlotsExecQRectF( this, qobject_cast( sender() ), "sceneRectChanged(QRectF)", rect ); } /* QDateTimeEdit */ -void HBSlots::dateChanged( const QDate & date ) { hbqt_SlotsExecQDate( this, qobject_cast( sender() ), "dateChanged(QDate)", date ); } -void HBSlots::dateTimeChanged( const QDateTime & datetime ) { hbqt_SlotsExecQDateTime( this, qobject_cast( sender() ), "dateTimeChanged(QDate)", datetime ); } -void HBSlots::timeChanged( const QTime & time ) { hbqt_SlotsExecQTime( this, qobject_cast( sender() ), "timeChanged(QTime)", time ); } +void HBQSlots::dateChanged( const QDate & date ) { hbqt_SlotsExecQDate( this, qobject_cast( sender() ), "dateChanged(QDate)", date ); } +void HBQSlots::dateTimeChanged( const QDateTime & datetime ) { hbqt_SlotsExecQDateTime( this, qobject_cast( sender() ), "dateTimeChanged(QDate)", datetime ); } +void HBQSlots::timeChanged( const QTime & time ) { hbqt_SlotsExecQTime( this, qobject_cast( sender() ), "timeChanged(QTime)", time ); } /* QApplication */ -//void HBSlots::commitDataRequest( QSessionManager & manager ) { hbqt_SlotsExecQSessionManager(this, qobject_cast( sender() ), "commitDataRequest(QSessionManager)", manager ); } -void HBSlots::focusChanged( QWidget * old, QWidget * now ) { hbqt_SlotsExecPointerPointer( this, qobject_cast( sender() ), "focusChanged(QWidget,QWidget)" , old, now ); } -void HBSlots::fontDatabaseChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "fontDatabaseChanged()" ); } -void HBSlots::lastWindowClosed() { hbqt_SlotsExec( this, qobject_cast( sender() ), "lastWindowClosed()" ); } -//void HBSlots::saveStateRequest( QSessionManager & manager ) { hbqt_SlotsExecQSessionManager(this, qobject_cast( sender() ), "saveStateRequest(QSessionManager)" , manager ); } +//void HBQSlots::commitDataRequest( QSessionManager & manager ) { hbqt_SlotsExecQSessionManager(this, qobject_cast( sender() ), "commitDataRequest(QSessionManager)", manager ); } +void HBQSlots::focusChanged( QWidget * old, QWidget * now ) { hbqt_SlotsExecPointerPointer( this, qobject_cast( sender() ), "focusChanged(QWidget,QWidget)" , old, now ); } +void HBQSlots::fontDatabaseChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "fontDatabaseChanged()" ); } +void HBQSlots::lastWindowClosed() { hbqt_SlotsExec( this, qobject_cast( sender() ), "lastWindowClosed()" ); } +//void HBQSlots::saveStateRequest( QSessionManager & manager ) { hbqt_SlotsExecQSessionManager(this, qobject_cast( sender() ), "saveStateRequest(QSessionManager)" , manager ); } /* Latest */ /*----------------------------------------------------------------------*/ @@ -1167,7 +1167,7 @@ void HBSlots::lastWindowClosed() HB_FUNC( QT_SLOTS_CONNECT ) { HB_BOOL bRet = HB_FALSE; - HBSlots * t_slots = hbqt_par_HBSlots( 1 ); + HBQSlots * t_slots = hbqt_par_HBQSlots( 1 ); if( t_slots ) { @@ -1200,7 +1200,7 @@ HB_TRACE( HB_TR_DEBUG, ( "QT_SLOTS_CONNECT( %s ) %s", hb_parcx( 3 ), bRet ? "Con HB_FUNC( QT_SLOTS_DISCONNECT ) { HB_BOOL bRet = HB_FALSE; - HBSlots * t_slots = hbqt_par_HBSlots( 1 ); + HBQSlots * t_slots = hbqt_par_HBQSlots( 1 ); if( t_slots ) { @@ -1233,9 +1233,9 @@ HB_FUNC( QT_SLOTS_NEW ) { void * pObj = NULL; - pObj = ( HBSlots * ) new HBSlots(); + pObj = ( HBQSlots * ) new HBQSlots(); - hb_retptrGC( hbqt_gcAllocate_HBSlots( pObj, true ) ); + hb_retptrGC( hbqt_gcAllocate_HBQSlots( pObj, true ) ); } #endif diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.h similarity index 99% rename from harbour/contrib/hbqt/qtcore/hbqt_hbslots.h rename to harbour/contrib/hbqt/qtcore/hbqt_hbqslots.h index a3878c2b3a..1c43d17eb6 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbslots.h +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.h @@ -78,13 +78,13 @@ /*----------------------------------------------------------------------*/ -class HBSlots: public QObject +class HBQSlots: public QObject { Q_OBJECT public: - HBSlots( QObject *parent = 0 ); - ~HBSlots(); + HBQSlots( QObject *parent = 0 ); + ~HBQSlots(); QList listBlock; QList listObj; diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc index b07137e0e8..de9f9ae59b 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc @@ -11,7 +11,7 @@ incpaths=. g libs=../hbqt_common.hbc -# TOFIX: QtGui is needed by hbqt_hbslots.cpp. This dependency should be removed. +# TOFIX: QtGui is needed by hbqt_hbqslots.cpp. This dependency should be removed. {!HB_STATIC_QT}libs=hbqtcore${__HB_DYN__} {!HB_STATIC_QT&(allwin|os2)}libs=QtCore4 QtGui4 {!HB_STATIC_QT&(linux|symbian)}libs=QtCore QtGui diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm index e18f653b09..d7461537f2 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm @@ -9,11 +9,11 @@ g/filelist.hbm hbqt_base.cpp hbqt_destruct.cpp -hbqt_hbevents.cpp -hbqt_hbslots.cpp +hbqt_hbqevents.cpp +hbqt_hbqslots.cpp hbqt_hbqstring.cpp hbqt_misc.prg -hbqt_hbevents.h -hbqt_hbslots.h +hbqt_hbqevents.h +hbqt_hbqslots.h diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbx b/harbour/contrib/hbqt/qtcore/hbqtcore.hbx index e450ad426b..a7a94e53d0 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbx +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbx @@ -28,15 +28,68 @@ #command DYNAMIC => EXTERNAL #endif -DYNAMIC HBEVENTS +DYNAMIC HBQEVENTS +DYNAMIC HBQSLOTS DYNAMIC HBQSTRING DYNAMIC HBQTOBJECTHANDLER DYNAMIC HBQT_ISEMPTYQTPOINTER DYNAMIC HBQT_ISEQUALGCQTPOINTER DYNAMIC HBQT_PTR -DYNAMIC __HBQT_SETCODECFORCSTRINGS -DYNAMIC __HBQT_SETCODECFORTR -DYNAMIC HBSLOTS +DYNAMIC HB_HBQEVENTS +DYNAMIC HB_HBQSLOTS +DYNAMIC HB_HBQSTRING +DYNAMIC HB_QABSTRACTITEMMODEL +DYNAMIC HB_QABSTRACTLISTMODEL +DYNAMIC HB_QABSTRACTTABLEMODEL +DYNAMIC HB_QBITARRAY +DYNAMIC HB_QBUFFER +DYNAMIC HB_QBYTEARRAY +DYNAMIC HB_QCHAR +DYNAMIC HB_QCOREAPPLICATION +DYNAMIC HB_QDATASTREAM +DYNAMIC HB_QDATE +DYNAMIC HB_QDATETIME +DYNAMIC HB_QDIR +DYNAMIC HB_QEVENT +DYNAMIC HB_QEVENTLOOP +DYNAMIC HB_QFILE +DYNAMIC HB_QFILEINFO +DYNAMIC HB_QIODEVICE +DYNAMIC HB_QLATIN1CHAR +DYNAMIC HB_QLATIN1STRING +DYNAMIC HB_QLINE +DYNAMIC HB_QLINEF +DYNAMIC HB_QLIST +DYNAMIC HB_QLOCALE +DYNAMIC HB_QMIMEDATA +DYNAMIC HB_QMODELINDEX +DYNAMIC HB_QOBJECT +DYNAMIC HB_QPOINT +DYNAMIC HB_QPOINTF +DYNAMIC HB_QPROCESS +DYNAMIC HB_QRECT +DYNAMIC HB_QRECTF +DYNAMIC HB_QREGEXP +DYNAMIC HB_QRESOURCE +DYNAMIC HB_QSETTINGS +DYNAMIC HB_QSIGNALMAPPER +DYNAMIC HB_QSIZE +DYNAMIC HB_QSIZEF +DYNAMIC HB_QSTRINGLIST +DYNAMIC HB_QSTRINGREF +DYNAMIC HB_QTCORE +DYNAMIC HB_QTEXTBOUNDARYFINDER +DYNAMIC HB_QTEXTCODEC +DYNAMIC HB_QTEXTDECODER +DYNAMIC HB_QTEXTENCODER +DYNAMIC HB_QTEXTSTREAM +DYNAMIC HB_QTHREAD +DYNAMIC HB_QTIME +DYNAMIC HB_QTIMELINE +DYNAMIC HB_QTIMER +DYNAMIC HB_QTRANSLATOR +DYNAMIC HB_QURL +DYNAMIC HB_QVARIANT DYNAMIC QABSTRACTITEMMODEL DYNAMIC QABSTRACTLISTMODEL DYNAMIC QABSTRACTTABLEMODEL @@ -90,6 +143,8 @@ DYNAMIC QTRANSLATOR DYNAMIC QURL DYNAMIC QVARIANT DYNAMIC QVERSION +DYNAMIC __HBQT_SETCODECFORCSTRINGS +DYNAMIC __HBQT_SETCODECFORTR #ifdef __HBEXTERN__HBQTCORE__REQUEST #uncommand DYNAMIC => EXTERNAL diff --git a/harbour/contrib/hbqt/qtcore/qth/HBEvents.qth b/harbour/contrib/hbqt/qtcore/qth/HBQEvents.qth similarity index 95% rename from harbour/contrib/hbqt/qtcore/qth/HBEvents.qth rename to harbour/contrib/hbqt/qtcore/qth/HBQEvents.qth index 4efc3e5a4b..e67729e0c6 100644 --- a/harbour/contrib/hbqt/qtcore/qth/HBEvents.qth +++ b/harbour/contrib/hbqt/qtcore/qth/HBQEvents.qth @@ -69,17 +69,17 @@ New = #include -#include "hbqt_hbevents.h" +#include "hbqt_hbqevents.h" /* - * HBEvents() - * ~HBEvents() + * HBQEvents() + * ~HBQEvents() * */ -HB_FUNC( QT_HBEVENTS ) +HB_FUNC( QT_HBQEVENTS ) { - hb_retptr( new HBEvents() ); + hb_retptr( new HBQEvents() ); } diff --git a/harbour/contrib/hbqt/qtcore/qth/HBSlots.qth b/harbour/contrib/hbqt/qtcore/qth/HBQSlots.qth similarity index 96% rename from harbour/contrib/hbqt/qtcore/qth/HBSlots.qth rename to harbour/contrib/hbqt/qtcore/qth/HBQSlots.qth index 231c6fa536..f33bafdf9a 100644 --- a/harbour/contrib/hbqt/qtcore/qth/HBSlots.qth +++ b/harbour/contrib/hbqt/qtcore/qth/HBQSlots.qth @@ -69,16 +69,16 @@ New = #include -#include "hbqt_hbslots.h" +#include "hbqt_hbqslots.h" /* - * HBSlots() - * ~HBSlots() + * HBQSlots() + * ~HBQSlots() */ -HB_FUNC( QT_HBSLOTS ) +HB_FUNC( QT_HBQSLOTS ) { - hb_retptr( new HBSlots() ); + hb_retptr( new HBQSlots() ); } diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbx b/harbour/contrib/hbqt/qtgui/hbqtgui.hbx index 359d532697..a6cb821462 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbx +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbx @@ -39,7 +39,268 @@ DYNAMIC HBQTUI DYNAMIC HBQT_ERRORSYS DYNAMIC HBQT_QMAINWINDOW_RESTSETTINGS DYNAMIC HBQT_QMAINWINDOW_SAVESETTINGS +DYNAMIC HB_HBQABSTRACTITEMMODEL +DYNAMIC HB_HBQGRAPHICSITEM +DYNAMIC HB_HBQGRAPHICSSCENE +DYNAMIC HB_HBQPLAINTEXTEDIT +DYNAMIC HB_HBQSYNTAXHIGHLIGHTER +DYNAMIC HB_HBQTABLEVIEW +DYNAMIC HB_HBQTEXTBLOCKUSERDATA +DYNAMIC HB_QABSTRACTBUTTON +DYNAMIC HB_QABSTRACTGRAPHICSSHAPEITEM +DYNAMIC HB_QABSTRACTITEMDELEGATE +DYNAMIC HB_QABSTRACTITEMVIEW +DYNAMIC HB_QABSTRACTPRINTDIALOG +DYNAMIC HB_QABSTRACTPROXYMODEL +DYNAMIC HB_QABSTRACTSCROLLAREA +DYNAMIC HB_QABSTRACTSLIDER +DYNAMIC HB_QABSTRACTSPINBOX +DYNAMIC HB_QABSTRACTTEXTDOCUMENTLAYOUT +DYNAMIC HB_QACTION +DYNAMIC HB_QACTIONGROUP +DYNAMIC HB_QAPPLICATION +DYNAMIC HB_QBITMAP +DYNAMIC HB_QBOXLAYOUT +DYNAMIC HB_QBRUSH +DYNAMIC HB_QBUTTONGROUP +DYNAMIC HB_QCALENDARWIDGET +DYNAMIC HB_QCHECKBOX +DYNAMIC HB_QCLIPBOARD +DYNAMIC HB_QCOLOR +DYNAMIC HB_QCOLORDIALOG +DYNAMIC HB_QCOMBOBOX +DYNAMIC HB_QCOMMANDLINKBUTTON +DYNAMIC HB_QCOMMONSTYLE +DYNAMIC HB_QCOMPLETER +DYNAMIC HB_QCONICALGRADIENT +DYNAMIC HB_QCONTEXTMENUEVENT +DYNAMIC HB_QCURSOR +DYNAMIC HB_QDATEEDIT +DYNAMIC HB_QDATETIMEEDIT +DYNAMIC HB_QDESKTOPWIDGET +DYNAMIC HB_QDIAL +DYNAMIC HB_QDIALOG +DYNAMIC HB_QDIRMODEL +DYNAMIC HB_QDOCKWIDGET +DYNAMIC HB_QDOUBLESPINBOX +DYNAMIC HB_QDOUBLEVALIDATOR +DYNAMIC HB_QDRAG +DYNAMIC HB_QDRAGENTEREVENT +DYNAMIC HB_QDRAGLEAVEEVENT +DYNAMIC HB_QDRAGMOVEEVENT +DYNAMIC HB_QDROPEVENT +DYNAMIC HB_QERRORMESSAGE +DYNAMIC HB_QFILEDIALOG +DYNAMIC HB_QFILEICONPROVIDER +DYNAMIC HB_QFILESYSTEMMODEL +DYNAMIC HB_QFOCUSEVENT +DYNAMIC HB_QFOCUSFRAME +DYNAMIC HB_QFONT +DYNAMIC HB_QFONTCOMBOBOX +DYNAMIC HB_QFONTDATABASE +DYNAMIC HB_QFONTDIALOG +DYNAMIC HB_QFONTINFO +DYNAMIC HB_QFONTMETRICS +DYNAMIC HB_QFONTMETRICSF +DYNAMIC HB_QFORMLAYOUT +DYNAMIC HB_QFRAME +DYNAMIC HB_QGRADIENT +DYNAMIC HB_QGRAPHICSELLIPSEITEM +DYNAMIC HB_QGRAPHICSGRIDLAYOUT +DYNAMIC HB_QGRAPHICSITEM +DYNAMIC HB_QGRAPHICSITEMANIMATION +DYNAMIC HB_QGRAPHICSITEMGROUP +DYNAMIC HB_QGRAPHICSLAYOUT +DYNAMIC HB_QGRAPHICSLAYOUTITEM +DYNAMIC HB_QGRAPHICSLINEARLAYOUT +DYNAMIC HB_QGRAPHICSLINEITEM +DYNAMIC HB_QGRAPHICSPATHITEM +DYNAMIC HB_QGRAPHICSPIXMAPITEM +DYNAMIC HB_QGRAPHICSPOLYGONITEM +DYNAMIC HB_QGRAPHICSPROXYWIDGET +DYNAMIC HB_QGRAPHICSRECTITEM +DYNAMIC HB_QGRAPHICSSCENE +DYNAMIC HB_QGRAPHICSSCENECONTEXTMENUEVENT +DYNAMIC HB_QGRAPHICSSCENEDRAGDROPEVENT +DYNAMIC HB_QGRAPHICSSCENEEVENT +DYNAMIC HB_QGRAPHICSSCENEHELPEVENT +DYNAMIC HB_QGRAPHICSSCENEHOVEREVENT +DYNAMIC HB_QGRAPHICSSCENEMOUSEEVENT +DYNAMIC HB_QGRAPHICSSCENEMOVEEVENT +DYNAMIC HB_QGRAPHICSSCENERESIZEEVENT +DYNAMIC HB_QGRAPHICSSCENEWHEELEVENT +DYNAMIC HB_QGRAPHICSSIMPLETEXTITEM +DYNAMIC HB_QGRAPHICSTEXTITEM +DYNAMIC HB_QGRAPHICSVIEW +DYNAMIC HB_QGRAPHICSWIDGET +DYNAMIC HB_QGRIDLAYOUT +DYNAMIC HB_QGROUPBOX +DYNAMIC HB_QHBOXLAYOUT +DYNAMIC HB_QHEADERVIEW +DYNAMIC HB_QHELPEVENT +DYNAMIC HB_QHIDEEVENT +DYNAMIC HB_QICON +DYNAMIC HB_QIMAGE +DYNAMIC HB_QIMAGEREADER +DYNAMIC HB_QIMAGEWRITER +DYNAMIC HB_QINPUTDIALOG +DYNAMIC HB_QINPUTEVENT +DYNAMIC HB_QINPUTMETHODEVENT +DYNAMIC HB_QINTVALIDATOR +DYNAMIC HB_QITEMDELEGATE +DYNAMIC HB_QITEMEDITORCREATORBASE +DYNAMIC HB_QITEMEDITORFACTORY +DYNAMIC HB_QITEMSELECTION +DYNAMIC HB_QITEMSELECTIONMODEL +DYNAMIC HB_QKEYEVENT +DYNAMIC HB_QKEYSEQUENCE +DYNAMIC HB_QLABEL +DYNAMIC HB_QLAYOUT +DYNAMIC HB_QLAYOUTITEM +DYNAMIC HB_QLCDNUMBER +DYNAMIC HB_QLINEARGRADIENT +DYNAMIC HB_QLINEEDIT +DYNAMIC HB_QLISTVIEW +DYNAMIC HB_QLISTWIDGET +DYNAMIC HB_QLISTWIDGETITEM +DYNAMIC HB_QMAINWINDOW +DYNAMIC HB_QMATRIX +DYNAMIC HB_QMDIAREA +DYNAMIC HB_QMDISUBWINDOW +DYNAMIC HB_QMENU +DYNAMIC HB_QMENUBAR +DYNAMIC HB_QMESSAGEBOX +DYNAMIC HB_QMOUSEEVENT +DYNAMIC HB_QMOVEEVENT +DYNAMIC HB_QMOVIE +DYNAMIC HB_QPAGESETUPDIALOG +DYNAMIC HB_QPAINTDEVICE +DYNAMIC HB_QPAINTENGINE +DYNAMIC HB_QPAINTER +DYNAMIC HB_QPAINTERPATH +DYNAMIC HB_QPAINTEVENT +DYNAMIC HB_QPALETTE +DYNAMIC HB_QPEN +DYNAMIC HB_QPICTURE +DYNAMIC HB_QPIXMAP +DYNAMIC HB_QPLAINTEXTDOCUMENTLAYOUT +DYNAMIC HB_QPLAINTEXTEDIT +DYNAMIC HB_QPOLYGON +DYNAMIC HB_QPOLYGONF +DYNAMIC HB_QPRINTDIALOG +DYNAMIC HB_QPRINTENGINE +DYNAMIC HB_QPRINTER +DYNAMIC HB_QPRINTERINFO +DYNAMIC HB_QPRINTPREVIEWDIALOG +DYNAMIC HB_QPROGRESSBAR +DYNAMIC HB_QPROGRESSDIALOG +DYNAMIC HB_QPUSHBUTTON +DYNAMIC HB_QRADIALGRADIENT +DYNAMIC HB_QRADIOBUTTON +DYNAMIC HB_QREGEXPVALIDATOR +DYNAMIC HB_QREGION +DYNAMIC HB_QRESIZEEVENT +DYNAMIC HB_QSCROLLAREA +DYNAMIC HB_QSCROLLBAR +DYNAMIC HB_QSESSIONMANAGER +DYNAMIC HB_QSHOWEVENT +DYNAMIC HB_QSIZEGRIP +DYNAMIC HB_QSIZEPOLICY +DYNAMIC HB_QSLIDER +DYNAMIC HB_QSOUND +DYNAMIC HB_QSPACERITEM +DYNAMIC HB_QSPINBOX +DYNAMIC HB_QSPLASHSCREEN +DYNAMIC HB_QSPLITTER +DYNAMIC HB_QSTACKEDWIDGET +DYNAMIC HB_QSTANDARDITEM +DYNAMIC HB_QSTANDARDITEMMODEL +DYNAMIC HB_QSTATUSBAR +DYNAMIC HB_QSTRINGLISTMODEL +DYNAMIC HB_QSTYLE +DYNAMIC HB_QSTYLEDITEMDELEGATE +DYNAMIC HB_QSTYLEFACTORY +DYNAMIC HB_QSTYLEHINTRETURN +DYNAMIC HB_QSTYLEHINTRETURNMASK +DYNAMIC HB_QSTYLEHINTRETURNVARIANT +DYNAMIC HB_QSTYLEOPTION +DYNAMIC HB_QSTYLEOPTIONBUTTON +DYNAMIC HB_QSTYLEOPTIONCOMBOBOX +DYNAMIC HB_QSTYLEOPTIONCOMPLEX +DYNAMIC HB_QSTYLEOPTIONDOCKWIDGET +DYNAMIC HB_QSTYLEOPTIONFOCUSRECT +DYNAMIC HB_QSTYLEOPTIONFRAME +DYNAMIC HB_QSTYLEOPTIONGRAPHICSITEM +DYNAMIC HB_QSTYLEOPTIONGROUPBOX +DYNAMIC HB_QSTYLEOPTIONHEADER +DYNAMIC HB_QSTYLEOPTIONMENUITEM +DYNAMIC HB_QSTYLEOPTIONPROGRESSBAR +DYNAMIC HB_QSTYLEOPTIONSIZEGRIP +DYNAMIC HB_QSTYLEOPTIONSLIDER +DYNAMIC HB_QSTYLEOPTIONSPINBOX +DYNAMIC HB_QSTYLEOPTIONTAB +DYNAMIC HB_QSTYLEOPTIONTABBARBASE +DYNAMIC HB_QSTYLEOPTIONTABWIDGETFRAME +DYNAMIC HB_QSTYLEOPTIONTITLEBAR +DYNAMIC HB_QSTYLEOPTIONTOOLBAR +DYNAMIC HB_QSTYLEOPTIONTOOLBOX +DYNAMIC HB_QSTYLEOPTIONTOOLBUTTON +DYNAMIC HB_QSTYLEOPTIONVIEWITEM +DYNAMIC HB_QSTYLEPAINTER +DYNAMIC HB_QSYNTAXHIGHLIGHTER +DYNAMIC HB_QSYSTEMTRAYICON DYNAMIC HB_QT +DYNAMIC HB_QTABBAR +DYNAMIC HB_QTABLEVIEW +DYNAMIC HB_QTABLEWIDGET +DYNAMIC HB_QTABLEWIDGETITEM +DYNAMIC HB_QTABLEWIDGETSELECTIONRANGE +DYNAMIC HB_QTABWIDGET +DYNAMIC HB_QTEXTBLOCK +DYNAMIC HB_QTEXTBLOCKFORMAT +DYNAMIC HB_QTEXTBLOCKGROUP +DYNAMIC HB_QTEXTBROWSER +DYNAMIC HB_QTEXTCHARFORMAT +DYNAMIC HB_QTEXTCURSOR +DYNAMIC HB_QTEXTDOCUMENT +DYNAMIC HB_QTEXTDOCUMENTFRAGMENT +DYNAMIC HB_QTEXTDOCUMENTWRITER +DYNAMIC HB_QTEXTEDIT +DYNAMIC HB_QTEXTFORMAT +DYNAMIC HB_QTEXTFRAGMENT +DYNAMIC HB_QTEXTFRAME +DYNAMIC HB_QTEXTFRAMEFORMAT +DYNAMIC HB_QTEXTIMAGEFORMAT +DYNAMIC HB_QTEXTINLINEOBJECT +DYNAMIC HB_QTEXTITEM +DYNAMIC HB_QTEXTLAYOUT +DYNAMIC HB_QTEXTLENGTH +DYNAMIC HB_QTEXTLINE +DYNAMIC HB_QTEXTLIST +DYNAMIC HB_QTEXTLISTFORMAT +DYNAMIC HB_QTEXTOBJECT +DYNAMIC HB_QTEXTOPTION +DYNAMIC HB_QTEXTTABLEFORMAT +DYNAMIC HB_QTGUI +DYNAMIC HB_QTIMEEDIT +DYNAMIC HB_QTOOLBAR +DYNAMIC HB_QTOOLBOX +DYNAMIC HB_QTOOLBUTTON +DYNAMIC HB_QTRANSFORM +DYNAMIC HB_QTREEVIEW +DYNAMIC HB_QTREEWIDGET +DYNAMIC HB_QTREEWIDGETITEM +DYNAMIC HB_QUILOADER +DYNAMIC HB_QVALIDATOR +DYNAMIC HB_QVBOXLAYOUT +DYNAMIC HB_QWHEELEVENT +DYNAMIC HB_QWIDGET +DYNAMIC HB_QWIDGETACTION +DYNAMIC HB_QWIDGETITEM +DYNAMIC HB_QWINDOWSSTYLE +DYNAMIC HB_QWINDOWSTATECHANGEEVENT +DYNAMIC HB_QWIZARD +DYNAMIC HB_QWIZARDPAGE DYNAMIC QABSTRACTBUTTON DYNAMIC QABSTRACTGRAPHICSSHAPEITEM DYNAMIC QABSTRACTITEMDELEGATE diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbx b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbx index 796bb7f14b..d08a89931d 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbx +++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbx @@ -28,6 +28,12 @@ #command DYNAMIC => EXTERNAL #endif +DYNAMIC HB_QFTP +DYNAMIC HB_QHTTP +DYNAMIC HB_QHTTPHEADER +DYNAMIC HB_QHTTPREQUESTHEADER +DYNAMIC HB_QHTTPRESPONSEHEADER +DYNAMIC HB_QNETWORKREQUEST DYNAMIC QFTP DYNAMIC QHTTP DYNAMIC QHTTPHEADER diff --git a/harbour/contrib/hbqt/tests/demoqt.prg b/harbour/contrib/hbqt/tests/demoqt.prg index 03923e1380..ae003a9a86 100644 --- a/harbour/contrib/hbqt/tests/demoqt.prg +++ b/harbour/contrib/hbqt/tests/demoqt.prg @@ -88,7 +88,7 @@ #include "common.ch" -REQUEST HB_QT +REQUEST HB_QTGUI STATIC s_qApp diff --git a/harbour/contrib/hbqt/tests/dialogqt.prg b/harbour/contrib/hbqt/tests/dialogqt.prg index 625b6a7d47..3bd55e7501 100644 --- a/harbour/contrib/hbqt/tests/dialogqt.prg +++ b/harbour/contrib/hbqt/tests/dialogqt.prg @@ -72,7 +72,7 @@ #include "common.ch" -REQUEST HB_QT +REQUEST HB_QTGUI THREAD STATIC s_events THREAD STATIC s_slots diff --git a/harbour/contrib/hbqt/tests/testbrow.prg b/harbour/contrib/hbqt/tests/testbrow.prg index d55dd2abd0..5c83585401 100644 --- a/harbour/contrib/hbqt/tests/testbrow.prg +++ b/harbour/contrib/hbqt/tests/testbrow.prg @@ -33,7 +33,7 @@ STATIC oColorD STATIC oColorLY STATIC oColorLN -REQUEST HB_QT +REQUEST HB_QTGUI INIT PROCEDURE Qt_Start() qApp := QApplication() diff --git a/harbour/contrib/hbqt/tests/testqaim.prg b/harbour/contrib/hbqt/tests/testqaim.prg index 0a844a5ba4..8c471c056a 100644 --- a/harbour/contrib/hbqt/tests/testqaim.prg +++ b/harbour/contrib/hbqt/tests/testqaim.prg @@ -22,7 +22,7 @@ STATIC oWnd STATIC oDA, oForeColor, oAlphaColor, oBackBrush, oSize, oPixmap, oIcon, oFont -REQUEST HB_QT +REQUEST HB_QTGUI INIT PROCEDURE Qt_Start() qApp := QApplication() diff --git a/harbour/contrib/hbqt/tests/testres.prg b/harbour/contrib/hbqt/tests/testres.prg index 4a2b8fd7c3..ee7db31b64 100644 --- a/harbour/contrib/hbqt/tests/testres.prg +++ b/harbour/contrib/hbqt/tests/testres.prg @@ -16,7 +16,7 @@ #include "common.ch" -REQUEST HB_QT +REQUEST HB_QTGUI STATIC s_qApp STATIC s_re1 diff --git a/harbour/contrib/hbqt/utils/qtcore.qtp b/harbour/contrib/hbqt/utils/qtcore.qtp index 12d3a67ed6..810f434b5b 100644 --- a/harbour/contrib/hbqt/utils/qtcore.qtp +++ b/harbour/contrib/hbqt/utils/qtcore.qtp @@ -6,8 +6,8 @@ -O=../qtcore/g -D=../qtcore/doc -HBEvents.qth -HBSlots.qth +HBQEvents.qth +HBQSlots.qth HBQString.qth ; QAbstractEventDispatcher.qth diff --git a/harbour/contrib/hbxbp/tests/demoxbp.prg b/harbour/contrib/hbxbp/tests/demoxbp.prg index b0af91422b..07eb9371f1 100644 --- a/harbour/contrib/hbxbp/tests/demoxbp.prg +++ b/harbour/contrib/hbxbp/tests/demoxbp.prg @@ -69,7 +69,7 @@ /*----------------------------------------------------------------------*/ -REQUEST HB_QT +REQUEST HB_QTGUI REQUEST DbfCdx diff --git a/harbour/contrib/hbxbp/tests/dialogqt.prg b/harbour/contrib/hbxbp/tests/dialogqt.prg index b5d0b21c5f..8d5517338d 100644 --- a/harbour/contrib/hbxbp/tests/dialogqt.prg +++ b/harbour/contrib/hbxbp/tests/dialogqt.prg @@ -61,7 +61,7 @@ /*----------------------------------------------------------------------*/ -REQUEST HB_QT +REQUEST HB_QTGUI REQUEST DbfCdx