From 8f0476314e6f4b0e5f144787ce5d110a84bceb7b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 21 Dec 2009 01:51:02 +0000 Subject: [PATCH] 2009-12-21 02:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/hbqt.ch * contrib/hbxbp/xbp.ch + Using HB_TRACE() macro. This means that now .prg level trace messages have to be enabled the standard way, __HB_DEBUG__ has no meaning anymore. * contrib/hbwin/tests/testwmtx.prg - Deleted some bits added by me as per Xavi's suggestions. --- harbour/ChangeLog | 12 +++++++++++- harbour/contrib/hbqt/hbqt.ch | 15 ++++++++++----- harbour/contrib/hbwin/tests/testwmtx.prg | 5 ++--- harbour/contrib/hbxbp/xbp.ch | 10 +++++----- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 32c3c6d771..d4c3b7cd46 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,10 +17,20 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-21 02:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/hbqt.ch + * contrib/hbxbp/xbp.ch + + Using HB_TRACE() macro. This means that now .prg level + trace messages have to be enabled the standard way, __HB_DEBUG__ + has no meaning anymore. + + * contrib/hbwin/tests/testwmtx.prg + - Deleted some bits added by me as per Xavi's suggestions. + 2009-12-21 00:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/hbextern.ch + Added new trace functions. - ; TODO: Use these new functions in HBQT, HBXBP. + ; TODO: Use these new functions in HBQT, HBXBP. [DONE] * contrib/hbwin/win_dll.c ! Fix for OpenWatcom. Seems to require LPVOID in asm code. diff --git a/harbour/contrib/hbqt/hbqt.ch b/harbour/contrib/hbqt/hbqt.ch index 511f6155fd..c1c30ab74f 100644 --- a/harbour/contrib/hbqt/hbqt.ch +++ b/harbour/contrib/hbqt/hbqt.ch @@ -67,14 +67,19 @@ #ifndef _HBQT_CH -#if defined( __HB_DEBUG__ ) - #xtranslate HBQT_DEBUG( [] ) => hb_TraceString( ) -#else - #xtranslate HBQT_DEBUG( [] ) => iif( .T.,, ) -#endif +/*----------------------------------------------------------------------*/ +#include "hbtrace.ch" + +#xtranslate HBQT_DEBUG( [] ) => HB_TRACE( HB_TR_DEBUG, ) + +/*----------------------------------------------------------------------*/ + +/* Retained for compatibility */ #define QT_PTROF( oObj ) ( oObj ) +/*----------------------------------------------------------------------*/ + #define HBQT_RELEASE_WITH_DELETE 0 // Release the QObject with delete operator #define HBQT_RELEASE_WITH_DESTRUTOR 1 // Release the QObject with his destructor #define HBQT_RELEASE_WITH_DELETE_LATER 2 // Release the QObject with deleteLater() slot diff --git a/harbour/contrib/hbwin/tests/testwmtx.prg b/harbour/contrib/hbwin/tests/testwmtx.prg index 2d83716891..4f52a43ff6 100644 --- a/harbour/contrib/hbwin/tests/testwmtx.prg +++ b/harbour/contrib/hbwin/tests/testwmtx.prg @@ -13,11 +13,10 @@ PROCEDURE Main() s_hMutex := wapi_CreateMutex( NIL, NIL, cAppName ) IF ! Empty( s_hMutex ) .AND. wapi_GetLastError() == 0 ? cAppName, "=> Hello World! OK." - WAIT - wapi_ReleaseMutex( s_hMutex ) ELSE ? cAppName, "=> Application is running. Error", wapi_GetLastError() - WAIT ENDIF + WAIT + RETURN diff --git a/harbour/contrib/hbxbp/xbp.ch b/harbour/contrib/hbxbp/xbp.ch index f3ab8a75a2..256e627862 100644 --- a/harbour/contrib/hbxbp/xbp.ch +++ b/harbour/contrib/hbxbp/xbp.ch @@ -4,11 +4,11 @@ #ifndef _XBP_CH -#if defined( __HB_DEBUG__ ) - #xtranslate HBXBP_DEBUG( [] ) => hb_TraceString( ) -#else - #xtranslate HBXBP_DEBUG( [] ) => iif( .T.,, ) -#endif +/*----------------------------------------------------------------------*/ + +#include "hbtrace.ch" + +#xtranslate HBXBP_DEBUG( [] ) => HB_TRACE( HB_TR_DEBUG, ) /*----------------------------------------------------------------------*/