diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2e7bc632ab..fe34532cd3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2012-05-08 16:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtwebkit/qth/QWebFrame.qth + * contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth + * contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth + * contrib/hbqt/qtwebkit/qth/QWebPage.qth + * contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth + * contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth + * contrib/hbqt/qtwebkit/qth/QWebView.qth + - Replaced: HB_ISOBJECT() => hbqt_par_isDerivedFrom() + * Rationalized: constructors. + 2012-05-08 15:14 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtnetwork/qth/QFtp.qth * contrib/hbqt/qtnetwork/qth/QHttp.qth diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth index 19f72b7103..46594ab4f3 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebFrame.qth @@ -31,7 +31,7 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBFRAME ) { - // __HB_RETPTRGC__( new QWebFrame() ); + //__HB_RETPTRGC__( new QWebFrame() ); } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth index c9f0a1551d..b77ecf40a7 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHistoryItem.qth @@ -32,10 +32,14 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBHISTORYITEM ) { - if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) + if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QWEBHISTORYITEM" ) ) { __HB_RETPTRGC__( new QWebHistoryItem( *hbqt_par_QWebHistoryItem( 1 ) ) ); } + else + { + hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); + } } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth index e6ea67596e..692b92f6f0 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebHitTestResult.qth @@ -32,7 +32,14 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBHITTESTRESULT ) { - __HB_RETPTRGC__( new QWebHitTestResult() ); + if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QWEBHITTESTRESULT" ) ) + { + __HB_RETPTRGC__( new QWebHitTestResult( *hbqt_par_QWebHitTestResult( 1 ) ) ); + } + else + { + __HB_RETPTRGC__( new QWebHitTestResult() ); + } } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth index 6bfa28df5f..80abc5d3d4 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebPage.qth @@ -30,7 +30,14 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBPAGE ) { - __HB_RETPTRGC__( new QWebPage( hbqt_par_QWidget( 2 ) ) ); + if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QOBJECT" ) ) + { + __HB_RETPTRGC__( new QWebPage( hbqt_par_QObject( 1 ) ) ); + } + else + { + __HB_RETPTRGC__( new QWebPage() ); + } } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth index 632c575b4b..ba01abdc9e 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebPluginFactory.qth @@ -15,8 +15,9 @@ Inherits = QObject Type = Core New = -folder = qtwebkit +Destructor = no Constructor = no +folder = qtwebkit diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth index 6c061f5f56..89583e80b3 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebSecurityOrigin.qth @@ -29,10 +29,14 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBSECURITYORIGIN ) { - if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) + if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QWEBSECURITYORIGIN" ) ) { __HB_RETPTRGC__( new QWebSecurityOrigin( *hbqt_par_QWebSecurityOrigin( 1 ) ) ); } + else + { + hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); + } } diff --git a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth index e88d46e916..375d4d8b5f 100644 --- a/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth +++ b/harbour/contrib/hbqt/qtwebkit/qth/QWebView.qth @@ -12,6 +12,7 @@ */ +QObject = Yes Inherit = QWidget New = pParent folder = qtwebkit @@ -29,7 +30,14 @@ folder = qtwebkit */ HB_FUNC( QT_QWEBVIEW ) { - __HB_RETPTRGC__( new QWebView( hbqt_par_QWidget( 1 ) ) ); + if( hb_pcount() == 1 && hbqt_par_isDerivedFrom( 1, "QWIDGET" ) ) + { + __HB_RETPTRGC__( new QWebView( hbqt_par_QWidget( 1 ) ) ); + } + else + { + __HB_RETPTRGC__( new QWebView() ); + } }