diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 604c0078ed..96f0944f7d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,45 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-19 21:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/qtcore/hbqtcore.hbx + * contrib/hbqt/qtcore/hbqt_destruct.cpp + * Renamed: HBQT_SETCODECFORCSTRINGS() -> __HBQT_SETCODECFORCSTRINGS() + * Renamed: HBQT_SETCODECFORTR -> __HBQT_SETCODECFORTR() + ; These should never be called by a Harbour application. + ; TODO: Remove them in the future. + + * contrib/hbqt/qtgui/qth/QApplication.qth + * contrib/hbqt/qtcore/qth/QCoreApplication.qth + ! Fixed to initialize default QT text codec to UTF8 + inside HBQTCORE (instead of HBQTGUI). + HB_QTGUI puller will automatically pull HB_QTCORE. + ! Fixed to use HB_QTCORE and HB_QTGUI puller symbols + instead of former HB_QT. Please change your code. + ; TODO: Changed HB_QT to HB_QTGUI. + ; TODO: Delete HB_QT + + * contrib/hbqt/qtgui/g/QApplication.cpp + * contrib/hbqt/qtcore/g/QCoreApplication.cpp + * Regenerated. + + * contrib/hbqt/qtgui/doc/en/class_qpainter.txt + * contrib/hbqt/qtgui/g/QPainter.cpp + * contrib/hbqt/qtgui/g/TQPainter.prg + * Regenerated. (due to some previous commits) + + * contrib/hbqt/qtwebkit/g/hbqtwebkit.h + * Regenerated. (why?) + + * contrib/hbxbp/hbxbp.hbx + * contrib/hbxbp/xbpgeneric.prg + - Deleted wrappers dealing with modifying QT text codec: + HBXBP_SETCODEC(), HBXBP_SETCODECFORTR() + + * contrib/hbide/idemain.prg + - Deleted manual init of QT text codec. + + Changed to display active CP based on Harbour setting. + 2010-09-18 13:05 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/hbqt_hbslots.cpp * contrib/hbqt/qtcore/hbqt_hbslots.h diff --git a/harbour/contrib/hbide/idemain.prg b/harbour/contrib/hbide/idemain.prg index 7f7772aadf..c9712385ab 100644 --- a/harbour/contrib/hbide/idemain.prg +++ b/harbour/contrib/hbide/idemain.prg @@ -435,8 +435,7 @@ METHOD HbIde:create( aParams ) hbide_loadSkltns( Self ) /* Set Codec at the Begining - no interface display */ - ::cWrkCodec := "UTF-8" - HbXbp_SetCodec( ::cWrkCodec ) + ::cWrkCodec := hb_cdpSelect() /* Load IDE|User defined Themes */ ::oTH := IdeThemes():new( Self, ::oINI:getThemesFile() ):create() @@ -1437,9 +1436,7 @@ METHOD HbIde:setCodec( cCodec ) ::cWrkCodec := cCodec - HbXbp_SetCodec( ::cWrkCodec ) - - ::oDK:setStatusText( SB_PNL_CODEC, ::cWrkCodec ) + ::oDK:setStatusText( SB_PNL_CODEC, hb_cdpUniID( ::cWrkCodec ) ) RETURN Self @@ -1460,4 +1457,3 @@ METHOD HbIde:testPainter( qPainter ) RETURN NIL /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp index fb734cc802..a04a458027 100644 --- a/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp @@ -71,9 +71,41 @@ #include +#include "hbapi.h" +#include "hbvm.h" +#include "hbinit.h" + #include #include +#include +HB_FUNC( HB_QTCORE ) {;} + +static void hbqtcore_Exit( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); +} + +static void hbqtcore_Init( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); + + QTextCodec * codec = QTextCodec::codecForName( "UTF8" ); + QTextCodec::setCodecForTr( codec ); + QTextCodec::setCodecForCStrings( codec ); +} + +HB_CALL_ON_STARTUP_BEGIN( _hb_hbqtcore_init_ ) + hb_vmAtInit( hbqtcore_Init, NULL ); + hb_vmAtExit( hbqtcore_Exit, NULL ); +HB_CALL_ON_STARTUP_END( _hb_hbqtcore_init_ ) + +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup _hb_hbqtcore_init_ +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqtcore_init_ ) + #include "hbiniseg.h" +#endif /* * QCoreApplication ( int & argc, char ** argv ) diff --git a/harbour/contrib/hbqt/qtcore/hbqt_destruct.cpp b/harbour/contrib/hbqt/qtcore/hbqt_destruct.cpp index 6cd5bcca18..dfb5354862 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_destruct.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_destruct.cpp @@ -171,13 +171,13 @@ void * hbqt_pPtrFromObj( int iParam ) } } -HB_FUNC( HBQT_SETCODECFORCSTRINGS ) +HB_FUNC( __HBQT_SETCODECFORCSTRINGS ) { QTextCodec * codec = QTextCodec::codecForName( ( char * ) hb_parc( 1 ) ); QTextCodec::setCodecForCStrings( codec ); } -HB_FUNC( HBQT_SETCODECFORTR ) +HB_FUNC( __HBQT_SETCODECFORTR ) { QTextCodec * codec = QTextCodec::codecForName( ( char * ) hb_parc( 1 ) ); QTextCodec::setCodecForTr( codec ); diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbx b/harbour/contrib/hbqt/qtcore/hbqtcore.hbx index 7069db540a..e450ad426b 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbx +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbx @@ -34,8 +34,8 @@ DYNAMIC HBQTOBJECTHANDLER DYNAMIC HBQT_ISEMPTYQTPOINTER DYNAMIC HBQT_ISEQUALGCQTPOINTER DYNAMIC HBQT_PTR -DYNAMIC HBQT_SETCODECFORCSTRINGS -DYNAMIC HBQT_SETCODECFORTR +DYNAMIC __HBQT_SETCODECFORCSTRINGS +DYNAMIC __HBQT_SETCODECFORTR DYNAMIC HBSLOTS DYNAMIC QABSTRACTITEMMODEL DYNAMIC QABSTRACTLISTMODEL diff --git a/harbour/contrib/hbqt/qtcore/qth/QCoreApplication.qth b/harbour/contrib/hbqt/qtcore/qth/QCoreApplication.qth index b4f79dfcaf..13b0ed67bb 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QCoreApplication.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QCoreApplication.qth @@ -62,9 +62,41 @@ New = +#include "hbapi.h" +#include "hbvm.h" +#include "hbinit.h" + #include #include +#include +HB_FUNC( HB_QTCORE ) {;} + +static void hbqtcore_Exit( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); +} + +static void hbqtcore_Init( void * cargo ) +{ + HB_SYMBOL_UNUSED( cargo ); + + QTextCodec * codec = QTextCodec::codecForName( "UTF8" ); + QTextCodec::setCodecForTr( codec ); + QTextCodec::setCodecForCStrings( codec ); +} + +HB_CALL_ON_STARTUP_BEGIN( _hb_hbqtcore_init_ ) + hb_vmAtInit( hbqtcore_Init, NULL ); + hb_vmAtExit( hbqtcore_Exit, NULL ); +HB_CALL_ON_STARTUP_END( _hb_hbqtcore_init_ ) + +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup _hb_hbqtcore_init_ +#elif defined( HB_DATASEG_STARTUP ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqtcore_init_ ) + #include "hbiniseg.h" +#endif /* * QCoreApplication ( int & argc, char ** argv ) diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt index f01dcb106a..ff4852ac7b 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt @@ -114,6 +114,7 @@ * :drawRoundedRect( pRect, nXRadius, nYRadius, nMode ) -> NIL * :drawRoundedRect_1( pRect, nXRadius, nYRadius, nMode ) -> NIL * :drawRoundedRect_2( nX, nY, nW, nH, nXRadius, nYRadius, nMode ) -> NIL + * :hbDrawText( ... ) -> NIL * :drawText( pPosition, cText ) -> NIL * :drawText_1( pPosition, cText ) -> NIL * :drawText_2( pRectangle, nFlags, cText, pBoundingRect ) -> NIL diff --git a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp index 2db84e0654..eddf9e6fab 100644 --- a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp @@ -84,7 +84,6 @@ #include #include #include -#include #include static QApplication * s_app = NULL; @@ -92,7 +91,17 @@ static QApplication * s_app = NULL; static int s_argc; static char ** s_argv; -HB_FUNC( HB_QT ) {;} +HB_FUNC_EXTERN( HB_QTCORE ); + +HB_FUNC( HB_QTGUI ) +{ + HB_FUNC_EXEC( HB_QTCORE ); +} + +HB_FUNC( HB_QT ) /* For compatibility */ +{ + HB_FUNC_EXEC( HB_QTCORE ); +} /* * QApplication ( int & argc, char ** argv ) @@ -104,7 +113,7 @@ HB_FUNC( HB_QT ) {;} */ -static void hbqt_Exit( void * cargo ) +static void hbqtgui_Exit( void * cargo ) { HB_SYMBOL_UNUSED( cargo ); @@ -112,34 +121,30 @@ static void hbqt_Exit( void * cargo ) //s_app = NULL; } -static void hbqt_Init( void * cargo ) +static void hbqtgui_Init( void * cargo ) { HB_SYMBOL_UNUSED( cargo ); - QTextCodec * codec = QTextCodec::codecForName( "UTF8" ); - QTextCodec::setCodecForTr( codec ); - QTextCodec::setCodecForCStrings( codec ); - s_argc = hb_cmdargARGC(); s_argv = hb_cmdargARGV(); s_app = new QApplication( s_argc, s_argv ); if( ! s_app ) - hb_errInternal( 11001, "hbqt_Init(): QT Initilization Error.", NULL, NULL ); + hb_errInternal( 11001, "hbqtgui_Init(): QT Initilization Error.", NULL, NULL ); hb_cmdargInit( s_argc, s_argv ); } -HB_CALL_ON_STARTUP_BEGIN( _hb_hbqt_init_ ) - hb_vmAtInit( hbqt_Init, NULL ); - hb_vmAtExit( hbqt_Exit, NULL ); -HB_CALL_ON_STARTUP_END( _hb_hbqt_init_ ) +HB_CALL_ON_STARTUP_BEGIN( _hb_hbqtgui_init_ ) + hb_vmAtInit( hbqtgui_Init, NULL ); + hb_vmAtExit( hbqtgui_Exit, NULL ); +HB_CALL_ON_STARTUP_END( _hb_hbqtgui_init_ ) #if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_hbqt_init_ + #pragma startup _hb_hbqtgui_init_ #elif defined( HB_DATASEG_STARTUP ) - #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqt_init_ ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqtgui_init_ ) #include "hbiniseg.h" #endif diff --git a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp index d3a5515d29..df92d764c4 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp @@ -73,7 +73,7 @@ */ /* - * Constructed[ 179/192 [ 93.23% ] ] + * Constructed[ 180/194 [ 92.78% ] ] * * *** Unconvered Prototypes *** * ----------------------------- @@ -86,6 +86,7 @@ * } * void drawRects ( const QVector & rectangles ) * void drawRects ( const QVector & rectangles ) + * } * * *** Commented out protos which construct fine but do not compile *** * @@ -1323,6 +1324,58 @@ HB_FUNC( QT_QPAINTER_DRAWROUNDEDRECT_2 ) } } +/* + * void hbDrawText ( ... ) + */ +HB_FUNC( QT_QPAINTER_HBDRAWTEXT ) +{ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + int iP = hb_pcount(); + + if( HB_ISNUM( 2 ) ) + { + if( iP >= 7 ) + { + ( p )->drawText( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hbqt_par_QString( 7 ), ( HB_ISPOINTER( 8 ) ? hbqt_par_QRect( 8 ) : 0 ) ); + } + else if( iP == 4 ) + { + ( p )->drawText( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ); + } + } + else if( HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawText( *hbqt_par_QPointF( 2 ), hbqt_par_QString( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawText( *hbqt_par_QPoint( 2 ), hbqt_par_QString( 3 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawText( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QRect( 5 ) : 0 ) ); + } + else if( q->type == HBQT_TYPE_QRectF ) + { + if( HB_ISNUM( 3 ) ) + { + ( p )->drawText( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ), ( HB_ISPOINTER( 5 ) ? hbqt_par_QRectF( 5 ) : 0 ) ); + } + else if( HB_ISCHAR( 3 ) ) + { + ( p )->drawText( *hbqt_par_QRectF( 2 ), hbqt_par_QString( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QTextOption( 4 ) : QTextOption() ) ); + } + } + } + } +} + /* * void drawText ( const QPointF & position, const QString & text ) */ diff --git a/harbour/contrib/hbqt/qtgui/g/TQPainter.prg b/harbour/contrib/hbqt/qtgui/g/TQPainter.prg index 8aa1bad974..bdffeba48d 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPainter.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPainter.prg @@ -159,6 +159,7 @@ CREATE CLASS QPainter INHERIT HbQtObjectHandler FUNCTION HB_QPainter METHOD drawRoundedRect( pRect, nXRadius, nYRadius, nMode ) METHOD drawRoundedRect_1( pRect, nXRadius, nYRadius, nMode ) METHOD drawRoundedRect_2( nX, nY, nW, nH, nXRadius, nYRadius, nMode ) + METHOD hbDrawText( ... ) METHOD drawText( pPosition, cText ) METHOD drawText_1( pPosition, cText ) METHOD drawText_2( pRectangle, nFlags, cText, pBoundingRect ) @@ -623,6 +624,14 @@ METHOD QPainter:drawRoundedRect_2( nX, nY, nW, nH, nXRadius, nYRadius, nMode ) RETURN Qt_QPainter_drawRoundedRect_2( ::pPtr, nX, nY, nW, nH, nXRadius, nYRadius, nMode ) +METHOD QPainter:hbDrawText( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_hbDrawText( ::pPtr, ... ) + + METHOD QPainter:drawText( pPosition, cText ) RETURN Qt_QPainter_drawText( ::pPtr, hbqt_ptr( pPosition ), cText ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QApplication.qth b/harbour/contrib/hbqt/qtgui/qth/QApplication.qth index 5b390a7db8..bf87524ce1 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QApplication.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QApplication.qth @@ -71,7 +71,6 @@ New = #include #include #include -#include #include static QApplication * s_app = NULL; @@ -79,7 +78,17 @@ static QApplication * s_app = NULL; static int s_argc; static char ** s_argv; -HB_FUNC( HB_QT ) {;} +HB_FUNC_EXTERN( HB_QTCORE ); + +HB_FUNC( HB_QTGUI ) +{ + HB_FUNC_EXEC( HB_QTCORE ); +} + +HB_FUNC( HB_QT ) /* For compatibility */ +{ + HB_FUNC_EXEC( HB_QTCORE ); +} /* * QApplication ( int & argc, char ** argv ) @@ -96,7 +105,7 @@ HB_FUNC( QT_QAPPLICATION ) hb_retptr ( s_app ); } -static void hbqt_Exit( void * cargo ) +static void hbqtgui_Exit( void * cargo ) { HB_SYMBOL_UNUSED( cargo ); @@ -104,34 +113,30 @@ static void hbqt_Exit( void * cargo ) //s_app = NULL; } -static void hbqt_Init( void * cargo ) +static void hbqtgui_Init( void * cargo ) { HB_SYMBOL_UNUSED( cargo ); - QTextCodec * codec = QTextCodec::codecForName( "UTF8" ); - QTextCodec::setCodecForTr( codec ); - QTextCodec::setCodecForCStrings( codec ); - s_argc = hb_cmdargARGC(); s_argv = hb_cmdargARGV(); s_app = new QApplication( s_argc, s_argv ); if( ! s_app ) - hb_errInternal( 11001, "hbqt_Init(): QT Initilization Error.", NULL, NULL ); + hb_errInternal( 11001, "hbqtgui_Init(): QT Initilization Error.", NULL, NULL ); hb_cmdargInit( s_argc, s_argv ); } -HB_CALL_ON_STARTUP_BEGIN( _hb_hbqt_init_ ) - hb_vmAtInit( hbqt_Init, NULL ); - hb_vmAtExit( hbqt_Exit, NULL ); -HB_CALL_ON_STARTUP_END( _hb_hbqt_init_ ) +HB_CALL_ON_STARTUP_BEGIN( _hb_hbqtgui_init_ ) + hb_vmAtInit( hbqtgui_Init, NULL ); + hb_vmAtExit( hbqtgui_Exit, NULL ); +HB_CALL_ON_STARTUP_END( _hb_hbqtgui_init_ ) #if defined( HB_PRAGMA_STARTUP ) - #pragma startup _hb_hbqt_init_ + #pragma startup _hb_hbqtgui_init_ #elif defined( HB_DATASEG_STARTUP ) - #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqt_init_ ) + #define HB_DATASEG_BODY HB_DATASEG_FUNC( _hb_hbqtgui_init_ ) #include "hbiniseg.h" #endif diff --git a/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h index 3686f39453..cb288faa32 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h +++ b/harbour/contrib/hbqt/qtwebkit/g/hbqtwebkit.h @@ -1,64 +1,64 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -#ifndef __HBQTWEBKIT_H -#define __HBQTWEBKIT_H - -#include "hbqt.h" - -HB_EXTERN_BEGIN - -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebFrame ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistory ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistoryInterface ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistoryItem ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHitTestResult ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebPage ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebPluginFactory ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebSecurityOrigin ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebSettings ); -extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebView ); - -extern HB_EXPORT void * hbqt_gcAllocate_QWebFrame( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QWebHistory( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QWebHistoryInterface( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QWebHistoryItem( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QWebHitTestResult( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QWebPage( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QWebPluginFactory( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QWebSettings( void * pObj, bool bNew ); -extern HB_EXPORT void * hbqt_gcAllocate_QWebView( void * pObj, bool bNew ); - -HB_EXTERN_END - -#define hbqt_par_QWebFrame( n ) ( ( QWebFrame * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebHistory( n ) ( ( QWebHistory * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebHistoryInterface( n ) ( ( QWebHistoryInterface * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebHistoryItem( n ) ( ( QWebHistoryItem * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebHitTestResult( n ) ( ( QWebHitTestResult * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebPage( n ) ( ( QWebPage * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebPluginFactory( n ) ( ( QWebPluginFactory * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebSecurityOrigin( n ) ( ( QWebSecurityOrigin * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebSettings( n ) ( ( QWebSettings * ) hbqt_gcpointer( n ) ) -#define hbqt_par_QWebView( n ) ( ( QWebView * ) hbqt_gcpointer( n ) ) - -#define HBQT_TYPE_QWebFrame 0xC549CCEE -#define HBQT_TYPE_QWebHistory 0x24AE8587 -#define HBQT_TYPE_QWebHistoryInterface 0x24436755 -#define HBQT_TYPE_QWebHistoryItem 0x24DEA87F -#define HBQT_TYPE_QWebHitTestResult 0xA2B0A23E -#define HBQT_TYPE_QWebPage 0xCF0E1A25 -#define HBQT_TYPE_QWebPluginFactory 0x8313F829 -#define HBQT_TYPE_QWebSecurityOrigin 0x76EEBFE7 -#define HBQT_TYPE_QWebSettings 0x77943AAB -#define HBQT_TYPE_QWebView 0x25F9078B - -#endif /* __HBQTWEBKIT_H */ +/* + * $Id$ + */ + +/* -------------------------------------------------------------------- */ +/* WARNING: Automatically generated source file. DO NOT EDIT! */ +/* Instead, edit corresponding .qth file, */ +/* or the generator tool itself, and run regenarate. */ +/* -------------------------------------------------------------------- */ + +#ifndef __HBQTWEBKIT_H +#define __HBQTWEBKIT_H + +#include "hbqt.h" + +HB_EXTERN_BEGIN + +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebFrame ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistory ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistoryInterface ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHistoryItem ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebHitTestResult ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebPage ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebPluginFactory ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebSecurityOrigin ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebSettings ); +extern HB_EXPORT HBQT_GC_FUNC( hbqt_gcRelease_QWebView ); + +extern HB_EXPORT void * hbqt_gcAllocate_QWebFrame( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebHistory( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebHistoryInterface( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebHistoryItem( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebHitTestResult( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebPage( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebPluginFactory( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebSettings( void * pObj, bool bNew ); +extern HB_EXPORT void * hbqt_gcAllocate_QWebView( void * pObj, bool bNew ); + +HB_EXTERN_END + +#define hbqt_par_QWebFrame( n ) ( ( QWebFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHistory( n ) ( ( QWebHistory * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHistoryInterface( n ) ( ( QWebHistoryInterface * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHistoryItem( n ) ( ( QWebHistoryItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHitTestResult( n ) ( ( QWebHitTestResult * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebPage( n ) ( ( QWebPage * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebPluginFactory( n ) ( ( QWebPluginFactory * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebSecurityOrigin( n ) ( ( QWebSecurityOrigin * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebSettings( n ) ( ( QWebSettings * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebView( n ) ( ( QWebView * ) hbqt_gcpointer( n ) ) + +#define HBQT_TYPE_QWebFrame 0xC549CCEE +#define HBQT_TYPE_QWebHistory 0x24AE8587 +#define HBQT_TYPE_QWebHistoryInterface 0x24436755 +#define HBQT_TYPE_QWebHistoryItem 0x24DEA87F +#define HBQT_TYPE_QWebHitTestResult 0xA2B0A23E +#define HBQT_TYPE_QWebPage 0xCF0E1A25 +#define HBQT_TYPE_QWebPluginFactory 0x8313F829 +#define HBQT_TYPE_QWebSecurityOrigin 0x76EEBFE7 +#define HBQT_TYPE_QWebSettings 0x77943AAB +#define HBQT_TYPE_QWebView 0x25F9078B + +#endif /* __HBQTWEBKIT_H */ diff --git a/harbour/contrib/hbxbp/hbxbp.hbx b/harbour/contrib/hbxbp/hbxbp.hbx index a11db5dd63..e3b1007d4a 100644 --- a/harbour/contrib/hbxbp/hbxbp.hbx +++ b/harbour/contrib/hbxbp/hbxbp.hbx @@ -72,8 +72,6 @@ DYNAMIC HBPPROCESS DYNAMIC HBXBP_CLEAREVENTBUFFER DYNAMIC HBXBP_CONVERTAFACTFROMXBP DYNAMIC HBXBP_INITIALIZEEVENTBUFFER -DYNAMIC HBXBP_SETCODEC -DYNAMIC HBXBP_SETCODECFORTR DYNAMIC HBXBP_SETEVENTLOOP DYNAMIC LASTAPPEVENT DYNAMIC MSGBOX diff --git a/harbour/contrib/hbxbp/xbpgeneric.prg b/harbour/contrib/hbxbp/xbpgeneric.prg index f7d9570efc..a97ad24004 100644 --- a/harbour/contrib/hbxbp/xbpgeneric.prg +++ b/harbour/contrib/hbxbp/xbpgeneric.prg @@ -392,19 +392,3 @@ FUNCTION hbxbp_ConvertAFactFromXBP( cMode, xValue ) RETURN xValue /*----------------------------------------------------------------------*/ - -FUNCTION HbXbp_SetCodec( cCodec ) - IF !empty( cCodec ) - hbqt_SetCodecForCStrings( cCodec ) - ENDIF - RETURN NIL - -/*----------------------------------------------------------------------*/ - -FUNCTION HbXbp_SetCodecForTr( cCodec ) - IF !empty( cCodec ) - hbqt_SetCodecForTr( cCodec ) - ENDIF - RETURN NIL - -/*----------------------------------------------------------------------*/