fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-04-11 16:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbide/hbide.prg
  * contrib/hbxbp/xbpwindow.prg
    - Deleted few remaining reference for HBQT_GETMEMUSED().

  * contrib/hbxbp/xbp.ch
  * contrib/hbxbp/xbpsle.prg
  * contrib/hbxbp/xbpbrowse.prg
  * contrib/hbxbp/xbptabpage.prg
  * contrib/hbxbp/xbpwindow.prg
  * contrib/hbxbp/xbphtmlviewer.prg
  * contrib/hbxbp/xbpdialog.prg
  * contrib/hbxbp/xbpspinbutton.prg
  * contrib/hbxbp/xbpdataref.prg
  * contrib/hbxbp/xbpgeneric.prg
    * Replaced remaining custom wrappers for HB_TRACE() calls
      with bare HB_TRACE() calls. This will make it easy to
      locate trace calls using a single 'grep'.
This commit is contained in:
Viktor Szakats
2010-04-11 14:53:10 +00:00
parent 7e23016eb0
commit ec3a62ba02
12 changed files with 61 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
harbour/ChangeLog
View File

@@ -17,6 +17,25 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-04-11 16:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbide/hbide.prg
* contrib/hbxbp/xbpwindow.prg
- Deleted few remaining reference for HBQT_GETMEMUSED().
* contrib/hbxbp/xbp.ch
* contrib/hbxbp/xbpsle.prg
* contrib/hbxbp/xbpbrowse.prg
* contrib/hbxbp/xbptabpage.prg
* contrib/hbxbp/xbpwindow.prg
* contrib/hbxbp/xbphtmlviewer.prg
* contrib/hbxbp/xbpdialog.prg
* contrib/hbxbp/xbpspinbutton.prg
* contrib/hbxbp/xbpdataref.prg
* contrib/hbxbp/xbpgeneric.prg
* Replaced remaining custom wrappers for HB_TRACE() calls
with bare HB_TRACE() calls. This will make it easy to
locate trace calls using a single 'grep'.
2010-04-11 15:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/qtgui/QInputContext.cpp
! Deleted hbqt_getmemused() reference.

4
harbour/contrib/hbide/hbide.prg
View File

@@ -571,7 +571,7 @@ HB_TRACE( HB_TR_ALWAYS, "HbIde:create( cProjIni )", "#Params=" )
/* Very important - destroy resources */
HB_TRACE( HB_TR_ALWAYS, "======================================================" )
HB_TRACE( HB_TR_ALWAYS, "Before ::oDlg:destroy()", memory( 1001 ), hbqt_getMemUsed() )
HB_TRACE( HB_TR_ALWAYS, "Before ::oDlg:destroy()", memory( 1001 ) )
HB_TRACE( HB_TR_ALWAYS, " " )
::oTM:destroy()
@@ -596,7 +596,7 @@ HB_TRACE( HB_TR_ALWAYS, "HbIde:create( cProjIni )", "#Params=" )
::oFont := NIL
HB_TRACE( HB_TR_ALWAYS, " " )
HB_TRACE( HB_TR_ALWAYS, "After ::oDlg:destroy()", memory( 1001 ), hbqt_getMemUsed() )
HB_TRACE( HB_TR_ALWAYS, "After ::oDlg:destroy()", memory( 1001 ) )
HB_TRACE( HB_TR_ALWAYS, "======================================================" )
RETURN self

7
harbour/contrib/hbxbp/xbp.ch
View File

@@ -6,15 +6,12 @@
/*----------------------------------------------------------------------*/
#include "hbqt.ch"
#include "hbtrace.ch"
#xtranslate HBXBP_DEBUG( [<x,...>] ) => HB_TRACE( HB_TR_DEBUG, <x> )
#xtranslate HBXBP_DBG( [<x,...>] ) => HB_TRACE( HB_TR_ALWAYS, <x> )
/*----------------------------------------------------------------------*/
#include "hbqt.ch"
#define HBXBP_EVENT_HANDLED 0
#define HBXBP_EVENT_UNHANDLED 1

8
harbour/contrib/hbxbp/xbpbrowse.prg
View File

