From 4d27a0e9b2f00cd05adb84b567de46c35649759d Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sun, 3 Oct 2010 18:18:59 +0000 Subject: [PATCH] 2010-10-03 11:14 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/hbqt_pointer.cpp ! Fixed: to not reach end of code with return type. * contrib/hbqt/utils/qtcore.qtp ! Commented out: wrongly commented QMimeData.qth. * contrib/hbqt/qtcore/g/filelist.hbm * contrib/hbqt/qtcore/g/hbqtcore.h * Re-generated. --- harbour/ChangeLog | 11 +++++++++++ harbour/contrib/hbqt/qtcore/g/filelist.hbm | 2 ++ harbour/contrib/hbqt/qtcore/g/hbqtcore.h | 4 ++++ harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp | 4 ++++ harbour/contrib/hbqt/utils/qtcore.qtp | 2 +- 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4298fb038c..86a0958fc5 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-03 11:14 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtcore/hbqt_pointer.cpp + ! Fixed: to not reach end of code with return type. + + * contrib/hbqt/utils/qtcore.qtp + ! Commented out: wrongly commented QMimeData.qth. + + * contrib/hbqt/qtcore/g/filelist.hbm + * contrib/hbqt/qtcore/g/hbqtcore.h + * Re-generated. + 2010-10-03 17:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Added MS-DOS compiler (djgpp) detection when used on *nix platform diff --git a/harbour/contrib/hbqt/qtcore/g/filelist.hbm b/harbour/contrib/hbqt/qtcore/g/filelist.hbm index 6f2d8ae463..5e471d972e 100644 --- a/harbour/contrib/hbqt/qtcore/g/filelist.hbm +++ b/harbour/contrib/hbqt/qtcore/g/filelist.hbm @@ -35,6 +35,7 @@ QLine.cpp QLineF.cpp QList.cpp QLocale.cpp +QMimeData.cpp QModelIndex.cpp QObject.cpp QPoint.cpp @@ -89,6 +90,7 @@ TQLine.prg TQLineF.prg TQList.prg TQLocale.prg +TQMimeData.prg TQModelIndex.prg TQObject.prg TQPoint.prg diff --git a/harbour/contrib/hbqt/qtcore/g/hbqtcore.h b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h index 33204a7a58..2e4f487b99 100644 --- a/harbour/contrib/hbqt/qtcore/g/hbqtcore.h +++ b/harbour/contrib/hbqt/qtcore/g/hbqtcore.h @@ -41,6 +41,7 @@ extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QLine ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QLineF ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QList ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QLocale ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QMimeData ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QModelIndex ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QObject ); extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QPoint ); @@ -95,6 +96,7 @@ extern HB_EXPORT void * hbqt_gcAllocate_QLine( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QLineF( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QList( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QLocale( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QMimeData( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QModelIndex( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QObject( void * pObj, bool bNew ); extern HB_EXPORT void * hbqt_gcAllocate_QPoint( void * pObj, bool bNew ); @@ -151,6 +153,7 @@ HB_EXTERN_END #define hbqt_par_QLineF( n ) ( ( QLineF * ) hbqt_gcpointer( n ) ) #define hbqt_par_QList( n ) ( ( QList< void * > * ) hbqt_gcpointer( n ) ) #define hbqt_par_QLocale( n ) ( ( QLocale * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMimeData( n ) ( ( QMimeData * ) hbqt_gcpointer( n ) ) #define hbqt_par_QModelIndex( n ) ( ( QModelIndex * ) hbqt_gcpointer( n ) ) #define hbqt_par_QObject( n ) ( ( QObject * ) hbqt_gcpointer( n ) ) #define hbqt_par_QPoint( n ) ( ( QPoint * ) hbqt_gcpointer( n ) ) @@ -205,6 +208,7 @@ HB_EXTERN_END #define HBQT_TYPE_QLineF 0x24C33533 #define HBQT_TYPE_QList 0xED20A97D #define HBQT_TYPE_QLocale 0x456691F0 +#define HBQT_TYPE_QMimeData 0xA1F425D3 #define HBQT_TYPE_QModelIndex 0xA9E86353 #define HBQT_TYPE_QObject 0xAC4BFC84 #define HBQT_TYPE_QPoint 0x8AD48EA2 diff --git a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp index f8f22f58e9..46776be2d5 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp @@ -229,6 +229,10 @@ void * hbqt_detachgcpointer( int iParam ) hb_vmSend( 0 ); return hbqt_detachgcpointer( -1 ); } + else + { + return NULL; + } } HB_FUNC( __HBQT_ISVALIDPOINTER ) diff --git a/harbour/contrib/hbqt/utils/qtcore.qtp b/harbour/contrib/hbqt/utils/qtcore.qtp index 8e313b4256..b9453f9197 100644 --- a/harbour/contrib/hbqt/utils/qtcore.qtp +++ b/harbour/contrib/hbqt/utils/qtcore.qtp @@ -42,7 +42,7 @@ QLocale.qth ; QMetaObject.qth ; QMetaProperty.qth ; QMetaType.qth -; QMimeData.qth +QMimeData.qth QModelIndex.qth QObject.qth QPoint.qth