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

2016-09-23 09:47 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* contrib/gtqtc/gtqtc1.cpp
    ! fixed C++ casting in MS-Windows builds
This commit is contained in:
Przemysław Czerpak
2016-09-23 09:47:21 +02:00
parent 72016f2bc3
commit 67f26c47c3
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.txt
View File

@@ -10,6 +10,10 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2016-09-23 09:47 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/gtqtc/gtqtc1.cpp
! fixed C++ casting in MS-Windows builds
2016-09-22 15:47 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* include/hbapi.h
* include/hbvmpub.h

10
contrib/gtqtc/gtqtc1.cpp
View File

@@ -94,16 +94,26 @@ static void hb_gt_qtc_itemGetQString( PHB_ITEM pItem, QString * pqStr )
if( ( wStr = hb_itemGetStrU16( pItem, HB_CDP_ENDIAN_NATIVE, &hStr, &nSize ) ) != NULL )
{
#if defined( HB_OS_WIN )
* pqStr = QString::fromWCharArray( wStr, nSize );
#else
* pqStr = QString::fromUtf16( static_cast< const ushort * >( wStr ), nSize );
#endif
hb_strfree( hStr );
}
}
static PHB_ITEM hb_gt_qtc_itemPutQString( PHB_ITEM pItem, const QString * pqStr )
{
#if defined( HB_OS_WIN )
return hb_itemPutStrLenU16( pItem, HB_CDP_ENDIAN_NATIVE,
reinterpret_cast< const HB_WCHAR * >( pqStr->utf16() ),
pqStr->size() );
#else
return hb_itemPutStrLenU16( pItem, HB_CDP_ENDIAN_NATIVE,
static_cast< const HB_WCHAR * >( pqStr->utf16() ),
pqStr->size() );
#endif
}
/* *********************************************************************** */