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

2011-04-25 23:16 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/hbmk2_qt.hbs
    ! Removed: one already commented-out section.

  * contrib/hbqt/qtcore/hbqt_pointer.cpp
    ! Removed: few more raw-pointers constructs which were 
      hanging around unneccessarily.
This commit is contained in:
Pritpal Bedi
2011-04-26 06:19:59 +00:00
parent feed03fe2b
commit 2a036f3643
3 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -16,6 +16,14 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-04-25 23:16 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/hbmk2_qt.hbs
! Removed: one already commented-out section.
* contrib/hbqt/qtcore/hbqt_pointer.cpp
! Removed: few more raw-pointers constructs which were
hanging around unneccessarily.
2011-04-26 02:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbct/token2.c
% deleted unnecessary null check of hb_xrealloc() retval

9
harbour/contrib/hbqt/hbmk2_qt.hbs
View File

@@ -2618,15 +2618,6 @@ METHOD HbQtSource:buildCppCode( oMtd )
CASE oRet:lFar .AND. ! oRet:lConst
cRef := oRet:cCast
oMtd:cCmd := hbqtgen_Get_Command( oRet:cCast, oMtd:cCmn, .F. )
#if 0
IF hbqtgen_isAqtObject( oRet:cCast )
cRef := oRet:cCast
oMtd:cCmd := hbqtgen_Get_Command( oRet:cCast, oMtd:cCmn, .F. )
ELSE
/* TOFIX: Such code is not valid and should never be generated [vszakats] */
oMtd:cCmd := "hb_retptr( ( " + oRet:cCast + "* ) " + oMtd:cCmn + " )"
ENDIF
#endif
oMtd:cPrgRet := "o" + oMtd:cDocNMRet
CASE hbqtgen_isAqtObject( oRet:cCast ) .AND. ;

32
harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp
View File

@@ -92,8 +92,6 @@ static HB_GARBAGE_FUNC( Q_mark )
p->mark( p );
}
static const HB_GC_FUNCS QT_gcFuncs =
{
Q_release,
@@ -113,38 +111,25 @@ void * hbqt_par_obj( int iParam )
if( ( pItem = hb_param( iParam, HB_IT_OBJECT ) ) != NULL )
{
HBQT_GC_T * p;
void * pr;
hb_vmPushSymbol( hb_dynsymSymbol( hb_dynsymFindName( "PPTR" ) ) );
hb_vmPush( pItem );
hb_vmSend( 0 );
pItem = hb_param( -1, HB_IT_POINTER );
p = ( HBQT_GC_T * ) hb_itemGetPtrGC( pItem, hbqt_gcFuncs() );
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_itemGetPtrGC( pItem, hbqt_gcFuncs() );
if( p && p->ph )
return p->ph;
#if 1
else if( ( pr = hb_itemGetPtr( pItem ) ) != NULL )
return pr; /* TOFIX: Only required in QList.cpp hb_retptr() calls. Though the latter should be fixed, rather than this code. */
#endif
else
hb_errRT_BASE( EG_ARG, 8001, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
else if( HB_ISPOINTER( iParam ) )
{
return hb_parptr( iParam );
}
else
{
HBQT_GC_T * p;
p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), iParam );
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), iParam );
if( p && p->ph )
return p->ph;
}
return NULL;
}
@@ -153,22 +138,14 @@ void * hbqt_gcpointer( int iParam )
#if 0
return hbqt_par_obj( iParam );
#else
HBQT_GC_T * p;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcpointer( %d )", iParam ) );
p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), iParam );
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), iParam );
if( p && p->ph )
{
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcpointer(): returns p->: %p", p->ph ) );
return p->ph;
}
else if( HB_ISPOINTER( iParam ) )
{
HB_TRACE( HB_TR_DEBUG, ( "hbqt_gcpointer(): returns RAW pointer: %p", hb_parptr( iParam ) ) );
return NULL;
}
else if( HB_ISOBJECT( iParam ) )
{
PHB_ITEM pObj = hb_param( iParam, HB_IT_ANY );
@@ -214,6 +191,7 @@ void * hbqt_pPtrFromObj( int iParam )
return pointer;
}
#if 1 /* TOFIX: This is the only raw pointers usage - HBQEvents and HBQSlots */
else if( hb_itemType( pObj ) == HB_IT_POINTER )
{
HB_TRACE( HB_TR_DEBUG, ( "hbqt_pPtrFromObj= IS_POINTER" ) );
@@ -224,6 +202,7 @@ void * hbqt_pPtrFromObj( int iParam )
return pointer;
}
#endif
else
{
HB_TRACE( HB_TR_DEBUG, ( "hbqt_pPtrFromObj(): returns NULL" ) );
@@ -304,7 +283,6 @@ HBQT_GC_T * hbqt_getObjectGC( int iParam )
return p;
}
}
/* hbqt_errRT_ARG(); */ /* NOTE: Could not check type for whatever reason */
return NULL;