diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cc2ca94121..d32ca627a0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
The license applies to all entries newer than 2009-04-28.
*/
+2012-05-05 15:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+ * contrib/hbqt/qtnetwork/qth/QNetworkProxy.qth
+ + Fixed: constructors now respect new str API.
+
2012-05-05 14:37 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtcore/qth/QDir.qth
* contrib/hbqt/qtcore/qth/QFile.qth
diff --git a/harbour/contrib/hbqt/qtnetwork/qth/QNetworkProxy.qth b/harbour/contrib/hbqt/qtnetwork/qth/QNetworkProxy.qth
index 78ba018d0e..900c490835 100644
--- a/harbour/contrib/hbqt/qtnetwork/qth/QNetworkProxy.qth
+++ b/harbour/contrib/hbqt/qtnetwork/qth/QNetworkProxy.qth
@@ -16,8 +16,8 @@
QObject = no
-Inherit =
-New =
+Inherit =
+New =
@@ -36,9 +36,15 @@ HB_FUNC( QT_QNETWORKPROXY )
{
__HB_RETPTRGC__( new QNetworkProxy( *hbqt_par_QNetworkProxy( 1 ) ) );
}
+ else if( hb_pcount() >= 2 && HB_ISNUM( 1 ) && HB_ISCHAR( 2 ) )
+ {
+ void * pText01 = NULL;
+ __HB_RETPTRGC__( new QNetworkProxy( ( QNetworkProxy::ProxyType ) hb_parni( 1 ), hb_parstr_utf8( 2, &pText01, NULL ), ( quint16 ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 0 ), ( HB_ISCHAR( 4 ) ? hbqt_par_QString( 4 ) : QString() ), ( HB_ISCHAR( 5 ) ? hbqt_par_QString( 5 ) : QString() ) ) );
+ hb_strfree( pText01 );
+ }
else if( hb_pcount() >= 1 && HB_ISNUM( 1 ) )
{
- __HB_RETPTRGC__( new QNetworkProxy( ( QNetworkProxy::ProxyType ) hb_parni( 1 ), ( HB_ISCHAR( 2 ) ? hbqt_par_QString( 2 ) : QString() ), ( quint16 ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 0 ), ( HB_ISCHAR( 4 ) ? hbqt_par_QString( 4 ) : QString() ), ( HB_ISCHAR( 5 ) ? hbqt_par_QString( 5 ) : QString() ) ) );
+ __HB_RETPTRGC__( new QNetworkProxy( ( QNetworkProxy::ProxyType ) hb_parni( 1 ), QString(), ( quint16 ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 0 ), ( HB_ISCHAR( 4 ) ? hbqt_par_QString( 4 ) : QString() ), ( HB_ISCHAR( 5 ) ? hbqt_par_QString( 5 ) : QString() ) ) );
}
else
{