From 3d890a92dadd4122dce85cf2c9dd97c0831d625a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 1 Feb 2012 14:42:07 +0000 Subject: [PATCH] 2012-02-01 00:50 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbxbp/xbpgeneric.prg * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp * contrib/hbide/hbqreportsmanager.prg ! neverending cleanup of HB_TR_ALWAYS debug lines * contrib/hbxbp/xbp.ch * contrib/hbide/hbide.ch + solution to end the neverending cleanup of HB_TR_ALWAYS debug lines ; NOTE: use debug msgs as described in INSTALL --- harbour/ChangeLog | 13 ++++++++++++- harbour/contrib/hbide/hbide.ch | 3 +++ harbour/contrib/hbide/hbqreportsmanager.prg | 3 --- .../contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp | 5 ++--- harbour/contrib/hbxbp/xbp.ch | 3 +++ harbour/contrib/hbxbp/xbpgeneric.prg | 7 ------- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1e812cee38..e10f1b8a25 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,9 +16,20 @@ The license applies to all entries newer than 2009-04-28. */ +2012-02-01 00:50 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbxbp/xbpgeneric.prg + * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp + * contrib/hbide/hbqreportsmanager.prg + ! neverending cleanup of HB_TR_ALWAYS debug lines + + * contrib/hbxbp/xbp.ch + * contrib/hbide/hbide.ch + + solution to end the neverending cleanup of HB_TR_ALWAYS debug lines + ; NOTE: use debug msgs as described in INSTALL + 2012-01-31 17:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp - ! Fixed: a long standing mis-behavior where K_END was not + ! Fixed: a long standing mis-behavior where K_END was not working as expected in column-selection mode. 2012-02-01 00:50 UTC+0100 Viktor Szakats (harbour syenar.net) diff --git a/harbour/contrib/hbide/hbide.ch b/harbour/contrib/hbide/hbide.ch index a8fd0e5a19..e1ca377f5f 100644 --- a/harbour/contrib/hbide/hbide.ch +++ b/harbour/contrib/hbide/hbide.ch @@ -54,6 +54,9 @@ #include "hbtrace.ch" +#undef HB_TR_ALWAYS +#define HB_TR_ALWAYS HB_TR_DEBUG + #define UI_MODE_FUNC 0 #define UI_MODE_UIC 1 #define UI_MODE_UI 2 diff --git a/harbour/contrib/hbide/hbqreportsmanager.prg b/harbour/contrib/hbide/hbqreportsmanager.prg index 499f52d65b..312462ef64 100644 --- a/harbour/contrib/hbide/hbqreportsmanager.prg +++ b/harbour/contrib/hbide/hbqreportsmanager.prg @@ -1554,10 +1554,8 @@ METHOD HbqReportsManager:printPreview( qPrinter ) #if 0 qInfo := QPrinterInfo( qPrinter ) qList := qInfo:availablePrinters() -HB_TRACE( HB_TR_ALWAYS, 201 ) FOR i := 0 TO qList:size() - 1 qStr := qList:at( i ) -HB_TRACE( HB_TR_ALWAYS, qList:at( i ), valtype( qList:at( i ) ), qStr:printerName() ) NEXT #endif qPrinter:setOutputFormat( QPrinter_PdfFormat ) @@ -1566,7 +1564,6 @@ HB_TRACE( HB_TR_ALWAYS, qList:at( i ), valtype( qList:at( i ) ), qStr:printerNam // qPrinter:setFullPage( .t. ) qDlg := QPrintPreviewDialog( qPrinter, ::qView ) -HB_TRACE( HB_TR_ALWAYS, 290101 ) qDlg:connect( "paintRequested(QPrinter*)", {|p| ::paintRequested( p ) } ) qDlg:setWindowTitle( "HBReportGenerator : " + iif( !empty( ::cSaved ), ::cSaved, "Untitled" ) ) diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp index aec4649ec1..0115499f08 100644 --- a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp +++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp @@ -1012,7 +1012,6 @@ bool HBQPlainTextEdit::hbKeyPressSelectionByApplication( QKeyEvent * event ) } else if( selectionMode == selectionMode_column ) { -HB_TRACE( HB_TR_ALWAYS, ( "HAHAHAHAHAH" ) ); switch( k ) { case Qt::Key_Right: @@ -1054,7 +1053,7 @@ HB_TRACE( HB_TR_ALWAYS, ( "HAHAHAHAHAH" ) ); QPlainTextEdit::keyPressEvent( event ); columnEnds = textCursor().columnNumber(); break; -#if 0 +#if 0 QTextCursor c( textCursor() ); c.movePosition( QTextCursor::EndOfLine, QTextCursor::MoveAnchor ); if( c.columnNumber() <= columnEnds ) @@ -1067,7 +1066,7 @@ HB_TRACE( HB_TR_ALWAYS, ( "HAHAHAHAHAH" ) ); event->ignore(); } break; -#endif +#endif } case Qt::Key_Up: case Qt::Key_PageUp: diff --git a/harbour/contrib/hbxbp/xbp.ch b/harbour/contrib/hbxbp/xbp.ch index 80ff4b9fd4..0b9dfc5365 100644 --- a/harbour/contrib/hbxbp/xbp.ch +++ b/harbour/contrib/hbxbp/xbp.ch @@ -11,6 +11,9 @@ #include "hbtrace.ch" +#undef HB_TR_ALWAYS +#define HB_TR_ALWAYS HB_TR_DEBUG + /*----------------------------------------------------------------------*/ #define HBXBP_EVENT_HANDLED 0 diff --git a/harbour/contrib/hbxbp/xbpgeneric.prg b/harbour/contrib/hbxbp/xbpgeneric.prg index 36e0ffe4da..25a12f4d3c 100644 --- a/harbour/contrib/hbxbp/xbpgeneric.prg +++ b/harbour/contrib/hbxbp/xbpgeneric.prg @@ -290,12 +290,7 @@ PROCEDURE SetAppEvent( nEvent, mp1, mp2, oXbp ) IF !empty( t_events[ nEventIn, 4 ] ) hb_ains( t_events, nEventIn, { nEvent, mp1, mp2, ooXbp }, .t. ) - - HB_TRACE( HB_TR_ALWAYS, "................t_nEventIn", 0, nEventIn ) - ELSE - HB_TRACE( HB_TR_ALWAYS, "................t_nEventIn", 1, nEventIn ) - t_events[ nEventIn, 1 ] := nEvent t_events[ nEventIn, 2 ] := mp1 t_events[ nEventIn, 3 ] := mp2 @@ -318,8 +313,6 @@ FUNCTION AppEvent( mp1, mp2, oXbp, nTimeout ) t_nEventOut := 1 ENDIF - HB_TRACE( HB_TR_ALWAYS, "t_nEventOut", t_nEventOut ) - //DO WHILE ! empty( t_oEventLoop ) t_oEventLoop:processEvents( QEventLoop_AllEvents )