diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f18642207f..715b917d47 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-06 21:26 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/tests/qtrevamp.prg + - Removed: note on returned QAction if it is not of same type + as stated in previous commit. New hbQT is always returning + NIL if a valid Qt pointer could not been obtained. This holds + true for all type of objects. Actually I did not test it + along these lines. So with __HBQT_REVAMP__ there is no need + of :isValidPointer() any more, just test a returned object + against NIL. + 2012-06-06 18:54 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/hbqt_bind.cpp * Struggled: to set pointer arithmatic to be used properly. diff --git a/harbour/contrib/hbqt/tests/qtrevamp.prg b/harbour/contrib/hbqt/tests/qtrevamp.prg index c5a9c30ec6..166bbcc396 100644 --- a/harbour/contrib/hbqt/tests/qtrevamp.prg +++ b/harbour/contrib/hbqt/tests/qtrevamp.prg @@ -118,15 +118,8 @@ FUNCTION ContextMenu( oWnd ) qMenu:addAction( "Find" ) qAct := qMenu:exec( oWnd:mapToGlobal( QPoint( 10,10 ) ) ) - - // The test below is neccessary because Qt returns NULL in case - // user clicks anything except a menu item. Theoretically, Qt - // should have returned a QAction. - // - IF __objGetClsName( qAct ) == "QAction" - IF hb_isString( qAct:text() ) - //... - ENDIF + IF ! empty( qAct ) + //... ENDIF // qMenu is a local variable and is carries no parent,