@@ -752,7 +752,7 @@ METHOD XbpBrowse:exeBlock( nEvent, p1, p2, p3 )
LOCAL oWheelEvent, oMouseEvent, i, nRow, nRowPos, nCol, nColPos, oPoint
HB_SYMBOL_UNUSED( p2 )
//HBXBP_DEBUG( " XbpBrowse:exeblock:", nEvent, 0, memory( 1001 ) )
//HB_TRACE( HB_TR_DEBUG, " XbpBrowse:exeblock:", nEvent, 0, memory( 1001 ) )
DO CASE
CASE nEvent == 1 /* Keypress Event */
SetAppEvent( xbeP_Keyboard, XbpQKeyEventToAppEvent( p1 ), NIL, self )
@@ -1009,7 +1009,7 @@ METHOD handleEvent( nEvent, mp1, mp2 ) CLASS XbpBrowse
METHOD XbpBrowse:supplyInfo( nMode, nInfo, p2, p3 )
//HBXBP_DEBUG( 0, 'supplyInfo:', nMode, nInfo, memory( 1001 ) )
//HB_TRACE( HB_TR_DEBUG, 0, 'supplyInfo:', nMode, nInfo, memory( 1001 ) )
DO CASE
CASE nMode == 141 /* Main View Header|Data */
IF nInfo == HBQT_BRW_COLCOUNT
@@ -1251,7 +1251,7 @@ METHOD setCurrentIndex( lReset ) CLASS XbpBrowse
DEFAULT lReset TO .t.
//HBXBP_DEBUG( " setCurrentIndex ", 0, lReset, memory( 1001 ) )
//HB_TRACE( HB_TR_DEBUG, " setCurrentIndex ", 0, lReset, memory( 1001 ) )
IF lReset
::oDbfModel:reset() /* Important */
@@ -1267,7 +1267,7 @@ METHOD setCurrentIndex( lReset ) CLASS XbpBrowse
pIndex := ::oDbfModel:index( ::rowPos - 1, ::colPos - 1 )
::oTableView:setCurrentIndex( pIndex )
//HBXBP_DEBUG( " setCurrentIndex ", 1, lReset, memory( 1001 ) )
//HB_TRACE( HB_TR_DEBUG, " setCurrentIndex ", 1, lReset, memory( 1001 ) )
RETURN Self
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbxbp/xbpdataref.prg
View File

@@ -147,7 +147,7 @@ METHOD XbpDataRef:setData( xValue, mp2 )
HB_SYMBOL_UNUSED( mp2 )
//HBXBP_DEBUG( cClass +' '+ ::cargo +"..."+ IF(empty(xValue)," empty ",valtype(xValue)) )
//HB_TRACE( HB_TR_DEBUG, cClass +' '+ ::cargo +"..."+ IF(empty(xValue)," empty ",valtype(xValue)) )
IF hb_isBlock( ::dataLink )
::sl_editBuffer := eval( ::dataLink, xValue )

16
harbour/contrib/hbxbp/xbpdialog.prg
View File

@@ -243,10 +243,10 @@ METHOD XbpDialog:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, l
METHOD XbpDialog:destroy()
LOCAL qtObj
HBXBP_DBG( ". " )
HBXBP_DBG( ". " )
HBXBP_DBG( ". " )
HBXBP_DBG( "<<<<<<<<<< XbpDialog:destroy B >>>>>>>>>>" )
HB_TRACE( HB_TR_ALWAYS, ". " )
HB_TRACE( HB_TR_ALWAYS, ". " )
HB_TRACE( HB_TR_ALWAYS, ". " )
HB_TRACE( HB_TR_ALWAYS, "<<<<<<<<<< XbpDialog:destroy B >>>>>>>>>>" )
hbxbp_SetEventLoop( NIL )
::oEventLoop:exit( 0 )
@@ -262,10 +262,10 @@ METHOD XbpDialog:destroy()
qtObj:destroy()
ENDIF
HBXBP_DBG( "<<<<<<<<<< XbpDialog:destroy E >>>>>>>>>>" )
HBXBP_DBG( ". " )
HBXBP_DBG( ". " )
HBXBP_DBG( ". " )
HB_TRACE( HB_TR_ALWAYS, "<<<<<<<<<< XbpDialog:destroy E >>>>>>>>>>" )
HB_TRACE( HB_TR_ALWAYS, ". " )
HB_TRACE( HB_TR_ALWAYS, ". " )
HB_TRACE( HB_TR_ALWAYS, ". " )
RETURN Self

9
harbour/contrib/hbxbp/xbpgeneric.prg
View File

