2009-07-07 07:46 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

* harbour/contrib/hbqt/generator/hbqtgen.prg
    ! METHOD New( ... )
        ::pPtr := Qt_Q*( ... )
        RETURN Self

  * harbour/contrib/hbqt/TQBrush.prg
  * harbour/contrib/hbqt/TQColor.prg
  * harbour/contrib/hbqt/TQCursor.prg
  * harbour/contrib/hbqt/TQFont.prg
  * harbour/contrib/hbqt/TQIcon.prg
  * harbour/contrib/hbqt/TQPalette.prg
  * harbour/contrib/hbqt/TQPen.prg
  * harbour/contrib/hbqt/TQSize.prg
    ! Result of above change.
This commit is contained in:
Pritpal Bedi
2009-07-07 14:49:51 +00:00
parent 6ef113db17
commit c954c7fa61
10 changed files with 30 additions and 358 deletions

View File

@@ -17,6 +17,22 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-07 07:46 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/hbqt/generator/hbqtgen.prg
! METHOD New( ... )
::pPtr := Qt_Q*( ... )
RETURN Self
* harbour/contrib/hbqt/TQBrush.prg
* harbour/contrib/hbqt/TQColor.prg
* harbour/contrib/hbqt/TQCursor.prg
* harbour/contrib/hbqt/TQFont.prg
* harbour/contrib/hbqt/TQIcon.prg
* harbour/contrib/hbqt/TQPalette.prg
* harbour/contrib/hbqt/TQPen.prg
* harbour/contrib/hbqt/TQSize.prg
! Result of above change.
2009-07-07 15:15 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/rtl/diskspac.c
* added iTODO warning in OW Linux builds

View File

@@ -83,46 +83,8 @@ CREATE CLASS QBrush
/*----------------------------------------------------------------------*/
METHOD New( ... ) CLASS QBrush
LOCAL aP, nParams
aP := hb_aParams()
nParams := len( aP )
DO CASE
CASE nParams == 0
::pPtr := Qt_QBrush()
CASE nParams == 1
::pPtr := Qt_QBrush( aP[ 1 ] )
CASE nParams == 2
::pPtr := Qt_QBrush( aP[ 1 ], aP[ 2 ] )
CASE nParams == 3
::pPtr := Qt_QBrush( aP[ 1 ], aP[ 2 ], aP[ 3 ] )
CASE nParams == 4
::pPtr := Qt_QBrush( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ] )
CASE nParams == 5
::pPtr := Qt_QBrush( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ] )
CASE nParams == 6
::pPtr := Qt_QBrush( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ] )
CASE nParams == 7
::pPtr := Qt_QBrush( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ] )
CASE nParams == 8
::pPtr := Qt_QBrush( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ] )
CASE nParams == 9
::pPtr := Qt_QBrush( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ] )
CASE nParams ==10
::pPtr := Qt_QBrush( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ], aP[10 ] )
ENDCASE
::pPtr := Qt_QBrush( ... )
RETURN Self

View File

@@ -134,46 +134,8 @@ CREATE CLASS QColor
/*----------------------------------------------------------------------*/
METHOD New( ... ) CLASS QColor
LOCAL aP, nParams
aP := hb_aParams()
nParams := len( aP )
DO CASE
CASE nParams == 0
::pPtr := Qt_QColor()
CASE nParams == 1
::pPtr := Qt_QColor( aP[ 1 ] )
CASE nParams == 2
::pPtr := Qt_QColor( aP[ 1 ], aP[ 2 ] )
CASE nParams == 3
::pPtr := Qt_QColor( aP[ 1 ], aP[ 2 ], aP[ 3 ] )
CASE nParams == 4
::pPtr := Qt_QColor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ] )
CASE nParams == 5
::pPtr := Qt_QColor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ] )
CASE nParams == 6
::pPtr := Qt_QColor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ] )
CASE nParams == 7
::pPtr := Qt_QColor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ] )
CASE nParams == 8
::pPtr := Qt_QColor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ] )
CASE nParams == 9
::pPtr := Qt_QColor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ] )
CASE nParams ==10
::pPtr := Qt_QColor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ], aP[10 ] )
ENDCASE
::pPtr := Qt_QColor( ... )
RETURN Self

View File

