diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ad38050198..5f00308665 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,19 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-19 16:55 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/idedocks.prg + ! Code cleanup. + + * contrib/hbqt/qtcore/hbqt_hbqslots.cpp + * contrib/hbqt/qtcore/hbqt_hbqslots.h + ! Fixed: hb_vmPushLogical( *reinterpret_cast< int( * ) >( arguments[ 1 ] ) ); + => + hb_vmPushLogical( *reinterpret_cast< bool( * ) >( arguments[ 1 ] ) ); + + ! Reimplemented: Francesco's signal management protocol which got broke + due to above overlook. + 2010-10-20 00:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbziparc/hbziparc.prg + HB_ZIPFILE() will now store file timestamp in zip. diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index ef7765f839..672e03b6be 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -443,11 +443,7 @@ METHOD IdeDocks:buildSystemTray() METHOD IdeDocks:execEvent( cEvent, p, p1 ) LOCAL qEvent, qMime, qList, qUrl, i, n, oEdit, aMenu -#if 0 -IF "visibility" $ cEvent -HB_TRACE( HB_TR_ALWAYS, cEvent, p, p1:isVisible() ) -ENDIF -#endif + SWITCH cEvent CASE "dockReportsManager_visibilityChanged" IF ! p .AND. ! p1:isVisible() diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp index 5192fc6f4f..5091cc770e 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp @@ -1454,13 +1454,13 @@ static void hbqt_SlotsExecPointerInt( PHB_ITEM * codeBlock, void ** arguments ) static void hbqt_SlotsExecBool( PHB_ITEM * codeBlock, void ** arguments ) { #ifdef __hb_vmEvalBlockV__ - PHB_ITEM p1 = hb_itemPutL( NULL, ( *reinterpret_cast< int( * ) >( arguments[ 1 ] ) ) ); + PHB_ITEM p1 = hb_itemPutL( NULL, ( *reinterpret_cast< bool( * ) >( arguments[ 1 ] ) ) ); hb_vmEvalBlockV( codeBlock, 1, p1 ); hb_itemRelease( p1 ); #else hb_vmPushEvalSym(); hb_vmPush( codeBlock ); - hb_vmPushLogical( *reinterpret_cast< int( * ) >( arguments[ 1 ] ) ); + hb_vmPushLogical( *reinterpret_cast< bool( * ) >( arguments[ 1 ] ) ); hb_vmSend( 1 ); #endif } diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.h b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.h index 9993e93bca..63e5abea72 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.h +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.h @@ -78,7 +78,7 @@ /*----------------------------------------------------------------------*/ -#define __PRITPAL__ +#define __xPRITPAL__ #ifdef __PRITPAL__