diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9edef9a526..9f2438b5a3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-03 14:50 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbnetio/utils/hbnetioq/netiosrq.prg + * contrib/hbqt/qtuitools/THbQtUILoader.prg + * contrib/hbxbp/xbpdialog.prg + * contrib/hbxbp/xbpprinter.prg + ! Deleted: Q*FromPointer() calls leftovers. + 2011-03-03 11:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbxbp/xbpsle.prg * contrib/hbxbp/xbplistbox.prg diff --git a/harbour/contrib/hbnetio/utils/hbnetioq/netiosrq.prg b/harbour/contrib/hbnetio/utils/hbnetioq/netiosrq.prg index 2201c286f5..727c7b642e 100644 --- a/harbour/contrib/hbnetio/utils/hbnetioq/netiosrq.prg +++ b/harbour/contrib/hbnetio/utils/hbnetioq/netiosrq.prg @@ -301,12 +301,12 @@ METHOD NetIOMgmtClient:execEvent( cEvent, p ) ENDSWITCH EXIT CASE "QEvent_WindowStateChange" - qEvent := QWindowStateChangeEventFromPointer( p ) + qEvent := p ::nPrevWindowState := qEvent:oldState() EXIT CASE "QEvent_Hide" IF ::lSystemTrayAvailable - qEvent := QHideEventFromPointer( p ) + qEvent := p IF ! ::lChanging ::lChanging := .t. IF qEvent:spontaneous() @@ -605,7 +605,7 @@ METHOD NetIOMgmtClient:buildColumns() ::oBrw:addColumn( oXbpColumn ) aPP := {} - aadd( aPP, { XBP_PP_COL_HA_CAPTION , "IP" } ) + aadd( aPP, { XBP_PP_COL_HA_CAPTION , "IP:Port" } ) aadd( aPP, { XBP_PP_COL_HA_FGCLR , nClrHFg } ) aadd( aPP, { XBP_PP_COL_HA_BGCLR , nClrHBg } ) aadd( aPP, { XBP_PP_COL_HA_HEIGHT , 20 } ) @@ -621,25 +621,6 @@ METHOD NetIOMgmtClient:buildColumns() oXbpColumn:create( , , , , aPP ) ::oBrw:addColumn( oXbpColumn ) -#if 0 - aPP := {} - aadd( aPP, { XBP_PP_COL_HA_CAPTION , "Port" } ) - aadd( aPP, { XBP_PP_COL_HA_FGCLR , nClrHFg } ) - aadd( aPP, { XBP_PP_COL_HA_BGCLR , nClrHBg } ) - aadd( aPP, { XBP_PP_COL_HA_HEIGHT , 20 } ) - aadd( aPP, { XBP_PP_COL_DA_FGCLR , GRA_CLR_BLACK } ) - aadd( aPP, { XBP_PP_COL_DA_BGCLR , nClrBG } ) - aadd( aPP, { XBP_PP_COL_DA_HILITE_FGCLR , GRA_CLR_WHITE } ) - aadd( aPP, { XBP_PP_COL_DA_HILITE_BGCLR , GRA_CLR_DARKGRAY } ) - aadd( aPP, { XBP_PP_COL_DA_ROWHEIGHT , 20 } ) - aadd( aPP, { XBP_PP_COL_DA_ROWWIDTH , 55 } ) - // - oXbpColumn := XbpColumn():new() - oXbpColumn:dataLink := {|| str( ::aData[ ::recNo(), DAT_PORT ], 5, 0 ) } - oXbpColumn:create( , , , , aPP ) - ::oBrw:addColumn( oXbpColumn ) -#endif - aPP := {} aadd( aPP, { XBP_PP_COL_HA_CAPTION , "DateTime IN" } ) aadd( aPP, { XBP_PP_COL_HA_FGCLR , nClrHFg } ) @@ -784,7 +765,7 @@ METHOD NetIOMgmtClient:buildSystemTray() ENDIF ENDIF - RETURN nil + RETURN NIL /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtuitools/THbQtUILoader.prg b/harbour/contrib/hbqt/qtuitools/THbQtUILoader.prg index ab5969daa3..2ac4d202ec 100644 --- a/harbour/contrib/hbqt/qtuitools/THbQtUILoader.prg +++ b/harbour/contrib/hbqt/qtuitools/THbQtUILoader.prg @@ -229,7 +229,6 @@ METHOD HbQtUILoader:loadContents( cUiFull ) METHOD HbQtUILoader:loadUI( cUiFull, qParent ) LOCAL oWidget, qUiLoader, qFile //, pWidget - #if 1 LOCAL cBuffer /* This method allows to use ui components stored in a @@ -238,25 +237,10 @@ METHOD HbQtUILoader:loadUI( cUiFull, qParent ) cBuffer := hb_memoRead( cUiFull ) qFile := QBuffer() qFile:setData( cBuffer, len( cBuffer ) ) - #else - qFile := QFile( cUiFull ) - #endif + IF qFile:open( 1 ) qUiLoader := QUiLoader() oWidget := qUiLoader:load( qFile, qParent ) - #if 0 - pWidget := qUiLoader:load( qFile, qParent ) - DO CASE - CASE ::widgets[ 1,1 ] == "QWidget" - oWidget := QWidgetFromPointer( pWidget ) - CASE ::widgets[ 1,1 ] == "QDialog" - oWidget := QDialogFromPointer( pWidget ) - CASE ::widgets[ 1,1 ] == "QMainWindow" - oWidget := QMainWindowFromPointer( pWidget ) - OTHERWISE - oWidget := QWidgetFromPointer( pWidget ) - ENDCASE - #endif qFile:close() qFile := NIL qUiLoader := NIL diff --git a/harbour/contrib/hbxbp/xbpdialog.prg b/harbour/contrib/hbxbp/xbpdialog.prg index 9e0bd4ece8..2ab0ffa564 100644 --- a/harbour/contrib/hbxbp/xbpdialog.prg +++ b/harbour/contrib/hbxbp/xbpdialog.prg @@ -400,8 +400,8 @@ METHOD XbpDrawingArea:create( oParent, oOwner, aPos, aSize, aPresParams, lVisibl ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, .T. ) - IF !empty( ::qtObject ) - ::oWidget := QWidgetFromPointer( ::qtObject ) + IF ! empty( ::qtObject ) + ::oWidget := ::qtObject:oWidget ELSE ::oWidget := QWidget() ENDIF diff --git a/harbour/contrib/hbxbp/xbpprinter.prg b/harbour/contrib/hbxbp/xbpprinter.prg index 3180640a81..c05cb3c8e6 100644 --- a/harbour/contrib/hbxbp/xbpprinter.prg +++ b/harbour/contrib/hbxbp/xbpprinter.prg @@ -522,7 +522,8 @@ METHOD XbpPrinter:startDoc( cDocName ) /*----------------------------------------------------------------------*/ METHOD XbpPrinter:getEngineProperty( nProperty ) - LOCAL oVariant := QVariantFromPointer( ::oEngine:property( nProperty ) ) + //LOCAL oVariant := QVariantFromPointer( ::oEngine:property( nProperty ) ) + LOCAL oVariant := ::oEngine:property( nProperty ) DO CASE CASE nProperty == QPrintEngine_PPK_CollateCopies