@@ -207,14 +207,14 @@ FUNCTION SetAppEvent( nEvent, mp1, mp2, oXbp )
t_nEventIn := 1
ENDIF
//HBXBP_DEBUG( 0, "SetAppEvent ... ", hb_threadId(), nEvent, xbeP_Paint )
//HB_TRACE( HB_TR_DEBUG, 0, "SetAppEvent ... ", hb_threadId(), nEvent, xbeP_Paint )
t_events[ t_nEventIn, 1 ] := nEvent
t_events[ t_nEventIn, 2 ] := mp1
t_events[ t_nEventIn, 3 ] := mp2
t_events[ t_nEventIn, 4 ] := oXbp
//HBXBP_DEBUG( 1, "SetAppEvent ... ", hb_threadId(), nEvent )
//HB_TRACE( HB_TR_DEBUG, 1, "SetAppEvent ... ", hb_threadId(), nEvent )
RETURN nil
/*----------------------------------------------------------------------*/
@@ -265,7 +265,7 @@ FUNCTION AppEvent( mp1, mp2, oXbp, nTimeout )
IF ++t_nEventOut > EVENT_BUFFER
t_nEventOut := 1
ENDIF
//HBXBP_DEBUG( " AppEvent ... ", nThreadID, t_nEventOut )
//HB_TRACE( HB_TR_DEBUG, " AppEvent ... ", nThreadID, t_nEventOut )
DO WHILE !empty( t_oEventLoop ) //.t.
t_oEventLoop:processEvents( QEventLoop_AllEvents )
@@ -284,7 +284,7 @@ FUNCTION AppEvent( mp1, mp2, oXbp, nTimeout )
s_hLastEvent[ nThreadID ] := { nEvent, mp1, mp2, oXbp }
//HBXBP_DEBUG( "..........................", hb_threadId() )
//HB_TRACE( HB_TR_DEBUG, "..........................", hb_threadId() )
RETURN nEvent
@@ -440,4 +440,3 @@ FUNCTION HbXbp_SetCodecForTr( cCodec )
RETURN NIL
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbxbp/xbphtmlviewer.prg
View File

@@ -227,7 +227,7 @@ METHOD XbpHTMLViewer:exeBlock( nEvent, p1 )
CASE nEvent == 7
CASE nEvent == 8
::cSelectedText := ::oWidget:selectedText()
HBXBP_DEBUG( ::cSelectedText )
HB_TRACE( HB_TR_DEBUG, ::cSelectedText )
CASE nEvent == 9
IF hb_isBlock( ::sl_statusTextChange )
eval( ::sl_statusTextChange, p1, NIL, Self )

2
harbour/contrib/hbxbp/xbpsle.prg
View File

@@ -197,7 +197,7 @@ METHOD XbpSLE:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVis
METHOD XbpSLE:exeBlock( nMsg, p1, p2 )
LOCAL lRet := .F.
//HBXBP_DEBUG( 'XbpSLE: '+hb_ntos( nMsg ) )
//HB_TRACE( HB_TR_DEBUG, 'XbpSLE: '+hb_ntos( nMsg ) )
HB_SYMBOL_UNUSED( p1 )
DO CASE

2
harbour/contrib/hbxbp/xbpspinbutton.prg
View File

@@ -157,7 +157,7 @@ METHOD XbpSpinButton:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible
#if 0 ////////////////////////////////////
::oWidget:installEventFilter( ::pEvents )
HBXBP_DEBUG( "XbpSpinButton:create 2" )
HB_TRACE( HB_TR_DEBUG, "XbpSpinButton:create 2" )
::connectEvent( ::pWidget, QEvent_FocusIn , {|e| ::exeBlock( 7, e ) } )
::connectEvent( ::pWidget, QEvent_FocusOut, {|e| ::exeBlock( 8, e ) } )
::connectEvent( ::pWidget, QEvent_KeyPress, {|e| ::exeBlock( 9, e ) } )

4
harbour/contrib/hbxbp/xbptabpage.prg
View File

@@ -315,13 +315,13 @@ METHOD XbpTabWidget:exeBlock( nMode, iIndex )
DO CASE
CASE nMode == 1
//HBXBP_DEBUG( "Tab Index Changed", nIndex )
//HB_TRACE( HB_TR_DEBUG, "Tab Index Changed", nIndex )
IF hb_isBlock( oTab:sl_tabActivate )
eval( oTab:sl_tabActivate, NIL, NIL, oTab )
ENDIF
CASE nMode == 2
//HBXBP_DEBUG( "Tab Close Requested", nIndex )
//HB_TRACE( HB_TR_DEBUG, "Tab Close Requested", nIndex )
IF hb_isBlock( oTab:sl_closeRequested )
eval( oTab:sl_closeRequested, NIL, NIL, oTab )
ENDIF

