diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 87d790d723..b4936df8d8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-26 00:13 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + + contrib/hbqt/hbqtsql.hbc + ! Miss from prev commit. + + * contrib/hbqt/qtgui/qth/QDropEvent.qth + * contrib/hbqt/qtsql/qth/QSqlQuery.qth + ! Manual code insertion/modification. + 2011-03-26 03:32 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rtl/hbproces.c ! fixed one HB_TRUE wrongly used instead of TRUE diff --git a/harbour/contrib/hbqt/hbqtsql.hbc b/harbour/contrib/hbqt/hbqtsql.hbc new file mode 100644 index 0000000000..d01bcb9420 --- /dev/null +++ b/harbour/contrib/hbqt/hbqtsql.hbc @@ -0,0 +1,10 @@ +# +# $Id$ +# + +# --------------------------------------------------------------- +# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) +# See COPYING for licensing terms. +# --------------------------------------------------------------- + +libs=qtsql/hbqtsql.hbc diff --git a/harbour/contrib/hbqt/qtgui/qth/QDropEvent.qth b/harbour/contrib/hbqt/qtgui/qth/QDropEvent.qth index c8e5b9f48a..49c0c18b17 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QDropEvent.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QDropEvent.qth @@ -52,10 +52,10 @@ Qt::KeyboardModifiers keyboardModifiers () const # how to construct dynamically - no separate keyword ??? # const QMimeData * mimeData () const{ - QDropEvent * _dropevent = ( QDropEvent * ) hbqt_pPtrFromObj( 0 ); - if( _dropevent ) + QDropEvent * p = ( QDropEvent * ) hbqt_pPtrFromObj( 0 ); + if( p ) { - hbqt_create_objectGC( hbqt_gcAllocate_QMimeData( ( void* ) _dropevent->mimeData(), true ), "hb_QMimeData" ); + hbqt_create_objectGC( hbqt_gcAllocate_QMimeData( ( void* ) p->mimeData(), true ), "hb_QMimeData" ); } } # diff --git a/harbour/contrib/hbqt/qtsql/qth/QSqlQuery.qth b/harbour/contrib/hbqt/qtsql/qth/QSqlQuery.qth index 8eeb5c35cc..31caafe7f4 100644 --- a/harbour/contrib/hbqt/qtsql/qth/QSqlQuery.qth +++ b/harbour/contrib/hbqt/qtsql/qth/QSqlQuery.qth @@ -96,7 +96,13 @@ QVariant boundValue ( const QString & placeholder ) const QVariant boundValue ( int pos ) const QMap boundValues () const void clear () -//const QSqlDriver * driver () const +const QSqlDriver * driver () const{ + QSqlQuery * p = ( QSqlQuery * ) hbqt_pPtrFromObj( 0 ); + if( p ) + { + hbqt_create_objectGC( hbqt_gcAllocate_QSqlDriver( ( void* ) p->driver(), true ), "hb_QSqlDriver" ); + } +} bool exec ( const QString & query ) bool exec () bool execBatch ( BatchExecutionMode mode = ValuesAsRows ) @@ -119,7 +125,13 @@ QSql::NumericalPrecisionPolicy numericalPrecisionPolicy () const bool prepare ( const QString & query ) bool previous () QSqlRecord record () const -//const QSqlResult * result () const +const QSqlResult * result () const{ + QSqlQuery * p = ( QSqlQuery * ) hbqt_pPtrFromObj( 0 ); + if( p ) + { + hbqt_create_objectGC( hbqt_gcAllocate_QSqlResult( ( void* ) p->result(), true ), "hb_QSqlResult" ); + } +} bool seek ( int index, bool relative = false ) void setForwardOnly ( bool forward ) void setNumericalPrecisionPolicy ( QSql::NumericalPrecisionPolicy precisionPolicy )