From f6796cc50d178669274198c55e2e7a8ee48aa40d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 21 Apr 2012 09:03:08 +0000 Subject: [PATCH] 2012-04-20 11:02 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbqt/qtcore/hbqt_pointer.cpp * contrib/hbqt/qtcore/hbqt.h * string variable names corrected --- harbour/ChangeLog | 5 +++ harbour/contrib/hbqt/qtcore/hbqt.h | 6 +-- harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp | 41 ++++++++++---------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 571a9c4b5b..4a13084a4c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2012-04-20 11:02 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/hbqt/qtcore/hbqt_pointer.cpp + * contrib/hbqt/qtcore/hbqt.h + * string variable names corrected + 2012-04-20 10:45 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/gtwvg/wvgwin.c ! fixed broken compilation in WVG_SendCBMessage() when using mingw 4.7 diff --git a/harbour/contrib/hbqt/qtcore/hbqt.h b/harbour/contrib/hbqt/qtcore/hbqt.h index b0194e5cf1..ee1d0df439 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt.h +++ b/harbour/contrib/hbqt/qtcore/hbqt.h @@ -103,13 +103,13 @@ extern HB_EXPORT void hbqt_par_detach_ptrGC( int iParam ); extern HB_EXPORT void hbqt_itemPushReturn( void * ptr, PHB_ITEM pSelf ); extern HB_EXPORT HB_U32 hbqt_getObjectType( int iParam ); extern HB_EXPORT HB_BOOL hbqt_isObjectType( int iParam, HB_U32 iType ); /* check if parameter iParam is EXACTLY of type iType */ -extern HB_EXPORT HB_BOOL hbqt_par_isDerivedFrom( int iParam, const char * szClsName ); /* check if parameter iParam is class or subclass of szClsName */ -extern HB_EXPORT HB_BOOL hbqt_obj_isDerivedFrom( PHB_ITEM pItem, const char * szClsName ); /* check if parameter iParam is class or subclass of szClsName */ +extern HB_EXPORT HB_BOOL hbqt_par_isDerivedFrom( int iParam, const char * pszClsName ); /* check if parameter iParam is class or subclass of szClsName */ +extern HB_EXPORT HB_BOOL hbqt_obj_isDerivedFrom( PHB_ITEM pItem, const char * pszClsName ); /* check if parameter iParam is class or subclass of szClsName */ extern HB_EXPORT void * hbqt_get_ptr( PHB_ITEM pObj ); extern HB_EXPORT const HB_GC_FUNCS * hbqt_gcFuncs( void ); extern HB_EXPORT void hbqt_errRT_ARG( void ); -extern HB_EXPORT PHB_ITEM hbqt_defineClassBegin( const char * szClsName, PHB_ITEM s_oClass, const char * szParentClsStr ); +extern HB_EXPORT PHB_ITEM hbqt_defineClassBegin( const char * pszClsName, PHB_ITEM s_oClass, const char * pszParentClsStr ); extern HB_EXPORT void hbqt_defineClassEnd( PHB_ITEM s_oClass, PHB_ITEM oClass ); extern HB_EXPORT PHB_ITEM hbqt_create_object( void * pObject, const char * pszObjectName ); extern HB_EXPORT PHB_ITEM hbqt_create_objectGC( void * pObject, const char * pszObjectName ); diff --git a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp index d4a9d7bf63..b6689ed74c 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp @@ -335,7 +335,7 @@ HB_FUNC( __HBQT_SETUTF8 ) hb_vmSetCDP( cdp ); } -PHB_ITEM hbqt_defineClassBegin( const char * szClsName, PHB_ITEM s_oClass, const char * szParentClsStr ) +PHB_ITEM hbqt_defineClassBegin( const char * pszClsName, PHB_ITEM s_oClass, const char * pszParentClsStr ) { static PHB_DYNS s__CLSLOCKDEF = NULL; @@ -349,11 +349,11 @@ PHB_ITEM hbqt_defineClassBegin( const char * szClsName, PHB_ITEM s_oClass, const hb_vmPushItemRef( s_oClass ); hb_vmDo( 1 ); - if( hb_itemGetL( hb_stackReturnItem() ) && szParentClsStr ) + if( hb_itemGetL( hb_stackReturnItem() ) && pszParentClsStr ) { static PHB_DYNS s___HBCLASS = NULL; - char * szSingleClsNameBuf = ( char * ) hb_xgrab( strlen( szParentClsStr ) + 1 ); + char * pszSingleClsNameBuf = ( char * ) hb_xgrab( strlen( pszParentClsStr ) + 1 ); if( s___HBCLASS == NULL ) s___HBCLASS = hb_dynsymGetCase( "HBCLASS" ); @@ -362,7 +362,7 @@ PHB_ITEM hbqt_defineClassBegin( const char * szClsName, PHB_ITEM s_oClass, const PHB_ITEM pSuper = hb_itemNew( NULL ); PHB_ITEM pSym_ClsFunc = hb_itemNew( NULL ); - hb_itemPutC( pClsName, szClsName ); + hb_itemPutC( pClsName, pszClsName ); HB_SIZE nPos = 0; HB_SIZE nStart = 0; @@ -370,19 +370,19 @@ PHB_ITEM hbqt_defineClassBegin( const char * szClsName, PHB_ITEM s_oClass, const /* array with parent classes (at least ONE) */ hb_arrayNew( pSuper, 0 ); - HB_TRACE( HB_TR_DEBUG, ("%s: dCB 3", szClsName ) ); + HB_TRACE( HB_TR_DEBUG, ("%s: dCB 3", pszClsName ) ); - while( szParentClsStr[ nPos++ ] ) + while( pszParentClsStr[ nPos++ ] ) { - if( ! szParentClsStr[ nPos ] || ( szParentClsStr[ nPos ] == ',' && szParentClsStr[ nPos + 1 ] == ' ' ) ) + if( ! pszParentClsStr[ nPos ] || ( pszParentClsStr[ nPos ] == ',' && pszParentClsStr[ nPos + 1 ] == ' ' ) ) { PHB_ITEM pItem = hb_itemNew( NULL ); - memcpy( szSingleClsNameBuf, szParentClsStr + nStart, nPos - nStart ); - szSingleClsNameBuf[ nPos - nStart ] = '\0'; + memcpy( pszSingleClsNameBuf, pszParentClsStr + nStart, nPos - nStart ); + pszSingleClsNameBuf[ nPos - nStart ] = '\0'; - hb_itemPutC( pItem, szSingleClsNameBuf ); - hb_arrayAdd( pSuper, hb_itemPutSymbol( pItem, hb_dynsymGetCase( szSingleClsNameBuf )->pSymbol ) ); + hb_itemPutC( pItem, pszSingleClsNameBuf ); + hb_arrayAdd( pSuper, hb_itemPutSymbol( pItem, hb_dynsymGetCase( pszSingleClsNameBuf )->pSymbol ) ); hb_itemRelease( pItem ); @@ -390,9 +390,9 @@ PHB_ITEM hbqt_defineClassBegin( const char * szClsName, PHB_ITEM s_oClass, const } } - hb_xfree( szSingleClsNameBuf ); + hb_xfree( pszSingleClsNameBuf ); - hb_itemPutSymbol( pSym_ClsFunc, hb_dynsymGetCase( szClsName )->pSymbol ); + hb_itemPutSymbol( pSym_ClsFunc, hb_dynsymGetCase( pszClsName )->pSymbol ); hb_vmPushDynSym( s___HBCLASS ); hb_vmPushNil(); @@ -400,7 +400,7 @@ PHB_ITEM hbqt_defineClassBegin( const char * szClsName, PHB_ITEM s_oClass, const /* TODO: change this hack */ char test[ HB_SYMBOL_NAME_LEN + 1 ]; - hb_snprintf( test, sizeof( test ), "HB_%s", szClsName ); + hb_snprintf( test, sizeof( test ), "HB_%s", pszClsName ); hb_itemPutSymbol( pSym_ClsFunc, hb_dynsymGetCase( test )->pSymbol ); @@ -478,21 +478,20 @@ PHB_ITEM hbqt_create_objectGC( void * pObject, const char * pszObjectName ) return hb_stackReturnItem(); } -HB_BOOL hbqt_obj_isDerivedFrom( PHB_ITEM pItem, const char * szClsName ) +HB_BOOL hbqt_obj_isDerivedFrom( PHB_ITEM pItem, const char * pszClsName ) { - return hb_clsIsParent( hb_objGetClass( pItem ), szClsName ); + return hb_clsIsParent( hb_objGetClass( pItem ), pszClsName ); } -/* Checks that the param iParam is an object and a subclass of szClsName */ - -HB_BOOL hbqt_par_isDerivedFrom( int iParam, const char * szClsName ) +/* Checks that the param iParam is an object and a subclass of pszClsName */ +HB_BOOL hbqt_par_isDerivedFrom( int iParam, const char * pszClsName ) { PHB_ITEM pItem; - HB_TRACE( HB_TR_DEBUG, ( "hbqt_par_isDerivedFrom( %i, %s )", iParam, szClsName ) ); + HB_TRACE( HB_TR_DEBUG, ( "hbqt_par_isDerivedFrom( %i, %s )", iParam, pszClsName ) ); if( ( pItem = hb_param( iParam, HB_IT_OBJECT ) ) != NULL ) - return hbqt_obj_isDerivedFrom( pItem, szClsName ); + return hbqt_obj_isDerivedFrom( pItem, pszClsName ); return HB_FALSE; }