diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0b02fe88e3..d0c83fff87 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,17 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-12 07:32 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * harbourr/contrib/hbqt/QPrinter.cpp + * harbourr/contrib/hbqt/QTextCursor.cpp + * harbourr/contrib/hbqt/TQPrinter.prg + * harbourr/contrib/hbqt/TQTextCursor.prg + + * harbourr/contrib/hbqt/qth/QPrinter.qth + ! Commented out setWinPage() and winPage() calls - Windows only. + * harbourr/contrib/hbqt/qth/QTextCursor.qth + ! changed the order of insertImage() calls. + 2009-07-12 12:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + Added information about creating Windows / Windows CE diff --git a/harbour/contrib/hbqt/QPrinter.cpp b/harbour/contrib/hbqt/QPrinter.cpp index 6ffd27a8b8..d4f728b218 100644 --- a/harbour/contrib/hbqt/QPrinter.cpp +++ b/harbour/contrib/hbqt/QPrinter.cpp @@ -75,7 +75,7 @@ */ /* - * Constructed[ 57/61 [ 93.44% ] ] + * Constructed[ 55/61 [ 90.16% ] ] * * *** Unconvered Prototypes *** * ----------------------------- @@ -87,6 +87,8 @@ * * // QString printerSelectionOption () const * // void setPrinterSelectionOption ( const QString & option ) + * // void setWinPageSize ( int pageSize ) + * // int winPageSize () const */ @@ -553,14 +555,6 @@ HB_FUNC( QT_QPRINTER_SETRESOLUTION ) hbqt_par_QPrinter( 1 )->setResolution( hb_parni( 2 ) ); } -/* - * void setWinPageSize ( int pageSize ) - */ -HB_FUNC( QT_QPRINTER_SETWINPAGESIZE ) -{ - hbqt_par_QPrinter( 1 )->setWinPageSize( hb_parni( 2 ) ); -} - /* * int toPage () const */ @@ -569,14 +563,6 @@ HB_FUNC( QT_QPRINTER_TOPAGE ) hb_retni( hbqt_par_QPrinter( 1 )->toPage() ); } -/* - * int winPageSize () const - */ -HB_FUNC( QT_QPRINTER_WINPAGESIZE ) -{ - hb_retni( hbqt_par_QPrinter( 1 )->winPageSize() ); -} - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ diff --git a/harbour/contrib/hbqt/QTextCursor.cpp b/harbour/contrib/hbqt/QTextCursor.cpp index 21459e93dd..1651f7c689 100644 --- a/harbour/contrib/hbqt/QTextCursor.cpp +++ b/harbour/contrib/hbqt/QTextCursor.cpp @@ -353,9 +353,17 @@ HB_FUNC( QT_QTEXTCURSOR_INSERTHTML ) } /* - * void insertImage ( const QTextImageFormat & format ) + * void insertImage ( const QString & name ) */ HB_FUNC( QT_QTEXTCURSOR_INSERTIMAGE ) +{ + hbqt_par_QTextCursor( 1 )->insertImage( hbqt_par_QString( 2 ) ); +} + +/* + * void insertImage ( const QTextImageFormat & format ) + */ +HB_FUNC( QT_QTEXTCURSOR_INSERTIMAGE_1 ) { hbqt_par_QTextCursor( 1 )->insertImage( *hbqt_par_QTextImageFormat( 2 ) ); } @@ -363,17 +371,9 @@ HB_FUNC( QT_QTEXTCURSOR_INSERTIMAGE ) /* * void insertImage ( const QTextImageFormat & format, QTextFrameFormat::Position alignment ) */ -HB_FUNC( QT_QTEXTCURSOR_INSERTIMAGE_1 ) -{ - hbqt_par_QTextCursor( 1 )->insertImage( *hbqt_par_QTextImageFormat( 2 ), ( QTextFrameFormat::Position ) hb_parni( 3 ) ); -} - -/* - * void insertImage ( const QString & name ) - */ HB_FUNC( QT_QTEXTCURSOR_INSERTIMAGE_2 ) { - hbqt_par_QTextCursor( 1 )->insertImage( hbqt_par_QString( 2 ) ); + hbqt_par_QTextCursor( 1 )->insertImage( *hbqt_par_QTextImageFormat( 2 ), ( QTextFrameFormat::Position ) hb_parni( 3 ) ); } /* diff --git a/harbour/contrib/hbqt/TQPrinter.prg b/harbour/contrib/hbqt/TQPrinter.prg index 5731746a5f..219150ca68 100644 --- a/harbour/contrib/hbqt/TQPrinter.prg +++ b/harbour/contrib/hbqt/TQPrinter.prg @@ -120,9 +120,7 @@ CREATE CLASS QPrinter INHERIT QPaintDevice METHOD setPrintRange( nRange ) INLINE Qt_QPrinter_setPrintRange( ::pPtr, nRange ) METHOD setPrinterName( cName ) INLINE Qt_QPrinter_setPrinterName( ::pPtr, cName ) METHOD setResolution( nDpi ) INLINE Qt_QPrinter_setResolution( ::pPtr, nDpi ) - METHOD setWinPageSize( nPageSize ) INLINE Qt_QPrinter_setWinPageSize( ::pPtr, nPageSize ) METHOD toPage() INLINE Qt_QPrinter_toPage( ::pPtr ) - METHOD winPageSize() INLINE Qt_QPrinter_winPageSize( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQTextCursor.prg b/harbour/contrib/hbqt/TQTextCursor.prg index 70b7693c31..1393698e36 100644 --- a/harbour/contrib/hbqt/TQTextCursor.prg +++ b/harbour/contrib/hbqt/TQTextCursor.prg @@ -95,9 +95,9 @@ CREATE CLASS QTextCursor METHOD insertFragment( pFragment ) INLINE Qt_QTextCursor_insertFragment( ::pPtr, pFragment ) METHOD insertFrame( pFormat ) INLINE Qt_QTextCursor_insertFrame( ::pPtr, pFormat ) METHOD insertHtml( cHtml ) INLINE Qt_QTextCursor_insertHtml( ::pPtr, cHtml ) - METHOD insertImage( pFormat ) INLINE Qt_QTextCursor_insertImage( ::pPtr, pFormat ) - METHOD insertImage_1( pFormat, nAlignment ) INLINE Qt_QTextCursor_insertImage_1( ::pPtr, pFormat, nAlignment ) - METHOD insertImage_2( cName ) INLINE Qt_QTextCursor_insertImage_2( ::pPtr, cName ) + METHOD insertImage( cName ) INLINE Qt_QTextCursor_insertImage( ::pPtr, cName ) + METHOD insertImage_1( pFormat ) INLINE Qt_QTextCursor_insertImage_1( ::pPtr, pFormat ) + METHOD insertImage_2( pFormat, nAlignment ) INLINE Qt_QTextCursor_insertImage_2( ::pPtr, pFormat, nAlignment ) METHOD insertImage_3( pImage, cName ) INLINE Qt_QTextCursor_insertImage_3( ::pPtr, pImage, cName ) METHOD insertList( pFormat ) INLINE Qt_QTextCursor_insertList( ::pPtr, pFormat ) METHOD insertList_1( nStyle ) INLINE Qt_QTextCursor_insertList_1( ::pPtr, nStyle ) diff --git a/harbour/contrib/hbqt/qth/QPrinter.qth b/harbour/contrib/hbqt/qth/QPrinter.qth index 032f7ef0e1..d9552e7f85 100644 --- a/harbour/contrib/hbqt/qth/QPrinter.qth +++ b/harbour/contrib/hbqt/qth/QPrinter.qth @@ -146,11 +146,11 @@ void setPrintRange ( PrintRange range ) void setPrinterName ( const QString & name ) // void setPrinterSelectionOption ( const QString & option ) void setResolution ( int dpi ) -void setWinPageSize ( int pageSize ) +// void setWinPageSize ( int pageSize ) QList supportedPaperSources () const QList supportedResolutions () const int toPage () const -int winPageSize () const +// int winPageSize () const diff --git a/harbour/contrib/hbqt/qth/QTextCursor.qth b/harbour/contrib/hbqt/qth/QTextCursor.qth index 9167a28b9d..903bf1327f 100644 --- a/harbour/contrib/hbqt/qth/QTextCursor.qth +++ b/harbour/contrib/hbqt/qth/QTextCursor.qth @@ -154,9 +154,9 @@ void insertBlock ( const QTextBlockFormat & format, const QTextCharFormat & char void insertFragment ( const QTextDocumentFragment & fragment ) QTextFrame * insertFrame ( const QTextFrameFormat & format ) void insertHtml ( const QString & html ) +void insertImage ( const QString & name ) void insertImage ( const QTextImageFormat & format ) void insertImage ( const QTextImageFormat & format, QTextFrameFormat::Position alignment ) -void insertImage ( const QString & name ) void insertImage ( const QImage & image, const QString & name = QString() ) QTextList * insertList ( const QTextListFormat & format ) QTextList * insertList ( QTextListFormat::Style style )