diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 37d0b7bd93..73926e81b8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,77 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-26 02:14 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/xhb/fparse.c + * contrib/rddsql/sddmy/mysqldd.c + * contrib/rddsql/sqlbase.c + * contrib/rddsql/sqlmix.c + * contrib/rddads/adsx.c + * contrib/examples/terminal/trm_client.prg + * source/rdd/dbfnsx/dbfnsx1.c + % "" -> NULL where applicable (hb_retc*(), hb_retds(), hb_itemPutC*(), + hb_arraySetC*(), hb_errInternal(), hb_itemPutDS(), hb_arraySetDS()) + + * contrib/hbqt/hbqt_qtextdocument.cpp + * contrib/hbqt/hbqt_qgridlayout.cpp + * contrib/hbqt/hbqt_qpainter.cpp + * contrib/hbqt/hbqt_qeventloop.cpp + * contrib/hbqt/hbqt_qicon.cpp + * contrib/hbqt/hbqt_qtreeview.cpp + * contrib/hbqt/hbqt_qtextline.cpp + * contrib/hbqt/hbqt_qdesktopwidget.cpp + * contrib/hbqt/hbqt_qhttp.cpp + * contrib/hbqt/hbqt_qlineedit.cpp + * contrib/hbqt/hbqt_qcombobox.cpp + * contrib/hbqt/hbqt_qlistwidget.cpp + * contrib/hbqt/hbqt_qtextcursor.cpp + * contrib/hbqt/hbqt_qtextlayout.cpp + * contrib/hbqt/hbqt_qftp.cpp + * contrib/hbqt/hbqt_qclipboard.cpp + * contrib/hbqt/hbqt_qurl.cpp + * contrib/hbqt/hbqt_qwebpage.cpp + * contrib/hbqt/hbqt_qtextedit.cpp + * contrib/hbqt/hbqt_qpixmap.cpp + * contrib/hbqt/hbqt_qsplashscreen.cpp + * contrib/hbqt/hbqt_qtablewidget.cpp + * contrib/hbqt/hbqt_qtreewidget.cpp + * contrib/hbqt/generator/hbqtgen.prg + * contrib/hbqt/hbqt_qfont.cpp + * contrib/hbqt/hbqt_qmainwindow.cpp + * contrib/hbqt/hbqt_qdir.cpp + * contrib/hbqt/hbqt_qwidget.cpp + * contrib/hbqt/hbqt_qstyle.cpp + * contrib/hbqt/hbqt_qabstractbutton.cpp + * contrib/hbqt/hbqt_qobject.cpp + * contrib/hbqt/hbqt_qcolor.cpp + * contrib/hbqt/hbqt_qtextstream.cpp + * contrib/hbqt/hbqt_qwebview.cpp + * contrib/hbqt/hbqt_qboxlayout.cpp + * contrib/hbqt/hbqt_qstatusbar.cpp + * contrib/hbqt/hbqt_qtabwidget.cpp + * contrib/hbqt/hbqt_qscrollarea.cpp + * contrib/hbqt/hbqt_qtextcharformat.cpp + ! Fixed to use HB_ISNUM() instead of HB_ISNIL(). + % Don't call HB_ISNUM() where the default value is + zero anyway. hb_parn*() functions will return zero + anyway. (well, maybe this exploits the array-type + bug in our Extend API.) + + * contrib/gtwvg/wvgwin.c + * contrib/gtwvg/wvgsink.c + * Avoiding ISNIL(). Corrected just a few occurences. + This practice is still wrong in most of the cases in + GTWVG code, so if the goal is GPF-free and consitently + behaving apps, these would better be fixed. With + string params ISNIL() is either superfluous or simply + don't protect agains GPFs, for rest of the cases it + either causes unexpected defaults (zero), or simply + superfluous for the rest of the cases. IOW: Avoid it, + use HB_ISNUM(), HB_ISCHAR() / parcx() instead. + + * contrib/hbgd/gdwrp.c + * Formatting. + 2009-05-25 15:01 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/gtwvg/wvgsink.c * Cleanup . diff --git a/harbour/contrib/examples/terminal/trm_client.prg b/harbour/contrib/examples/terminal/trm_client.prg index a9782de944..4e2121fb2b 100644 --- a/harbour/contrib/examples/terminal/trm_client.prg +++ b/harbour/contrib/examples/terminal/trm_client.prg @@ -206,14 +206,10 @@ STATIC FUNCTION ResolveParams( cAddress, cPort, cAppln, cParams, cDirectory ) TCHAR buffer[ MAX_PATH ]; iSize = GetModuleFileName( NULL, buffer, MAX_PATH ); - if ( iSize > 0 ) - { + if( iSize > 0 ) hb_retc( HB_TCHAR_CONVFROM( buffer ) ); - } else - { - hb_retc( "" ); - } + hb_retc( NULL ); } if !empty( cPath ) diff --git a/harbour/contrib/gtwvg/wvgsink.c b/harbour/contrib/gtwvg/wvgsink.c index a9013f5ce5..17d8540505 100644 --- a/harbour/contrib/gtwvg/wvgsink.c +++ b/harbour/contrib/gtwvg/wvgsink.c @@ -331,9 +331,8 @@ static HRESULT STDMETHODCALLTYPE Invoke( IEventHandler *self, DISPID dispid, REF /* We implement only a "default" interface */ if( !IsEqualIID( riid, HB_ID_REF( IID_NULL ) ) ) - { return( ( HRESULT ) DISP_E_UNKNOWNINTERFACE ); - } + HB_SYMBOL_UNUSED( lcid ); HB_SYMBOL_UNUSED( wFlags ); HB_SYMBOL_UNUSED( result ); @@ -396,18 +395,14 @@ static HRESULT STDMETHODCALLTYPE Invoke( IEventHandler *self, DISPID dispid, REF for( i = iArg; i > 0; i-- ) { if( HB_IS_BYREF( pItemArray[ iArg-i ] ) ) - { hb_oleItemToVariant( &( params->rgvarg[ iArg-i ] ), pItemArray[ iArg-i ] ); - } } /* Pritpal */ if( iArg ) { for( i = iArg; i > 0; i-- ) - { hb_itemRelease( pItemArray[ i-1 ] ); - } } hb_vmPopState(); } @@ -491,14 +486,10 @@ static HRESULT SetupConnectionPoint( device_interface* pdevice_interface, REFIID ( ( MyRealIEventHandler* ) thisobj )->dwEventCookie = dwCookie; } else - { hr = S_OK; - } } else - { hr = S_OK; - } } } while( hr == S_OK ); HB_VTBL( m_pIEnumConnectionPoints )->Release( HB_THIS( m_pIEnumConnectionPoints ) ); @@ -782,4 +773,3 @@ HB_FUNC( HB_AX_ATLSETVERB ) } /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/gtwvg/wvgwin.c b/harbour/contrib/gtwvg/wvgwin.c index 87124b1d64..1c0d4098d4 100644 --- a/harbour/contrib/gtwvg/wvgwin.c +++ b/harbour/contrib/gtwvg/wvgwin.c @@ -344,8 +344,8 @@ HB_FUNC( WIN_GETDLGITEM ) HB_FUNC( WIN_MESSAGEBOX ) { HWND hWnd = ISNIL( 1 ) ? GetActiveWindow() : ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ) ; - LPTSTR lpMsg = HB_TCHAR_CONVTO( ISNIL( 2 ) ? "" : hb_parc( 2 ) ); - LPTSTR lpTitle = HB_TCHAR_CONVTO( ISNIL( 3 ) ? "Info" : hb_parc( 3 ) ); + LPTSTR lpMsg = HB_TCHAR_CONVTO( hb_parcx( 2 ) ); + LPTSTR lpTitle = HB_TCHAR_CONVTO( ISCHAR( 3 ) ? hb_parc( 3 ) : "Info" ); hb_retni( MessageBox( hWnd, lpMsg, lpTitle, ISNIL( 4 ) ? MB_OK : hb_parni( 4 ) ) ); @@ -896,7 +896,7 @@ HB_FUNC( WIN_CREATEWINDOWEX ) LPTSTR szClassName; szClassName = HB_TCHAR_CONVTO( hb_parc( 2 ) ); - szWinName = HB_TCHAR_CONVTO( ISNIL( 3 ) ? "" : hb_parc( 3 ) ); + szWinName = HB_TCHAR_CONVTO( hb_parcx( 3 ) ); hWnd = CreateWindowEx( ( DWORD ) hb_parnint( 1 ), szClassName, @@ -1870,7 +1870,7 @@ PHB_ITEM wvg_logfontTOarray( LPLOGFONT lf, BOOL bEmpty ) if( bEmpty ) { - hb_arraySetC( aFont , 1, "" ); + hb_arraySetC( aFont , 1, NULL ); hb_arraySetNL( aFont, 2, 0 ); hb_arraySetNL( aFont, 3, 0 ); hb_arraySetNL( aFont, 4, 0 ); diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c index 46689b1493..4fa9d5aef2 100644 --- a/harbour/contrib/hbgd/gdwrp.c +++ b/harbour/contrib/hbgd/gdwrp.c @@ -243,12 +243,10 @@ static PHB_ITEM hb_gdFontItemNew( gdFontPtr font ) static void * LoadImageFromHandle( HB_FHANDLE fhandle, int sz ) { - void *iptr; + void * iptr; - if ( !( fhandle ) ) - { + if( ! fhandle ) fhandle = 0; /* 0 = std input */ - } /* Read file */ iptr = ( BYTE * ) hb_xgrab( sz ); @@ -263,10 +261,10 @@ static void * LoadImageFromHandle( HB_FHANDLE fhandle, int sz ) static void * LoadImageFromFile( char *szFile, int *sz ) { - void *iptr; + void * iptr; HB_FHANDLE fhandle; - if ( ( fhandle = hb_fsOpen( ( BYTE * ) szFile, FO_READ ) ) != FS_ERROR ) + if( ( fhandle = hb_fsOpen( ( BYTE * ) szFile, FO_READ ) ) != FS_ERROR ) { /* get lenght */ *sz = hb_fsSeek( fhandle, 0, FS_END ); @@ -296,10 +294,8 @@ static void * LoadImageFromFile( char *szFile, int *sz ) static void SaveImageToHandle( HB_FHANDLE fhandle, void *iptr, int sz ) { - if ( !(fhandle) ) - { + if( ! fhandle ) fhandle = 1; /* 1 = std output */ - } /* Write Image */ hb_fsWriteLarge( fhandle, ( BYTE *) iptr, (ULONG) sz ); @@ -311,7 +307,7 @@ static void SaveImageToFile( char *szFile, void *iptr, int sz ) { HB_FHANDLE fhandle; - if ( ( fhandle = hb_fsCreate( ( BYTE * ) szFile, FC_NORMAL ) ) != FS_ERROR ) + if( ( fhandle = hb_fsCreate( ( BYTE * ) szFile, FC_NORMAL ) ) != FS_ERROR ) { /* Write Image */ SaveImageToHandle( fhandle, ( BYTE *) iptr, (ULONG) sz ); @@ -328,13 +324,13 @@ static void GDImageCreateFrom( int nType ) gdImagePtr im = NULL; char *szFile; int sz; - void *iptr; + void * iptr; /*TraceLog( NULL, "Params = %i, 1 = %i, 2 = %i \n\r", hb_pcount(), hb_parinfo( 1 ), hb_parinfo( 2 ) );*/ - if ( hb_pcount() == 1 && + if( hb_pcount() == 1 && ( hb_parinfo( 1 ) & HB_IT_STRING ) - ) + ) { /* Retrieve file name */ szFile = hb_parcx( 1 ); @@ -343,10 +339,10 @@ static void GDImageCreateFrom( int nType ) } /* From Image Pointer + size */ - else if ( hb_pcount() == 2 && + else if( hb_pcount() == 2 && ( hb_parinfo( 1 ) & HB_IT_POINTER ) && ( hb_parinfo( 2 ) & HB_IT_NUMERIC ) - ) + ) { /* Retrieve image pointer */ @@ -356,10 +352,10 @@ static void GDImageCreateFrom( int nType ) } /* From file handle */ - else if ( hb_pcount() == 2 && + else if( hb_pcount() == 2 && ( hb_parinfo( 1 ) & HB_IT_NUMERIC ) && ( hb_parinfo( 2 ) & HB_IT_NUMERIC ) - ) + ) { HB_FHANDLE fhandle; @@ -383,7 +379,7 @@ static void GDImageCreateFrom( int nType ) return; } - if ( iptr && sz ) + if( iptr && sz ) { /* Create Image */ switch ( nType ) @@ -418,9 +414,9 @@ static void GDImageCreateFrom( int nType ) static void GDImageSaveTo( int nType ) { - if ( hb_pcount() >= 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() >= 1 && + hb_parinfo( 1 ) & HB_IT_POINTER + ) { gdImagePtr im; char *szFile; @@ -433,9 +429,9 @@ static void GDImageSaveTo( int nType ) im = hb_parGdImage( 1 ); /* Get file name or an output handler or NIL it I want a return string */ - if ( !( ISNIL(2) || - hb_parinfo( 2 ) & HB_IT_STRING || - hb_parinfo( 2 ) & HB_IT_NUMERIC ) ) + if( !( ISNIL( 2 ) || + hb_parinfo( 2 ) & HB_IT_STRING || + hb_parinfo( 2 ) & HB_IT_NUMERIC ) ) { hb_errRT_BASE_SubstR( EG_ARG, 0, "Second argument must be NIL or numeric or a string.", @@ -447,7 +443,7 @@ static void GDImageSaveTo( int nType ) /* Retrieve compression level */ /*TraceLog( NULL, "Count = %i\n\r", hb_pcount() ); */ /* check if is numeric */ - if ( !( ISNIL(3) || hb_parinfo( 3 ) & HB_IT_NUMERIC ) ) + if( !( ISNIL( 3 ) || hb_parinfo( 3 ) & HB_IT_NUMERIC ) ) { hb_errRT_BASE_SubstR( EG_ARG, 0, "Tirdh argument must be NIL or numeric.", @@ -456,11 +452,11 @@ static void GDImageSaveTo( int nType ) return; } - if ( nType == IMAGE_JPEG ) + if( nType == IMAGE_JPEG ) { /* check range */ level = ( hb_parinfo( 3 ) & HB_IT_NUMERIC ? hb_parni( 3 ) : -1 ); - if ( !( level >= -1 && level <= 95 ) ) + if( !( level >= -1 && level <= 95 ) ) { hb_errRT_BASE_SubstR( EG_ARG, 0, "Compression level must be -1 (default) or a value between 0 and 95.", @@ -469,11 +465,11 @@ static void GDImageSaveTo( int nType ) return; } } - else if ( nType == IMAGE_PNG ) + else if( nType == IMAGE_PNG ) { /* check range */ level = ( hb_parinfo( 3 ) & HB_IT_NUMERIC ? hb_parni( 3 ) : -1 ); - if ( !( level >= -1 && level <= 9 ) ) + if( !( level >= -1 && level <= 9 ) ) { hb_errRT_BASE_SubstR( EG_ARG, 0, "Compression level must be -1 (default) or a value between 0 and 9.", @@ -482,9 +478,9 @@ static void GDImageSaveTo( int nType ) return; } } - else if ( nType == IMAGE_WBMP ) + else if( nType == IMAGE_WBMP ) { - if ( !( hb_parinfo( 3 ) & HB_IT_NUMERIC ) ) + if( !( hb_parinfo( 3 ) & HB_IT_NUMERIC ) ) { hb_errRT_BASE_SubstR( EG_ARG, 0, "Foreground color nedeed", @@ -520,14 +516,14 @@ static void GDImageSaveTo( int nType ) } /* If i get a file name */ - if ( hb_parinfo( 2 ) & HB_IT_STRING ) + if( hb_parinfo( 2 ) & HB_IT_STRING ) { szFile = hb_parcx( 2 ); SaveImageToFile( szFile, iptr, sz ); } /* Write to file handle (1 = std output) */ - else if ( hb_parinfo( 2 ) & HB_IT_NUMERIC ) + else if( hb_parinfo( 2 ) & HB_IT_NUMERIC ) { /* Write to std output or to a passed file */ fhandle = ( hb_parnl( 2 ) > -1 ) ? hb_parnl( 2 ) : 1 ; /* 1 = std output */ @@ -592,9 +588,9 @@ HB_FUNC( GDVERSIONNUMBER ) HB_FUNC( GDIMAGECREATE ) /* gdImagePtr gdImageCreate(sx, sy) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_NUMERIC ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_NUMERIC && + hb_parinfo( 2 ) & HB_IT_NUMERIC ) { gdImagePtr im; int sx, sy; @@ -634,9 +630,9 @@ HB_FUNC( GDIMAGECREATEPALETTE ) /* gdImagePtr gdImageCreatePalette(sx, sy) */ HB_FUNC( GDIMAGECREATETRUECOLOR ) /* gdImageCreateTrueColor(sx, sy) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_NUMERIC ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_NUMERIC && + hb_parinfo( 2 ) & HB_IT_NUMERIC ) { gdImagePtr im; int sx, sy; @@ -760,8 +756,8 @@ HB_FUNC( GDIMAGEGD ) /* original: void gdImageGD(gdImagePtr im, FILE *out) */ */ HB_FUNC( GDIMAGEDESTROY ) /* gdImageDestroy(gdImagePtr im) */ { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER ) + if( hb_pcount() == 1 && + hb_parinfo( 1 ) & HB_IT_POINTER ) { /* gdImagePtr im; @@ -799,12 +795,12 @@ HB_FUNC( GDIMAGEDESTROY ) /* gdImageDestroy(gdImagePtr im) */ HB_FUNC( GDIMAGESETPIXEL ) /* void gdImageSetPixel(gdImagePtr im, int x, int y, int color) */ { - if ( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 4 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int x, y; @@ -840,14 +836,14 @@ HB_FUNC( GDIMAGESETPIXEL ) /* void gdImageSetPixel(gdImagePtr im, int x, int y, HB_FUNC( GDIMAGELINE ) /* void gdImageLine(gdImagePtr im, int x1, int y1, int x2, int y2, int color) */ { - if ( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 6 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int x1, y1, x2, y2; @@ -886,14 +882,14 @@ HB_FUNC( GDIMAGELINE ) /* void gdImageLine(gdImagePtr im, int x1, int y1, int x2 HB_FUNC( GDIMAGEDASHEDLINE ) /* void gdImageDashedLine(gdImagePtr im, int x1, int y1, int x2, int y2, int color) */ { - if ( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 6 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int x1, y1, x2, y2; @@ -933,11 +929,11 @@ HB_FUNC( GDIMAGEDASHEDLINE ) /* void gdImageDashedLine(gdImagePtr im, int x1, in HB_FUNC( GDIMAGEPOLYGON ) /* original: void gdImagePolygon(gdImagePtr im, gdPointPtr points, int pointsTotal, int color) */ /* implementation: void gdImagePolygon(gdImagePtr im, gdPointPtr points, int color) */ { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_ARRAY && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_ARRAY && + hb_parinfo( 3 ) & HB_IT_NUMERIC + ) { gdImagePtr im; /*gdPointPtr points; */ @@ -990,11 +986,11 @@ HB_FUNC( GDIMAGEPOLYGON ) /* original: void gdImagePolygon(gdImagePtr im, gdPoin HB_FUNC( GDIMAGEOPENPOLYGON ) /* original: void gdImageOpenPolygon(gdImagePtr im, gdPointPtr points, int pointsTotal, int color) */ /* implementation: void gdImageOpenPolygon(gdImagePtr im, gdPointPtr points, int color) */ { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_ARRAY && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_ARRAY && + hb_parinfo( 3 ) & HB_IT_NUMERIC + ) { gdImagePtr im; /*gdPointPtr points; */ @@ -1047,14 +1043,14 @@ HB_FUNC( GDIMAGEOPENPOLYGON ) /* original: void gdImageOpenPolygon(gdImagePtr im HB_FUNC( GDIMAGERECTANGLE ) /* void gdImageRectangle(gdImagePtr im, int x1, int y1, int x2, int y2, int color) */ { - if ( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 6 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int x1, y1, x2, y2; @@ -1094,11 +1090,11 @@ HB_FUNC( GDIMAGERECTANGLE ) /* void gdImageRectangle(gdImagePtr im, int x1, int HB_FUNC( GDIMAGEFILLEDPOLYGON ) /* original: void gdImageFilledPolygon(gdImagePtr im, gdPointPtr points, int pointsTotal, int color) */ /* implementation: void gdImageFilledPolygon(gdImagePtr im, gdPointPtr points, int color) */ { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_ARRAY && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_ARRAY && + hb_parinfo( 3 ) & HB_IT_NUMERIC + ) { gdImagePtr im; /*gdPointPtr points; */ @@ -1150,14 +1146,14 @@ HB_FUNC( GDIMAGEFILLEDPOLYGON ) /* original: void gdImageFilledPolygon(gdImagePt HB_FUNC( GDIMAGEFILLEDRECTANGLE ) /* void gdImageFilledRectangle(gdImagePtr im, int x1, int y1, int x2, int y2, int color) */ { - if ( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 6 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int x1, y1, x2, y2; @@ -1196,16 +1192,16 @@ HB_FUNC( GDIMAGEFILLEDRECTANGLE ) /* void gdImageFilledRectangle(gdImagePtr im, HB_FUNC( GDIMAGEARC ) /* void gdImageArc(gdImagePtr im, int cx, int cy, int w, int h, int s, int e, int color) */ { - if ( hb_pcount() == 8 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 8 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC && + hb_parinfo( 7 ) & HB_IT_NUMERIC && + hb_parinfo( 8 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int cx, cy, w, h, s, e, color; @@ -1245,16 +1241,16 @@ HB_FUNC( GDIMAGEARC ) /* void gdImageArc(gdImagePtr im, int cx, int cy, int w, i HB_FUNC( GDIMAGEFILLEDARC ) /* void gdImageFilledArc(gdImagePtr im, int cx, int cy, int w, int h, int s, int e, int color[, int style]) */ { - if ( hb_pcount() >= 8 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC - ) + if( hb_pcount() >= 8 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC && + hb_parinfo( 7 ) & HB_IT_NUMERIC && + hb_parinfo( 8 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int cx, cy, w, h, s, e, color, style; @@ -1299,14 +1295,14 @@ HB_FUNC( GDIMAGEFILLEDARC ) /* void gdImageFilledArc(gdImagePtr im, int cx, int HB_FUNC( GDIMAGEFILLEDELLIPSE ) /* void gdImageFilledEllipse(gdImagePtr im, int cx, int cy, int w, int h, int color) */ { - if ( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 6 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int cx, cy, w, h, color; @@ -1344,13 +1340,13 @@ HB_FUNC( GDIMAGEFILLEDELLIPSE ) /* void gdImageFilledEllipse(gdImagePtr im, int HB_FUNC( GDIMAGEFILLTOBORDER ) /* void gdImageFillToBorder(gdImagePtr im, int x, int y, int border, int color) */ { - if ( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 5 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int x, y, border, color; @@ -1390,14 +1386,14 @@ HB_FUNC( GDIMAGEFILLTOBORDER ) /* void gdImageFillToBorder(gdImagePtr im, int x, #if HB_GD_VERS( 2, 0, 35 ) HB_FUNC( GDIMAGEELLIPSE ) /* void gdImageEllipse(gdImagePtr im, int cx, int cy, int w, int h, int color) */ { - if ( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 6 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int cx, cy, w, h, color; @@ -1436,12 +1432,12 @@ HB_FUNC( GDIMAGEELLIPSE ) /* void gdImageEllipse(gdImagePtr im, int cx, int cy, HB_FUNC( GDIMAGEFILL ) /* void gdImageFill(gdImagePtr im, int x, int y, int color) */ { - if ( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 4 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int x, y, color; @@ -1475,10 +1471,10 @@ HB_FUNC( GDIMAGEFILL ) /* void gdImageFill(gdImagePtr im, int x, int y, int colo HB_FUNC( GDIMAGESETANTIALIASED ) /* void gdImageSetAntiAliased(gdImagePtr im, int color) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int color; @@ -1509,11 +1505,11 @@ HB_FUNC( GDIMAGESETANTIALIASED ) /* void gdImageSetAntiAliased(gdImagePtr im, in HB_FUNC( GDIMAGESETANTIALIASEDDONTBLEND ) /* void gdImageSetAntiAliasedDontBlend(gdImagePtr im, int c, int dont_blend) */ { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int color; @@ -1548,10 +1544,10 @@ HB_FUNC( GDIMAGESETANTIALIASEDDONTBLEND ) /* void gdImageSetAntiAliasedDontBlend HB_FUNC( GDIMAGESETBRUSH ) /* void gdImageSetBrush(gdImagePtr im, gdImagePtr brush) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER + ) { gdImagePtr im; gdImagePtr brush; @@ -1582,10 +1578,10 @@ HB_FUNC( GDIMAGESETBRUSH ) /* void gdImageSetBrush(gdImagePtr im, gdImagePtr bru HB_FUNC( GDIMAGESETTILE ) /* void gdImageSetTile(gdImagePtr im, gdImagePtr tile) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER + ) { gdImagePtr im; gdImagePtr tile; @@ -1617,10 +1613,10 @@ HB_FUNC( GDIMAGESETTILE ) /* void gdImageSetTile(gdImagePtr im, gdImagePtr tile) HB_FUNC( GDIMAGESETSTYLE ) /* original: void gdImageSetStyle(gdImagePtr im, int *style, int styleLength) */ /* implementation: void gdImageSetStyle(gdImagePtr im, int *style) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_ARRAY - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_ARRAY + ) { gdImagePtr im; PHB_ITEM pStyles; @@ -1661,10 +1657,10 @@ HB_FUNC( GDIMAGESETSTYLE ) /* original: void gdImageSetStyle(gdImagePtr im, int HB_FUNC( GDIMAGESETTHICKNESS ) /* void gdImageSetThickness(gdImagePtr im, int thickness) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int thickness; @@ -1702,10 +1698,10 @@ HB_FUNC( GDIMAGESETTHICKNESS ) /* void gdImageSetThickness(gdImagePtr im, int th HB_FUNC( GDIMAGEALPHABLENDING ) /* void gdImageAlphaBlending(gdImagePtr im, int blending) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_LOGICAL - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_LOGICAL + ) { gdImagePtr im; int blending; @@ -1736,10 +1732,10 @@ HB_FUNC( GDIMAGEALPHABLENDING ) /* void gdImageAlphaBlending(gdImagePtr im, int HB_FUNC( GDIMAGESAVEALPHA ) /* void gdImageSaveAlpha(gdImagePtr im, int saveFlag) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_LOGICAL - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_LOGICAL + ) { gdImagePtr im; int saveFlag; @@ -1770,13 +1766,13 @@ HB_FUNC( GDIMAGESAVEALPHA ) /* void gdImageSaveAlpha(gdImagePtr im, int saveFlag HB_FUNC( GDIMAGESETCLIP ) /* void gdImageSetClip(gdImagePtr im, int x1, int y1, int x2, int y2) */ { - if ( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 5 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int x1, y1, x2, y2; @@ -1812,9 +1808,9 @@ HB_FUNC( GDIMAGESETCLIP ) /* void gdImageSetClip(gdImagePtr im, int x1, int y1, HB_FUNC( GDIMAGEGETCLIP ) /* original: void gdImageGetClip(gdImagePtr im, int *x1P, int *y1P, int *x2P, int *y2P) */ /* implementation: array gdImageGetClip(gdImagePtr im) */ { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + hb_parinfo( 1 ) & HB_IT_POINTER + ) { gdImagePtr im; int x1, y1, x2, y2; @@ -1858,9 +1854,9 @@ HB_FUNC( GDIMAGEGETCLIP ) /* original: void gdImageGetClip(gdImagePtr im, int *x HB_FUNC( GDIMAGECOLORSTOTAL ) /* int gdImageColorsTotal(gdImagePtr im) */ { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + hb_parinfo( 1 ) & HB_IT_POINTER + ) { gdImagePtr im; @@ -1887,10 +1883,10 @@ HB_FUNC( GDIMAGECOLORSTOTAL ) /* int gdImageColorsTotal(gdImagePtr im) */ HB_FUNC( GDIMAGEALPHA ) /* int gdImageAlpha(gdImagePtr im, int color) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int color; @@ -1921,10 +1917,10 @@ HB_FUNC( GDIMAGEALPHA ) /* int gdImageAlpha(gdImagePtr im, int color) */ HB_FUNC( GDIMAGERED ) /* int gdImageRed(gdImagePtr im, int color) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int color; @@ -1955,10 +1951,10 @@ HB_FUNC( GDIMAGERED ) /* int gdImageRed(gdImagePtr im, int color) */ HB_FUNC( GDIMAGEGREEN ) /* int gdImageGreen(gdImagePtr im, int color) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int color; @@ -1989,10 +1985,10 @@ HB_FUNC( GDIMAGEGREEN ) /* int gdImageGreen(gdImagePtr im, int color) */ HB_FUNC( GDIMAGEBLUE ) /* int gdImageBlue(gdImagePtr im, int color) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int color; @@ -2023,9 +2019,9 @@ HB_FUNC( GDIMAGEBLUE ) /* int gdImageBlue(gdImagePtr im, int color) */ HB_FUNC( GDIMAGESX ) /* int gdImageSX(gdImagePtr im) */ { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + hb_parinfo( 1 ) & HB_IT_POINTER + ) { gdImagePtr im; @@ -2052,9 +2048,9 @@ HB_FUNC( GDIMAGESX ) /* int gdImageSX(gdImagePtr im) */ HB_FUNC( GDIMAGESY ) /* int gdImageSX(gdImagePtr im) */ { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + hb_parinfo( 1 ) & HB_IT_POINTER + ) { gdImagePtr im; @@ -2081,14 +2077,14 @@ HB_FUNC( GDIMAGESY ) /* int gdImageSX(gdImagePtr im) */ HB_FUNC( GDIMAGEGETPIXEL ) /* int gdImageGetPixel(gdImagePtr im, int x, int y) */ { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC + ) { gdImagePtr im; - int x,y; + int x, y; /* Retrieve image pointer */ im = hb_parGdImage( 1 ); @@ -2117,14 +2113,14 @@ HB_FUNC( GDIMAGEGETPIXEL ) /* int gdImageGetPixel(gdImagePtr im, int x, int y) * HB_FUNC( GDIMAGEBOUNDSSAFE ) /* int gdImageBoundsSafe(gdImagePtr im, int x, int y) */ { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC + ) { gdImagePtr im; - int x,y; + int x, y; /* Retrieve image pointer */ im = hb_parGdImage( 1 ); @@ -2153,9 +2149,9 @@ HB_FUNC( GDIMAGEBOUNDSSAFE ) /* int gdImageBoundsSafe(gdImagePtr im, int x, int HB_FUNC( GDIMAGEGETINTERLACED ) /* int gdImageGetInterlaced(gdImagePtr im) */ { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + hb_parinfo( 1 ) & HB_IT_POINTER + ) { gdImagePtr im; @@ -2182,9 +2178,9 @@ HB_FUNC( GDIMAGEGETINTERLACED ) /* int gdImageGetInterlaced(gdImagePtr im) */ HB_FUNC( GDIMAGEGETTRANSPARENT ) /* int gdImageGetTransparent(gdImagePtr im) */ { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + hb_parinfo( 1 ) & HB_IT_POINTER + ) { gdImagePtr im; @@ -2211,9 +2207,9 @@ HB_FUNC( GDIMAGEGETTRANSPARENT ) /* int gdImageGetTransparent(gdImagePtr im) */ HB_FUNC( GDIMAGETRUECOLOR ) /* int gdImageTrueColor(gdImagePtr im) */ { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + hb_parinfo( 1 ) & HB_IT_POINTER + ) { gdImagePtr im; @@ -2240,11 +2236,11 @@ HB_FUNC( GDIMAGETRUECOLOR ) /* int gdImageTrueColor(gdImagePtr im) */ HB_FUNC( GDIMAGETRUECOLORTOPALETTE ) /* void gdImageTrueColorToPalette (gdImagePtr im, int ditherFlag, int colorsWanted) */ { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_LOGICAL && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_LOGICAL && + hb_parinfo( 3 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int ditherFlag, colorsWanted; @@ -2278,11 +2274,11 @@ HB_FUNC( GDIMAGETRUECOLORTOPALETTE ) /* void gdImageTrueColorToPalette (gdImageP HB_FUNC( GDIMAGECREATEPALETTEFROMTRUECOLOR ) /* gdImagePtr gdImageCreatePaletteFromTrueColor(gdImagePtr im, int ditherFlag, int colorsWanted) */ { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_LOGICAL && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_LOGICAL && + hb_parinfo( 3 ) & HB_IT_NUMERIC + ) { gdImagePtr im; gdImagePtr imNew; @@ -2320,14 +2316,14 @@ HB_FUNC( GDIMAGECREATEPALETTEFROMTRUECOLOR ) /* gdImagePtr gdImageCreatePaletteF HB_FUNC( GDIMAGEPALETTEPIXEL ) /* int gdImagePalettePixel(gdImagePtr im, int x, int y) */ { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC + ) { gdImagePtr im; - int x,y; + int x, y; /* Retrieve image pointer */ im = hb_parGdImage( 1 ); @@ -2356,14 +2352,14 @@ HB_FUNC( GDIMAGEPALETTEPIXEL ) /* int gdImagePalettePixel(gdImagePtr im, int x, HB_FUNC( GDIMAGETRUECOLORPIXEL ) /* int gdImageTrueColorPixel(gdImagePtr im, int x, int y) */ { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC + ) { gdImagePtr im; - int x,y; + int x, y; /* Retrieve image pointer */ im = hb_parGdImage( 1 ); @@ -2392,9 +2388,9 @@ HB_FUNC( GDIMAGETRUECOLORPIXEL ) /* int gdImageTrueColorPixel(gdImagePtr im, int HB_FUNC( GDIMAGEGETTHICKNESS ) /* void gdImageGetThickness(gdImagePtr im) */ { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + hb_parinfo( 1 ) & HB_IT_POINTER + ) { gdImagePtr im; @@ -2496,19 +2492,19 @@ HB_FUNC( GDFONTGETTINY ) /* gdFontPtr gdFontGetTiny(void) */ HB_FUNC( GDIMAGESTRING ) /* void gdImageChar(gdImagePtr im, gdFontPtr font, int x, int y, int c, int color) */ /* void gdImageString(gdImagePtr im, gdFontPtr font, int x, int y, unsigned char *s, int color) */ { - if ( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_STRING && - hb_parinfo( 6 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 6 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_STRING && + hb_parinfo( 6 ) & HB_IT_NUMERIC + ) { gdImagePtr im; - gdFontPtr font; + gdFontPtr font; int x, y, c, color; - unsigned char *s; + unsigned char * s; /* Retrieve image pointer */ im = hb_parGdImage( 1 ); @@ -2524,7 +2520,7 @@ HB_FUNC( GDIMAGESTRING ) /* void gdImageChar(gdImagePtr im, gdFontPtr font, int color = hb_parni( 6 ); /* Write char */ - if ( hb_parclen(5) == 1 ) + if( hb_parclen(5) == 1 ) { /* Retrieve char value */ c = hb_parni( 5 ); @@ -2556,19 +2552,19 @@ HB_FUNC( GDIMAGESTRING ) /* void gdImageChar(gdImagePtr im, gdFontPtr font, int HB_FUNC( GDIMAGESTRINGUP ) /* void gdImageCharUp(gdImagePtr im, gdFontPtr font, int x, int y, int c, int color) */ /* void gdImageStringUp(gdImagePtr im, gdFontPtr font, int x, int y, unsigned char *s, int color) */ { - if ( hb_pcount() == 6 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_STRING && - hb_parinfo( 6 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 6 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_STRING && + hb_parinfo( 6 ) & HB_IT_NUMERIC + ) { gdImagePtr im; - gdFontPtr font; + gdFontPtr font; int x, y, c, color; - unsigned char *s; + unsigned char * s; /* Retrieve image pointer */ im = hb_parGdImage( 1 ); @@ -2584,7 +2580,7 @@ HB_FUNC( GDIMAGESTRINGUP ) /* void gdImageCharUp(gdImagePtr im, gdFontPtr font, color = hb_parni( 6 ); /* Write char */ - if ( hb_parclen(5) == 1 ) + if( hb_parclen(5) == 1 ) { /* Retrieve char value */ c = hb_parni( 5 ); @@ -2618,17 +2614,17 @@ HB_FUNC( GDIMAGESTRINGFTEX ) { /* TraceLog( NULL, "Parameters: %i, Type 1 =%i=\n\r", hb_pcount(), hb_parinfo( 1 ) ); */ - if ( hb_pcount() >= 9 && - ( ISNIL(1) || hb_parinfo( 1 ) & ( HB_IT_POINTER ) ) && - hb_parinfo( 2 ) & HB_IT_ARRAY && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_STRING && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_STRING - ) + if( hb_pcount() >= 9 && + ( ISNIL( 1 ) || hb_parinfo( 1 ) & ( HB_IT_POINTER ) ) && + hb_parinfo( 2 ) & HB_IT_ARRAY && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_STRING && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC && + hb_parinfo( 7 ) & HB_IT_NUMERIC && + hb_parinfo( 8 ) & HB_IT_NUMERIC && + hb_parinfo( 9 ) & HB_IT_STRING + ) { gdImagePtr im; gdFTStringExtra extra; @@ -2690,27 +2686,27 @@ HB_FUNC( GDIMAGESTRINGFTEX ) resolution = 96; /* Retrieve line spacing */ - if ( hb_parinfo( 10 ) & HB_IT_DOUBLE ) + if( hb_parinfo( 10 ) & HB_IT_DOUBLE ) { linespacing = hb_parnd( 10 ); flags |= gdFTEX_LINESPACE; } /* Retrieve charmap */ - if ( hb_parinfo( 11 ) & HB_IT_NUMERIC ) + if( hb_parinfo( 11 ) & HB_IT_NUMERIC ) { charmap = hb_parni( 11 ); flags |= gdFTEX_CHARMAP; } /* Retrieve resolution */ - if ( hb_parinfo( 12 ) & HB_IT_NUMERIC ) + if( hb_parinfo( 12 ) & HB_IT_NUMERIC ) { resolution = hb_parni( 12 ); flags |= gdFTEX_RESOLUTION; } - if ( !( flags == 0 ) ) + if( !( flags == 0 ) ) { extra.flags = flags; extra.linespacing = ( flags & gdFTEX_LINESPACE ? linespacing : 1.05 ); @@ -2721,7 +2717,7 @@ HB_FUNC( GDIMAGESTRINGFTEX ) /* Write string */ err = gdImageStringFTEx(im, &aRect[0], fg, fontname, ptsize, angle, x, y, string, ( !( flags == 0 ) ? &extra : 0 )); - if ( !( err ) ) + if( !( err ) ) { /* Save in array the correct text rectangle dimensions */ PHB_ITEM pArray; @@ -2756,19 +2752,19 @@ HB_FUNC( GDIMAGESTRINGFTCIRCLE ) /* char *gdImageStringFTCircle(gdImagePtr im, i { /*TraceLog( NULL, "Parameters: %i, Type 9 =%i=\n\r", hb_pcount(), hb_parinfo( 10 ) ); */ - if ( hb_pcount() == 11 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_STRING && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - ( ISNIL( 9 ) || ( hb_parinfo( 9 ) & HB_IT_STRING ) ) && - ( ISNIL( 10 ) || ( hb_parinfo( 10 ) & HB_IT_STRING ) ) && - hb_parinfo( 11 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 11 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC && + hb_parinfo( 7 ) & HB_IT_STRING && + hb_parinfo( 8 ) & HB_IT_NUMERIC && + ( ISNIL( 9 ) || ( hb_parinfo( 9 ) & HB_IT_STRING ) ) && + ( ISNIL( 10 ) || ( hb_parinfo( 10 ) & HB_IT_STRING ) ) && + hb_parinfo( 11 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int cx, cy; @@ -2849,9 +2845,9 @@ HB_FUNC( GDFONTCACHESHUTDOWN ) /* void gdFontCacheShutdown (void) */ HB_FUNC( GDFONTGETWIDTH ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + hb_parinfo( 1 ) & HB_IT_POINTER + ) { gdFontPtr font; @@ -2878,9 +2874,9 @@ HB_FUNC( GDFONTGETWIDTH ) HB_FUNC( GDFONTGETHEIGHT ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_POINTER - ) + if( hb_pcount() == 1 && + hb_parinfo( 1 ) & HB_IT_POINTER + ) { gdFontPtr font; @@ -2911,12 +2907,12 @@ HB_FUNC( GDFONTGETHEIGHT ) HB_FUNC( GDIMAGECOLORALLOCATE ) /* int gdImageColorAllocate(gdImagePtr im, int r, int g, int b) */ { - if ( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 4 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int r, g, b; @@ -2953,10 +2949,10 @@ HB_FUNC( GDIMAGECOLORALLOCATE ) /* int gdImageColorAllocate(gdImagePtr im, int r HB_FUNC( GDIMAGECOLORDEALLOCATE ) /* void gdImageColorDeallocate(gdImagePtr im, int color) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int color; @@ -2987,13 +2983,13 @@ HB_FUNC( GDIMAGECOLORDEALLOCATE ) /* void gdImageColorDeallocate(gdImagePtr im, HB_FUNC( GDIMAGECOLORALLOCATEALPHA ) /* int gdImageColorAllocateAlpha(gdImagePtr im, int r, int g, int b, int a) */ { - if ( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 5 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int r, g, b; @@ -3035,12 +3031,12 @@ HB_FUNC( GDIMAGECOLORALLOCATEALPHA ) /* int gdImageColorAllocateAlpha(gdImagePtr HB_FUNC( GDIMAGECOLORCLOSEST ) /* int gdImageColorClosest(gdImagePtr im, int r, int g, int b) */ { - if ( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 4 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int r, g, b; @@ -3077,13 +3073,13 @@ HB_FUNC( GDIMAGECOLORCLOSEST ) /* int gdImageColorClosest(gdImagePtr im, int r, HB_FUNC( GDIMAGECOLORCLOSESTALPHA ) /* int gdImageColorClosestAlpha(gdImagePtr im, int r, int g, int b, int a) */ { - if ( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 5 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int r, g, b; @@ -3125,12 +3121,12 @@ HB_FUNC( GDIMAGECOLORCLOSESTALPHA ) /* int gdImageColorClosestAlpha(gdImagePtr i HB_FUNC( GDIMAGECOLORCLOSESTHWB ) /* gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b) */ { - if ( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 4 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int r, g, b; @@ -3167,12 +3163,12 @@ HB_FUNC( GDIMAGECOLORCLOSESTHWB ) /* gdImageColorClosestHWB(gdImagePtr im, int HB_FUNC( GDIMAGECOLOREXACT ) /* int gdImageColorExact(gdImagePtr im, int r, int g, int b) */ { - if ( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 4 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int r, g, b; @@ -3209,12 +3205,12 @@ HB_FUNC( GDIMAGECOLOREXACT ) /* int gdImageColorExact(gdImagePtr im, int r, int HB_FUNC( GDIMAGECOLORRESOLVE ) /* int gdImageColorResolve(gdImagePtr im, int r, int g, int b) */ { - if ( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 4 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int r, g, b; @@ -3251,13 +3247,13 @@ HB_FUNC( GDIMAGECOLORRESOLVE ) /* int gdImageColorResolve(gdImagePtr im, int r, HB_FUNC( GDIMAGECOLORRESOLVEALPHA ) /* int gdImageColorResolveAlpha(gdImagePtr im, int r, int g, int b, int a) */ { - if ( hb_pcount() == 5 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 5 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int r, g, b; @@ -3299,10 +3295,10 @@ HB_FUNC( GDIMAGECOLORRESOLVEALPHA ) /* int gdImageColorResolveAlpha(gdImagePtr i HB_FUNC( GDIMAGECOLORTRANSPARENT ) /* void gdImageColorTransparent(gdImagePtr im, int color) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int color; @@ -3333,11 +3329,11 @@ HB_FUNC( GDIMAGECOLORTRANSPARENT ) /* void gdImageColorTransparent(gdImagePtr im HB_FUNC( GDTRUECOLOR ) /* int gdTrueColor(int red, int green, int blue) */ { - if ( hb_pcount() == 3 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 3 && + hb_parinfo( 1 ) & HB_IT_NUMERIC && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC + ) { int r, g, b; int color; @@ -3370,12 +3366,12 @@ HB_FUNC( GDTRUECOLOR ) /* int gdTrueColor(int red, int green, int blue) */ HB_FUNC( GDTRUECOLORALPHA ) /* int gdTrueColorAlpha(int red, int green, int blue, int alpha) */ { - if ( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_NUMERIC && - hb_parinfo( 2 ) & HB_IT_NUMERIC && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 4 && + hb_parinfo( 1 ) & HB_IT_NUMERIC && + hb_parinfo( 2 ) & HB_IT_NUMERIC && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC + ) { int r, g, b, a; int color; @@ -3413,16 +3409,16 @@ HB_FUNC( GDTRUECOLORALPHA ) /* int gdTrueColorAlpha(int red, int green, int blue HB_FUNC( GDIMAGECOPY ) /* void gdImageCopy(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int w, int h) */ { - if ( hb_pcount() == 8 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 8 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC && + hb_parinfo( 7 ) & HB_IT_NUMERIC && + hb_parinfo( 8 ) & HB_IT_NUMERIC + ) { gdImagePtr dst, src; int dstX, dstY, srcX, srcY, w, h; @@ -3467,18 +3463,18 @@ HB_FUNC( GDIMAGECOPY ) /* void gdImageCopy(gdImagePtr dst, gdImagePtr src, int d HB_FUNC( GDIMAGECOPYRESIZED ) /* void gdImageCopyResized(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int dstW, int dstH, int srcW, int srcH) */ { - if ( hb_pcount() == 10 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_NUMERIC && - hb_parinfo( 10 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 10 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC && + hb_parinfo( 7 ) & HB_IT_NUMERIC && + hb_parinfo( 8 ) & HB_IT_NUMERIC && + hb_parinfo( 9 ) & HB_IT_NUMERIC && + hb_parinfo( 10 ) & HB_IT_NUMERIC + ) { gdImagePtr dst, src; int dstX, dstY, srcX, srcY; @@ -3531,18 +3527,18 @@ HB_FUNC( GDIMAGECOPYRESIZED ) /* void gdImageCopyResized(gdImagePtr dst, gdImage HB_FUNC( GDIMAGECOPYRESAMPLED ) /* void gdImageCopyResampled(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int dstW, int dstH, int srcW, int srcH) */ { - if ( hb_pcount() == 10 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_NUMERIC && - hb_parinfo( 10 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 10 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC && + hb_parinfo( 7 ) & HB_IT_NUMERIC && + hb_parinfo( 8 ) & HB_IT_NUMERIC && + hb_parinfo( 9 ) & HB_IT_NUMERIC && + hb_parinfo( 10 ) & HB_IT_NUMERIC + ) { gdImagePtr dst, src; int dstX, dstY, srcX, srcY; @@ -3595,17 +3591,17 @@ HB_FUNC( GDIMAGECOPYRESAMPLED ) /* void gdImageCopyResampled(gdImagePtr dst, gdI HB_FUNC( GDIMAGECOPYROTATED ) /* void gdImageCopyRotated(gdImagePtr dst, gdImagePtr src, double dstX, double dstY, int srcX, int srcY, int srcW, int srcH, int angle) */ { - if ( hb_pcount() == 9 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 9 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC && + hb_parinfo( 7 ) & HB_IT_NUMERIC && + hb_parinfo( 8 ) & HB_IT_NUMERIC && + hb_parinfo( 9 ) & HB_IT_NUMERIC + ) { gdImagePtr dst, src; double dstX, dstY; @@ -3655,17 +3651,17 @@ HB_FUNC( GDIMAGECOPYROTATED ) /* void gdImageCopyRotated(gdImagePtr dst, gdImage HB_FUNC( GDIMAGECOPYMERGE ) /* void gdImageCopyMerge(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int w, int h, int pct) */ { - if ( hb_pcount() == 9 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 9 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC && + hb_parinfo( 7 ) & HB_IT_NUMERIC && + hb_parinfo( 8 ) & HB_IT_NUMERIC && + hb_parinfo( 9 ) & HB_IT_NUMERIC + ) { gdImagePtr dst, src; int dstX, dstY, srcX, srcY, w, h, pct; @@ -3714,17 +3710,17 @@ HB_FUNC( GDIMAGECOPYMERGE ) /* void gdImageCopyMerge(gdImagePtr dst, gdImagePtr HB_FUNC( GDIMAGECOPYMERGEGRAY ) /* void gdImageCopyMergeGray(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int w, int h, int pct) */ { - if ( hb_pcount() == 9 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - hb_parinfo( 8 ) & HB_IT_NUMERIC && - hb_parinfo( 9 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 9 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC && + hb_parinfo( 7 ) & HB_IT_NUMERIC && + hb_parinfo( 8 ) & HB_IT_NUMERIC && + hb_parinfo( 9 ) & HB_IT_NUMERIC + ) { gdImagePtr dst, src; int dstX, dstY, srcX, srcY, w, h, pct; @@ -3773,10 +3769,10 @@ HB_FUNC( GDIMAGECOPYMERGEGRAY ) /* void gdImageCopyMergeGray(gdImagePtr dst, gdI HB_FUNC( GDIMAGEPALETTECOPY ) /* void gdImagePaletteCopy(gdImagePtr dst, gdImagePtr src) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER + ) { gdImagePtr dst, src; @@ -3805,10 +3801,10 @@ HB_FUNC( GDIMAGEPALETTECOPY ) /* void gdImagePaletteCopy(gdImagePtr dst, gdImage HB_FUNC( GDIMAGESQUARETOCIRCLE ) /* void gdImageSquareToCircle(gdImagePtr im, int radius) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int radius; @@ -3839,10 +3835,10 @@ HB_FUNC( GDIMAGESQUARETOCIRCLE ) /* void gdImageSquareToCircle(gdImagePtr im, in HB_FUNC( GDIMAGESHARPEN ) /* void gdImageSharpen(gdImagePtr im, int pct) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_NUMERIC - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_NUMERIC + ) { gdImagePtr im; int pct; @@ -3877,10 +3873,10 @@ HB_FUNC( GDIMAGESHARPEN ) /* void gdImageSharpen(gdImagePtr im, int pct) */ HB_FUNC( GDIMAGECOMPARE ) /* int gdImageCompare(gdImagePtr im1, gdImagePtr im2) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_POINTER - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_POINTER + ) { gdImagePtr dst, src; @@ -3909,10 +3905,10 @@ HB_FUNC( GDIMAGECOMPARE ) /* int gdImageCompare(gdImagePtr im1, gdImagePtr im2) HB_FUNC( GDIMAGEINTERLACE ) /* void gdImageInterlace(gdImagePtr im, int interlace) */ { - if ( hb_pcount() == 2 && - hb_parinfo( 1 ) & HB_IT_POINTER && - hb_parinfo( 2 ) & HB_IT_LOGICAL - ) + if( hb_pcount() == 2 && + hb_parinfo( 1 ) & HB_IT_POINTER && + hb_parinfo( 2 ) & HB_IT_LOGICAL + ) { gdImagePtr im; int interlace; @@ -3947,7 +3943,7 @@ static void AddImageToFile( char *szFile, void *iptr, int sz ) { HB_FHANDLE fhandle; - if ( ( fhandle = hb_fsOpen( ( BYTE * ) szFile, FO_READWRITE ) ) != FS_ERROR ) + if( ( fhandle = hb_fsOpen( ( BYTE * ) szFile, FO_READWRITE ) ) != FS_ERROR ) { /* move to end of file */ hb_fsSeek(fhandle, 0, FS_END); @@ -3964,15 +3960,15 @@ static void AddImageToFile( char *szFile, void *iptr, int sz ) /* implementation: (void *) gdImageGifAnimBegin( gdImagePtr im, cFile | nHandle, int GlobalCM, int Loops); */ HB_FUNC( GDIMAGEGIFANIMBEGIN ) { - if ( hb_pcount() == 4 && - hb_parinfo( 1 ) & HB_IT_POINTER && + if( hb_pcount() == 4 && + hb_parinfo( 1 ) & HB_IT_POINTER && ( hb_parinfo( 2 ) & HB_IT_STRING || hb_parinfo( 2 ) & HB_IT_NUMERIC || ISNIL( 2 ) ) && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC - ) + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC + ) { gdImagePtr im; - void *iptr; + void * iptr; int size; int GlobalCM, Loops; @@ -3989,14 +3985,14 @@ HB_FUNC( GDIMAGEGIFANIMBEGIN ) iptr = gdImageGifAnimBeginPtr(im, &size, GlobalCM, Loops); /* Check if 2nd parameter is a file name or an handle */ - if ( hb_parinfo( 2 ) & HB_IT_STRING ) + if( hb_parinfo( 2 ) & HB_IT_STRING ) { char *szFile; szFile = hb_parcx( 2 ); SaveImageToFile( szFile, iptr, size ); } - else if ( hb_parinfo( 2 ) & HB_IT_NUMERIC || ISNIL( 2 ) ) + else if( hb_parinfo( 2 ) & HB_IT_NUMERIC || ISNIL( 2 ) ) { HB_FHANDLE fhandle; @@ -4026,19 +4022,19 @@ HB_FUNC( GDIMAGEGIFANIMBEGIN ) /* implementation: (void *) gdImageGifAnimAdd( gdImagePtr im, cFile | nHandle, int LocalCM, int LeftOfs, int TopOfs, int Delay, int Disposal, gdImagePtr previm); */ HB_FUNC( GDIMAGEGIFANIMADD ) { - if ( hb_pcount() == 8 && - hb_parinfo( 1 ) & HB_IT_POINTER && - ( hb_parinfo( 2 ) & HB_IT_STRING || hb_parinfo( 2 ) & HB_IT_NUMERIC || ISNIL( 2 ) ) && - hb_parinfo( 3 ) & HB_IT_NUMERIC && - hb_parinfo( 4 ) & HB_IT_NUMERIC && - hb_parinfo( 5 ) & HB_IT_NUMERIC && - hb_parinfo( 6 ) & HB_IT_NUMERIC && - hb_parinfo( 7 ) & HB_IT_NUMERIC && - ( hb_parinfo( 8 ) & HB_IT_POINTER || ISNIL( 8 ) ) - ) + if( hb_pcount() == 8 && + hb_parinfo( 1 ) & HB_IT_POINTER && + ( hb_parinfo( 2 ) & HB_IT_STRING || hb_parinfo( 2 ) & HB_IT_NUMERIC || ISNIL( 2 ) ) && + hb_parinfo( 3 ) & HB_IT_NUMERIC && + hb_parinfo( 4 ) & HB_IT_NUMERIC && + hb_parinfo( 5 ) & HB_IT_NUMERIC && + hb_parinfo( 6 ) & HB_IT_NUMERIC && + hb_parinfo( 7 ) & HB_IT_NUMERIC && + ( hb_parinfo( 8 ) & HB_IT_POINTER || ISNIL( 8 ) ) + ) { gdImagePtr im, previm; - void *iptr; + void * iptr; int size; int LocalCM, LeftOfs, TopOfs, Delay, Disposal; @@ -4056,14 +4052,14 @@ HB_FUNC( GDIMAGEGIFANIMADD ) iptr = gdImageGifAnimAddPtr(im, &size, LocalCM, LeftOfs, TopOfs, Delay, Disposal, previm); /* Check if 2nd parameter is a file name or an handle */ - if ( hb_parinfo( 2 ) & HB_IT_STRING ) + if( hb_parinfo( 2 ) & HB_IT_STRING ) { - char *szFile; + char * szFile; szFile = hb_parcx( 2 ); AddImageToFile( szFile, iptr, size ); } - else if ( hb_parinfo( 2 ) & HB_IT_NUMERIC || ISNIL( 2 ) ) + else if( hb_parinfo( 2 ) & HB_IT_NUMERIC || ISNIL( 2 ) ) { HB_FHANDLE fhandle; @@ -4095,25 +4091,25 @@ HB_FUNC( GDIMAGEGIFANIMADD ) /* implementation: gdImageGifAnimEnd( cFile | nHandle ); */ HB_FUNC( GDIMAGEGIFANIMEND ) { - if ( hb_pcount() == 1 && - ( hb_parinfo( 1 ) & HB_IT_STRING || hb_parinfo( 1 ) & HB_IT_NUMERIC || ISNIL( 1 ) ) - ) + if( hb_pcount() == 1 && + ( hb_parinfo( 1 ) & HB_IT_STRING || hb_parinfo( 1 ) & HB_IT_NUMERIC || ISNIL( 1 ) ) + ) { - void *iptr; + void * iptr; int size; /* Run function and return value */ - iptr = gdImageGifAnimEndPtr(&size); + iptr = gdImageGifAnimEndPtr( &size ); /* Check if 1st parameter is a file name or an handle */ - if ( hb_parinfo( 1 ) & HB_IT_STRING ) + if( hb_parinfo( 1 ) & HB_IT_STRING ) { - char *szFile; + char * szFile; szFile = hb_parcx( 1 ); AddImageToFile( szFile, iptr, size ); } - else if ( hb_parinfo( 2 ) & HB_IT_NUMERIC || ISNIL( 2 ) ) + else if( hb_parinfo( 2 ) & HB_IT_NUMERIC || ISNIL( 2 ) ) { HB_FHANDLE fhandle; diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index fc9c4b2ac1..3e40594337 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -623,8 +623,8 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ ) CASE aA[ PRT_CAST ] $ cIntegers s := 'hb_parni( '+ cHBIdx +' )' - IF !empty( aA[ PRT_DEFAULT ] ) - aA[ PRT_BODY ] := '( HB_ISNIL( '+cHBIdx+' ) ? '+aA[ PRT_DEFAULT ]+' : '+ s + ' )' + IF !empty( aA[ PRT_DEFAULT ] ) .AND. !( aA[ PRT_DEFAULT ] == "0" ) + aA[ PRT_BODY ] := '( HB_ISNUM( '+cHBIdx+' ) ? ' + s + ' : ' + aA[ PRT_DEFAULT ] + ' )' ELSE aA[ PRT_BODY ] := s ENDIF @@ -646,15 +646,15 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ ) CASE ( '::' $ aA[ PRT_CAST ] ) s := '( '+ aA[ PRT_CAST ] +' ) hb_parni( '+ cHBIdx +' )' - IF !empty( aA[ PRT_DEFAULT ] ) + IF !empty( aA[ PRT_DEFAULT ] ) .AND. !( aA[ PRT_DEFAULT ] == "0" ) IF ascan( aEnum, aA[ PRT_DEFAULT ] ) > 0 ss := cWidget+'::'+aA[ PRT_DEFAULT ] ELSE ss := IF( '::' $ aA[ PRT_DEFAULT ], aA[ PRT_DEFAULT ], ; - IF( isDigit( left( aA[ PRT_DEFAULT ],1 ) ), aA[ PRT_DEFAULT ], cWidget+'::'+aA[ PRT_DEFAULT ] ) ) + IF( isDigit( left( aA[ PRT_DEFAULT ], 1 ) ), aA[ PRT_DEFAULT ], cWidget+'::'+aA[ PRT_DEFAULT ] ) ) ENDIF ss := '( '+ aA[ PRT_CAST ] +' ) '+ss - aA[ PRT_BODY ] := '( HB_ISNIL( '+cHBIdx+' ) ? '+ ss +' : '+ s + ' )' + aA[ PRT_BODY ] := '( HB_ISNUM( '+cHBIdx+' ) ? ' + s + ' : ' + ss + ' )' ELSE aA[ PRT_BODY ] := s ENDIF diff --git a/harbour/contrib/hbqt/hbqt_qabstractbutton.cpp b/harbour/contrib/hbqt/hbqt_qabstractbutton.cpp index dedd227eb7..8c61f96604 100644 --- a/harbour/contrib/hbqt/hbqt_qabstractbutton.cpp +++ b/harbour/contrib/hbqt/hbqt_qabstractbutton.cpp @@ -245,7 +245,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_TEXT ) */ HB_FUNC( QT_QABSTRACTBUTTON_ANIMATECLICK ) { - hbqt_par_QAbstractButton( 1 )->animateClick( ( HB_ISNIL( 2 ) ? 100 : hb_parni( 2 ) ) ); + hbqt_par_QAbstractButton( 1 )->animateClick( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 100 ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qboxlayout.cpp b/harbour/contrib/hbqt/hbqt_qboxlayout.cpp index 3e2c99ae34..8923f957ef 100644 --- a/harbour/contrib/hbqt/hbqt_qboxlayout.cpp +++ b/harbour/contrib/hbqt/hbqt_qboxlayout.cpp @@ -78,7 +78,7 @@ HB_FUNC( QT_QBOXLAYOUT ) */ HB_FUNC( QT_QBOXLAYOUT_ADDLAYOUT ) { - hbqt_par_QBoxLayout( 1 )->addLayout( hbqt_par_QLayout( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ) ); + hbqt_par_QBoxLayout( 1 )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ) ); } /* @@ -102,7 +102,7 @@ HB_FUNC( QT_QBOXLAYOUT_ADDSPACING ) */ HB_FUNC( QT_QBOXLAYOUT_ADDSTRETCH ) { - hbqt_par_QBoxLayout( 1 )->addStretch( ( HB_ISNIL( 2 ) ? 0 : hb_parni( 2 ) ) ); + hbqt_par_QBoxLayout( 1 )->addStretch( hb_parni( 2 ) ); } /* @@ -118,7 +118,7 @@ HB_FUNC( QT_QBOXLAYOUT_ADDSTRUT ) */ HB_FUNC( QT_QBOXLAYOUT_ADDWIDGET ) { - hbqt_par_QBoxLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? ( Qt::Alignment ) 0 : ( Qt::Alignment ) hb_parni( 4 ) ) ); + hbqt_par_QBoxLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), ( Qt::Alignment ) hb_parni( 4 ) ); } /* @@ -134,7 +134,7 @@ HB_FUNC( QT_QBOXLAYOUT_DIRECTION ) */ HB_FUNC( QT_QBOXLAYOUT_INSERTLAYOUT ) { - hbqt_par_QBoxLayout( 1 )->insertLayout( hb_parni( 2 ), hbqt_par_QLayout( 3 ), ( HB_ISNIL( 4 ) ? 0 : hb_parni( 4 ) ) ); + hbqt_par_QBoxLayout( 1 )->insertLayout( hb_parni( 2 ), hbqt_par_QLayout( 3 ), hb_parni( 4 ) ); } /* @@ -158,7 +158,7 @@ HB_FUNC( QT_QBOXLAYOUT_INSERTSPACING ) */ HB_FUNC( QT_QBOXLAYOUT_INSERTSTRETCH ) { - hbqt_par_QBoxLayout( 1 )->insertStretch( hb_parni( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ) ); + hbqt_par_QBoxLayout( 1 )->insertStretch( hb_parni( 2 ), hb_parni( 3 ) ); } /* @@ -166,7 +166,7 @@ HB_FUNC( QT_QBOXLAYOUT_INSERTSTRETCH ) */ HB_FUNC( QT_QBOXLAYOUT_INSERTWIDGET ) { - hbqt_par_QBoxLayout( 1 )->insertWidget( hb_parni( 2 ), hbqt_par_QWidget( 3 ), ( HB_ISNIL( 4 ) ? 0 : hb_parni( 4 ) ), ( HB_ISNIL( 5 ) ? ( Qt::Alignment ) 0 : ( Qt::Alignment ) hb_parni( 5 ) ) ); + hbqt_par_QBoxLayout( 1 )->insertWidget( hb_parni( 2 ), hbqt_par_QWidget( 3 ), hb_parni( 4 ), ( Qt::Alignment ) hb_parni( 5 ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qclipboard.cpp b/harbour/contrib/hbqt/hbqt_qclipboard.cpp index 5859b69f31..1fb215af5e 100644 --- a/harbour/contrib/hbqt/hbqt_qclipboard.cpp +++ b/harbour/contrib/hbqt/hbqt_qclipboard.cpp @@ -77,7 +77,7 @@ HB_FUNC( QT_QCLIPBOARD ) */ HB_FUNC( QT_QCLIPBOARD_CLEAR ) { - hbqt_par_QClipboard( 1 )->clear( ( HB_ISNIL( 2 ) ? ( QClipboard::Mode ) QClipboard::Clipboard : ( QClipboard::Mode ) hb_parni( 2 ) ) ); + hbqt_par_QClipboard( 1 )->clear( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ); } /* @@ -85,7 +85,7 @@ HB_FUNC( QT_QCLIPBOARD_CLEAR ) */ HB_FUNC( QT_QCLIPBOARD_IMAGE ) { - hb_retptr( new QImage( hbqt_par_QClipboard( 1 )->image( ( HB_ISNIL( 2 ) ? ( QClipboard::Mode ) QClipboard::Clipboard : ( QClipboard::Mode ) hb_parni( 2 ) ) ) ) ); + hb_retptr( new QImage( hbqt_par_QClipboard( 1 )->image( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ); } /* @@ -93,7 +93,7 @@ HB_FUNC( QT_QCLIPBOARD_IMAGE ) */ HB_FUNC( QT_QCLIPBOARD_MIMEDATA ) { - hb_retptr( ( QMimeData* ) hbqt_par_QClipboard( 1 )->mimeData( ( HB_ISNIL( 2 ) ? ( QClipboard::Mode ) QClipboard::Clipboard : ( QClipboard::Mode ) hb_parni( 2 ) ) ) ); + hb_retptr( ( QMimeData* ) hbqt_par_QClipboard( 1 )->mimeData( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ); } /* @@ -125,7 +125,7 @@ HB_FUNC( QT_QCLIPBOARD_OWNSSELECTION ) */ HB_FUNC( QT_QCLIPBOARD_PIXMAP ) { - hb_retptr( new QPixmap( hbqt_par_QClipboard( 1 )->pixmap( ( HB_ISNIL( 2 ) ? ( QClipboard::Mode ) QClipboard::Clipboard : ( QClipboard::Mode ) hb_parni( 2 ) ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QClipboard( 1 )->pixmap( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ); } /* @@ -133,7 +133,7 @@ HB_FUNC( QT_QCLIPBOARD_PIXMAP ) */ HB_FUNC( QT_QCLIPBOARD_SETIMAGE ) { - hbqt_par_QClipboard( 1 )->setImage( *hbqt_par_QImage( 2 ), ( HB_ISNIL( 3 ) ? ( QClipboard::Mode ) QClipboard::Clipboard : ( QClipboard::Mode ) hb_parni( 3 ) ) ); + hbqt_par_QClipboard( 1 )->setImage( *hbqt_par_QImage( 2 ), ( HB_ISNUM( 3 ) ? ( QClipboard::Mode ) hb_parni( 3 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ); } /* @@ -141,7 +141,7 @@ HB_FUNC( QT_QCLIPBOARD_SETIMAGE ) */ HB_FUNC( QT_QCLIPBOARD_SETMIMEDATA ) { - hbqt_par_QClipboard( 1 )->setMimeData( hbqt_par_QMimeData( 2 ), ( HB_ISNIL( 3 ) ? ( QClipboard::Mode ) QClipboard::Clipboard : ( QClipboard::Mode ) hb_parni( 3 ) ) ); + hbqt_par_QClipboard( 1 )->setMimeData( hbqt_par_QMimeData( 2 ), ( HB_ISNUM( 3 ) ? ( QClipboard::Mode ) hb_parni( 3 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ); } /* @@ -149,7 +149,7 @@ HB_FUNC( QT_QCLIPBOARD_SETMIMEDATA ) */ HB_FUNC( QT_QCLIPBOARD_SETPIXMAP ) { - hbqt_par_QClipboard( 1 )->setPixmap( *hbqt_par_QPixmap( 2 ), ( HB_ISNIL( 3 ) ? ( QClipboard::Mode ) QClipboard::Clipboard : ( QClipboard::Mode ) hb_parni( 3 ) ) ); + hbqt_par_QClipboard( 1 )->setPixmap( *hbqt_par_QPixmap( 2 ), ( HB_ISNUM( 3 ) ? ( QClipboard::Mode ) hb_parni( 3 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ); } /* @@ -157,7 +157,7 @@ HB_FUNC( QT_QCLIPBOARD_SETPIXMAP ) */ HB_FUNC( QT_QCLIPBOARD_SETTEXT ) { - hbqt_par_QClipboard( 1 )->setText( hbqt_par_QString( 2 ), ( HB_ISNIL( 3 ) ? ( QClipboard::Mode ) QClipboard::Clipboard : ( QClipboard::Mode ) hb_parni( 3 ) ) ); + hbqt_par_QClipboard( 1 )->setText( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QClipboard::Mode ) hb_parni( 3 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ); } /* @@ -181,7 +181,7 @@ HB_FUNC( QT_QCLIPBOARD_SUPPORTSSELECTION ) */ HB_FUNC( QT_QCLIPBOARD_TEXT ) { - hb_retc( hbqt_par_QClipboard( 1 )->text( ( HB_ISNIL( 2 ) ? ( QClipboard::Mode ) QClipboard::Clipboard : ( QClipboard::Mode ) hb_parni( 2 ) ) ).toLatin1().data() ); + hb_retc( hbqt_par_QClipboard( 1 )->text( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ).toLatin1().data() ); } diff --git a/harbour/contrib/hbqt/hbqt_qcolor.cpp b/harbour/contrib/hbqt/hbqt_qcolor.cpp index 1351acdd5a..0ec6703446 100644 --- a/harbour/contrib/hbqt/hbqt_qcolor.cpp +++ b/harbour/contrib/hbqt/hbqt_qcolor.cpp @@ -153,7 +153,7 @@ HB_FUNC( QT_QCOLOR_CYANF ) */ HB_FUNC( QT_QCOLOR_DARKER ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->darker( ( HB_ISNIL( 2 ) ? 200 : hb_parni( 2 ) ) ) ) ); + hb_retptr( new QColor( hbqt_par_QColor( 1 )->darker( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 200 ) ) ) ); } /* @@ -313,7 +313,7 @@ HB_FUNC( QT_QCOLOR_ISVALID ) */ HB_FUNC( QT_QCOLOR_LIGHTER ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->lighter( ( HB_ISNIL( 2 ) ? 150 : hb_parni( 2 ) ) ) ) ); + hb_retptr( new QColor( hbqt_par_QColor( 1 )->lighter( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 150 ) ) ) ); } /* @@ -425,7 +425,7 @@ HB_FUNC( QT_QCOLOR_SETBLUEF ) */ HB_FUNC( QT_QCOLOR_SETCMYK ) { - hbqt_par_QColor( 1 )->setCmyk( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( HB_ISNIL( 6 ) ? 255 : hb_parni( 6 ) ) ); + hbqt_par_QColor( 1 )->setCmyk( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : 255 ) ); } /* @@ -457,7 +457,7 @@ HB_FUNC( QT_QCOLOR_SETGREENF ) */ HB_FUNC( QT_QCOLOR_SETHSV ) { - hbqt_par_QColor( 1 )->setHsv( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNIL( 5 ) ? 255 : hb_parni( 5 ) ) ); + hbqt_par_QColor( 1 )->setHsv( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 255 ) ); } /* @@ -497,7 +497,7 @@ HB_FUNC( QT_QCOLOR_SETREDF ) */ HB_FUNC( QT_QCOLOR_SETRGB ) { - hbqt_par_QColor( 1 )->setRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNIL( 5 ) ? 255 : hb_parni( 5 ) ) ); + hbqt_par_QColor( 1 )->setRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 255 ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qcombobox.cpp b/harbour/contrib/hbqt/hbqt_qcombobox.cpp index 83572b21ae..b3261e6de6 100644 --- a/harbour/contrib/hbqt/hbqt_qcombobox.cpp +++ b/harbour/contrib/hbqt/hbqt_qcombobox.cpp @@ -141,7 +141,7 @@ HB_FUNC( QT_QCOMBOBOX_DUPLICATESENABLED ) */ HB_FUNC( QT_QCOMBOBOX_FINDDATA ) { - hb_retni( hbqt_par_QComboBox( 1 )->findData( *hbqt_par_QVariant( 2 ), ( HB_ISNIL( 3 ) ? Qt::UserRole : hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? ( Qt::MatchFlags ) Qt::MatchExactly | Qt::MatchCaseSensitive : ( Qt::MatchFlags ) hb_parni( 4 ) ) ) ); + hb_retni( hbqt_par_QComboBox( 1 )->findData( *hbqt_par_QVariant( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::UserRole ), ( HB_ISNUM( 4 ) ? ( Qt::MatchFlags ) hb_parni( 4 ) : ( Qt::MatchFlags ) Qt::MatchExactly | Qt::MatchCaseSensitive ) ) ); } /* @@ -149,7 +149,7 @@ HB_FUNC( QT_QCOMBOBOX_FINDDATA ) */ HB_FUNC( QT_QCOMBOBOX_FINDTEXT ) { - hb_retni( hbqt_par_QComboBox( 1 )->findText( hbqt_par_QString( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::MatchFlags ) Qt::MatchExactly | Qt::MatchCaseSensitive : ( Qt::MatchFlags ) hb_parni( 3 ) ) ) ); + hb_retni( hbqt_par_QComboBox( 1 )->findText( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::MatchFlags ) hb_parni( 3 ) : ( Qt::MatchFlags ) Qt::MatchExactly | Qt::MatchCaseSensitive ) ) ); } /* @@ -229,7 +229,7 @@ HB_FUNC( QT_QCOMBOBOX_ISEDITABLE ) */ HB_FUNC( QT_QCOMBOBOX_ITEMDATA ) { - hb_retptr( new QVariant( hbqt_par_QComboBox( 1 )->itemData( hb_parni( 2 ), ( HB_ISNIL( 3 ) ? Qt::UserRole : hb_parni( 3 ) ) ) ) ); + hb_retptr( new QVariant( hbqt_par_QComboBox( 1 )->itemData( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::UserRole ) ) ) ); } /* @@ -373,7 +373,7 @@ HB_FUNC( QT_QCOMBOBOX_SETINSERTPOLICY ) */ HB_FUNC( QT_QCOMBOBOX_SETITEMDATA ) { - hbqt_par_QComboBox( 1 )->setItemData( hb_parni( 2 ), *hbqt_par_QVariant( 3 ), ( HB_ISNIL( 4 ) ? Qt::UserRole : hb_parni( 4 ) ) ); + hbqt_par_QComboBox( 1 )->setItemData( hb_parni( 2 ), *hbqt_par_QVariant( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::UserRole ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qdesktopwidget.cpp b/harbour/contrib/hbqt/hbqt_qdesktopwidget.cpp index ebc5a6453b..8948df805e 100644 --- a/harbour/contrib/hbqt/hbqt_qdesktopwidget.cpp +++ b/harbour/contrib/hbqt/hbqt_qdesktopwidget.cpp @@ -77,7 +77,7 @@ HB_FUNC( QT_QDESKTOPWIDGET ) */ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY ) { - hb_retptr( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( ( HB_ISNIL( 2 ) ? -1 : hb_parni( 2 ) ) ) ) ); + hb_retptr( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ); } /* @@ -125,7 +125,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_PRIMARYSCREEN ) */ HB_FUNC( QT_QDESKTOPWIDGET_SCREEN ) { - hb_retptr( ( QWidget* ) hbqt_par_QDesktopWidget( 1 )->screen( ( HB_ISNIL( 2 ) ? -1 : hb_parni( 2 ) ) ) ); + hb_retptr( ( QWidget* ) hbqt_par_QDesktopWidget( 1 )->screen( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ); } /* @@ -133,7 +133,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_SCREEN ) */ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY ) { - hb_retptr( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( ( HB_ISNIL( 2 ) ? -1 : hb_parni( 2 ) ) ) ) ); + hb_retptr( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qdir.cpp b/harbour/contrib/hbqt/hbqt_qdir.cpp index 65a983da4b..23270a5371 100644 --- a/harbour/contrib/hbqt/hbqt_qdir.cpp +++ b/harbour/contrib/hbqt/hbqt_qdir.cpp @@ -135,7 +135,7 @@ HB_FUNC( QT_QDIR_DIRNAME ) */ HB_FUNC( QT_QDIR_ENTRYINFOLIST ) { - hb_retptr( new QFileInfoList( hbqt_par_QDir( 1 )->entryInfoList( *hbqt_par_QStringList( 2 ), ( HB_ISNIL( 3 ) ? ( QDir::Filters ) QDir::NoFilter : ( QDir::Filters ) hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? ( QDir::SortFlags ) QDir::NoSort : ( QDir::SortFlags ) hb_parni( 4 ) ) ) ) ); + hb_retptr( new QFileInfoList( hbqt_par_QDir( 1 )->entryInfoList( *hbqt_par_QStringList( 2 ), ( HB_ISNUM( 3 ) ? ( QDir::Filters ) hb_parni( 3 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 4 ) ? ( QDir::SortFlags ) hb_parni( 4 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ); } /* @@ -143,7 +143,7 @@ HB_FUNC( QT_QDIR_ENTRYINFOLIST ) */ HB_FUNC( QT_QDIR_ENTRYINFOLIST_1 ) { - hb_retptr( new QFileInfoList( hbqt_par_QDir( 1 )->entryInfoList( ( HB_ISNIL( 2 ) ? ( QDir::Filters ) QDir::NoFilter : ( QDir::Filters ) hb_parni( 2 ) ), ( HB_ISNIL( 3 ) ? ( QDir::SortFlags ) QDir::NoSort : ( QDir::SortFlags ) hb_parni( 3 ) ) ) ) ); + hb_retptr( new QFileInfoList( hbqt_par_QDir( 1 )->entryInfoList( ( HB_ISNUM( 2 ) ? ( QDir::Filters ) hb_parni( 2 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 3 ) ? ( QDir::SortFlags ) hb_parni( 3 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ); } /* @@ -151,7 +151,7 @@ HB_FUNC( QT_QDIR_ENTRYINFOLIST_1 ) */ HB_FUNC( QT_QDIR_ENTRYLIST ) { - hb_retptr( new QStringList( hbqt_par_QDir( 1 )->entryList( *hbqt_par_QStringList( 2 ), ( HB_ISNIL( 3 ) ? ( QDir::Filters ) QDir::NoFilter : ( QDir::Filters ) hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? ( QDir::SortFlags ) QDir::NoSort : ( QDir::SortFlags ) hb_parni( 4 ) ) ) ) ); + hb_retptr( new QStringList( hbqt_par_QDir( 1 )->entryList( *hbqt_par_QStringList( 2 ), ( HB_ISNUM( 3 ) ? ( QDir::Filters ) hb_parni( 3 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 4 ) ? ( QDir::SortFlags ) hb_parni( 4 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ); } /* @@ -159,7 +159,7 @@ HB_FUNC( QT_QDIR_ENTRYLIST ) */ HB_FUNC( QT_QDIR_ENTRYLIST_1 ) { - hb_retptr( new QStringList( hbqt_par_QDir( 1 )->entryList( ( HB_ISNIL( 2 ) ? ( QDir::Filters ) QDir::NoFilter : ( QDir::Filters ) hb_parni( 2 ) ), ( HB_ISNIL( 3 ) ? ( QDir::SortFlags ) QDir::NoSort : ( QDir::SortFlags ) hb_parni( 3 ) ) ) ) ); + hb_retptr( new QStringList( hbqt_par_QDir( 1 )->entryList( ( HB_ISNUM( 2 ) ? ( QDir::Filters ) hb_parni( 2 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 3 ) ? ( QDir::SortFlags ) hb_parni( 3 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qeventloop.cpp b/harbour/contrib/hbqt/hbqt_qeventloop.cpp index 64646eea25..a3a8f81761 100644 --- a/harbour/contrib/hbqt/hbqt_qeventloop.cpp +++ b/harbour/contrib/hbqt/hbqt_qeventloop.cpp @@ -77,7 +77,7 @@ HB_FUNC( QT_QEVENTLOOP ) */ HB_FUNC( QT_QEVENTLOOP_EXEC ) { - hb_retni( hbqt_par_QEventLoop( 1 )->exec( ( HB_ISNIL( 2 ) ? ( QEventLoop::ProcessEventsFlags ) QEventLoop::AllEvents : ( QEventLoop::ProcessEventsFlags ) hb_parni( 2 ) ) ) ); + hb_retni( hbqt_par_QEventLoop( 1 )->exec( ( HB_ISNUM( 2 ) ? ( QEventLoop::ProcessEventsFlags ) hb_parni( 2 ) : ( QEventLoop::ProcessEventsFlags ) QEventLoop::AllEvents ) ) ); } /* @@ -85,7 +85,7 @@ HB_FUNC( QT_QEVENTLOOP_EXEC ) */ HB_FUNC( QT_QEVENTLOOP_EXIT ) { - hbqt_par_QEventLoop( 1 )->exit( ( HB_ISNIL( 2 ) ? 0 : hb_parni( 2 ) ) ); + hbqt_par_QEventLoop( 1 )->exit( hb_parni( 2 ) ); } /* @@ -101,7 +101,7 @@ HB_FUNC( QT_QEVENTLOOP_ISRUNNING ) */ HB_FUNC( QT_QEVENTLOOP_PROCESSEVENTS ) { - hb_retl( hbqt_par_QEventLoop( 1 )->processEvents( ( HB_ISNIL( 2 ) ? ( QEventLoop::ProcessEventsFlags ) QEventLoop::AllEvents : ( QEventLoop::ProcessEventsFlags ) hb_parni( 2 ) ) ) ); + hb_retl( hbqt_par_QEventLoop( 1 )->processEvents( ( HB_ISNUM( 2 ) ? ( QEventLoop::ProcessEventsFlags ) hb_parni( 2 ) : ( QEventLoop::ProcessEventsFlags ) QEventLoop::AllEvents ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qfont.cpp b/harbour/contrib/hbqt/hbqt_qfont.cpp index dba6099cb1..32189adb6e 100644 --- a/harbour/contrib/hbqt/hbqt_qfont.cpp +++ b/harbour/contrib/hbqt/hbqt_qfont.cpp @@ -376,7 +376,7 @@ HB_FUNC( QT_QFONT_SETSTYLE ) */ HB_FUNC( QT_QFONT_SETSTYLEHINT ) { - hbqt_par_QFont( 1 )->setStyleHint( ( QFont::StyleHint ) hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( QFont::StyleStrategy ) QFont::PreferDefault : ( QFont::StyleStrategy ) hb_parni( 3 ) ) ); + hbqt_par_QFont( 1 )->setStyleHint( ( QFont::StyleHint ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QFont::StyleStrategy ) hb_parni( 3 ) : ( QFont::StyleStrategy ) QFont::PreferDefault ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qftp.cpp b/harbour/contrib/hbqt/hbqt_qftp.cpp index 8aaf6b8d8c..abd755328a 100644 --- a/harbour/contrib/hbqt/hbqt_qftp.cpp +++ b/harbour/contrib/hbqt/hbqt_qftp.cpp @@ -109,7 +109,7 @@ HB_FUNC( QT_QFTP_CLOSE ) */ HB_FUNC( QT_QFTP_CONNECTTOHOST ) { - hb_retni( hbqt_par_QFtp( 1 )->connectToHost( hbqt_par_QString( 2 ), ( HB_ISNIL( 3 ) ? 21 : hb_parni( 3 ) ) ) ); + hb_retni( hbqt_par_QFtp( 1 )->connectToHost( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 21 ) ) ); } /* @@ -157,7 +157,7 @@ HB_FUNC( QT_QFTP_ERRORSTRING ) */ HB_FUNC( QT_QFTP_GET ) { - hb_retni( hbqt_par_QFtp( 1 )->get( hbqt_par_QString( 2 ), hbqt_par_QIODevice( 3 ), ( HB_ISNIL( 4 ) ? ( QFtp::TransferType ) QFtp::Binary : ( QFtp::TransferType ) hb_parni( 4 ) ) ) ); + hb_retni( hbqt_par_QFtp( 1 )->get( hbqt_par_QString( 2 ), hbqt_par_QIODevice( 3 ), ( HB_ISNUM( 4 ) ? ( QFtp::TransferType ) hb_parni( 4 ) : ( QFtp::TransferType ) QFtp::Binary ) ) ); } /* @@ -197,7 +197,7 @@ HB_FUNC( QT_QFTP_MKDIR ) */ HB_FUNC( QT_QFTP_PUT ) { - hb_retni( hbqt_par_QFtp( 1 )->put( hbqt_par_QIODevice( 2 ), hbqt_par_QString( 3 ), ( HB_ISNIL( 4 ) ? ( QFtp::TransferType ) QFtp::Binary : ( QFtp::TransferType ) hb_parni( 4 ) ) ) ); + hb_retni( hbqt_par_QFtp( 1 )->put( hbqt_par_QIODevice( 2 ), hbqt_par_QString( 3 ), ( HB_ISNUM( 4 ) ? ( QFtp::TransferType ) hb_parni( 4 ) : ( QFtp::TransferType ) QFtp::Binary ) ) ); } /* @@ -205,7 +205,7 @@ HB_FUNC( QT_QFTP_PUT ) */ HB_FUNC( QT_QFTP_PUT_1 ) { - hb_retni( hbqt_par_QFtp( 1 )->put( *hbqt_par_QByteArray( 2 ), hbqt_par_QString( 3 ), ( HB_ISNIL( 4 ) ? ( QFtp::TransferType ) QFtp::Binary : ( QFtp::TransferType ) hb_parni( 4 ) ) ) ); + hb_retni( hbqt_par_QFtp( 1 )->put( *hbqt_par_QByteArray( 2 ), hbqt_par_QString( 3 ), ( HB_ISNUM( 4 ) ? ( QFtp::TransferType ) hb_parni( 4 ) : ( QFtp::TransferType ) QFtp::Binary ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qgridlayout.cpp b/harbour/contrib/hbqt/hbqt_qgridlayout.cpp index 9c1cfebde2..0bffefe732 100644 --- a/harbour/contrib/hbqt/hbqt_qgridlayout.cpp +++ b/harbour/contrib/hbqt/hbqt_qgridlayout.cpp @@ -78,7 +78,7 @@ HB_FUNC( QT_QGRIDLAYOUT ) */ HB_FUNC( QT_QGRIDLAYOUT_ADDITEM ) { - hbqt_par_QGridLayout( 1 )->addItem( hbqt_par_QLayoutItem( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNIL( 5 ) ? 1 : hb_parni( 5 ) ), ( HB_ISNIL( 6 ) ? 1 : hb_parni( 6 ) ), ( HB_ISNIL( 7 ) ? ( Qt::Alignment ) 0 : ( Qt::Alignment ) hb_parni( 7 ) ) ); + hbqt_par_QGridLayout( 1 )->addItem( hbqt_par_QLayoutItem( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 1 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : 1 ), ( Qt::Alignment ) hb_parni( 7 ) ); } /* @@ -86,7 +86,7 @@ HB_FUNC( QT_QGRIDLAYOUT_ADDITEM ) */ HB_FUNC( QT_QGRIDLAYOUT_ADDLAYOUT ) { - hbqt_par_QGridLayout( 1 )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNIL( 5 ) ? ( Qt::Alignment ) 0 : ( Qt::Alignment ) hb_parni( 5 ) ) ); + hbqt_par_QGridLayout( 1 )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( Qt::Alignment ) hb_parni( 5 ) ); } /* @@ -94,7 +94,7 @@ HB_FUNC( QT_QGRIDLAYOUT_ADDLAYOUT ) */ HB_FUNC( QT_QGRIDLAYOUT_ADDLAYOUT_1 ) { - hbqt_par_QGridLayout( 1 )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), ( HB_ISNIL( 7 ) ? ( Qt::Alignment ) 0 : ( Qt::Alignment ) hb_parni( 7 ) ) ); + hbqt_par_QGridLayout( 1 )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), ( Qt::Alignment ) hb_parni( 7 ) ); } /* @@ -102,7 +102,7 @@ HB_FUNC( QT_QGRIDLAYOUT_ADDLAYOUT_1 ) */ HB_FUNC( QT_QGRIDLAYOUT_ADDWIDGET ) { - hbqt_par_QGridLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNIL( 5 ) ? ( Qt::Alignment ) 0 : ( Qt::Alignment ) hb_parni( 5 ) ) ); + hbqt_par_QGridLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( Qt::Alignment ) hb_parni( 5 ) ); } /* @@ -110,7 +110,7 @@ HB_FUNC( QT_QGRIDLAYOUT_ADDWIDGET ) */ HB_FUNC( QT_QGRIDLAYOUT_ADDWIDGET_1 ) { - hbqt_par_QGridLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), ( HB_ISNIL( 7 ) ? ( Qt::Alignment ) 0 : ( Qt::Alignment ) hb_parni( 7 ) ) ); + hbqt_par_QGridLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), ( Qt::Alignment ) hb_parni( 7 ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qhttp.cpp b/harbour/contrib/hbqt/hbqt_qhttp.cpp index 1b5b2f1ba8..d9daa7b7c7 100644 --- a/harbour/contrib/hbqt/hbqt_qhttp.cpp +++ b/harbour/contrib/hbqt/hbqt_qhttp.cpp @@ -231,7 +231,7 @@ HB_FUNC( QT_QHTTP_REQUEST_1 ) */ HB_FUNC( QT_QHTTP_SETHOST ) { - hb_retni( hbqt_par_QHttp( 1 )->setHost( hbqt_par_QString( 2 ), ( HB_ISNIL( 3 ) ? 80 : hb_parni( 3 ) ) ) ); + hb_retni( hbqt_par_QHttp( 1 )->setHost( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 80 ) ) ); } /* @@ -239,7 +239,7 @@ HB_FUNC( QT_QHTTP_SETHOST ) */ HB_FUNC( QT_QHTTP_SETHOST_1 ) { - hb_retni( hbqt_par_QHttp( 1 )->setHost( hbqt_par_QString( 2 ), ( QHttp::ConnectionMode ) hb_parni( 3 ), ( HB_ISNIL( 4 ) ? 0 : hb_parni( 4 ) ) ) ); + hb_retni( hbqt_par_QHttp( 1 )->setHost( hbqt_par_QString( 2 ), ( QHttp::ConnectionMode ) hb_parni( 3 ), hb_parni( 4 ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qicon.cpp b/harbour/contrib/hbqt/hbqt_qicon.cpp index 5a80acc27e..4492a5bf75 100644 --- a/harbour/contrib/hbqt/hbqt_qicon.cpp +++ b/harbour/contrib/hbqt/hbqt_qicon.cpp @@ -91,7 +91,7 @@ HB_FUNC( QT_QICON ) */ HB_FUNC( QT_QICON_ACTUALSIZE ) { - hb_retptr( new QSize( hbqt_par_QIcon( 1 )->actualSize( *hbqt_par_QSize( 2 ), ( HB_ISNIL( 3 ) ? ( QIcon::Mode ) QIcon::Normal : ( QIcon::Mode ) hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? ( QIcon::State ) QIcon::Off : ( QIcon::State ) hb_parni( 4 ) ) ) ) ); + hb_retptr( new QSize( hbqt_par_QIcon( 1 )->actualSize( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ); } /* @@ -107,7 +107,7 @@ HB_FUNC( QT_QICON_ADDFILE ) */ HB_FUNC( QT_QICON_ADDPIXMAP ) { - hbqt_par_QIcon( 1 )->addPixmap( *hbqt_par_QPixmap( 2 ), ( HB_ISNIL( 3 ) ? ( QIcon::Mode ) QIcon::Normal : ( QIcon::Mode ) hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? ( QIcon::State ) QIcon::Off : ( QIcon::State ) hb_parni( 4 ) ) ); + hbqt_par_QIcon( 1 )->addPixmap( *hbqt_par_QPixmap( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ); } /* @@ -131,7 +131,7 @@ HB_FUNC( QT_QICON_ISNULL ) */ HB_FUNC( QT_QICON_PAINT ) { - hbqt_par_QIcon( 1 )->paint( hbqt_par_QPainter( 2 ), *hbqt_par_QRect( 3 ), ( HB_ISNIL( 4 ) ? ( Qt::Alignment ) Qt::AlignCenter : ( Qt::Alignment ) hb_parni( 4 ) ), ( HB_ISNIL( 5 ) ? ( QIcon::Mode ) QIcon::Normal : ( QIcon::Mode ) hb_parni( 5 ) ), ( HB_ISNIL( 6 ) ? ( QIcon::State ) QIcon::Off : ( QIcon::State ) hb_parni( 6 ) ) ); + hbqt_par_QIcon( 1 )->paint( hbqt_par_QPainter( 2 ), *hbqt_par_QRect( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::Alignment ) hb_parni( 4 ) : ( Qt::Alignment ) Qt::AlignCenter ), ( HB_ISNUM( 5 ) ? ( QIcon::Mode ) hb_parni( 5 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 6 ) ? ( QIcon::State ) hb_parni( 6 ) : ( QIcon::State ) QIcon::Off ) ); } /* @@ -139,7 +139,7 @@ HB_FUNC( QT_QICON_PAINT ) */ HB_FUNC( QT_QICON_PAINT_1 ) { - hbqt_par_QIcon( 1 )->paint( hbqt_par_QPainter( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), ( HB_ISNIL( 7 ) ? ( Qt::Alignment ) Qt::AlignCenter : ( Qt::Alignment ) hb_parni( 7 ) ), ( HB_ISNIL( 8 ) ? ( QIcon::Mode ) QIcon::Normal : ( QIcon::Mode ) hb_parni( 8 ) ), ( HB_ISNIL( 9 ) ? ( QIcon::State ) QIcon::Off : ( QIcon::State ) hb_parni( 9 ) ) ); + hbqt_par_QIcon( 1 )->paint( hbqt_par_QPainter( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), ( HB_ISNUM( 7 ) ? ( Qt::Alignment ) hb_parni( 7 ) : ( Qt::Alignment ) Qt::AlignCenter ), ( HB_ISNUM( 8 ) ? ( QIcon::Mode ) hb_parni( 8 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 9 ) ? ( QIcon::State ) hb_parni( 9 ) : ( QIcon::State ) QIcon::Off ) ); } /* @@ -147,7 +147,7 @@ HB_FUNC( QT_QICON_PAINT_1 ) */ HB_FUNC( QT_QICON_PIXMAP ) { - hb_retptr( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( *hbqt_par_QSize( 2 ), ( HB_ISNIL( 3 ) ? ( QIcon::Mode ) QIcon::Normal : ( QIcon::Mode ) hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? ( QIcon::State ) QIcon::Off : ( QIcon::State ) hb_parni( 4 ) ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ); } /* @@ -155,7 +155,7 @@ HB_FUNC( QT_QICON_PIXMAP ) */ HB_FUNC( QT_QICON_PIXMAP_1 ) { - hb_retptr( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNIL( 4 ) ? ( QIcon::Mode ) QIcon::Normal : ( QIcon::Mode ) hb_parni( 4 ) ), ( HB_ISNIL( 5 ) ? ( QIcon::State ) QIcon::Off : ( QIcon::State ) hb_parni( 5 ) ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( QIcon::Mode ) hb_parni( 4 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 5 ) ? ( QIcon::State ) hb_parni( 5 ) : ( QIcon::State ) QIcon::Off ) ) ) ); } /* @@ -163,7 +163,7 @@ HB_FUNC( QT_QICON_PIXMAP_1 ) */ HB_FUNC( QT_QICON_PIXMAP_2 ) { - hb_retptr( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( QIcon::Mode ) QIcon::Normal : ( QIcon::Mode ) hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? ( QIcon::State ) QIcon::Off : ( QIcon::State ) hb_parni( 4 ) ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ); } diff --git a/harbour/contrib/hbqt/hbqt_qlineedit.cpp b/harbour/contrib/hbqt/hbqt_qlineedit.cpp index 76af567747..0691aaa8e4 100644 --- a/harbour/contrib/hbqt/hbqt_qlineedit.cpp +++ b/harbour/contrib/hbqt/hbqt_qlineedit.cpp @@ -110,7 +110,7 @@ HB_FUNC( QT_QLINEEDIT_CREATESTANDARDCONTEXTMENU ) */ HB_FUNC( QT_QLINEEDIT_CURSORBACKWARD ) { - hbqt_par_QLineEdit( 1 )->cursorBackward( hb_parl( 2 ), ( HB_ISNIL( 3 ) ? 1 : hb_parni( 3 ) ) ); + hbqt_par_QLineEdit( 1 )->cursorBackward( hb_parl( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 1 ) ); } /* @@ -118,7 +118,7 @@ HB_FUNC( QT_QLINEEDIT_CURSORBACKWARD ) */ HB_FUNC( QT_QLINEEDIT_CURSORFORWARD ) { - hbqt_par_QLineEdit( 1 )->cursorForward( hb_parl( 2 ), ( HB_ISNIL( 3 ) ? 1 : hb_parni( 3 ) ) ); + hbqt_par_QLineEdit( 1 )->cursorForward( hb_parl( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 1 ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qlistwidget.cpp b/harbour/contrib/hbqt/hbqt_qlistwidget.cpp index 3a8f8d505c..c4bdf29078 100644 --- a/harbour/contrib/hbqt/hbqt_qlistwidget.cpp +++ b/harbour/contrib/hbqt/hbqt_qlistwidget.cpp @@ -287,7 +287,7 @@ HB_FUNC( QT_QLISTWIDGET_SETSORTINGENABLED ) */ HB_FUNC( QT_QLISTWIDGET_SORTITEMS ) { - hbqt_par_QListWidget( 1 )->sortItems( ( HB_ISNIL( 2 ) ? ( Qt::SortOrder ) Qt::AscendingOrder : ( Qt::SortOrder ) hb_parni( 2 ) ) ); + hbqt_par_QListWidget( 1 )->sortItems( ( HB_ISNUM( 2 ) ? ( Qt::SortOrder ) hb_parni( 2 ) : ( Qt::SortOrder ) Qt::AscendingOrder ) ); } /* @@ -319,7 +319,7 @@ HB_FUNC( QT_QLISTWIDGET_CLEAR ) */ HB_FUNC( QT_QLISTWIDGET_SCROLLTOITEM ) { - hbqt_par_QListWidget( 1 )->scrollToItem( hbqt_par_QListWidgetItem( 2 ), ( HB_ISNIL( 3 ) ? ( QAbstractItemView::ScrollHint ) QListWidget::EnsureVisible : ( QAbstractItemView::ScrollHint ) hb_parni( 3 ) ) ); + hbqt_par_QListWidget( 1 )->scrollToItem( hbqt_par_QListWidgetItem( 2 ), ( HB_ISNUM( 3 ) ? ( QAbstractItemView::ScrollHint ) hb_parni( 3 ) : ( QAbstractItemView::ScrollHint ) QListWidget::EnsureVisible ) ); } diff --git a/harbour/contrib/hbqt/hbqt_qmainwindow.cpp b/harbour/contrib/hbqt/hbqt_qmainwindow.cpp index 017fd50b6c..c480054ae0 100644 --- a/harbour/contrib/hbqt/hbqt_qmainwindow.cpp +++ b/harbour/contrib/hbqt/hbqt_qmainwindow.cpp @@ -126,7 +126,7 @@ HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR_2 ) */ HB_FUNC( QT_QMAINWINDOW_ADDTOOLBARBREAK ) { - hbqt_par_QMainWindow( 1 )->addToolBarBreak( ( HB_ISNIL( 2 ) ? ( Qt::ToolBarArea ) Qt::TopToolBarArea : ( Qt::ToolBarArea ) hb_parni( 2 ) ) ); + hbqt_par_QMainWindow( 1 )->addToolBarBreak( ( HB_ISNUM( 2 ) ? ( Qt::ToolBarArea ) hb_parni( 2 ) : ( Qt::ToolBarArea ) Qt::TopToolBarArea ) ); } /* @@ -270,7 +270,7 @@ HB_FUNC( QT_QMAINWINDOW_RESTOREDOCKWIDGET ) */ HB_FUNC( QT_QMAINWINDOW_RESTORESTATE ) { - hb_retl( hbqt_par_QMainWindow( 1 )->restoreState( *hbqt_par_QByteArray( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ) ) ); + hb_retl( hbqt_par_QMainWindow( 1 )->restoreState( *hbqt_par_QByteArray( 2 ), hb_parni( 3 ) ) ); } /* @@ -278,7 +278,7 @@ HB_FUNC( QT_QMAINWINDOW_RESTORESTATE ) */ HB_FUNC( QT_QMAINWINDOW_SAVESTATE ) { - hb_retptr( new QByteArray( hbqt_par_QMainWindow( 1 )->saveState( ( HB_ISNIL( 2 ) ? 0 : hb_parni( 2 ) ) ) ) ); + hb_retptr( new QByteArray( hbqt_par_QMainWindow( 1 )->saveState( hb_parni( 2 ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qobject.cpp b/harbour/contrib/hbqt/hbqt_qobject.cpp index 0930f58d96..c37b16baed 100644 --- a/harbour/contrib/hbqt/hbqt_qobject.cpp +++ b/harbour/contrib/hbqt/hbqt_qobject.cpp @@ -104,7 +104,7 @@ HB_FUNC( QT_QOBJECT_CHILDREN ) */ HB_FUNC( QT_QOBJECT_CONNECT ) { - hb_retl( hbqt_par_QObject( 1 )->connect( hbqt_par_QObject( 2 ), hbqt_par_char( 3 ), hbqt_par_char( 4 ), ( HB_ISNIL( 5 ) ? ( Qt::ConnectionType ) Qt::AutoConnection : ( Qt::ConnectionType ) hb_parni( 5 ) ) ) ); + hb_retl( hbqt_par_QObject( 1 )->connect( hbqt_par_QObject( 2 ), hbqt_par_char( 3 ), hbqt_par_char( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::ConnectionType ) hb_parni( 5 ) : ( Qt::ConnectionType ) Qt::AutoConnection ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qpainter.cpp b/harbour/contrib/hbqt/hbqt_qpainter.cpp index ae26fb176d..f45df5ca14 100644 --- a/harbour/contrib/hbqt/hbqt_qpainter.cpp +++ b/harbour/contrib/hbqt/hbqt_qpainter.cpp @@ -354,7 +354,7 @@ HB_FUNC( QT_QPAINTER_DRAWELLIPSE_4 ) */ HB_FUNC( QT_QPAINTER_DRAWIMAGE ) { - hbqt_par_QPainter( 1 )->drawImage( *hbqt_par_QRectF( 2 ), *hbqt_par_QImage( 3 ), *hbqt_par_QRectF( 4 ), ( HB_ISNIL( 5 ) ? ( Qt::ImageConversionFlags ) Qt::AutoColor : ( Qt::ImageConversionFlags ) hb_parni( 5 ) ) ); + hbqt_par_QPainter( 1 )->drawImage( *hbqt_par_QRectF( 2 ), *hbqt_par_QImage( 3 ), *hbqt_par_QRectF( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::ImageConversionFlags ) hb_parni( 5 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ); } /* @@ -362,7 +362,7 @@ HB_FUNC( QT_QPAINTER_DRAWIMAGE ) */ HB_FUNC( QT_QPAINTER_DRAWIMAGE_1 ) { - hbqt_par_QPainter( 1 )->drawImage( *hbqt_par_QRect( 2 ), *hbqt_par_QImage( 3 ), *hbqt_par_QRect( 4 ), ( HB_ISNIL( 5 ) ? ( Qt::ImageConversionFlags ) Qt::AutoColor : ( Qt::ImageConversionFlags ) hb_parni( 5 ) ) ); + hbqt_par_QPainter( 1 )->drawImage( *hbqt_par_QRect( 2 ), *hbqt_par_QImage( 3 ), *hbqt_par_QRect( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::ImageConversionFlags ) hb_parni( 5 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ); } /* @@ -386,7 +386,7 @@ HB_FUNC( QT_QPAINTER_DRAWIMAGE_3 ) */ HB_FUNC( QT_QPAINTER_DRAWIMAGE_4 ) { - hbqt_par_QPainter( 1 )->drawImage( *hbqt_par_QPointF( 2 ), *hbqt_par_QImage( 3 ), *hbqt_par_QRectF( 4 ), ( HB_ISNIL( 5 ) ? ( Qt::ImageConversionFlags ) Qt::AutoColor : ( Qt::ImageConversionFlags ) hb_parni( 5 ) ) ); + hbqt_par_QPainter( 1 )->drawImage( *hbqt_par_QPointF( 2 ), *hbqt_par_QImage( 3 ), *hbqt_par_QRectF( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::ImageConversionFlags ) hb_parni( 5 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ); } /* @@ -394,7 +394,7 @@ HB_FUNC( QT_QPAINTER_DRAWIMAGE_4 ) */ HB_FUNC( QT_QPAINTER_DRAWIMAGE_5 ) { - hbqt_par_QPainter( 1 )->drawImage( *hbqt_par_QPoint( 2 ), *hbqt_par_QImage( 3 ), *hbqt_par_QRect( 4 ), ( HB_ISNIL( 5 ) ? ( Qt::ImageConversionFlags ) Qt::AutoColor : ( Qt::ImageConversionFlags ) hb_parni( 5 ) ) ); + hbqt_par_QPainter( 1 )->drawImage( *hbqt_par_QPoint( 2 ), *hbqt_par_QImage( 3 ), *hbqt_par_QRect( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::ImageConversionFlags ) hb_parni( 5 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ); } /* @@ -418,7 +418,7 @@ HB_FUNC( QT_QPAINTER_DRAWIMAGE_7 ) */ HB_FUNC( QT_QPAINTER_DRAWIMAGE_8 ) { - hbqt_par_QPainter( 1 )->drawImage( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QImage( 4 ), ( HB_ISNIL( 5 ) ? 0 : hb_parni( 5 ) ), ( HB_ISNIL( 6 ) ? 0 : hb_parni( 6 ) ), ( HB_ISNIL( 7 ) ? -1 : hb_parni( 7 ) ), ( HB_ISNIL( 8 ) ? -1 : hb_parni( 8 ) ), ( HB_ISNIL( 9 ) ? ( Qt::ImageConversionFlags ) Qt::AutoColor : ( Qt::ImageConversionFlags ) hb_parni( 9 ) ) ); + hbqt_par_QPainter( 1 )->drawImage( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QImage( 4 ), hb_parni( 5 ), hb_parni( 6 ), ( HB_ISNUM( 7 ) ? hb_parni( 7 ) : -1 ), ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : -1 ), ( HB_ISNUM( 9 ) ? ( Qt::ImageConversionFlags ) hb_parni( 9 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ); } /* @@ -698,7 +698,7 @@ HB_FUNC( QT_QPAINTER_DRAWPOINTS_3 ) */ HB_FUNC( QT_QPAINTER_DRAWPOLYGON ) { - hbqt_par_QPainter( 1 )->drawPolygon( hbqt_par_QPointF( 2 ), hb_parni( 3 ), ( HB_ISNIL( 4 ) ? ( Qt::FillRule ) Qt::OddEvenFill : ( Qt::FillRule ) hb_parni( 4 ) ) ); + hbqt_par_QPainter( 1 )->drawPolygon( hbqt_par_QPointF( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::FillRule ) hb_parni( 4 ) : ( Qt::FillRule ) Qt::OddEvenFill ) ); } /* @@ -706,7 +706,7 @@ HB_FUNC( QT_QPAINTER_DRAWPOLYGON ) */ HB_FUNC( QT_QPAINTER_DRAWPOLYGON_1 ) { - hbqt_par_QPainter( 1 )->drawPolygon( hbqt_par_QPoint( 2 ), hb_parni( 3 ), ( HB_ISNIL( 4 ) ? ( Qt::FillRule ) Qt::OddEvenFill : ( Qt::FillRule ) hb_parni( 4 ) ) ); + hbqt_par_QPainter( 1 )->drawPolygon( hbqt_par_QPoint( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::FillRule ) hb_parni( 4 ) : ( Qt::FillRule ) Qt::OddEvenFill ) ); } /* @@ -714,7 +714,7 @@ HB_FUNC( QT_QPAINTER_DRAWPOLYGON_1 ) */ HB_FUNC( QT_QPAINTER_DRAWPOLYGON_2 ) { - hbqt_par_QPainter( 1 )->drawPolygon( *hbqt_par_QPolygonF( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::FillRule ) Qt::OddEvenFill : ( Qt::FillRule ) hb_parni( 3 ) ) ); + hbqt_par_QPainter( 1 )->drawPolygon( *hbqt_par_QPolygonF( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::FillRule ) hb_parni( 3 ) : ( Qt::FillRule ) Qt::OddEvenFill ) ); } /* @@ -722,7 +722,7 @@ HB_FUNC( QT_QPAINTER_DRAWPOLYGON_2 ) */ HB_FUNC( QT_QPAINTER_DRAWPOLYGON_3 ) { - hbqt_par_QPainter( 1 )->drawPolygon( *hbqt_par_QPolygon( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::FillRule ) Qt::OddEvenFill : ( Qt::FillRule ) hb_parni( 3 ) ) ); + hbqt_par_QPainter( 1 )->drawPolygon( *hbqt_par_QPolygon( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::FillRule ) hb_parni( 3 ) : ( Qt::FillRule ) Qt::OddEvenFill ) ); } /* @@ -802,7 +802,7 @@ HB_FUNC( QT_QPAINTER_DRAWRECTS_1 ) */ HB_FUNC( QT_QPAINTER_DRAWROUNDEDRECT ) { - hbqt_par_QPainter( 1 )->drawRoundedRect( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISNIL( 5 ) ? ( Qt::SizeMode ) Qt::AbsoluteSize : ( Qt::SizeMode ) hb_parni( 5 ) ) ); + hbqt_par_QPainter( 1 )->drawRoundedRect( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::SizeMode ) hb_parni( 5 ) : ( Qt::SizeMode ) Qt::AbsoluteSize ) ); } /* @@ -810,7 +810,7 @@ HB_FUNC( QT_QPAINTER_DRAWROUNDEDRECT ) */ HB_FUNC( QT_QPAINTER_DRAWROUNDEDRECT_1 ) { - hbqt_par_QPainter( 1 )->drawRoundedRect( *hbqt_par_QRect( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISNIL( 5 ) ? ( Qt::SizeMode ) Qt::AbsoluteSize : ( Qt::SizeMode ) hb_parni( 5 ) ) ); + hbqt_par_QPainter( 1 )->drawRoundedRect( *hbqt_par_QRect( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::SizeMode ) hb_parni( 5 ) : ( Qt::SizeMode ) Qt::AbsoluteSize ) ); } /* @@ -818,7 +818,7 @@ HB_FUNC( QT_QPAINTER_DRAWROUNDEDRECT_1 ) */ HB_FUNC( QT_QPAINTER_DRAWROUNDEDRECT_2 ) { - hbqt_par_QPainter( 1 )->drawRoundedRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parnd( 6 ), hb_parnd( 7 ), ( HB_ISNIL( 8 ) ? ( Qt::SizeMode ) Qt::AbsoluteSize : ( Qt::SizeMode ) hb_parni( 8 ) ) ); + hbqt_par_QPainter( 1 )->drawRoundedRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parnd( 6 ), hb_parnd( 7 ), ( HB_ISNUM( 8 ) ? ( Qt::SizeMode ) hb_parni( 8 ) : ( Qt::SizeMode ) Qt::AbsoluteSize ) ); } /* @@ -898,7 +898,7 @@ HB_FUNC( QT_QPAINTER_DRAWTILEDPIXMAP_1 ) */ HB_FUNC( QT_QPAINTER_DRAWTILEDPIXMAP_2 ) { - hbqt_par_QPainter( 1 )->drawTiledPixmap( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QPixmap( 6 ), ( HB_ISNIL( 7 ) ? 0 : hb_parni( 7 ) ), ( HB_ISNIL( 8 ) ? 0 : hb_parni( 8 ) ) ); + hbqt_par_QPainter( 1 )->drawTiledPixmap( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QPixmap( 6 ), hb_parni( 7 ), hb_parni( 8 ) ); } /* @@ -1234,7 +1234,7 @@ HB_FUNC( QT_QPAINTER_SETBRUSHORIGIN_2 ) */ HB_FUNC( QT_QPAINTER_SETCLIPPATH ) { - hbqt_par_QPainter( 1 )->setClipPath( *hbqt_par_QPainterPath( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::ClipOperation ) Qt::ReplaceClip : ( Qt::ClipOperation ) hb_parni( 3 ) ) ); + hbqt_par_QPainter( 1 )->setClipPath( *hbqt_par_QPainterPath( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ClipOperation ) hb_parni( 3 ) : ( Qt::ClipOperation ) Qt::ReplaceClip ) ); } /* @@ -1242,7 +1242,7 @@ HB_FUNC( QT_QPAINTER_SETCLIPPATH ) */ HB_FUNC( QT_QPAINTER_SETCLIPRECT ) { - hbqt_par_QPainter( 1 )->setClipRect( *hbqt_par_QRectF( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::ClipOperation ) Qt::ReplaceClip : ( Qt::ClipOperation ) hb_parni( 3 ) ) ); + hbqt_par_QPainter( 1 )->setClipRect( *hbqt_par_QRectF( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ClipOperation ) hb_parni( 3 ) : ( Qt::ClipOperation ) Qt::ReplaceClip ) ); } /* @@ -1250,7 +1250,7 @@ HB_FUNC( QT_QPAINTER_SETCLIPRECT ) */ HB_FUNC( QT_QPAINTER_SETCLIPRECT_1 ) { - hbqt_par_QPainter( 1 )->setClipRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( HB_ISNIL( 6 ) ? ( Qt::ClipOperation ) Qt::ReplaceClip : ( Qt::ClipOperation ) hb_parni( 6 ) ) ); + hbqt_par_QPainter( 1 )->setClipRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( HB_ISNUM( 6 ) ? ( Qt::ClipOperation ) hb_parni( 6 ) : ( Qt::ClipOperation ) Qt::ReplaceClip ) ); } /* @@ -1258,7 +1258,7 @@ HB_FUNC( QT_QPAINTER_SETCLIPRECT_1 ) */ HB_FUNC( QT_QPAINTER_SETCLIPRECT_2 ) { - hbqt_par_QPainter( 1 )->setClipRect( *hbqt_par_QRect( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::ClipOperation ) Qt::ReplaceClip : ( Qt::ClipOperation ) hb_parni( 3 ) ) ); + hbqt_par_QPainter( 1 )->setClipRect( *hbqt_par_QRect( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ClipOperation ) hb_parni( 3 ) : ( Qt::ClipOperation ) Qt::ReplaceClip ) ); } /* @@ -1266,7 +1266,7 @@ HB_FUNC( QT_QPAINTER_SETCLIPRECT_2 ) */ HB_FUNC( QT_QPAINTER_SETCLIPREGION ) { - hbqt_par_QPainter( 1 )->setClipRegion( *hbqt_par_QRegion( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::ClipOperation ) Qt::ReplaceClip : ( Qt::ClipOperation ) hb_parni( 3 ) ) ); + hbqt_par_QPainter( 1 )->setClipRegion( *hbqt_par_QRegion( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ClipOperation ) hb_parni( 3 ) : ( Qt::ClipOperation ) Qt::ReplaceClip ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qpixmap.cpp b/harbour/contrib/hbqt/hbqt_qpixmap.cpp index d431fbd15d..d768ffb34b 100644 --- a/harbour/contrib/hbqt/hbqt_qpixmap.cpp +++ b/harbour/contrib/hbqt/hbqt_qpixmap.cpp @@ -218,7 +218,7 @@ HB_FUNC( QT_QPIXMAP_ISQBITMAP ) */ HB_FUNC( QT_QPIXMAP_LOAD ) { - hb_retl( hbqt_par_QPixmap( 1 )->load( hbqt_par_QString( 2 ), hbqt_par_char( 3 ), ( HB_ISNIL( 4 ) ? ( Qt::ImageConversionFlags ) Qt::AutoColor : ( Qt::ImageConversionFlags ) hb_parni( 4 ) ) ) ); + hb_retl( hbqt_par_QPixmap( 1 )->load( hbqt_par_QString( 2 ), hbqt_par_char( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::ImageConversionFlags ) hb_parni( 4 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ); } /* @@ -226,7 +226,7 @@ HB_FUNC( QT_QPIXMAP_LOAD ) */ HB_FUNC( QT_QPIXMAP_LOADFROMDATA ) { - hb_retl( hbqt_par_QPixmap( 1 )->loadFromData( *hbqt_par_QByteArray( 2 ), hbqt_par_char( 3 ), ( HB_ISNIL( 4 ) ? ( Qt::ImageConversionFlags ) Qt::AutoColor : ( Qt::ImageConversionFlags ) hb_parni( 4 ) ) ) ); + hb_retl( hbqt_par_QPixmap( 1 )->loadFromData( *hbqt_par_QByteArray( 2 ), hbqt_par_char( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::ImageConversionFlags ) hb_parni( 4 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ); } /* @@ -250,7 +250,7 @@ HB_FUNC( QT_QPIXMAP_RECT ) */ HB_FUNC( QT_QPIXMAP_SAVE ) { - hb_retl( hbqt_par_QPixmap( 1 )->save( hbqt_par_QString( 2 ), hbqt_par_char( 3 ), ( HB_ISNIL( 4 ) ? -1 : hb_parni( 4 ) ) ) ); + hb_retl( hbqt_par_QPixmap( 1 )->save( hbqt_par_QString( 2 ), hbqt_par_char( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : -1 ) ) ); } /* @@ -258,7 +258,7 @@ HB_FUNC( QT_QPIXMAP_SAVE ) */ HB_FUNC( QT_QPIXMAP_SAVE_1 ) { - hb_retl( hbqt_par_QPixmap( 1 )->save( hbqt_par_QIODevice( 2 ), hbqt_par_char( 3 ), ( HB_ISNIL( 4 ) ? -1 : hb_parni( 4 ) ) ) ); + hb_retl( hbqt_par_QPixmap( 1 )->save( hbqt_par_QIODevice( 2 ), hbqt_par_char( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : -1 ) ) ); } /* @@ -266,7 +266,7 @@ HB_FUNC( QT_QPIXMAP_SAVE_1 ) */ HB_FUNC( QT_QPIXMAP_SCALED ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio : ( Qt::AspectRatioMode ) hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? ( Qt::TransformationMode ) Qt::FastTransformation : ( Qt::TransformationMode ) hb_parni( 4 ) ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::AspectRatioMode ) hb_parni( 3 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 4 ) ? ( Qt::TransformationMode ) hb_parni( 4 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); } /* @@ -274,7 +274,7 @@ HB_FUNC( QT_QPIXMAP_SCALED ) */ HB_FUNC( QT_QPIXMAP_SCALED_1 ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNIL( 4 ) ? ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio : ( Qt::AspectRatioMode ) hb_parni( 4 ) ), ( HB_ISNIL( 5 ) ? ( Qt::TransformationMode ) Qt::FastTransformation : ( Qt::TransformationMode ) hb_parni( 5 ) ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::AspectRatioMode ) hb_parni( 4 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 5 ) ? ( Qt::TransformationMode ) hb_parni( 5 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); } /* @@ -282,7 +282,7 @@ HB_FUNC( QT_QPIXMAP_SCALED_1 ) */ HB_FUNC( QT_QPIXMAP_SCALEDTOHEIGHT ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToHeight( hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::TransformationMode ) Qt::FastTransformation : ( Qt::TransformationMode ) hb_parni( 3 ) ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToHeight( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); } /* @@ -290,7 +290,7 @@ HB_FUNC( QT_QPIXMAP_SCALEDTOHEIGHT ) */ HB_FUNC( QT_QPIXMAP_SCALEDTOWIDTH ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToWidth( hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::TransformationMode ) Qt::FastTransformation : ( Qt::TransformationMode ) hb_parni( 3 ) ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToWidth( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); } /* @@ -330,7 +330,7 @@ HB_FUNC( QT_QPIXMAP_TOIMAGE ) */ HB_FUNC( QT_QPIXMAP_TRANSFORMED ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QTransform( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::TransformationMode ) Qt::FastTransformation : ( Qt::TransformationMode ) hb_parni( 3 ) ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QTransform( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); } /* @@ -338,7 +338,7 @@ HB_FUNC( QT_QPIXMAP_TRANSFORMED ) */ HB_FUNC( QT_QPIXMAP_TRANSFORMED_1 ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::TransformationMode ) Qt::FastTransformation : ( Qt::TransformationMode ) hb_parni( 3 ) ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qscrollarea.cpp b/harbour/contrib/hbqt/hbqt_qscrollarea.cpp index 845b406876..3d3e797bdc 100644 --- a/harbour/contrib/hbqt/hbqt_qscrollarea.cpp +++ b/harbour/contrib/hbqt/hbqt_qscrollarea.cpp @@ -85,7 +85,7 @@ HB_FUNC( QT_QSCROLLAREA_ALIGNMENT ) */ HB_FUNC( QT_QSCROLLAREA_ENSUREVISIBLE ) { - hbqt_par_QScrollArea( 1 )->ensureVisible( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNIL( 4 ) ? 50 : hb_parni( 4 ) ), ( HB_ISNIL( 5 ) ? 50 : hb_parni( 5 ) ) ); + hbqt_par_QScrollArea( 1 )->ensureVisible( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 50 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 50 ) ); } /* @@ -93,7 +93,7 @@ HB_FUNC( QT_QSCROLLAREA_ENSUREVISIBLE ) */ HB_FUNC( QT_QSCROLLAREA_ENSUREWIDGETVISIBLE ) { - hbqt_par_QScrollArea( 1 )->ensureWidgetVisible( hbqt_par_QWidget( 2 ), ( HB_ISNIL( 3 ) ? 50 : hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? 50 : hb_parni( 4 ) ) ); + hbqt_par_QScrollArea( 1 )->ensureWidgetVisible( hbqt_par_QWidget( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 50 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 50 ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qsplashscreen.cpp b/harbour/contrib/hbqt/hbqt_qsplashscreen.cpp index 76366ea77d..c9e372ca88 100644 --- a/harbour/contrib/hbqt/hbqt_qsplashscreen.cpp +++ b/harbour/contrib/hbqt/hbqt_qsplashscreen.cpp @@ -118,7 +118,7 @@ HB_FUNC( QT_QSPLASHSCREEN_CLEARMESSAGE ) */ HB_FUNC( QT_QSPLASHSCREEN_SHOWMESSAGE ) { - hbqt_par_QSplashScreen( 1 )->showMessage( hbqt_par_QString( 2 ), ( HB_ISNIL( 3 ) ? Qt::AlignLeft : hb_parni( 3 ) ), *hbqt_par_QColor( 4 ) ); + hbqt_par_QSplashScreen( 1 )->showMessage( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::AlignLeft ), *hbqt_par_QColor( 4 ) ); } diff --git a/harbour/contrib/hbqt/hbqt_qstatusbar.cpp b/harbour/contrib/hbqt/hbqt_qstatusbar.cpp index bbdeea9df7..85ff41375b 100644 --- a/harbour/contrib/hbqt/hbqt_qstatusbar.cpp +++ b/harbour/contrib/hbqt/hbqt_qstatusbar.cpp @@ -77,7 +77,7 @@ HB_FUNC( QT_QSTATUSBAR ) */ HB_FUNC( QT_QSTATUSBAR_ADDPERMANENTWIDGET ) { - hbqt_par_QStatusBar( 1 )->addPermanentWidget( hbqt_par_QWidget( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ) ); + hbqt_par_QStatusBar( 1 )->addPermanentWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ) ); } /* @@ -85,7 +85,7 @@ HB_FUNC( QT_QSTATUSBAR_ADDPERMANENTWIDGET ) */ HB_FUNC( QT_QSTATUSBAR_ADDWIDGET ) { - hbqt_par_QStatusBar( 1 )->addWidget( hbqt_par_QWidget( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ) ); + hbqt_par_QStatusBar( 1 )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ) ); } /* @@ -101,7 +101,7 @@ HB_FUNC( QT_QSTATUSBAR_CURRENTMESSAGE ) */ HB_FUNC( QT_QSTATUSBAR_INSERTPERMANENTWIDGET ) { - hb_retni( hbqt_par_QStatusBar( 1 )->insertPermanentWidget( hb_parni( 2 ), hbqt_par_QWidget( 3 ), ( HB_ISNIL( 4 ) ? 0 : hb_parni( 4 ) ) ) ); + hb_retni( hbqt_par_QStatusBar( 1 )->insertPermanentWidget( hb_parni( 2 ), hbqt_par_QWidget( 3 ), hb_parni( 4 ) ) ); } /* @@ -109,7 +109,7 @@ HB_FUNC( QT_QSTATUSBAR_INSERTPERMANENTWIDGET ) */ HB_FUNC( QT_QSTATUSBAR_INSERTWIDGET ) { - hb_retni( hbqt_par_QStatusBar( 1 )->insertWidget( hb_parni( 2 ), hbqt_par_QWidget( 3 ), ( HB_ISNIL( 4 ) ? 0 : hb_parni( 4 ) ) ) ); + hb_retni( hbqt_par_QStatusBar( 1 )->insertWidget( hb_parni( 2 ), hbqt_par_QWidget( 3 ), hb_parni( 4 ) ) ); } /* @@ -149,7 +149,7 @@ HB_FUNC( QT_QSTATUSBAR_CLEARMESSAGE ) */ HB_FUNC( QT_QSTATUSBAR_SHOWMESSAGE ) { - hbqt_par_QStatusBar( 1 )->showMessage( hbqt_par_QString( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ) ); + hbqt_par_QStatusBar( 1 )->showMessage( hbqt_par_QString( 2 ), hb_parni( 3 ) ); } diff --git a/harbour/contrib/hbqt/hbqt_qstyle.cpp b/harbour/contrib/hbqt/hbqt_qstyle.cpp index 4ff4166f1b..1c8e096cff 100644 --- a/harbour/contrib/hbqt/hbqt_qstyle.cpp +++ b/harbour/contrib/hbqt/hbqt_qstyle.cpp @@ -109,7 +109,7 @@ HB_FUNC( QT_QSTYLE_DRAWITEMPIXMAP ) */ HB_FUNC( QT_QSTYLE_DRAWITEMTEXT ) { - hbqt_par_QStyle( 1 )->drawItemText( hbqt_par_QPainter( 2 ), *hbqt_par_QRect( 3 ), hb_parni( 4 ), *hbqt_par_QPalette( 5 ), hb_parl( 6 ), hbqt_par_QString( 7 ), ( HB_ISNIL( 8 ) ? ( QPalette::ColorRole ) QPalette::NoRole : ( QPalette::ColorRole ) hb_parni( 8 ) ) ); + hbqt_par_QStyle( 1 )->drawItemText( hbqt_par_QPainter( 2 ), *hbqt_par_QRect( 3 ), hb_parni( 4 ), *hbqt_par_QPalette( 5 ), hb_parl( 6 ), hbqt_par_QString( 7 ), ( HB_ISNUM( 8 ) ? ( QPalette::ColorRole ) hb_parni( 8 ) : ( QPalette::ColorRole ) QPalette::NoRole ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qtablewidget.cpp b/harbour/contrib/hbqt/hbqt_qtablewidget.cpp index 84179e1101..52c842d4fa 100644 --- a/harbour/contrib/hbqt/hbqt_qtablewidget.cpp +++ b/harbour/contrib/hbqt/hbqt_qtablewidget.cpp @@ -340,7 +340,7 @@ HB_FUNC( QT_QTABLEWIDGET_SETVERTICALHEADERLABELS ) */ HB_FUNC( QT_QTABLEWIDGET_SORTITEMS ) { - hbqt_par_QTableWidget( 1 )->sortItems( hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::SortOrder ) Qt::AscendingOrder : ( Qt::SortOrder ) hb_parni( 3 ) ) ); + hbqt_par_QTableWidget( 1 )->sortItems( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::SortOrder ) hb_parni( 3 ) : ( Qt::SortOrder ) Qt::AscendingOrder ) ); } /* @@ -452,7 +452,7 @@ HB_FUNC( QT_QTABLEWIDGET_REMOVEROW ) */ HB_FUNC( QT_QTABLEWIDGET_SCROLLTOITEM ) { - hbqt_par_QTableWidget( 1 )->scrollToItem( hbqt_par_QTableWidgetItem( 2 ), ( HB_ISNIL( 3 ) ? ( QAbstractItemView::ScrollHint ) QTableWidget::EnsureVisible : ( QAbstractItemView::ScrollHint ) hb_parni( 3 ) ) ); + hbqt_par_QTableWidget( 1 )->scrollToItem( hbqt_par_QTableWidgetItem( 2 ), ( HB_ISNUM( 3 ) ? ( QAbstractItemView::ScrollHint ) hb_parni( 3 ) : ( QAbstractItemView::ScrollHint ) QTableWidget::EnsureVisible ) ); } diff --git a/harbour/contrib/hbqt/hbqt_qtabwidget.cpp b/harbour/contrib/hbqt/hbqt_qtabwidget.cpp index 8344d7972d..d9b616dd3a 100644 --- a/harbour/contrib/hbqt/hbqt_qtabwidget.cpp +++ b/harbour/contrib/hbqt/hbqt_qtabwidget.cpp @@ -101,7 +101,7 @@ HB_FUNC( QT_QTABWIDGET_CLEAR ) */ HB_FUNC( QT_QTABWIDGET_CORNERWIDGET ) { - hb_retptr( ( QWidget* ) hbqt_par_QTabWidget( 1 )->cornerWidget( ( HB_ISNIL( 2 ) ? ( Qt::Corner ) Qt::TopRightCorner : ( Qt::Corner ) hb_parni( 2 ) ) ) ); + hb_retptr( ( QWidget* ) hbqt_par_QTabWidget( 1 )->cornerWidget( ( HB_ISNUM( 2 ) ? ( Qt::Corner ) hb_parni( 2 ) : ( Qt::Corner ) Qt::TopRightCorner ) ) ); } /* @@ -205,7 +205,7 @@ HB_FUNC( QT_QTABWIDGET_REMOVETAB ) */ HB_FUNC( QT_QTABWIDGET_SETCORNERWIDGET ) { - hbqt_par_QTabWidget( 1 )->setCornerWidget( hbqt_par_QWidget( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::Corner ) Qt::TopRightCorner : ( Qt::Corner ) hb_parni( 3 ) ) ); + hbqt_par_QTabWidget( 1 )->setCornerWidget( hbqt_par_QWidget( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::Corner ) hb_parni( 3 ) : ( Qt::Corner ) Qt::TopRightCorner ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qtextcharformat.cpp b/harbour/contrib/hbqt/hbqt_qtextcharformat.cpp index 7617c55bab..6ae064f73b 100644 --- a/harbour/contrib/hbqt/hbqt_qtextcharformat.cpp +++ b/harbour/contrib/hbqt/hbqt_qtextcharformat.cpp @@ -333,7 +333,7 @@ HB_FUNC( QT_QTEXTCHARFORMAT_SETFONTSTRIKEOUT ) */ HB_FUNC( QT_QTEXTCHARFORMAT_SETFONTSTYLEHINT ) { - hbqt_par_QTextCharFormat( 1 )->setFontStyleHint( ( QFont::StyleHint ) hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( QFont::StyleStrategy ) QFont::PreferDefault : ( QFont::StyleStrategy ) hb_parni( 3 ) ) ); + hbqt_par_QTextCharFormat( 1 )->setFontStyleHint( ( QFont::StyleHint ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QFont::StyleStrategy ) hb_parni( 3 ) : ( QFont::StyleStrategy ) QFont::PreferDefault ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qtextcursor.cpp b/harbour/contrib/hbqt/hbqt_qtextcursor.cpp index 76e0e1617c..c05bd08bb4 100644 --- a/harbour/contrib/hbqt/hbqt_qtextcursor.cpp +++ b/harbour/contrib/hbqt/hbqt_qtextcursor.cpp @@ -441,7 +441,7 @@ HB_FUNC( QT_QTEXTCURSOR_MERGECHARFORMAT ) */ HB_FUNC( QT_QTEXTCURSOR_MOVEPOSITION ) { - hb_retl( hbqt_par_QTextCursor( 1 )->movePosition( ( QTextCursor::MoveOperation ) hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( QTextCursor::MoveMode ) QTextCursor::MoveAnchor : ( QTextCursor::MoveMode ) hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? 1 : hb_parni( 4 ) ) ) ); + hb_retl( hbqt_par_QTextCursor( 1 )->movePosition( ( QTextCursor::MoveOperation ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QTextCursor::MoveMode ) hb_parni( 3 ) : ( QTextCursor::MoveMode ) QTextCursor::MoveAnchor ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 1 ) ) ); } /* @@ -547,7 +547,7 @@ HB_FUNC( QT_QTEXTCURSOR_SETCHARFORMAT ) */ HB_FUNC( QT_QTEXTCURSOR_SETPOSITION ) { - hbqt_par_QTextCursor( 1 )->setPosition( hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( QTextCursor::MoveMode ) QTextCursor::MoveAnchor : ( QTextCursor::MoveMode ) hb_parni( 3 ) ) ); + hbqt_par_QTextCursor( 1 )->setPosition( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QTextCursor::MoveMode ) hb_parni( 3 ) : ( QTextCursor::MoveMode ) QTextCursor::MoveAnchor ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qtextdocument.cpp b/harbour/contrib/hbqt/hbqt_qtextdocument.cpp index cb5858b736..6212c50a24 100644 --- a/harbour/contrib/hbqt/hbqt_qtextdocument.cpp +++ b/harbour/contrib/hbqt/hbqt_qtextdocument.cpp @@ -199,7 +199,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_END ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND ) { - hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), *hbqt_par_QTextCursor( 3 ), ( HB_ISNIL( 4 ) ? ( QTextDocument::FindFlags ) 0 : ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); + hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ); } /* @@ -207,7 +207,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND_1 ) { - hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), *hbqt_par_QTextCursor( 3 ), ( HB_ISNIL( 4 ) ? ( QTextDocument::FindFlags ) 0 : ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); + hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ); } /* @@ -215,7 +215,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND_1 ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND_2 ) { - hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? ( QTextDocument::FindFlags ) 0 : ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); + hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ); } /* @@ -223,7 +223,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND_2 ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND_3 ) { - hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ), ( HB_ISNIL( 4 ) ? ( QTextDocument::FindFlags ) 0 : ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); + hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qtextedit.cpp b/harbour/contrib/hbqt/hbqt_qtextedit.cpp index 0d49ed2c79..0819c16f86 100644 --- a/harbour/contrib/hbqt/hbqt_qtextedit.cpp +++ b/harbour/contrib/hbqt/hbqt_qtextedit.cpp @@ -220,7 +220,7 @@ HB_FUNC( QT_QTEXTEDIT_ENSURECURSORVISIBLE ) */ HB_FUNC( QT_QTEXTEDIT_FIND ) { - hb_retl( hbqt_par_QTextEdit( 1 )->find( hbqt_par_QString( 2 ), ( HB_ISNIL( 3 ) ? ( QTextDocument::FindFlags ) 0 : ( QTextDocument::FindFlags ) hb_parni( 3 ) ) ) ); + hb_retl( hbqt_par_QTextEdit( 1 )->find( hbqt_par_QString( 2 ), ( QTextDocument::FindFlags ) hb_parni( 3 ) ) ); } /* @@ -316,7 +316,7 @@ HB_FUNC( QT_QTEXTEDIT_MERGECURRENTCHARFORMAT ) */ HB_FUNC( QT_QTEXTEDIT_MOVECURSOR ) { - hbqt_par_QTextEdit( 1 )->moveCursor( ( QTextCursor::MoveOperation ) hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( QTextCursor::MoveMode ) QTextCursor::MoveAnchor : ( QTextCursor::MoveMode ) hb_parni( 3 ) ) ); + hbqt_par_QTextEdit( 1 )->moveCursor( ( QTextCursor::MoveOperation ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QTextCursor::MoveMode ) hb_parni( 3 ) : ( QTextCursor::MoveMode ) QTextCursor::MoveAnchor ) ); } /* @@ -724,7 +724,7 @@ HB_FUNC( QT_QTEXTEDIT_UNDO ) */ HB_FUNC( QT_QTEXTEDIT_ZOOMIN ) { - hbqt_par_QTextEdit( 1 )->zoomIn( ( HB_ISNIL( 2 ) ? 1 : hb_parni( 2 ) ) ); + hbqt_par_QTextEdit( 1 )->zoomIn( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 1 ) ); } /* @@ -732,7 +732,7 @@ HB_FUNC( QT_QTEXTEDIT_ZOOMIN ) */ HB_FUNC( QT_QTEXTEDIT_ZOOMOUT ) { - hbqt_par_QTextEdit( 1 )->zoomOut( ( HB_ISNIL( 2 ) ? 1 : hb_parni( 2 ) ) ); + hbqt_par_QTextEdit( 1 )->zoomOut( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 1 ) ); } diff --git a/harbour/contrib/hbqt/hbqt_qtextlayout.cpp b/harbour/contrib/hbqt/hbqt_qtextlayout.cpp index 0201b6cae6..d6572e3225 100644 --- a/harbour/contrib/hbqt/hbqt_qtextlayout.cpp +++ b/harbour/contrib/hbqt/hbqt_qtextlayout.cpp @@ -218,7 +218,7 @@ HB_FUNC( QT_QTEXTLAYOUT_MINIMUMWIDTH ) */ HB_FUNC( QT_QTEXTLAYOUT_NEXTCURSORPOSITION ) { - hb_retni( hbqt_par_QTextLayout( 1 )->nextCursorPosition( hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( QTextLayout::CursorMode ) QTextLayout::SkipCharacters : ( QTextLayout::CursorMode ) hb_parni( 3 ) ) ) ); + hb_retni( hbqt_par_QTextLayout( 1 )->nextCursorPosition( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QTextLayout::CursorMode ) hb_parni( 3 ) : ( QTextLayout::CursorMode ) QTextLayout::SkipCharacters ) ) ); } /* @@ -250,7 +250,7 @@ HB_FUNC( QT_QTEXTLAYOUT_PREEDITAREATEXT ) */ HB_FUNC( QT_QTEXTLAYOUT_PREVIOUSCURSORPOSITION ) { - hb_retni( hbqt_par_QTextLayout( 1 )->previousCursorPosition( hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( QTextLayout::CursorMode ) QTextLayout::SkipCharacters : ( QTextLayout::CursorMode ) hb_parni( 3 ) ) ) ); + hb_retni( hbqt_par_QTextLayout( 1 )->previousCursorPosition( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QTextLayout::CursorMode ) hb_parni( 3 ) : ( QTextLayout::CursorMode ) QTextLayout::SkipCharacters ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qtextline.cpp b/harbour/contrib/hbqt/hbqt_qtextline.cpp index e6e9207ed6..9d036b1921 100644 --- a/harbour/contrib/hbqt/hbqt_qtextline.cpp +++ b/harbour/contrib/hbqt/hbqt_qtextline.cpp @@ -86,7 +86,7 @@ HB_FUNC( QT_QTEXTLINE_CURSORTOX ) { int iCursorPos = 0; - hb_retnd( hbqt_par_QTextLine( 1 )->cursorToX( &iCursorPos, ( HB_ISNIL( 3 ) ? ( QTextLine::Edge ) QTextLine::Leading : ( QTextLine::Edge ) hb_parni( 3 ) ) ) ); + hb_retnd( hbqt_par_QTextLine( 1 )->cursorToX( &iCursorPos, ( HB_ISNUM( 3 ) ? ( QTextLine::Edge ) hb_parni( 3 ) : ( QTextLine::Edge ) QTextLine::Leading ) ) ); hb_storni( iCursorPos, 2 ); } @@ -96,7 +96,7 @@ HB_FUNC( QT_QTEXTLINE_CURSORTOX ) */ HB_FUNC( QT_QTEXTLINE_CURSORTOX_1 ) { - hb_retnd( hbqt_par_QTextLine( 1 )->cursorToX( hb_parni( 2 ), ( HB_ISNIL( 3 ) ? ( QTextLine::Edge ) QTextLine::Leading : ( QTextLine::Edge ) hb_parni( 3 ) ) ) ); + hb_retnd( hbqt_par_QTextLine( 1 )->cursorToX( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QTextLine::Edge ) hb_parni( 3 ) : ( QTextLine::Edge ) QTextLine::Leading ) ) ); } /* @@ -232,7 +232,7 @@ HB_FUNC( QT_QTEXTLINE_X ) */ HB_FUNC( QT_QTEXTLINE_XTOCURSOR ) { - hb_retni( hbqt_par_QTextLine( 1 )->xToCursor( hb_parnd( 2 ), ( HB_ISNIL( 3 ) ? ( QTextLine::CursorPosition ) QTextLine::CursorBetweenCharacters : ( QTextLine::CursorPosition ) hb_parni( 3 ) ) ) ); + hb_retni( hbqt_par_QTextLine( 1 )->xToCursor( hb_parnd( 2 ), ( HB_ISNUM( 3 ) ? ( QTextLine::CursorPosition ) hb_parni( 3 ) : ( QTextLine::CursorPosition ) QTextLine::CursorBetweenCharacters ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qtextstream.cpp b/harbour/contrib/hbqt/hbqt_qtextstream.cpp index 323552f5e3..cabc1b20ac 100644 --- a/harbour/contrib/hbqt/hbqt_qtextstream.cpp +++ b/harbour/contrib/hbqt/hbqt_qtextstream.cpp @@ -202,7 +202,7 @@ HB_FUNC( QT_QTEXTSTREAM_READALL ) */ HB_FUNC( QT_QTEXTSTREAM_READLINE ) { - hb_retc( hbqt_par_QTextStream( 1 )->readLine( ( HB_ISNIL( 2 ) ? 0 : hb_parni( 2 ) ) ).toLatin1().data() ); + hb_retc( hbqt_par_QTextStream( 1 )->readLine( hb_parni( 2 ) ).toLatin1().data() ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qtreeview.cpp b/harbour/contrib/hbqt/hbqt_qtreeview.cpp index c3f1930a0b..43c10691de 100644 --- a/harbour/contrib/hbqt/hbqt_qtreeview.cpp +++ b/harbour/contrib/hbqt/hbqt_qtreeview.cpp @@ -229,7 +229,7 @@ HB_FUNC( QT_QTREEVIEW_ROOTISDECORATED ) */ HB_FUNC( QT_QTREEVIEW_SCROLLTO ) { - hbqt_par_QTreeView( 1 )->scrollTo( *hbqt_par_QModelIndex( 2 ), ( HB_ISNIL( 3 ) ? ( QTreeView::ScrollHint ) QTreeView::EnsureVisible : ( QTreeView::ScrollHint ) hb_parni( 3 ) ) ); + hbqt_par_QTreeView( 1 )->scrollTo( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? ( QTreeView::ScrollHint ) hb_parni( 3 ) : ( QTreeView::ScrollHint ) QTreeView::EnsureVisible ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qtreewidget.cpp b/harbour/contrib/hbqt/hbqt_qtreewidget.cpp index 8322c62d67..178dc82ebd 100644 --- a/harbour/contrib/hbqt/hbqt_qtreewidget.cpp +++ b/harbour/contrib/hbqt/hbqt_qtreewidget.cpp @@ -97,7 +97,7 @@ HB_FUNC( QT_QTREEWIDGET_ADDTOPLEVELITEM ) */ HB_FUNC( QT_QTREEWIDGET_CLOSEPERSISTENTEDITOR ) { - hbqt_par_QTreeWidget( 1 )->closePersistentEditor( hbqt_par_QTreeWidgetItem( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ) ); + hbqt_par_QTreeWidget( 1 )->closePersistentEditor( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ) ); } /* @@ -129,7 +129,7 @@ HB_FUNC( QT_QTREEWIDGET_CURRENTITEM ) */ HB_FUNC( QT_QTREEWIDGET_EDITITEM ) { - hbqt_par_QTreeWidget( 1 )->editItem( hbqt_par_QTreeWidgetItem( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ) ); + hbqt_par_QTreeWidget( 1 )->editItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ) ); } /* @@ -217,7 +217,7 @@ HB_FUNC( QT_QTREEWIDGET_ITEMWIDGET ) */ HB_FUNC( QT_QTREEWIDGET_OPENPERSISTENTEDITOR ) { - hbqt_par_QTreeWidget( 1 )->openPersistentEditor( hbqt_par_QTreeWidgetItem( 2 ), ( HB_ISNIL( 3 ) ? 0 : hb_parni( 3 ) ) ); + hbqt_par_QTreeWidget( 1 )->openPersistentEditor( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ) ); } /* @@ -377,7 +377,7 @@ HB_FUNC( QT_QTREEWIDGET_EXPANDITEM ) */ HB_FUNC( QT_QTREEWIDGET_SCROLLTOITEM ) { - hbqt_par_QTreeWidget( 1 )->scrollToItem( hbqt_par_QTreeWidgetItem( 2 ), ( HB_ISNIL( 3 ) ? ( QAbstractItemView::ScrollHint ) QTreeWidget::EnsureVisible : ( QAbstractItemView::ScrollHint ) hb_parni( 3 ) ) ); + hbqt_par_QTreeWidget( 1 )->scrollToItem( hbqt_par_QTreeWidgetItem( 2 ), ( HB_ISNUM( 3 ) ? ( QAbstractItemView::ScrollHint ) hb_parni( 3 ) : ( QAbstractItemView::ScrollHint ) QTreeWidget::EnsureVisible ) ); } diff --git a/harbour/contrib/hbqt/hbqt_qurl.cpp b/harbour/contrib/hbqt/hbqt_qurl.cpp index 517c12f9f2..2b7c823b61 100644 --- a/harbour/contrib/hbqt/hbqt_qurl.cpp +++ b/harbour/contrib/hbqt/hbqt_qurl.cpp @@ -540,7 +540,7 @@ HB_FUNC( QT_QURL_SETUSERNAME ) */ HB_FUNC( QT_QURL_TOENCODED ) { - hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->toEncoded( ( HB_ISNIL( 2 ) ? ( QUrl::FormattingOptions ) QUrl::None : ( QUrl::FormattingOptions ) hb_parni( 2 ) ) ) ) ); + hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->toEncoded( ( HB_ISNUM( 2 ) ? ( QUrl::FormattingOptions ) hb_parni( 2 ) : ( QUrl::FormattingOptions ) QUrl::None ) ) ) ); } /* @@ -556,7 +556,7 @@ HB_FUNC( QT_QURL_TOLOCALFILE ) */ HB_FUNC( QT_QURL_TOSTRING ) { - hb_retc( hbqt_par_QUrl( 1 )->toString( ( HB_ISNIL( 2 ) ? ( QUrl::FormattingOptions ) QUrl::None : ( QUrl::FormattingOptions ) hb_parni( 2 ) ) ).toLatin1().data() ); + hb_retc( hbqt_par_QUrl( 1 )->toString( ( HB_ISNUM( 2 ) ? ( QUrl::FormattingOptions ) hb_parni( 2 ) : ( QUrl::FormattingOptions ) QUrl::None ) ).toLatin1().data() ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qwebpage.cpp b/harbour/contrib/hbqt/hbqt_qwebpage.cpp index 396fd43268..35517836ef 100644 --- a/harbour/contrib/hbqt/hbqt_qwebpage.cpp +++ b/harbour/contrib/hbqt/hbqt_qwebpage.cpp @@ -110,7 +110,7 @@ HB_FUNC( QT_QWEBPAGE_CURRENTFRAME ) */ HB_FUNC( QT_QWEBPAGE_FINDTEXT ) { - hb_retl( hbqt_par_QWebPage( 1 )->findText( hbqt_par_QString( 2 ), ( HB_ISNIL( 3 ) ? ( QWebPage::FindFlags ) 0 : ( QWebPage::FindFlags ) hb_parni( 3 ) ) ) ); + hb_retl( hbqt_par_QWebPage( 1 )->findText( hbqt_par_QString( 2 ), ( QWebPage::FindFlags ) hb_parni( 3 ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qwebview.cpp b/harbour/contrib/hbqt/hbqt_qwebview.cpp index 9ea8d0cb59..a959811d3f 100644 --- a/harbour/contrib/hbqt/hbqt_qwebview.cpp +++ b/harbour/contrib/hbqt/hbqt_qwebview.cpp @@ -78,7 +78,7 @@ HB_FUNC( QT_QWEBVIEW ) */ HB_FUNC( QT_QWEBVIEW_FINDTEXT ) { - hb_retl( hbqt_par_QWebView( 1 )->findText( hbqt_par_QString( 2 ), ( HB_ISNIL( 3 ) ? ( QWebPage::FindFlags ) 0 : ( QWebPage::FindFlags ) hb_parni( 3 ) ) ) ); + hb_retl( hbqt_par_QWebView( 1 )->findText( hbqt_par_QString( 2 ), ( QWebPage::FindFlags ) hb_parni( 3 ) ) ); } /* @@ -118,7 +118,7 @@ HB_FUNC( QT_QWEBVIEW_LOAD ) */ HB_FUNC( QT_QWEBVIEW_LOAD_1 ) { - hbqt_par_QWebView( 1 )->load( *hbqt_par_QNetworkRequest( 2 ), ( HB_ISNIL( 3 ) ? ( QNetworkAccessManager::Operation ) QNetworkAccessManager::GetOperation : ( QNetworkAccessManager::Operation ) hb_parni( 3 ) ), *hbqt_par_QByteArray( 4 ) ); + hbqt_par_QWebView( 1 )->load( *hbqt_par_QNetworkRequest( 2 ), ( HB_ISNUM( 3 ) ? ( QNetworkAccessManager::Operation ) hb_parni( 3 ) : ( QNetworkAccessManager::Operation ) QNetworkAccessManager::GetOperation ), *hbqt_par_QByteArray( 4 ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_qwidget.cpp b/harbour/contrib/hbqt/hbqt_qwidget.cpp index ec4755e3d2..0bfd7ff224 100644 --- a/harbour/contrib/hbqt/hbqt_qwidget.cpp +++ b/harbour/contrib/hbqt/hbqt_qwidget.cpp @@ -364,7 +364,7 @@ HB_FUNC( QT_QWIDGET_GRABMOUSE_1 ) */ HB_FUNC( QT_QWIDGET_GRABSHORTCUT ) { - hb_retni( hbqt_par_QWidget( 1 )->grabShortcut( *hbqt_par_QKeySequence( 2 ), ( HB_ISNIL( 3 ) ? ( Qt::ShortcutContext ) Qt::WindowShortcut : ( Qt::ShortcutContext ) hb_parni( 3 ) ) ) ); + hb_retni( hbqt_par_QWidget( 1 )->grabShortcut( *hbqt_par_QKeySequence( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ShortcutContext ) hb_parni( 3 ) : ( Qt::ShortcutContext ) Qt::WindowShortcut ) ) ); } /* diff --git a/harbour/contrib/rddads/adsx.c b/harbour/contrib/rddads/adsx.c index a5f10b0881..83b8395e20 100644 --- a/harbour/contrib/rddads/adsx.c +++ b/harbour/contrib/rddads/adsx.c @@ -1224,7 +1224,7 @@ static HB_ERRCODE adsxOrderInfo( ADSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO switch( uiIndex ) { case DBOI_CONDITION: - hb_itemPutC( pOrderInfo->itmResult, pTag->szForExpr ? pTag->szForExpr : "" ); + hb_itemPutC( pOrderInfo->itmResult, pTag->szForExpr ); break; case DBOI_EXPRESSION: @@ -1331,11 +1331,11 @@ static HB_ERRCODE adsxOrderInfo( ADSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO break; case DBOI_BAGNAME: - hb_itemPutC( pOrderInfo->itmResult, "" ); + hb_itemPutC( pOrderInfo->itmResult, NULL ); break; case DBOI_FULLPATH : - hb_itemPutC( pOrderInfo->itmResult, "" ); + hb_itemPutC( pOrderInfo->itmResult, NULL ); break; case DBOI_BAGEXT: diff --git a/harbour/contrib/rddsql/sddmy/mysqldd.c b/harbour/contrib/rddsql/sddmy/mysqldd.c index 76dbf8a61a..26ff4a8c17 100644 --- a/harbour/contrib/rddsql/sddmy/mysqldd.c +++ b/harbour/contrib/rddsql/sddmy/mysqldd.c @@ -524,7 +524,7 @@ static HB_ERRCODE mysqlGetValue( SQLBASEAREAP pArea, USHORT uiIndex, PHB_ITEM pI if ( pValue ) hb_itemPutCL( pItem, pValue, ulLen ); else - hb_itemPutCL( pItem, "", 0 ); + hb_itemPutC( pItem, NULL ); #endif break; } @@ -533,7 +533,7 @@ static HB_ERRCODE mysqlGetValue( SQLBASEAREAP pArea, USHORT uiIndex, PHB_ITEM pI if ( pValue ) hb_itemPutCL( pItem, pValue, ulLen ); else - hb_itemPutCL( pItem, "", 0 ); + hb_itemPutC( pItem, NULL ); hb_itemSetCMemo( pItem ); break; diff --git a/harbour/contrib/rddsql/sqlbase.c b/harbour/contrib/rddsql/sqlbase.c index 3f6f5671a6..404d7dbc3b 100644 --- a/harbour/contrib/rddsql/sqlbase.c +++ b/harbour/contrib/rddsql/sqlbase.c @@ -653,7 +653,7 @@ static HB_ERRCODE sqlbaseCreate( SQLBASEAREAP pArea, LPDBOPENINFO pOpenInfo ) } case HB_FT_MEMO: - pItem = hb_itemPutC( NULL, "" ); + pItem = hb_itemPutC( NULL, NULL ); break; case HB_FT_INTEGER: @@ -679,7 +679,7 @@ static HB_ERRCODE sqlbaseCreate( SQLBASEAREAP pArea, LPDBOPENINFO pOpenInfo ) break; case HB_FT_DATE: - pItem = hb_itemPutDS( NULL, "" ); + pItem = hb_itemPutDS( NULL, NULL ); break; case HB_FT_LOGICAL: diff --git a/harbour/contrib/rddsql/sqlmix.c b/harbour/contrib/rddsql/sqlmix.c index 90bf68e9d8..d985b912dc 100644 --- a/harbour/contrib/rddsql/sqlmix.c +++ b/harbour/contrib/rddsql/sqlmix.c @@ -1899,7 +1899,7 @@ static HB_ERRCODE sqlmixOrderInfo( SQLMIXAREAP pArea, USHORT uiIndex, LPDBORDERI switch( uiIndex ) { case DBOI_CONDITION: - pOrderInfo->itmResult = hb_itemPutC( pOrderInfo->itmResult, ( pTag ? pTag->szForExpr : "" ) ); + pOrderInfo->itmResult = hb_itemPutC( pOrderInfo->itmResult, ( pTag ? pTag->szForExpr : NULL ) ); if ( pTag && pOrderInfo->itmNewVal && HB_IS_STRING( pOrderInfo->itmNewVal ) ) { if ( pTag->szForExpr != NULL ) @@ -1940,7 +1940,7 @@ static HB_ERRCODE sqlmixOrderInfo( SQLMIXAREAP pArea, USHORT uiIndex, LPDBORDERI break; case DBOI_EXPRESSION: - pOrderInfo->itmResult = hb_itemPutC( pOrderInfo->itmResult, pTag ? pTag->szKeyExpr : "" ); + pOrderInfo->itmResult = hb_itemPutC( pOrderInfo->itmResult, pTag ? pTag->szKeyExpr : NULL ); break; case DBOI_POSITION: @@ -1979,7 +1979,7 @@ static HB_ERRCODE sqlmixOrderInfo( SQLMIXAREAP pArea, USHORT uiIndex, LPDBORDERI break; */ case DBOI_NAME: - pOrderInfo->itmResult = hb_itemPutC( pOrderInfo->itmResult, pTag ? pTag->szName : "" ); + pOrderInfo->itmResult = hb_itemPutC( pOrderInfo->itmResult, pTag ? pTag->szName : NULL ); break; case DBOI_NUMBER: @@ -2011,7 +2011,7 @@ static HB_ERRCODE sqlmixOrderInfo( SQLMIXAREAP pArea, USHORT uiIndex, LPDBORDERI pOrderInfo->itmResult = hb_itemPutC( pOrderInfo->itmResult, szType ); } else - pOrderInfo->itmResult = hb_itemPutC( pOrderInfo->itmResult, "" ); + pOrderInfo->itmResult = hb_itemPutC( pOrderInfo->itmResult, NULL ); break; case DBOI_KEYSIZE: diff --git a/harbour/contrib/xhb/fparse.c b/harbour/contrib/xhb/fparse.c index 3f1529f859..5492d65316 100644 --- a/harbour/contrib/xhb/fparse.c +++ b/harbour/contrib/xhb/fparse.c @@ -251,7 +251,7 @@ void hb_ParseLine( PHB_ITEM pReturn, char * szText, int iDelimiter, int * iWord if ( szText[ iLen - 1 ] == iDelimiter ) { word_count ++; - hb_arrayAddForward( pReturn, hb_itemPutC( pTemp, "" )); + hb_arrayAddForward( pReturn, hb_itemPutC( pTemp, NULL ) ); } /* store number of words */ diff --git a/harbour/source/rdd/dbfnsx/dbfnsx1.c b/harbour/source/rdd/dbfnsx/dbfnsx1.c index 2507289658..1ca3dfdd30 100644 --- a/harbour/source/rdd/dbfnsx/dbfnsx1.c +++ b/harbour/source/rdd/dbfnsx/dbfnsx1.c @@ -1096,15 +1096,15 @@ static void hb_nsxTagCheckBuffers( LPTAGINFO pTag ) ULONG i; if( ( pTag->HdrChanged || pTag->pIndex->Changed ) && !pTag->pIndex->lockWrite ) - hb_errInternal( 9999, "hb_nsxTagCheckBuffers: tag modified in unlocked index", "", "" ); + hb_errInternal( 9999, "hb_nsxTagCheckBuffers: tag modified in unlocked index", NULL, NULL ); for( i = 0; i < pTag->pIndex->ulPages; i++ ) { pPage = pTag->pIndex->pages[ i ]; if( pPage->Changed && !pTag->pIndex->lockWrite ) - hb_errInternal( 9999, "hb_nsxTagCheckBuffers: page modified in unlocked index", "", "" ); + hb_errInternal( 9999, "hb_nsxTagCheckBuffers: page modified in unlocked index", NULL, NULL ); if( pPage->iUsed ) - hb_errInternal( 9999, "hb_nsxTagCheckBuffers: page still allocated", "", "" ); + hb_errInternal( 9999, "hb_nsxTagCheckBuffers: page still allocated", NULL, NULL ); } } @@ -1149,7 +1149,7 @@ static void hb_nsxPageCheckKeys( LPPAGEINFO pPage, LPTAGINFO pTag, int iPos, int printf("\r\nuiKeys=%d(%d/%d), (%d)[%.*s]<%ld>>(%d)[%.*s]<%ld>", pPage->uiKeys, iPos, iType, u - 1, pTag->KeyLength, pKeyPrev, ulPrevRec, u, pTag->KeyLength, pKeyVal, ulRecNo); fflush(stdout); - hb_errInternal( 9999, "hb_nsxPageCheckKeys: keys sorted wrong.", "", "" ); + hb_errInternal( 9999, "hb_nsxPageCheckKeys: keys sorted wrong.", NULL, NULL ); } } else @@ -1168,7 +1168,7 @@ static void hb_nsxPageCheckKeys( LPPAGEINFO pPage, LPTAGINFO pTag, int iPos, int u - 1, pTag->KeyLength, hb_nsxGetKeyVal( pPage, pTag->KeyLength, u - 1 ), u, pTag->KeyLength, hb_nsxGetKeyVal( pPage, pTag->KeyLength, u ) ); fflush(stdout); - hb_errInternal( 9999, "hb_nsxPageCheckKeys: keys sorted wrong.", "", "" ); + hb_errInternal( 9999, "hb_nsxPageCheckKeys: keys sorted wrong.", NULL, NULL ); } } } @@ -1176,7 +1176,7 @@ static void hb_nsxPageCheckKeys( LPPAGEINFO pPage, LPTAGINFO pTag, int iPos, int { printf("\r\npPage->uiOffset=%d, uiOffset=%d\r\n", pPage->uiOffset, uiOffset ); fflush(stdout); - hb_errInternal( 9999, "hb_nsxPageCheckKeys: wrong free offset in leaf page.", "", "" ); + hb_errInternal( 9999, "hb_nsxPageCheckKeys: wrong free offset in leaf page.", NULL, NULL ); } } #endif @@ -1187,7 +1187,7 @@ static void hb_nsxPageCheckKeys( LPPAGEINFO pPage, LPTAGINFO pTag, int iPos, int static BOOL hb_nsxBlockRead( LPNSXINDEX pIndex, ULONG ulBlock, BYTE *buffer, int iSize ) { if( !pIndex->lockRead && !pIndex->lockWrite ) - hb_errInternal( 9103, "hb_nsxBlockRead on not locked index file.", "", "" ); + hb_errInternal( 9103, "hb_nsxBlockRead on not locked index file.", NULL, NULL ); if( hb_fileReadAt( pIndex->pFile, buffer, iSize, hb_nsxFileOffset( pIndex, ulBlock ) ) != ( ULONG ) iSize ) @@ -1205,7 +1205,7 @@ static BOOL hb_nsxBlockRead( LPNSXINDEX pIndex, ULONG ulBlock, BYTE *buffer, int static BOOL hb_nsxBlockWrite( LPNSXINDEX pIndex, ULONG ulBlock, BYTE *buffer, int iSize ) { if( !pIndex->lockWrite ) - hb_errInternal( 9102, "hb_nsxBlockWrite on not locked index file.", "", "" ); + hb_errInternal( 9102, "hb_nsxBlockWrite on not locked index file.", NULL, NULL ); if( hb_fileWriteAt( pIndex->pFile, buffer, iSize, hb_nsxFileOffset( pIndex, ulBlock ) ) != ( ULONG ) iSize ) @@ -1341,7 +1341,7 @@ static void hb_nsxFreePageBuffer( LPNSXINDEX pIndex ) static void hb_nsxIndexTrunc( LPNSXINDEX pIndex ) { if( !pIndex->lockWrite ) - hb_errInternal( 9102, "hb_nsxIndexTrunc on not locked index file.", "", "" ); + hb_errInternal( 9102, "hb_nsxIndexTrunc on not locked index file.", NULL, NULL ); hb_nsxFreePageBuffer( pIndex ); pIndex->Update = pIndex->Changed = pIndex->fFlush = TRUE; @@ -1384,9 +1384,9 @@ static LPPAGEINFO hb_nsxPageGetBuffer( LPTAGINFO pTag, ULONG ulPage ) LPPAGEINFO pPage = pIndex->pFirst; if( pPage->iUsed ) - hb_errInternal( 9999, "hb_nsxPageGetBuffer: page used.", "", "" ); + hb_errInternal( 9999, "hb_nsxPageGetBuffer: page used.", NULL, NULL ); if( pPage->Changed ) - hb_errInternal( 9999, "hb_nsxPageGetBuffer: page changed.", "", "" ); + hb_errInternal( 9999, "hb_nsxPageGetBuffer: page changed.", NULL, NULL ); pIndex->pFirst = pPage->pNext; if( pIndex->pFirst ) @@ -1487,7 +1487,7 @@ static void hb_nsxPageRelease( LPTAGINFO pTag, LPPAGEINFO pPage ) } } else if( pPage->iUsed < 0 ) - hb_errInternal( 9999, "hb_nsxPageRelease: unused page freed.", "", "" ); + hb_errInternal( 9999, "hb_nsxPageRelease: unused page freed.", NULL, NULL ); #ifdef HB_NSX_DEBUG_EXT if( hb_nsxPageType( pPage ) != 'f' ) @@ -2135,7 +2135,7 @@ static void hb_nsxIndexFlush( LPNSXINDEX pIndex ) hb_nsxPageRelease( pIndex->lpTags[0], pPage ); } else - hb_errInternal( 9999, "hb_nsxIndexFlush: unchaged page in the list.", "", "" ); + hb_errInternal( 9999, "hb_nsxIndexFlush: unchaged page in the list.", NULL, NULL ); } for( i = 0; i < pIndex->iTags; i++ ) @@ -2191,10 +2191,10 @@ static BOOL hb_nsxIndexLockWrite( LPNSXINDEX pIndex, BOOL fCheck ) BOOL fOK; if( pIndex->fReadonly ) - hb_errInternal( 9101, "hb_nsxIndexLockWrite: readonly index.", "", "" ); + hb_errInternal( 9101, "hb_nsxIndexLockWrite: readonly index.", NULL, NULL ); if( pIndex->lockRead ) - hb_errInternal( 9105, "hb_nsxIndexLockWrite: writeLock after readLock.", "", "" ); + hb_errInternal( 9105, "hb_nsxIndexLockWrite: writeLock after readLock.", NULL, NULL ); if( pIndex->lockWrite > 0 || !pIndex->fShared ) { @@ -2241,7 +2241,7 @@ static BOOL hb_nsxIndexUnLockRead( LPNSXINDEX pIndex ) pIndex->lockRead--; if( pIndex->lockRead < 0 ) - hb_errInternal( 9106, "hb_nsxIndexUnLockRead: bad count of locks.", "", "" ); + hb_errInternal( 9106, "hb_nsxIndexUnLockRead: bad count of locks.", NULL, NULL ); if( pIndex->lockRead || pIndex->lockWrite || !pIndex->fShared || HB_DIRTYREAD( pIndex->pArea ) ) @@ -2255,7 +2255,7 @@ static BOOL hb_nsxIndexUnLockRead( LPNSXINDEX pIndex ) FL_UNLOCK, &pIndex->ulLockPos ); } if( !fOK ) - hb_errInternal( 9108, "hb_nsxIndexUnLockRead: unlock error.", "", "" ); + hb_errInternal( 9108, "hb_nsxIndexUnLockRead: unlock error.", NULL, NULL ); return fOK; } @@ -2274,9 +2274,9 @@ static BOOL hb_nsxIndexUnLockWrite( LPNSXINDEX pIndex ) #endif if( pIndex->lockWrite <= 0 ) - hb_errInternal( 9106, "hb_nsxIndexUnLockWrite: bad count of locks.", "", "" ); + hb_errInternal( 9106, "hb_nsxIndexUnLockWrite: bad count of locks.", NULL, NULL ); if( pIndex->lockRead ) - hb_errInternal( 9105, "hb_nsxIndexUnLockWrite: writeUnLock before readUnLock.", "", "" ); + hb_errInternal( 9105, "hb_nsxIndexUnLockWrite: writeUnLock before readUnLock.", NULL, NULL ); hb_nsxIndexFlush( pIndex ); pIndex->lockWrite--; @@ -2292,7 +2292,7 @@ static BOOL hb_nsxIndexUnLockWrite( LPNSXINDEX pIndex ) FL_UNLOCK, &pIndex->ulLockPos ); } if( !fOK ) - hb_errInternal( 9108, "hb_nsxIndexUnLockWrite: unlock error.", "", "" ); + hb_errInternal( 9108, "hb_nsxIndexUnLockWrite: unlock error.", NULL, NULL ); return fOK; } @@ -3072,9 +3072,9 @@ static BOOL hb_nsxTagInsertKey( LPTAGINFO pTag, LPPAGEINFO pPage, if( uiOffset == 0 ) { if( pNewKey ) - hb_errInternal( 9999, "hb_nsxTagInsertKey: multiple leaf page split", "", "" ); + hb_errInternal( 9999, "hb_nsxTagInsertKey: multiple leaf page split", NULL, NULL ); else if( uiHalfOffset == 0 ) - hb_errInternal( 9999, "hb_nsxTagInsertKey: split offset not set", "", "" ); + hb_errInternal( 9999, "hb_nsxTagInsertKey: split offset not set", NULL, NULL ); pPage->uiOffset = uiHalfOffset; uiKey = pPage->uiKeys = uiHalfKeys; @@ -3782,7 +3782,7 @@ static void hb_nsxCreateFName( NSXAREAP pArea, const char * szBagName, BOOL * fP { DBORDERINFO pExtInfo; memset( &pExtInfo, 0, sizeof( pExtInfo ) ); - pExt = pExtInfo.itmResult = hb_itemPutC( NULL, "" ); + pExt = pExtInfo.itmResult = hb_itemPutC( NULL, NULL ); if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == HB_SUCCESS && hb_itemGetCLen( pExt ) > 0 ) { @@ -3807,7 +3807,7 @@ static void hb_nsxCreateFName( NSXAREAP pArea, const char * szBagName, BOOL * fP { DBORDERINFO pExtInfo; memset( &pExtInfo, 0, sizeof( pExtInfo ) ); - pExt = pExtInfo.itmResult = hb_itemPutC( NULL, "" ); + pExt = pExtInfo.itmResult = hb_itemPutC( NULL, NULL ); if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == HB_SUCCESS ) { *fProd = hb_stricmp( pFileName->szExtension, @@ -5550,7 +5550,7 @@ static void hb_nsxSortOut( LPNSXSORTINFO pSort ) { if( hb_vmRequestQuery() != 0 ) return; - hb_errInternal( 9999, "hb_nsxSortOut: memory structure corrupted.", "", "" ); + hb_errInternal( 9999, "hb_nsxSortOut: memory structure corrupted.", NULL, NULL ); } if( fUnique ) { @@ -5571,7 +5571,7 @@ static void hb_nsxSortOut( LPNSXSORTINFO pSort ) ulKey, pKeyVal, ulRec, pSort->pLastKey, pSort->ulLastRec); fflush(stdout); if( hb_vmRequestQuery() != 0 ) return; - hb_errInternal( 9999, "hb_nsxSortOut: sorting fails.", "", "" ); + hb_errInternal( 9999, "hb_nsxSortOut: sorting fails.", NULL, NULL ); } } #endif @@ -5590,7 +5590,7 @@ static void hb_nsxSortOut( LPNSXSORTINFO pSort ) { if( hb_vmRequestQuery() != 0 ) return; - hb_errInternal( 9999, "hb_nsxSortOut: memory structure corrupted(2).", "", "" ); + hb_errInternal( 9999, "hb_nsxSortOut: memory structure corrupted(2).", NULL, NULL ); } } #endif @@ -6315,7 +6315,7 @@ static HB_ERRCODE hb_nsxGoCold( NSXAREAP pArea ) if( fAppend && pArea->fShared ) { if( pArea->fIdxAppend ) - hb_errInternal( 9999, "hb_nsxGoCold: multiple appending without GOCOLD.", "", "" ); + hb_errInternal( 9999, "hb_nsxGoCold: multiple appending without GOCOLD.", NULL, NULL ); pArea->fIdxAppend = TRUE; } else @@ -7211,8 +7211,7 @@ static HB_ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO switch( uiIndex ) { case DBOI_CONDITION: - pInfo->itmResult = hb_itemPutC( pInfo->itmResult, - pTag->ForExpr ? pTag->ForExpr : "" ); + pInfo->itmResult = hb_itemPutC( pInfo->itmResult, pTag->ForExpr ); if( hb_itemType( pInfo->itmNewVal ) & HB_IT_STRING ) { const char * szForExpr = hb_itemGetCPtr( pInfo->itmNewVal ); @@ -7709,7 +7708,7 @@ static HB_ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO case DBOI_FULLPATH: case DBOI_NAME: case DBOI_KEYTYPE: - hb_itemPutC( pInfo->itmResult, "" ); + hb_itemPutC( pInfo->itmResult, NULL ); break; default: hb_itemClear( pInfo->itmResult ); @@ -7886,7 +7885,7 @@ static HB_ERRCODE hb_nsxOrderListFocus( NSXAREAP pArea, LPDBORDERINFO pOrderInfo HB_TRACE(HB_TR_DEBUG, ("hb_nsxOrderListFocus(%p, %p)", pArea, pOrderInfo)); pOrderInfo->itmResult = hb_itemPutC( pOrderInfo->itmResult, - pArea->lpCurTag ? pArea->lpCurTag->TagName : "" ); + pArea->lpCurTag ? pArea->lpCurTag->TagName : NULL ); if( pOrderInfo->itmOrder ) {