@@ -78,46 +78,8 @@ CREATE CLASS QCursor
/*----------------------------------------------------------------------*/
METHOD New( ... ) CLASS QCursor
LOCAL aP, nParams
aP := hb_aParams()
nParams := len( aP )
DO CASE
CASE nParams == 0
::pPtr := Qt_QCursor()
CASE nParams == 1
::pPtr := Qt_QCursor( aP[ 1 ] )
CASE nParams == 2
::pPtr := Qt_QCursor( aP[ 1 ], aP[ 2 ] )
CASE nParams == 3
::pPtr := Qt_QCursor( aP[ 1 ], aP[ 2 ], aP[ 3 ] )
CASE nParams == 4
::pPtr := Qt_QCursor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ] )
CASE nParams == 5
::pPtr := Qt_QCursor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ] )
CASE nParams == 6
::pPtr := Qt_QCursor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ] )
CASE nParams == 7
::pPtr := Qt_QCursor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ] )
CASE nParams == 8
::pPtr := Qt_QCursor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ] )
CASE nParams == 9
::pPtr := Qt_QCursor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ] )
CASE nParams ==10
::pPtr := Qt_QCursor( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ], aP[10 ] )
ENDCASE
::pPtr := Qt_QCursor( ... )
RETURN Self

View File

@@ -127,46 +127,8 @@ CREATE CLASS QFont
/*----------------------------------------------------------------------*/
METHOD New( ... ) CLASS QFont
LOCAL aP, nParams
aP := hb_aParams()
nParams := len( aP )
DO CASE
CASE nParams == 0
::pPtr := Qt_QFont()
CASE nParams == 1
::pPtr := Qt_QFont( aP[ 1 ] )
CASE nParams == 2
::pPtr := Qt_QFont( aP[ 1 ], aP[ 2 ] )
CASE nParams == 3
::pPtr := Qt_QFont( aP[ 1 ], aP[ 2 ], aP[ 3 ] )
CASE nParams == 4
::pPtr := Qt_QFont( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ] )
CASE nParams == 5
::pPtr := Qt_QFont( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ] )
CASE nParams == 6
::pPtr := Qt_QFont( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ] )
CASE nParams == 7
::pPtr := Qt_QFont( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ] )
CASE nParams == 8
::pPtr := Qt_QFont( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ] )
CASE nParams == 9
::pPtr := Qt_QFont( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ] )
CASE nParams ==10
::pPtr := Qt_QFont( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ], aP[10 ] )
ENDCASE
::pPtr := Qt_QFont( ... )
RETURN Self

View File

@@ -79,46 +79,8 @@ CREATE CLASS QIcon
/*----------------------------------------------------------------------*/
METHOD New( ... ) CLASS QIcon
LOCAL aP, nParams
aP := hb_aParams()
nParams := len( aP )
DO CASE
CASE nParams == 0
::pPtr := Qt_QIcon()
CASE nParams == 1
::pPtr := Qt_QIcon( aP[ 1 ] )
CASE nParams == 2
::pPtr := Qt_QIcon( aP[ 1 ], aP[ 2 ] )
CASE nParams == 3
::pPtr := Qt_QIcon( aP[ 1 ], aP[ 2 ], aP[ 3 ] )
CASE nParams == 4
::pPtr := Qt_QIcon( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ] )
CASE nParams == 5
::pPtr := Qt_QIcon( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ] )
CASE nParams == 6
::pPtr := Qt_QIcon( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ] )
CASE nParams == 7
::pPtr := Qt_QIcon( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ] )
CASE nParams == 8
::pPtr := Qt_QIcon( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ] )
CASE nParams == 9
::pPtr := Qt_QIcon( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ] )
CASE nParams ==10
::pPtr := Qt_QIcon( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ], aP[10 ] )
ENDCASE
::pPtr := Qt_QIcon( ... )
RETURN Self

View File

@@ -104,46 +104,8 @@ CREATE CLASS QPalette
/*----------------------------------------------------------------------*/
METHOD New( ... ) CLASS QPalette
LOCAL aP, nParams
aP := hb_aParams()
nParams := len( aP )
DO CASE
CASE nParams == 0
::pPtr := Qt_QPalette()
CASE nParams == 1
::pPtr := Qt_QPalette( aP[ 1 ] )
CASE nParams == 2
::pPtr := Qt_QPalette( aP[ 1 ], aP[ 2 ] )
CASE nParams == 3
::pPtr := Qt_QPalette( aP[ 1 ], aP[ 2 ], aP[ 3 ] )
CASE nParams == 4
::pPtr := Qt_QPalette( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ] )
CASE nParams == 5
::pPtr := Qt_QPalette( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ] )
CASE nParams == 6
::pPtr := Qt_QPalette( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ] )
CASE nParams == 7
::pPtr := Qt_QPalette( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ] )
CASE nParams == 8
::pPtr := Qt_QPalette( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ] )
CASE nParams == 9
::pPtr := Qt_QPalette( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ] )
CASE nParams ==10
::pPtr := Qt_QPalette( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ], aP[10 ] )
ENDCASE
::pPtr := Qt_QPalette( ... )
RETURN Self

View File

