From f5a9c9d65ec36ec2ade92c472793e323cfd131e8 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Thu, 9 Apr 2009 15:24:23 +0000 Subject: [PATCH] 2009-04-09 08:18 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/hbqt/hbqt.h * harbour/contrib/hbqt/hbqt_qfont.cpp * harbour/contrib/hbqt/hbqt_qregion.cpp * harbour/contrib/hbqt/hbqt_qwidget.cpp * harbour/contrib/hbqt/TQFont.prg * harbour/contrib/hbqt/TQRegion.prg * harbour/contrib/hbqt/TQWidget.prg * harbour/contrib/hbqt/qth/QApplication.qth * harbour/contrib/hbqt/qth/QFileDialog.qth * harbour/contrib/hbqt/qth/QFont.qth * harbour/contrib/hbqt/qth/QRegion.qth * harbour/contrib/hbqt/qth/QWidget.qth ! Commented out non-portable functions belongings to Win Handles family. --- harbour/ChangeLog | 16 ++++++++++++++++ harbour/contrib/hbqt/TQFont.prg | 1 - harbour/contrib/hbqt/TQRegion.prg | 1 - harbour/contrib/hbqt/TQWidget.prg | 2 -- harbour/contrib/hbqt/hbqt.h | 2 -- harbour/contrib/hbqt/hbqt_qfont.cpp | 8 -------- harbour/contrib/hbqt/hbqt_qregion.cpp | 10 +--------- harbour/contrib/hbqt/hbqt_qwidget.cpp | 18 +----------------- harbour/contrib/hbqt/qth/QApplication.qth | 11 +++++++---- harbour/contrib/hbqt/qth/QFileDialog.qth | 3 ++- harbour/contrib/hbqt/qth/QFont.qth | 10 +++++++++- harbour/contrib/hbqt/qth/QRegion.qth | 6 ++++-- harbour/contrib/hbqt/qth/QWidget.qth | 6 ++++-- 13 files changed, 44 insertions(+), 50 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 146cc2ce62..905b1229ca 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,22 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-09 08:18 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * harbour/contrib/hbqt/hbqt.h + * harbour/contrib/hbqt/hbqt_qfont.cpp + * harbour/contrib/hbqt/hbqt_qregion.cpp + * harbour/contrib/hbqt/hbqt_qwidget.cpp + * harbour/contrib/hbqt/TQFont.prg + * harbour/contrib/hbqt/TQRegion.prg + * harbour/contrib/hbqt/TQWidget.prg + * harbour/contrib/hbqt/qth/QApplication.qth + * harbour/contrib/hbqt/qth/QFileDialog.qth + * harbour/contrib/hbqt/qth/QFont.qth + * harbour/contrib/hbqt/qth/QRegion.qth + * harbour/contrib/hbqt/qth/QWidget.qth + ! Commented out non-portable functions belongings to + Win Handles family. + 2009-04-09 07:19 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg + Added support for -compr=max, -compr=min to control level diff --git a/harbour/contrib/hbqt/TQFont.prg b/harbour/contrib/hbqt/TQFont.prg index 484760797a..566d5e8975 100644 --- a/harbour/contrib/hbqt/TQFont.prg +++ b/harbour/contrib/hbqt/TQFont.prg @@ -70,7 +70,6 @@ CREATE CLASS QFont METHOD family() INLINE Qt_QFont_family( ::pPtr ) METHOD fixedPitch() INLINE Qt_QFont_fixedPitch( ::pPtr ) METHOD fromString( cDescrip ) INLINE Qt_QFont_fromString( ::pPtr, cDescrip ) - METHOD handle() INLINE Qt_QFont_handle( ::pPtr ) METHOD italic() INLINE Qt_QFont_italic( ::pPtr ) METHOD kerning() INLINE Qt_QFont_kerning( ::pPtr ) METHOD key() INLINE Qt_QFont_key( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQRegion.prg b/harbour/contrib/hbqt/TQRegion.prg index e768117bb5..a5d75b10a9 100644 --- a/harbour/contrib/hbqt/TQRegion.prg +++ b/harbour/contrib/hbqt/TQRegion.prg @@ -66,7 +66,6 @@ CREATE CLASS QRegion METHOD boundingRect() INLINE Qt_QRegion_boundingRect( ::pPtr ) METHOD contains( pP ) INLINE Qt_QRegion_contains( ::pPtr, pP ) METHOD contains_1( pR ) INLINE Qt_QRegion_contains_1( ::pPtr, pR ) - METHOD handle() INLINE Qt_QRegion_handle( ::pPtr ) METHOD intersected( pR ) INLINE Qt_QRegion_intersected( ::pPtr, pR ) METHOD intersected_1( pRect ) INLINE Qt_QRegion_intersected_1( ::pPtr, pRect ) METHOD intersects( pRegion ) INLINE Qt_QRegion_intersects( ::pPtr, pRegion ) diff --git a/harbour/contrib/hbqt/TQWidget.prg b/harbour/contrib/hbqt/TQWidget.prg index 87e94fcd27..af17eb7de7 100644 --- a/harbour/contrib/hbqt/TQWidget.prg +++ b/harbour/contrib/hbqt/TQWidget.prg @@ -94,7 +94,6 @@ CREATE CLASS QWidget INHERIT QObject, QPaintDevice METHOD frameSize() INLINE Qt_QWidget_frameSize( ::pPtr ) METHOD geometry() INLINE Qt_QWidget_geometry( ::pPtr ) METHOD getContentsMargins( nLeft, nTop, nRight, nBottom ) INLINE Qt_QWidget_getContentsMargins( ::pPtr, nLeft, nTop, nRight, nBottom ) - METHOD getDC() INLINE Qt_QWidget_getDC( ::pPtr ) METHOD grabKeyboard() INLINE Qt_QWidget_grabKeyboard( ::pPtr ) METHOD grabMouse() INLINE Qt_QWidget_grabMouse( ::pPtr ) METHOD grabMouse_1( pCursor ) INLINE Qt_QWidget_grabMouse_1( ::pPtr, pCursor ) @@ -148,7 +147,6 @@ CREATE CLASS QWidget INHERIT QObject, QPaintDevice METHOD parentWidget() INLINE Qt_QWidget_parentWidget( ::pPtr ) METHOD pos() INLINE Qt_QWidget_pos( ::pPtr ) METHOD rect() INLINE Qt_QWidget_rect( ::pPtr ) - METHOD releaseDC( hHdc ) INLINE Qt_QWidget_releaseDC( ::pPtr, hHdc ) METHOD releaseKeyboard() INLINE Qt_QWidget_releaseKeyboard( ::pPtr ) METHOD releaseMouse() INLINE Qt_QWidget_releaseMouse( ::pPtr ) METHOD releaseShortcut( nId ) INLINE Qt_QWidget_releaseShortcut( ::pPtr, nId ) diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index e223b8b5d5..b9fd5a3d84 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -266,8 +266,6 @@ QRectF hbqt_const_QRectF( int ); QSizeF hbqt_const_QSizeF( int ); QPointF hbqt_const_QPointF( int ); -void hb_ToOutDebug( const char * sTraceMsg, ... ); - #endif #endif /* __HBQT_H */ diff --git a/harbour/contrib/hbqt/hbqt_qfont.cpp b/harbour/contrib/hbqt/hbqt_qfont.cpp index 692cf5c8b9..dba6099cb1 100644 --- a/harbour/contrib/hbqt/hbqt_qfont.cpp +++ b/harbour/contrib/hbqt/hbqt_qfont.cpp @@ -139,14 +139,6 @@ HB_FUNC( QT_QFONT_FROMSTRING ) hb_retl( hbqt_par_QFont( 1 )->fromString( hbqt_par_QString( 2 ) ) ); } -/* - * HFONT handle () const - */ -HB_FUNC( QT_QFONT_HANDLE ) -{ - hb_retptr( ( HFONT ) hbqt_par_QFont( 1 )->handle() ); -} - /* * bool italic () const */ diff --git a/harbour/contrib/hbqt/hbqt_qregion.cpp b/harbour/contrib/hbqt/hbqt_qregion.cpp index b60e13d66b..242aca33d5 100644 --- a/harbour/contrib/hbqt/hbqt_qregion.cpp +++ b/harbour/contrib/hbqt/hbqt_qregion.cpp @@ -60,7 +60,7 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 19/20 [ 95.00% ] ] + * Constructed[ 18/19 [ 94.74% ] ] * * *** Unconvered Prototypes *** * ----------------------------- @@ -111,14 +111,6 @@ HB_FUNC( QT_QREGION_CONTAINS_1 ) hb_retl( hbqt_par_QRegion( 1 )->contains( *hbqt_par_QRect( 2 ) ) ); } -/* - * HRGN handle () const - */ -HB_FUNC( QT_QREGION_HANDLE ) -{ - hb_retptr( ( HRGN ) hbqt_par_QRegion( 1 )->handle() ); -} - /* * QRegion intersected ( const QRegion & r ) const */ diff --git a/harbour/contrib/hbqt/hbqt_qwidget.cpp b/harbour/contrib/hbqt/hbqt_qwidget.cpp index 5187fdb0b0..c7f418a801 100644 --- a/harbour/contrib/hbqt/hbqt_qwidget.cpp +++ b/harbour/contrib/hbqt/hbqt_qwidget.cpp @@ -60,7 +60,7 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 216/219 [ 98.63% ] ] + * Constructed[ 214/217 [ 98.62% ] ] * * *** Unconvered Prototypes *** * ----------------------------- @@ -343,14 +343,6 @@ HB_FUNC( QT_QWIDGET_GETCONTENTSMARGINS ) hb_storni( iBottom, 5 ); } -/* - * virtual HDC getDC () const - */ -HB_FUNC( QT_QWIDGET_GETDC ) -{ - hb_retptr( ( HDC ) hbqt_par_QWidget( 1 )->getDC() ); -} - /* * void grabKeyboard () */ @@ -775,14 +767,6 @@ HB_FUNC( QT_QWIDGET_RECT ) hb_retptr( new QRect( hbqt_par_QWidget( 1 )->rect() ) ); } -/* - * virtual void releaseDC ( HDC hdc ) const - */ -HB_FUNC( QT_QWIDGET_RELEASEDC ) -{ - hbqt_par_QWidget( 1 )->releaseDC( *hbqt_par_HDC( 2 ) ); -} - /* * void releaseKeyboard () */ diff --git a/harbour/contrib/hbqt/qth/QApplication.qth b/harbour/contrib/hbqt/qth/QApplication.qth index 46222d44a2..4ca6d5de1c 100644 --- a/harbour/contrib/hbqt/qth/QApplication.qth +++ b/harbour/contrib/hbqt/qth/QApplication.qth @@ -175,10 +175,13 @@ enum Type { Tty, GuiClient, GuiServer } virtual void commitData ( QSessionManager & manager ) QInputContext * inputContext () const bool isSessionRestored () const -//virtual bool macEventFilter ( EventHandlerCallRef, EventRef ) -//virtual bool qwsEventFilter ( QWSEvent * ) -//int qwsProcessEvent ( QWSEvent * ) -//void qwsSetCustomColors ( QRgb * colortable, int start, int numColors ) +# +# not-found +// virtual bool macEventFilter ( EventHandlerCallRef, EventRef ) +// virtual bool qwsEventFilter ( QWSEvent * ) +// int qwsProcessEvent ( QWSEvent * ) +// void qwsSetCustomColors ( QRgb * colortable, int start, int numColors ) +# virtual void saveState ( QSessionManager & manager ) QString sessionId () const QString sessionKey () const diff --git a/harbour/contrib/hbqt/qth/QFileDialog.qth b/harbour/contrib/hbqt/qth/QFileDialog.qth index 36ab0145fb..260a36e899 100644 --- a/harbour/contrib/hbqt/qth/QFileDialog.qth +++ b/harbour/contrib/hbqt/qth/QFileDialog.qth @@ -100,7 +100,8 @@ QStringList nameFilters () const # # Just too difficult to handle automatically # -//void open ( QObject * receiver, const char * member ) +// void open ( QObject * receiver, const char * member ) +# Options options () const QAbstractProxyModel * proxyModel () const bool resolveSymlinks () const diff --git a/harbour/contrib/hbqt/qth/QFont.qth b/harbour/contrib/hbqt/qth/QFont.qth index 48c6b733cf..627c9a1ff4 100644 --- a/harbour/contrib/hbqt/qth/QFont.qth +++ b/harbour/contrib/hbqt/qth/QFont.qth @@ -99,10 +99,16 @@ QString defaultFamily () const bool exactMatch () const QString family () const bool fixedPitch () const +# # member not found +# // FT_Face freetypeFace () const +# bool fromString ( const QString & descrip ) -HFONT handle () const +# +# Not portable +// HFONT handle () const +# # member not found // bool isCopyOf ( const QFont & f ) const bool italic () const @@ -112,6 +118,7 @@ QString lastResortFamily () const QString lastResortFont () const qreal letterSpacing () const SpacingType letterSpacingType () const +# # member not found // quint32 macFontID () const bool overline () const @@ -120,6 +127,7 @@ int pointSize () const qreal pointSizeF () const bool rawMode () const QString rawName () const +# # error: invalid conversion from `QFont*' to `uint' # initializing argument 1 of `void QFont::resolve(uint)' // QFont resolve ( const QFont & other ) const diff --git a/harbour/contrib/hbqt/qth/QRegion.qth b/harbour/contrib/hbqt/qth/QRegion.qth index a047e48ded..c8b767ee1f 100644 --- a/harbour/contrib/hbqt/qth/QRegion.qth +++ b/harbour/contrib/hbqt/qth/QRegion.qth @@ -87,8 +87,10 @@ enum RegionType { Rectangle, Ellipse } QRect boundingRect () const bool contains ( const QPoint & p ) const bool contains ( const QRect & r ) const -//Handle handle () const -HRGN handle () const +# +# non-portable +// Handle handle () const +# QRegion intersected ( const QRegion & r ) const QRegion intersected ( const QRect & rect ) const bool intersects ( const QRegion & region ) const diff --git a/harbour/contrib/hbqt/qth/QWidget.qth b/harbour/contrib/hbqt/qth/QWidget.qth index a64942a631..9a47b005b2 100644 --- a/harbour/contrib/hbqt/qth/QWidget.qth +++ b/harbour/contrib/hbqt/qth/QWidget.qth @@ -115,7 +115,8 @@ QRect frameGeometry () const QSize frameSize () const const QRect & geometry () const void getContentsMargins ( int * left, int * top, int * right, int * bottom ) const -virtual HDC getDC () const +# non-portable +// virtual HDC getDC () const void grabKeyboard () void grabMouse () void grabMouse ( const QCursor & cursor ) @@ -179,7 +180,8 @@ const QPalette & palette () const QWidget * parentWidget () const QPoint pos () const QRect rect () const -virtual void releaseDC ( HDC hdc ) const +# non-portable +// virtual void releaseDC ( HDC hdc ) const void releaseKeyboard () void releaseMouse () void releaseShortcut ( int id )