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

2011-04-09 11:08 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
    ! Fixed: to supply strings per UTF8 conversion to Qt.
      Now it is equivalent to hbQT engine.
This commit is contained in:
Pritpal Bedi
2011-04-09 18:10:52 +00:00
parent 3e2cfb4e48
commit d09d800cbf
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-04-09 11:08 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
! Fixed: to supply strings per UTF8 conversion to Qt.
Now it is equivalent to hbQT engine.
2011-04-09 13:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/3rd/png/pngwrite.c
* src/3rd/png/pngconf.h

10
harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
View File

@@ -87,23 +87,29 @@ QVariant hbqt_fetchData( PHB_ITEM block, int type, int role, int par1, int par2
if( hb_itemType( ret ) & HB_IT_STRING )
{
vv = hb_itemGetCPtr( ret );
void * pText01 = NULL;
vv = hb_itemGetStrUTF8( ret, &pText01, NULL );
hb_strfree( pText01 );
HB_TRACE( HB_TR_DEBUG, ( " fetchData[ s = %s ]", hb_itemGetCPtr( ret ) ) );
hb_itemRelease( ret );
}
else if( hb_itemType( ret ) & HB_IT_LOGICAL )
{
vv = hb_itemGetL( ret );
HB_TRACE( HB_TR_DEBUG, ( " fetchData[ l = %i ]", hb_itemGetL( ret ) ) );
hb_itemRelease( ret );
}
else if( hb_itemType( ret ) & HB_IT_DOUBLE )
{
vv = hb_itemGetND( ret );
HB_TRACE( HB_TR_DEBUG, ( " fetchData[ d = %f ]", hb_itemGetND( ret ) ) );
hb_itemRelease( ret );
}
else if( hb_itemType( ret ) & HB_IT_NUMERIC )
{
vv = hb_itemGetNI( ret );
HB_TRACE( HB_TR_DEBUG, ( " fetchData[ n = %i ]", hb_itemGetNI( ret ) ) );
hb_itemRelease( ret );
}
else if( hb_itemType( ret ) & HB_IT_OBJECT )
{
@@ -125,6 +131,8 @@ QVariant hbqt_fetchData( PHB_ITEM block, int type, int role, int par1, int par2
vv = * ( ( QPixmap * ) ( p->ph ) );
else if( p->type == HBQT_TYPE_QFont )
vv = * ( ( QFont * ) ( p->ph ) );
hb_itemRelease( ret );
}
hb_vmRequestRestore();