diff --git a/harbour/contrib/hbqt/qth/QPen.qth b/harbour/contrib/hbqt/qth/QPen.qth index a86d5cc795..206cc6a058 100644 --- a/harbour/contrib/hbqt/qth/QPen.qth +++ b/harbour/contrib/hbqt/qth/QPen.qth @@ -110,11 +110,11 @@ HB_FUNC( QT_QPEN ) } else if( hb_pcount() >= 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QPen* ) new QPen( *hbqt_par_QBrush( 1 ), hb_parnd( 2 ), - HB_ISNUM( 3 ) ? ( Qt::PenStyle ) hb_parni( 3 ) : Qt::SolidLine, - HB_ISNUM( 4 ) ? ( Qt::PenCapStyle ) hb_parni( 4 ) : Qt::SquareCap, - HB_ISNUM( 5 ) ? ( Qt::PenJoinStyle ) hb_parni( 5 ) : Qt::BevelJoin - ) ); + Qt::PenStyle iStyle = HB_ISNUM( 3 ) ? ( Qt::PenStyle ) hb_parni( 3 ) : Qt::SolidLine; + Qt::PenCapStyle iCap = HB_ISNUM( 4 ) ? ( Qt::PenCapStyle ) hb_parni( 4 ) : Qt::SquareCap; + Qt::PenJoinStyle iJoin = HB_ISNUM( 5 ) ? ( Qt::PenJoinStyle ) hb_parni( 5 ) : Qt::BevelJoin; + + hb_retptr( ( QPen* ) new QPen( *hbqt_par_QBrush( 1 ), hb_parnd( 2 ), iStyle, iCap, iJoin ) ); } else { diff --git a/harbour/contrib/hbqt/qth/QPrintPreviewDialog.qth b/harbour/contrib/hbqt/qth/QPrintPreviewDialog.qth index 5879b31667..36743ce2f0 100644 --- a/harbour/contrib/hbqt/qth/QPrintPreviewDialog.qth +++ b/harbour/contrib/hbqt/qth/QPrintPreviewDialog.qth @@ -71,11 +71,9 @@ New = pParent, nFlags HB_FUNC( QT_QPRINTPREVIEWDIALOG ) { if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - hb_retptr( ( QPrintPreviewDialog* ) new QPrintPreviewDialog( hbqt_par_QPrinter( 1 ), - hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ) ); + hb_retptr( new QPrintPreviewDialog( hbqt_par_QPrinter( 1 ), hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ) ); else - hb_retptr( ( QPrintPreviewDialog* ) new QPrintPreviewDialog( hbqt_par_QWidget( 1 ), - ( Qt::WindowFlags ) hb_parni( 2 ) ) ); + hb_retptr( new QPrintPreviewDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); } diff --git a/harbour/contrib/hbqt/qth/QRegion.qth b/harbour/contrib/hbqt/qth/QRegion.qth index f7323cd930..be03991ba5 100644 --- a/harbour/contrib/hbqt/qth/QRegion.qth +++ b/harbour/contrib/hbqt/qth/QRegion.qth @@ -90,15 +90,13 @@ HB_FUNC( QT_QREGION ) } else if( hb_pcount() >= 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QRegion* ) new QRegion( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), - HB_ISNUM( 5 ) ? ( QRegion::RegionType ) hb_parni( 5 ) : QRegion::Rectangle ) ); + hb_retptr( ( QRegion* ) new QRegion( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), HB_ISNUM( 5 ) ? ( QRegion::RegionType ) hb_parni( 5 ) : QRegion::Rectangle ) ); } else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { if( ( QString ) "QPolygon" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QPolygon( 2 ), - HB_ISNUM( 3 ) ? ( Qt::FillRule ) hb_parni( 3 ) : Qt::OddEvenFill ) ); + hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QPolygon( 2 ), HB_ISNUM( 3 ) ? ( Qt::FillRule ) hb_parni( 3 ) : Qt::OddEvenFill ) ); } else if( ( QString ) "QBitmap" == hbqt_par_QString( 1 ) ) { @@ -106,8 +104,7 @@ HB_FUNC( QT_QREGION ) } else if( ( QString ) "QRect" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QRect( 2 ), - HB_ISNUM( 3 ) ? ( QRegion::RegionType ) hb_parni( 3 ) : QRegion::Rectangle ) ); + hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QRect( 2 ), HB_ISNUM( 3 ) ? ( QRegion::RegionType ) hb_parni( 3 ) : QRegion::Rectangle ) ); } else { diff --git a/harbour/contrib/hbqt/qth/QTextStream.qth b/harbour/contrib/hbqt/qth/QTextStream.qth index fbcc3ec740..77b7e5bfd7 100644 --- a/harbour/contrib/hbqt/qth/QTextStream.qth +++ b/harbour/contrib/hbqt/qth/QTextStream.qth @@ -74,8 +74,7 @@ New = cText, nIOMode */ HB_FUNC( QT_QTEXTSTREAM ) { - hb_retptr( ( QTextStream* ) new QTextStream( hb_parcx( 1 ), - ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) ); + hb_retptr( new QTextStream( hb_parcx( 1 ), ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) ); } /* * QChar padChar () const