diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9cdad4ac5f..fc3d706c30 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,28 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-03 01:30 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/tests/demoqt.prg + ! Possible fix for leaks in this .prg code. + Added these two calls before exit: + QT_EVENTS_DESTROY() + QT_SLOTS_DESTROY() + + * contrib/hbqt/filelist.mk + - contrib/hbqt/hbqt_events.h + + contrib/hbqt/hbqt_hbevents.h + - contrib/hbqt/hbqt_events.cpp + + contrib/hbqt/hbqt_hbevents.cpp + - contrib/hbqt/hbqt_slots.h + + contrib/hbqt/hbqt_hbslots.h + - contrib/hbqt/hbqt_slots.cpp + + contrib/hbqt/hbqt_hbslots.cpp + * Renamed Events class to HBEvents. + * Renamed Slots class to HBSlots. + + * src/vm/fm.c + % Deleted unnecessary guard added in prev commit. + 2010-01-03 00:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/vm/fm.c + Overriding some additional C++ memory allocation operators diff --git a/harbour/contrib/hbqt/filelist.mk b/harbour/contrib/hbqt/filelist.mk index 8341ffaa23..afbdd4300a 100644 --- a/harbour/contrib/hbqt/filelist.mk +++ b/harbour/contrib/hbqt/filelist.mk @@ -3,27 +3,27 @@ # MOC_HEADERS := \ - hbqt_events.h \ hbqt_hbdbfmodel.h \ + hbqt_hbevents.h \ hbqt_hbqmainwindow.h \ hbqt_hbqsyntaxhighlighter.h \ hbqt_hbqtableview.h \ - hbqt_slots.h \ + hbqt_hbslots.h \ CPP_SOURCES := \ hbqt_base.cpp \ hbqt_utils.cpp \ - hbqt_slots.cpp \ hbqt_destruct.cpp \ - hbqt_events.cpp \ hbqt_hbdbfmodel.cpp \ + hbqt_hbevents.cpp \ hbqt_hbqmainwindow.cpp \ hbqt_hbqsyntaxhighlighter.cpp \ hbqt_hbqtableview.cpp \ + hbqt_hbslots.cpp \ PRG_SOURCES := \ hbqt_misc.prg \ hbqt_errorsys.prg \ - + # Don't delete this comment, it's here to ensure empty # line above is kept intact. diff --git a/harbour/contrib/hbqt/hbqt_events.cpp b/harbour/contrib/hbqt/hbqt_hbevents.cpp similarity index 89% rename from harbour/contrib/hbqt/hbqt_events.cpp rename to harbour/contrib/hbqt/hbqt_hbevents.cpp index f10123083f..a61f9f926b 100644 --- a/harbour/contrib/hbqt/hbqt_events.cpp +++ b/harbour/contrib/hbqt/hbqt_hbevents.cpp @@ -62,7 +62,7 @@ #if QT_VERSION >= 0x040500 -#include "hbqt_events.h" +#include "hbqt_hbevents.h" #include @@ -70,7 +70,7 @@ typedef struct { - Events * t_events; + HBEvents * t_events; } HB_EVENTS, * PHB_EVENTS; static HB_TSD_NEW( s_events, sizeof( HB_EVENTS ), NULL, NULL ); @@ -79,12 +79,12 @@ static HB_TSD_NEW( s_events, sizeof( HB_EVENTS ), NULL, NULL ); /*----------------------------------------------------------------------*/ -static Events * qt_getEventFilter( void ) +static HBEvents * qt_getEventFilter( void ) { PHB_EVENTS p_events = HB_QTTHREAD_EVENTS(); if( ! p_events->t_events ) - p_events->t_events = new Events(); + p_events->t_events = new HBEvents(); return p_events->t_events; } @@ -102,20 +102,20 @@ HB_FUNC( QT_EVENTS_DESTROY ) if( p_events->t_events ) { - p_events->t_events->~Events(); + p_events->t_events->~HBEvents(); p_events->t_events = NULL; } } /*----------------------------------------------------------------------*/ -Events::Events( QObject * parent ) : QObject( parent ) +HBEvents::HBEvents( QObject * parent ) : QObject( parent ) { } -Events::~Events() +HBEvents::~HBEvents() { - HB_TRACE( HB_TR_DEBUG, ( " Events::~Events()" ) ); + HB_TRACE( HB_TR_DEBUG, ( " HBEvents::~HBEvents()" ) ); int i; for( i = 0; i < listBlock.size(); i++ ) @@ -131,7 +131,7 @@ Events::~Events() listBlock.clear(); } -bool Events::eventFilter( QObject * object, QEvent * event ) +bool HBEvents::eventFilter( QObject * object, QEvent * event ) { QEvent::Type eventtype = event->type(); @@ -171,9 +171,9 @@ HB_FUNC( QT_CONNECT_EVENT ) if( object ) { - int type = hb_parni( 2 ); - PHB_ITEM codeblock = hb_itemNew( hb_param( 3, HB_IT_BLOCK | HB_IT_BYREF ) ); - Events * t_events = qt_getEventFilter(); + int type = hb_parni( 2 ); + PHB_ITEM codeblock = hb_itemNew( hb_param( 3, HB_IT_BLOCK | HB_IT_BYREF ) ); + HBEvents * t_events = qt_getEventFilter(); char prop[ 20 ]; hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", type, "P" ); /* Make it a unique identifier */ @@ -197,8 +197,8 @@ HB_FUNC( QT_DISCONNECT_EVENT ) if( object ) { - int type = hb_parni( 2 ); - Events * t_events = qt_getEventFilter(); + int type = hb_parni( 2 ); + HBEvents * t_events = qt_getEventFilter(); char prop[ 20 ]; hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", type, "P" ); /* Make it a unique identifier */ diff --git a/harbour/contrib/hbqt/hbqt_events.h b/harbour/contrib/hbqt/hbqt_hbevents.h similarity index 97% rename from harbour/contrib/hbqt/hbqt_events.h rename to harbour/contrib/hbqt/hbqt_hbevents.h index 312274d942..6d5f131100 100644 --- a/harbour/contrib/hbqt/hbqt_events.h +++ b/harbour/contrib/hbqt/hbqt_hbevents.h @@ -63,13 +63,13 @@ #include #include -class Events: public QObject +class HBEvents: public QObject { Q_OBJECT public: - Events( QObject *parent = 0 ); - ~Events(); + HBEvents( QObject *parent = 0 ); + ~HBEvents(); QList listBlock; QList listActv; QList listObj; diff --git a/harbour/contrib/hbqt/hbqt_slots.cpp b/harbour/contrib/hbqt/hbqt_hbslots.cpp similarity index 73% rename from harbour/contrib/hbqt/hbqt_slots.cpp rename to harbour/contrib/hbqt/hbqt_hbslots.cpp index 850d421d9d..b16335d8ba 100644 --- a/harbour/contrib/hbqt/hbqt_slots.cpp +++ b/harbour/contrib/hbqt/hbqt_hbslots.cpp @@ -62,13 +62,13 @@ #if QT_VERSION >= 0x040500 -#include "hbqt_slots.h" +#include "hbqt_hbslots.h" /*----------------------------------------------------------------------*/ typedef struct { - Slots * t_slots; + HBSlots * t_slots; } HB_SLOTS, * PHB_SLOTS; static HB_TSD_NEW( s_slots, sizeof( HB_SLOTS ), NULL, NULL ); @@ -77,12 +77,12 @@ static HB_TSD_NEW( s_slots, sizeof( HB_SLOTS ), NULL, NULL ); /*----------------------------------------------------------------------*/ -static Slots * qt_getEventSlots( void ) +static HBSlots * qt_getEventSlots( void ) { PHB_SLOTS p_slots = HB_QTTHREAD_SLOTS(); if( ! p_slots->t_slots ) - p_slots->t_slots = new Slots(); + p_slots->t_slots = new HBSlots(); return p_slots->t_slots; } @@ -94,18 +94,18 @@ HB_FUNC( QT_SLOTS_DESTROY ) if( p_slots->t_slots ) { - p_slots->t_slots->~Slots(); + p_slots->t_slots->~HBSlots(); p_slots->t_slots = NULL; } } /*----------------------------------------------------------------------*/ -Slots::Slots( QObject* parent ) : QObject( parent ) +HBSlots::HBSlots( QObject* parent ) : QObject( parent ) { } -Slots::~Slots() +HBSlots::~HBSlots() { int i; @@ -127,7 +127,7 @@ static void hbqt_SlotsExec( QObject * object, const char * pszEvent ) { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -143,7 +143,7 @@ static void hbqt_SlotsExecBool( QObject * object, const char * pszEvent, bool bB { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -161,7 +161,7 @@ static void hbqt_SlotsExecInt( QObject * object, const char * pszEvent, int iVal { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -179,7 +179,7 @@ static void hbqt_SlotsExecIntInt( QObject * object, const char * pszEvent, int i { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -199,7 +199,7 @@ static void hbqt_SlotsExecIntIntInt( QObject * object, const char * pszEvent, in { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -221,7 +221,7 @@ static void hbqt_SlotsExecIntIntIntInt( QObject * object, const char * pszEvent, { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -245,7 +245,7 @@ static void hbqt_SlotsExecString( QObject * object, const char * pszEvent, const { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -263,7 +263,7 @@ static void hbqt_SlotsExecModel( QObject * object, const char * pszEvent, const { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -282,7 +282,7 @@ static void hbqt_SlotsExecTextCharFormat( QObject * object, const char * pszEven { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -301,7 +301,7 @@ static void hbqt_SlotsExecFont( QObject * object, const char * pszEvent, const Q { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -320,7 +320,7 @@ static void hbqt_SlotsExecQTextCursor( QObject * object, const char * pszEvent, { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -340,7 +340,7 @@ static void hbqt_SlotsExecStringList( QObject * object, const char * pszEvent, c { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -359,7 +359,7 @@ static void hbqt_SlotsExecPointer( QObject * object, const char * pszEvent, void { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -377,7 +377,7 @@ static void hbqt_SlotsExecPointerInt( QObject * object, const char * pszEvent, v { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -397,7 +397,7 @@ static void hbqt_SlotsExecPointerPointer( QObject * object, const char * pszEven { if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); int i = object->property( pszEvent ).toInt(); if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() ) { @@ -414,125 +414,125 @@ static void hbqt_SlotsExecPointerPointer( QObject * object, const char * pszEven } /* Generic Key and Mouse Events emitted by subclass objects */ -void Slots::keyPressEvent( QKeyEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "keyPressEvent()", event ); } -void Slots::keyReleaseEvent( QKeyEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "keyReleaseEvent()", event ); } -void Slots::mouseMoveEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "mouseMoveEvent()", event ); } -void Slots::mouseDoubleClickEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "mouseDoubleClickEvent()", event ); } -void Slots::mousePressEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "mousePressEvent()", event ); } -void Slots::mouseReleaseEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "mouseReleaseEvent()", event ); } -void Slots::wheelEvent( QWheelEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "wheelEvent()", event ); } -void Slots::resizeEvent( QResizeEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "resizeEvent()", event ); } -void Slots::triggered( bool checked ) { hbqt_SlotsExecBool( qobject_cast( sender() ), "triggered(bool)", checked ); } -void Slots::hovered( QAction * action ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "hovered(action)", action ); } -void Slots::clicked() { hbqt_SlotsExec( qobject_cast( sender() ), "clicked()" ); } -void Slots::returnPressed() { hbqt_SlotsExec( qobject_cast( sender() ), "returnPressed()" ); } -void Slots::viewportEntered() { hbqt_SlotsExec( qobject_cast( sender() ), "viewportEntered()" ); } -void Slots::pressed() { hbqt_SlotsExec( qobject_cast( sender() ), "pressed()" ); } -void Slots::released() { hbqt_SlotsExec( qobject_cast( sender() ), "released()" ); } -void Slots::triggered() { hbqt_SlotsExec( qobject_cast( sender() ), "triggered()" ); } -void Slots::hovered() { hbqt_SlotsExec( qobject_cast( sender() ), "hovered()" ); } -void Slots::stateChanged( int state ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "stateChanged(int)", state ); } -void Slots::activated( int index ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "activated(int)", index ); } -void Slots::currentIndexChanged( int index ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "currentIndexChanged(int)", index ); } -void Slots::currentChanged( int index ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "currentChanged(int)", index ); } -void Slots::highlighted( int index ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "highlighted(int)", index ); } -void Slots::clicked( const QModelIndex & index ) { hbqt_SlotsExecModel( qobject_cast( sender() ), "clicked(QModelIndex)", index ); } -void Slots::doubleClicked( const QModelIndex & index ) { hbqt_SlotsExecModel( qobject_cast( sender() ), "doubleClicked(QModelIndex)", index ); } -void Slots::entered( const QModelIndex & index ) { hbqt_SlotsExecModel( qobject_cast( sender() ), "entered(QModelIndex)", index ); } -void Slots::actionTriggered( int action ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "actionTriggered(int)", action ); } -void Slots::rangeChanged( int min, int max ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "rangeChanged(int)", min, max ); } -void Slots::sliderMoved( int value ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sliderMoved(int)", value ); } -void Slots::sliderPressed() { hbqt_SlotsExec( qobject_cast( sender() ), "sliderPressed()" ); } -void Slots::sliderReleased() { hbqt_SlotsExec( qobject_cast( sender() ), "sliderReleased()" ); } -void Slots::valueChanged( int value ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "valueChanged(int)", value ); } -void Slots::cursorPositionChanged( int iOld, int iNew ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cursorPositionChanged(int,int)", iOld, iNew ); } -void Slots::editingFinished() { hbqt_SlotsExec( qobject_cast( sender() ), "editingFinished()" ); } -void Slots::selectionChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "selectionChanged()" ); } -void Slots::textChanged( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "textChanged(QString)", text ); } -void Slots::textEdited( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "textEdited(QString)", text ); } +void HBSlots::keyPressEvent( QKeyEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "keyPressEvent()", event ); } +void HBSlots::keyReleaseEvent( QKeyEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "keyReleaseEvent()", event ); } +void HBSlots::mouseMoveEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "mouseMoveEvent()", event ); } +void HBSlots::mouseDoubleClickEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "mouseDoubleClickEvent()", event ); } +void HBSlots::mousePressEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "mousePressEvent()", event ); } +void HBSlots::mouseReleaseEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "mouseReleaseEvent()", event ); } +void HBSlots::wheelEvent( QWheelEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "wheelEvent()", event ); } +void HBSlots::resizeEvent( QResizeEvent * event ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "resizeEvent()", event ); } +void HBSlots::triggered( bool checked ) { hbqt_SlotsExecBool( qobject_cast( sender() ), "triggered(bool)", checked ); } +void HBSlots::hovered( QAction * action ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "hovered(action)", action ); } +void HBSlots::clicked() { hbqt_SlotsExec( qobject_cast( sender() ), "clicked()" ); } +void HBSlots::returnPressed() { hbqt_SlotsExec( qobject_cast( sender() ), "returnPressed()" ); } +void HBSlots::viewportEntered() { hbqt_SlotsExec( qobject_cast( sender() ), "viewportEntered()" ); } +void HBSlots::pressed() { hbqt_SlotsExec( qobject_cast( sender() ), "pressed()" ); } +void HBSlots::released() { hbqt_SlotsExec( qobject_cast( sender() ), "released()" ); } +void HBSlots::triggered() { hbqt_SlotsExec( qobject_cast( sender() ), "triggered()" ); } +void HBSlots::hovered() { hbqt_SlotsExec( qobject_cast( sender() ), "hovered()" ); } +void HBSlots::stateChanged( int state ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "stateChanged(int)", state ); } +void HBSlots::activated( int index ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "activated(int)", index ); } +void HBSlots::currentIndexChanged( int index ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "currentIndexChanged(int)", index ); } +void HBSlots::currentChanged( int index ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "currentChanged(int)", index ); } +void HBSlots::highlighted( int index ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "highlighted(int)", index ); } +void HBSlots::clicked( const QModelIndex & index ) { hbqt_SlotsExecModel( qobject_cast( sender() ), "clicked(QModelIndex)", index ); } +void HBSlots::doubleClicked( const QModelIndex & index ) { hbqt_SlotsExecModel( qobject_cast( sender() ), "doubleClicked(QModelIndex)", index ); } +void HBSlots::entered( const QModelIndex & index ) { hbqt_SlotsExecModel( qobject_cast( sender() ), "entered(QModelIndex)", index ); } +void HBSlots::actionTriggered( int action ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "actionTriggered(int)", action ); } +void HBSlots::rangeChanged( int min, int max ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "rangeChanged(int)", min, max ); } +void HBSlots::sliderMoved( int value ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sliderMoved(int)", value ); } +void HBSlots::sliderPressed() { hbqt_SlotsExec( qobject_cast( sender() ), "sliderPressed()" ); } +void HBSlots::sliderReleased() { hbqt_SlotsExec( qobject_cast( sender() ), "sliderReleased()" ); } +void HBSlots::valueChanged( int value ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "valueChanged(int)", value ); } +void HBSlots::cursorPositionChanged( int iOld, int iNew ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cursorPositionChanged(int,int)", iOld, iNew ); } +void HBSlots::editingFinished() { hbqt_SlotsExec( qobject_cast( sender() ), "editingFinished()" ); } +void HBSlots::selectionChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "selectionChanged()" ); } +void HBSlots::textChanged( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "textChanged(QString)", text ); } +void HBSlots::textEdited( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "textEdited(QString)", text ); } /* TreeViewobject */ -void Slots::currentItemChanged( QTreeWidgetItem * current, QTreeWidgetItem * previous ) { hbqt_SlotsExecPointerPointer( qobject_cast( sender() ), "currentItemChanged(QTWItem)", current, previous ); } -void Slots::itemActivated( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemActivated(QTWItem)", item, column ); } -void Slots::itemChanged( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemChanged(QTWItem)", item, column ); } -void Slots::itemClicked( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemClicked(QTWItem)", item, column ); } -void Slots::itemDoubleClicked( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemDoubleClicked(QTWItem)", item, column ); } -void Slots::itemEntered( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemEntered(QTWItem)", item, column ); } -void Slots::itemPressed( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemPressed(QTWItem)", item, column ); } -void Slots::itemExpanded( QTreeWidgetItem * item ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "itemExpanded(QTWItem)", item ); } -void Slots::itemCollapsed( QTreeWidgetItem * item ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "itemCollapsed(QTWItem)", item ); } -void Slots::itemSelectionChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "itemSelectionChanged()" ); } +void HBSlots::currentItemChanged( QTreeWidgetItem * current, QTreeWidgetItem * previous ) { hbqt_SlotsExecPointerPointer( qobject_cast( sender() ), "currentItemChanged(QTWItem)", current, previous ); } +void HBSlots::itemActivated( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemActivated(QTWItem)", item, column ); } +void HBSlots::itemChanged( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemChanged(QTWItem)", item, column ); } +void HBSlots::itemClicked( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemClicked(QTWItem)", item, column ); } +void HBSlots::itemDoubleClicked( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemDoubleClicked(QTWItem)", item, column ); } +void HBSlots::itemEntered( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemEntered(QTWItem)", item, column ); } +void HBSlots::itemPressed( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( qobject_cast( sender() ), "itemPressed(QTWItem)", item, column ); } +void HBSlots::itemExpanded( QTreeWidgetItem * item ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "itemExpanded(QTWItem)", item ); } +void HBSlots::itemCollapsed( QTreeWidgetItem * item ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "itemCollapsed(QTWItem)", item ); } +void HBSlots::itemSelectionChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "itemSelectionChanged()" ); } /* QDialog (s)*/ -void Slots::currentFontChanged( const QFont & font ) { hbqt_SlotsExecFont( qobject_cast( sender() ), "currentFontChanged(QFont)", font ); } -void Slots::fontSelected( const QFont & font ) { hbqt_SlotsExecFont( qobject_cast( sender() ), "fontSelected(QFont)", font ); } -void Slots::accepted() { hbqt_SlotsExec( qobject_cast( sender() ), "accepted()" ); } -void Slots::finished( int result ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "finished(int)", result ); } -void Slots::rejected() { hbqt_SlotsExec( qobject_cast( sender() ), "rejected()" ); } -void Slots::currentChanged( const QString & path ) { hbqt_SlotsExecString( qobject_cast( sender() ), "currentChanged(QString)", path ); } -void Slots::directoryEntered( const QString & directory ) { hbqt_SlotsExecString( qobject_cast( sender() ), "directoryEntered(QString)", directory ); } -void Slots::fileSelected( const QString & file ) { hbqt_SlotsExecString( qobject_cast( sender() ), "fileSelected(QString)", file ); } -void Slots::filesSelected( const QStringList & selected ) { hbqt_SlotsExecStringList( qobject_cast( sender() ), "filesSelected(QStringList)", selected ); } -void Slots::filterSelected( const QString & filter ) { hbqt_SlotsExecString( qobject_cast( sender() ), "filterSelected(QString)", filter ); } +void HBSlots::currentFontChanged( const QFont & font ) { hbqt_SlotsExecFont( qobject_cast( sender() ), "currentFontChanged(QFont)", font ); } +void HBSlots::fontSelected( const QFont & font ) { hbqt_SlotsExecFont( qobject_cast( sender() ), "fontSelected(QFont)", font ); } +void HBSlots::accepted() { hbqt_SlotsExec( qobject_cast( sender() ), "accepted()" ); } +void HBSlots::finished( int result ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "finished(int)", result ); } +void HBSlots::rejected() { hbqt_SlotsExec( qobject_cast( sender() ), "rejected()" ); } +void HBSlots::currentChanged( const QString & path ) { hbqt_SlotsExecString( qobject_cast( sender() ), "currentChanged(QString)", path ); } +void HBSlots::directoryEntered( const QString & directory ) { hbqt_SlotsExecString( qobject_cast( sender() ), "directoryEntered(QString)", directory ); } +void HBSlots::fileSelected( const QString & file ) { hbqt_SlotsExecString( qobject_cast( sender() ), "fileSelected(QString)", file ); } +void HBSlots::filesSelected( const QStringList & selected ) { hbqt_SlotsExecStringList( qobject_cast( sender() ), "filesSelected(QStringList)", selected ); } +void HBSlots::filterSelected( const QString & filter ) { hbqt_SlotsExecString( qobject_cast( sender() ), "filterSelected(QString)", filter ); } /* QPrintDialog */ -void Slots::accepted( QPrinter * printer ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "accepted(QPrinter)", printer ); } +void HBSlots::accepted( QPrinter * printer ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "accepted(QPrinter)", printer ); } /* QTextEdit */ -void Slots::copyAvailable( bool yes ) { hbqt_SlotsExecBool( qobject_cast( sender() ), "copyAvailable(bool)", yes ); } -void Slots::currentCharFormatChanged( const QTextCharFormat & f ) { hbqt_SlotsExecTextCharFormat( qobject_cast( sender() ), "currentCharFormatChanged(QTextCharFormat)", f ); } -void Slots::cursorPositionChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "cursorPositionChanged()" ); } -void Slots::redoAvailable( bool available ) { hbqt_SlotsExecBool( qobject_cast( sender() ), "redoAvailable(bool)", available ); } -void Slots::textChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "textChanged()" ); } -void Slots::undoAvailable( bool available ) { hbqt_SlotsExecBool( qobject_cast( sender() ), "undoAvailable(available)", available ); } -void Slots::timeout() { hbqt_SlotsExec( qobject_cast( sender() ), "timeout()" ); } -void Slots::scrollContentsBy( int x, int y ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "scrollContentsBy(int,int)", x, y ); } -void Slots::geometriesChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "geometriesChanged()" ); } -void Slots::sectionAutoResize( int logicalIndex, QHeaderView::ResizeMode mode ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "sectionAutoResize(int,int)", logicalIndex, mode ); } -void Slots::sectionClicked( int logicalIndex ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sectionClicked(int)", logicalIndex ); } -void Slots::sectionCountChanged( int oldCount, int newCount ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "sectionCountChanged(int,int)", oldCount, newCount ); } -void Slots::sectionDoubleClicked( int logicalIndex ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sectionDoubleClicked(int)", logicalIndex ); } -void Slots::sectionEntered( int logicalIndex ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sectionEntered(int)", logicalIndex ); } -void Slots::sectionHandleDoubleClicked( int logicalIndex ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sectionHandleDoubleClicked(int)", logicalIndex ); } -void Slots::sectionMoved( int logicalIndex, int oldVisualIndex, int newVisualIndex ) { hbqt_SlotsExecIntIntInt( qobject_cast( sender() ), "sectionMoved(int,int,int)", logicalIndex, oldVisualIndex, newVisualIndex ); } -void Slots::sectionPressed( int logicalIndex ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sectionPressed(int)", logicalIndex ); } -void Slots::sectionResized( int logicalIndex, int oldSize, int newSize ) { hbqt_SlotsExecIntIntInt( qobject_cast( sender() ), "sectionResized(int,int,int)", logicalIndex, oldSize, newSize ); } -void Slots::sortIndicatorChanged( int logicalIndex, Qt::SortOrder order ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "sortIndicatorChanged(int,int)", logicalIndex, order ); } -void Slots::buttonClicked( int id ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "buttonClicked(int)", id ); } -void Slots::buttonPressed( int id ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "buttonPressed(int)", id ); } -void Slots::buttonReleased( int id ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "buttonReleased(int)", id ); } -void Slots::linkActivated( const QString & link ) { hbqt_SlotsExecString( qobject_cast( sender() ), "linkActivated(QString)", link ); } -void Slots::linkHovered( const QString & link ) { hbqt_SlotsExecString( qobject_cast( sender() ), "linkHovered(QString)", link ); } -void Slots::cellActivated( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellActivated(int,int)", row, column ); } -void Slots::cellChanged( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellChanged(int,int)", row, column ); } -void Slots::cellClicked( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellClicked(int,int)", row, column ); } -void Slots::cellDoubleClicked( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellDoubleClicked(int,int)", row, column ); } -void Slots::cellEntered( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellEntered(int,int)", row, column ); } -void Slots::cellPressed( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellEntered(int,int)", row, column ); } -void Slots::currentCellChanged( int currentRow, int currentColumn, int previousRow, int previousColumn ) { hbqt_SlotsExecIntIntIntInt( qobject_cast( sender() ), "currentCellChanged(int,int,int,int)", currentRow, currentColumn, previousRow, previousColumn ); } -void Slots::tabCloseRequested( int index ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "tabCloseRequested(int)", index ); } -void Slots::paintRequested( QPrinter * printer ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "paintRequested(QPrinter)", printer ); } +void HBSlots::copyAvailable( bool yes ) { hbqt_SlotsExecBool( qobject_cast( sender() ), "copyAvailable(bool)", yes ); } +void HBSlots::currentCharFormatChanged( const QTextCharFormat & f ) { hbqt_SlotsExecTextCharFormat( qobject_cast( sender() ), "currentCharFormatChanged(QTextCharFormat)", f ); } +void HBSlots::cursorPositionChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "cursorPositionChanged()" ); } +void HBSlots::redoAvailable( bool available ) { hbqt_SlotsExecBool( qobject_cast( sender() ), "redoAvailable(bool)", available ); } +void HBSlots::textChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "textChanged()" ); } +void HBSlots::undoAvailable( bool available ) { hbqt_SlotsExecBool( qobject_cast( sender() ), "undoAvailable(available)", available ); } +void HBSlots::timeout() { hbqt_SlotsExec( qobject_cast( sender() ), "timeout()" ); } +void HBSlots::scrollContentsBy( int x, int y ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "scrollContentsBy(int,int)", x, y ); } +void HBSlots::geometriesChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "geometriesChanged()" ); } +void HBSlots::sectionAutoResize( int logicalIndex, QHeaderView::ResizeMode mode ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "sectionAutoResize(int,int)", logicalIndex, mode ); } +void HBSlots::sectionClicked( int logicalIndex ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sectionClicked(int)", logicalIndex ); } +void HBSlots::sectionCountChanged( int oldCount, int newCount ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "sectionCountChanged(int,int)", oldCount, newCount ); } +void HBSlots::sectionDoubleClicked( int logicalIndex ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sectionDoubleClicked(int)", logicalIndex ); } +void HBSlots::sectionEntered( int logicalIndex ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sectionEntered(int)", logicalIndex ); } +void HBSlots::sectionHandleDoubleClicked( int logicalIndex ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sectionHandleDoubleClicked(int)", logicalIndex ); } +void HBSlots::sectionMoved( int logicalIndex, int oldVisualIndex, int newVisualIndex ) { hbqt_SlotsExecIntIntInt( qobject_cast( sender() ), "sectionMoved(int,int,int)", logicalIndex, oldVisualIndex, newVisualIndex ); } +void HBSlots::sectionPressed( int logicalIndex ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "sectionPressed(int)", logicalIndex ); } +void HBSlots::sectionResized( int logicalIndex, int oldSize, int newSize ) { hbqt_SlotsExecIntIntInt( qobject_cast( sender() ), "sectionResized(int,int,int)", logicalIndex, oldSize, newSize ); } +void HBSlots::sortIndicatorChanged( int logicalIndex, Qt::SortOrder order ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "sortIndicatorChanged(int,int)", logicalIndex, order ); } +void HBSlots::buttonClicked( int id ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "buttonClicked(int)", id ); } +void HBSlots::buttonPressed( int id ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "buttonPressed(int)", id ); } +void HBSlots::buttonReleased( int id ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "buttonReleased(int)", id ); } +void HBSlots::linkActivated( const QString & link ) { hbqt_SlotsExecString( qobject_cast( sender() ), "linkActivated(QString)", link ); } +void HBSlots::linkHovered( const QString & link ) { hbqt_SlotsExecString( qobject_cast( sender() ), "linkHovered(QString)", link ); } +void HBSlots::cellActivated( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellActivated(int,int)", row, column ); } +void HBSlots::cellChanged( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellChanged(int,int)", row, column ); } +void HBSlots::cellClicked( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellClicked(int,int)", row, column ); } +void HBSlots::cellDoubleClicked( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellDoubleClicked(int,int)", row, column ); } +void HBSlots::cellEntered( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellEntered(int,int)", row, column ); } +void HBSlots::cellPressed( int row, int column ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "cellEntered(int,int)", row, column ); } +void HBSlots::currentCellChanged( int currentRow, int currentColumn, int previousRow, int previousColumn ) { hbqt_SlotsExecIntIntIntInt( qobject_cast( sender() ), "currentCellChanged(int,int,int,int)", currentRow, currentColumn, previousRow, previousColumn ); } +void HBSlots::tabCloseRequested( int index ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "tabCloseRequested(int)", index ); } +void HBSlots::paintRequested( QPrinter * printer ) { hbqt_SlotsExecPointer( qobject_cast( sender() ), "paintRequested(QPrinter)", printer ); } /* QIODevice */ -void Slots::aboutToClose() { hbqt_SlotsExec( qobject_cast( sender() ), "aboutToClose()" ); } -void Slots::bytesWritten( qint64 bytes ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "bytesWritten(int)", bytes ); } -void Slots::readChannelFinished() { hbqt_SlotsExec( qobject_cast( sender() ), "readChannelFinished()" ); } -void Slots::readyRead() { hbqt_SlotsExec( qobject_cast( sender() ), "readyRead()" ); } +void HBSlots::aboutToClose() { hbqt_SlotsExec( qobject_cast( sender() ), "aboutToClose()" ); } +void HBSlots::bytesWritten( qint64 bytes ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "bytesWritten(int)", bytes ); } +void HBSlots::readChannelFinished() { hbqt_SlotsExec( qobject_cast( sender() ), "readChannelFinished()" ); } +void HBSlots::readyRead() { hbqt_SlotsExec( qobject_cast( sender() ), "readyRead()" ); } /* QProcess */ -void Slots::error( QProcess::ProcessError error ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "error(error)", error ); } -void Slots::finished( int exitCode, QProcess::ExitStatus exitStatus ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "finished(int,int)", exitCode, exitStatus ); } -void Slots::readyReadStandardError() { hbqt_SlotsExec( qobject_cast( sender() ), "readyReadStandardError()" ); } -void Slots::readyReadStandardOutput() { hbqt_SlotsExec( qobject_cast( sender() ), "readyReadStandardOutput()" ); } -void Slots::started() { hbqt_SlotsExec( qobject_cast( sender() ), "started()" ); } -void Slots::stateChanged( QProcess::ProcessState newState ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "stateChanged(int)", newState ); } +void HBSlots::error( QProcess::ProcessError error ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "error(error)", error ); } +void HBSlots::finished( int exitCode, QProcess::ExitStatus exitStatus ) { hbqt_SlotsExecIntInt( qobject_cast( sender() ), "finished(int,int)", exitCode, exitStatus ); } +void HBSlots::readyReadStandardError() { hbqt_SlotsExec( qobject_cast( sender() ), "readyReadStandardError()" ); } +void HBSlots::readyReadStandardOutput() { hbqt_SlotsExec( qobject_cast( sender() ), "readyReadStandardOutput()" ); } +void HBSlots::started() { hbqt_SlotsExec( qobject_cast( sender() ), "started()" ); } +void HBSlots::stateChanged( QProcess::ProcessState newState ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "stateChanged(int)", newState ); } /* QComboBox */ -void Slots::activated( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "activated(text)", text ); } -void Slots::currentIndexChanged( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "currentIndexChanged(text)", text ); } -void Slots::editTextChanged( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "editTextChanged(text)", text ); } -void Slots::highlighted( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "highlighted(text)", text ); } +void HBSlots::activated( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "activated(text)", text ); } +void HBSlots::currentIndexChanged( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "currentIndexChanged(text)", text ); } +void HBSlots::editTextChanged( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "editTextChanged(text)", text ); } +void HBSlots::highlighted( const QString & text ) { hbqt_SlotsExecString( qobject_cast( sender() ), "highlighted(text)", text ); } /* QTextDocument */ -void Slots::blockCountChanged( int newBlockCount ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "blockCountChanged(int)", newBlockCount ); } -void Slots::contentsChange( int position, int charsRemoved, int charsAdded ) { hbqt_SlotsExecIntIntInt( qobject_cast( sender() ), "contentsChange(int,int,int)", position, charsRemoved, charsAdded ); } -void Slots::contentsChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "contentsChanged()" ); } -void Slots::cursorPositionChanged( const QTextCursor & cursor ) { hbqt_SlotsExecQTextCursor( qobject_cast( sender() ), "cursorPositionChanged(QTextCursor)", cursor ); } -void Slots::documentLayoutChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "documentLayoutChanged()" ); } -void Slots::modificationChanged( bool changed ) { hbqt_SlotsExecBool( qobject_cast( sender() ), "modificationChanged(bool)", changed ); } -void Slots::undoCommandAdded() { hbqt_SlotsExec( qobject_cast( sender() ), "undoCommandAdded()" ); } +void HBSlots::blockCountChanged( int newBlockCount ) { hbqt_SlotsExecInt( qobject_cast( sender() ), "blockCountChanged(int)", newBlockCount ); } +void HBSlots::contentsChange( int position, int charsRemoved, int charsAdded ) { hbqt_SlotsExecIntIntInt( qobject_cast( sender() ), "contentsChange(int,int,int)", position, charsRemoved, charsAdded ); } +void HBSlots::contentsChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "contentsChanged()" ); } +void HBSlots::cursorPositionChanged( const QTextCursor & cursor ) { hbqt_SlotsExecQTextCursor( qobject_cast( sender() ), "cursorPositionChanged(QTextCursor)", cursor ); } +void HBSlots::documentLayoutChanged() { hbqt_SlotsExec( qobject_cast( sender() ), "documentLayoutChanged()" ); } +void HBSlots::modificationChanged( bool changed ) { hbqt_SlotsExecBool( qobject_cast( sender() ), "modificationChanged(bool)", changed ); } +void HBSlots::undoCommandAdded() { hbqt_SlotsExec( qobject_cast( sender() ), "undoCommandAdded()" ); } /**/ /*----------------------------------------------------------------------*/ @@ -553,7 +553,7 @@ HB_FUNC( QT_CONNECT_SIGNAL ) PHB_ITEM pBlock = hb_itemNew( hb_param( 3, HB_IT_BLOCK ) ); /* get codeblock */ bool ret; - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); if( signal == ( QString ) "clicked()" ) ret = object->connect( object, SIGNAL( clicked() ), t_slots, SLOT( clicked() ), Qt::AutoConnection ); else if( signal == ( QString ) "returnPressed()" ) ret = object->connect( object, SIGNAL( returnPressed() ), t_slots, SLOT( returnPressed() ), Qt::AutoConnection ); @@ -818,7 +818,7 @@ HB_FUNC( QT_DISCONNECT_SIGNAL ) if( object ) { - Slots * t_slots = qt_getEventSlots(); + HBSlots * t_slots = qt_getEventSlots(); const char * signal = hb_parcx( 2 ); int i = object->property( signal ).toInt(); diff --git a/harbour/contrib/hbqt/hbqt_slots.h b/harbour/contrib/hbqt/hbqt_hbslots.h similarity index 99% rename from harbour/contrib/hbqt/hbqt_slots.h rename to harbour/contrib/hbqt/hbqt_hbslots.h index df176d8146..bc474793c7 100644 --- a/harbour/contrib/hbqt/hbqt_slots.h +++ b/harbour/contrib/hbqt/hbqt_hbslots.h @@ -66,13 +66,13 @@ /*----------------------------------------------------------------------*/ -class Slots: public QObject +class HBSlots: public QObject { Q_OBJECT public: - Slots( QObject *parent = 0 ); - ~Slots(); + HBSlots( QObject *parent = 0 ); + ~HBSlots(); QList listBlock; public slots: diff --git a/harbour/contrib/hbqt/tests/demoqt.prg b/harbour/contrib/hbqt/tests/demoqt.prg index c4c08d8d8f..4ea1457a84 100644 --- a/harbour/contrib/hbqt/tests/demoqt.prg +++ b/harbour/contrib/hbqt/tests/demoqt.prg @@ -177,6 +177,9 @@ HBQT_DEBUG( "HbQt_Set_Release_Method SET : HBQT_RELEASE_WITH_DELETE" ) HBQT_DEBUG( "-------------------- exit -------------------" ) + QT_EVENTS_DESTROY() + QT_SLOTS_DESTROY() + RETURN /*----------------------------------------------------------------------*/ diff --git a/harbour/src/vm/fm.c b/harbour/src/vm/fm.c index 301d78b30d..e4c69e3874 100644 --- a/harbour/src/vm/fm.c +++ b/harbour/src/vm/fm.c @@ -1129,11 +1129,9 @@ void hb_xexit( void ) /* Deinitialize fixed memory subsystem */ } else { -#ifdef HB_FM_STATISTICS hb_conOutErr( hb_conNewLine(), 0 ); hb_snprintf( buffer, sizeof( buffer ), HB_I_("Memory allocated but not released: none") ); hb_conOutErr( buffer, 0 ); -#endif } hb_conOutErr( hb_conNewLine(), 0 );