32
harbour/contrib/hbxbp/xbpwindow.prg
View File

@@ -403,13 +403,13 @@ METHOD XbpWindow:disconnect()
LOCAL e_
IF len( ::aConnections ) > 0
//HBXBP_DBG( " " )
//HB_TRACE( HB_TR_ALWAYS, " " )
FOR EACH e_ IN ::aConnections
::xDummy := Qt_Slots_DisConnect( ::pSlots, e_[ 1 ], e_[ 2 ] )
//HBXBP_DBG( ::xDummy, " Qt_Slots_DisConnect() ", e_[ 2 ] )
//HB_TRACE( HB_TR_ALWAYS, ::xDummy, " Qt_Slots_DisConnect() ", e_[ 2 ] )
NEXT
::aConnections := {}
//HBXBP_DBG( " " )
//HB_TRACE( HB_TR_ALWAYS, " " )
ENDIF
RETURN Self
@@ -421,9 +421,9 @@ METHOD XbpWindow:connectEvent( pWidget, nEvent, bBlock )
IF ( lSuccess := Qt_Events_Connect( ::pEvents, pWidget, nEvent, bBlock ) )
aadd( ::aEConnections, { pWidget, nEvent } )
// HBXBP_DBG( "XbpWindow:connectEvent", nEvent, "Succeeded" )
// HB_TRACE( HB_TR_ALWAYS, "XbpWindow:connectEvent", nEvent, "Succeeded" )
ELSE
HBXBP_DBG( "XbpWindow:connectEvent", nEvent, "Failed" )
HB_TRACE( HB_TR_ALWAYS, "XbpWindow:connectEvent", nEvent, "Failed" )
ENDIF
RETURN lSuccess
@@ -475,14 +475,14 @@ METHOD XbpWindow:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible
METHOD XbpWindow:destroy()
LOCAL e_
#if 0
HBXBP_DBG( ". " )
HBXBP_DBG( ". " )
HBXBP_DBG( ". " )
HBXBP_DBG( hb_threadId(),"Destroy[ B ] "+pad(cCls,12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ), hbqt_getMemUsed() )
HB_TRACE( HB_TR_ALWAYS, ". " )
HB_TRACE( HB_TR_ALWAYS, ". " )
HB_TRACE( HB_TR_ALWAYS, ". " )
HB_TRACE( HB_TR_ALWAYS, hb_threadId(),"Destroy[ B ] "+pad(cCls,12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ) )
LOCAL cCls := __ObjGetClsName( self ), cMsg
cMsg := iif( cCls == "XBPWINDOW", ::oWidget:objectName(), IF( empty(::cargo),'',str(::cargo) ) )
HBXBP_DBG( hb_threadId(),"Destroy[ B ] "+pad(cCls,12)+ cMsg, memory( 1001 ), hbqt_getMemUsed() )
HB_TRACE( HB_TR_ALWAYS, hb_threadId(),"Destroy[ B ] "+pad(cCls,12)+ cMsg, memory( 1001 ) )
#endif
::oParent := NIL
::oOwner := NIL
@@ -516,12 +516,12 @@ HBXBP_DBG( hb_threadId(),"Destroy[ B ] "+pad(cCls,12)+ cMsg, memory( 1001 ), hbq
::oWidget := NIL
#if 0
HBXBP_DBG( hb_threadId(),"Destroy[ E ] "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ), hbqt_getMemUsed() )
HB_TRACE( HB_TR_ALWAYS, hb_threadId(),"Destroy[ E ] "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ) )
HBXBP_DBG( ". " )
HBXBP_DBG( ". " )
HBXBP_DBG( ". " )
HBXBP_DBG( hb_threadId(),"Destroy[ E ] "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ), hbqt_getMemUsed() )
HB_TRACE( HB_TR_ALWAYS, ". " )
HB_TRACE( HB_TR_ALWAYS, ". " )
HB_TRACE( HB_TR_ALWAYS, ". " )
HB_TRACE( HB_TR_ALWAYS, hb_threadId(),"Destroy[ E ] "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ) )
#endif
RETURN NIL
@@ -581,7 +581,7 @@ METHOD XbpWindow:grabEvent( nEvent, pEvent )
LOCAL oEvent, nXbpKey, oP0, oP1, oObj_O, oObj_N
LOCAL lRet := .t.
//HBXBP_DEBUG( hb_threadId(), "XbpWindow:grabEvent", nEvent )
//HB_TRACE( HB_TR_DEBUG, hb_threadId(), "XbpWindow:grabEvent", nEvent )
SWITCH ( nEvent )