@@ -90,46 +90,8 @@ CREATE CLASS QPen
/*----------------------------------------------------------------------*/
METHOD New( ... ) CLASS QPen
LOCAL aP, nParams
aP := hb_aParams()
nParams := len( aP )
DO CASE
CASE nParams == 0
::pPtr := Qt_QPen()
CASE nParams == 1
::pPtr := Qt_QPen( aP[ 1 ] )
CASE nParams == 2
::pPtr := Qt_QPen( aP[ 1 ], aP[ 2 ] )
CASE nParams == 3
::pPtr := Qt_QPen( aP[ 1 ], aP[ 2 ], aP[ 3 ] )
CASE nParams == 4
::pPtr := Qt_QPen( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ] )
CASE nParams == 5
::pPtr := Qt_QPen( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ] )
CASE nParams == 6
::pPtr := Qt_QPen( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ] )
CASE nParams == 7
::pPtr := Qt_QPen( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ] )
CASE nParams == 8
::pPtr := Qt_QPen( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ] )
CASE nParams == 9
::pPtr := Qt_QPen( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ] )
CASE nParams ==10
::pPtr := Qt_QPen( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ], aP[10 ] )
ENDCASE
::pPtr := Qt_QPen( ... )
RETURN Self

View File

@@ -83,46 +83,8 @@ CREATE CLASS QSize
/*----------------------------------------------------------------------*/
METHOD New( ... ) CLASS QSize
LOCAL aP, nParams
aP := hb_aParams()
nParams := len( aP )
DO CASE
CASE nParams == 0
::pPtr := Qt_QSize()
CASE nParams == 1
::pPtr := Qt_QSize( aP[ 1 ] )
CASE nParams == 2
::pPtr := Qt_QSize( aP[ 1 ], aP[ 2 ] )
CASE nParams == 3
::pPtr := Qt_QSize( aP[ 1 ], aP[ 2 ], aP[ 3 ] )
CASE nParams == 4
::pPtr := Qt_QSize( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ] )
CASE nParams == 5
::pPtr := Qt_QSize( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ] )
CASE nParams == 6
::pPtr := Qt_QSize( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ] )
CASE nParams == 7
::pPtr := Qt_QSize( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ] )
CASE nParams == 8
::pPtr := Qt_QSize( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ] )
CASE nParams == 9
::pPtr := Qt_QSize( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ] )
CASE nParams ==10
::pPtr := Qt_QSize( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ], aP[10 ] )
ENDCASE
::pPtr := Qt_QSize( ... )
RETURN Self

View File

@@ -1263,58 +1263,17 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut )
DO CASE
CASE cClassType == "PLAINOBJECT"
cM := 'New( ... )'
aadd( txt_, 'METHOD ' + cM + ' CLASS ' + cWidget )
aadd( txt_, ' LOCAL aP, nParams' )
aadd( txt_, 'METHOD New( ... ) CLASS ' + cWidget )
aadd( txt_, '' )
aadd( txt_, ' aP := hb_aParams()' )
aadd( txt_, ' nParams := len( aP )' )
aadd( txt_, '' )
aadd( txt_, ' DO CASE' )
aadd( txt_, ' CASE nParams == 0' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '()' )
aadd( txt_, ' ' )
aadd( txt_, ' CASE nParams == 1' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( aP[ 1 ] )' )
aadd( txt_, ' ' )
aadd( txt_, ' CASE nParams == 2' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ] )' )
aadd( txt_, ' ' )
aadd( txt_, ' CASE nParams == 3' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ] )' )
aadd( txt_, ' ' )
aadd( txt_, ' CASE nParams == 4' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ] )' )
aadd( txt_, ' ' )
aadd( txt_, ' CASE nParams == 5' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ] )' )
aadd( txt_, ' ' )
aadd( txt_, ' CASE nParams == 6' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ] )' )
aadd( txt_, ' ' )
aadd( txt_, ' CASE nParams == 7' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ] )' )
aadd( txt_, ' ' )
aadd( txt_, ' CASE nParams == 8' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ] )' )
aadd( txt_, ' ' )
aadd( txt_, ' CASE nParams == 9' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ] )' )
aadd( txt_, ' ' )
aadd( txt_, ' CASE nParams ==10' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ], aP[10 ] )' )
aadd( txt_, ' ' )
aadd( txt_, ' ENDCASE' )
aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( ... )' )
aadd( txt_, '' )
aadd( txt_, ' RETURN Self' )
aadd( txt_, '' )
aadd( txt_, '/*----------------------------------------------------------------------*/' )
aadd( txt_, '' )
OTHERWISE
cM := 'New( pParent )'
aadd( txt_, '' )
aadd( txt_, 'METHOD ' + cM + ' CLASS ' + cWidget )
OTHERWISE
aadd( txt_, 'METHOD New( pParent ) CLASS ' + cWidget )
aadd( txt_, '' )
aadd( txt_, ' ::pParent := pParent' )
aadd( txt_, '' )
@@ -1324,6 +1283,7 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut )
aadd( txt_, '' )
aadd( txt_, '/*----------------------------------------------------------------------*/' )
aadd( txt_, '' )
ENDCASE
RETURN CreateTarget( cFile, txt_ )