From d40c77876e094ce12f107c43444c58dfcc11e043 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Fri, 22 Oct 2010 08:43:51 +0000 Subject: [PATCH] 2010-10-22 01:39 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/g/HBQString.cpp * contrib/hbqt/qtcore/g/QAbstractItemModel.cpp * contrib/hbqt/qtcore/g/QAbstractListModel.cpp * contrib/hbqt/qtcore/g/QAbstractTableModel.cpp * contrib/hbqt/qtcore/g/QByteArray.cpp * contrib/hbqt/qtcore/g/QSettings.cpp * contrib/hbqt/qtcore/g/QUrl.cpp * contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp * contrib/hbqt/qtgui/g/QComboBox.cpp * contrib/hbqt/qtgui/g/QCompleter.cpp * contrib/hbqt/qtgui/g/QDirModel.cpp * contrib/hbqt/qtgui/g/QGraphicsItem.cpp * contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp * contrib/hbqt/qtgui/g/QGraphicsScene.cpp * contrib/hbqt/qtgui/g/QGraphicsView.cpp * contrib/hbqt/qtgui/g/QIcon.cpp * contrib/hbqt/qtgui/g/QImage.cpp * contrib/hbqt/qtgui/g/QPainter.cpp * contrib/hbqt/qtgui/g/QPainterPath.cpp * contrib/hbqt/qtgui/g/QPixmap.cpp * contrib/hbqt/qtgui/g/QStandardItemModel.cpp * contrib/hbqt/qtgui/g/QStringListModel.cpp * contrib/hbqt/qtgui/g/QTextDocument.cpp * contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp * contrib/hbqt/qtwebkit/g/QWebFrame.cpp * contrib/hbqt/qtwebkit/g/QWebView.cpp * Re-generated: HB_ISPOINTER => HB_ISOBJECT. * contrib/hbqt/utils/hbqtgen.prg ! Fixed: for HB_ISPOINTER => HB_ISOBJECT in C++ code. --- harbour/ChangeLog | 32 +++++++++++++++++++ harbour/contrib/hbqt/qtcore/g/HBQString.cpp | 24 +++++++------- .../hbqt/qtcore/g/QAbstractItemModel.cpp | 26 +++++++-------- .../hbqt/qtcore/g/QAbstractListModel.cpp | 2 +- .../hbqt/qtcore/g/QAbstractTableModel.cpp | 2 +- harbour/contrib/hbqt/qtcore/g/QByteArray.cpp | 2 +- harbour/contrib/hbqt/qtcore/g/QSettings.cpp | 2 +- harbour/contrib/hbqt/qtcore/g/QUrl.cpp | 2 +- .../hbqt/qtgui/g/HBQAbstractItemModel.cpp | 2 +- harbour/contrib/hbqt/qtgui/g/QComboBox.cpp | 8 ++--- harbour/contrib/hbqt/qtgui/g/QCompleter.cpp | 2 +- harbour/contrib/hbqt/qtgui/g/QDirModel.cpp | 10 +++--- .../contrib/hbqt/qtgui/g/QGraphicsItem.cpp | 8 ++--- .../hbqt/qtgui/g/QGraphicsLayoutItem.cpp | 2 +- .../contrib/hbqt/qtgui/g/QGraphicsScene.cpp | 26 +++++++-------- .../contrib/hbqt/qtgui/g/QGraphicsView.cpp | 4 +-- harbour/contrib/hbqt/qtgui/g/QIcon.cpp | 2 +- harbour/contrib/hbqt/qtgui/g/QImage.cpp | 2 +- harbour/contrib/hbqt/qtgui/g/QPainter.cpp | 10 +++--- harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp | 6 ++-- harbour/contrib/hbqt/qtgui/g/QPixmap.cpp | 2 +- .../hbqt/qtgui/g/QStandardItemModel.cpp | 4 +-- .../contrib/hbqt/qtgui/g/QStringListModel.cpp | 6 ++-- .../contrib/hbqt/qtgui/g/QTextDocument.cpp | 4 +-- .../hbqt/qtnetwork/g/QNetworkRequest.cpp | 2 +- harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp | 4 +-- harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp | 6 ++-- harbour/contrib/hbqt/utils/hbqtgen.prg | 2 +- 28 files changed, 118 insertions(+), 86 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 33e9106293..924906ef2c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,38 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-22 01:39 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtcore/g/HBQString.cpp + * contrib/hbqt/qtcore/g/QAbstractItemModel.cpp + * contrib/hbqt/qtcore/g/QAbstractListModel.cpp + * contrib/hbqt/qtcore/g/QAbstractTableModel.cpp + * contrib/hbqt/qtcore/g/QByteArray.cpp + * contrib/hbqt/qtcore/g/QSettings.cpp + * contrib/hbqt/qtcore/g/QUrl.cpp + * contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp + * contrib/hbqt/qtgui/g/QComboBox.cpp + * contrib/hbqt/qtgui/g/QCompleter.cpp + * contrib/hbqt/qtgui/g/QDirModel.cpp + * contrib/hbqt/qtgui/g/QGraphicsItem.cpp + * contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp + * contrib/hbqt/qtgui/g/QGraphicsScene.cpp + * contrib/hbqt/qtgui/g/QGraphicsView.cpp + * contrib/hbqt/qtgui/g/QIcon.cpp + * contrib/hbqt/qtgui/g/QImage.cpp + * contrib/hbqt/qtgui/g/QPainter.cpp + * contrib/hbqt/qtgui/g/QPainterPath.cpp + * contrib/hbqt/qtgui/g/QPixmap.cpp + * contrib/hbqt/qtgui/g/QStandardItemModel.cpp + * contrib/hbqt/qtgui/g/QStringListModel.cpp + * contrib/hbqt/qtgui/g/QTextDocument.cpp + * contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp + * contrib/hbqt/qtwebkit/g/QWebFrame.cpp + * contrib/hbqt/qtwebkit/g/QWebView.cpp + * Re-generated: HB_ISPOINTER => HB_ISOBJECT. + + * contrib/hbqt/utils/hbqtgen.prg + ! Fixed: for HB_ISPOINTER => HB_ISOBJECT in C++ code. + 2010-10-22 01:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/projectpropertiesex.ui % Rearranged: tab names in accordance with new Project Management. diff --git a/harbour/contrib/hbqt/qtcore/g/HBQString.cpp b/harbour/contrib/hbqt/qtcore/g/HBQString.cpp index f39ac91240..31258ce223 100644 --- a/harbour/contrib/hbqt/qtcore/g/HBQString.cpp +++ b/harbour/contrib/hbqt/qtcore/g/HBQString.cpp @@ -320,7 +320,7 @@ HB_FUNC( QT_HBQSTRING_ARG ) if( p ) { void * pText; - hb_retstr_utf8( ( p )->arg( hb_parstr_utf8( 2, &pText, NULL ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QChar( 4 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( hb_parstr_utf8( 2, &pText, NULL ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QChar( 4 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); hb_strfree( pText ); } } @@ -445,7 +445,7 @@ HB_FUNC( QT_HBQSTRING_ARG_9 ) HBQString * p = hbqt_par_HBQString( 1 ); if( p ) { - hb_retstr_utf8( ( p )->arg( hb_parni( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( hb_parni( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISOBJECT( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); } } @@ -457,7 +457,7 @@ HB_FUNC( QT_HBQSTRING_ARG_10 ) HBQString * p = hbqt_par_HBQString( 1 ); if( p ) { - hb_retstr_utf8( ( p )->arg( hb_parni( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( hb_parni( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISOBJECT( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); } } @@ -469,7 +469,7 @@ HB_FUNC( QT_HBQSTRING_ARG_11 ) HBQString * p = hbqt_par_HBQString( 1 ); if( p ) { - hb_retstr_utf8( ( p )->arg( ( long ) hb_parnint( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( ( long ) hb_parnint( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISOBJECT( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); } } @@ -481,7 +481,7 @@ HB_FUNC( QT_HBQSTRING_ARG_12 ) HBQString * p = hbqt_par_HBQString( 1 ); if( p ) { - hb_retstr_utf8( ( p )->arg( ( ulong ) hb_parnint( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( ( ulong ) hb_parnint( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISOBJECT( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); } } @@ -493,7 +493,7 @@ HB_FUNC( QT_HBQSTRING_ARG_13 ) HBQString * p = hbqt_par_HBQString( 1 ); if( p ) { - hb_retstr_utf8( ( p )->arg( ( qlonglong ) hb_parnint( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( ( qlonglong ) hb_parnint( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISOBJECT( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); } } @@ -505,7 +505,7 @@ HB_FUNC( QT_HBQSTRING_ARG_14 ) HBQString * p = hbqt_par_HBQString( 1 ); if( p ) { - hb_retstr_utf8( ( p )->arg( ( qulonglong ) hb_parnint( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( ( qulonglong ) hb_parnint( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISOBJECT( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); } } @@ -517,7 +517,7 @@ HB_FUNC( QT_HBQSTRING_ARG_15 ) HBQString * p = hbqt_par_HBQString( 1 ); if( p ) { - hb_retstr_utf8( ( p )->arg( hb_parni( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( hb_parni( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISOBJECT( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); } } @@ -529,7 +529,7 @@ HB_FUNC( QT_HBQSTRING_ARG_16 ) HBQString * p = hbqt_par_HBQString( 1 ); if( p ) { - hb_retstr_utf8( ( p )->arg( hb_parni( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( hb_parni( 2 ), hb_parni( 3 ), hb_parnidef( 4, 10 ), ( HB_ISOBJECT( 5 ) ? *hbqt_par_QChar( 5 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); } } @@ -541,7 +541,7 @@ HB_FUNC( QT_HBQSTRING_ARG_17 ) HBQString * p = hbqt_par_HBQString( 1 ); if( p ) { - hb_retstr_utf8( ( p )->arg( *hbqt_par_QChar( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QChar( 4 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( *hbqt_par_QChar( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QChar( 4 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); } } @@ -553,7 +553,7 @@ HB_FUNC( QT_HBQSTRING_ARG_18 ) HBQString * p = hbqt_par_HBQString( 1 ); if( p ) { - hb_retstr_utf8( ( p )->arg( ( char ) hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QChar( 4 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( ( char ) hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QChar( 4 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); } } @@ -565,7 +565,7 @@ HB_FUNC( QT_HBQSTRING_ARG_19 ) HBQString * p = hbqt_par_HBQString( 1 ); if( p ) { - hb_retstr_utf8( ( p )->arg( hb_parnd( 2 ), hb_parni( 3 ), ( char ) hb_parni( 4 ), hb_parnidef( 5, -1 ), ( HB_ISPOINTER( 6 ) ? *hbqt_par_QChar( 6 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->arg( hb_parnd( 2 ), hb_parni( 3 ), ( char ) hb_parni( 4 ), hb_parnidef( 5, -1 ), ( HB_ISOBJECT( 6 ) ? *hbqt_par_QChar( 6 ) : QLatin1Char( ' ' ) ) ).toUtf8().data() ); } } diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp index a0dd5b0c96..117f3f9a1c 100644 --- a/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp @@ -200,7 +200,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_COLUMNCOUNT ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retni( ( p )->columnCount( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); + hb_retni( ( p )->columnCount( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); } } @@ -260,7 +260,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_HASCHILDREN ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retl( ( p )->hasChildren( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); + hb_retl( ( p )->hasChildren( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); } } @@ -272,7 +272,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_HASINDEX ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retl( ( p )->hasIndex( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); + hb_retl( ( p )->hasIndex( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); } } @@ -296,7 +296,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_INDEX ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( p )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( p )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) ); } } @@ -308,7 +308,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_INSERTCOLUMN ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retl( ( p )->insertColumn( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); + hb_retl( ( p )->insertColumn( hb_parni( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); } } @@ -320,7 +320,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_INSERTCOLUMNS ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retl( ( p )->insertColumns( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); + hb_retl( ( p )->insertColumns( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); } } @@ -332,7 +332,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_INSERTROW ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retl( ( p )->insertRow( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); + hb_retl( ( p )->insertRow( hb_parni( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); } } @@ -344,7 +344,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_INSERTROWS ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retl( ( p )->insertRows( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); + hb_retl( ( p )->insertRows( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); } } @@ -380,7 +380,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_REMOVECOLUMN ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retl( ( p )->removeColumn( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); + hb_retl( ( p )->removeColumn( hb_parni( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); } } @@ -392,7 +392,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_REMOVECOLUMNS ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retl( ( p )->removeColumns( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); + hb_retl( ( p )->removeColumns( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); } } @@ -404,7 +404,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_REMOVEROW ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retl( ( p )->removeRow( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); + hb_retl( ( p )->removeRow( hb_parni( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); } } @@ -416,7 +416,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_REMOVEROWS ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retl( ( p )->removeRows( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); + hb_retl( ( p )->removeRows( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); } } @@ -428,7 +428,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_ROWCOUNT ) QAbstractItemModel * p = hbqt_par_QAbstractItemModel( 1 ); if( p ) { - hb_retni( ( p )->rowCount( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); + hb_retni( ( p )->rowCount( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); } } diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp index dc3cfae8df..aa4149c992 100644 --- a/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp @@ -164,7 +164,7 @@ HB_FUNC( QT_QABSTRACTLISTMODEL_INDEX ) QAbstractListModel * p = hbqt_par_QAbstractListModel( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( p )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( p )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp index 2348dc36ec..b0f43bac12 100644 --- a/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp @@ -164,7 +164,7 @@ HB_FUNC( QT_QABSTRACTTABLEMODEL_INDEX ) QAbstractTableModel * p = hbqt_par_QAbstractTableModel( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( p )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( p )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp b/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp index abc6a2ca32..d0033c4c67 100644 --- a/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp @@ -1301,7 +1301,7 @@ HB_FUNC( QT_QBYTEARRAY_TOPERCENTENCODING ) QByteArray * p = hbqt_par_QByteArray( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( ( p )->toPercentEncoding( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QByteArray( 2 ) : QByteArray() ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( char ) hb_parni( 4 ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( ( p )->toPercentEncoding( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QByteArray( 2 ) : QByteArray() ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( char ) hb_parni( 4 ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtcore/g/QSettings.cpp b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp index 205af03fa7..96cb3bc265 100644 --- a/harbour/contrib/hbqt/qtcore/g/QSettings.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp @@ -556,7 +556,7 @@ HB_FUNC( QT_QSETTINGS_VALUE ) if( p ) { void * pText; - hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( ( p )->value( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( ( p )->value( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ) ), true ) ); hb_strfree( pText ); } } diff --git a/harbour/contrib/hbqt/qtcore/g/QUrl.cpp b/harbour/contrib/hbqt/qtcore/g/QUrl.cpp index b77bce366f..9c5589400e 100644 --- a/harbour/contrib/hbqt/qtcore/g/QUrl.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QUrl.cpp @@ -1086,7 +1086,7 @@ HB_FUNC( QT_QURL_TOPERCENTENCODING ) if( p ) { void * pText; - hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( ( p )->toPercentEncoding( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QByteArray( 4 ) : QByteArray() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( ( p )->toPercentEncoding( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QByteArray( 4 ) : QByteArray() ) ) ), true ) ); hb_strfree( pText ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp index e842111003..a3f0278c70 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp @@ -208,7 +208,7 @@ HB_FUNC( QT_HBQABSTRACTITEMMODEL_INDEX ) HBQAbstractItemModel * p = hbqt_par_HBQAbstractItemModel( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( p )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( p )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp index e8d7bc1855..40e97f5cb2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp @@ -209,7 +209,7 @@ HB_FUNC( QT_QCOMBOBOX_ADDITEM ) if( p ) { void * pText; - ( p )->addItem( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ); + ( p )->addItem( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ); hb_strfree( pText ); } } @@ -223,7 +223,7 @@ HB_FUNC( QT_QCOMBOBOX_ADDITEM_1 ) if( p ) { void * pText; - ( p )->addItem( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) ); + ( p )->addItem( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) ); hb_strfree( pText ); } } @@ -371,7 +371,7 @@ HB_FUNC( QT_QCOMBOBOX_INSERTITEM ) if( p ) { void * pText; - ( p )->insertItem( hb_parni( 2 ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) ); + ( p )->insertItem( hb_parni( 2 ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) ); hb_strfree( pText ); } } @@ -385,7 +385,7 @@ HB_FUNC( QT_QCOMBOBOX_INSERTITEM_1 ) if( p ) { void * pText; - ( p )->insertItem( hb_parni( 2 ), ( HB_ISCHAR( 3 ) ? QIcon( hbqt_par_QString( 3 ) ) : *hbqt_par_QIcon( 3 )), hb_parstr_utf8( 4, &pText, NULL ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QVariant( 5 ) : QVariant() ) ); + ( p )->insertItem( hb_parni( 2 ), ( HB_ISCHAR( 3 ) ? QIcon( hbqt_par_QString( 3 ) ) : *hbqt_par_QIcon( 3 )), hb_parstr_utf8( 4, &pText, NULL ), ( HB_ISOBJECT( 5 ) ? *hbqt_par_QVariant( 5 ) : QVariant() ) ); hb_strfree( pText ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp index 403ca6b2b4..e6ba583e4f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp @@ -515,7 +515,7 @@ HB_FUNC( QT_QCOMPLETER_COMPLETE ) QCompleter * p = hbqt_par_QCompleter( 1 ); if( p ) { - ( p )->complete( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ); + ( p )->complete( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp index 8d089b9780..df5fa81512 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp @@ -204,7 +204,7 @@ HB_FUNC( QT_QDIRMODEL_COLUMNCOUNT ) QDirModel * p = hbqt_par_QDirModel( 1 ); if( p ) { - hb_retni( ( p )->columnCount( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); + hb_retni( ( p )->columnCount( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); } } @@ -312,7 +312,7 @@ HB_FUNC( QT_QDIRMODEL_HASCHILDREN ) QDirModel * p = hbqt_par_QDirModel( 1 ); if( p ) { - hb_retl( ( p )->hasChildren( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); + hb_retl( ( p )->hasChildren( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); } } @@ -348,7 +348,7 @@ HB_FUNC( QT_QDIRMODEL_INDEX ) QDirModel * p = hbqt_par_QDirModel( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( p )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( ( p )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), true ) ); } } @@ -496,7 +496,7 @@ HB_FUNC( QT_QDIRMODEL_ROWCOUNT ) QDirModel * p = hbqt_par_QDirModel( 1 ); if( p ) { - hb_retni( ( p )->rowCount( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); + hb_retni( ( p )->rowCount( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); } } @@ -640,7 +640,7 @@ HB_FUNC( QT_QDIRMODEL_REFRESH ) QDirModel * p = hbqt_par_QDirModel( 1 ); if( p ) { - ( p )->refresh( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ); + ( p )->refresh( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp index e75fbd1e87..bbcb618622 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp @@ -425,7 +425,7 @@ HB_FUNC( QT_QGRAPHICSITEM_ENSUREVISIBLE ) QGraphicsItem * p = hbqt_par_QGraphicsItem( 1 ); if( p ) { - ( p )->ensureVisible( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRectF( 2 ) : QRectF() ), hb_parnidef( 3, 50 ), hb_parnidef( 4, 50 ) ); + ( p )->ensureVisible( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QRectF( 2 ) : QRectF() ), hb_parnidef( 3, 50 ), hb_parnidef( 4, 50 ) ); } } @@ -1485,7 +1485,7 @@ HB_FUNC( QT_QGRAPHICSITEM_SCROLL ) QGraphicsItem * p = hbqt_par_QGraphicsItem( 1 ); if( p ) { - ( p )->scroll( hb_parnd( 2 ), hb_parnd( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QRectF( 4 ) : QRectF() ) ); + ( p )->scroll( hb_parnd( 2 ), hb_parnd( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QRectF( 4 ) : QRectF() ) ); } } @@ -1545,7 +1545,7 @@ HB_FUNC( QT_QGRAPHICSITEM_SETCACHEMODE ) QGraphicsItem * p = hbqt_par_QGraphicsItem( 1 ); if( p ) { - ( p )->setCacheMode( ( QGraphicsItem::CacheMode ) hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QSize( 3 ) : QSize() ) ); + ( p )->setCacheMode( ( QGraphicsItem::CacheMode ) hb_parni( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QSize( 3 ) : QSize() ) ); } } @@ -1907,7 +1907,7 @@ HB_FUNC( QT_QGRAPHICSITEM_UPDATE ) QGraphicsItem * p = hbqt_par_QGraphicsItem( 1 ); if( p ) { - ( p )->update( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRectF( 2 ) : QRectF() ) ); + ( p )->update( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QRectF( 2 ) : QRectF() ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp index 63bb40c8eb..d376074b73 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp @@ -180,7 +180,7 @@ HB_FUNC( QT_QGRAPHICSLAYOUTITEM_EFFECTIVESIZEHINT ) QGraphicsLayoutItem * p = hbqt_par_QGraphicsLayoutItem( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( ( p )->effectiveSizeHint( ( Qt::SizeHint ) hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QSizeF( 3 ) : QSizeF() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( ( p )->effectiveSizeHint( ( Qt::SizeHint ) hb_parni( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QSizeF( 3 ) : QSizeF() ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp index 761df804ff..b8890249d9 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp @@ -241,7 +241,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_ADDELLIPSE ) QGraphicsScene * p = hbqt_par_QGraphicsScene( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QGraphicsEllipseItem( ( p )->addEllipse( *hbqt_par_QRectF( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QPen( 3 ) : QPen() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QBrush( 4 ) : QBrush() ) ), false ) ); + hb_retptrGC( hbqt_gcAllocate_QGraphicsEllipseItem( ( p )->addEllipse( *hbqt_par_QRectF( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QPen( 3 ) : QPen() ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QBrush( 4 ) : QBrush() ) ), false ) ); } } @@ -253,7 +253,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_ADDELLIPSE_1 ) QGraphicsScene * p = hbqt_par_QGraphicsScene( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QGraphicsEllipseItem( ( p )->addEllipse( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), ( HB_ISPOINTER( 6 ) ? *hbqt_par_QPen( 6 ) : QPen() ), ( HB_ISPOINTER( 7 ) ? *hbqt_par_QBrush( 7 ) : QBrush() ) ), false ) ); + hb_retptrGC( hbqt_gcAllocate_QGraphicsEllipseItem( ( p )->addEllipse( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), ( HB_ISOBJECT( 6 ) ? *hbqt_par_QPen( 6 ) : QPen() ), ( HB_ISOBJECT( 7 ) ? *hbqt_par_QBrush( 7 ) : QBrush() ) ), false ) ); } } @@ -278,7 +278,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_ADDLINE ) QGraphicsScene * p = hbqt_par_QGraphicsScene( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QGraphicsLineItem( ( p )->addLine( *hbqt_par_QLineF( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QPen( 3 ) : QPen() ) ), false ) ); + hb_retptrGC( hbqt_gcAllocate_QGraphicsLineItem( ( p )->addLine( *hbqt_par_QLineF( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QPen( 3 ) : QPen() ) ), false ) ); } } @@ -290,7 +290,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_ADDLINE_1 ) QGraphicsScene * p = hbqt_par_QGraphicsScene( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QGraphicsLineItem( ( p )->addLine( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), ( HB_ISPOINTER( 6 ) ? *hbqt_par_QPen( 6 ) : QPen() ) ), false ) ); + hb_retptrGC( hbqt_gcAllocate_QGraphicsLineItem( ( p )->addLine( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), ( HB_ISOBJECT( 6 ) ? *hbqt_par_QPen( 6 ) : QPen() ) ), false ) ); } } @@ -302,7 +302,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_ADDPATH ) QGraphicsScene * p = hbqt_par_QGraphicsScene( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QGraphicsPathItem( ( p )->addPath( *hbqt_par_QPainterPath( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QPen( 3 ) : QPen() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QBrush( 4 ) : QBrush() ) ), false ) ); + hb_retptrGC( hbqt_gcAllocate_QGraphicsPathItem( ( p )->addPath( *hbqt_par_QPainterPath( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QPen( 3 ) : QPen() ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QBrush( 4 ) : QBrush() ) ), false ) ); } } @@ -326,7 +326,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_ADDPOLYGON ) QGraphicsScene * p = hbqt_par_QGraphicsScene( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QGraphicsPolygonItem( ( p )->addPolygon( *hbqt_par_QPolygonF( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QPen( 3 ) : QPen() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QBrush( 4 ) : QBrush() ) ), false ) ); + hb_retptrGC( hbqt_gcAllocate_QGraphicsPolygonItem( ( p )->addPolygon( *hbqt_par_QPolygonF( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QPen( 3 ) : QPen() ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QBrush( 4 ) : QBrush() ) ), false ) ); } } @@ -338,7 +338,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_ADDRECT ) QGraphicsScene * p = hbqt_par_QGraphicsScene( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QGraphicsRectItem( ( p )->addRect( *hbqt_par_QRectF( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QPen( 3 ) : QPen() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QBrush( 4 ) : QBrush() ) ), false ) ); + hb_retptrGC( hbqt_gcAllocate_QGraphicsRectItem( ( p )->addRect( *hbqt_par_QRectF( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QPen( 3 ) : QPen() ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QBrush( 4 ) : QBrush() ) ), false ) ); } } @@ -350,7 +350,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_ADDRECT_1 ) QGraphicsScene * p = hbqt_par_QGraphicsScene( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QGraphicsRectItem( ( p )->addRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), ( HB_ISPOINTER( 6 ) ? *hbqt_par_QPen( 6 ) : QPen() ), ( HB_ISPOINTER( 7 ) ? *hbqt_par_QBrush( 7 ) : QBrush() ) ), false ) ); + hb_retptrGC( hbqt_gcAllocate_QGraphicsRectItem( ( p )->addRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), ( HB_ISOBJECT( 6 ) ? *hbqt_par_QPen( 6 ) : QPen() ), ( HB_ISOBJECT( 7 ) ? *hbqt_par_QBrush( 7 ) : QBrush() ) ), false ) ); } } @@ -363,7 +363,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_ADDSIMPLETEXT ) if( p ) { void * pText; - hb_retptrGC( hbqt_gcAllocate_QGraphicsSimpleTextItem( ( p )->addSimpleText( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QFont( 3 ) : QFont() ) ), false ) ); + hb_retptrGC( hbqt_gcAllocate_QGraphicsSimpleTextItem( ( p )->addSimpleText( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QFont( 3 ) : QFont() ) ), false ) ); hb_strfree( pText ); } } @@ -377,7 +377,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_ADDTEXT ) if( p ) { void * pText; - hb_retptrGC( hbqt_gcAllocate_QGraphicsTextItem( ( p )->addText( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QFont( 3 ) : QFont() ) ), false ) ); + hb_retptrGC( hbqt_gcAllocate_QGraphicsTextItem( ( p )->addText( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QFont( 3 ) : QFont() ) ), false ) ); hb_strfree( pText ); } } @@ -702,7 +702,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_RENDER ) QGraphicsScene * p = hbqt_par_QGraphicsScene( 1 ); if( p ) { - ( p )->render( hbqt_par_QPainter( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QRectF( 3 ) : QRectF() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QRectF( 4 ) : QRectF() ), ( HB_ISNUM( 5 ) ? ( Qt::AspectRatioMode ) hb_parni( 5 ) : ( Qt::AspectRatioMode ) Qt::KeepAspectRatio ) ); + ( p )->render( hbqt_par_QPainter( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QRectF( 3 ) : QRectF() ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QRectF( 4 ) : QRectF() ), ( HB_ISNUM( 5 ) ? ( Qt::AspectRatioMode ) hb_parni( 5 ) : ( Qt::AspectRatioMode ) Qt::KeepAspectRatio ) ); } } @@ -1038,7 +1038,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_INVALIDATE_1 ) QGraphicsScene * p = hbqt_par_QGraphicsScene( 1 ); if( p ) { - ( p )->invalidate( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRectF( 2 ) : QRectF() ), ( HB_ISNUM( 3 ) ? ( QGraphicsScene::SceneLayers ) hb_parni( 3 ) : ( QGraphicsScene::SceneLayers ) QGraphicsScene::AllLayers ) ); + ( p )->invalidate( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QRectF( 2 ) : QRectF() ), ( HB_ISNUM( 3 ) ? ( QGraphicsScene::SceneLayers ) hb_parni( 3 ) : ( QGraphicsScene::SceneLayers ) QGraphicsScene::AllLayers ) ); } } @@ -1050,7 +1050,7 @@ HB_FUNC( QT_QGRAPHICSSCENE_UPDATE_1 ) QGraphicsScene * p = hbqt_par_QGraphicsScene( 1 ); if( p ) { - ( p )->update( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRectF( 2 ) : QRectF() ) ); + ( p )->update( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QRectF( 2 ) : QRectF() ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp index 6fd0d7cadf..1ab8c0998f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp @@ -683,7 +683,7 @@ HB_FUNC( QT_QGRAPHICSVIEW_RENDER ) QGraphicsView * p = hbqt_par_QGraphicsView( 1 ); if( p ) { - ( p )->render( hbqt_par_QPainter( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QRectF( 3 ) : QRectF() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QRect( 4 ) : QRect() ), ( HB_ISNUM( 5 ) ? ( Qt::AspectRatioMode ) hb_parni( 5 ) : ( Qt::AspectRatioMode ) Qt::KeepAspectRatio ) ); + ( p )->render( hbqt_par_QPainter( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QRectF( 3 ) : QRectF() ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QRect( 4 ) : QRect() ), ( HB_ISNUM( 5 ) ? ( Qt::AspectRatioMode ) hb_parni( 5 ) : ( Qt::AspectRatioMode ) Qt::KeepAspectRatio ) ); } } @@ -1115,7 +1115,7 @@ HB_FUNC( QT_QGRAPHICSVIEW_INVALIDATESCENE ) QGraphicsView * p = hbqt_par_QGraphicsView( 1 ); if( p ) { - ( p )->invalidateScene( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRectF( 2 ) : QRectF() ), ( HB_ISNUM( 3 ) ? ( QGraphicsScene::SceneLayers ) hb_parni( 3 ) : ( QGraphicsScene::SceneLayers ) QGraphicsScene::AllLayers ) ); + ( p )->invalidateScene( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QRectF( 2 ) : QRectF() ), ( HB_ISNUM( 3 ) ? ( QGraphicsScene::SceneLayers ) hb_parni( 3 ) : ( QGraphicsScene::SceneLayers ) QGraphicsScene::AllLayers ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp index f5197acdf6..2786d7f799 100644 --- a/harbour/contrib/hbqt/qtgui/g/QIcon.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp @@ -237,7 +237,7 @@ HB_FUNC( QT_QICON_ADDFILE ) if( p ) { void * pText; - ( p )->addFile( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QSize( 3 ) : QSize() ), ( HB_ISNUM( 4 ) ? ( QIcon::Mode ) hb_parni( 4 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 5 ) ? ( QIcon::State ) hb_parni( 5 ) : ( QIcon::State ) QIcon::Off ) ); + ( p )->addFile( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QSize( 3 ) : QSize() ), ( HB_ISNUM( 4 ) ? ( QIcon::Mode ) hb_parni( 4 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 5 ) ? ( QIcon::State ) hb_parni( 5 ) : ( QIcon::State ) QIcon::Off ) ); hb_strfree( pText ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QImage.cpp b/harbour/contrib/hbqt/qtgui/g/QImage.cpp index 161a09da11..400d63809e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QImage.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QImage.cpp @@ -326,7 +326,7 @@ HB_FUNC( QT_QIMAGE_COPY ) QImage * p = hbqt_par_QImage( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->copy( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp index 92746accc2..9464436bc8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp @@ -290,7 +290,7 @@ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_3 ) if( p ) { void * pText; - hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( ( p )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QTextOption( 4 ) : QTextOption() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( ( p )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QTextOption( 4 ) : QTextOption() ) ) ), true ) ); hb_strfree( pText ); } } @@ -1396,7 +1396,7 @@ HB_FUNC( QT_QPAINTER_DRAWTEXT_6 ) if( p ) { void * pText; - ( p )->drawText( *hbqt_par_QRectF( 2 ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QTextOption( 4 ) : QTextOption() ) ); + ( p )->drawText( *hbqt_par_QRectF( 2 ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QTextOption( 4 ) : QTextOption() ) ); hb_strfree( pText ); } } @@ -1409,7 +1409,7 @@ HB_FUNC( QT_QPAINTER_DRAWTILEDPIXMAP ) QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawTiledPixmap( *hbqt_par_QRectF( 2 ), *hbqt_par_QPixmap( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QPointF( 4 ) : QPointF() ) ); + ( p )->drawTiledPixmap( *hbqt_par_QRectF( 2 ), *hbqt_par_QPixmap( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QPointF( 4 ) : QPointF() ) ); } } @@ -1421,7 +1421,7 @@ HB_FUNC( QT_QPAINTER_DRAWTILEDPIXMAP_1 ) QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawTiledPixmap( *hbqt_par_QRect( 2 ), *hbqt_par_QPixmap( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QPoint( 4 ) : QPoint() ) ); + ( p )->drawTiledPixmap( *hbqt_par_QRect( 2 ), *hbqt_par_QPixmap( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QPoint( 4 ) : QPoint() ) ); } } @@ -2369,7 +2369,7 @@ HB_FUNC( QT_QPAINTER_SETREDIRECTED ) QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->setRedirected( hbqt_par_QPaintDevice( 2 ), hbqt_par_QPaintDevice( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QPoint( 4 ) : QPoint() ) ); + ( p )->setRedirected( hbqt_par_QPaintDevice( 2 ), hbqt_par_QPaintDevice( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QPoint( 4 ) : QPoint() ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp index a8a6d45b49..6a674e9a1f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp @@ -773,7 +773,7 @@ HB_FUNC( QT_QPAINTERPATH_TOFILLPOLYGON_1 ) QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QPolygonF( new QPolygonF( ( p )->toFillPolygon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QMatrix( 2 ) : QMatrix() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygonF( new QPolygonF( ( p )->toFillPolygon( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QMatrix( 2 ) : QMatrix() ) ) ), true ) ); } } @@ -797,7 +797,7 @@ HB_FUNC( QT_QPAINTERPATH_TOFILLPOLYGONS_1 ) QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->toFillPolygons( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QMatrix( 2 ) : QMatrix() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->toFillPolygons( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QMatrix( 2 ) : QMatrix() ) ) ), true ) ); } } @@ -833,7 +833,7 @@ HB_FUNC( QT_QPAINTERPATH_TOSUBPATHPOLYGONS_1 ) QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->toSubpathPolygons( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QMatrix( 2 ) : QMatrix() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QList( new QList( ( p )->toSubpathPolygons( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QMatrix( 2 ) : QMatrix() ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp b/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp index 9928b4dd03..4bceeb3acf 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp @@ -263,7 +263,7 @@ HB_FUNC( QT_QPIXMAP_COPY ) QPixmap * p = hbqt_par_QPixmap( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->copy( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp index d215891287..e62f23d8ff 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp @@ -268,7 +268,7 @@ HB_FUNC( QT_QSTANDARDITEMMODEL_INSERTCOLUMN ) QStandardItemModel * p = hbqt_par_QStandardItemModel( 1 ); if( p ) { - hb_retl( ( p )->insertColumn( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); + hb_retl( ( p )->insertColumn( hb_parni( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); } } @@ -280,7 +280,7 @@ HB_FUNC( QT_QSTANDARDITEMMODEL_INSERTROW ) QStandardItemModel * p = hbqt_par_QStandardItemModel( 1 ); if( p ) { - hb_retl( ( p )->insertRow( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); + hb_retl( ( p )->insertRow( hb_parni( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QModelIndex( 3 ) : QModelIndex() ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp index f8b9894e63..7c4c57431f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp @@ -219,7 +219,7 @@ HB_FUNC( QT_QSTRINGLISTMODEL_INSERTROWS ) QStringListModel * p = hbqt_par_QStringListModel( 1 ); if( p ) { - hb_retl( ( p )->insertRows( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); + hb_retl( ( p )->insertRows( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); } } @@ -231,7 +231,7 @@ HB_FUNC( QT_QSTRINGLISTMODEL_REMOVEROWS ) QStringListModel * p = hbqt_par_QStringListModel( 1 ); if( p ) { - hb_retl( ( p )->removeRows( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); + hb_retl( ( p )->removeRows( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ); } } @@ -243,7 +243,7 @@ HB_FUNC( QT_QSTRINGLISTMODEL_ROWCOUNT ) QStringListModel * p = hbqt_par_QStringListModel( 1 ); if( p ) { - hb_retni( ( p )->rowCount( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); + hb_retni( ( p )->rowCount( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QModelIndex( 2 ) : QModelIndex() ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp index 3d3d2b4ade..fb70fde015 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp @@ -364,7 +364,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_DRAWCONTENTS ) QTextDocument * p = hbqt_par_QTextDocument( 1 ); if( p ) { - ( p )->drawContents( hbqt_par_QPainter( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QRectF( 3 ) : QRectF() ) ); + ( p )->drawContents( hbqt_par_QPainter( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QRectF( 3 ) : QRectF() ) ); } } @@ -940,7 +940,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_TOHTML ) QTextDocument * p = hbqt_par_QTextDocument( 1 ); if( p ) { - hb_retstr_utf8( ( p )->toHtml( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QByteArray( 2 ) : QByteArray() ) ).toUtf8().data() ); + hb_retstr_utf8( ( p )->toHtml( ( HB_ISOBJECT( 2 ) ? *hbqt_par_QByteArray( 2 ) : QByteArray() ) ).toUtf8().data() ); } } diff --git a/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp b/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp index 61f1d88971..bc447c9a6e 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp @@ -195,7 +195,7 @@ HB_FUNC( QT_QNETWORKREQUEST_ATTRIBUTE ) QNetworkRequest * p = hbqt_par_QNetworkRequest( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( ( p )->attribute( ( QNetworkRequest::Attribute ) hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ) ), true ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( ( p )->attribute( ( QNetworkRequest::Attribute ) hb_parni( 2 ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp index 3179f3a66b..ce14f02ff7 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp @@ -442,7 +442,7 @@ HB_FUNC( QT_QWEBFRAME_SETCONTENT ) if( p ) { void * pText; - ( p )->setContent( *hbqt_par_QByteArray( 2 ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QUrl( 4 ) : QUrl() ) ); + ( p )->setContent( *hbqt_par_QByteArray( 2 ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QUrl( 4 ) : QUrl() ) ); hb_strfree( pText ); } } @@ -456,7 +456,7 @@ HB_FUNC( QT_QWEBFRAME_SETHTML ) if( p ) { void * pText; - ( p )->setHtml( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QUrl( 3 ) : QUrl() ) ); + ( p )->setHtml( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QUrl( 3 ) : QUrl() ) ); hb_strfree( pText ); } } diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp index 9f5199d583..09a5c46bf3 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp @@ -260,7 +260,7 @@ HB_FUNC( QT_QWEBVIEW_LOAD_1 ) QWebView * p = hbqt_par_QWebView( 1 ); if( p ) { - ( p )->load( *hbqt_par_QNetworkRequest( 2 ), ( HB_ISNUM( 3 ) ? ( QNetworkAccessManager::Operation ) hb_parni( 3 ) : ( QNetworkAccessManager::Operation ) QNetworkAccessManager::GetOperation ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QByteArray( 4 ) : QByteArray() ) ); + ( p )->load( *hbqt_par_QNetworkRequest( 2 ), ( HB_ISNUM( 3 ) ? ( QNetworkAccessManager::Operation ) hb_parni( 3 ) : ( QNetworkAccessManager::Operation ) QNetworkAccessManager::GetOperation ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QByteArray( 4 ) : QByteArray() ) ); } } @@ -309,7 +309,7 @@ HB_FUNC( QT_QWEBVIEW_SETCONTENT ) if( p ) { void * pText; - ( p )->setContent( *hbqt_par_QByteArray( 2 ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QUrl( 4 ) : QUrl() ) ); + ( p )->setContent( *hbqt_par_QByteArray( 2 ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISOBJECT( 4 ) ? *hbqt_par_QUrl( 4 ) : QUrl() ) ); hb_strfree( pText ); } } @@ -323,7 +323,7 @@ HB_FUNC( QT_QWEBVIEW_SETHTML ) if( p ) { void * pText; - ( p )->setHtml( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QUrl( 3 ) : QUrl() ) ); + ( p )->setHtml( hb_parstr_utf8( 2, &pText, NULL ), ( HB_ISOBJECT( 3 ) ? *hbqt_par_QUrl( 3 ) : QUrl() ) ); hb_strfree( pText ); } } diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg index 75a984b04f..b2e50cbfea 100644 --- a/harbour/contrib/hbqt/utils/hbqtgen.prg +++ b/harbour/contrib/hbqt/utils/hbqtgen.prg @@ -1787,7 +1787,7 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) CASE oArg:lAnd .AND. oArg:lConst s := "*hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" IF !empty( oArg:cDefault ) .and. ( "(" $ oArg:cDefault ) - oArg:cBody := "( HB_ISPOINTER( " + cHBIdx + " ) ? " + s + " : " + oArg:cDefault + " )" + oArg:cBody := "( HB_ISOBJECT( " + cHBIdx + " ) ? " + s + " : " + oArg:cDefault + " )" ELSE oArg:cBody := s ENDIF