diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fe1e288bf1..c0fc8c01b2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-08 02:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/hbqt_slots.cpp + * Formatting. + ! Deleted explicit ( char * ) casts. + ! Converted some types to const char *. + + Added hbqt_ prefix to Slot*() callback names. + + * ChangeLog + + Added missing changes to my 2009-12-08 01:09 entry. + 2009-12-08 01:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/hbqt_destruct.cpp * contrib/hbxbp/xbptabpage.prg @@ -96,12 +106,13 @@ % Certain functions marked static. % Optimized out listActv vars. - Deleted commented code. + % Large amount of mutually exclusive 'if()'s converted to 'else if()'s. + ! Added NULL check in QT_CONNECT_SIGNAL(). * contrib/rddads/adsx.c * contrib/rddads/ads1.c * Minor formatting. ->>>>>>> .r13156 2009-12-07 19:29 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/global.mk ! fixed variable name in output message diff --git a/harbour/contrib/hbqt/hbqt_slots.cpp b/harbour/contrib/hbqt/hbqt_slots.cpp index a2cb496abf..909d854b88 100644 --- a/harbour/contrib/hbqt/hbqt_slots.cpp +++ b/harbour/contrib/hbqt/hbqt_slots.cpp @@ -134,7 +134,7 @@ Slots::~Slots() listBlock.clear(); } -static void SlotsExec( QObject* object, char* event ) +static void hbqt_SlotsExec( QObject * object, const char * event ) { if( object ) { @@ -150,7 +150,7 @@ static void SlotsExec( QObject* object, char* event ) } } -static void SlotsExecBool( QObject* object, char* event, bool bBool ) +static void hbqt_SlotsExecBool( QObject * object, const char* event, bool bBool ) { if( object ) { @@ -168,7 +168,7 @@ static void SlotsExecBool( QObject* object, char* event, bool bBool ) } } -static void SlotsExecInt( QObject* object, char* event, int iValue ) +static void hbqt_SlotsExecInt( QObject * object, const char * event, int iValue ) { if( object ) { @@ -186,7 +186,7 @@ static void SlotsExecInt( QObject* object, char* event, int iValue ) } } -static void SlotsExecIntInt( QObject* object, char* event, int iValue1, int iValue2 ) +static void hbqt_SlotsExecIntInt( QObject * object, const char * event, int iValue1, int iValue2 ) { if( object ) { @@ -206,7 +206,7 @@ static void SlotsExecIntInt( QObject* object, char* event, int iValue1, int iVal } } -static void SlotsExecIntIntInt( QObject* object, char* event, int iValue1, int iValue2, int iValue3 ) +static void hbqt_SlotsExecIntIntInt( QObject * object, const char * event, int iValue1, int iValue2, int iValue3 ) { if( object ) { @@ -228,7 +228,7 @@ static void SlotsExecIntIntInt( QObject* object, char* event, int iValue1, int i } } -static void SlotsExecIntIntIntInt( QObject* object, char* event, int iValue1, int iValue2, int iValue3, int iValue4 ) +static void hbqt_SlotsExecIntIntIntInt( QObject * object, const char * event, int iValue1, int iValue2, int iValue3, int iValue4 ) { if( object ) { @@ -252,7 +252,7 @@ static void SlotsExecIntIntIntInt( QObject* object, char* event, int iValue1, in } } -static void SlotsExecString( QObject* object, char* event, const QString & string ) +static void hbqt_SlotsExecString( QObject * object, const char * event, const QString & string ) { if( object ) { @@ -270,7 +270,7 @@ static void SlotsExecString( QObject* object, char* event, const QString & strin } } -static void SlotsExecModel( QObject* object, char* event, const QModelIndex & index ) +static void hbqt_SlotsExecModel( QObject * object, const char * event, const QModelIndex & index ) { if( object ) { @@ -289,7 +289,7 @@ static void SlotsExecModel( QObject* object, char* event, const QModelIndex & in } } -static void SlotsExecTextCharFormat( QObject* object, char* event, const QTextCharFormat & f ) +static void hbqt_SlotsExecTextCharFormat( QObject * object, const char * event, const QTextCharFormat & f ) { if( object ) { @@ -308,7 +308,7 @@ static void SlotsExecTextCharFormat( QObject* object, char* event, const QTextCh } } -static void SlotsExecFont( QObject* object, char* event, const QFont & font ) +static void hbqt_SlotsExecFont( QObject * object, const char * event, const QFont & font ) { if( object ) { @@ -327,7 +327,7 @@ static void SlotsExecFont( QObject* object, char* event, const QFont & font ) } } -static void SlotsExecStringList( QObject* object, char* event, const QStringList & stringList ) +static void hbqt_SlotsExecStringList( QObject * object, const char * event, const QStringList & stringList ) { if( object ) { @@ -345,7 +345,8 @@ static void SlotsExecStringList( QObject* object, char* event, const QStringList } } } -static void SlotsExecPointer( QObject* object, char* event, void * p1 ) + +static void hbqt_SlotsExecPointer( QObject * object, const char * event, void * p1 ) { if( object ) { @@ -362,7 +363,8 @@ static void SlotsExecPointer( QObject* object, char* event, void * p1 ) } } } -static void SlotsExecPointerInt( QObject* object, char* event, void * p1, int iInt ) + +static void hbqt_SlotsExecPointerInt( QObject * object, const char * event, void * p1, int iInt ) { if( object ) { @@ -382,7 +384,7 @@ static void SlotsExecPointerInt( QObject* object, char* event, void * p1, int iI } } -static void SlotsExecPointerPointer( QObject* object, char* event, void * p1, void * p2 ) +static void hbqt_SlotsExecPointerPointer( QObject * object, const char * event, void * p1, void * p2 ) { if( object ) { @@ -406,461 +408,547 @@ static void SlotsExecPointerPointer( QObject* object, char* event, void * p1, vo void Slots::keyPressEvent( QKeyEvent * event ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "keyPressEvent()", event ); + hbqt_SlotsExecPointer( object, "keyPressEvent()", event ); } + void Slots::keyReleaseEvent( QKeyEvent * event ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "keyReleaseEvent()", event ); + hbqt_SlotsExecPointer( object, "keyReleaseEvent()", event ); } + void Slots::mouseMoveEvent( QMouseEvent * event ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "mouseMoveEvent()", event ); + hbqt_SlotsExecPointer( object, "mouseMoveEvent()", event ); } + void Slots::mouseDoubleClickEvent( QMouseEvent * event ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "mouseDoubleClickEvent()", event ); + hbqt_SlotsExecPointer( object, "mouseDoubleClickEvent()", event ); } + void Slots::mousePressEvent( QMouseEvent * event ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "mousePressEvent()", event ); + hbqt_SlotsExecPointer( object, "mousePressEvent()", event ); } + void Slots::mouseReleaseEvent( QMouseEvent * event ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "mouseReleaseEvent()", event ); + hbqt_SlotsExecPointer( object, "mouseReleaseEvent()", event ); } + void Slots::wheelEvent( QWheelEvent * event ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "wheelEvent()", event ); + hbqt_SlotsExecPointer( object, "wheelEvent()", event ); } + void Slots::resizeEvent( QResizeEvent * event ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "resizeEvent()", event ); + hbqt_SlotsExecPointer( object, "resizeEvent()", event ); } -/* ........................................................ */ +/* ........................................................ */ void Slots::triggered( bool checked ) { QObject *object = qobject_cast( sender() ); - SlotsExecBool( object, ( char* ) "triggered(bool)", checked ); + hbqt_SlotsExecBool( object, "triggered(bool)", checked ); } + void Slots::hovered( QAction * action ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "hovered(action)", action ); + hbqt_SlotsExecPointer( object, "hovered(action)", action ); } + void Slots::clicked() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "clicked()" ); + hbqt_SlotsExec( object, "clicked()" ); } + void Slots::returnPressed() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "returnPressed()" ); + hbqt_SlotsExec( object, "returnPressed()" ); } + void Slots::viewportEntered() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "viewportEntered()" ); + hbqt_SlotsExec( object, "viewportEntered()" ); } + void Slots::pressed() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "pressed()" ); + hbqt_SlotsExec( object, "pressed()" ); } + void Slots::released() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "released()" ); + hbqt_SlotsExec( object, "released()" ); } + void Slots::triggered() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "triggered()" ); + hbqt_SlotsExec( object, "triggered()" ); } + void Slots::hovered() { QAction *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "hovered()" ); + hbqt_SlotsExec( object, "hovered()" ); } + void Slots::stateChanged( int state ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "stateChanged(int)", state ); + hbqt_SlotsExecInt( object, "stateChanged(int)", state ); } + void Slots::activated( int index ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "activated(int)", index ); + hbqt_SlotsExecInt( object, "activated(int)", index ); } + void Slots::currentIndexChanged( int index ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "currentIndexChanged(int)", index ); + hbqt_SlotsExecInt( object, "currentIndexChanged(int)", index ); } + void Slots::currentChanged( int index ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "currentChanged(int)", index ); + hbqt_SlotsExecInt( object, "currentChanged(int)", index ); } + void Slots::highlighted( int index ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "highlighted(int)", index ); + hbqt_SlotsExecInt( object, "highlighted(int)", index ); } void Slots::clicked( const QModelIndex & index ) { QObject *object = qobject_cast( sender() ); - SlotsExecModel( object, ( char* ) "clicked(QModelIndex)", index ); + hbqt_SlotsExecModel( object, "clicked(QModelIndex)", index ); } + void Slots::doubleClicked( const QModelIndex & index ) { QObject *object = qobject_cast( sender() ); - SlotsExecModel( object, ( char* ) "doubleClicked(QModelIndex)", index ); + hbqt_SlotsExecModel( object, "doubleClicked(QModelIndex)", index ); } + void Slots::entered( const QModelIndex & index ) { QObject *object = qobject_cast( sender() ); - SlotsExecModel( object, ( char* ) "entered(QModelIndex)", index ); + hbqt_SlotsExecModel( object, "entered(QModelIndex)", index ); } void Slots::actionTriggered( int action ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "actionTriggered(int)", action ); + hbqt_SlotsExecInt( object, "actionTriggered(int)", action ); } + void Slots::rangeChanged( int min, int max ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "rangeChanged(int)", min, max ); + hbqt_SlotsExecIntInt( object, "rangeChanged(int)", min, max ); } + void Slots::sliderMoved( int value ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "sliderMoved(int)", value ); + hbqt_SlotsExecInt( object, "sliderMoved(int)", value ); } + void Slots::sliderPressed() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "sliderPressed()" ); + hbqt_SlotsExec( object, "sliderPressed()" ); } + void Slots::sliderReleased() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "sliderReleased()" ); + hbqt_SlotsExec( object, "sliderReleased()" ); } + void Slots::valueChanged( int value ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "valueChanged(int)", value ); + hbqt_SlotsExecInt( object, "valueChanged(int)", value ); } + void Slots::cursorPositionChanged( int iOld, int iNew ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "cursorPositionChanged(int,int)", iOld, iNew ); + hbqt_SlotsExecIntInt( object, "cursorPositionChanged(int,int)", iOld, iNew ); } + void Slots::editingFinished() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "editingFinished()" ); + hbqt_SlotsExec( object, "editingFinished()" ); } + void Slots::selectionChanged() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "selectionChanged()" ); + hbqt_SlotsExec( object, "selectionChanged()" ); } + void Slots::textChanged( const QString & text ) { QObject *object = qobject_cast( sender() ); - SlotsExecString( object, ( char* ) "textChanged(QString)", text ); + hbqt_SlotsExecString( object, "textChanged(QString)", text ); } + void Slots::textEdited( const QString & text ) { QObject *object = qobject_cast( sender() ); - SlotsExecString( object, ( char* ) "textEdited(QString)", text ); + hbqt_SlotsExecString( object, "textEdited(QString)", text ); } + /* TreeViewobject */ void Slots::currentItemChanged( QTreeWidgetItem * current, QTreeWidgetItem * previous ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointerPointer( object, ( char* ) "currentItemChanged(QTWItem)", current, previous ); + hbqt_SlotsExecPointerPointer( object, "currentItemChanged(QTWItem)", current, previous ); } + void Slots::itemActivated( QTreeWidgetItem * item, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointerInt( object, ( char* ) "itemActivated(QTWItem)", item, column ); + hbqt_SlotsExecPointerInt( object, "itemActivated(QTWItem)", item, column ); } + void Slots::itemChanged( QTreeWidgetItem * item, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointerInt( object, ( char* ) "itemChanged(QTWItem)", item, column ); + hbqt_SlotsExecPointerInt( object, "itemChanged(QTWItem)", item, column ); } + void Slots::itemClicked( QTreeWidgetItem * item, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointerInt( object, ( char* ) "itemClicked(QTWItem)", item, column ); + hbqt_SlotsExecPointerInt( object, "itemClicked(QTWItem)", item, column ); } + void Slots::itemDoubleClicked( QTreeWidgetItem * item, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointerInt( object, ( char* ) "itemDoubleClicked(QTWItem)", item, column ); + hbqt_SlotsExecPointerInt( object, "itemDoubleClicked(QTWItem)", item, column ); } + void Slots::itemEntered( QTreeWidgetItem * item, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointerInt( object, ( char* ) "itemEntered(QTWItem)", item, column ); + hbqt_SlotsExecPointerInt( object, "itemEntered(QTWItem)", item, column ); } + void Slots::itemPressed( QTreeWidgetItem * item, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointerInt( object, ( char* ) "itemPressed(QTWItem)", item, column ); + hbqt_SlotsExecPointerInt( object, "itemPressed(QTWItem)", item, column ); } + void Slots::itemExpanded( QTreeWidgetItem * item ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "itemExpanded(QTWItem)", item ); + hbqt_SlotsExecPointer( object, "itemExpanded(QTWItem)", item ); } + void Slots::itemCollapsed( QTreeWidgetItem * item ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "itemCollapsed(QTWItem)", item ); + hbqt_SlotsExecPointer( object, "itemCollapsed(QTWItem)", item ); } + void Slots::itemSelectionChanged() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "itemSelectionChanged()" ); + hbqt_SlotsExec( object, "itemSelectionChanged()" ); } + /* QDialog (s)*/ void Slots::currentFontChanged( const QFont & font ) { QObject *object = qobject_cast( sender() ); - SlotsExecFont( object, ( char* ) "currentFontChanged(QFont)", font ); + hbqt_SlotsExecFont( object, "currentFontChanged(QFont)", font ); } + void Slots::fontSelected( const QFont & font ) { QObject *object = qobject_cast( sender() ); - SlotsExecFont( object, ( char* ) "fontSelected(QFont)", font ); + hbqt_SlotsExecFont( object, "fontSelected(QFont)", font ); } + void Slots::accepted() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "accepted()" ); + hbqt_SlotsExec( object, "accepted()" ); } + void Slots::finished( int result ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "finished(int)", result ); + hbqt_SlotsExecInt( object, "finished(int)", result ); } + void Slots::rejected() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "rejected()" ); + hbqt_SlotsExec( object, "rejected()" ); } + void Slots::currentChanged( const QString & path ) { QObject *object = qobject_cast( sender() ); - SlotsExecString( object, ( char* ) "currentChanged(QString)", path ); + hbqt_SlotsExecString( object, "currentChanged(QString)", path ); } + void Slots::directoryEntered( const QString & directory ) { QObject *object = qobject_cast( sender() ); - SlotsExecString( object, ( char* ) "directoryEntered(QString)", directory ); + hbqt_SlotsExecString( object, "directoryEntered(QString)", directory ); } + void Slots::fileSelected( const QString & file ) { QObject *object = qobject_cast( sender() ); - SlotsExecString( object, ( char* ) "fileSelected(QString)", file ); + hbqt_SlotsExecString( object, "fileSelected(QString)", file ); } + void Slots::filesSelected( const QStringList & selected ) { QObject *object = qobject_cast( sender() ); - SlotsExecStringList( object, ( char* ) "filesSelected(QStringList)", selected ); + hbqt_SlotsExecStringList( object, "filesSelected(QStringList)", selected ); } + void Slots::filterSelected( const QString & filter ) { QObject *object = qobject_cast( sender() ); - SlotsExecString( object, ( char* ) "filterSelected(QString)", filter ); + hbqt_SlotsExecString( object, "filterSelected(QString)", filter ); } + /* QPrintDialog */ void Slots::accepted( QPrinter * printer ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "accepted(QPrinter)", printer ); + hbqt_SlotsExecPointer( object, "accepted(QPrinter)", printer ); } + /* QTextEdit */ void Slots::copyAvailable( bool yes ) { QObject *object = qobject_cast( sender() ); - SlotsExecBool( object, ( char* ) "copyAvailable(bool)", yes ); + hbqt_SlotsExecBool( object, "copyAvailable(bool)", yes ); } + void Slots::currentCharFormatChanged( const QTextCharFormat & f ) { QObject *object = qobject_cast( sender() ); - SlotsExecTextCharFormat( object, ( char* ) "currentCharFormatChanged(QTextCharFormat)", f ); + hbqt_SlotsExecTextCharFormat( object, "currentCharFormatChanged(QTextCharFormat)", f ); } + void Slots::cursorPositionChanged() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "cursorPositionChanged()" ); + hbqt_SlotsExec( object, "cursorPositionChanged()" ); } + void Slots::redoAvailable( bool available ) { QObject *object = qobject_cast( sender() ); - SlotsExecBool( object, ( char* ) "redoAvailable(bool)", available ); + hbqt_SlotsExecBool( object, "redoAvailable(bool)", available ); } + void Slots::textChanged() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "textChanged()" ); + hbqt_SlotsExec( object, "textChanged()" ); } + void Slots::undoAvailable( bool available ) { QObject *object = qobject_cast( sender() ); - SlotsExecBool( object, ( char* ) "undoAvailable(available)", available ); + hbqt_SlotsExecBool( object, "undoAvailable(available)", available ); } + void Slots::timeout() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "timeout()" ); + hbqt_SlotsExec( object, "timeout()" ); } + void Slots::scrollContentsBy( int x, int y ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "scrollContentsBy(int,int)", x, y ); + hbqt_SlotsExecIntInt( object, "scrollContentsBy(int,int)", x, y ); } + void Slots::geometriesChanged() { QObject *object = qobject_cast( sender() ); - SlotsExec( object, ( char* ) "geometriesChanged()" ); + hbqt_SlotsExec( object, "geometriesChanged()" ); } + void Slots::sectionAutoResize( int logicalIndex, QHeaderView::ResizeMode mode ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "sectionAutoResize(int,int)", logicalIndex, mode ); + hbqt_SlotsExecIntInt( object, "sectionAutoResize(int,int)", logicalIndex, mode ); } + void Slots::sectionClicked( int logicalIndex ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "sectionClicked(int)", logicalIndex ); + hbqt_SlotsExecInt( object, "sectionClicked(int)", logicalIndex ); } + void Slots::sectionCountChanged( int oldCount, int newCount ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "sectionCountChanged(int,int)", oldCount, newCount ); + hbqt_SlotsExecIntInt( object, "sectionCountChanged(int,int)", oldCount, newCount ); } + void Slots::sectionDoubleClicked( int logicalIndex ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "sectionDoubleClicked(int)", logicalIndex ); + hbqt_SlotsExecInt( object, "sectionDoubleClicked(int)", logicalIndex ); } + void Slots::sectionEntered( int logicalIndex ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "sectionEntered(int)", logicalIndex ); + hbqt_SlotsExecInt( object, "sectionEntered(int)", logicalIndex ); } + void Slots::sectionHandleDoubleClicked( int logicalIndex ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "sectionHandleDoubleClicked(int)", logicalIndex ); + hbqt_SlotsExecInt( object, "sectionHandleDoubleClicked(int)", logicalIndex ); } + void Slots::sectionMoved( int logicalIndex, int oldVisualIndex, int newVisualIndex ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntIntInt( object, ( char* ) "sectionMoved(int,int,int)", logicalIndex, oldVisualIndex, newVisualIndex ); + hbqt_SlotsExecIntIntInt( object, "sectionMoved(int,int,int)", logicalIndex, oldVisualIndex, newVisualIndex ); } + void Slots::sectionPressed( int logicalIndex ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "sectionPressed(int)", logicalIndex ); + hbqt_SlotsExecInt( object, "sectionPressed(int)", logicalIndex ); } + void Slots::sectionResized( int logicalIndex, int oldSize, int newSize ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntIntInt( object, ( char* ) "sectionResized(int,int,int)", logicalIndex, oldSize, newSize ); + hbqt_SlotsExecIntIntInt( object, "sectionResized(int,int,int)", logicalIndex, oldSize, newSize ); } + void Slots::sortIndicatorChanged( int logicalIndex, Qt::SortOrder order ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "sortIndicatorChanged(int,int)", logicalIndex, order ); + hbqt_SlotsExecIntInt( object, "sortIndicatorChanged(int,int)", logicalIndex, order ); } + void Slots::buttonClicked( int id ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "buttonClicked(int)", id ); + hbqt_SlotsExecInt( object, "buttonClicked(int)", id ); } + void Slots::buttonPressed( int id ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "buttonPressed(int)", id ); + hbqt_SlotsExecInt( object, "buttonPressed(int)", id ); } + void Slots::buttonReleased( int id ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "buttonReleased(int)", id ); + hbqt_SlotsExecInt( object, "buttonReleased(int)", id ); } + void Slots::linkActivated( const QString & link ) { QObject *object = qobject_cast( sender() ); - SlotsExecString( object, ( char* ) "linkActivated(QString)", link ); + hbqt_SlotsExecString( object, "linkActivated(QString)", link ); } + void Slots::linkHovered( const QString & link ) { QObject *object = qobject_cast( sender() ); - SlotsExecString( object, ( char* ) "linkHovered(QString)", link ); + hbqt_SlotsExecString( object, "linkHovered(QString)", link ); } + void Slots::cellActivated( int row, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "cellActivated(int,int)", row, column ); + hbqt_SlotsExecIntInt( object, "cellActivated(int,int)", row, column ); } + void Slots::cellChanged( int row, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "cellChanged(int,int)", row, column ); + hbqt_SlotsExecIntInt( object, "cellChanged(int,int)", row, column ); } + void Slots::cellClicked( int row, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "cellClicked(int,int)", row, column ); + hbqt_SlotsExecIntInt( object, "cellClicked(int,int)", row, column ); } + void Slots::cellDoubleClicked( int row, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "cellDoubleClicked(int,int)", row, column ); + hbqt_SlotsExecIntInt( object, "cellDoubleClicked(int,int)", row, column ); } + void Slots::cellEntered( int row, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "cellEntered(int,int)", row, column ); + hbqt_SlotsExecIntInt( object, "cellEntered(int,int)", row, column ); } + void Slots::cellPressed( int row, int column ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntInt( object, ( char* ) "cellEntered(int,int)", row, column ); + hbqt_SlotsExecIntInt( object, "cellEntered(int,int)", row, column ); } + void Slots::currentCellChanged( int currentRow, int currentColumn, int previousRow, int previousColumn ) { QObject *object = qobject_cast( sender() ); - SlotsExecIntIntIntInt( object, ( char* ) "currentCellChanged(int,int,int,int)", currentRow, currentColumn, previousRow, previousColumn ); + hbqt_SlotsExecIntIntIntInt( object, "currentCellChanged(int,int,int,int)", currentRow, currentColumn, previousRow, previousColumn ); } + void Slots::tabCloseRequested( int index ) { QObject *object = qobject_cast( sender() ); - SlotsExecInt( object, ( char* ) "tabCloseRequested(int)", index ); + hbqt_SlotsExecInt( object, "tabCloseRequested(int)", index ); } + void Slots::paintRequested( QPrinter * printer ) { QObject *object = qobject_cast( sender() ); - SlotsExecPointer( object, ( char* ) "paintRequested(QPrinter)", printer ); + hbqt_SlotsExecPointer( object, "paintRequested(QPrinter)", printer ); } /*----------------------------------------------------------------------*/ @@ -884,35 +972,35 @@ HB_FUNC( QT_CONNECT_SIGNAL ) qt_setEventSlots(); Slots * s_s = qt_getEventSlots(); - if( signal == ( QString ) "clicked()" ) ret = object->connect( object, SIGNAL( clicked() ) , s_s, SLOT( clicked() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "returnPressed()" ) ret = object->connect( object, SIGNAL( returnPressed() ) , s_s, SLOT( returnPressed() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "triggered()" ) ret = object->connect( object, SIGNAL( triggered() ) , s_s, SLOT( triggered() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "hovered()" ) ret = object->connect( object, SIGNAL( hovered() ) , s_s, SLOT( hovered() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "viewportEntered()" ) ret = object->connect( object, SIGNAL( viewportEntered() ) , s_s, SLOT( viewportEntered() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "pressed()" ) ret = object->connect( object, SIGNAL( pressed() ) , s_s, SLOT( pressed() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "released()" ) ret = object->connect( object, SIGNAL( released() ) , s_s, SLOT( released() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "stateChanged(int)" ) ret = object->connect( object, SIGNAL( stateChanged( int ) ) , s_s, SLOT( stateChanged( int ) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "activated(int)" ) ret = object->connect( object, SIGNAL( activated( int ) ) , s_s, SLOT( activated( int ) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "currentIndexChanged(int)" ) ret = object->connect( object, SIGNAL( currentIndexChanged( int ) ) , s_s, SLOT( currentIndexChanged( int ) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "highlighted(int)" ) ret = object->connect( object, SIGNAL( highlighted( int ) ) , s_s, SLOT( highlighted( int ) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "triggered(bool)" ) ret = object->connect( object, SIGNAL( triggered( bool ) ) , s_s, SLOT( triggered( bool ) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "clicked(QModelIndex)" ) ret = object->connect( object, SIGNAL( clicked( const QModelIndex & ) ) , s_s, SLOT( clicked( const QModelIndex & ) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "doubleClicked(QModelIndex)" ) ret = object->connect( object, SIGNAL( doubleClicked( const QModelIndex & ) ) , s_s, SLOT( doubleClicked( const QModelIndex & ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "entered(QModelIndex)" ) ret = object->connect( object, SIGNAL( entered( const QModelIndex & ) ) , s_s, SLOT( entered( const QModelIndex & ) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "hovered(action)" ) ret = object->connect( object, SIGNAL( hovered( QAction * ) ) , s_s, SLOT( hovered( QAction * ) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "currentChanged(int)" ) ret = object->connect( object, SIGNAL( currentChanged( int ) ) , s_s, SLOT( currentChanged( int ) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "actionTriggered(int)" ) ret = object->connect( object, SIGNAL( actionTriggered(int) ) , s_s, SLOT( actionTriggered(int) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "rangeChanged(int,int)" ) ret = object->connect( object, SIGNAL( rangeChanged(int,int) ) , s_s, SLOT( rangeChanged(int,int) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "sliderMoved(int)" ) ret = object->connect( object, SIGNAL( sliderMoved(int) ) , s_s, SLOT( sliderMoved(int) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "sliderPressed()" ) ret = object->connect( object, SIGNAL( sliderPressed() ) , s_s, SLOT( sliderPressed() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "sliderReleased()" ) ret = object->connect( object, SIGNAL( sliderReleased() ) , s_s, SLOT( sliderReleased() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "valueChanged(int)" ) ret = object->connect( object, SIGNAL( valueChanged(int) ) , s_s, SLOT( valueChanged(int) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "cursorPositionChanged(int,int)" ) ret = object->connect( object, SIGNAL( cursorPositionChanged(int,int) ) , s_s, SLOT( cursorPositionChanged(int,int) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "editingFinished()" ) ret = object->connect( object, SIGNAL( editingFinished() ) , s_s, SLOT( editingFinished() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "returnPressed()" ) ret = object->connect( object, SIGNAL( returnPressed() ) , s_s, SLOT( returnPressed() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "selectionChanged()" ) ret = object->connect( object, SIGNAL( selectionChanged() ) , s_s, SLOT( selectionChanged() ) , Qt::AutoConnection ); - else if( signal == ( QString ) "textChanged(QString)" ) ret = object->connect( object, SIGNAL( textChanged( const QString &) ) , s_s, SLOT( textChanged( const QString & ) ) , Qt::AutoConnection ); - else if( signal == ( QString ) "textEdited(QString)" ) ret = object->connect( object, SIGNAL( textEdited( const QString &) ) , s_s, SLOT( textEdited( const QString & ) ) , Qt::AutoConnection ); + if( signal == ( QString ) "clicked()" ) ret = object->connect( object, SIGNAL( clicked() ) , s_s, SLOT( clicked() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "returnPressed()" ) ret = object->connect( object, SIGNAL( returnPressed() ) , s_s, SLOT( returnPressed() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "triggered()" ) ret = object->connect( object, SIGNAL( triggered() ) , s_s, SLOT( triggered() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "hovered()" ) ret = object->connect( object, SIGNAL( hovered() ) , s_s, SLOT( hovered() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "viewportEntered()" ) ret = object->connect( object, SIGNAL( viewportEntered() ) , s_s, SLOT( viewportEntered() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "pressed()" ) ret = object->connect( object, SIGNAL( pressed() ) , s_s, SLOT( pressed() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "released()" ) ret = object->connect( object, SIGNAL( released() ) , s_s, SLOT( released() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "stateChanged(int)" ) ret = object->connect( object, SIGNAL( stateChanged( int ) ) , s_s, SLOT( stateChanged( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "activated(int)" ) ret = object->connect( object, SIGNAL( activated( int ) ) , s_s, SLOT( activated( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "currentIndexChanged(int)" ) ret = object->connect( object, SIGNAL( currentIndexChanged( int ) ) , s_s, SLOT( currentIndexChanged( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "highlighted(int)" ) ret = object->connect( object, SIGNAL( highlighted( int ) ) , s_s, SLOT( highlighted( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "triggered(bool)" ) ret = object->connect( object, SIGNAL( triggered( bool ) ) , s_s, SLOT( triggered( bool ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "clicked(QModelIndex)" ) ret = object->connect( object, SIGNAL( clicked( const QModelIndex & ) ) , s_s, SLOT( clicked( const QModelIndex & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "doubleClicked(QModelIndex)" ) ret = object->connect( object, SIGNAL( doubleClicked( const QModelIndex & ) ) , s_s, SLOT( doubleClicked( const QModelIndex & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "entered(QModelIndex)" ) ret = object->connect( object, SIGNAL( entered( const QModelIndex & ) ) , s_s, SLOT( entered( const QModelIndex & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "hovered(action)" ) ret = object->connect( object, SIGNAL( hovered( QAction * ) ) , s_s, SLOT( hovered( QAction * ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "currentChanged(int)" ) ret = object->connect( object, SIGNAL( currentChanged( int ) ) , s_s, SLOT( currentChanged( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "actionTriggered(int)" ) ret = object->connect( object, SIGNAL( actionTriggered(int) ) , s_s, SLOT( actionTriggered(int) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "rangeChanged(int,int)" ) ret = object->connect( object, SIGNAL( rangeChanged(int,int) ) , s_s, SLOT( rangeChanged(int,int) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sliderMoved(int)" ) ret = object->connect( object, SIGNAL( sliderMoved(int) ) , s_s, SLOT( sliderMoved(int) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sliderPressed()" ) ret = object->connect( object, SIGNAL( sliderPressed() ) , s_s, SLOT( sliderPressed() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sliderReleased()" ) ret = object->connect( object, SIGNAL( sliderReleased() ) , s_s, SLOT( sliderReleased() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "valueChanged(int)" ) ret = object->connect( object, SIGNAL( valueChanged(int) ) , s_s, SLOT( valueChanged(int) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "cursorPositionChanged(int,int)" ) ret = object->connect( object, SIGNAL( cursorPositionChanged(int,int) ) , s_s, SLOT( cursorPositionChanged(int,int) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "editingFinished()" ) ret = object->connect( object, SIGNAL( editingFinished() ) , s_s, SLOT( editingFinished() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "returnPressed()" ) ret = object->connect( object, SIGNAL( returnPressed() ) , s_s, SLOT( returnPressed() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "selectionChanged()" ) ret = object->connect( object, SIGNAL( selectionChanged() ) , s_s, SLOT( selectionChanged() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "textChanged(QString)" ) ret = object->connect( object, SIGNAL( textChanged( const QString &) ) , s_s, SLOT( textChanged( const QString & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "textEdited(QString)" ) ret = object->connect( object, SIGNAL( textEdited( const QString &) ) , s_s, SLOT( textEdited( const QString & ) ) , Qt::AutoConnection ); /* QTreeViewWidget */ else if( signal == ( QString ) "currentItemChanged(QTWItem)" ) ret = object->connect( object, SIGNAL( currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ) ), s_s, SLOT( currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ) ), Qt::AutoConnection ); else if( signal == ( QString ) "itemActivated(QTWItem)" ) ret = object->connect( object, SIGNAL( itemActivated( QTreeWidgetItem *, int ) ) , s_s, SLOT( itemActivated( QTreeWidgetItem *, int ) ) , Qt::AutoConnection ); @@ -925,59 +1013,59 @@ HB_FUNC( QT_CONNECT_SIGNAL ) else if( signal == ( QString ) "itemPressed(QTWItem)" ) ret = object->connect( object, SIGNAL( itemPressed( QTreeWidgetItem *, int ) ) , s_s, SLOT( itemPressed( QTreeWidgetItem *, int ) ) , Qt::AutoConnection ); else if( signal == ( QString ) "itemSelectionChanged()" ) ret = object->connect( object, SIGNAL( itemSelectionChanged() ) , s_s, SLOT( itemSelectionChanged() ) , Qt::AutoConnection ); /* QDialog (s) QFontDialog, QFileDialog */ - else if( signal == ( QString ) "currentFontChanged(QFont)" ) ret = object->connect( object, SIGNAL( currentFontChanged( const QFont & ) ) , s_s, SLOT( currentFontChanged( const QFont & ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "fontSelected(QFont)" ) ret = object->connect( object, SIGNAL( fontSelected( const QFont & ) ) , s_s, SLOT( fontSelected( const QFont & ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "accepted()" ) ret = object->connect( object, SIGNAL( accepted() ) , s_s, SLOT( accepted() ), Qt::AutoConnection ); - else if( signal == ( QString ) "finished(int)" ) ret = object->connect( object, SIGNAL( finished( int ) ) , s_s, SLOT( finished( int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "rejected()" ) ret = object->connect( object, SIGNAL( rejected() ) , s_s, SLOT( rejected() ), Qt::AutoConnection ); - else if( signal == ( QString ) "currentChanged(QString)" ) ret = object->connect( object, SIGNAL( currentChanged( const QString & ) ) , s_s, SLOT( currentChanged( const QString & ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "directoryEntered(QString)" ) ret = object->connect( object, SIGNAL( directoryEntered( const QString & ) ) , s_s, SLOT( directoryEntered( const QString & ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "fileSelected(QString)" ) ret = object->connect( object, SIGNAL( fileSelected( const QString & ) ) , s_s, SLOT( fileSelected( const QString & ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "filesSelected(QStringList)" ) ret = object->connect( object, SIGNAL( filesSelected( const QStringList & ) ) , s_s, SLOT( filesSelected( const QStringList & ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "filterSelected(QString)" ) ret = object->connect( object, SIGNAL( filterSelected( const QString & ) ) , s_s, SLOT( filterSelected( const QString & ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "accepted(QPrinter)" ) ret = object->connect( object, SIGNAL( accepted( QPrinter * ) ) , s_s, SLOT( accepted( QPrinter * ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "copyAvailable(bool)" ) ret = object->connect( object, SIGNAL( copyAvailable( bool ) ) , s_s, SLOT( copyAvailable( bool ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "currentCharFormatChanged(QTextCharFormat)" ) ret = object->connect( object, SIGNAL( currentCharFormatChanged( const QTextCharFormat & ) ) , s_s, SLOT( currentCharFormatChanged( const QTextCharFormat & ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "cursorPositionChanged()" ) ret = object->connect( object, SIGNAL( cursorPositionChanged() ) , s_s, SLOT( cursorPositionChanged() ), Qt::AutoConnection ); - else if( signal == ( QString ) "redoAvailable(bool)" ) ret = object->connect( object, SIGNAL( redoAvailable( bool ) ) , s_s, SLOT( redoAvailable( bool ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "textChanged()" ) ret = object->connect( object, SIGNAL( textChanged() ) , s_s, SLOT( textChanged() ), Qt::AutoConnection ); - else if( signal == ( QString ) "undoAvailable(available)" ) ret = object->connect( object, SIGNAL( undoAvailable( bool ) ) , s_s, SLOT( undoAvailable( bool ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "timeout()" ) ret = object->connect( object, SIGNAL( timeout() ) , s_s, SLOT( timeout() ), Qt::AutoConnection ); + else if( signal == ( QString ) "currentFontChanged(QFont)" ) ret = object->connect( object, SIGNAL( currentFontChanged( const QFont & ) ) , s_s, SLOT( currentFontChanged( const QFont & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "fontSelected(QFont)" ) ret = object->connect( object, SIGNAL( fontSelected( const QFont & ) ) , s_s, SLOT( fontSelected( const QFont & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "accepted()" ) ret = object->connect( object, SIGNAL( accepted() ) , s_s, SLOT( accepted() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "finished(int)" ) ret = object->connect( object, SIGNAL( finished( int ) ) , s_s, SLOT( finished( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "rejected()" ) ret = object->connect( object, SIGNAL( rejected() ) , s_s, SLOT( rejected() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "currentChanged(QString)" ) ret = object->connect( object, SIGNAL( currentChanged( const QString & ) ) , s_s, SLOT( currentChanged( const QString & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "directoryEntered(QString)" ) ret = object->connect( object, SIGNAL( directoryEntered( const QString & ) ) , s_s, SLOT( directoryEntered( const QString & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "fileSelected(QString)" ) ret = object->connect( object, SIGNAL( fileSelected( const QString & ) ) , s_s, SLOT( fileSelected( const QString & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "filesSelected(QStringList)" ) ret = object->connect( object, SIGNAL( filesSelected( const QStringList & ) ) , s_s, SLOT( filesSelected( const QStringList & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "filterSelected(QString)" ) ret = object->connect( object, SIGNAL( filterSelected( const QString & ) ) , s_s, SLOT( filterSelected( const QString & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "accepted(QPrinter)" ) ret = object->connect( object, SIGNAL( accepted( QPrinter * ) ) , s_s, SLOT( accepted( QPrinter * ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "copyAvailable(bool)" ) ret = object->connect( object, SIGNAL( copyAvailable( bool ) ) , s_s, SLOT( copyAvailable( bool ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "currentCharFormatChanged(QTextCharFormat)" ) ret = object->connect( object, SIGNAL( currentCharFormatChanged( const QTextCharFormat & ) ) , s_s, SLOT( currentCharFormatChanged( const QTextCharFormat & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "cursorPositionChanged()" ) ret = object->connect( object, SIGNAL( cursorPositionChanged() ) , s_s, SLOT( cursorPositionChanged() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "redoAvailable(bool)" ) ret = object->connect( object, SIGNAL( redoAvailable( bool ) ) , s_s, SLOT( redoAvailable( bool ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "textChanged()" ) ret = object->connect( object, SIGNAL( textChanged() ) , s_s, SLOT( textChanged() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "undoAvailable(available)" ) ret = object->connect( object, SIGNAL( undoAvailable( bool ) ) , s_s, SLOT( undoAvailable( bool ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "timeout()" ) ret = object->connect( object, SIGNAL( timeout() ) , s_s, SLOT( timeout() ) , Qt::AutoConnection ); /* Generic purpose mechanism to receive key and mouse events off subclasses */ - else if( signal == ( QString ) "keyPressEvent()" ) ret = object->connect( object, SIGNAL( sg_keyPressEvent( QKeyEvent * ) ) , s_s, SLOT( keyPressEvent( QKeyEvent * ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "keyReleaseEvent()" ) ret = object->connect( object, SIGNAL( sg_keyReleaseEvent( QKeyEvent * ) ) , s_s, SLOT( keyReleaseEvent( QKeyEvent * ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "mouseMoveEvent()" ) ret = object->connect( object, SIGNAL( sg_mouseMoveEvent( QMouseEvent * ) ) , s_s, SLOT( mouseMoveEvent( QMouseEvent * ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "mouseDoubleClickEvent()" ) ret = object->connect( object, SIGNAL( sg_mouseDoubleClickEvent( QMouseEvent * ) ) , s_s, SLOT( mouseDoubleClickEvent( QMouseEvent * ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "mousePressEvent()" ) ret = object->connect( object, SIGNAL( sg_mousePressEvent( QMouseEvent * ) ) , s_s, SLOT( mousePressEvent( QMouseEvent * ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "mouseReleaseEvent()" ) ret = object->connect( object, SIGNAL( sg_mouseReleaseEvent( QMouseEvent * ) ) , s_s, SLOT( mouseReleaseEvent( QMouseEvent * ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "wheelEvent()" ) ret = object->connect( object, SIGNAL( sg_wheelEvent( QWheelEvent * ) ) , s_s, SLOT( wheelEvent( QWheelEvent * ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "resizeEvent()" ) ret = object->connect( object, SIGNAL( sg_resizeEvent( QResizeEvent * ) ) , s_s, SLOT( resizeEvent( QResizeEvent * ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "scrollContentsBy(int,int)" ) ret = object->connect( object, SIGNAL( sg_scrollContentsBy( int, int ) ) , s_s, SLOT( scrollContentsBy( int, int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "geometriesChanged()" ) ret = object->connect( object, SIGNAL( geometriesChanged() ) , s_s, SLOT( geometriesChanged() ), Qt::AutoConnection ); - else if( signal == ( QString ) "sectionAutoResize(int,int)" ) ret = object->connect( object, SIGNAL( sectionAutoResize( int, QHeaderView::ResizeMode ) ) , s_s, SLOT( sectionAutoResize( int, QHeaderView::ResizeMode ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "sectionClicked(int)" ) ret = object->connect( object, SIGNAL( sectionClicked( int ) ) , s_s, SLOT( sectionClicked( int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "sectionCountChanged(int,int)" ) ret = object->connect( object, SIGNAL( sectionCountChanged( int, int ) ) , s_s, SLOT( sectionCountChanged( int, int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "sectionDoubleClicked(int)" ) ret = object->connect( object, SIGNAL( sectionDoubleClicked( int ) ) , s_s, SLOT( sectionDoubleClicked( int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "sectionEntered(int)" ) ret = object->connect( object, SIGNAL( sectionEntered( int ) ) , s_s, SLOT( sectionEntered( int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "sectionHandleDoubleClicked(int)" ) ret = object->connect( object, SIGNAL( sectionHandleDoubleClicked( int ) ) , s_s, SLOT( sectionHandleDoubleClicked( int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "sectionMoved(int,int,int)" ) ret = object->connect( object, SIGNAL( sectionMoved( int, int, int ) ) , s_s, SLOT( sectionMoved( int, int, int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "sectionPressed(int)" ) ret = object->connect( object, SIGNAL( sectionPressed( int ) ) , s_s, SLOT( sectionPressed( int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "sectionResized(int,int,int)" ) ret = object->connect( object, SIGNAL( sectionResized( int, int, int ) ) , s_s, SLOT( sectionResized( int, int, int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "sortIndicatorChanged(int,int)" ) ret = object->connect( object, SIGNAL( sortIndicatorChanged( int, Qt::SortOrder ) ) , s_s, SLOT( sortIndicatorChanged( int, Qt::SortOrder ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "buttonClicked(int)" ) ret = object->connect( object, SIGNAL( buttonClicked( int ) ) , s_s, SLOT( buttonClicked( int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "buttonPressed(int)" ) ret = object->connect( object, SIGNAL( buttonPressed( int ) ) , s_s, SLOT( buttonPressed( int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "buttonReleased(int)" ) ret = object->connect( object, SIGNAL( buttonReleased( int ) ) , s_s, SLOT( buttonReleased( int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "linkActivated(QString)" ) ret = object->connect( object, SIGNAL( linkActivated( const QString & ) ) , s_s, SLOT( linkActivated( const QString & ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "linkHovered(QString)" ) ret = object->connect( object, SIGNAL( linkHovered( const QString & ) ) , s_s, SLOT( linkHovered( const QString & ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "cellActivated(int,int)" ) ret = object->connect( object, SIGNAL( cellActivated( int, int ) ) , s_s, SLOT( cellActivated( int, int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "cellChanged(int,int)" ) ret = object->connect( object, SIGNAL( cellChanged( int, int ) ) , s_s, SLOT( cellChanged( int, int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "cellClicked(int,int)" ) ret = object->connect( object, SIGNAL( cellClicked( int, int ) ) , s_s, SLOT( cellClicked( int, int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "cellDoubleClicked(int,int)" ) ret = object->connect( object, SIGNAL( cellDoubleClicked( int, int ) ) , s_s, SLOT( cellDoubleClicked( int, int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "cellEntered(int,int)" ) ret = object->connect( object, SIGNAL( cellEntered( int, int ) ) , s_s, SLOT( cellEntered( int, int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "cellPressed(int,int)" ) ret = object->connect( object, SIGNAL( cellPressed( int, int ) ) , s_s, SLOT( cellPressed( int, int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "currentCellChanged(int,int,int,int)" ) ret = object->connect( object, SIGNAL( currentCellChanged( int, int, int, int ) ) , s_s, SLOT( currentCellChanged( int, int, int, int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "tabCloseRequested(int)" ) ret = object->connect( object, SIGNAL( tabCloseRequested( int ) ) , s_s, SLOT( tabCloseRequested( int ) ), Qt::AutoConnection ); - else if( signal == ( QString ) "paintRequested(QPrinter)" ) ret = object->connect( object, SIGNAL( paintRequested( QPrinter * ) ) , s_s, SLOT( paintRequested( QPrinter * ) ), Qt::AutoConnection ); + else if( signal == ( QString ) "keyPressEvent()" ) ret = object->connect( object, SIGNAL( sg_keyPressEvent( QKeyEvent * ) ) , s_s, SLOT( keyPressEvent( QKeyEvent * ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "keyReleaseEvent()" ) ret = object->connect( object, SIGNAL( sg_keyReleaseEvent( QKeyEvent * ) ) , s_s, SLOT( keyReleaseEvent( QKeyEvent * ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "mouseMoveEvent()" ) ret = object->connect( object, SIGNAL( sg_mouseMoveEvent( QMouseEvent * ) ) , s_s, SLOT( mouseMoveEvent( QMouseEvent * ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "mouseDoubleClickEvent()" ) ret = object->connect( object, SIGNAL( sg_mouseDoubleClickEvent( QMouseEvent * ) ) , s_s, SLOT( mouseDoubleClickEvent( QMouseEvent * ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "mousePressEvent()" ) ret = object->connect( object, SIGNAL( sg_mousePressEvent( QMouseEvent * ) ) , s_s, SLOT( mousePressEvent( QMouseEvent * ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "mouseReleaseEvent()" ) ret = object->connect( object, SIGNAL( sg_mouseReleaseEvent( QMouseEvent * ) ) , s_s, SLOT( mouseReleaseEvent( QMouseEvent * ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "wheelEvent()" ) ret = object->connect( object, SIGNAL( sg_wheelEvent( QWheelEvent * ) ) , s_s, SLOT( wheelEvent( QWheelEvent * ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "resizeEvent()" ) ret = object->connect( object, SIGNAL( sg_resizeEvent( QResizeEvent * ) ) , s_s, SLOT( resizeEvent( QResizeEvent * ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "scrollContentsBy(int,int)" ) ret = object->connect( object, SIGNAL( sg_scrollContentsBy( int, int ) ) , s_s, SLOT( scrollContentsBy( int, int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "geometriesChanged()" ) ret = object->connect( object, SIGNAL( geometriesChanged() ) , s_s, SLOT( geometriesChanged() ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sectionAutoResize(int,int)" ) ret = object->connect( object, SIGNAL( sectionAutoResize( int, QHeaderView::ResizeMode ) ) , s_s, SLOT( sectionAutoResize( int, QHeaderView::ResizeMode ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sectionClicked(int)" ) ret = object->connect( object, SIGNAL( sectionClicked( int ) ) , s_s, SLOT( sectionClicked( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sectionCountChanged(int,int)" ) ret = object->connect( object, SIGNAL( sectionCountChanged( int, int ) ) , s_s, SLOT( sectionCountChanged( int, int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sectionDoubleClicked(int)" ) ret = object->connect( object, SIGNAL( sectionDoubleClicked( int ) ) , s_s, SLOT( sectionDoubleClicked( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sectionEntered(int)" ) ret = object->connect( object, SIGNAL( sectionEntered( int ) ) , s_s, SLOT( sectionEntered( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sectionHandleDoubleClicked(int)" ) ret = object->connect( object, SIGNAL( sectionHandleDoubleClicked( int ) ) , s_s, SLOT( sectionHandleDoubleClicked( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sectionMoved(int,int,int)" ) ret = object->connect( object, SIGNAL( sectionMoved( int, int, int ) ) , s_s, SLOT( sectionMoved( int, int, int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sectionPressed(int)" ) ret = object->connect( object, SIGNAL( sectionPressed( int ) ) , s_s, SLOT( sectionPressed( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sectionResized(int,int,int)" ) ret = object->connect( object, SIGNAL( sectionResized( int, int, int ) ) , s_s, SLOT( sectionResized( int, int, int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "sortIndicatorChanged(int,int)" ) ret = object->connect( object, SIGNAL( sortIndicatorChanged( int, Qt::SortOrder ) ) , s_s, SLOT( sortIndicatorChanged( int, Qt::SortOrder ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "buttonClicked(int)" ) ret = object->connect( object, SIGNAL( buttonClicked( int ) ) , s_s, SLOT( buttonClicked( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "buttonPressed(int)" ) ret = object->connect( object, SIGNAL( buttonPressed( int ) ) , s_s, SLOT( buttonPressed( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "buttonReleased(int)" ) ret = object->connect( object, SIGNAL( buttonReleased( int ) ) , s_s, SLOT( buttonReleased( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "linkActivated(QString)" ) ret = object->connect( object, SIGNAL( linkActivated( const QString & ) ) , s_s, SLOT( linkActivated( const QString & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "linkHovered(QString)" ) ret = object->connect( object, SIGNAL( linkHovered( const QString & ) ) , s_s, SLOT( linkHovered( const QString & ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "cellActivated(int,int)" ) ret = object->connect( object, SIGNAL( cellActivated( int, int ) ) , s_s, SLOT( cellActivated( int, int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "cellChanged(int,int)" ) ret = object->connect( object, SIGNAL( cellChanged( int, int ) ) , s_s, SLOT( cellChanged( int, int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "cellClicked(int,int)" ) ret = object->connect( object, SIGNAL( cellClicked( int, int ) ) , s_s, SLOT( cellClicked( int, int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "cellDoubleClicked(int,int)" ) ret = object->connect( object, SIGNAL( cellDoubleClicked( int, int ) ) , s_s, SLOT( cellDoubleClicked( int, int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "cellEntered(int,int)" ) ret = object->connect( object, SIGNAL( cellEntered( int, int ) ) , s_s, SLOT( cellEntered( int, int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "cellPressed(int,int)" ) ret = object->connect( object, SIGNAL( cellPressed( int, int ) ) , s_s, SLOT( cellPressed( int, int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "currentCellChanged(int,int,int,int)" ) ret = object->connect( object, SIGNAL( currentCellChanged( int, int, int, int ) ) , s_s, SLOT( currentCellChanged( int, int, int, int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "tabCloseRequested(int)" ) ret = object->connect( object, SIGNAL( tabCloseRequested( int ) ) , s_s, SLOT( tabCloseRequested( int ) ) , Qt::AutoConnection ); + else if( signal == ( QString ) "paintRequested(QPrinter)" ) ret = object->connect( object, SIGNAL( paintRequested( QPrinter * ) ) , s_s, SLOT( paintRequested( QPrinter * ) ) , Qt::AutoConnection ); hb_retl( ret == true );