fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-12-18 09:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbqt/hbqt_hbdbfmodel.cpp
  * contrib/hbqt/generator/hbqtgen.prg
  * contrib/hbqt/hbqt_hbqtableview.cpp
  * contrib/hbqt/hbqt.h
  * contrib/hbqt/hbqt_destruct.cpp
  * contrib/hbqt/hbqt_hbqmainwindow.cpp
  * contrib/hbqt/hbqt_base.cpp
    ! Fixed gcFuncs() to be named hbqt_gcFuncs(). This is a 
      public function, please remember to prefix all public functions 
      to have a lib specific prefix.
    ; TODO: Regenerate.
This commit is contained in:
Viktor Szakats
2009-12-18 08:59:17 +00:00
parent 863baef288
commit dd3b0805a3
8 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -17,6 +17,19 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-18 09:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/hbqt_hbdbfmodel.cpp
* contrib/hbqt/generator/hbqtgen.prg
* contrib/hbqt/hbqt_hbqtableview.cpp
* contrib/hbqt/hbqt.h
* contrib/hbqt/hbqt_destruct.cpp
* contrib/hbqt/hbqt_hbqmainwindow.cpp
* contrib/hbqt/hbqt_base.cpp
! Fixed gcFuncs() to be named hbqt_gcFuncs(). This is a
public function, please remember to prefix all public functions
to have a lib specific prefix.
; TODO: Regenerate.
2009-12-18 09:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
+ Added direct link to QT Windows 4.5.3 pkg.
@@ -35,8 +48,7 @@
! Added one missing 'extern' keyword.
+ Added TOFIX for QT_HBQTABLEVIEW_NAVIGATE() which
has a remaining leak of one typical type.
; TOFIX: Do the same with gcFuncs().
; TODO: Regenerate.
; TOFIX: Do the same with gcFuncs(). [DONE]
2009-12-17 22:24 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbide/hbide.prg

6
harbour/contrib/hbqt/generator/hbqtgen.prg
View File

@@ -650,9 +650,9 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
aadd( cpp_, "void * hbqt_gcAllocate_" + cWidget + "( void * pObj )" )
aadd( cpp_, "{ " )
IF lObject
aadd( cpp_, " QGC_POINTER_" + cWidget + " * p = ( QGC_POINTER_" + cWidget + " * ) hb_gcAllocate( sizeof( QGC_POINTER_" + cWidget + " ), gcFuncs() );" )
aadd( cpp_, " QGC_POINTER_" + cWidget + " * p = ( QGC_POINTER_" + cWidget + " * ) hb_gcAllocate( sizeof( QGC_POINTER_" + cWidget + " ), hbqt_gcFuncs() );" )
ELSE
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );" )
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );" )
ENDIF
aadd( cpp_, " " )
aadd( cpp_, " p->ph = pObj;" )
@@ -698,7 +698,7 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
aadd( cpp_, new_[ 2 ] ) // {
IF lConst
IF lDestructor
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );" )
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );" )
ENDIF
IF lObject
aadd( cpp_, " QPointer< "+ cWidget +" > pObj = NULL;" )

2
harbour/contrib/hbqt/hbqt.h
View File

@@ -79,7 +79,7 @@ extern int hbqt_get_object_release_method();
HB_GARBAGE_FUNC( Q_release );
extern void * hbqt_gcpointer( int iParam );
extern const HB_GC_FUNCS * gcFuncs( void ); /* TOFIX: prefix: hbqt_ */
extern const HB_GC_FUNCS * hbqt_gcFuncs( void );
extern int hbqt_getmemused( void );

2
harbour/contrib/hbqt/hbqt_base.cpp
View File

@@ -79,7 +79,7 @@ HB_FUNC( QT_FINDCHILD )
HB_FUNC( HBQT_ISEQUALGCQTPOINTER )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( gcFuncs(), 1 );
QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), 1 );
if( p && p->ph )
hb_retl( p->ph == hb_parptr( 2 ) );

4
harbour/contrib/hbqt/hbqt_destruct.cpp
View File

@@ -75,14 +75,14 @@ const HB_GC_FUNCS QT_gcFuncs =
hb_gcDummyMark
};
const HB_GC_FUNCS * gcFuncs( void )
const HB_GC_FUNCS * hbqt_gcFuncs( void )
{
return &QT_gcFuncs;
}
void * hbqt_gcpointer( int iParam )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( gcFuncs(), iParam );
QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), iParam );
if( p && p->ph )
return p->ph;

2
harbour/contrib/hbqt/hbqt_hbdbfmodel.cpp
View File

@@ -353,7 +353,7 @@ QT_G_FUNC( hbqt_release_HBDbfModel )
void * hbqt_gcAllocate_HBDbfModel( void * pObj )
{
QGC_POINTER_HBDbfModel * p = ( QGC_POINTER_HBDbfModel * ) hb_gcAllocate( sizeof( QGC_POINTER_HBDbfModel ), gcFuncs() );
QGC_POINTER_HBDbfModel * p = ( QGC_POINTER_HBDbfModel * ) hb_gcAllocate( sizeof( QGC_POINTER_HBDbfModel ), hbqt_gcFuncs() );
p->ph = pObj;
p->func = hbqt_release_HBDbfModel;

2
harbour/contrib/hbqt/hbqt_hbqmainwindow.cpp
View File

@@ -376,7 +376,7 @@ QT_G_FUNC( release_HBQMainWindow )
void * hbqt_gcAllocate_HBQMainWindow( void * pObj )
{
QGC_POINTER_HBQMainWindow * p = ( QGC_POINTER_HBQMainWindow * ) hb_gcAllocate( sizeof( QGC_POINTER_HBQMainWindow ), gcFuncs() );
QGC_POINTER_HBQMainWindow * p = ( QGC_POINTER_HBQMainWindow * ) hb_gcAllocate( sizeof( QGC_POINTER_HBQMainWindow ), hbqt_gcFuncs() );
p->ph = pObj;
p->func = release_HBQMainWindow;

2
harbour/contrib/hbqt/hbqt_hbqtableview.cpp
View File

@@ -175,7 +175,7 @@ QT_G_FUNC( release_HBQTableView )
void * hbqt_gcAllocate_HBQTableView( void * pObj )
{
QGC_POINTER_HBQTableView * p = ( QGC_POINTER_HBQTableView * ) hb_gcAllocate( sizeof( QGC_POINTER_HBQTableView ), gcFuncs() );
QGC_POINTER_HBQTableView * p = ( QGC_POINTER_HBQTableView * ) hb_gcAllocate( sizeof( QGC_POINTER_HBQTableView ), hbqt_gcFuncs() );
p->ph = pObj;
p->func = release_HBQTableView;