From e223dff7e866c7223d9f0a8925e6d8d671366c01 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 17 Aug 2009 04:48:18 +0000 Subject: [PATCH] 2009-08-16 21:44 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/hbqt_slots.cpp * contrib/hbqt/QColor.cpp * contrib/hbqt/QFont.cpp * contrib/hbqt/QKeyEvent.cpp * contrib/hbqt/QMouseEvent.cpp * contrib/hbqt/QMoveEvent.cpp * contrib/hbqt/QPoint.cpp * contrib/hbqt/QRect.cpp * contrib/hbqt/QRectF.cpp * contrib/hbqt/QRegion.cpp * contrib/hbqt/QSize.cpp * contrib/hbqt/QSizeF.cpp * contrib/hbqt/qth/QColor.qth * contrib/hbqt/qth/QFont.qth * contrib/hbqt/qth/QKeyEvent.qth * contrib/hbqt/qth/QMouseEvent.qth * contrib/hbqt/qth/QMoveEvent.qth * contrib/hbqt/qth/QPoint.qth * contrib/hbqt/qth/QRect.qth * contrib/hbqt/qth/QRectF.qth * contrib/hbqt/qth/QRegion.qth * contrib/hbqt/qth/QSize.qth * contrib/hbqt/qth/QSizeF.qth ! Tweaked some definitions. --- harbour/ChangeLog | 29 ++++++++++++++++++++++++ harbour/contrib/hbqt/QColor.cpp | 3 ++- harbour/contrib/hbqt/QFont.cpp | 3 ++- harbour/contrib/hbqt/QKeyEvent.cpp | 3 ++- harbour/contrib/hbqt/QMouseEvent.cpp | 3 ++- harbour/contrib/hbqt/QMoveEvent.cpp | 3 ++- harbour/contrib/hbqt/QPoint.cpp | 3 ++- harbour/contrib/hbqt/QRect.cpp | 3 ++- harbour/contrib/hbqt/QRectF.cpp | 3 ++- harbour/contrib/hbqt/QRegion.cpp | 3 ++- harbour/contrib/hbqt/QSize.cpp | 3 ++- harbour/contrib/hbqt/QSizeF.cpp | 3 ++- harbour/contrib/hbqt/hbqt_slots.cpp | 8 +++++-- harbour/contrib/hbqt/qth/QColor.qth | 1 + harbour/contrib/hbqt/qth/QFont.qth | 1 + harbour/contrib/hbqt/qth/QKeyEvent.qth | 1 + harbour/contrib/hbqt/qth/QMouseEvent.qth | 1 + harbour/contrib/hbqt/qth/QMoveEvent.qth | 1 + harbour/contrib/hbqt/qth/QPoint.qth | 1 + harbour/contrib/hbqt/qth/QRect.qth | 1 + harbour/contrib/hbqt/qth/QRectF.qth | 1 + harbour/contrib/hbqt/qth/QRegion.qth | 1 + harbour/contrib/hbqt/qth/QSize.qth | 1 + harbour/contrib/hbqt/qth/QSizeF.qth | 1 + 24 files changed, 68 insertions(+), 13 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 072e5e5331..bfc0957af9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,35 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-16 21:44 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbqt/hbqt_slots.cpp + + * contrib/hbqt/QColor.cpp + * contrib/hbqt/QFont.cpp + * contrib/hbqt/QKeyEvent.cpp + * contrib/hbqt/QMouseEvent.cpp + * contrib/hbqt/QMoveEvent.cpp + * contrib/hbqt/QPoint.cpp + * contrib/hbqt/QRect.cpp + * contrib/hbqt/QRectF.cpp + * contrib/hbqt/QRegion.cpp + * contrib/hbqt/QSize.cpp + * contrib/hbqt/QSizeF.cpp + + * contrib/hbqt/qth/QColor.qth + * contrib/hbqt/qth/QFont.qth + * contrib/hbqt/qth/QKeyEvent.qth + * contrib/hbqt/qth/QMouseEvent.qth + * contrib/hbqt/qth/QMoveEvent.qth + * contrib/hbqt/qth/QPoint.qth + * contrib/hbqt/qth/QRect.qth + * contrib/hbqt/qth/QRectF.qth + * contrib/hbqt/qth/QRegion.qth + * contrib/hbqt/qth/QSize.qth + * contrib/hbqt/qth/QSizeF.qth + + ! Tweaked some definitions. + 2009-08-16 10:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.cf + Package creation now only works if run from Harbour source root. diff --git a/harbour/contrib/hbqt/QColor.cpp b/harbour/contrib/hbqt/QColor.cpp index 1b1c87139b..303723efc8 100644 --- a/harbour/contrib/hbqt/QColor.cpp +++ b/harbour/contrib/hbqt/QColor.cpp @@ -75,6 +75,7 @@ QColor ( Qt::GlobalColor color ) QColor ( const QString & name ) QColor ( const char * name ) QColor ( const QColor & color ) +~QColor () */ HB_FUNC( QT_QCOLOR ) { @@ -120,7 +121,7 @@ HB_FUNC( QT_QCOLOR ) */ HB_FUNC( QT_QCOLOR_DESTROY ) { - + hbqt_par_QColor( 1 )->~QColor(); } /* diff --git a/harbour/contrib/hbqt/QFont.cpp b/harbour/contrib/hbqt/QFont.cpp index 4025250541..bc2a8085d3 100644 --- a/harbour/contrib/hbqt/QFont.cpp +++ b/harbour/contrib/hbqt/QFont.cpp @@ -79,6 +79,7 @@ * QFont ( const QString & family, int pointSize = -1, int weight = -1, bool italic = false ) * QFont ( const QFont & font, QPaintDevice * pd ) * QFont ( const QFont & font ) + * ~QFont () */ HB_FUNC( QT_QFONT ) { @@ -117,7 +118,7 @@ HB_FUNC( QT_QFONT ) */ HB_FUNC( QT_QFONT_DESTROY ) { - + hbqt_par_QFont( 1 )->~QFont(); } /* diff --git a/harbour/contrib/hbqt/QKeyEvent.cpp b/harbour/contrib/hbqt/QKeyEvent.cpp index b147dae75b..d92c4c6e78 100644 --- a/harbour/contrib/hbqt/QKeyEvent.cpp +++ b/harbour/contrib/hbqt/QKeyEvent.cpp @@ -66,6 +66,7 @@ /* * QKeyEvent ( Type type, int key, Qt::KeyboardModifiers modifiers, const QString & text = QString(), bool autorep = false, ushort count = 1 ) + * ~QKeyEvent () */ HB_FUNC( QT_QKEYEVENT ) { @@ -77,7 +78,7 @@ HB_FUNC( QT_QKEYEVENT ) */ HB_FUNC( QT_QKEYEVENT_DESTROY ) { - + hbqt_par_QKeyEvent( 1 )->~QKeyEvent(); } /* diff --git a/harbour/contrib/hbqt/QMouseEvent.cpp b/harbour/contrib/hbqt/QMouseEvent.cpp index 31aea5a03d..6bb7106b49 100644 --- a/harbour/contrib/hbqt/QMouseEvent.cpp +++ b/harbour/contrib/hbqt/QMouseEvent.cpp @@ -67,6 +67,7 @@ /* * QMouseEvent ( Type type, const QPoint & position, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers ) * QMouseEvent ( Type type, const QPoint & pos, const QPoint & globalPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers ) + * ~QMouseEvent () */ HB_FUNC( QT_QMOUSEEVENT ) { @@ -78,7 +79,7 @@ HB_FUNC( QT_QMOUSEEVENT ) */ HB_FUNC( QT_QMOUSEEVENT_DESTROY ) { - + hbqt_par_QMouseEvent( 1 )->~QMouseEvent(); } /* diff --git a/harbour/contrib/hbqt/QMoveEvent.cpp b/harbour/contrib/hbqt/QMoveEvent.cpp index f29a054ad3..221e02b871 100644 --- a/harbour/contrib/hbqt/QMoveEvent.cpp +++ b/harbour/contrib/hbqt/QMoveEvent.cpp @@ -66,6 +66,7 @@ /* * QMoveEvent ( const QPoint & pos, const QPoint & oldPos ) + * ~QMoveEvent () */ HB_FUNC( QT_QMOVEEVENT ) { @@ -77,7 +78,7 @@ HB_FUNC( QT_QMOVEEVENT ) */ HB_FUNC( QT_QMOVEEVENT_DESTROY ) { - + hbqt_par_QMoveEvent( 1 )->~QMoveEvent(); } /* diff --git a/harbour/contrib/hbqt/QPoint.cpp b/harbour/contrib/hbqt/QPoint.cpp index 8299ade745..ab4a3bf29e 100644 --- a/harbour/contrib/hbqt/QPoint.cpp +++ b/harbour/contrib/hbqt/QPoint.cpp @@ -67,6 +67,7 @@ /* * QPoint () * QPoint ( int x, int y ) + * ~QPoint () */ HB_FUNC( QT_QPOINT ) { @@ -89,7 +90,7 @@ HB_FUNC( QT_QPOINT ) */ HB_FUNC( QT_QPOINT_DESTROY ) { - + hbqt_par_QPoint( 1 )->~QPoint(); } /* diff --git a/harbour/contrib/hbqt/QRect.cpp b/harbour/contrib/hbqt/QRect.cpp index c4659ff6b1..f134a828f5 100644 --- a/harbour/contrib/hbqt/QRect.cpp +++ b/harbour/contrib/hbqt/QRect.cpp @@ -69,6 +69,7 @@ * QRect ( const QPoint & topLeft, const QPoint & bottomRight ) * QRect ( const QPoint & topLeft, const QSize & size ) * QRect ( int x, int y, int width, int height ) + * ~QRect () */ HB_FUNC( QT_QRECT ) { @@ -95,7 +96,7 @@ HB_FUNC( QT_QRECT ) */ HB_FUNC( QT_QRECT_DESTROY ) { - + hbqt_par_QRect( 1 )->~QRect(); } /* diff --git a/harbour/contrib/hbqt/QRectF.cpp b/harbour/contrib/hbqt/QRectF.cpp index df34076705..74a715890d 100644 --- a/harbour/contrib/hbqt/QRectF.cpp +++ b/harbour/contrib/hbqt/QRectF.cpp @@ -70,6 +70,7 @@ * QRectF ( const QPointF & topLeft, const QPointF & bottomRight ) * QRectF ( qreal x, qreal y, qreal width, qreal height ) * QRectF ( const QRect & rectangle ) + * ~QRectF () */ HB_FUNC( QT_QRECTF ) { @@ -96,7 +97,7 @@ HB_FUNC( QT_QRECTF ) */ HB_FUNC( QT_QRECTF_DESTROY ) { - + hbqt_par_QRectF( 1 )->~QRectF(); } /* diff --git a/harbour/contrib/hbqt/QRegion.cpp b/harbour/contrib/hbqt/QRegion.cpp index da3956d174..3c9dcf7d5f 100644 --- a/harbour/contrib/hbqt/QRegion.cpp +++ b/harbour/contrib/hbqt/QRegion.cpp @@ -88,6 +88,7 @@ * QRegion ( const QRegion & r ) * QRegion ( const QBitmap & bm ) * QRegion ( const QRect & r, RegionType t = Rectangle ) + * ~QRegion () */ HB_FUNC( QT_QREGION ) { @@ -136,7 +137,7 @@ HB_FUNC( QT_QREGION ) */ HB_FUNC( QT_QREGION_DESTROY ) { - + hbqt_par_QRegion( 1 )->~QRegion(); } /* diff --git a/harbour/contrib/hbqt/QSize.cpp b/harbour/contrib/hbqt/QSize.cpp index 7a7fba4a78..fe6d6d393b 100644 --- a/harbour/contrib/hbqt/QSize.cpp +++ b/harbour/contrib/hbqt/QSize.cpp @@ -67,6 +67,7 @@ /* * QSize () * QSize ( int width, int height ) + * ~QSize () */ HB_FUNC( QT_QSIZE ) { @@ -89,7 +90,7 @@ HB_FUNC( QT_QSIZE ) */ HB_FUNC( QT_QSIZE_DESTROY ) { - + hbqt_par_QSize( 1 )->~QSize(); } /* diff --git a/harbour/contrib/hbqt/QSizeF.cpp b/harbour/contrib/hbqt/QSizeF.cpp index ab1bdf6b36..67c8a5286e 100644 --- a/harbour/contrib/hbqt/QSizeF.cpp +++ b/harbour/contrib/hbqt/QSizeF.cpp @@ -68,6 +68,7 @@ * QSizeF () * QSizeF ( const QSize & size ) * QSizeF ( qreal width, qreal height ) + * ~QSizeF () */ HB_FUNC( QT_QSIZEF ) { @@ -86,7 +87,7 @@ HB_FUNC( QT_QSIZEF ) */ HB_FUNC( QT_QSIZEF_DESTROY ) { - + hbqt_par_QSizeF( 1 )->~QSizeF(); } /* diff --git a/harbour/contrib/hbqt/hbqt_slots.cpp b/harbour/contrib/hbqt/hbqt_slots.cpp index c06d290a5f..34dc74146a 100644 --- a/harbour/contrib/hbqt/hbqt_slots.cpp +++ b/harbour/contrib/hbqt/hbqt_slots.cpp @@ -1871,8 +1871,12 @@ QVariant fetchRole( PHB_ITEM block, int what, int par1, int par2 ) return( hb_itemGetND( ret ) ); else if( hb_itemType( ret ) & HB_IT_NUMERIC ) return( hb_itemGetNI( ret ) ); -// else if( hb_itemType( ret ) & HB_IT_POINTER ) -// return( hb_itemGetPtr( ret ) ); + #if 0 + else if( hb_itemType( ret ) & HB_IT_POINTER ) + { + QPixmap pixmap = qobject_cast( (QPixmap*) hb_itemGetPtr( ret ) ); + } + #endif else return QVariant(); } diff --git a/harbour/contrib/hbqt/qth/QColor.qth b/harbour/contrib/hbqt/qth/QColor.qth index 31d1cec0c4..772278ad78 100644 --- a/harbour/contrib/hbqt/qth/QColor.qth +++ b/harbour/contrib/hbqt/qth/QColor.qth @@ -81,6 +81,7 @@ QColor ( Qt::GlobalColor color ) QColor ( const QString & name ) QColor ( const char * name ) QColor ( const QColor & color ) +~QColor () */ HB_FUNC( QT_QCOLOR ) { diff --git a/harbour/contrib/hbqt/qth/QFont.qth b/harbour/contrib/hbqt/qth/QFont.qth index 59e9f55700..29b2cf169c 100644 --- a/harbour/contrib/hbqt/qth/QFont.qth +++ b/harbour/contrib/hbqt/qth/QFont.qth @@ -77,6 +77,7 @@ oFont := QFont():new( pFont, pPaintDevice ) * QFont ( const QString & family, int pointSize = -1, int weight = -1, bool italic = false ) * QFont ( const QFont & font, QPaintDevice * pd ) * QFont ( const QFont & font ) + * ~QFont () */ HB_FUNC( QT_QFONT ) { diff --git a/harbour/contrib/hbqt/qth/QKeyEvent.qth b/harbour/contrib/hbqt/qth/QKeyEvent.qth index 63644ace75..4c173e1496 100644 --- a/harbour/contrib/hbqt/qth/QKeyEvent.qth +++ b/harbour/contrib/hbqt/qth/QKeyEvent.qth @@ -66,6 +66,7 @@ New = /* * QKeyEvent ( Type type, int key, Qt::KeyboardModifiers modifiers, const QString & text = QString(), bool autorep = false, ushort count = 1 ) + * ~QKeyEvent () */ HB_FUNC( QT_QKEYEVENT ) { diff --git a/harbour/contrib/hbqt/qth/QMouseEvent.qth b/harbour/contrib/hbqt/qth/QMouseEvent.qth index c61ef5616c..6f6c635b6d 100644 --- a/harbour/contrib/hbqt/qth/QMouseEvent.qth +++ b/harbour/contrib/hbqt/qth/QMouseEvent.qth @@ -67,6 +67,7 @@ New = /* * QMouseEvent ( Type type, const QPoint & position, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers ) * QMouseEvent ( Type type, const QPoint & pos, const QPoint & globalPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers ) + * ~QMouseEvent () */ HB_FUNC( QT_QMOUSEEVENT ) { diff --git a/harbour/contrib/hbqt/qth/QMoveEvent.qth b/harbour/contrib/hbqt/qth/QMoveEvent.qth index 0f85d00a11..c5965148a6 100644 --- a/harbour/contrib/hbqt/qth/QMoveEvent.qth +++ b/harbour/contrib/hbqt/qth/QMoveEvent.qth @@ -66,6 +66,7 @@ New = /* * QMoveEvent ( const QPoint & pos, const QPoint & oldPos ) + * ~QMoveEvent () */ HB_FUNC( QT_QMOVEEVENT ) { diff --git a/harbour/contrib/hbqt/qth/QPoint.qth b/harbour/contrib/hbqt/qth/QPoint.qth index a3d138e90f..fbb50ed1d8 100644 --- a/harbour/contrib/hbqt/qth/QPoint.qth +++ b/harbour/contrib/hbqt/qth/QPoint.qth @@ -72,6 +72,7 @@ oPoint := QPoint():new( pQPoint ) /* * QPoint () * QPoint ( int x, int y ) + * ~QPoint () */ HB_FUNC( QT_QPOINT ) { diff --git a/harbour/contrib/hbqt/qth/QRect.qth b/harbour/contrib/hbqt/qth/QRect.qth index 3008836eaa..60bd196bde 100644 --- a/harbour/contrib/hbqt/qth/QRect.qth +++ b/harbour/contrib/hbqt/qth/QRect.qth @@ -80,6 +80,7 @@ oRect := QRect():new( nX, nY, nWidth, nHeight ) * QRect ( const QPoint & topLeft, const QPoint & bottomRight ) * QRect ( const QPoint & topLeft, const QSize & size ) * QRect ( int x, int y, int width, int height ) + * ~QRect () */ HB_FUNC( QT_QRECT ) { diff --git a/harbour/contrib/hbqt/qth/QRectF.qth b/harbour/contrib/hbqt/qth/QRectF.qth index 46bb8b0e38..6a9a3fb495 100644 --- a/harbour/contrib/hbqt/qth/QRectF.qth +++ b/harbour/contrib/hbqt/qth/QRectF.qth @@ -81,6 +81,7 @@ oRectF := QRectF():new( nX, nY, nWidth, nHeight ) * QRectF ( const QPointF & topLeft, const QPointF & bottomRight ) * QRectF ( qreal x, qreal y, qreal width, qreal height ) * QRectF ( const QRect & rectangle ) + * ~QRectF () */ HB_FUNC( QT_QRECTF ) { diff --git a/harbour/contrib/hbqt/qth/QRegion.qth b/harbour/contrib/hbqt/qth/QRegion.qth index 8106a5a431..f7323cd930 100644 --- a/harbour/contrib/hbqt/qth/QRegion.qth +++ b/harbour/contrib/hbqt/qth/QRegion.qth @@ -80,6 +80,7 @@ oRegion := QRegion():new( pQRect, nQRegion_RegionType ) * QRegion ( const QRegion & r ) * QRegion ( const QBitmap & bm ) * QRegion ( const QRect & r, RegionType t = Rectangle ) + * ~QRegion () */ HB_FUNC( QT_QREGION ) { diff --git a/harbour/contrib/hbqt/qth/QSize.qth b/harbour/contrib/hbqt/qth/QSize.qth index 24196ac4b6..222d72ec42 100644 --- a/harbour/contrib/hbqt/qth/QSize.qth +++ b/harbour/contrib/hbqt/qth/QSize.qth @@ -72,6 +72,7 @@ oSize := QSize():new( nWidth, nHeight ) /* * QSize () * QSize ( int width, int height ) + * ~QSize () */ HB_FUNC( QT_QSIZE ) { diff --git a/harbour/contrib/hbqt/qth/QSizeF.qth b/harbour/contrib/hbqt/qth/QSizeF.qth index e08e2e0696..47dc60cbc4 100644 --- a/harbour/contrib/hbqt/qth/QSizeF.qth +++ b/harbour/contrib/hbqt/qth/QSizeF.qth @@ -72,6 +72,7 @@ oSizeF := QSizeF():new( nWidth, nHeight ) * QSizeF () * QSizeF ( const QSize & size ) * QSizeF ( qreal width, qreal height ) + * ~QSizeF () */ HB_FUNC( QT_QSIZEF ) {