diff --git a/harbour/ChangeLog b/harbour/ChangeLog index dbd4d83e27..ae89f0883d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-10 19:13 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtcore/hbqt_init.cpp + ! Fixed: one remaining warning - arguments. + * contrib/hbxbp/xbpbrowse.prg + ! Fixed: slot "commitData(QWidget*)" was not working. + It is hack on PRG level and is scheduled to be shifted to C++. + 2011-03-10 17:53 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/hbmk2_qt.hbs ! Optimized: methods callable with no arguments. diff --git a/harbour/contrib/hbqt/qtcore/hbqt_init.cpp b/harbour/contrib/hbqt/qtcore/hbqt_init.cpp index 3b8df491ea..849e6e3a27 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_init.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_init.cpp @@ -92,6 +92,7 @@ extern void * hbqt_gcAllocate_QDateTime( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QTime( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QModelIndex( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_QStringList( void * pObj, bool bNew ); +extern void * hbqt_gcAllocate_QList( void * pObj, bool bNew ); HB_EXTERN_END /*----------------------------------------------------------------------*/ @@ -345,11 +346,7 @@ static void hbqt_SlotsExecModelIndexList( PHB_ITEM * codeBlock, void ** argument hb_vmPushEvalSym(); hb_vmPush( codeBlock ); -#if 0 - hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QModelIndexList( new QModelIndexList( ( *reinterpret_cast< QModelIndexList( * ) >( arguments[ 1 ] ) ) ), true ), "hb_QModelIndexList" ) ); -#else - hb_vmPushNil(); -#endif + hb_vmPush( hbqt_create_objectGC( hbqt_gcAllocate_QList( new QList< QModelIndex *>( ( *reinterpret_cast< QList< QModelIndex *> *>( arguments[ 1 ] ) ) ), true ), "hb_QModelIndexList" ) ); hb_vmSend( 1 ); } diff --git a/harbour/contrib/hbxbp/xbpbrowse.prg b/harbour/contrib/hbxbp/xbpbrowse.prg index db76868c50..7549185e53 100644 --- a/harbour/contrib/hbxbp/xbpbrowse.prg +++ b/harbour/contrib/hbxbp/xbpbrowse.prg @@ -971,7 +971,7 @@ METHOD XbpBrowse:manageFrameResized() /*----------------------------------------------------------------------*/ METHOD XbpBrowse:manageCommitData( qWidget ) - LOCAL cTxt := qWidget:text() + LOCAL cTxt := hbqt_promotWidget( qWidget, "QLineEdit" ):text() LOCAL oCol := ::columns[ ::colPos ] LOCAL cTyp := valtype( eval( oCol:block ) )