From 701638b52ca6d44e78f7a8bfe619dc19edef170e Mon Sep 17 00:00:00 2001
From: Pritpal Bedi <bedipritpal@hotmail.com>
Date: Tue, 5 Apr 2011 13:59:17 +0000
Subject: [PATCH] 2011-04-05 06:56 UTC-0800 Pritpal Bedi
 (bedipritpal@hotmail.com)   * contrib/hbide/hbqreportsmanager.prg   *
 contrib/hbide/hbqtoolbar.prg     ! Removed: some tracelogs.

  * contrib/hbqt/qtgui/qth/QBoxLayout.qth
    ! Detached: one child.
  * contrib/hbqt/qtgui/qth/QLabel.qth
    ! Improved: constructor to accept a string also.
---
 harbour/ChangeLog                             | 10 ++++++++++
 harbour/contrib/hbide/hbqreportsmanager.prg   |  1 -
 harbour/contrib/hbide/hbqtoolbar.prg          |  2 --
 harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth |  2 +-
 harbour/contrib/hbqt/qtgui/qth/QLabel.qth     |  9 ++++++++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0c841f714b..abf8e53eec 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-04-05 06:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbide/hbqreportsmanager.prg
+  * contrib/hbide/hbqtoolbar.prg
+    ! Removed: some tracelogs.
+
+  * contrib/hbqt/qtgui/qth/QBoxLayout.qth
+    ! Detached: one child.
+  * contrib/hbqt/qtgui/qth/QLabel.qth
+    ! Improved: constructor to accept a string also.
+
 2011-04-05 15:33 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/vm/hvm.c
     ! fixed missing write unreferencing in my last modification
diff --git a/harbour/contrib/hbide/hbqreportsmanager.prg b/harbour/contrib/hbide/hbqreportsmanager.prg
index 7e733282f6..2590686e51 100644
--- a/harbour/contrib/hbide/hbqreportsmanager.prg
+++ b/harbour/contrib/hbide/hbqreportsmanager.prg
@@ -2434,7 +2434,6 @@ METHOD HqrGraphicsItem:drawChord( qPainter, qRectF )
 /*----------------------------------------------------------------------*/
 
 METHOD HqrGraphicsItem:drawText( qPainter, qRectF )
-HB_TRACE( HB_TR_ALWAYS, qRectF:className(), ::textFlags(), ::text() )
    qPainter:drawText( qRectF, ::textFlags(), ::text() )
    RETURN Self
 
diff --git a/harbour/contrib/hbide/hbqtoolbar.prg b/harbour/contrib/hbide/hbqtoolbar.prg
index 683f6ca829..119b1de1fc 100644
--- a/harbour/contrib/hbide/hbqtoolbar.prg
+++ b/harbour/contrib/hbide/hbqtoolbar.prg
@@ -211,9 +211,7 @@ METHOD HbqToolbar:execEvent( cEvent, p, p1 )
          ::qDrag:setPixmap( ::qPix )
          ::qDrag:setHotSpot( QPoint( 15,15 ) )
          ::qDrag:setDragCursor( ::qPix, Qt_CopyAction + Qt_IgnoreAction )
-HB_TRACE( HB_TR_DEBUG, "..............................0" )
          ::qDropAction := ::qDrag:exec( Qt_CopyAction + Qt_IgnoreAction )  /* Why this is not terminated GPF's */
-HB_TRACE( HB_TR_DEBUG, "..............................1" )
 
          ::qDrag := NIL
          ::qPos  := NIL
diff --git a/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth
index f421628c7d..f275ac92a3 100644
--- a/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth
+++ b/harbour/contrib/hbqt/qtgui/qth/QBoxLayout.qth
@@ -40,7 +40,7 @@ void addSpacerItem ( QSpacerItem * spacerItem )        [*D=1*]
 void addSpacing ( int size )
 void addStretch ( int stretch = 0 )
 void addStrut ( int size )
-void addWidget ( QWidget * widget, int stretch = 0, Qt::Alignment alignment = 0 ) 
+void addWidget ( QWidget * widget, int stretch = 0, Qt::Alignment alignment = 0 )    [*D=1*]
 Direction direction () const
 void insertLayout ( int index, QLayout * layout, int stretch = 0 )
 void insertSpacerItem ( int index, QSpacerItem * spacerItem )
diff --git a/harbour/contrib/hbqt/qtgui/qth/QLabel.qth b/harbour/contrib/hbqt/qtgui/qth/QLabel.qth
index c32f5b434c..af9f4dfae1 100644
--- a/harbour/contrib/hbqt/qtgui/qth/QLabel.qth
+++ b/harbour/contrib/hbqt/qtgui/qth/QLabel.qth
@@ -28,7 +28,14 @@ New      = pParent, nFlags
  */
 HB_FUNC( QT_QLABEL )
 {
-   __HB_RETPTRGC__( new QLabel( hbqt_par_QWidget( 1 ), HB_ISNUM( 2 ) ? ( Qt::WindowFlags ) hb_parni( 2 ) : ( Qt::WindowFlags ) 0 ) );
+   if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) )
+   {
+      __HB_RETPTRGC__( new QLabel( hbqt_par_QString( 1 ), ( HB_ISOBJECT( 2 ) ? hbqt_par_QWidget( 2 ) : 0 ), HB_ISNUM( 3 ) ? ( Qt::WindowFlags ) hb_parni( 3 ) : ( Qt::WindowFlags ) 0 ) );
+   }
+   else
+   {
+      __HB_RETPTRGC__( new QLabel( ( HB_ISOBJECT( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ), HB_ISNUM( 2 ) ? ( Qt::WindowFlags ) hb_parni( 2 ) : ( Qt::WindowFlags ) 0 ) );
+   }
 }
 </CODE>