diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1261315625..97ea8c33aa 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,60 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-24 15:45 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtcore/qth/QFile.qth + * contrib/hbqt/qtcore/qth/QIODevice.qth + * contrib/hbqt/qtcore/qth/QResource.qth + * contrib/hbqt/qtgui/qth/QBrush.qth + * contrib/hbqt/qtgui/qth/QColor.qth + * contrib/hbqt/qtgui/qth/QFormLayout.qth + * contrib/hbqt/qtgui/qth/QIcon.qth + * contrib/hbqt/qtgui/qth/QImage.qth + * contrib/hbqt/qtgui/qth/QMainWindow.qth + * contrib/hbqt/qtgui/qth/QMenu.qth + * contrib/hbqt/qtgui/qth/QMenuBar.qth + * contrib/hbqt/qtgui/qth/QPainter.qth + * contrib/hbqt/qtgui/qth/QPainterPath.qth + * contrib/hbqt/qtgui/qth/QPixmap.qth + * contrib/hbqt/qtgui/qth/QWidget.qth + + Normalized as much as possible. + In some cases almost 100%. + + * contrib/hbqt/hbqt_hbmk2_plugin.hbs + + * contrib/hbxbp/xbpbrowse.prg + * contrib/hbxbp/xbplistbox.prg + - Changed: calls postfixed with "_1" and family methods. + + * contrib/hbide/hbqreportsmanager.prg + * contrib/hbide/idebrowse.prg + * contrib/hbide/idedocks.prg + * contrib/hbide/idefindreplace.prg + * contrib/hbide/idefunctions.prg + * contrib/hbide/ideharbourhelp.prg + * contrib/hbide/idesaveload.prg + * contrib/hbide/ideshortcuts.prg + - Changed: calls postfixed with "_1" and family methods. + Nothing else is looked into yet. + + * contrib/hbqt/qtcore/hbqt_misc.prg + + Added one more method :valtypes() + + * contrib/hbqt/utils/hbqtgen.prg + + Implemented: resolving parameters and calling + many-to-one methods at PRG level. It is extremely + complex composition but has been achieved to the point where, + at least, hbIDE is build properly and is running. + Many more points needs to be addressed but that I + will undertake after a couple of days. + + REGRESSION is highly possible and reporting + will be extremely helpful to further fine-tune the + concept. Goal is to bring everything on PRG code. + + * contrib/hbqt/qt*/g/*.cpp;*.prg,*.txt + * Re-generated. + 2010-09-23 18:52 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/qth/HBQString.qth * contrib/hbqt/qtcore/qth/QBuffer.qth diff --git a/harbour/contrib/hbide/hbqreportsmanager.prg b/harbour/contrib/hbide/hbqreportsmanager.prg index 843e38db7a..c0ff820919 100644 --- a/harbour/contrib/hbide/hbqreportsmanager.prg +++ b/harbour/contrib/hbide/hbqreportsmanager.prg @@ -263,25 +263,31 @@ METHOD HbqReportsManager:create( qParent ) /* Toolbar */ ::buildToolbar() - ::qLayout:addWidget_1( ::qToolbar:oWidget , 0, 0, 1, 2 ) + //::qLayout:addWidget_1( ::qToolbar:oWidget , 0, 0, 1, 2 ) + ::qLayout:addWidget( ::qToolbar:oWidget , 0, 0, 1, 2 ) ::buildToolbarAlign() - ::qLayout:addWidget_1( ::qToolbarAlign:oWidget , 1, 0, 1, 2 ) + //::qLayout:addWidget_1( ::qToolbarAlign:oWidget , 1, 0, 1, 2 ) + ::qLayout:addWidget( ::qToolbarAlign:oWidget , 1, 0, 1, 2 ) /* Toolbar left */ ::buildToolbarLeft() - ::qLayout:addWidget_1( ::qToolbarL:oWidget , 2, 0, 2, 1 ) + //::qLayout:addWidget_1( ::qToolbarL:oWidget , 2, 0, 2, 1 ) + ::qLayout:addWidget( ::qToolbarL:oWidget , 2, 0, 2, 1 ) /* ::qTabBar */ ::buildTabBar() - ::qLayout:addWidget_1( ::qTabBar , 2, 1, 1, 1 ) + //::qLayout:addWidget_1( ::qTabBar , 2, 1, 1, 1 ) + ::qLayout:addWidget( ::qTabBar , 2, 1, 1, 1 ) /* Stacked widget */ ::buildStacks() - ::qLayout:addWidget_1( ::qStack , 3, 1, 1, 1 ) + //::qLayout:addWidget_1( ::qStack , 3, 1, 1, 1 ) + ::qLayout:addWidget( ::qStack , 3, 1, 1, 1 ) /* StatusBar */ ::buildStatusBar() - ::qLayout:addWidget_1( ::qStatus , 4, 0, 1, 2 ) + //::qLayout:addWidget_1( ::qStatus , 4, 0, 1, 2 ) + ::qLayout:addWidget( ::qStatus , 4, 0, 1, 2 ) /* Document manipulation interface */ ::buildDesignReport() @@ -1052,11 +1058,13 @@ METHOD HbqReportsManager:zoom( nMode ) CASE HBQT_GRAPHICSVIEW_ZOOM_WYSIWYG ::qView:resetMatrix() ::qView:scale( ::nScreenDpiX / 25.4 / 10.0, ::nScreenDpiY / 25.4 / 10.0 ) - ::qView:centerOn_1( 0.0, 0.0 ) + //::qView:centerOn_1( 0.0, 0.0 ) + ::qView:centerOn( 0.0, 0.0 ) EXIT CASE HBQT_GRAPHICSVIEW_ZOOM_ORIGINAL ::qView:resetMatrix() - ::qView:centerOn_1( 0.0, 0.0 ) + //::qView:centerOn_1( 0.0, 0.0 ) + ::qView:centerOn( 0.0, 0.0 ) EXIT ENDSWITCH diff --git a/harbour/contrib/hbide/idebrowse.prg b/harbour/contrib/hbide/idebrowse.prg index bfbf9b931b..4ca30629e8 100644 --- a/harbour/contrib/hbide/idebrowse.prg +++ b/harbour/contrib/hbide/idebrowse.prg @@ -308,20 +308,24 @@ METHOD IdeBrowseManager:create( oIde ) /* Toolbar */ ::buildToolbar() - ::qLayout:addWidget_1( ::qToolbar, 0, 0, 1, 2 ) + //::qLayout:addWidget_1( ::qToolbar, 0, 0, 1, 2 ) + ::qLayout:addWidget( ::qToolbar, 0, 0, 1, 2 ) /* Toolbar left */ ::buildLeftToolbar() - ::qLayout:addWidget_1( ::qToolbarL, 1, 0, 1, 1 ) + //::qLayout:addWidget_1( ::qToolbarL, 1, 0, 1, 1 ) + ::qLayout:addWidget( ::qToolbarL, 1, 0, 1, 1 ) /* Stacked widget */ ::qStack := QStackedWidget() - ::qLayout:addWidget_1( ::qStack , 1, 1, 1, 1 ) + //::qLayout:addWidget_1( ::qStack , 1, 1, 1, 1 ) + ::qLayout:addWidget( ::qStack , 1, 1, 1, 1 ) /* StatusBar */ ::qStatus := QStatusBar() ::qStatus:setSizeGripEnabled( .f. ) - ::qLayout:addWidget_1( ::qStatus , 2, 0, 1, 2 ) + //::qLayout:addWidget_1( ::qStatus , 2, 0, 1, 2 ) + ::qLayout:addWidget( ::qStatus , 2, 0, 1, 2 ) /* */ ::buildStatusPanels() diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index a643df1129..23ccc81253 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -286,18 +286,24 @@ METHOD IdeDocks:buildDialog() IF ::oIde:lCurEditsMdi ::buildMdiToolbar() - ::qLayout:addWidget_1( ::qMdiToolbar:oWidget , 0, 0, 1, 2 ) + //::qLayout:addWidget_1( ::qMdiToolbar:oWidget , 0, 0, 1, 2 ) + ::qLayout:addWidget( ::qMdiToolbar:oWidget , 0, 0, 1, 2 ) ::buildMdiToolbarLeft() - ::qLayout:addWidget_1( ::qMdiToolbarL:oWidget , 1, 0, 1, 1 ) + //::qLayout:addWidget_1( ::qMdiToolbarL:oWidget , 1, 0, 1, 1 ) + ::qLayout:addWidget( ::qMdiToolbarL:oWidget , 1, 0, 1, 1 ) ::buildStackedWidget() - ::qLayout:addWidget_1( ::oStackedWidget:oWidget, 1, 1, 1, 1 ) + //::qLayout:addWidget_1( ::oStackedWidget:oWidget, 1, 1, 1, 1 ) + ::qLayout:addWidget( ::oStackedWidget:oWidget, 1, 1, 1, 1 ) ::buildSearchReplaceWidget() - ::qLayout:addWidget_1( ::oSearchReplace:oUI , 2, 0, 1, 2 ) + //::qLayout:addWidget_1( ::oSearchReplace:oUI , 2, 0, 1, 2 ) + ::qLayout:addWidget( ::oSearchReplace:oUI , 2, 0, 1, 2 ) ELSE ::buildStackedWidget() - ::qLayout:addWidget_1( ::oStackedWidget:oWidget, 0, 0, 1, 1 ) + //::qLayout:addWidget_1( ::oStackedWidget:oWidget, 0, 0, 1, 1 ) + ::qLayout:addWidget( ::oStackedWidget:oWidget, 0, 0, 1, 1 ) ::buildSearchReplaceWidget() - ::qLayout:addWidget_1( ::oSearchReplace:oUI , 1, 0, 1, 1 ) + //::qLayout:addWidget_1( ::oSearchReplace:oUI , 1, 0, 1, 1 ) + ::qLayout:addWidget( ::oSearchReplace:oUI , 1, 0, 1, 1 ) ENDIF /* Normalize Views */ @@ -348,12 +354,6 @@ METHOD IdeDocks:buildDialog() ::oStackedWidget:cascadeSubWindows() ELSEIF x_[ 1,6 ] == 3 ::stackMaximized() -#if 0 /* At this point size of the viewport is not determined */ - ELSEIF x_[ 1,6 ] == 4 - ::stackVertically() - ELSEIF x_[ 1,6 ] == 5 - ::stackHorizontally() -#endif ELSE FOR EACH a_ IN x_ IF !empty( a_[ 2 ] ) @@ -429,7 +429,7 @@ METHOD IdeDocks:buildSystemTray() ::oSys:setIcon( hbide_image( "hbide" ) ) ::oSys:connect( "activated(QSystemTrayIcon::ActivationReason)", {|p| ::execEvent( "qSystemTrayIcon_activated", p ) } ) - ::oIde:oSysMenu := QMenu( ::oDlg:oWidget ) + ::oIde:oSysMenu := QMenu() // ::oDlg:oWidget ) ::qAct1 := QAction():from( ::oSysMenu:addAction( hbide_image( "fullscreen" ), "&Show" ) ) ::oSysMenu:addSeparator() ::qAct2 := QAction():from( ::oSysMenu:addAction( hbide_image( "exit" ), "&Exit" ) ) diff --git a/harbour/contrib/hbide/idefindreplace.prg b/harbour/contrib/hbide/idefindreplace.prg index f11a6c8591..695208cd53 100644 --- a/harbour/contrib/hbide/idefindreplace.prg +++ b/harbour/contrib/hbide/idefindreplace.prg @@ -823,7 +823,8 @@ METHOD IdeFindInFiles:buildUI() qItem:setFlags( Qt_ItemIsUserCheckable + Qt_ItemIsEnabled + Qt_ItemIsSelectable ) qItem:setText( cProj ) qItem:setCheckState( 0 ) - ::oUI:q_listProjects:addItem_1( qItem ) + //::oUI:q_listProjects:addItem_1( qItem ) + ::oUI:q_listProjects:addItem( qItem ) aadd( ::aItems, qItem ) ENDIF NEXT diff --git a/harbour/contrib/hbide/idefunctions.prg b/harbour/contrib/hbide/idefunctions.prg index 2607ef9760..451c4091f6 100644 --- a/harbour/contrib/hbide/idefunctions.prg +++ b/harbour/contrib/hbide/idefunctions.prg @@ -384,7 +384,8 @@ METHOD IdeFunctions:listProjects() qItm := QListWidgetItem() qItm:setText( s ) qItm:setCheckState( Qt_Unchecked ) - oLst:addItem_1( qItm ) + //oLst:addItem_1( qItm ) + oLst:addItem( qItm ) aadd( ::aProjList, qItm ) NEXT diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg index c154afbb60..3d3f5b071a 100644 --- a/harbour/contrib/hbide/ideharbourhelp.prg +++ b/harbour/contrib/hbide/ideharbourhelp.prg @@ -728,7 +728,8 @@ METHOD IdeHarbourHelp:populateIndex() qItem := QListWidgetItem() qItem:setText( a_[ 2 ] ) a_[ 5 ] := qItem - ::oUI:q_listIndex:addItem_1( qItem ) + //::oUI:q_listIndex:addItem_1( qItem ) + ::oUI:q_listIndex:addItem( qItem ) ENDIF NEXT diff --git a/harbour/contrib/hbide/idesaveload.prg b/harbour/contrib/hbide/idesaveload.prg index 92ffecf14a..1ac2a95757 100644 --- a/harbour/contrib/hbide/idesaveload.prg +++ b/harbour/contrib/hbide/idesaveload.prg @@ -1543,7 +1543,8 @@ METHOD IdeSetup:execEvent( cEvent, p, p1 ) aadd( ::oINI:aAppThemes, cTheme + "," + ::fetchThemeColorsString() ) qItem := QListWidgetItem() qItem:setText( cTheme ) - ::oUI:q_listThemes:addItem_1( qItem ) + //::oUI:q_listThemes:addItem_1( qItem ) + ::oUI:q_listThemes:addItem( qItem ) ::oUI:q_listThemes:setCurrentRow( len( ::oINI:aAppThemes ) - 1 ) ENDIF EXIT @@ -1695,7 +1696,8 @@ METHOD IdeSetup:pushThemesData() a_:= hb_aTokens( s, "," ) qItem := QListWidgetItem() qItem:setText( a_[ 1 ] ) - ::oUI:q_listThemes:addItem_1( qItem ) + //::oUI:q_listThemes:addItem_1( qItem ) + ::oUI:q_listThemes:addItem( qItem ) ::pushThemeColors( s:__enumIndex() ) NEXT ENDIF diff --git a/harbour/contrib/hbide/ideshortcuts.prg b/harbour/contrib/hbide/ideshortcuts.prg index ad635b0a15..b7cacfde29 100644 --- a/harbour/contrib/hbide/ideshortcuts.prg +++ b/harbour/contrib/hbide/ideshortcuts.prg @@ -676,7 +676,8 @@ METHOD IdeShortcuts:populateMethods() qItem:setText( a_[ 1 ] ) ENDIF aadd( ::aMtdItms, qItem ) - qLW:addItem_1( qItem ) + //qLW:addItem_1( qItem ) + qLW:addItem( qItem ) ENDIF NEXT qLW:setCurrentRow( 0 ) diff --git a/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs b/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs index 0550d72b2e..0a6d5bf9ba 100644 --- a/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs +++ b/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs @@ -644,11 +644,13 @@ STATIC FUNCTION hbq_gen_ui_prg( cFile, cFuncName ) IF "addWidget" $ cCmd IF hbq_occurs( cCmd, "," ) >= 4 - cCmd := StrTran( cCmd, "addWidget", "addWidget_1" ) +// cCmd := StrTran( cCmd, "addWidget", "addWidget_1" ) + cCmd := StrTran( cCmd, "addWidget", "addWidget" ) ENDIF ELSEIF "addLayout" $ cCmd IF hbq_occurs( cCmd, "," ) >= 4 - cCmd := StrTran( cCmd, "addLayout", "addLayout_1" ) +// cCmd := StrTran( cCmd, "addLayout", "addLayout_1" ) + cCmd := StrTran( cCmd, "addLayout", "addLayout" ) ENDIF ENDIF diff --git a/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciabstractapis.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciabstractapis.txt index a38dce29bc..3ffdff5e06 100644 --- a/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciabstractapis.txt +++ b/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciabstractapis.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QsciAbstractAPIs():new( ... ) + * QsciAbstractAPIs( ... ) * QsciAbstractAPIs():from( pPtr_OR_oObj_of_type_QsciAbstractAPIs ) * QsciAbstractAPIs():configure( pPtr_OR_oObj_of_type_QsciAbstractAPIs ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciapis.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciapis.txt index e953dc676e..1321834936 100644 --- a/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciapis.txt +++ b/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciapis.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QsciAbstractAPIs * $SYNTAX$ - * QsciAPIs():new( ... ) + * QsciAPIs( ... ) * QsciAPIs():from( pPtr_OR_oObj_of_type_QsciAPIs ) * QsciAPIs():configure( pPtr_OR_oObj_of_type_QsciAPIs ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommand.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommand.txt index 4b6175e03f..0004505153 100644 --- a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommand.txt +++ b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommand.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QsciCommand():new( ... ) + * QsciCommand( ... ) * QsciCommand():from( pPtr_OR_oObj_of_type_QsciCommand ) * QsciCommand():configure( pPtr_OR_oObj_of_type_QsciCommand ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommandset.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommandset.txt index e80cbce9e9..2de189abf0 100644 --- a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommandset.txt +++ b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommandset.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QsciCommandSet():new( ... ) + * QsciCommandSet( ... ) * QsciCommandSet():from( pPtr_OR_oObj_of_type_QsciCommandSet ) * QsciCommandSet():configure( pPtr_OR_oObj_of_type_QsciCommandSet ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexer.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexer.txt index 458263ad93..a9eb03a01e 100644 --- a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexer.txt +++ b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexer.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QsciLexer():new( ... ) + * QsciLexer( ... ) * QsciLexer():from( pPtr_OR_oObj_of_type_QsciLexer ) * QsciLexer():configure( pPtr_OR_oObj_of_type_QsciLexer ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexercpp.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexercpp.txt index a870a97a32..2867dd12ee 100644 --- a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexercpp.txt +++ b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexercpp.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QsciLexer * $SYNTAX$ - * QsciLexerCPP():new( ... ) + * QsciLexerCPP( ... ) * QsciLexerCPP():from( pPtr_OR_oObj_of_type_QsciLexerCPP ) * QsciLexerCPP():configure( pPtr_OR_oObj_of_type_QsciLexerCPP ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexerflagship.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexerflagship.txt index 3de6966a99..ca891f72c6 100644 --- a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexerflagship.txt +++ b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexerflagship.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QsciLexer * $SYNTAX$ - * QsciLexerFlagship():new( ... ) + * QsciLexerFlagship( ... ) * QsciLexerFlagship():from( pPtr_OR_oObj_of_type_QsciLexerFlagship ) * QsciLexerFlagship():configure( pPtr_OR_oObj_of_type_QsciLexerFlagship ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciscintilla.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciscintilla.txt index c5a0d6427d..2a2391afff 100644 --- a/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciscintilla.txt +++ b/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciscintilla.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QsciScintilla():new( ... ) + * QsciScintilla( ... ) * QsciScintilla():from( pPtr_OR_oObj_of_type_QsciScintilla ) * QsciScintilla():configure( pPtr_OR_oObj_of_type_QsciScintilla ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyle.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyle.txt index 7205a68979..e949f700a0 100644 --- a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyle.txt +++ b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyle.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QsciStyle():new( ... ) + * QsciStyle( ... ) * QsciStyle():from( pPtr_OR_oObj_of_type_QsciStyle ) * QsciStyle():configure( pPtr_OR_oObj_of_type_QsciStyle ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyledtext.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyledtext.txt index 7678548075..aa28092a69 100644 --- a/harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyledtext.txt +++ b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyledtext.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QsciStyledText():new( ... ) + * QsciStyledText( ... ) * QsciStyledText():from( pPtr_OR_oObj_of_type_QsciStyledText ) * QsciStyledText():configure( pPtr_OR_oObj_of_type_QsciStyledText ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp b/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp index 889c217870..2cc4cbef6b 100644 --- a/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp index 9cdd784172..699973497e 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp @@ -70,7 +70,6 @@ * Constructed[ 14/15 [ 93.33% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * virtual QStringList callTips (const QStringList &context, int commas, QsciScintilla::CallTipsStyle style, QList< int > &shifts) */ diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciAbstractAPIs.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciAbstractAPIs.cpp index 33304a85c6..d2fd0b8ef9 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciAbstractAPIs.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciAbstractAPIs.cpp @@ -70,7 +70,6 @@ * Constructed[ 3/4 [ 75.00% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * virtual QStringList callTips (const QStringList &context, int commas, QsciScintilla::CallTipsStyle style, QList< int > &shifts)=0 */ diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciCommand.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciCommand.cpp index 616db6c771..0a0a85378f 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciCommand.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciCommand.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp index 12a53d9ca3..e3071f4838 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 5/5 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciDocument.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciDocument.cpp index 33eab29187..81327cb330 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciDocument.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciDocument.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciLexer.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciLexer.cpp index 1e75acb4ab..6884492279 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciLexer.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciLexer.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 44/44 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp index 19b7f1585a..525637b088 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp @@ -78,6 +78,11 @@ * } */ +/* + * Constructed[ 27/27 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp index e4d876d03b..73fedd763d 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp @@ -78,6 +78,11 @@ * } */ +/* + * Constructed[ 27/27 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp index 8fcaadb571..54bda344c2 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp @@ -106,7 +106,6 @@ * Constructed[ 195/197 [ 98.98% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void annotate (int line, const QList< QsciStyledText > &text) * void setMarginText (int line, const QList< QsciStyledText > &text) diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp index 80fb98672c..a34da3b59f 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp @@ -70,6 +70,11 @@ * enum TextCase { OriginalCase = 0, UpperCase = 1, LowerCase = 2 } */ +/* + * Constructed[ 20/20 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qscintilla/g/QsciStyledText.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciStyledText.cpp index 88a10aec83..e1a4529348 100644 --- a/harbour/contrib/hbqt/qscintilla/g/QsciStyledText.cpp +++ b/harbour/contrib/hbqt/qscintilla/g/QsciStyledText.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qscintilla/g/TQsciLexer.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciLexer.prg index 6ae3ad031a..c3280b138e 100644 --- a/harbour/contrib/hbqt/qscintilla/g/TQsciLexer.prg +++ b/harbour/contrib/hbqt/qscintilla/g/TQsciLexer.prg @@ -92,13 +92,10 @@ CREATE CLASS QsciLexer INHERIT HbQtObjectHandler FUNCTION HB_QsciLexer METHOD defaultStyle() METHOD description( nStyle ) METHOD paper( nStyle ) - METHOD defaultColor() - METHOD defaultColor_1( nStyle ) + METHOD defaultColor( ... ) METHOD defaultEolFill( nStyle ) - METHOD defaultFont() - METHOD defaultFont_1( nStyle ) - METHOD defaultPaper() - METHOD defaultPaper_1( nStyle ) + METHOD defaultFont( ... ) + METHOD defaultPaper( ... ) METHOD editor() METHOD setEditor( pEditor ) METHOD readSettings( pQs, pPrefix ) @@ -212,32 +209,77 @@ METHOD QsciLexer:paper( nStyle ) RETURN Qt_QsciLexer_paper( ::pPtr, nStyle ) -METHOD QsciLexer:defaultColor() - RETURN Qt_QsciLexer_defaultColor( ::pPtr ) - - -METHOD QsciLexer:defaultColor_1( nStyle ) - RETURN Qt_QsciLexer_defaultColor_1( ::pPtr, nStyle ) +METHOD QsciLexer:defaultColor( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // virtual QColor defaultColor (int style) const + // N n int + RETURN QColor():from( Qt_QsciLexer_defaultColor_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QColor defaultColor () const + RETURN QColor():from( Qt_QsciLexer_defaultColor( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QsciLexer:defaultEolFill( nStyle ) RETURN Qt_QsciLexer_defaultEolFill( ::pPtr, nStyle ) -METHOD QsciLexer:defaultFont() - RETURN Qt_QsciLexer_defaultFont( ::pPtr ) +METHOD QsciLexer:defaultFont( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // virtual QFont defaultFont (int style) const + // N n int + RETURN QFont():from( Qt_QsciLexer_defaultFont_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QFont defaultFont () const + RETURN QFont():from( Qt_QsciLexer_defaultFont( ::pPtr, ... ) ) + ENDCASE + RETURN NIL -METHOD QsciLexer:defaultFont_1( nStyle ) - RETURN Qt_QsciLexer_defaultFont_1( ::pPtr, nStyle ) - - -METHOD QsciLexer:defaultPaper() - RETURN Qt_QsciLexer_defaultPaper( ::pPtr ) - - -METHOD QsciLexer:defaultPaper_1( nStyle ) - RETURN Qt_QsciLexer_defaultPaper_1( ::pPtr, nStyle ) +METHOD QsciLexer:defaultPaper( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // virtual QColor defaultPaper (int style) const + // N n int + RETURN QColor():from( Qt_QsciLexer_defaultPaper_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QColor defaultPaper () const + RETURN QColor():from( Qt_QsciLexer_defaultPaper( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QsciLexer:editor() diff --git a/harbour/contrib/hbqt/qscintilla/g/TQsciScintilla.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciScintilla.prg index a726fa9eba..0d8ebff4a4 100644 --- a/harbour/contrib/hbqt/qscintilla/g/TQsciScintilla.prg +++ b/harbour/contrib/hbqt/qscintilla/g/TQsciScintilla.prg @@ -71,9 +71,7 @@ CREATE CLASS QsciScintilla INHERIT HbQtObjectHandler FUNCTION HB_QsciScintilla METHOD new( ... ) - METHOD annotate( nLine, cText, nStyle ) - METHOD annotate_1( nLine, cText, pStyle ) - METHOD annotate_2( nLine, pText ) + METHOD annotate( ... ) METHOD annotation( nLine ) METHOD annotationDisplay() METHOD clearAnnotations( nLine ) @@ -133,9 +131,7 @@ CREATE CLASS QsciScintilla INHERIT HbQtObjectHandler FUNCTION HB_QsciScintilla METHOD marginSensitivity( nMargin ) METHOD marginType( nMargin ) METHOD marginWidth( nMargin ) - METHOD markerDefine( nSym, nMnr ) - METHOD markerDefine_1( cCh, nMnr ) - METHOD markerDefine_2( pPm, nMnr ) + METHOD markerDefine( ... ) METHOD markerAdd( nLinenr, nMnr ) METHOD markersAtLine( nLinenr ) METHOD markerDelete( nLinenr, nMnr ) @@ -165,9 +161,7 @@ CREATE CLASS QsciScintilla INHERIT HbQtObjectHandler FUNCTION HB_QsciScintilla METHOD setEdgeColor( pCol ) METHOD setEdgeColumn( nColnr ) METHOD setEdgeMode( nMode ) - METHOD setMarginText( nLine, cText, nStyle ) - METHOD setMarginText_1( nLine, cText, pStyle ) - METHOD setMarginText_2( nLine, pText ) + METHOD setMarginText( ... ) METHOD setMarginType( nMargin, nType ) METHOD clearMarginText( nLine ) METHOD setMarkerBackgroundColor( pCol, nMnr ) @@ -184,8 +178,7 @@ CREATE CLASS QsciScintilla INHERIT HbQtObjectHandler FUNCTION HB_QsciScintilla METHOD standardCommands() METHOD tabIndents() METHOD tabWidth() - METHOD text() - METHOD text_1( nLine ) + METHOD text( ... ) METHOD textHeight( nLinenr ) METHOD whitespaceVisibility() METHOD wordAtPoint( pPoint ) @@ -245,8 +238,7 @@ CREATE CLASS QsciScintilla INHERIT HbQtObjectHandler FUNCTION HB_QsciScintilla METHOD setMarginLineNumbers( nMargin, lLnrs ) METHOD setMarginMarkerMask( nMargin, nMask ) METHOD setMarginSensitivity( nMargin, lSens ) - METHOD setMarginWidth( nMargin, nWidth ) - METHOD setMarginWidth_1( nMargin, cS ) + METHOD setMarginWidth( ... ) METHOD setModified( lM ) METHOD setPaper( pC ) METHOD setReadOnly( lRo ) @@ -261,10 +253,8 @@ CREATE CLASS QsciScintilla INHERIT HbQtObjectHandler FUNCTION HB_QsciScintilla METHOD setWrapMode( nMode ) METHOD undo() METHOD unindent( nLine ) - METHOD zoomIn( nRange ) - METHOD zoomIn_1() - METHOD zoomOut( nRange ) - METHOD zoomOut_1() + METHOD zoomIn( ... ) + METHOD zoomOut( ... ) METHOD zoomTo( nSize ) ENDCLASS @@ -279,16 +269,35 @@ METHOD QsciScintilla:new( ... ) RETURN Self -METHOD QsciScintilla:annotate( nLine, cText, nStyle ) - RETURN Qt_QsciScintilla_annotate( ::pPtr, nLine, cText, nStyle ) - - -METHOD QsciScintilla:annotate_1( nLine, cText, pStyle ) - RETURN Qt_QsciScintilla_annotate_1( ::pPtr, nLine, cText, hbqt_ptr( pStyle ) ) - - -METHOD QsciScintilla:annotate_2( nLine, pText ) - RETURN Qt_QsciScintilla_annotate_2( ::pPtr, nLine, hbqt_ptr( pText ) ) +METHOD QsciScintilla:annotate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "N" + // void annotate (int line, const QString &text, int style) + // N n int, C c QString, N n int + RETURN Qt_QsciScintilla_annotate( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "PO" + // void annotate (int line, const QString &text, const QsciStyle &style) + // N n int, C c QString, PO p QsciStyle + RETURN Qt_QsciScintilla_annotate_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // void annotate (int line, const QsciStyledText &text) + // N n int, PO p QsciStyledText + RETURN Qt_QsciScintilla_annotate_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QsciScintilla:annotation( nLine ) @@ -527,16 +536,47 @@ METHOD QsciScintilla:marginWidth( nMargin ) RETURN Qt_QsciScintilla_marginWidth( ::pPtr, nMargin ) -METHOD QsciScintilla:markerDefine( nSym, nMnr ) - RETURN Qt_QsciScintilla_markerDefine( ::pPtr, nSym, nMnr ) - - -METHOD QsciScintilla:markerDefine_1( cCh, nMnr ) - RETURN Qt_QsciScintilla_markerDefine_1( ::pPtr, cCh, nMnr ) - - -METHOD QsciScintilla:markerDefine_2( pPm, nMnr ) - RETURN Qt_QsciScintilla_markerDefine_2( ::pPtr, hbqt_ptr( pPm ), nMnr ) +METHOD QsciScintilla:markerDefine( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // int markerDefine (char ch, int mnr=-1) + // C c char, N n int + RETURN Qt_QsciScintilla_markerDefine_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // int markerDefine (MarkerSymbol sym, int mnr=-1) + // N n QsciScintilla::MarkerSymbol, N n int + RETURN Qt_QsciScintilla_markerDefine( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // int markerDefine (const QPixmap &pm, int mnr=-1) + // PO p QPixmap, N n int + RETURN Qt_QsciScintilla_markerDefine_2( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // int markerDefine (char ch, int mnr=-1) + // C c char, N n int + RETURN Qt_QsciScintilla_markerDefine_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" + // int markerDefine (MarkerSymbol sym, int mnr=-1) + // N n QsciScintilla::MarkerSymbol, N n int + RETURN Qt_QsciScintilla_markerDefine( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // int markerDefine (const QPixmap &pm, int mnr=-1) + // PO p QPixmap, N n int + RETURN Qt_QsciScintilla_markerDefine_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QsciScintilla:markerAdd( nLinenr, nMnr ) @@ -655,16 +695,35 @@ METHOD QsciScintilla:setEdgeMode( nMode ) RETURN Qt_QsciScintilla_setEdgeMode( ::pPtr, nMode ) -METHOD QsciScintilla:setMarginText( nLine, cText, nStyle ) - RETURN Qt_QsciScintilla_setMarginText( ::pPtr, nLine, cText, nStyle ) - - -METHOD QsciScintilla:setMarginText_1( nLine, cText, pStyle ) - RETURN Qt_QsciScintilla_setMarginText_1( ::pPtr, nLine, cText, hbqt_ptr( pStyle ) ) - - -METHOD QsciScintilla:setMarginText_2( nLine, pText ) - RETURN Qt_QsciScintilla_setMarginText_2( ::pPtr, nLine, hbqt_ptr( pText ) ) +METHOD QsciScintilla:setMarginText( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "N" + // void setMarginText (int line, const QString &text, int style) + // N n int, C c QString, N n int + RETURN Qt_QsciScintilla_setMarginText( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "PO" + // void setMarginText (int line, const QString &text, const QsciStyle &style) + // N n int, C c QString, PO p QsciStyle + RETURN Qt_QsciScintilla_setMarginText_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // void setMarginText (int line, const QsciStyledText &text) + // N n int, PO p QsciStyledText + RETURN Qt_QsciScintilla_setMarginText_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QsciScintilla:setMarginType( nMargin, nType ) @@ -731,12 +790,27 @@ METHOD QsciScintilla:tabWidth() RETURN Qt_QsciScintilla_tabWidth( ::pPtr ) -METHOD QsciScintilla:text() - RETURN Qt_QsciScintilla_text( ::pPtr ) - - -METHOD QsciScintilla:text_1( nLine ) - RETURN Qt_QsciScintilla_text_1( ::pPtr, nLine ) +METHOD QsciScintilla:text( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QString text (int line) const + // N n int + RETURN Qt_QsciScintilla_text_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // QString text () const + RETURN Qt_QsciScintilla_text( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QsciScintilla:textHeight( nLinenr ) @@ -975,12 +1049,28 @@ METHOD QsciScintilla:setMarginSensitivity( nMargin, lSens ) RETURN Qt_QsciScintilla_setMarginSensitivity( ::pPtr, nMargin, lSens ) -METHOD QsciScintilla:setMarginWidth( nMargin, nWidth ) - RETURN Qt_QsciScintilla_setMarginWidth( ::pPtr, nMargin, nWidth ) - - -METHOD QsciScintilla:setMarginWidth_1( nMargin, cS ) - RETURN Qt_QsciScintilla_setMarginWidth_1( ::pPtr, nMargin, cS ) +METHOD QsciScintilla:setMarginWidth( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "C" + // virtual void setMarginWidth (int margin, const QString &s) + // N n int, C c QString + RETURN Qt_QsciScintilla_setMarginWidth_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // virtual void setMarginWidth (int margin, int width) + // N n int, N n int + RETURN Qt_QsciScintilla_setMarginWidth( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QsciScintilla:setModified( lM ) @@ -1039,20 +1129,50 @@ METHOD QsciScintilla:unindent( nLine ) RETURN Qt_QsciScintilla_unindent( ::pPtr, nLine ) -METHOD QsciScintilla:zoomIn( nRange ) - RETURN Qt_QsciScintilla_zoomIn( ::pPtr, nRange ) +METHOD QsciScintilla:zoomIn( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // virtual void zoomIn (int range) + // N n int + RETURN Qt_QsciScintilla_zoomIn( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // virtual void zoomIn () + RETURN Qt_QsciScintilla_zoomIn_1( ::pPtr, ... ) + ENDCASE + RETURN NIL -METHOD QsciScintilla:zoomIn_1() - RETURN Qt_QsciScintilla_zoomIn_1( ::pPtr ) - - -METHOD QsciScintilla:zoomOut( nRange ) - RETURN Qt_QsciScintilla_zoomOut( ::pPtr, nRange ) - - -METHOD QsciScintilla:zoomOut_1() - RETURN Qt_QsciScintilla_zoomOut_1( ::pPtr ) +METHOD QsciScintilla:zoomOut( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // virtual void zoomOut (int range) + // N n int + RETURN Qt_QsciScintilla_zoomOut( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // virtual void zoomOut () + RETURN Qt_QsciScintilla_zoomOut_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QsciScintilla:zoomTo( nSize ) diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_hbqevents.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_hbqevents.txt index 52199d1863..2525071be2 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_hbqevents.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_hbqevents.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * HBQEvents():new( ... ) + * HBQEvents( ... ) * HBQEvents():from( pPtr_OR_oObj_of_type_HBQEvents ) * HBQEvents():configure( pPtr_OR_oObj_of_type_HBQEvents ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_hbqslots.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_hbqslots.txt index 8621a31981..9b4a776b3e 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_hbqslots.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_hbqslots.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * HBQSlots():new( ... ) + * HBQSlots( ... ) * HBQSlots():from( pPtr_OR_oObj_of_type_HBQSlots ) * HBQSlots():configure( pPtr_OR_oObj_of_type_HBQSlots ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qabstractitemmodel.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qabstractitemmodel.txt index 76dd378d6d..400187a313 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qabstractitemmodel.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qabstractitemmodel.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QAbstractItemModel():new( ... ) + * QAbstractItemModel( ... ) * QAbstractItemModel():from( pPtr_OR_oObj_of_type_QAbstractItemModel ) * QAbstractItemModel():configure( pPtr_OR_oObj_of_type_QAbstractItemModel ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qabstractlistmodel.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qabstractlistmodel.txt index 6f28f6725d..fc153b1cac 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qabstractlistmodel.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qabstractlistmodel.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemModel * $SYNTAX$ - * QAbstractListModel():new( ... ) + * QAbstractListModel( ... ) * QAbstractListModel():from( pPtr_OR_oObj_of_type_QAbstractListModel ) * QAbstractListModel():configure( pPtr_OR_oObj_of_type_QAbstractListModel ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qabstracttablemodel.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qabstracttablemodel.txt index cbaeeadfbe..31a2944aa9 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qabstracttablemodel.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qabstracttablemodel.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemModel * $SYNTAX$ - * QAbstractTableModel():new( ... ) + * QAbstractTableModel( ... ) * QAbstractTableModel():from( pPtr_OR_oObj_of_type_QAbstractTableModel ) * QAbstractTableModel():configure( pPtr_OR_oObj_of_type_QAbstractTableModel ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qbitarray.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qbitarray.txt index 5f3e155be5..9ffcb99c12 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qbitarray.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qbitarray.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QBitArray():new( ... ) + * QBitArray( ... ) * QBitArray():from( pPtr_OR_oObj_of_type_QBitArray ) * QBitArray():configure( pPtr_OR_oObj_of_type_QBitArray ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qbuffer.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qbuffer.txt index 59f693ae74..7d4d89ffea 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qbuffer.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qbuffer.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QIODevice * $SYNTAX$ - * QBuffer():new( ... ) + * QBuffer( ... ) * QBuffer():from( pPtr_OR_oObj_of_type_QBuffer ) * QBuffer():configure( pPtr_OR_oObj_of_type_QBuffer ) * $ARGUMENTS$ @@ -27,7 +27,6 @@ * An instance of the object of type QBuffer * $METHODS$ * :buffer() -> pQByteArray - * :buffer_1() -> pQByteArray * :data() -> pQByteArray * :setBuffer( pByteArray ) -> NIL * :setData( pData, nSize ) -> NIL diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qbytearray.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qbytearray.txt index 8904e67c67..6e971d749a 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qbytearray.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qbytearray.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QByteArray():new( ... ) + * QByteArray( ... ) * QByteArray():from( pPtr_OR_oObj_of_type_QByteArray ) * QByteArray():configure( pPtr_OR_oObj_of_type_QByteArray ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qchar.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qchar.txt index d571c99cf8..9c6cf6efb1 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qchar.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qchar.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QChar():new( ... ) + * QChar( ... ) * QChar():from( pPtr_OR_oObj_of_type_QChar ) * QChar():configure( pPtr_OR_oObj_of_type_QChar ) * $ARGUMENTS$ @@ -27,7 +27,7 @@ * An instance of the object of type QChar * $METHODS$ * :category() -> nCategory - * :combiningClass() -> nUnsigned + * :combiningClass() -> nChar * :decomposition() -> cQString * :decompositionTag() -> nDecomposition * :digitValue() -> nInt @@ -52,7 +52,6 @@ * :toAscii() -> cChar * :toLatin1() -> cChar * :unicode() -> nUshort - * :unicode_1() -> nUshort * :unicodeVersion() -> nUnicodeVersion * * $DESCRIPTION$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qcoreapplication.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qcoreapplication.txt index d8b214cd20..2317ac2f8f 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qcoreapplication.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qcoreapplication.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QCoreApplication():new( ... ) + * QCoreApplication( ... ) * QCoreApplication():from( pPtr_OR_oObj_of_type_QCoreApplication ) * QCoreApplication():configure( pPtr_OR_oObj_of_type_QCoreApplication ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qdatastream.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qdatastream.txt index aac12d978f..d875e4958c 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qdatastream.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qdatastream.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QDataStream():new( ... ) + * QDataStream( ... ) * QDataStream():from( pPtr_OR_oObj_of_type_QDataStream ) * QDataStream():configure( pPtr_OR_oObj_of_type_QDataStream ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qdate.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qdate.txt index df17521d14..a63bb1ecd5 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qdate.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qdate.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QDate():new( ... ) + * QDate( ... ) * QDate():from( pPtr_OR_oObj_of_type_QDate ) * QDate():configure( pPtr_OR_oObj_of_type_QDate ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qdatetime.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qdatetime.txt index f8e40a85a0..fecc6db6ed 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qdatetime.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qdatetime.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QDateTime():new( ... ) + * QDateTime( ... ) * QDateTime():from( pPtr_OR_oObj_of_type_QDateTime ) * QDateTime():configure( pPtr_OR_oObj_of_type_QDateTime ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qdir.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qdir.txt index e1578d5ba8..d86e924d25 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qdir.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qdir.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QDir():new( ... ) + * QDir( ... ) * QDir():from( pPtr_OR_oObj_of_type_QDir ) * QDir():configure( pPtr_OR_oObj_of_type_QDir ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qevent.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qevent.txt index cd94c4e996..454426b176 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qevent.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QEvent():new( ... ) + * QEvent( ... ) * QEvent():from( pPtr_OR_oObj_of_type_QEvent ) * QEvent():configure( pPtr_OR_oObj_of_type_QEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qeventloop.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qeventloop.txt index c7495c4b78..b5556fb774 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qeventloop.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qeventloop.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QEventLoop():new( ... ) + * QEventLoop( ... ) * QEventLoop():from( pPtr_OR_oObj_of_type_QEventLoop ) * QEventLoop():configure( pPtr_OR_oObj_of_type_QEventLoop ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qfile.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qfile.txt index e717a3a411..ef2ea78227 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qfile.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qfile.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QIODevice * $SYNTAX$ - * QFile():new( ... ) + * QFile( ... ) * QFile():from( pPtr_OR_oObj_of_type_QFile ) * QFile():configure( pPtr_OR_oObj_of_type_QFile ) * $ARGUMENTS$ @@ -50,7 +50,6 @@ * :unsetError() -> NIL * :copy_1( cFileName, cNewName ) -> lBool * :decodeName( pLocalFileName ) -> cQString - * :decodeName_1( pLocalFileName ) -> cQString * :encodeName( cFileName ) -> pQByteArray * :exists_1( cFileName ) -> lBool * :link_1( cFileName, cLinkName ) -> lBool diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qfileinfo.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qfileinfo.txt index 82e793bcbd..cf8b0f910c 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qfileinfo.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qfileinfo.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QFileInfo():new( ... ) + * QFileInfo( ... ) * QFileInfo():from( pPtr_OR_oObj_of_type_QFileInfo ) * QFileInfo():configure( pPtr_OR_oObj_of_type_QFileInfo ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qiodevice.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qiodevice.txt index 221317b7d6..5771833c20 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qiodevice.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qiodevice.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QIODevice():new( ... ) + * QIODevice( ... ) * QIODevice():from( pPtr_OR_oObj_of_type_QIODevice ) * QIODevice():configure( pPtr_OR_oObj_of_type_QIODevice ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qlatin1char.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qlatin1char.txt index fa13ca14d8..0ab9e86e8a 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qlatin1char.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qlatin1char.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QLatin1Char():new( ... ) + * QLatin1Char( ... ) * QLatin1Char():from( pPtr_OR_oObj_of_type_QLatin1Char ) * QLatin1Char():configure( pPtr_OR_oObj_of_type_QLatin1Char ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qlatin1string.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qlatin1string.txt index 73b2811ba1..b9efd61578 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qlatin1string.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qlatin1string.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QLatin1String():new( ... ) + * QLatin1String( ... ) * QLatin1String():from( pPtr_OR_oObj_of_type_QLatin1String ) * QLatin1String():configure( pPtr_OR_oObj_of_type_QLatin1String ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qline.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qline.txt index 73dbdbef98..172ebbacb1 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qline.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qline.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QLine():new( ... ) + * QLine( ... ) * QLine():from( pPtr_OR_oObj_of_type_QLine ) * QLine():configure( pPtr_OR_oObj_of_type_QLine ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qlinef.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qlinef.txt index 368deb70e7..01753df90a 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qlinef.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qlinef.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QLineF():new( ... ) + * QLineF( ... ) * QLineF():from( pPtr_OR_oObj_of_type_QLineF ) * QLineF():configure( pPtr_OR_oObj_of_type_QLineF ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qlist.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qlist.txt index af9deae7d7..76f0aa01f6 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qlist.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qlist.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QList():new( ... ) + * QList( ... ) * QList():from( pPtr_OR_oObj_of_type_QList ) * QList():configure( pPtr_OR_oObj_of_type_QList ) * $ARGUMENTS$ @@ -29,21 +29,17 @@ * :append( xValue ) -> NIL * :at( nI ) -> pT * :back() -> pT - * :back_1() -> pT * :clear() -> NIL * :count( xValue ) -> nInt * :count_1() -> nInt * :empty() -> lBool * :endsWith( xValue ) -> lBool * :first() -> pT - * :first_1() -> pT * :front() -> pT - * :front_1() -> pT * :indexOf( xValue, nFrom ) -> nInt * :insert( nI, xValue ) -> NIL * :isEmpty() -> lBool * :last() -> pT - * :last_1() -> pT * :lastIndexOf( xValue, nFrom ) -> nInt * :length() -> nInt * :move( nFrom, nTo ) -> NIL diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qlocale.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qlocale.txt index 0d66be03d4..13b2c5bbe2 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qlocale.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qlocale.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QLocale():new( ... ) + * QLocale( ... ) * QLocale():from( pPtr_OR_oObj_of_type_QLocale ) * QLocale():configure( pPtr_OR_oObj_of_type_QLocale ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qmimedata.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qmimedata.txt index 690addf096..1acbe71fa8 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qmimedata.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qmimedata.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QMimeData():new( ... ) + * QMimeData( ... ) * QMimeData():from( pPtr_OR_oObj_of_type_QMimeData ) * QMimeData():configure( pPtr_OR_oObj_of_type_QMimeData ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qmodelindex.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qmodelindex.txt index c060c88740..b5fccbb4b1 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qmodelindex.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qmodelindex.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QModelIndex():new( ... ) + * QModelIndex( ... ) * QModelIndex():from( pPtr_OR_oObj_of_type_QModelIndex ) * QModelIndex():configure( pPtr_OR_oObj_of_type_QModelIndex ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qobject.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qobject.txt index e516f0e981..6bf395b273 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qobject.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qobject.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QObject():new( ... ) + * QObject( ... ) * QObject():from( pPtr_OR_oObj_of_type_QObject ) * QObject():configure( pPtr_OR_oObj_of_type_QObject ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qpoint.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qpoint.txt index fa8c8fa06e..62c65f2816 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qpoint.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qpoint.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPoint():new( ... ) + * QPoint( ... ) * QPoint():from( pPtr_OR_oObj_of_type_QPoint ) * QPoint():configure( pPtr_OR_oObj_of_type_QPoint ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qpointf.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qpointf.txt index 6abb214cb7..2a754899bb 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qpointf.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qpointf.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPointF():new( ... ) + * QPointF( ... ) * QPointF():from( pPtr_OR_oObj_of_type_QPointF ) * QPointF():configure( pPtr_OR_oObj_of_type_QPointF ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qprocess.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qprocess.txt index 32f7b6e4d8..3dfea9a502 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qprocess.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qprocess.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QIODevice * $SYNTAX$ - * QProcess():new( ... ) + * QProcess( ... ) * QProcess():from( pPtr_OR_oObj_of_type_QProcess ) * QProcess():configure( pPtr_OR_oObj_of_type_QProcess ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qrect.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qrect.txt index 0af8473f91..0dffcb9839 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qrect.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qrect.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QRect():new( ... ) + * QRect( ... ) * QRect():from( pPtr_OR_oObj_of_type_QRect ) * QRect():configure( pPtr_OR_oObj_of_type_QRect ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qrectf.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qrectf.txt index 7b361b12fd..66ff33628e 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qrectf.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qrectf.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QRectF():new( ... ) + * QRectF( ... ) * QRectF():from( pPtr_OR_oObj_of_type_QRectF ) * QRectF():configure( pPtr_OR_oObj_of_type_QRectF ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qregexp.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qregexp.txt index 5e046479ef..57100388b6 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qregexp.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qregexp.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QRegExp():new( ... ) + * QRegExp( ... ) * QRegExp():from( pPtr_OR_oObj_of_type_QRegExp ) * QRegExp():configure( pPtr_OR_oObj_of_type_QRegExp ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qresource.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qresource.txt index e43995b38a..4d8aea9b1a 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qresource.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qresource.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QResource():new( ... ) + * QResource( ... ) * QResource():from( pPtr_OR_oObj_of_type_QResource ) * QResource():configure( pPtr_OR_oObj_of_type_QResource ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qsettings.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qsettings.txt index f458de7efe..bff1772dee 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qsettings.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qsettings.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QSettings():new( ... ) + * QSettings( ... ) * QSettings():from( pPtr_OR_oObj_of_type_QSettings ) * QSettings():configure( pPtr_OR_oObj_of_type_QSettings ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qsignalmapper.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qsignalmapper.txt index 945720fd24..092b868505 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qsignalmapper.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qsignalmapper.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QSignalMapper():new( ... ) + * QSignalMapper( ... ) * QSignalMapper():from( pPtr_OR_oObj_of_type_QSignalMapper ) * QSignalMapper():configure( pPtr_OR_oObj_of_type_QSignalMapper ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qsize.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qsize.txt index 86176d7c28..e63e27cd8e 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qsize.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qsize.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QSize():new( ... ) + * QSize( ... ) * QSize():from( pPtr_OR_oObj_of_type_QSize ) * QSize():configure( pPtr_OR_oObj_of_type_QSize ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qsizef.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qsizef.txt index 2a43d0d879..05d5862cd8 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qsizef.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qsizef.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QSizeF():new( ... ) + * QSizeF( ... ) * QSizeF():from( pPtr_OR_oObj_of_type_QSizeF ) * QSizeF():configure( pPtr_OR_oObj_of_type_QSizeF ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qstringlist.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qstringlist.txt index f4b898de7a..f99b201d7c 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qstringlist.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qstringlist.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QList * $SYNTAX$ - * QStringList():new( ... ) + * QStringList( ... ) * QStringList():from( pPtr_OR_oObj_of_type_QStringList ) * QStringList():configure( pPtr_OR_oObj_of_type_QStringList ) * $ARGUMENTS$ @@ -41,12 +41,9 @@ * :count( cValue ) -> nInt * :endsWith( cValue ) -> lBool * :first() -> cQString - * :first_1() -> cQString * :front() -> cQString - * :front_1() -> cQString * :insert( nI, cValue ) -> NIL * :last() -> cQString - * :last_1() -> cQString * :mid( nPos, nLength ) -> pQList * :prepend( cValue ) -> NIL * :push_back( cValue ) -> NIL diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qtextboundaryfinder.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qtextboundaryfinder.txt index 1a2ff20887..baf70f6c54 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qtextboundaryfinder.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qtextboundaryfinder.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextBoundaryFinder():new( ... ) + * QTextBoundaryFinder( ... ) * QTextBoundaryFinder():from( pPtr_OR_oObj_of_type_QTextBoundaryFinder ) * QTextBoundaryFinder():configure( pPtr_OR_oObj_of_type_QTextBoundaryFinder ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qtextcodec.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qtextcodec.txt index e8eecdd31f..3c2955c1c4 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qtextcodec.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qtextcodec.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextCodec():new( ... ) + * QTextCodec( ... ) * QTextCodec():from( pPtr_OR_oObj_of_type_QTextCodec ) * QTextCodec():configure( pPtr_OR_oObj_of_type_QTextCodec ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qtextdecoder.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qtextdecoder.txt index aefef85ba4..94bfb65a1e 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qtextdecoder.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qtextdecoder.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextDecoder():new( ... ) + * QTextDecoder( ... ) * QTextDecoder():from( pPtr_OR_oObj_of_type_QTextDecoder ) * QTextDecoder():configure( pPtr_OR_oObj_of_type_QTextDecoder ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qtextencoder.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qtextencoder.txt index 405b0fe86d..e12f0dfeeb 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qtextencoder.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qtextencoder.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextEncoder():new( ... ) + * QTextEncoder( ... ) * QTextEncoder():from( pPtr_OR_oObj_of_type_QTextEncoder ) * QTextEncoder():configure( pPtr_OR_oObj_of_type_QTextEncoder ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qtextstream.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qtextstream.txt index 368a722fde..ca67e03fc4 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qtextstream.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qtextstream.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextStream():new( ... ) + * QTextStream( ... ) * QTextStream():from( pPtr_OR_oObj_of_type_QTextStream ) * QTextStream():configure( pPtr_OR_oObj_of_type_QTextStream ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qthread.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qthread.txt index 35dcd7faa7..e55474126a 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qthread.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qthread.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QThread():new( ... ) + * QThread( ... ) * QThread():from( pPtr_OR_oObj_of_type_QThread ) * QThread():configure( pPtr_OR_oObj_of_type_QThread ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qtime.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qtime.txt index c46a8d3974..2bf964f92c 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qtime.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qtime.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTime():new( ... ) + * QTime( ... ) * QTime():from( pPtr_OR_oObj_of_type_QTime ) * QTime():configure( pPtr_OR_oObj_of_type_QTime ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qtimeline.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qtimeline.txt index 63683a7fb2..7ae47df968 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qtimeline.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qtimeline.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QTimeLine():new( ... ) + * QTimeLine( ... ) * QTimeLine():from( pPtr_OR_oObj_of_type_QTimeLine ) * QTimeLine():configure( pPtr_OR_oObj_of_type_QTimeLine ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qtimer.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qtimer.txt index f552a8ff3c..5208987f4c 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qtimer.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qtimer.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QTimer():new( ... ) + * QTimer( ... ) * QTimer():from( pPtr_OR_oObj_of_type_QTimer ) * QTimer():configure( pPtr_OR_oObj_of_type_QTimer ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qtranslator.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qtranslator.txt index dbf00ce96d..c813ea4319 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qtranslator.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qtranslator.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QTranslator():new( ... ) + * QTranslator( ... ) * QTranslator():from( pPtr_OR_oObj_of_type_QTranslator ) * QTranslator():configure( pPtr_OR_oObj_of_type_QTranslator ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qurl.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qurl.txt index b48533a2aa..29fd6f51fb 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qurl.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qurl.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QUrl():new( ... ) + * QUrl( ... ) * QUrl():from( pPtr_OR_oObj_of_type_QUrl ) * QUrl():configure( pPtr_OR_oObj_of_type_QUrl ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/doc/en/class_qvariant.txt b/harbour/contrib/hbqt/qtcore/doc/en/class_qvariant.txt index 997dac1cbf..1a075a2391 100644 --- a/harbour/contrib/hbqt/qtcore/doc/en/class_qvariant.txt +++ b/harbour/contrib/hbqt/qtcore/doc/en/class_qvariant.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QVariant():new( ... ) + * QVariant( ... ) * QVariant():from( pPtr_OR_oObj_of_type_QVariant ) * QVariant():configure( pPtr_OR_oObj_of_type_QVariant ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp b/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp index b82fd96661..f58c4d40b2 100644 --- a/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp +++ b/harbour/contrib/hbqt/qtcore/g/HBQEvents.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp b/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp index 77dfdd1041..5ab3f987bd 100644 --- a/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp +++ b/harbour/contrib/hbqt/qtcore/g/HBQSlots.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/HBQString.cpp b/harbour/contrib/hbqt/qtcore/g/HBQString.cpp index d8045d54f5..ffd5943076 100644 --- a/harbour/contrib/hbqt/qtcore/g/HBQString.cpp +++ b/harbour/contrib/hbqt/qtcore/g/HBQString.cpp @@ -78,14 +78,13 @@ */ /* - * Constructed[ 167/187 [ 89.30% ] ] + * Constructed[ 167/168 [ 99.40% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QVector toUcs4 () const * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * //iterator begin () * //const_iterator begin () const diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp index c49118ea75..24cef0669c 100644 --- a/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QAbstractItemModel.cpp @@ -66,15 +66,14 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 32/36 [ 88.89% ] ] + * Constructed[ 32/34 [ 94.12% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * virtual QMap itemData ( const QModelIndex & index ) const * virtual bool setItemData ( const QModelIndex & index, const QMap & roles ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // virtual QModelIndexList match ( const QModelIndex & start, int role, const QVariant & value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags( Qt::MatchStartsWith | Qt::MatchWrap ) ) const * // virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp index 0bb5a1e26b..a93af29bd6 100644 --- a/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QAbstractListModel.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 1/1 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp index 7f71c4bd4c..7a8dab5de7 100644 --- a/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QAbstractTableModel.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 1/1 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp b/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp index 930fabc9bc..8110de44ed 100644 --- a/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QBitArray.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 16/16 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp b/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp index e2ac98cef1..d02144fce4 100644 --- a/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QBuffer.cpp @@ -65,6 +65,15 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 5/5 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //const QByteArray & buffer () const + */ + #include #include @@ -162,18 +171,6 @@ HB_FUNC( QT_QBUFFER_BUFFER ) } } -/* - * const QByteArray & buffer () const - */ -HB_FUNC( QT_QBUFFER_BUFFER_1 ) -{ - QBuffer * p = hbqt_par_QBuffer( 1 ); - if( p ) - { - hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( ( p )->buffer() ), true ) ); - } -} - /* * const QByteArray & data () const */ diff --git a/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp b/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp index 383491dd89..7b4432ab55 100644 --- a/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QByteArray.cpp @@ -65,6 +65,17 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 98/98 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // bool contains ( const QByteArray & ba ) const + * // bool contains ( const char * str ) const + * // bool contains ( char ch ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QChar.cpp b/harbour/contrib/hbqt/qtcore/g/QChar.cpp index 77b85a6de3..c6630e3f70 100644 --- a/harbour/contrib/hbqt/qtcore/g/QChar.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QChar.cpp @@ -75,13 +75,16 @@ */ /* - * Constructed[ 33/35 [ 94.29% ] ] + * Constructed[ 32/34 [ 94.12% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * uchar cell () const * uchar row () const + * + * *** Commented out protostypes *** + * + * //ushort unicode () const */ #include @@ -522,18 +525,6 @@ HB_FUNC( QT_QCHAR_UNICODE ) } } -/* - * ushort unicode () const - */ -HB_FUNC( QT_QCHAR_UNICODE_1 ) -{ - QChar * p = hbqt_par_QChar( 1 ); - if( p ) - { - hb_retni( ( p )->unicode() ); - } -} - /* * UnicodeVersion unicodeVersion () const */ diff --git a/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp index a04a458027..0282257906 100644 --- a/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QCoreApplication.cpp @@ -69,6 +69,17 @@ * enum Encoding { CodecForTr, UnicodeUTF8, DefaultCodec } */ +/* + * Constructed[ 40/40 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // bool filterEvent ( void * message, long * result ) + * // EventFilter setEventFilter ( EventFilter filter ) + * // virtual bool winEventFilter ( MSG * msg, long * result ) + */ + #include #include "hbapi.h" diff --git a/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp b/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp index 1b2d4a93c0..0be57d5309 100644 --- a/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QDataStream.cpp @@ -71,6 +71,16 @@ * enum Version { Qt_1_0, Qt_2_0, Qt_2_1, Qt_3_0, ..., Qt_4_5 } */ +/* + * Constructed[ 13/13 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //QDataStream & readBytes ( char *& s, uint & l ) + * //QDataStream & writeBytes ( const char * s, uint len ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QDate.cpp b/harbour/contrib/hbqt/qtcore/g/QDate.cpp index d74e84cb56..a6f7c1dc15 100644 --- a/harbour/contrib/hbqt/qtcore/g/QDate.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QDate.cpp @@ -69,6 +69,11 @@ * enum MonthNameType { DateFormat, StandaloneFormat } */ +/* + * Constructed[ 19/19 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp b/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp index 498a135ddf..231546fc97 100644 --- a/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QDateTime.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 26/26 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QDir.cpp b/harbour/contrib/hbqt/qtcore/g/QDir.cpp index b9c5264217..50184eb8c5 100644 --- a/harbour/contrib/hbqt/qtcore/g/QDir.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QDir.cpp @@ -72,6 +72,17 @@ * flags SortFlags */ +/* + * Constructed[ 53/53 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // QFileInfoList entryInfoList ( const QStringList & nameFilters, Filters filters = NoFilter, SortFlags sort = NoSort ) const + * // QFileInfoList entryInfoList ( Filters filters = NoFilter, SortFlags sort = NoSort ) const + * // QFileInfoList drives () + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QEvent.cpp b/harbour/contrib/hbqt/qtcore/g/QEvent.cpp index 9c0de9e2c4..a4884cf80e 100644 --- a/harbour/contrib/hbqt/qtcore/g/QEvent.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QEvent.cpp @@ -69,6 +69,11 @@ * enum Type { None, AccessibilityDescription, AccessibilityHelp, AccessibilityPrepare, ..., MaxUser } */ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp b/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp index c37bf99193..3165e30d87 100644 --- a/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QEventLoop.cpp @@ -70,6 +70,11 @@ * flags ProcessEventsFlags */ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QFile.cpp b/harbour/contrib/hbqt/qtcore/g/QFile.cpp index 9bec8cf17d..224204294b 100644 --- a/harbour/contrib/hbqt/qtcore/g/QFile.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QFile.cpp @@ -74,6 +74,19 @@ * enum OpenModeFlag { NotOpen, ReadOnly, WriteOnly, ReadWrite, ..., Unbuffered } */ +/* + * Constructed[ 33/33 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // bool open ( FILE * fh, OpenMode mode ) + * // bool unmap ( uchar * address ) + * //QString decodeName ( const QByteArray & localFileName ) + * // void setDecodingFunction ( DecoderFn function ) + * // void setEncodingFunction ( EncoderFn function ) + */ + #include #include @@ -448,22 +461,10 @@ HB_FUNC( QT_QFILE_COPY_1 ) } } -/* - * QString decodeName ( const QByteArray & localFileName ) - */ -HB_FUNC( QT_QFILE_DECODENAME ) -{ - QFile * p = hbqt_par_QFile( 1 ); - if( p ) - { - hb_retstr_utf8( ( p )->decodeName( *hbqt_par_QByteArray( 2 ) ).toUtf8().data() ); - } -} - /* * QString decodeName ( const char * localFileName ) */ -HB_FUNC( QT_QFILE_DECODENAME_1 ) +HB_FUNC( QT_QFILE_DECODENAME ) { QFile * p = hbqt_par_QFile( 1 ); if( p ) diff --git a/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp b/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp index c215b6f217..b5baf30b85 100644 --- a/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QFileInfo.cpp @@ -69,6 +69,11 @@ * flags PermissionSpec */ +/* + * Constructed[ 44/44 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp b/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp index 90534f80d4..fef4928647 100644 --- a/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QIODevice.cpp @@ -70,6 +70,11 @@ * enum OpenModeFlag { NotOpen, ReadOnly, WriteOnly, ReadWrite, ..., Unbuffered } */ +/* + * Constructed[ 33/33 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp b/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp index 87bbb60b6d..b962c690fa 100644 --- a/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QLatin1Char.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp b/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp index 8bc9fa4fc8..9fa1fe8b9f 100644 --- a/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QLatin1String.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 1/1 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QLine.cpp b/harbour/contrib/hbqt/qtcore/g/QLine.cpp index 47f871caf8..4dd5b332f8 100644 --- a/harbour/contrib/hbqt/qtcore/g/QLine.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QLine.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 17/17 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QLineF.cpp b/harbour/contrib/hbqt/qtcore/g/QLineF.cpp index 4518ca2da4..87a368561a 100644 --- a/harbour/contrib/hbqt/qtcore/g/QLineF.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QLineF.cpp @@ -69,6 +69,11 @@ * enum IntersectType { NoIntersection, UnboundedIntersection, BoundedIntersection } */ +/* + * Constructed[ 27/27 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QList.cpp b/harbour/contrib/hbqt/qtcore/g/QList.cpp index ce06bdb309..3051ce38bc 100644 --- a/harbour/contrib/hbqt/qtcore/g/QList.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QList.cpp @@ -66,18 +66,18 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 40/55 [ 72.73% ] ] + * Constructed[ 36/40 [ 90.00% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void append ( const QList & value ) * QList mid ( int pos, int length = -1 ) const * QSet toSet () const * QVector toVector () const * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * + * //T & back () * //iterator begin () * //const_iterator begin () const * //const_iterator constBegin () const @@ -87,7 +87,10 @@ * //const_iterator end () const * //iterator erase ( iterator pos ) * //iterator erase ( iterator begin, iterator end ) + * //T & first () + * //T & front () * //iterator insert ( iterator before, const T & value ) + * //T & last () * //std::list toStdList () const */ @@ -190,22 +193,10 @@ HB_FUNC( QT_QLIST_AT ) } } -/* - * T & back () - */ -HB_FUNC( QT_QLIST_BACK ) -{ - QList< void *> * p = hbqt_par_QList( 1 ); - if( p ) - { - hb_retptr( ( p )->back() ); - } -} - /* * const T & back () const */ -HB_FUNC( QT_QLIST_BACK_1 ) +HB_FUNC( QT_QLIST_BACK ) { QList< void *> * p = hbqt_par_QList( 1 ); if( p ) @@ -275,7 +266,7 @@ HB_FUNC( QT_QLIST_ENDSWITH ) } /* - * T & first () + * const T & first () const */ HB_FUNC( QT_QLIST_FIRST ) { @@ -286,34 +277,10 @@ HB_FUNC( QT_QLIST_FIRST ) } } -/* - * const T & first () const - */ -HB_FUNC( QT_QLIST_FIRST_1 ) -{ - QList< void *> * p = hbqt_par_QList( 1 ); - if( p ) - { - hb_retptr( ( p )->first() ); - } -} - -/* - * T & front () - */ -HB_FUNC( QT_QLIST_FRONT ) -{ - QList< void *> * p = hbqt_par_QList( 1 ); - if( p ) - { - hb_retptr( ( p )->front() ); - } -} - /* * const T & front () const */ -HB_FUNC( QT_QLIST_FRONT_1 ) +HB_FUNC( QT_QLIST_FRONT ) { QList< void *> * p = hbqt_par_QList( 1 ); if( p ) @@ -358,22 +325,10 @@ HB_FUNC( QT_QLIST_ISEMPTY ) } } -/* - * T & last () - */ -HB_FUNC( QT_QLIST_LAST ) -{ - QList< void *> * p = hbqt_par_QList( 1 ); - if( p ) - { - hb_retptr( ( p )->last() ); - } -} - /* * const T & last () const */ -HB_FUNC( QT_QLIST_LAST_1 ) +HB_FUNC( QT_QLIST_LAST ) { QList< void *> * p = hbqt_par_QList( 1 ); if( p ) diff --git a/harbour/contrib/hbqt/qtcore/g/QLocale.cpp b/harbour/contrib/hbqt/qtcore/g/QLocale.cpp index b391045095..af151fd6cc 100644 --- a/harbour/contrib/hbqt/qtcore/g/QLocale.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QLocale.cpp @@ -74,6 +74,15 @@ * flags NumberOptions */ +/* + * Constructed[ 55/55 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //QList countriesForLanguage ( Language language ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp b/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp index 648362f425..f7d84b3462 100644 --- a/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QMimeData.cpp @@ -66,13 +66,11 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 21/23 [ 91.30% ] ] + * Constructed[ 21/22 [ 95.45% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void setUrls ( const QList & urls ) - * } */ #include diff --git a/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp b/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp index cd62533abd..5055824c96 100644 --- a/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QModelIndex.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 11/11 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QObject.cpp b/harbour/contrib/hbqt/qtcore/g/QObject.cpp index c4449f1cb5..0986a9d873 100644 --- a/harbour/contrib/hbqt/qtcore/g/QObject.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QObject.cpp @@ -66,14 +66,13 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 24/35 [ 68.57% ] ] + * Constructed[ 24/25 [ 96.00% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * const QMetaObject staticMetaObject * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // const QObjectList & children () const * // bool connect ( const QObject * sender, const char * signal, const char * method, Qt::ConnectionType type = Qt::AutoConnection ) const diff --git a/harbour/contrib/hbqt/qtcore/g/QPoint.cpp b/harbour/contrib/hbqt/qtcore/g/QPoint.cpp index 68a4f4a7ec..1190655f9d 100644 --- a/harbour/contrib/hbqt/qtcore/g/QPoint.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QPoint.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QPointF.cpp b/harbour/contrib/hbqt/qtcore/g/QPointF.cpp index d5e7b76538..13ee3dd354 100644 --- a/harbour/contrib/hbqt/qtcore/g/QPointF.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QPointF.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QProcess.cpp b/harbour/contrib/hbqt/qtcore/g/QProcess.cpp index e0381e0638..a6fc3652f9 100644 --- a/harbour/contrib/hbqt/qtcore/g/QProcess.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QProcess.cpp @@ -76,6 +76,15 @@ * enum ProcessState { NotRunning, Starting, Running } */ +/* + * Constructed[ 33/33 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // Q_PID pid () const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QRect.cpp b/harbour/contrib/hbqt/qtcore/g/QRect.cpp index e9ecd97d2d..512a8151d2 100644 --- a/harbour/contrib/hbqt/qtcore/g/QRect.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QRect.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 59/59 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QRectF.cpp b/harbour/contrib/hbqt/qtcore/g/QRectF.cpp index ea44cde8bc..85044c4e7d 100644 --- a/harbour/contrib/hbqt/qtcore/g/QRectF.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QRectF.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 60/60 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp b/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp index 2448c72fc8..c02f01d436 100644 --- a/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QRegExp.cpp @@ -70,6 +70,11 @@ * enum PatternSyntax { RegExp, RegExp2, Wildcard, FixedString } */ +/* + * Constructed[ 19/19 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QResource.cpp b/harbour/contrib/hbqt/qtcore/g/QResource.cpp index c906c4028c..7c0d628a1d 100644 --- a/harbour/contrib/hbqt/qtcore/g/QResource.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QResource.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QSettings.cpp b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp index b9143f7471..e80828eec4 100644 --- a/harbour/contrib/hbqt/qtcore/g/QSettings.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QSettings.cpp @@ -71,6 +71,15 @@ * enum Status { NoError, AccessError, FormatError } */ +/* + * Constructed[ 31/31 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //Format registerFormat ( const QString & extension, ReadFunc readFunc, WriteFunc writeFunc, Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp b/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp index 0bde60d9f1..2b812e6638 100644 --- a/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QSignalMapper.cpp @@ -65,6 +65,16 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // QObject * mapping ( QWidget * widget ) const + * // void setMapping ( QObject * sender, QWidget * widget ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QSize.cpp b/harbour/contrib/hbqt/qtcore/g/QSize.cpp index d4475330eb..4676cdca25 100644 --- a/harbour/contrib/hbqt/qtcore/g/QSize.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QSize.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp b/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp index 7ff8d62e67..c801fbf07a 100644 --- a/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QSizeF.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 15/15 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QStringList.cpp b/harbour/contrib/hbqt/qtcore/g/QStringList.cpp index 976f2f081e..2b76b024a5 100644 --- a/harbour/contrib/hbqt/qtcore/g/QStringList.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QStringList.cpp @@ -66,20 +66,22 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 36/42 [ 85.71% ] ] + * Constructed[ 33/36 [ 91.67% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QSet toSet () const * std::list toStdList () const * QVector toVector () const * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // bool contains ( const QString & str, Qt::CaseSensitivity cs = Qt::CaseSensitive ) const * // QStringList & replaceInStrings ( const QString & before, const QString & after, Qt::CaseSensitivity cs = Qt::CaseSensitive ) * // QStringList & replaceInStrings ( const QRegExp & rx, const QString & after ) + * //QString & first () + * //QString & front () + * //QString & last () */ #include @@ -364,7 +366,7 @@ HB_FUNC( QT_QSTRINGLIST_ENDSWITH ) } /* - * QString & first () + * const QString & first () const */ HB_FUNC( QT_QSTRINGLIST_FIRST ) { @@ -375,34 +377,10 @@ HB_FUNC( QT_QSTRINGLIST_FIRST ) } } -/* - * const QString & first () const - */ -HB_FUNC( QT_QSTRINGLIST_FIRST_1 ) -{ - QStringList * p = hbqt_par_QStringList( 1 ); - if( p ) - { - hb_retstr_utf8( ( p )->first().toUtf8().data() ); - } -} - -/* - * QString & front () - */ -HB_FUNC( QT_QSTRINGLIST_FRONT ) -{ - QStringList * p = hbqt_par_QStringList( 1 ); - if( p ) - { - hb_retstr_utf8( ( p )->front().toUtf8().data() ); - } -} - /* * const QString & front () const */ -HB_FUNC( QT_QSTRINGLIST_FRONT_1 ) +HB_FUNC( QT_QSTRINGLIST_FRONT ) { QStringList * p = hbqt_par_QStringList( 1 ); if( p ) @@ -425,22 +403,10 @@ HB_FUNC( QT_QSTRINGLIST_INSERT ) } } -/* - * QString & last () - */ -HB_FUNC( QT_QSTRINGLIST_LAST ) -{ - QStringList * p = hbqt_par_QStringList( 1 ); - if( p ) - { - hb_retstr_utf8( ( p )->last().toUtf8().data() ); - } -} - /* * const QString & last () const */ -HB_FUNC( QT_QSTRINGLIST_LAST_1 ) +HB_FUNC( QT_QSTRINGLIST_LAST ) { QStringList * p = hbqt_par_QStringList( 1 ); if( p ) diff --git a/harbour/contrib/hbqt/qtcore/g/QStringRef.cpp b/harbour/contrib/hbqt/qtcore/g/QStringRef.cpp index 3fca4a76db..e6e8099cd3 100644 --- a/harbour/contrib/hbqt/qtcore/g/QStringRef.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QStringRef.cpp @@ -65,6 +65,19 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 19/19 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //QStringRef appendTo ( QString * string ) const + * //int compare ( QLatin1String other, Qt::CaseSensitivity cs = Qt::CaseSensitive ) const + * //const QString * string () const + * //QString toString () const + * //int compare ( const QStringRef & s1, QLatin1String s2, Qt::CaseSensitivity cs = Qt::CaseSensitive ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp index 297c09cd73..bb6bb67fbc 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTextBoundaryFinder.cpp @@ -71,6 +71,11 @@ * enum BoundaryType { Grapheme, Word, Line, Sentence } */ +/* + * Constructed[ 11/11 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp b/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp index 05a3b6bb2f..a50079142e 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTextCodec.cpp @@ -70,6 +70,16 @@ * flags ConversionFlags */ +/* + * Constructed[ 21/21 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //QByteArray fromUnicode ( const QChar * input, int number, ConverterState * state = 0 ) const + * // QString toUnicode ( const char * input, int size, ConverterState * state = 0 ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp index 9f88638b64..33d706b5d7 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTextDecoder.cpp @@ -65,6 +65,16 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 1/1 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //void toUnicode ( QString * target, const char * chars, int len ) + * //QString toUnicode ( const QByteArray & ba ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp b/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp index e8179744e7..925a99aac9 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTextEncoder.cpp @@ -65,6 +65,15 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //QByteArray fromUnicode ( const QString & uc, int & lenInOut ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp b/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp index ef943ceb85..e193b1abd7 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTextStream.cpp @@ -73,6 +73,16 @@ * enum Status { Ok, ReadPastEnd, ReadCorruptData } */ +/* + * Constructed[ 37/37 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //void setString ( QString * string, QIODevice::OpenMode openMode = QIODevice::ReadWrite ) + * //QString * string () const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QThread.cpp b/harbour/contrib/hbqt/qtcore/g/QThread.cpp index 4c535828dc..3536bcb15e 100644 --- a/harbour/contrib/hbqt/qtcore/g/QThread.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QThread.cpp @@ -69,6 +69,15 @@ * enum Priority { IdlePriority, LowestPriority, LowPriority, NormalPriority, ..., InheritPriority } */ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // Qt::HANDLE currentThreadId () + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QTime.cpp b/harbour/contrib/hbqt/qtcore/g/QTime.cpp index 963b3bdb64..a33078ca8a 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTime.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTime.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 20/20 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp b/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp index ebab8c74d0..51041404ca 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTimeLine.cpp @@ -71,6 +71,11 @@ * enum State { NotRunning, Paused, Running } */ +/* + * Constructed[ 27/27 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QTimer.cpp b/harbour/contrib/hbqt/qtcore/g/QTimer.cpp index 0445e60881..c5b7a842bb 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTimer.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTimer.cpp @@ -65,6 +65,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 10/10 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp b/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp index eb63ee2192..e536810963 100644 --- a/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QTranslator.cpp @@ -65,6 +65,15 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // bool load ( const uchar * data, int len ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtcore/g/QUrl.cpp b/harbour/contrib/hbqt/qtcore/g/QUrl.cpp index a16de1e352..4e06f01716 100644 --- a/harbour/contrib/hbqt/qtcore/g/QUrl.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QUrl.cpp @@ -72,17 +72,16 @@ */ /* - * Constructed[ 70/75 [ 93.33% ] ] + * Constructed[ 70/74 [ 94.59% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QList > encodedQueryItems () const * QList > queryItems () const * void setEncodedQueryItems ( const QList > & query ) * void setQueryItems ( const QList > & query ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * //void setQueryDelimiters ( char valueDelimiter, char pairDelimiter ) */ diff --git a/harbour/contrib/hbqt/qtcore/g/QVariant.cpp b/harbour/contrib/hbqt/qtcore/g/QVariant.cpp index a6e5538887..43811b7f4c 100644 --- a/harbour/contrib/hbqt/qtcore/g/QVariant.cpp +++ b/harbour/contrib/hbqt/qtcore/g/QVariant.cpp @@ -70,15 +70,14 @@ */ /* - * Constructed[ 38/42 [ 90.48% ] ] + * Constructed[ 38/40 [ 95.00% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QHash toHash () const * QMap toMap () const * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * //const char * typeName () const * //T value () const diff --git a/harbour/contrib/hbqt/qtcore/g/TQBitArray.prg b/harbour/contrib/hbqt/qtcore/g/TQBitArray.prg index 7ce3d57801..bef1293643 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQBitArray.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQBitArray.prg @@ -74,15 +74,12 @@ CREATE CLASS QBitArray INHERIT HbQtObjectHandler FUNCTION HB_QBitArray METHOD at( nI ) METHOD clear() METHOD clearBit( nI ) - METHOD count() - METHOD count_1( lOn ) - METHOD fill( lValue, nSize ) - METHOD fill_1( lValue, nBegin, nEnd ) + METHOD count( ... ) + METHOD fill( ... ) METHOD isEmpty() METHOD isNull() METHOD resize( nSize ) - METHOD setBit( nI ) - METHOD setBit_1( nI, lValue ) + METHOD setBit( ... ) METHOD size() METHOD testBit( nI ) METHOD toggleBit( nI ) @@ -112,20 +109,61 @@ METHOD QBitArray:clearBit( nI ) RETURN Qt_QBitArray_clearBit( ::pPtr, nI ) -METHOD QBitArray:count() - RETURN Qt_QBitArray_count( ::pPtr ) +METHOD QBitArray:count( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "L" + // int count ( bool on ) const + // L l bool + RETURN Qt_QBitArray_count_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // int count () const + RETURN Qt_QBitArray_count( ::pPtr, ... ) + ENDCASE + RETURN NIL -METHOD QBitArray:count_1( lOn ) - RETURN Qt_QBitArray_count_1( ::pPtr, lOn ) - - -METHOD QBitArray:fill( lValue, nSize ) - RETURN Qt_QBitArray_fill( ::pPtr, lValue, nSize ) - - -METHOD QBitArray:fill_1( lValue, nBegin, nEnd ) - RETURN Qt_QBitArray_fill_1( ::pPtr, lValue, nBegin, nEnd ) +METHOD QBitArray:fill( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "L" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void fill ( bool value, int begin, int end ) + // L l bool, N n int, N n int + RETURN Qt_QBitArray_fill_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "L" .AND. aV[ 2 ] $ "N" + // bool fill ( bool value, int size = -1 ) + // L l bool, N n int + RETURN Qt_QBitArray_fill( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "L" + // bool fill ( bool value, int size = -1 ) + // L l bool, N n int + RETURN Qt_QBitArray_fill( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QBitArray:isEmpty() @@ -140,12 +178,31 @@ METHOD QBitArray:resize( nSize ) RETURN Qt_QBitArray_resize( ::pPtr, nSize ) -METHOD QBitArray:setBit( nI ) - RETURN Qt_QBitArray_setBit( ::pPtr, nI ) - - -METHOD QBitArray:setBit_1( nI, lValue ) - RETURN Qt_QBitArray_setBit_1( ::pPtr, nI, lValue ) +METHOD QBitArray:setBit( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "L" + // void setBit ( int i, bool value ) + // N n int, L l bool + RETURN Qt_QBitArray_setBit_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setBit ( int i ) + // N n int + RETURN Qt_QBitArray_setBit( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QBitArray:size() diff --git a/harbour/contrib/hbqt/qtcore/g/TQBuffer.prg b/harbour/contrib/hbqt/qtcore/g/TQBuffer.prg index 0c769e8740..219ed93f7c 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQBuffer.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQBuffer.prg @@ -72,11 +72,9 @@ CREATE CLASS QBuffer INHERIT HbQtObjectHandler, HB_QIODevice FUNCTION HB_QBuffer METHOD new( ... ) METHOD buffer() - METHOD buffer_1() METHOD data() METHOD setBuffer( pByteArray ) - METHOD setData( pData, nSize ) - METHOD setData_1( pData ) + METHOD setData( ... ) ENDCLASS @@ -94,10 +92,6 @@ METHOD QBuffer:buffer() RETURN Qt_QBuffer_buffer( ::pPtr ) -METHOD QBuffer:buffer_1() - RETURN Qt_QBuffer_buffer_1( ::pPtr ) - - METHOD QBuffer:data() RETURN Qt_QBuffer_data( ::pPtr ) @@ -106,10 +100,29 @@ METHOD QBuffer:setBuffer( pByteArray ) RETURN Qt_QBuffer_setBuffer( ::pPtr, hbqt_ptr( pByteArray ) ) -METHOD QBuffer:setData( pData, nSize ) - RETURN Qt_QBuffer_setData( ::pPtr, hbqt_ptr( pData ), nSize ) - - -METHOD QBuffer:setData_1( pData ) - RETURN Qt_QBuffer_setData_1( ::pPtr, hbqt_ptr( pData ) ) +METHOD QBuffer:setData( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void setData ( const char * data, int size ) + // PO p char, N n int + RETURN Qt_QBuffer_setData( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setData ( const QByteArray & data ) + // PO p QByteArray + RETURN Qt_QBuffer_setData_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtcore/g/TQChar.prg b/harbour/contrib/hbqt/qtcore/g/TQChar.prg index 1cfff21bb1..240e75c887 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQChar.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQChar.prg @@ -102,7 +102,6 @@ CREATE CLASS QChar INHERIT HbQtObjectHandler FUNCTION HB_QChar METHOD toTitleCase() METHOD toUpper() METHOD unicode() - METHOD unicode_1() METHOD unicodeVersion() ENDCLASS @@ -241,10 +240,6 @@ METHOD QChar:unicode() RETURN Qt_QChar_unicode( ::pPtr ) -METHOD QChar:unicode_1() - RETURN Qt_QChar_unicode_1( ::pPtr ) - - METHOD QChar:unicodeVersion() RETURN Qt_QChar_unicodeVersion( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtcore/g/TQCoreApplication.prg b/harbour/contrib/hbqt/qtcore/g/TQCoreApplication.prg index fef7301cee..7640f2a67a 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQCoreApplication.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQCoreApplication.prg @@ -89,17 +89,13 @@ CREATE CLASS QCoreApplication INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_ METHOD libraryPaths() METHOD organizationDomain() METHOD organizationName() - METHOD postEvent( pReceiver, pEvent ) - METHOD postEvent_1( pReceiver, pEvent, nPriority ) - METHOD processEvents( nFlags ) - METHOD processEvents_1( nFlags, nMaxtime ) + METHOD postEvent( ... ) + METHOD processEvents( ... ) METHOD removeLibraryPath( cPath ) - METHOD removePostedEvents( pReceiver ) - METHOD removePostedEvents_1( pReceiver, nEventType ) + METHOD removePostedEvents( ... ) METHOD removeTranslator( pTranslationFile ) METHOD sendEvent( pReceiver, pEvent ) - METHOD sendPostedEvents( pReceiver, nEvent_type ) - METHOD sendPostedEvents_1() + METHOD sendPostedEvents( ... ) METHOD setApplicationName( cApplication ) METHOD setApplicationVersion( cVersion ) METHOD setAttribute( nAttribute, lOn ) @@ -108,8 +104,7 @@ CREATE CLASS QCoreApplication INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_ METHOD setOrganizationName( cOrgName ) METHOD startingUp() METHOD testAttribute( nAttribute ) - METHOD translate( pContext, pSourceText, pDisambiguation, nEncoding, nN ) - METHOD translate_1( pContext, pSourceText, pDisambiguation, nEncoding ) + METHOD translate( ... ) METHOD quit() ENDCLASS @@ -196,32 +191,93 @@ METHOD QCoreApplication:organizationName() RETURN Qt_QCoreApplication_organizationName( ::pPtr ) -METHOD QCoreApplication:postEvent( pReceiver, pEvent ) - RETURN Qt_QCoreApplication_postEvent( ::pPtr, hbqt_ptr( pReceiver ), hbqt_ptr( pEvent ) ) +METHOD QCoreApplication:postEvent( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // void postEvent ( QObject * receiver, QEvent * event, int priority ) + // PO p QObject, PO p QEvent, N n int + RETURN Qt_QCoreApplication_postEvent_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // void postEvent ( QObject * receiver, QEvent * event ) + // PO p QObject, PO p QEvent + RETURN Qt_QCoreApplication_postEvent( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QCoreApplication:postEvent_1( pReceiver, pEvent, nPriority ) - RETURN Qt_QCoreApplication_postEvent_1( ::pPtr, hbqt_ptr( pReceiver ), hbqt_ptr( pEvent ), nPriority ) - - -METHOD QCoreApplication:processEvents( nFlags ) - RETURN Qt_QCoreApplication_processEvents( ::pPtr, nFlags ) - - -METHOD QCoreApplication:processEvents_1( nFlags, nMaxtime ) - RETURN Qt_QCoreApplication_processEvents_1( ::pPtr, nFlags, nMaxtime ) +METHOD QCoreApplication:processEvents( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void processEvents ( QEventLoop::ProcessEventsFlags flags, int maxtime ) + // N n QEventLoop::ProcessEventsFlags, N n int + RETURN Qt_QCoreApplication_processEvents_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void processEvents ( QEventLoop::ProcessEventsFlags flags = QEventLoop::AllEvents ) + // N n QEventLoop::ProcessEventsFlags + RETURN Qt_QCoreApplication_processEvents( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void processEvents ( QEventLoop::ProcessEventsFlags flags = QEventLoop::AllEvents ) + // N n QEventLoop::ProcessEventsFlags + RETURN Qt_QCoreApplication_processEvents( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QCoreApplication:removeLibraryPath( cPath ) RETURN Qt_QCoreApplication_removeLibraryPath( ::pPtr, cPath ) -METHOD QCoreApplication:removePostedEvents( pReceiver ) - RETURN Qt_QCoreApplication_removePostedEvents( ::pPtr, hbqt_ptr( pReceiver ) ) - - -METHOD QCoreApplication:removePostedEvents_1( pReceiver, nEventType ) - RETURN Qt_QCoreApplication_removePostedEvents_1( ::pPtr, hbqt_ptr( pReceiver ), nEventType ) +METHOD QCoreApplication:removePostedEvents( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void removePostedEvents ( QObject * receiver, int eventType ) + // PO p QObject, N n int + RETURN Qt_QCoreApplication_removePostedEvents_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void removePostedEvents ( QObject * receiver ) + // PO p QObject + RETURN Qt_QCoreApplication_removePostedEvents( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QCoreApplication:removeTranslator( pTranslationFile ) @@ -232,12 +288,27 @@ METHOD QCoreApplication:sendEvent( pReceiver, pEvent ) RETURN Qt_QCoreApplication_sendEvent( ::pPtr, hbqt_ptr( pReceiver ), hbqt_ptr( pEvent ) ) -METHOD QCoreApplication:sendPostedEvents( pReceiver, nEvent_type ) - RETURN Qt_QCoreApplication_sendPostedEvents( ::pPtr, hbqt_ptr( pReceiver ), nEvent_type ) - - -METHOD QCoreApplication:sendPostedEvents_1() - RETURN Qt_QCoreApplication_sendPostedEvents_1( ::pPtr ) +METHOD QCoreApplication:sendPostedEvents( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void sendPostedEvents ( QObject * receiver, int event_type ) + // PO p QObject, N n int + RETURN Qt_QCoreApplication_sendPostedEvents( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void sendPostedEvents () + RETURN Qt_QCoreApplication_sendPostedEvents_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QCoreApplication:setApplicationName( cApplication ) @@ -272,12 +343,38 @@ METHOD QCoreApplication:testAttribute( nAttribute ) RETURN Qt_QCoreApplication_testAttribute( ::pPtr, nAttribute ) -METHOD QCoreApplication:translate( pContext, pSourceText, pDisambiguation, nEncoding, nN ) - RETURN Qt_QCoreApplication_translate( ::pPtr, hbqt_ptr( pContext ), hbqt_ptr( pSourceText ), hbqt_ptr( pDisambiguation ), nEncoding, nN ) - - -METHOD QCoreApplication:translate_1( pContext, pSourceText, pDisambiguation, nEncoding ) - RETURN Qt_QCoreApplication_translate_1( ::pPtr, hbqt_ptr( pContext ), hbqt_ptr( pSourceText ), hbqt_ptr( pDisambiguation ), nEncoding ) +METHOD QCoreApplication:translate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // QString translate ( const char * context, const char * sourceText, const char * disambiguation, Encoding encoding, int n ) + // PO p char, PO p char, PO p char, N n QCoreApplication::Encoding, N n int + RETURN Qt_QCoreApplication_translate( ::pPtr, ... ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" .AND. aV[ 4 ] $ "N" + // QString translate ( const char * context, const char * sourceText, const char * disambiguation = 0, Encoding encoding = CodecForTr ) + // PO p char, PO p char, PO p char, N n QCoreApplication::Encoding + RETURN Qt_QCoreApplication_translate_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // QString translate ( const char * context, const char * sourceText, const char * disambiguation = 0, Encoding encoding = CodecForTr ) + // PO p char, PO p char, PO p char, N n QCoreApplication::Encoding + RETURN Qt_QCoreApplication_translate_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QCoreApplication:quit() diff --git a/harbour/contrib/hbqt/qtcore/g/TQDate.prg b/harbour/contrib/hbqt/qtcore/g/TQDate.prg index 173a1643b2..a4fe29e373 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQDate.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQDate.prg @@ -86,8 +86,7 @@ CREATE CLASS QDate INHERIT HbQtObjectHandler FUNCTION HB_QDate METHOD month() METHOD setDate( nYear, nMonth, nDay ) METHOD toJulianDay() - METHOD toString( cFormat ) - METHOD toString_1( nFormat ) + METHOD toString( ... ) METHOD weekNumber( nYearNumber ) METHOD year() @@ -163,12 +162,32 @@ METHOD QDate:toJulianDay() RETURN Qt_QDate_toJulianDay( ::pPtr ) -METHOD QDate:toString( cFormat ) - RETURN Qt_QDate_toString( ::pPtr, cFormat ) - - -METHOD QDate:toString_1( nFormat ) - RETURN Qt_QDate_toString_1( ::pPtr, nFormat ) +METHOD QDate:toString( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QString toString ( const QString & format ) const + // C c QString + RETURN Qt_QDate_toString( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" + // QString toString ( Qt::DateFormat format = Qt::TextDate ) const + // N n Qt::DateFormat + RETURN Qt_QDate_toString_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // QString toString ( Qt::DateFormat format = Qt::TextDate ) const + // N n Qt::DateFormat + RETURN Qt_QDate_toString_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QDate:weekNumber( nYearNumber ) diff --git a/harbour/contrib/hbqt/qtcore/g/TQDateTime.prg b/harbour/contrib/hbqt/qtcore/g/TQDateTime.prg index 7bae8a05bd..347685ab28 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQDateTime.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQDateTime.prg @@ -88,14 +88,12 @@ CREATE CLASS QDateTime INHERIT HbQtObjectHandler FUNCTION HB_QDateTime METHOD time() METHOD timeSpec() METHOD toLocalTime() - METHOD toString( cFormat ) - METHOD toString_1( nFormat ) + METHOD toString( ... ) METHOD toTimeSpec( nSpecification ) METHOD toTime_t() METHOD toUTC() METHOD currentDateTime() - METHOD fromString( cString, nFormat ) - METHOD fromString_1( cString, cFormat ) + METHOD fromString( ... ) METHOD fromTime_t( nSeconds ) ENDCLASS @@ -178,12 +176,32 @@ METHOD QDateTime:toLocalTime() RETURN Qt_QDateTime_toLocalTime( ::pPtr ) -METHOD QDateTime:toString( cFormat ) - RETURN Qt_QDateTime_toString( ::pPtr, cFormat ) - - -METHOD QDateTime:toString_1( nFormat ) - RETURN Qt_QDateTime_toString_1( ::pPtr, nFormat ) +METHOD QDateTime:toString( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QString toString ( const QString & format ) const + // C c QString + RETURN Qt_QDateTime_toString( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" + // QString toString ( Qt::DateFormat format = Qt::TextDate ) const + // N n Qt::DateFormat + RETURN Qt_QDateTime_toString_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // QString toString ( Qt::DateFormat format = Qt::TextDate ) const + // N n Qt::DateFormat + RETURN Qt_QDateTime_toString_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QDateTime:toTimeSpec( nSpecification ) @@ -202,12 +220,35 @@ METHOD QDateTime:currentDateTime() RETURN Qt_QDateTime_currentDateTime( ::pPtr ) -METHOD QDateTime:fromString( cString, nFormat ) - RETURN Qt_QDateTime_fromString( ::pPtr, cString, nFormat ) - - -METHOD QDateTime:fromString_1( cString, cFormat ) - RETURN Qt_QDateTime_fromString_1( ::pPtr, cString, cFormat ) +METHOD QDateTime:fromString( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "C" + // QDateTime fromString ( const QString & string, const QString & format ) + // C c QString, C c QString + RETURN QDateTime():from( Qt_QDateTime_fromString_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // QDateTime fromString ( const QString & string, Qt::DateFormat format = Qt::TextDate ) + // C c QString, N n Qt::DateFormat + RETURN QDateTime():from( Qt_QDateTime_fromString( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QDateTime fromString ( const QString & string, Qt::DateFormat format = Qt::TextDate ) + // C c QString, N n Qt::DateFormat + RETURN QDateTime():from( Qt_QDateTime_fromString( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QDateTime:fromTime_t( nSeconds ) diff --git a/harbour/contrib/hbqt/qtcore/g/TQDir.prg b/harbour/contrib/hbqt/qtcore/g/TQDir.prg index 52238bbc6a..25bb9a6918 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQDir.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQDir.prg @@ -78,10 +78,8 @@ CREATE CLASS QDir INHERIT HbQtObjectHandler FUNCTION HB_QDir METHOD cdUp() METHOD count() METHOD dirName() - METHOD entryList( pNameFilters, nFilters, nSort ) - METHOD entryList_1( nFilters, nSort ) - METHOD exists( cName ) - METHOD exists_1() + METHOD entryList( ... ) + METHOD exists( ... ) METHOD filePath( cFileName ) METHOD filter() METHOD isAbsolute() @@ -113,8 +111,7 @@ CREATE CLASS QDir INHERIT HbQtObjectHandler FUNCTION HB_QDir METHOD homePath() METHOD isAbsolutePath( cPath ) METHOD isRelativePath( cPath ) - METHOD match( cFilter, cFileName ) - METHOD match_1( pFilters, cFileName ) + METHOD match( ... ) METHOD root() METHOD rootPath() METHOD searchPaths( cPrefix ) @@ -165,20 +162,65 @@ METHOD QDir:dirName() RETURN Qt_QDir_dirName( ::pPtr ) -METHOD QDir:entryList( pNameFilters, nFilters, nSort ) - RETURN Qt_QDir_entryList( ::pPtr, hbqt_ptr( pNameFilters ), nFilters, nSort ) +METHOD QDir:entryList( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // QStringList entryList ( const QStringList & nameFilters, Filters filters = NoFilter, SortFlags sort = NoSort ) const + // PO p QStringList, N n QDir::Filters, N n QDir::SortFlags + RETURN QStringList():from( Qt_QDir_entryList( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QStringList entryList ( Filters filters = NoFilter, SortFlags sort = NoSort ) const + // N n QDir::Filters, N n QDir::SortFlags + RETURN QStringList():from( Qt_QDir_entryList_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QStringList entryList ( const QStringList & nameFilters, Filters filters = NoFilter, SortFlags sort = NoSort ) const + // PO p QStringList, N n QDir::Filters, N n QDir::SortFlags + RETURN QStringList():from( Qt_QDir_entryList( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QStringList entryList ( Filters filters = NoFilter, SortFlags sort = NoSort ) const + // N n QDir::Filters, N n QDir::SortFlags + RETURN QStringList():from( Qt_QDir_entryList_1( ::pPtr, ... ) ) + ENDCASE + RETURN NIL -METHOD QDir:entryList_1( nFilters, nSort ) - RETURN Qt_QDir_entryList_1( ::pPtr, nFilters, nSort ) - - -METHOD QDir:exists( cName ) - RETURN Qt_QDir_exists( ::pPtr, cName ) - - -METHOD QDir:exists_1() - RETURN Qt_QDir_exists_1( ::pPtr ) +METHOD QDir:exists( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool exists ( const QString & name ) const + // C c QString + RETURN Qt_QDir_exists( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // bool exists () const + RETURN Qt_QDir_exists_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QDir:filePath( cFileName ) @@ -305,12 +347,28 @@ METHOD QDir:isRelativePath( cPath ) RETURN Qt_QDir_isRelativePath( ::pPtr, cPath ) -METHOD QDir:match( cFilter, cFileName ) - RETURN Qt_QDir_match( ::pPtr, cFilter, cFileName ) - - -METHOD QDir:match_1( pFilters, cFileName ) - RETURN Qt_QDir_match_1( ::pPtr, hbqt_ptr( pFilters ), cFileName ) +METHOD QDir:match( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "C" + // bool match ( const QString & filter, const QString & fileName ) + // C c QString, C c QString + RETURN Qt_QDir_match( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" + // bool match ( const QStringList & filters, const QString & fileName ) + // PO p QStringList, C c QString + RETURN Qt_QDir_match_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QDir:root() diff --git a/harbour/contrib/hbqt/qtcore/g/TQEventLoop.prg b/harbour/contrib/hbqt/qtcore/g/TQEventLoop.prg index cd6c943a92..01aade4a33 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQEventLoop.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQEventLoop.prg @@ -74,8 +74,7 @@ CREATE CLASS QEventLoop INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QEvent METHOD exec( nFlags ) METHOD exit( nReturnCode ) METHOD isRunning() - METHOD processEvents( nFlags ) - METHOD processEvents_1( nFlags, nMaxTime ) + METHOD processEvents( ... ) METHOD wakeUp() ENDCLASS @@ -102,12 +101,35 @@ METHOD QEventLoop:isRunning() RETURN Qt_QEventLoop_isRunning( ::pPtr ) -METHOD QEventLoop:processEvents( nFlags ) - RETURN Qt_QEventLoop_processEvents( ::pPtr, nFlags ) - - -METHOD QEventLoop:processEvents_1( nFlags, nMaxTime ) - RETURN Qt_QEventLoop_processEvents_1( ::pPtr, nFlags, nMaxTime ) +METHOD QEventLoop:processEvents( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void processEvents ( ProcessEventsFlags flags, int maxTime ) + // N n QEventLoop::ProcessEventsFlags, N n int + RETURN Qt_QEventLoop_processEvents_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // bool processEvents ( ProcessEventsFlags flags = AllEvents ) + // N n QEventLoop::ProcessEventsFlags + RETURN Qt_QEventLoop_processEvents( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // bool processEvents ( ProcessEventsFlags flags = AllEvents ) + // N n QEventLoop::ProcessEventsFlags + RETURN Qt_QEventLoop_processEvents( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QEventLoop:wakeUp() diff --git a/harbour/contrib/hbqt/qtcore/g/TQFile.prg b/harbour/contrib/hbqt/qtcore/g/TQFile.prg index 8ea6de4752..f9b46a04d5 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQFile.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQFile.prg @@ -73,38 +73,27 @@ CREATE CLASS QFile INHERIT HbQtObjectHandler, HB_QIODevice FUNCTION HB_QFile METHOD atEnd() METHOD close() - METHOD copy( cNewName ) + METHOD copy( ... ) METHOD error() - METHOD exists() + METHOD exists( ... ) METHOD fileName() METHOD flush() METHOD handle() METHOD isSequential() - METHOD link( cLinkName ) + METHOD link( ... ) METHOD map( nOffset, nSize, nFlags ) - METHOD open( nMode ) - METHOD open_1( nFd, nMode ) - METHOD permissions() - METHOD remove() - METHOD rename( cNewName ) - METHOD resize( nSz ) + METHOD open( ... ) + METHOD permissions( ... ) + METHOD remove( ... ) + METHOD rename( ... ) + METHOD resize( ... ) METHOD setFileName( cName ) - METHOD setPermissions( nPermissions ) + METHOD setPermissions( ... ) METHOD size() - METHOD symLinkTarget() + METHOD symLinkTarget( ... ) METHOD unsetError() - METHOD copy_1( cFileName, cNewName ) METHOD decodeName( pLocalFileName ) - METHOD decodeName_1( pLocalFileName ) METHOD encodeName( cFileName ) - METHOD exists_1( cFileName ) - METHOD link_1( cFileName, cLinkName ) - METHOD permissions_1( cFileName ) - METHOD remove_1( cFileName ) - METHOD rename_1( cOldName, cNewName ) - METHOD resize_1( cFileName, nSz ) - METHOD setPermissions_1( cFileName, nPermissions ) - METHOD symLinkTarget_1( cFileName ) ENDCLASS @@ -126,16 +115,58 @@ METHOD QFile:close() RETURN Qt_QFile_close( ::pPtr ) -METHOD QFile:copy( cNewName ) - RETURN Qt_QFile_copy( ::pPtr, cNewName ) +METHOD QFile:copy( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "C" + // bool copy ( const QString & fileName, const QString & newName ) + // C c QString, C c QString + RETURN Qt_QFile_copy_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool copy ( const QString & newName ) + // C c QString + RETURN Qt_QFile_copy( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFile:error() RETURN Qt_QFile_error( ::pPtr ) -METHOD QFile:exists() - RETURN Qt_QFile_exists( ::pPtr ) +METHOD QFile:exists( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool exists ( const QString & fileName ) + // C c QString + RETURN Qt_QFile_exists_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // bool exists () const + RETURN Qt_QFile_exists( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QFile:fileName() @@ -154,102 +185,230 @@ METHOD QFile:isSequential() RETURN Qt_QFile_isSequential( ::pPtr ) -METHOD QFile:link( cLinkName ) - RETURN Qt_QFile_link( ::pPtr, cLinkName ) +METHOD QFile:link( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "C" + // bool link ( const QString & fileName, const QString & linkName ) + // C c QString, C c QString + RETURN Qt_QFile_link_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool link ( const QString & linkName ) + // C c QString + RETURN Qt_QFile_link( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFile:map( nOffset, nSize, nFlags ) RETURN Qt_QFile_map( ::pPtr, nOffset, nSize, nFlags ) -METHOD QFile:open( nMode ) - RETURN Qt_QFile_open( ::pPtr, nMode ) +METHOD QFile:open( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // bool open ( int fd, OpenMode mode ) + // N n int, N n QFile::OpenMode + RETURN Qt_QFile_open_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // virtual bool open ( OpenMode mode ) + // N n QFile::OpenMode + RETURN Qt_QFile_open( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QFile:open_1( nFd, nMode ) - RETURN Qt_QFile_open_1( ::pPtr, nFd, nMode ) +METHOD QFile:permissions( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // Permissions permissions ( const QString & fileName ) + // C c QString + RETURN Qt_QFile_permissions_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // Permissions permissions () const + RETURN Qt_QFile_permissions( ::pPtr, ... ) + ENDCASE + RETURN NIL -METHOD QFile:permissions() - RETURN Qt_QFile_permissions( ::pPtr ) +METHOD QFile:remove( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool remove ( const QString & fileName ) + // C c QString + RETURN Qt_QFile_remove_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // bool remove () + RETURN Qt_QFile_remove( ::pPtr, ... ) + ENDCASE + RETURN NIL -METHOD QFile:remove() - RETURN Qt_QFile_remove( ::pPtr ) +METHOD QFile:rename( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "C" + // bool rename ( const QString & oldName, const QString & newName ) + // C c QString, C c QString + RETURN Qt_QFile_rename_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool rename ( const QString & newName ) + // C c QString + RETURN Qt_QFile_rename( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QFile:rename( cNewName ) - RETURN Qt_QFile_rename( ::pPtr, cNewName ) - - -METHOD QFile:resize( nSz ) - RETURN Qt_QFile_resize( ::pPtr, nSz ) +METHOD QFile:resize( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // bool resize ( const QString & fileName, qint64 sz ) + // C c QString, N n qint64 + RETURN Qt_QFile_resize_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // bool resize ( qint64 sz ) + // N n qint64 + RETURN Qt_QFile_resize( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFile:setFileName( cName ) RETURN Qt_QFile_setFileName( ::pPtr, cName ) -METHOD QFile:setPermissions( nPermissions ) - RETURN Qt_QFile_setPermissions( ::pPtr, nPermissions ) +METHOD QFile:setPermissions( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // bool setPermissions ( const QString & fileName, Permissions permissions ) + // C c QString, N n QFile::Permissions + RETURN Qt_QFile_setPermissions_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // bool setPermissions ( Permissions permissions ) + // N n QFile::Permissions + RETURN Qt_QFile_setPermissions( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFile:size() RETURN Qt_QFile_size( ::pPtr ) -METHOD QFile:symLinkTarget() - RETURN Qt_QFile_symLinkTarget( ::pPtr ) +METHOD QFile:symLinkTarget( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QString symLinkTarget ( const QString & fileName ) + // C c QString + RETURN Qt_QFile_symLinkTarget_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // QString symLinkTarget () const + RETURN Qt_QFile_symLinkTarget( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QFile:unsetError() RETURN Qt_QFile_unsetError( ::pPtr ) -METHOD QFile:copy_1( cFileName, cNewName ) - RETURN Qt_QFile_copy_1( ::pPtr, cFileName, cNewName ) - - METHOD QFile:decodeName( pLocalFileName ) RETURN Qt_QFile_decodeName( ::pPtr, hbqt_ptr( pLocalFileName ) ) -METHOD QFile:decodeName_1( pLocalFileName ) - RETURN Qt_QFile_decodeName_1( ::pPtr, hbqt_ptr( pLocalFileName ) ) - - METHOD QFile:encodeName( cFileName ) RETURN Qt_QFile_encodeName( ::pPtr, cFileName ) - -METHOD QFile:exists_1( cFileName ) - RETURN Qt_QFile_exists_1( ::pPtr, cFileName ) - - -METHOD QFile:link_1( cFileName, cLinkName ) - RETURN Qt_QFile_link_1( ::pPtr, cFileName, cLinkName ) - - -METHOD QFile:permissions_1( cFileName ) - RETURN Qt_QFile_permissions_1( ::pPtr, cFileName ) - - -METHOD QFile:remove_1( cFileName ) - RETURN Qt_QFile_remove_1( ::pPtr, cFileName ) - - -METHOD QFile:rename_1( cOldName, cNewName ) - RETURN Qt_QFile_rename_1( ::pPtr, cOldName, cNewName ) - - -METHOD QFile:resize_1( cFileName, nSz ) - RETURN Qt_QFile_resize_1( ::pPtr, cFileName, nSz ) - - -METHOD QFile:setPermissions_1( cFileName, nPermissions ) - RETURN Qt_QFile_setPermissions_1( ::pPtr, cFileName, nPermissions ) - - -METHOD QFile:symLinkTarget_1( cFileName ) - RETURN Qt_QFile_symLinkTarget_1( ::pPtr, cFileName ) - diff --git a/harbour/contrib/hbqt/qtcore/g/TQFileInfo.prg b/harbour/contrib/hbqt/qtcore/g/TQFileInfo.prg index ba65d8923e..354ee842d2 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQFileInfo.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQFileInfo.prg @@ -109,9 +109,7 @@ CREATE CLASS QFileInfo INHERIT HbQtObjectHandler FUNCTION HB_QFileInfo METHOD permissions() METHOD refresh() METHOD setCaching( lEnable ) - METHOD setFile( cFile ) - METHOD setFile_1( pFile ) - METHOD setFile_2( pDir, cFile ) + METHOD setFile( ... ) METHOD size() METHOD suffix() METHOD symLinkTarget() @@ -280,16 +278,35 @@ METHOD QFileInfo:setCaching( lEnable ) RETURN Qt_QFileInfo_setCaching( ::pPtr, lEnable ) -METHOD QFileInfo:setFile( cFile ) - RETURN Qt_QFileInfo_setFile( ::pPtr, cFile ) - - -METHOD QFileInfo:setFile_1( pFile ) - RETURN Qt_QFileInfo_setFile_1( ::pPtr, hbqt_ptr( pFile ) ) - - -METHOD QFileInfo:setFile_2( pDir, cFile ) - RETURN Qt_QFileInfo_setFile_2( ::pPtr, hbqt_ptr( pDir ), cFile ) +METHOD QFileInfo:setFile( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" + // void setFile ( const QDir & dir, const QString & file ) + // PO p QDir, C c QString + RETURN Qt_QFileInfo_setFile_2( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // void setFile ( const QString & file ) + // C c QString + RETURN Qt_QFileInfo_setFile( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // void setFile ( const QFile & file ) + // PO p QFile + RETURN Qt_QFileInfo_setFile_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFileInfo:size() diff --git a/harbour/contrib/hbqt/qtcore/g/TQIODevice.prg b/harbour/contrib/hbqt/qtcore/g/TQIODevice.prg index 245f59abd9..69cf5ea832 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQIODevice.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQIODevice.prg @@ -85,15 +85,12 @@ CREATE CLASS QIODevice INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QIODevi METHOD isWritable() METHOD open( nMode ) METHOD openMode() - METHOD peek( cData, nMaxSize ) - METHOD peek_1( nMaxSize ) + METHOD peek( ... ) METHOD pos() METHOD putChar( cC ) - METHOD read( cData, nMaxSize ) - METHOD read_1( nMaxSize ) + METHOD read( ... ) METHOD readAll() - METHOD readLine( cData, nMaxSize ) - METHOD readLine_1( nMaxSize ) + METHOD readLine( ... ) METHOD reset() METHOD seek( nPos ) METHOD setTextModeEnabled( lEnabled ) @@ -101,9 +98,7 @@ CREATE CLASS QIODevice INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QIODevi METHOD ungetChar( cC ) METHOD waitForBytesWritten( nMsecs ) METHOD waitForReadyRead( nMsecs ) - METHOD write( pData, nMaxSize ) - METHOD write_1( pData ) - METHOD write_2( pByteArray ) + METHOD write( ... ) ENDCLASS @@ -173,12 +168,31 @@ METHOD QIODevice:openMode() RETURN Qt_QIODevice_openMode( ::pPtr ) -METHOD QIODevice:peek( cData, nMaxSize ) - RETURN Qt_QIODevice_peek( ::pPtr, cData, nMaxSize ) - - -METHOD QIODevice:peek_1( nMaxSize ) - RETURN Qt_QIODevice_peek_1( ::pPtr, nMaxSize ) +METHOD QIODevice:peek( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // qint64 peek ( char * data, qint64 maxSize ) + // C c char, N n qint64 + RETURN Qt_QIODevice_peek( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QByteArray peek ( qint64 maxSize ) + // N n qint64 + RETURN QByteArray():from( Qt_QIODevice_peek_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QIODevice:pos() @@ -189,24 +203,66 @@ METHOD QIODevice:putChar( cC ) RETURN Qt_QIODevice_putChar( ::pPtr, cC ) -METHOD QIODevice:read( cData, nMaxSize ) - RETURN Qt_QIODevice_read( ::pPtr, cData, nMaxSize ) - - -METHOD QIODevice:read_1( nMaxSize ) - RETURN Qt_QIODevice_read_1( ::pPtr, nMaxSize ) +METHOD QIODevice:read( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // qint64 read ( char * data, qint64 maxSize ) + // C c char, N n qint64 + RETURN Qt_QIODevice_read( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QByteArray read ( qint64 maxSize ) + // N n qint64 + RETURN QByteArray():from( Qt_QIODevice_read_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QIODevice:readAll() RETURN Qt_QIODevice_readAll( ::pPtr ) -METHOD QIODevice:readLine( cData, nMaxSize ) - RETURN Qt_QIODevice_readLine( ::pPtr, cData, nMaxSize ) - - -METHOD QIODevice:readLine_1( nMaxSize ) - RETURN Qt_QIODevice_readLine_1( ::pPtr, nMaxSize ) +METHOD QIODevice:readLine( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // qint64 readLine ( char * data, qint64 maxSize ) + // C c char, N n qint64 + RETURN Qt_QIODevice_readLine( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QByteArray readLine ( qint64 maxSize = 0 ) + // N n qint64 + RETURN QByteArray():from( Qt_QIODevice_readLine_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QByteArray readLine ( qint64 maxSize = 0 ) + // N n qint64 + RETURN QByteArray():from( Qt_QIODevice_readLine_1( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QIODevice:reset() @@ -237,14 +293,32 @@ METHOD QIODevice:waitForReadyRead( nMsecs ) RETURN Qt_QIODevice_waitForReadyRead( ::pPtr, nMsecs ) -METHOD QIODevice:write( pData, nMaxSize ) - RETURN Qt_QIODevice_write( ::pPtr, hbqt_ptr( pData ), nMaxSize ) - - -METHOD QIODevice:write_1( pData ) - RETURN Qt_QIODevice_write_1( ::pPtr, hbqt_ptr( pData ) ) - - -METHOD QIODevice:write_2( pByteArray ) - RETURN Qt_QIODevice_write_2( ::pPtr, hbqt_ptr( pByteArray ) ) +METHOD QIODevice:write( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // qint64 write ( const char * data, qint64 maxSize ) + // PO p char, N n qint64 + RETURN Qt_QIODevice_write( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // qint64 write ( const char * data ) + // PO p char + RETURN Qt_QIODevice_write_1( ::pPtr, ... ) + // qint64 write ( const QByteArray & byteArray ) + // PO p QByteArray + // RETURN Qt_QIODevice_write_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtcore/g/TQLine.prg b/harbour/contrib/hbqt/qtcore/g/TQLine.prg index 5990dabd5b..9b2a0895f7 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQLine.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQLine.prg @@ -84,10 +84,8 @@ CREATE CLASS QLine INHERIT HbQtObjectHandler FUNCTION HB_QLine METHOD setP2( pP2 ) METHOD setLine( nX1, nY1, nX2, nY2 ) METHOD setPoints( pP1, pP2 ) - METHOD translate( pOffset ) - METHOD translate_1( nDx, nDy ) - METHOD translated( pOffset ) - METHOD translated_1( nDx, nDy ) + METHOD translate( ... ) + METHOD translated( ... ) ENDCLASS @@ -153,18 +151,56 @@ METHOD QLine:setPoints( pP1, pP2 ) RETURN Qt_QLine_setPoints( ::pPtr, hbqt_ptr( pP1 ), hbqt_ptr( pP2 ) ) -METHOD QLine:translate( pOffset ) - RETURN Qt_QLine_translate( ::pPtr, hbqt_ptr( pOffset ) ) +METHOD QLine:translate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void translate ( int dx, int dy ) + // N n int, N n int + RETURN Qt_QLine_translate_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void translate ( const QPoint & offset ) + // PO p QPoint + RETURN Qt_QLine_translate( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QLine:translate_1( nDx, nDy ) - RETURN Qt_QLine_translate_1( ::pPtr, nDx, nDy ) - - -METHOD QLine:translated( pOffset ) - RETURN Qt_QLine_translated( ::pPtr, hbqt_ptr( pOffset ) ) - - -METHOD QLine:translated_1( nDx, nDy ) - RETURN Qt_QLine_translated_1( ::pPtr, nDx, nDy ) +METHOD QLine:translated( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QLine translated ( int dx, int dy ) const + // N n int, N n int + RETURN QLine():from( Qt_QLine_translated_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QLine translated ( const QPoint & offset ) const + // PO p QPoint + RETURN QLine():from( Qt_QLine_translated( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtcore/g/TQLineF.prg b/harbour/contrib/hbqt/qtcore/g/TQLineF.prg index 48f7e9b94c..f16290d2d8 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQLineF.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQLineF.prg @@ -93,10 +93,8 @@ CREATE CLASS QLineF INHERIT HbQtObjectHandler FUNCTION HB_QLineF METHOD setLine( nX1, nY1, nX2, nY2 ) METHOD setPoints( pP1, pP2 ) METHOD toLine() - METHOD translate( pOffset ) - METHOD translate_1( nDx, nDy ) - METHOD translated( pOffset ) - METHOD translated_1( nDx, nDy ) + METHOD translate( ... ) + METHOD translated( ... ) METHOD unitVector() ENDCLASS @@ -199,20 +197,58 @@ METHOD QLineF:toLine() RETURN Qt_QLineF_toLine( ::pPtr ) -METHOD QLineF:translate( pOffset ) - RETURN Qt_QLineF_translate( ::pPtr, hbqt_ptr( pOffset ) ) +METHOD QLineF:translate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void translate ( qreal dx, qreal dy ) + // N n qreal, N n qreal + RETURN Qt_QLineF_translate_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void translate ( const QPointF & offset ) + // PO p QPointF + RETURN Qt_QLineF_translate( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QLineF:translate_1( nDx, nDy ) - RETURN Qt_QLineF_translate_1( ::pPtr, nDx, nDy ) - - -METHOD QLineF:translated( pOffset ) - RETURN Qt_QLineF_translated( ::pPtr, hbqt_ptr( pOffset ) ) - - -METHOD QLineF:translated_1( nDx, nDy ) - RETURN Qt_QLineF_translated_1( ::pPtr, nDx, nDy ) +METHOD QLineF:translated( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QLineF translated ( qreal dx, qreal dy ) const + // N n qreal, N n qreal + RETURN QLineF():from( Qt_QLineF_translated_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QLineF translated ( const QPointF & offset ) const + // PO p QPointF + RETURN QLineF():from( Qt_QLineF_translated( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QLineF:unitVector() diff --git a/harbour/contrib/hbqt/qtcore/g/TQList.prg b/harbour/contrib/hbqt/qtcore/g/TQList.prg index b29fa4dc2f..94ab6a3890 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQList.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQList.prg @@ -74,21 +74,16 @@ CREATE CLASS QList INHERIT HbQtObjectHandler FUNCTION HB_QList METHOD append( xValue ) METHOD at( nI ) METHOD back() - METHOD back_1() METHOD clear() - METHOD count( xValue ) - METHOD count_1() + METHOD count( ... ) METHOD empty() METHOD endsWith( xValue ) METHOD first() - METHOD first_1() METHOD front() - METHOD front_1() METHOD indexOf( xValue, nFrom ) METHOD insert( nI, xValue ) METHOD isEmpty() METHOD last() - METHOD last_1() METHOD lastIndexOf( xValue, nFrom ) METHOD length() METHOD move( nFrom, nTo ) @@ -109,8 +104,7 @@ CREATE CLASS QList INHERIT HbQtObjectHandler FUNCTION HB_QList METHOD takeAt( nI ) METHOD takeFirst() METHOD takeLast() - METHOD value( nI ) - METHOD value_1( nI, xDefaultValue ) + METHOD value( ... ) ENDCLASS @@ -136,20 +130,31 @@ METHOD QList:back() RETURN Qt_QList_back( ::pPtr ) -METHOD QList:back_1() - RETURN Qt_QList_back_1( ::pPtr ) - - METHOD QList:clear() RETURN Qt_QList_clear( ::pPtr ) -METHOD QList:count( xValue ) - RETURN Qt_QList_count( ::pPtr, xValue ) - - -METHOD QList:count_1() - RETURN Qt_QList_count_1( ::pPtr ) +METHOD QList:count( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "X" + // int count ( const T & value ) const + // X x T + RETURN Qt_QList_count( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // int count () const + RETURN Qt_QList_count_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QList:empty() @@ -164,18 +169,10 @@ METHOD QList:first() RETURN Qt_QList_first( ::pPtr ) -METHOD QList:first_1() - RETURN Qt_QList_first_1( ::pPtr ) - - METHOD QList:front() RETURN Qt_QList_front( ::pPtr ) -METHOD QList:front_1() - RETURN Qt_QList_front_1( ::pPtr ) - - METHOD QList:indexOf( xValue, nFrom ) RETURN Qt_QList_indexOf( ::pPtr, xValue, nFrom ) @@ -192,10 +189,6 @@ METHOD QList:last() RETURN Qt_QList_last( ::pPtr ) -METHOD QList:last_1() - RETURN Qt_QList_last_1( ::pPtr ) - - METHOD QList:lastIndexOf( xValue, nFrom ) RETURN Qt_QList_lastIndexOf( ::pPtr, xValue, nFrom ) @@ -276,10 +269,29 @@ METHOD QList:takeLast() RETURN Qt_QList_takeLast( ::pPtr ) -METHOD QList:value( nI ) - RETURN Qt_QList_value( ::pPtr, nI ) - - -METHOD QList:value_1( nI, xDefaultValue ) - RETURN Qt_QList_value_1( ::pPtr, nI, xDefaultValue ) +METHOD QList:value( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "X" + // T value ( int i, const T & defaultValue ) const + // N n int, X x T + RETURN Qt_QList_value_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // T value ( int i ) const + // N n int + RETURN Qt_QList_value( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtcore/g/TQLocale.prg b/harbour/contrib/hbqt/qtcore/g/TQLocale.prg index beac9693a0..ac4d5ac14a 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQLocale.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQLocale.prg @@ -92,31 +92,15 @@ CREATE CLASS QLocale INHERIT HbQtObjectHandler FUNCTION HB_QLocale METHOD standaloneDayName( nDay, nType ) METHOD standaloneMonthName( nMonth, nType ) METHOD timeFormat( nFormat ) - METHOD toDate( cString, nFormat ) - METHOD toDate_1( cString, cFormat ) - METHOD toDateTime( cString, nFormat ) - METHOD toDateTime_1( cString, cFormat ) + METHOD toDate( ... ) + METHOD toDateTime( ... ) METHOD toDouble( cS, lOk ) METHOD toFloat( cS, lOk ) METHOD toInt( cS, lOk, nBase ) METHOD toLongLong( cS, lOk, nBase ) METHOD toShort( cS, lOk, nBase ) - METHOD toString( nI ) - METHOD toString_1( pDate, cFormat ) - METHOD toString_2( pDate, nFormat ) - METHOD toString_3( pTime, cFormat ) - METHOD toString_4( pTime, nFormat ) - METHOD toString_5( pDateTime, nFormat ) - METHOD toString_6( pDateTime, cFormat ) - METHOD toString_7( nI ) - METHOD toString_8( nI, cF, nPrec ) - METHOD toString_9( nI ) - METHOD toString_10( nI ) - METHOD toString_11( nI ) - METHOD toString_12( nI ) - METHOD toString_13( nI, cF, nPrec ) - METHOD toTime( cString, nFormat ) - METHOD toTime_1( cString, cFormat ) + METHOD toString( ... ) + METHOD toTime( ... ) METHOD toUInt( cS, lOk, nBase ) METHOD toULongLong( cS, lOk, nBase ) METHOD toUShort( cS, lOk, nBase ) @@ -223,20 +207,66 @@ METHOD QLocale:timeFormat( nFormat ) RETURN Qt_QLocale_timeFormat( ::pPtr, nFormat ) -METHOD QLocale:toDate( cString, nFormat ) - RETURN Qt_QLocale_toDate( ::pPtr, cString, nFormat ) +METHOD QLocale:toDate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "C" + // QDate toDate ( const QString & string, const QString & format ) const + // C c QString, C c QString + RETURN QDate():from( Qt_QLocale_toDate_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // QDate toDate ( const QString & string, FormatType format = LongFormat ) const + // C c QString, N n QLocale::FormatType + RETURN QDate():from( Qt_QLocale_toDate( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QDate toDate ( const QString & string, FormatType format = LongFormat ) const + // C c QString, N n QLocale::FormatType + RETURN QDate():from( Qt_QLocale_toDate( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QLocale:toDate_1( cString, cFormat ) - RETURN Qt_QLocale_toDate_1( ::pPtr, cString, cFormat ) - - -METHOD QLocale:toDateTime( cString, nFormat ) - RETURN Qt_QLocale_toDateTime( ::pPtr, cString, nFormat ) - - -METHOD QLocale:toDateTime_1( cString, cFormat ) - RETURN Qt_QLocale_toDateTime_1( ::pPtr, cString, cFormat ) +METHOD QLocale:toDateTime( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "C" + // QDateTime toDateTime ( const QString & string, const QString & format ) const + // C c QString, C c QString + RETURN QDateTime():from( Qt_QLocale_toDateTime_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // QDateTime toDateTime ( const QString & string, FormatType format = LongFormat ) const + // C c QString, N n QLocale::FormatType + RETURN QDateTime():from( Qt_QLocale_toDateTime( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QDateTime toDateTime ( const QString & string, FormatType format = LongFormat ) const + // C c QString, N n QLocale::FormatType + RETURN QDateTime():from( Qt_QLocale_toDateTime( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QLocale:toDouble( cS, lOk ) @@ -259,68 +289,119 @@ METHOD QLocale:toShort( cS, lOk, nBase ) RETURN Qt_QLocale_toShort( ::pPtr, cS, lOk, nBase ) -METHOD QLocale:toString( nI ) - RETURN Qt_QLocale_toString( ::pPtr, nI ) +METHOD QLocale:toString( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "N" + // QString toString ( float i, char f = 'g', int prec = 6 ) const + // N n float, C c char, N n int + RETURN Qt_QLocale_toString_13( ::pPtr, ... ) + // QString toString ( double i, char f = 'g', int prec = 6 ) const + // N n double, C c char, N n int + // RETURN Qt_QLocale_toString_8( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" + // QString toString ( const QDate & date, const QString & format ) const + // PO p QDate, C c QString + RETURN Qt_QLocale_toString_1( ::pPtr, ... ) + // QString toString ( const QDateTime & dateTime, const QString & format ) const + // PO p QDateTime, C c QString + // RETURN Qt_QLocale_toString_6( ::pPtr, ... ) + // QString toString ( const QTime & time, const QString & format ) const + // PO p QTime, C c QString + // RETURN Qt_QLocale_toString_3( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // QString toString ( const QDate & date, FormatType format = LongFormat ) const + // PO p QDate, N n QLocale::FormatType + RETURN Qt_QLocale_toString_2( ::pPtr, ... ) + // QString toString ( const QDateTime & dateTime, FormatType format = LongFormat ) const + // PO p QDateTime, N n QLocale::FormatType + // RETURN Qt_QLocale_toString_5( ::pPtr, ... ) + // QString toString ( const QTime & time, FormatType format = LongFormat ) const + // PO p QTime, N n QLocale::FormatType + // RETURN Qt_QLocale_toString_4( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QString toString ( qlonglong i ) const + // N n qlonglong + RETURN Qt_QLocale_toString( ::pPtr, ... ) + // QString toString ( ushort i ) const + // N n ushort + // RETURN Qt_QLocale_toString_10( ::pPtr, ... ) + // QString toString ( float i, char f = 'g', int prec = 6 ) const + // N n float, C c char, N n int + // RETURN Qt_QLocale_toString_13( ::pPtr, ... ) + // QString toString ( short i ) const + // N n short + // RETURN Qt_QLocale_toString_9( ::pPtr, ... ) + // QString toString ( double i, char f = 'g', int prec = 6 ) const + // N n double, C c char, N n int + // RETURN Qt_QLocale_toString_8( ::pPtr, ... ) + // QString toString ( qulonglong i ) const + // N n qulonglong + // RETURN Qt_QLocale_toString_7( ::pPtr, ... ) + // QString toString ( uint i ) const + // N n uint + // RETURN Qt_QLocale_toString_12( ::pPtr, ... ) + // QString toString ( int i ) const + // N n int + // RETURN Qt_QLocale_toString_11( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // QString toString ( const QDate & date, FormatType format = LongFormat ) const + // PO p QDate, N n QLocale::FormatType + RETURN Qt_QLocale_toString_2( ::pPtr, ... ) + // QString toString ( const QTime & time, FormatType format = LongFormat ) const + // PO p QTime, N n QLocale::FormatType + // RETURN Qt_QLocale_toString_4( ::pPtr, ... ) + // QString toString ( const QDateTime & dateTime, FormatType format = LongFormat ) const + // PO p QDateTime, N n QLocale::FormatType + // RETURN Qt_QLocale_toString_5( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QLocale:toString_1( pDate, cFormat ) - RETURN Qt_QLocale_toString_1( ::pPtr, hbqt_ptr( pDate ), cFormat ) - - -METHOD QLocale:toString_2( pDate, nFormat ) - RETURN Qt_QLocale_toString_2( ::pPtr, hbqt_ptr( pDate ), nFormat ) - - -METHOD QLocale:toString_3( pTime, cFormat ) - RETURN Qt_QLocale_toString_3( ::pPtr, hbqt_ptr( pTime ), cFormat ) - - -METHOD QLocale:toString_4( pTime, nFormat ) - RETURN Qt_QLocale_toString_4( ::pPtr, hbqt_ptr( pTime ), nFormat ) - - -METHOD QLocale:toString_5( pDateTime, nFormat ) - RETURN Qt_QLocale_toString_5( ::pPtr, hbqt_ptr( pDateTime ), nFormat ) - - -METHOD QLocale:toString_6( pDateTime, cFormat ) - RETURN Qt_QLocale_toString_6( ::pPtr, hbqt_ptr( pDateTime ), cFormat ) - - -METHOD QLocale:toString_7( nI ) - RETURN Qt_QLocale_toString_7( ::pPtr, nI ) - - -METHOD QLocale:toString_8( nI, cF, nPrec ) - RETURN Qt_QLocale_toString_8( ::pPtr, nI, cF, nPrec ) - - -METHOD QLocale:toString_9( nI ) - RETURN Qt_QLocale_toString_9( ::pPtr, nI ) - - -METHOD QLocale:toString_10( nI ) - RETURN Qt_QLocale_toString_10( ::pPtr, nI ) - - -METHOD QLocale:toString_11( nI ) - RETURN Qt_QLocale_toString_11( ::pPtr, nI ) - - -METHOD QLocale:toString_12( nI ) - RETURN Qt_QLocale_toString_12( ::pPtr, nI ) - - -METHOD QLocale:toString_13( nI, cF, nPrec ) - RETURN Qt_QLocale_toString_13( ::pPtr, nI, cF, nPrec ) - - -METHOD QLocale:toTime( cString, nFormat ) - RETURN Qt_QLocale_toTime( ::pPtr, cString, nFormat ) - - -METHOD QLocale:toTime_1( cString, cFormat ) - RETURN Qt_QLocale_toTime_1( ::pPtr, cString, cFormat ) +METHOD QLocale:toTime( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "C" + // QTime toTime ( const QString & string, const QString & format ) const + // C c QString, C c QString + RETURN QTime():from( Qt_QLocale_toTime_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // QTime toTime ( const QString & string, FormatType format = LongFormat ) const + // C c QString, N n QLocale::FormatType + RETURN QTime():from( Qt_QLocale_toTime( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QTime toTime ( const QString & string, FormatType format = LongFormat ) const + // C c QString, N n QLocale::FormatType + RETURN QTime():from( Qt_QLocale_toTime( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QLocale:toUInt( cS, lOk, nBase ) diff --git a/harbour/contrib/hbqt/qtcore/g/TQProcess.prg b/harbour/contrib/hbqt/qtcore/g/TQProcess.prg index 480a0cda34..77ce505d03 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQProcess.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQProcess.prg @@ -90,17 +90,13 @@ CREATE CLASS QProcess INHERIT HbQtObjectHandler, HB_QIODevice FUNCTION HB_QProce METHOD setStandardOutputFile( cFileName, nMode ) METHOD setStandardOutputProcess( pDestination ) METHOD setWorkingDirectory( cDir ) - METHOD start( cProgram, pArguments, nMode ) - METHOD start_1( cProgram, nMode ) + METHOD start( ... ) METHOD state() METHOD waitForFinished( nMsecs ) METHOD waitForStarted( nMsecs ) METHOD workingDirectory() - METHOD execute( cProgram, pArguments ) - METHOD execute_1( cProgram ) - METHOD startDetached( cProgram, pArguments, cWorkingDirectory, nPid ) - METHOD startDetached_1( cProgram, pArguments ) - METHOD startDetached_2( cProgram ) + METHOD execute( ... ) + METHOD startDetached( ... ) METHOD systemEnvironment() METHOD kill() METHOD terminate() @@ -193,12 +189,42 @@ METHOD QProcess:setWorkingDirectory( cDir ) RETURN Qt_QProcess_setWorkingDirectory( ::pPtr, cDir ) -METHOD QProcess:start( cProgram, pArguments, nMode ) - RETURN Qt_QProcess_start( ::pPtr, cProgram, hbqt_ptr( pArguments ), nMode ) - - -METHOD QProcess:start_1( cProgram, nMode ) - RETURN Qt_QProcess_start_1( ::pPtr, cProgram, nMode ) +METHOD QProcess:start( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // void start ( const QString & program, const QStringList & arguments, OpenMode mode = ReadWrite ) + // C c QString, PO p QStringList, N n QProcess::OpenMode + RETURN Qt_QProcess_start( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // void start ( const QString & program, OpenMode mode = ReadWrite ) + // C c QString, N n QProcess::OpenMode + RETURN Qt_QProcess_start_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // void start ( const QString & program, const QStringList & arguments, OpenMode mode = ReadWrite ) + // C c QString, PO p QStringList, N n QProcess::OpenMode + RETURN Qt_QProcess_start( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // void start ( const QString & program, OpenMode mode = ReadWrite ) + // C c QString, N n QProcess::OpenMode + RETURN Qt_QProcess_start_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QProcess:state() @@ -217,24 +243,72 @@ METHOD QProcess:workingDirectory() RETURN Qt_QProcess_workingDirectory( ::pPtr ) -METHOD QProcess:execute( cProgram, pArguments ) - RETURN Qt_QProcess_execute( ::pPtr, cProgram, hbqt_ptr( pArguments ) ) +METHOD QProcess:execute( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // int execute ( const QString & program, const QStringList & arguments ) + // C c QString, PO p QStringList + RETURN Qt_QProcess_execute( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // int execute ( const QString & program ) + // C c QString + RETURN Qt_QProcess_execute_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QProcess:execute_1( cProgram ) - RETURN Qt_QProcess_execute_1( ::pPtr, cProgram ) - - -METHOD QProcess:startDetached( cProgram, pArguments, cWorkingDirectory, nPid ) - RETURN Qt_QProcess_startDetached( ::pPtr, cProgram, hbqt_ptr( pArguments ), cWorkingDirectory, nPid ) - - -METHOD QProcess:startDetached_1( cProgram, pArguments ) - RETURN Qt_QProcess_startDetached_1( ::pPtr, cProgram, hbqt_ptr( pArguments ) ) - - -METHOD QProcess:startDetached_2( cProgram ) - RETURN Qt_QProcess_startDetached_2( ::pPtr, cProgram ) +METHOD QProcess:startDetached( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "C" .AND. aV[ 4 ] $ "N" + // bool startDetached ( const QString & program, const QStringList & arguments, const QString & workingDirectory, qint64 * pid = 0 ) + // C c QString, PO p QStringList, C c QString, N @ qint64 + RETURN Qt_QProcess_startDetached( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "C" + // bool startDetached ( const QString & program, const QStringList & arguments, const QString & workingDirectory, qint64 * pid = 0 ) + // C c QString, PO p QStringList, C c QString, N @ qint64 + RETURN Qt_QProcess_startDetached( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // bool startDetached ( const QString & program, const QStringList & arguments ) + // C c QString, PO p QStringList + RETURN Qt_QProcess_startDetached_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool startDetached ( const QString & program ) + // C c QString + RETURN Qt_QProcess_startDetached_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QProcess:systemEnvironment() diff --git a/harbour/contrib/hbqt/qtcore/g/TQRect.prg b/harbour/contrib/hbqt/qtcore/g/TQRect.prg index 3b707bbf45..cf38080a28 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQRect.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQRect.prg @@ -77,10 +77,7 @@ CREATE CLASS QRect INHERIT HbQtObjectHandler FUNCTION HB_QRect METHOD bottomLeft() METHOD bottomRight() METHOD center() - METHOD contains( pPoint, lProper ) - METHOD contains_1( nX, nY, lProper ) - METHOD contains_2( nX, nY ) - METHOD contains_3( pRectangle, lProper ) + METHOD contains( ... ) METHOD getCoords( nX1, nY1, nX2, nY2 ) METHOD getRect( nX, nY, nWidth, nHeight ) METHOD height() @@ -96,8 +93,7 @@ CREATE CLASS QRect INHERIT HbQtObjectHandler FUNCTION HB_QRect METHOD moveCenter( pPosition ) METHOD moveLeft( nX ) METHOD moveRight( nX ) - METHOD moveTo( nX, nY ) - METHOD moveTo_1( pPosition ) + METHOD moveTo( ... ) METHOD moveTop( nY ) METHOD moveTopLeft( pPosition ) METHOD moveTopRight( pPosition ) @@ -122,10 +118,8 @@ CREATE CLASS QRect INHERIT HbQtObjectHandler FUNCTION HB_QRect METHOD top() METHOD topLeft() METHOD topRight() - METHOD translate( nDx, nDy ) - METHOD translate_1( pOffset ) - METHOD translated( nDx, nDy ) - METHOD translated_1( pOffset ) + METHOD translate( ... ) + METHOD translated( ... ) METHOD united( pRectangle ) METHOD width() METHOD x() @@ -167,20 +161,48 @@ METHOD QRect:center() RETURN Qt_QRect_center( ::pPtr ) -METHOD QRect:contains( pPoint, lProper ) - RETURN Qt_QRect_contains( ::pPtr, hbqt_ptr( pPoint ), lProper ) - - -METHOD QRect:contains_1( nX, nY, lProper ) - RETURN Qt_QRect_contains_1( ::pPtr, nX, nY, lProper ) - - -METHOD QRect:contains_2( nX, nY ) - RETURN Qt_QRect_contains_2( ::pPtr, nX, nY ) - - -METHOD QRect:contains_3( pRectangle, lProper ) - RETURN Qt_QRect_contains_3( ::pPtr, hbqt_ptr( pRectangle ), lProper ) +METHOD QRect:contains( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "L" + // bool contains ( int x, int y, bool proper ) const + // N n int, N n int, L l bool + RETURN Qt_QRect_contains_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // bool contains ( int x, int y ) const + // N n int, N n int + RETURN Qt_QRect_contains_2( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "L" + // bool contains ( const QRect & rectangle, bool proper = false ) const + // PO p QRect, L l bool + RETURN Qt_QRect_contains_3( ::pPtr, ... ) + // bool contains ( const QPoint & point, bool proper = false ) const + // PO p QPoint, L l bool + // RETURN Qt_QRect_contains( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // bool contains ( const QRect & rectangle, bool proper = false ) const + // PO p QRect, L l bool + RETURN Qt_QRect_contains_3( ::pPtr, ... ) + // bool contains ( const QPoint & point, bool proper = false ) const + // PO p QPoint, L l bool + // RETURN Qt_QRect_contains( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QRect:getCoords( nX1, nY1, nX2, nY2 ) @@ -243,12 +265,31 @@ METHOD QRect:moveRight( nX ) RETURN Qt_QRect_moveRight( ::pPtr, nX ) -METHOD QRect:moveTo( nX, nY ) - RETURN Qt_QRect_moveTo( ::pPtr, nX, nY ) - - -METHOD QRect:moveTo_1( pPosition ) - RETURN Qt_QRect_moveTo_1( ::pPtr, hbqt_ptr( pPosition ) ) +METHOD QRect:moveTo( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void moveTo ( int x, int y ) + // N n int, N n int + RETURN Qt_QRect_moveTo( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void moveTo ( const QPoint & position ) + // PO p QPoint + RETURN Qt_QRect_moveTo_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QRect:moveTop( nY ) @@ -347,20 +388,58 @@ METHOD QRect:topRight() RETURN Qt_QRect_topRight( ::pPtr ) -METHOD QRect:translate( nDx, nDy ) - RETURN Qt_QRect_translate( ::pPtr, nDx, nDy ) +METHOD QRect:translate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void translate ( int dx, int dy ) + // N n int, N n int + RETURN Qt_QRect_translate( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void translate ( const QPoint & offset ) + // PO p QPoint + RETURN Qt_QRect_translate_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QRect:translate_1( pOffset ) - RETURN Qt_QRect_translate_1( ::pPtr, hbqt_ptr( pOffset ) ) - - -METHOD QRect:translated( nDx, nDy ) - RETURN Qt_QRect_translated( ::pPtr, nDx, nDy ) - - -METHOD QRect:translated_1( pOffset ) - RETURN Qt_QRect_translated_1( ::pPtr, hbqt_ptr( pOffset ) ) +METHOD QRect:translated( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QRect translated ( int dx, int dy ) const + // N n int, N n int + RETURN QRect():from( Qt_QRect_translated( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRect translated ( const QPoint & offset ) const + // PO p QPoint + RETURN QRect():from( Qt_QRect_translated_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QRect:united( pRectangle ) diff --git a/harbour/contrib/hbqt/qtcore/g/TQRectF.prg b/harbour/contrib/hbqt/qtcore/g/TQRectF.prg index 300d762bb6..bb8bec0a4a 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQRectF.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQRectF.prg @@ -77,9 +77,7 @@ CREATE CLASS QRectF INHERIT HbQtObjectHandler FUNCTION HB_QRectF METHOD bottomLeft() METHOD bottomRight() METHOD center() - METHOD contains( pPoint ) - METHOD contains_1( nX, nY ) - METHOD contains_2( pRectangle ) + METHOD contains( ... ) METHOD getCoords( nX1, nY1, nX2, nY2 ) METHOD getRect( nX, nY, nWidth, nHeight ) METHOD height() @@ -95,8 +93,7 @@ CREATE CLASS QRectF INHERIT HbQtObjectHandler FUNCTION HB_QRectF METHOD moveCenter( pPosition ) METHOD moveLeft( nX ) METHOD moveRight( nX ) - METHOD moveTo( nX, nY ) - METHOD moveTo_1( pPosition ) + METHOD moveTo( ... ) METHOD moveTop( nY ) METHOD moveTopLeft( pPosition ) METHOD moveTopRight( pPosition ) @@ -123,10 +120,8 @@ CREATE CLASS QRectF INHERIT HbQtObjectHandler FUNCTION HB_QRectF METHOD top() METHOD topLeft() METHOD topRight() - METHOD translate( nDx, nDy ) - METHOD translate_1( pOffset ) - METHOD translated( nDx, nDy ) - METHOD translated_1( pOffset ) + METHOD translate( ... ) + METHOD translated( ... ) METHOD united( pRectangle ) METHOD width() METHOD x() @@ -168,16 +163,34 @@ METHOD QRectF:center() RETURN Qt_QRectF_center( ::pPtr ) -METHOD QRectF:contains( pPoint ) - RETURN Qt_QRectF_contains( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QRectF:contains_1( nX, nY ) - RETURN Qt_QRectF_contains_1( ::pPtr, nX, nY ) - - -METHOD QRectF:contains_2( pRectangle ) - RETURN Qt_QRectF_contains_2( ::pPtr, hbqt_ptr( pRectangle ) ) +METHOD QRectF:contains( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // bool contains ( qreal x, qreal y ) const + // N n qreal, N n qreal + RETURN Qt_QRectF_contains_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // bool contains ( const QPointF & point ) const + // PO p QPointF + RETURN Qt_QRectF_contains( ::pPtr, ... ) + // bool contains ( const QRectF & rectangle ) const + // PO p QRectF + // RETURN Qt_QRectF_contains_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QRectF:getCoords( nX1, nY1, nX2, nY2 ) @@ -240,12 +253,31 @@ METHOD QRectF:moveRight( nX ) RETURN Qt_QRectF_moveRight( ::pPtr, nX ) -METHOD QRectF:moveTo( nX, nY ) - RETURN Qt_QRectF_moveTo( ::pPtr, nX, nY ) - - -METHOD QRectF:moveTo_1( pPosition ) - RETURN Qt_QRectF_moveTo_1( ::pPtr, hbqt_ptr( pPosition ) ) +METHOD QRectF:moveTo( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void moveTo ( qreal x, qreal y ) + // N n qreal, N n qreal + RETURN Qt_QRectF_moveTo( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void moveTo ( const QPointF & position ) + // PO p QPointF + RETURN Qt_QRectF_moveTo_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QRectF:moveTop( nY ) @@ -352,20 +384,58 @@ METHOD QRectF:topRight() RETURN Qt_QRectF_topRight( ::pPtr ) -METHOD QRectF:translate( nDx, nDy ) - RETURN Qt_QRectF_translate( ::pPtr, nDx, nDy ) +METHOD QRectF:translate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void translate ( qreal dx, qreal dy ) + // N n qreal, N n qreal + RETURN Qt_QRectF_translate( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void translate ( const QPointF & offset ) + // PO p QPointF + RETURN Qt_QRectF_translate_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QRectF:translate_1( pOffset ) - RETURN Qt_QRectF_translate_1( ::pPtr, hbqt_ptr( pOffset ) ) - - -METHOD QRectF:translated( nDx, nDy ) - RETURN Qt_QRectF_translated( ::pPtr, nDx, nDy ) - - -METHOD QRectF:translated_1( pOffset ) - RETURN Qt_QRectF_translated_1( ::pPtr, hbqt_ptr( pOffset ) ) +METHOD QRectF:translated( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QRectF translated ( qreal dx, qreal dy ) const + // N n qreal, N n qreal + RETURN QRectF():from( Qt_QRectF_translated( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRectF translated ( const QPointF & offset ) const + // PO p QPointF + RETURN QRectF():from( Qt_QRectF_translated_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QRectF:united( pRectangle ) diff --git a/harbour/contrib/hbqt/qtcore/g/TQSettings.prg b/harbour/contrib/hbqt/qtcore/g/TQSettings.prg index 9cbafbb46d..aa4e8fb774 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQSettings.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQSettings.prg @@ -93,8 +93,7 @@ CREATE CLASS QSettings INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QSettin METHOD scope() METHOD setArrayIndex( nI ) METHOD setFallbacksEnabled( lB ) - METHOD setIniCodec( pCodec ) - METHOD setIniCodec_1( pCodecName ) + METHOD setIniCodec( ... ) METHOD setValue( cKey, pValue ) METHOD status() METHOD sync() @@ -203,12 +202,27 @@ METHOD QSettings:setFallbacksEnabled( lB ) RETURN Qt_QSettings_setFallbacksEnabled( ::pPtr, lB ) -METHOD QSettings:setIniCodec( pCodec ) - RETURN Qt_QSettings_setIniCodec( ::pPtr, hbqt_ptr( pCodec ) ) - - -METHOD QSettings:setIniCodec_1( pCodecName ) - RETURN Qt_QSettings_setIniCodec_1( ::pPtr, hbqt_ptr( pCodecName ) ) +METHOD QSettings:setIniCodec( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setIniCodec ( QTextCodec * codec ) + // PO p QTextCodec + RETURN Qt_QSettings_setIniCodec( ::pPtr, ... ) + // void setIniCodec ( const char * codecName ) + // PO p char + // RETURN Qt_QSettings_setIniCodec_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QSettings:setValue( cKey, pValue ) diff --git a/harbour/contrib/hbqt/qtcore/g/TQSignalMapper.prg b/harbour/contrib/hbqt/qtcore/g/TQSignalMapper.prg index 374cf8b69f..cd26a1626a 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQSignalMapper.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQSignalMapper.prg @@ -71,15 +71,10 @@ CREATE CLASS QSignalMapper INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QSi METHOD new( ... ) - METHOD mapping( nId ) - METHOD mapping_1( cId ) - METHOD mapping_2( pObject ) + METHOD mapping( ... ) METHOD removeMappings( pSender ) - METHOD setMapping( pSender, nId ) - METHOD setMapping_1( pSender, cText ) - METHOD setMapping_2( pSender, pObject ) - METHOD map() - METHOD map_1( pSender ) + METHOD setMapping( ... ) + METHOD map( ... ) ENDCLASS @@ -93,38 +88,85 @@ METHOD QSignalMapper:new( ... ) RETURN Self -METHOD QSignalMapper:mapping( nId ) - RETURN Qt_QSignalMapper_mapping( ::pPtr, nId ) - - -METHOD QSignalMapper:mapping_1( cId ) - RETURN Qt_QSignalMapper_mapping_1( ::pPtr, cId ) - - -METHOD QSignalMapper:mapping_2( pObject ) - RETURN Qt_QSignalMapper_mapping_2( ::pPtr, hbqt_ptr( pObject ) ) +METHOD QSignalMapper:mapping( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QObject * mapping ( const QString & id ) const + // C c QString + RETURN QObject():from( Qt_QSignalMapper_mapping_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "N" + // QObject * mapping ( int id ) const + // N n int + RETURN QObject():from( Qt_QSignalMapper_mapping( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // QObject * mapping ( QObject * object ) const + // PO p QObject + RETURN QObject():from( Qt_QSignalMapper_mapping_2( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QSignalMapper:removeMappings( pSender ) RETURN Qt_QSignalMapper_removeMappings( ::pPtr, hbqt_ptr( pSender ) ) -METHOD QSignalMapper:setMapping( pSender, nId ) - RETURN Qt_QSignalMapper_setMapping( ::pPtr, hbqt_ptr( pSender ), nId ) +METHOD QSignalMapper:setMapping( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" + // void setMapping ( QObject * sender, const QString & text ) + // PO p QObject, C c QString + RETURN Qt_QSignalMapper_setMapping_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void setMapping ( QObject * sender, int id ) + // PO p QObject, N n int + RETURN Qt_QSignalMapper_setMapping( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // void setMapping ( QObject * sender, QObject * object ) + // PO p QObject, PO p QObject + RETURN Qt_QSignalMapper_setMapping_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QSignalMapper:setMapping_1( pSender, cText ) - RETURN Qt_QSignalMapper_setMapping_1( ::pPtr, hbqt_ptr( pSender ), cText ) - - -METHOD QSignalMapper:setMapping_2( pSender, pObject ) - RETURN Qt_QSignalMapper_setMapping_2( ::pPtr, hbqt_ptr( pSender ), hbqt_ptr( pObject ) ) - - -METHOD QSignalMapper:map() - RETURN Qt_QSignalMapper_map( ::pPtr ) - - -METHOD QSignalMapper:map_1( pSender ) - RETURN Qt_QSignalMapper_map_1( ::pPtr, hbqt_ptr( pSender ) ) +METHOD QSignalMapper:map( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void map ( QObject * sender ) + // PO p QObject + RETURN Qt_QSignalMapper_map_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void map () + RETURN Qt_QSignalMapper_map( ::pPtr, ... ) + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtcore/g/TQSize.prg b/harbour/contrib/hbqt/qtcore/g/TQSize.prg index deef9c52b3..1f30366db8 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQSize.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQSize.prg @@ -77,8 +77,7 @@ CREATE CLASS QSize INHERIT HbQtObjectHandler FUNCTION HB_QSize METHOD isValid() METHOD rheight() METHOD rwidth() - METHOD scale( nWidth, nHeight, nMode ) - METHOD scale_1( pSize, nMode ) + METHOD scale( ... ) METHOD setHeight( nHeight ) METHOD setWidth( nWidth ) METHOD transpose() @@ -122,12 +121,31 @@ METHOD QSize:rwidth() RETURN Qt_QSize_rwidth( ::pPtr ) -METHOD QSize:scale( nWidth, nHeight, nMode ) - RETURN Qt_QSize_scale( ::pPtr, nWidth, nHeight, nMode ) - - -METHOD QSize:scale_1( pSize, nMode ) - RETURN Qt_QSize_scale_1( ::pPtr, hbqt_ptr( pSize ), nMode ) +METHOD QSize:scale( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void scale ( int width, int height, Qt::AspectRatioMode mode ) + // N n int, N n int, N n Qt::AspectRatioMode + RETURN Qt_QSize_scale( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void scale ( const QSize & size, Qt::AspectRatioMode mode ) + // PO p QSize, N n Qt::AspectRatioMode + RETURN Qt_QSize_scale_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QSize:setHeight( nHeight ) diff --git a/harbour/contrib/hbqt/qtcore/g/TQSizeF.prg b/harbour/contrib/hbqt/qtcore/g/TQSizeF.prg index b4bfaf8b20..b3312f6686 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQSizeF.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQSizeF.prg @@ -79,8 +79,7 @@ CREATE CLASS QSizeF INHERIT HbQtObjectHandler FUNCTION HB_QSizeF METHOD isValid() METHOD rheight() METHOD rwidth() - METHOD scale( nWidth, nHeight, nMode ) - METHOD scale_1( pSize, nMode ) + METHOD scale( ... ) METHOD setHeight( nHeight ) METHOD setWidth( nWidth ) METHOD toSize() @@ -131,12 +130,31 @@ METHOD QSizeF:rwidth() RETURN Qt_QSizeF_rwidth( ::pPtr ) -METHOD QSizeF:scale( nWidth, nHeight, nMode ) - RETURN Qt_QSizeF_scale( ::pPtr, nWidth, nHeight, nMode ) - - -METHOD QSizeF:scale_1( pSize, nMode ) - RETURN Qt_QSizeF_scale_1( ::pPtr, hbqt_ptr( pSize ), nMode ) +METHOD QSizeF:scale( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void scale ( qreal width, qreal height, Qt::AspectRatioMode mode ) + // N n qreal, N n qreal, N n Qt::AspectRatioMode + RETURN Qt_QSizeF_scale( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void scale ( const QSizeF & size, Qt::AspectRatioMode mode ) + // PO p QSizeF, N n Qt::AspectRatioMode + RETURN Qt_QSizeF_scale_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QSizeF:setHeight( nHeight ) diff --git a/harbour/contrib/hbqt/qtcore/g/TQStringList.prg b/harbour/contrib/hbqt/qtcore/g/TQStringList.prg index c9dadf250f..5cbb111e24 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQStringList.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQStringList.prg @@ -72,15 +72,10 @@ CREATE CLASS QStringList INHERIT HbQtObjectHandler, HB_QList FUNCTION HB_QString METHOD new( ... ) METHOD append( cValue ) - METHOD filter( cStr, nCs ) - METHOD filter_1( pRx ) - METHOD indexOf( cValue, nFrom ) - METHOD indexOf_1( pRx, nFrom ) - METHOD indexOf_2( pRx, nFrom ) + METHOD filter( ... ) + METHOD indexOf( ... ) METHOD join( cSeparator ) - METHOD lastIndexOf( pRx, nFrom ) - METHOD lastIndexOf_1( cValue, nFrom ) - METHOD lastIndexOf_2( pRx, nFrom ) + METHOD lastIndexOf( ... ) METHOD removeDuplicates() METHOD sort() METHOD at( nI ) @@ -88,12 +83,9 @@ CREATE CLASS QStringList INHERIT HbQtObjectHandler, HB_QList FUNCTION HB_QString METHOD count( cValue ) METHOD endsWith( cValue ) METHOD first() - METHOD first_1() METHOD front() - METHOD front_1() METHOD insert( nI, cValue ) METHOD last() - METHOD last_1() METHOD mid( nPos, nLength ) METHOD prepend( cValue ) METHOD push_back( cValue ) @@ -105,8 +97,7 @@ CREATE CLASS QStringList INHERIT HbQtObjectHandler, HB_QList FUNCTION HB_QString METHOD takeAt( nI ) METHOD takeFirst() METHOD takeLast() - METHOD value( nI ) - METHOD value_1( nI, cDefaultValue ) + METHOD value( ... ) ENDCLASS @@ -124,40 +115,121 @@ METHOD QStringList:append( cValue ) RETURN Qt_QStringList_append( ::pPtr, cValue ) -METHOD QStringList:filter( cStr, nCs ) - RETURN Qt_QStringList_filter( ::pPtr, cStr, nCs ) +METHOD QStringList:filter( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // QStringList filter ( const QString & str, Qt::CaseSensitivity cs = Qt::CaseSensitive ) const + // C c QString, N n Qt::CaseSensitivity + RETURN QStringList():from( Qt_QStringList_filter( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QStringList filter ( const QString & str, Qt::CaseSensitivity cs = Qt::CaseSensitive ) const + // C c QString, N n Qt::CaseSensitivity + RETURN QStringList():from( Qt_QStringList_filter( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // QStringList filter ( const QRegExp & rx ) const + // PO p QRegExp + RETURN QStringList():from( Qt_QStringList_filter_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QStringList:filter_1( pRx ) - RETURN Qt_QStringList_filter_1( ::pPtr, hbqt_ptr( pRx ) ) - - -METHOD QStringList:indexOf( cValue, nFrom ) - RETURN Qt_QStringList_indexOf( ::pPtr, cValue, nFrom ) - - -METHOD QStringList:indexOf_1( pRx, nFrom ) - RETURN Qt_QStringList_indexOf_1( ::pPtr, hbqt_ptr( pRx ), nFrom ) - - -METHOD QStringList:indexOf_2( pRx, nFrom ) - RETURN Qt_QStringList_indexOf_2( ::pPtr, hbqt_ptr( pRx ), nFrom ) +METHOD QStringList:indexOf( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // int indexOf ( const QString & value, int from = 0 ) const + // C c QString, N n int + RETURN Qt_QStringList_indexOf( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // int indexOf ( const QRegExp & rx, int from = 0 ) const + // PO p QRegExp, N n int + RETURN Qt_QStringList_indexOf_1( ::pPtr, ... ) + // int indexOf ( QRegExp & rx, int from = 0 ) const + // PO p QRegExp, N n int + // RETURN Qt_QStringList_indexOf_2( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // int indexOf ( const QString & value, int from = 0 ) const + // C c QString, N n int + RETURN Qt_QStringList_indexOf( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // int indexOf ( const QRegExp & rx, int from = 0 ) const + // PO p QRegExp, N n int + RETURN Qt_QStringList_indexOf_1( ::pPtr, ... ) + // int indexOf ( QRegExp & rx, int from = 0 ) const + // PO p QRegExp, N n int + // RETURN Qt_QStringList_indexOf_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QStringList:join( cSeparator ) RETURN Qt_QStringList_join( ::pPtr, cSeparator ) -METHOD QStringList:lastIndexOf( pRx, nFrom ) - RETURN Qt_QStringList_lastIndexOf( ::pPtr, hbqt_ptr( pRx ), nFrom ) - - -METHOD QStringList:lastIndexOf_1( cValue, nFrom ) - RETURN Qt_QStringList_lastIndexOf_1( ::pPtr, cValue, nFrom ) - - -METHOD QStringList:lastIndexOf_2( pRx, nFrom ) - RETURN Qt_QStringList_lastIndexOf_2( ::pPtr, hbqt_ptr( pRx ), nFrom ) +METHOD QStringList:lastIndexOf( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // int lastIndexOf ( const QString & value, int from = -1 ) const + // C c QString, N n int + RETURN Qt_QStringList_lastIndexOf_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // int lastIndexOf ( QRegExp & rx, int from = -1 ) const + // PO p QRegExp, N n int + RETURN Qt_QStringList_lastIndexOf_2( ::pPtr, ... ) + // int lastIndexOf ( const QRegExp & rx, int from = -1 ) const + // PO p QRegExp, N n int + // RETURN Qt_QStringList_lastIndexOf( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // int lastIndexOf ( const QString & value, int from = -1 ) const + // C c QString, N n int + RETURN Qt_QStringList_lastIndexOf_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // int lastIndexOf ( QRegExp & rx, int from = -1 ) const + // PO p QRegExp, N n int + RETURN Qt_QStringList_lastIndexOf_2( ::pPtr, ... ) + // int lastIndexOf ( const QRegExp & rx, int from = -1 ) const + // PO p QRegExp, N n int + // RETURN Qt_QStringList_lastIndexOf( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QStringList:removeDuplicates() @@ -188,18 +260,10 @@ METHOD QStringList:first() RETURN Qt_QStringList_first( ::pPtr ) -METHOD QStringList:first_1() - RETURN Qt_QStringList_first_1( ::pPtr ) - - METHOD QStringList:front() RETURN Qt_QStringList_front( ::pPtr ) -METHOD QStringList:front_1() - RETURN Qt_QStringList_front_1( ::pPtr ) - - METHOD QStringList:insert( nI, cValue ) RETURN Qt_QStringList_insert( ::pPtr, nI, cValue ) @@ -208,10 +272,6 @@ METHOD QStringList:last() RETURN Qt_QStringList_last( ::pPtr ) -METHOD QStringList:last_1() - RETURN Qt_QStringList_last_1( ::pPtr ) - - METHOD QStringList:mid( nPos, nLength ) RETURN Qt_QStringList_mid( ::pPtr, nPos, nLength ) @@ -256,10 +316,29 @@ METHOD QStringList:takeLast() RETURN Qt_QStringList_takeLast( ::pPtr ) -METHOD QStringList:value( nI ) - RETURN Qt_QStringList_value( ::pPtr, nI ) - - -METHOD QStringList:value_1( nI, cDefaultValue ) - RETURN Qt_QStringList_value_1( ::pPtr, nI, cDefaultValue ) +METHOD QStringList:value( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "C" + // QString value ( int i, const QString & defaultValue ) const + // N n int, C c QString + RETURN Qt_QStringList_value_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QString value ( int i ) const + // N n int + RETURN Qt_QStringList_value( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtcore/g/TQStringRef.prg b/harbour/contrib/hbqt/qtcore/g/TQStringRef.prg index 0916f9aa79..638f0f718b 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQStringRef.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQStringRef.prg @@ -73,23 +73,17 @@ CREATE CLASS QStringRef INHERIT HbQtObjectHandler FUNCTION HB_QStringRef METHOD at( nPosition ) METHOD clear() - METHOD compare( cOther, nCs ) - METHOD compare_1( pOther, nCs ) + METHOD compare( ... ) METHOD constData() METHOD count() METHOD data() METHOD isEmpty() METHOD isNull() METHOD length() - METHOD localeAwareCompare( cOther ) - METHOD localeAwareCompare_1( pOther ) + METHOD localeAwareCompare( ... ) METHOD position() METHOD size() METHOD unicode() - METHOD compare_2( pS1, cS2, nCs ) - METHOD compare_3( pS1, pS2, nCs ) - METHOD localeAwareCompare_2( pS1, cS2 ) - METHOD localeAwareCompare_3( pS1, pS2 ) ENDCLASS @@ -111,12 +105,58 @@ METHOD QStringRef:clear() RETURN Qt_QStringRef_clear( ::pPtr ) -METHOD QStringRef:compare( cOther, nCs ) - RETURN Qt_QStringRef_compare( ::pPtr, cOther, nCs ) - - -METHOD QStringRef:compare_1( pOther, nCs ) - RETURN Qt_QStringRef_compare_1( ::pPtr, hbqt_ptr( pOther ), nCs ) +METHOD QStringRef:compare( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "N" + // int compare ( const QStringRef & s1, const QString & s2, Qt::CaseSensitivity cs = Qt::CaseSensitive ) + // PO p QStringRef, C c QString, N n Qt::CaseSensitivity + RETURN Qt_QStringRef_compare_2( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // int compare ( const QStringRef & s1, const QStringRef & s2, Qt::CaseSensitivity cs = Qt::CaseSensitive ) + // PO p QStringRef, PO p QStringRef, N n Qt::CaseSensitivity + RETURN Qt_QStringRef_compare_3( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // int compare ( const QString & other, Qt::CaseSensitivity cs = Qt::CaseSensitive ) const + // C c QString, N n Qt::CaseSensitivity + RETURN Qt_QStringRef_compare( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" + // int compare ( const QStringRef & s1, const QString & s2, Qt::CaseSensitivity cs = Qt::CaseSensitive ) + // PO p QStringRef, C c QString, N n Qt::CaseSensitivity + RETURN Qt_QStringRef_compare_2( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // int compare ( const QStringRef & other, Qt::CaseSensitivity cs = Qt::CaseSensitive ) const + // PO p QStringRef, N n Qt::CaseSensitivity + RETURN Qt_QStringRef_compare_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // int compare ( const QStringRef & s1, const QStringRef & s2, Qt::CaseSensitivity cs = Qt::CaseSensitive ) + // PO p QStringRef, PO p QStringRef, N n Qt::CaseSensitivity + RETURN Qt_QStringRef_compare_3( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // int compare ( const QString & other, Qt::CaseSensitivity cs = Qt::CaseSensitive ) const + // C c QString, N n Qt::CaseSensitivity + RETURN Qt_QStringRef_compare( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // int compare ( const QStringRef & other, Qt::CaseSensitivity cs = Qt::CaseSensitive ) const + // PO p QStringRef, N n Qt::CaseSensitivity + RETURN Qt_QStringRef_compare_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QStringRef:constData() @@ -143,12 +183,39 @@ METHOD QStringRef:length() RETURN Qt_QStringRef_length( ::pPtr ) -METHOD QStringRef:localeAwareCompare( cOther ) - RETURN Qt_QStringRef_localeAwareCompare( ::pPtr, cOther ) - - -METHOD QStringRef:localeAwareCompare_1( pOther ) - RETURN Qt_QStringRef_localeAwareCompare_1( ::pPtr, hbqt_ptr( pOther ) ) +METHOD QStringRef:localeAwareCompare( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" + // int localeAwareCompare ( const QStringRef & s1, const QString & s2 ) + // PO p QStringRef, C c QString + RETURN Qt_QStringRef_localeAwareCompare_2( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // int localeAwareCompare ( const QStringRef & s1, const QStringRef & s2 ) + // PO p QStringRef, PO p QStringRef + RETURN Qt_QStringRef_localeAwareCompare_3( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // int localeAwareCompare ( const QString & other ) const + // C c QString + RETURN Qt_QStringRef_localeAwareCompare( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // int localeAwareCompare ( const QStringRef & other ) const + // PO p QStringRef + RETURN Qt_QStringRef_localeAwareCompare_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QStringRef:position() @@ -162,19 +229,3 @@ METHOD QStringRef:size() METHOD QStringRef:unicode() RETURN Qt_QStringRef_unicode( ::pPtr ) - -METHOD QStringRef:compare_2( pS1, cS2, nCs ) - RETURN Qt_QStringRef_compare_2( ::pPtr, hbqt_ptr( pS1 ), cS2, nCs ) - - -METHOD QStringRef:compare_3( pS1, pS2, nCs ) - RETURN Qt_QStringRef_compare_3( ::pPtr, hbqt_ptr( pS1 ), hbqt_ptr( pS2 ), nCs ) - - -METHOD QStringRef:localeAwareCompare_2( pS1, cS2 ) - RETURN Qt_QStringRef_localeAwareCompare_2( ::pPtr, hbqt_ptr( pS1 ), cS2 ) - - -METHOD QStringRef:localeAwareCompare_3( pS1, pS2 ) - RETURN Qt_QStringRef_localeAwareCompare_3( ::pPtr, hbqt_ptr( pS1 ), hbqt_ptr( pS2 ) ) - diff --git a/harbour/contrib/hbqt/qtcore/g/TQTextCodec.prg b/harbour/contrib/hbqt/qtcore/g/TQTextCodec.prg index 6e683fd41a..e3697aa9ad 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQTextCodec.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQTextCodec.prg @@ -72,22 +72,18 @@ CREATE CLASS QTextCodec INHERIT HbQtObjectHandler FUNCTION HB_QTextCodec METHOD new( ... ) METHOD aliases() - METHOD canEncode( pCh ) - METHOD canEncode_1( cS ) + METHOD canEncode( ... ) METHOD fromUnicode( cStr ) METHOD makeDecoder() METHOD makeEncoder() METHOD mibEnum() METHOD name() - METHOD toUnicode( pA ) - METHOD toUnicode_1( pChars ) + METHOD toUnicode( ... ) METHOD codecForCStrings() - METHOD codecForHtml( pBa, pDefaultCodec ) - METHOD codecForHtml_1( pBa ) + METHOD codecForHtml( ... ) METHOD codecForLocale() METHOD codecForMib( nMib ) - METHOD codecForName( pName ) - METHOD codecForName_1( pName ) + METHOD codecForName( ... ) METHOD codecForTr() METHOD setCodecForCStrings( pCodec ) METHOD setCodecForLocale( pC ) @@ -109,12 +105,28 @@ METHOD QTextCodec:aliases() RETURN Qt_QTextCodec_aliases( ::pPtr ) -METHOD QTextCodec:canEncode( pCh ) - RETURN Qt_QTextCodec_canEncode( ::pPtr, hbqt_ptr( pCh ) ) - - -METHOD QTextCodec:canEncode_1( cS ) - RETURN Qt_QTextCodec_canEncode_1( ::pPtr, cS ) +METHOD QTextCodec:canEncode( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool canEncode ( const QString & s ) const + // C c QString + RETURN Qt_QTextCodec_canEncode_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // bool canEncode ( QChar ch ) const + // PO p QChar + RETURN Qt_QTextCodec_canEncode( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextCodec:fromUnicode( cStr ) @@ -137,24 +149,58 @@ METHOD QTextCodec:name() RETURN Qt_QTextCodec_name( ::pPtr ) -METHOD QTextCodec:toUnicode( pA ) - RETURN Qt_QTextCodec_toUnicode( ::pPtr, hbqt_ptr( pA ) ) - - -METHOD QTextCodec:toUnicode_1( pChars ) - RETURN Qt_QTextCodec_toUnicode_1( ::pPtr, hbqt_ptr( pChars ) ) +METHOD QTextCodec:toUnicode( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QString toUnicode ( const QByteArray & a ) const + // PO p QByteArray + RETURN Qt_QTextCodec_toUnicode( ::pPtr, ... ) + // QString toUnicode ( const char * chars ) const + // PO p char + // RETURN Qt_QTextCodec_toUnicode_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextCodec:codecForCStrings() RETURN Qt_QTextCodec_codecForCStrings( ::pPtr ) -METHOD QTextCodec:codecForHtml( pBa, pDefaultCodec ) - RETURN Qt_QTextCodec_codecForHtml( ::pPtr, hbqt_ptr( pBa ), hbqt_ptr( pDefaultCodec ) ) - - -METHOD QTextCodec:codecForHtml_1( pBa ) - RETURN Qt_QTextCodec_codecForHtml_1( ::pPtr, hbqt_ptr( pBa ) ) +METHOD QTextCodec:codecForHtml( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // QTextCodec * codecForHtml ( const QByteArray & ba, QTextCodec * defaultCodec ) + // PO p QByteArray, PO p QTextCodec + RETURN QTextCodec():from( Qt_QTextCodec_codecForHtml( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QTextCodec * codecForHtml ( const QByteArray & ba ) + // PO p QByteArray + RETURN QTextCodec():from( Qt_QTextCodec_codecForHtml_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextCodec:codecForLocale() @@ -165,12 +211,27 @@ METHOD QTextCodec:codecForMib( nMib ) RETURN Qt_QTextCodec_codecForMib( ::pPtr, nMib ) -METHOD QTextCodec:codecForName( pName ) - RETURN Qt_QTextCodec_codecForName( ::pPtr, hbqt_ptr( pName ) ) - - -METHOD QTextCodec:codecForName_1( pName ) - RETURN Qt_QTextCodec_codecForName_1( ::pPtr, hbqt_ptr( pName ) ) +METHOD QTextCodec:codecForName( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QTextCodec * codecForName ( const QByteArray & name ) + // PO p QByteArray + RETURN QTextCodec():from( Qt_QTextCodec_codecForName( ::pPtr, ... ) ) + // QTextCodec * codecForName ( const char * name ) + // PO p char + // RETURN QTextCodec():from( Qt_QTextCodec_codecForName_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextCodec:codecForTr() diff --git a/harbour/contrib/hbqt/qtcore/g/TQTextEncoder.prg b/harbour/contrib/hbqt/qtcore/g/TQTextEncoder.prg index 57bd8d8ab7..4047241808 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQTextEncoder.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQTextEncoder.prg @@ -71,8 +71,7 @@ CREATE CLASS QTextEncoder INHERIT HbQtObjectHandler FUNCTION HB_QTextEncoder METHOD new( ... ) - METHOD fromUnicode( cStr ) - METHOD fromUnicode_1( pUc, nLen ) + METHOD fromUnicode( ... ) ENDCLASS @@ -86,10 +85,29 @@ METHOD QTextEncoder:new( ... ) RETURN Self -METHOD QTextEncoder:fromUnicode( cStr ) - RETURN Qt_QTextEncoder_fromUnicode( ::pPtr, cStr ) - - -METHOD QTextEncoder:fromUnicode_1( pUc, nLen ) - RETURN Qt_QTextEncoder_fromUnicode_1( ::pPtr, hbqt_ptr( pUc ), nLen ) +METHOD QTextEncoder:fromUnicode( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // QByteArray fromUnicode ( const QChar * uc, int len ) + // PO p QChar, N n int + RETURN QByteArray():from( Qt_QTextEncoder_fromUnicode_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QByteArray fromUnicode ( const QString & str ) + // C c QString + RETURN QByteArray():from( Qt_QTextEncoder_fromUnicode( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtcore/g/TQTextStream.prg b/harbour/contrib/hbqt/qtcore/g/TQTextStream.prg index 07bb8edd44..d2580b4fd0 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQTextStream.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQTextStream.prg @@ -93,8 +93,7 @@ CREATE CLASS QTextStream INHERIT HbQtObjectHandler FUNCTION HB_QTextStream METHOD resetStatus() METHOD seek( nPos ) METHOD setAutoDetectUnicode( lEnabled ) - METHOD setCodec( pCodec ) - METHOD setCodec_1( pCodecName ) + METHOD setCodec( ... ) METHOD setDevice( pDevice ) METHOD setFieldAlignment( nMode ) METHOD setFieldWidth( nWidth ) @@ -209,12 +208,27 @@ METHOD QTextStream:setAutoDetectUnicode( lEnabled ) RETURN Qt_QTextStream_setAutoDetectUnicode( ::pPtr, lEnabled ) -METHOD QTextStream:setCodec( pCodec ) - RETURN Qt_QTextStream_setCodec( ::pPtr, hbqt_ptr( pCodec ) ) - - -METHOD QTextStream:setCodec_1( pCodecName ) - RETURN Qt_QTextStream_setCodec_1( ::pPtr, hbqt_ptr( pCodecName ) ) +METHOD QTextStream:setCodec( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setCodec ( QTextCodec * codec ) + // PO p QTextCodec + RETURN Qt_QTextStream_setCodec( ::pPtr, ... ) + // void setCodec ( const char * codecName ) + // PO p char + // RETURN Qt_QTextStream_setCodec_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextStream:setDevice( pDevice ) diff --git a/harbour/contrib/hbqt/qtcore/g/TQTime.prg b/harbour/contrib/hbqt/qtcore/g/TQTime.prg index 2c751305cd..7a3dc62118 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQTime.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQTime.prg @@ -76,7 +76,7 @@ CREATE CLASS QTime INHERIT HbQtObjectHandler FUNCTION HB_QTime METHOD elapsed() METHOD hour() METHOD isNull() - METHOD isValid() + METHOD isValid( ... ) METHOD minute() METHOD msec() METHOD msecsTo( pT ) @@ -85,12 +85,9 @@ CREATE CLASS QTime INHERIT HbQtObjectHandler FUNCTION HB_QTime METHOD secsTo( pT ) METHOD setHMS( nH, nM, nS, nMs ) METHOD start() - METHOD toString( cFormat ) - METHOD toString_1( nFormat ) + METHOD toString( ... ) METHOD currentTime() - METHOD fromString( cString, nFormat ) - METHOD fromString_1( cString, cFormat ) - METHOD isValid_1( nH, nM, nS, nMs ) + METHOD fromString( ... ) ENDCLASS @@ -124,8 +121,34 @@ METHOD QTime:isNull() RETURN Qt_QTime_isNull( ::pPtr ) -METHOD QTime:isValid() - RETURN Qt_QTime_isValid( ::pPtr ) +METHOD QTime:isValid( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // bool isValid ( int h, int m, int s, int ms = 0 ) + // N n int, N n int, N n int, N n int + RETURN Qt_QTime_isValid_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // bool isValid ( int h, int m, int s, int ms = 0 ) + // N n int, N n int, N n int, N n int + RETURN Qt_QTime_isValid_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // bool isValid () const + RETURN Qt_QTime_isValid( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QTime:minute() @@ -160,26 +183,65 @@ METHOD QTime:start() RETURN Qt_QTime_start( ::pPtr ) -METHOD QTime:toString( cFormat ) - RETURN Qt_QTime_toString( ::pPtr, cFormat ) - - -METHOD QTime:toString_1( nFormat ) - RETURN Qt_QTime_toString_1( ::pPtr, nFormat ) +METHOD QTime:toString( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QString toString ( const QString & format ) const + // C c QString + RETURN Qt_QTime_toString( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" + // QString toString ( Qt::DateFormat format = Qt::TextDate ) const + // N n Qt::DateFormat + RETURN Qt_QTime_toString_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // QString toString ( Qt::DateFormat format = Qt::TextDate ) const + // N n Qt::DateFormat + RETURN Qt_QTime_toString_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QTime:currentTime() RETURN Qt_QTime_currentTime( ::pPtr ) -METHOD QTime:fromString( cString, nFormat ) - RETURN Qt_QTime_fromString( ::pPtr, cString, nFormat ) - - -METHOD QTime:fromString_1( cString, cFormat ) - RETURN Qt_QTime_fromString_1( ::pPtr, cString, cFormat ) - - -METHOD QTime:isValid_1( nH, nM, nS, nMs ) - RETURN Qt_QTime_isValid_1( ::pPtr, nH, nM, nS, nMs ) +METHOD QTime:fromString( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "C" + // QTime fromString ( const QString & string, const QString & format ) + // C c QString, C c QString + RETURN QTime():from( Qt_QTime_fromString_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // QTime fromString ( const QString & string, Qt::DateFormat format = Qt::TextDate ) + // C c QString, N n Qt::DateFormat + RETURN QTime():from( Qt_QTime_fromString( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QTime fromString ( const QString & string, Qt::DateFormat format = Qt::TextDate ) + // C c QString, N n Qt::DateFormat + RETURN QTime():from( Qt_QTime_fromString( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtcore/g/TQTimer.prg b/harbour/contrib/hbqt/qtcore/g/TQTimer.prg index 00ca6178e5..a310f6d3b3 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQTimer.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQTimer.prg @@ -78,9 +78,8 @@ CREATE CLASS QTimer INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QTimer METHOD setSingleShot( lSingleShot ) METHOD timerId() METHOD singleShot( nMsec, pReceiver, pMember ) - METHOD start() + METHOD start( ... ) METHOD stop() - METHOD start_1( nMsec ) ENDCLASS @@ -122,14 +121,29 @@ METHOD QTimer:singleShot( nMsec, pReceiver, pMember ) RETURN Qt_QTimer_singleShot( ::pPtr, nMsec, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ) ) -METHOD QTimer:start() - RETURN Qt_QTimer_start( ::pPtr ) +METHOD QTimer:start( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void start ( int msec ) + // N n int + RETURN Qt_QTimer_start_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void start () + RETURN Qt_QTimer_start( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QTimer:stop() RETURN Qt_QTimer_stop( ::pPtr ) - -METHOD QTimer:start_1( nMsec ) - RETURN Qt_QTimer_start_1( ::pPtr, nMsec ) - diff --git a/harbour/contrib/hbqt/qtcore/g/TQTranslator.prg b/harbour/contrib/hbqt/qtcore/g/TQTranslator.prg index de0486333d..0a5d495df1 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQTranslator.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQTranslator.prg @@ -73,8 +73,7 @@ CREATE CLASS QTranslator INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QTran METHOD isEmpty() METHOD load( cFilename, cDirectory, cSearch_delimiters, cSuffix ) - METHOD translate( pContext, pSourceText, pDisambiguation ) - METHOD translate_1( pContext, pSourceText, pDisambiguation, nN ) + METHOD translate( ... ) ENDCLASS @@ -96,10 +95,36 @@ METHOD QTranslator:load( cFilename, cDirectory, cSearch_delimiters, cSuffix ) RETURN Qt_QTranslator_load( ::pPtr, cFilename, cDirectory, cSearch_delimiters, cSuffix ) -METHOD QTranslator:translate( pContext, pSourceText, pDisambiguation ) - RETURN Qt_QTranslator_translate( ::pPtr, hbqt_ptr( pContext ), hbqt_ptr( pSourceText ), hbqt_ptr( pDisambiguation ) ) - - -METHOD QTranslator:translate_1( pContext, pSourceText, pDisambiguation, nN ) - RETURN Qt_QTranslator_translate_1( ::pPtr, hbqt_ptr( pContext ), hbqt_ptr( pSourceText ), hbqt_ptr( pDisambiguation ), nN ) +METHOD QTranslator:translate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" .AND. aV[ 4 ] $ "N" + // QString translate ( const char * context, const char * sourceText, const char * disambiguation, int n ) const + // PO p char, PO p char, PO p char, N n int + RETURN Qt_QTranslator_translate_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" + // virtual QString translate ( const char * context, const char * sourceText, const char * disambiguation = 0 ) const + // PO p char, PO p char, PO p char + RETURN Qt_QTranslator_translate( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // virtual QString translate ( const char * context, const char * sourceText, const char * disambiguation = 0 ) const + // PO p char, PO p char, PO p char + RETURN Qt_QTranslator_translate( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtcore/g/TQUrl.prg b/harbour/contrib/hbqt/qtcore/g/TQUrl.prg index cfb4c19153..af2ec405c1 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQUrl.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQUrl.prg @@ -97,8 +97,7 @@ CREATE CLASS QUrl INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QUrl METHOD isValid() METHOD password() METHOD path() - METHOD port() - METHOD port_1( nDefaultPort ) + METHOD port( ... ) METHOD queryItemValue( cKey ) METHOD queryPairDelimiter() METHOD queryValueDelimiter() @@ -114,8 +113,7 @@ CREATE CLASS QUrl INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QUrl METHOD setEncodedPassword( pPassword ) METHOD setEncodedPath( pPath ) METHOD setEncodedQuery( pQuery ) - METHOD setEncodedUrl( pEncodedUrl ) - METHOD setEncodedUrl_1( pEncodedUrl, nParsingMode ) + METHOD setEncodedUrl( ... ) METHOD setEncodedUserName( pUserName ) METHOD setFragment( cFragment ) METHOD setHost( cHost ) @@ -123,8 +121,7 @@ CREATE CLASS QUrl INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QUrl METHOD setPath( cPath ) METHOD setPort( nPort ) METHOD setScheme( cScheme ) - METHOD setUrl( cUrl ) - METHOD setUrl_1( cUrl, nParsingMode ) + METHOD setUrl( ... ) METHOD setUserInfo( cUserInfo ) METHOD setUserName( cUserName ) METHOD toEncoded( nOptions ) @@ -133,8 +130,7 @@ CREATE CLASS QUrl INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QUrl METHOD userInfo() METHOD userName() METHOD fromAce( pDomain ) - METHOD fromEncoded( pInput ) - METHOD fromEncoded_1( pInput, nParsingMode ) + METHOD fromEncoded( ... ) METHOD fromLocalFile( cLocalFile ) METHOD fromPercentEncoding( pInput ) METHOD idnWhitelist() @@ -258,12 +254,27 @@ METHOD QUrl:path() RETURN Qt_QUrl_path( ::pPtr ) -METHOD QUrl:port() - RETURN Qt_QUrl_port( ::pPtr ) - - -METHOD QUrl:port_1( nDefaultPort ) - RETURN Qt_QUrl_port_1( ::pPtr, nDefaultPort ) +METHOD QUrl:port( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // int port ( int defaultPort ) const + // N n int + RETURN Qt_QUrl_port_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // int port () const + RETURN Qt_QUrl_port( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QUrl:queryItemValue( cKey ) @@ -326,12 +337,31 @@ METHOD QUrl:setEncodedQuery( pQuery ) RETURN Qt_QUrl_setEncodedQuery( ::pPtr, hbqt_ptr( pQuery ) ) -METHOD QUrl:setEncodedUrl( pEncodedUrl ) - RETURN Qt_QUrl_setEncodedUrl( ::pPtr, hbqt_ptr( pEncodedUrl ) ) - - -METHOD QUrl:setEncodedUrl_1( pEncodedUrl, nParsingMode ) - RETURN Qt_QUrl_setEncodedUrl_1( ::pPtr, hbqt_ptr( pEncodedUrl ), nParsingMode ) +METHOD QUrl:setEncodedUrl( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void setEncodedUrl ( const QByteArray & encodedUrl, ParsingMode parsingMode ) + // PO p QByteArray, N n QUrl::ParsingMode + RETURN Qt_QUrl_setEncodedUrl_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setEncodedUrl ( const QByteArray & encodedUrl ) + // PO p QByteArray + RETURN Qt_QUrl_setEncodedUrl( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QUrl:setEncodedUserName( pUserName ) @@ -362,12 +392,31 @@ METHOD QUrl:setScheme( cScheme ) RETURN Qt_QUrl_setScheme( ::pPtr, cScheme ) -METHOD QUrl:setUrl( cUrl ) - RETURN Qt_QUrl_setUrl( ::pPtr, cUrl ) - - -METHOD QUrl:setUrl_1( cUrl, nParsingMode ) - RETURN Qt_QUrl_setUrl_1( ::pPtr, cUrl, nParsingMode ) +METHOD QUrl:setUrl( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // void setUrl ( const QString & url, ParsingMode parsingMode ) + // C c QString, N n QUrl::ParsingMode + RETURN Qt_QUrl_setUrl_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // void setUrl ( const QString & url ) + // C c QString + RETURN Qt_QUrl_setUrl( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QUrl:setUserInfo( cUserInfo ) @@ -402,12 +451,31 @@ METHOD QUrl:fromAce( pDomain ) RETURN Qt_QUrl_fromAce( ::pPtr, hbqt_ptr( pDomain ) ) -METHOD QUrl:fromEncoded( pInput ) - RETURN Qt_QUrl_fromEncoded( ::pPtr, hbqt_ptr( pInput ) ) - - -METHOD QUrl:fromEncoded_1( pInput, nParsingMode ) - RETURN Qt_QUrl_fromEncoded_1( ::pPtr, hbqt_ptr( pInput ), nParsingMode ) +METHOD QUrl:fromEncoded( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // QUrl fromEncoded ( const QByteArray & input, ParsingMode parsingMode ) + // PO p QByteArray, N n QUrl::ParsingMode + RETURN QUrl():from( Qt_QUrl_fromEncoded_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QUrl fromEncoded ( const QByteArray & input ) + // PO p QByteArray + RETURN QUrl():from( Qt_QUrl_fromEncoded( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QUrl:fromLocalFile( cLocalFile ) diff --git a/harbour/contrib/hbqt/qtcore/g/TQVariant.prg b/harbour/contrib/hbqt/qtcore/g/TQVariant.prg index 069895820a..2a472394ce 100644 --- a/harbour/contrib/hbqt/qtcore/g/TQVariant.prg +++ b/harbour/contrib/hbqt/qtcore/g/TQVariant.prg @@ -71,8 +71,7 @@ CREATE CLASS QVariant INHERIT HbQtObjectHandler FUNCTION HB_QVariant METHOD new( ... ) - METHOD canConvert( nT ) - METHOD canConvert_1( nT ) + METHOD canConvert( ... ) METHOD clear() METHOD convert( nT ) METHOD isNull() @@ -122,12 +121,27 @@ METHOD QVariant:new( ... ) RETURN Self -METHOD QVariant:canConvert( nT ) - RETURN Qt_QVariant_canConvert( ::pPtr, nT ) - - -METHOD QVariant:canConvert_1( nT ) - RETURN Qt_QVariant_canConvert_1( ::pPtr, nT ) +METHOD QVariant:canConvert( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // bool canConvert ( Type t ) const + // N n QVariant::Type + RETURN Qt_QVariant_canConvert( ::pPtr, ... ) + // bool canConvert ( Type t ) const + // N n QVariant::Type + // RETURN Qt_QVariant_canConvert_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QVariant:clear() diff --git a/harbour/contrib/hbqt/qtcore/hbqt_misc.prg b/harbour/contrib/hbqt/qtcore/hbqt_misc.prg index 17b50060ab..82ff57bce4 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_misc.prg +++ b/harbour/contrib/hbqt/qtcore/hbqt_misc.prg @@ -65,6 +65,7 @@ CLASS HbQtObjectHandler METHOD configure( xObject ) METHOD from( xObject ) INLINE ::configure( xObject ) + METHOD valtypes( aP, aV ) METHOD connect( cnEvent, bBlock ) METHOD disconnect( cnEvent ) @@ -85,6 +86,15 @@ METHOD HbQtObjectHandler:configure( xObject ) /*----------------------------------------------------------------------*/ +METHOD HbQtObjectHandler:valtypes( aP, aV ) + LOCAL p + FOR EACH p IN aP + aadd( aV, valtype( p ) ) + NEXT + RETURN Self + +/*----------------------------------------------------------------------*/ + METHOD HbQtObjectHandler:onError() LOCAL cMsg := __GetMessage() LOCAL oError @@ -151,28 +161,9 @@ METHOD HbQtObjectHandler:disconnect( cnEvent ) /*----------------------------------------------------------------------*/ FUNCTION hbqt_ptr( xParam ) - #if 0 - LOCAL cClsName - - IF hb_isObject( xParam ) - cClsName := __ObjGetClsName( xParam ) - - IF left( cClsName, 1 ) == "Q" - RETURN xParam:pPtr - - ELSEIF left( cClsName, 2 ) == "HB" - RETURN xParam:pPtr - - ELSE /* we don't care, programmer is at a fault */ - - ENDIF - ENDIF - #else IF hb_isObject( xParam ) .AND. __objHasMsg( xParam, "PPTR" ) RETURN xParam:pPtr ENDIF - #endif - RETURN xParam /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtcore/qth/QFile.qth b/harbour/contrib/hbqt/qtcore/qth/QFile.qth index 1888d4f757..53e10b63d3 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QFile.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QFile.qth @@ -59,7 +59,7 @@ QObject = Inherits = QIODevice Type = Core New = -Destructor = +Destructor = @@ -117,7 +117,7 @@ QString symLinkTarget () const void unsetError () bool copy ( const QString & fileName, const QString & newName ) -QString decodeName ( const QByteArray & localFileName ) +//QString decodeName ( const QByteArray & localFileName ) QString decodeName ( const char * localFileName ) QByteArray encodeName ( const QString & fileName ) bool exists ( const QString & fileName ) diff --git a/harbour/contrib/hbqt/qtcore/qth/QIODevice.qth b/harbour/contrib/hbqt/qtcore/qth/QIODevice.qth index 3ef83c8aba..0bb34e58ad 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QIODevice.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QIODevice.qth @@ -57,7 +57,7 @@ Inherits = QObject Type = Core -New = +New = diff --git a/harbour/contrib/hbqt/qtcore/qth/QResource.qth b/harbour/contrib/hbqt/qtcore/qth/QResource.qth index f885de2d4a..4368b46838 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QResource.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QResource.qth @@ -56,9 +56,10 @@ QObject = no -Inherits = +Inherits = Type = Core -New = +New = +ClubMethods = no diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesigneractioneditorinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesigneractioneditorinterface.txt index 2eeca0c976..a32ac63658 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesigneractioneditorinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesigneractioneditorinterface.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QDesignerActionEditorInterface():new( ... ) + * QDesignerActionEditorInterface( ... ) * QDesignerActionEditorInterface():from( pPtr_OR_oObj_of_type_QDesignerActionEditorInterface ) * QDesignerActionEditorInterface():configure( pPtr_OR_oObj_of_type_QDesignerActionEditorInterface ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformeditorinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformeditorinterface.txt index d7603c067c..e84ebec998 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformeditorinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformeditorinterface.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QDesignerFormEditorInterface():new( ... ) + * QDesignerFormEditorInterface( ... ) * QDesignerFormEditorInterface():from( pPtr_OR_oObj_of_type_QDesignerFormEditorInterface ) * QDesignerFormEditorInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormEditorInterface ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowcursorinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowcursorinterface.txt index 0cdd7482a9..f2207c62df 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowcursorinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowcursorinterface.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QDesignerFormWindowCursorInterface():new( ... ) + * QDesignerFormWindowCursorInterface( ... ) * QDesignerFormWindowCursorInterface():from( pPtr_OR_oObj_of_type_QDesignerFormWindowCursorInterface ) * QDesignerFormWindowCursorInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormWindowCursorInterface ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowinterface.txt index e551ab9097..cc0aa50b65 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowinterface.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QDesignerFormWindowInterface():new( ... ) + * QDesignerFormWindowInterface( ... ) * QDesignerFormWindowInterface():from( pPtr_OR_oObj_of_type_QDesignerFormWindowInterface ) * QDesignerFormWindowInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormWindowInterface ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowmanagerinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowmanagerinterface.txt index 0d2a157559..eb76b0ee4f 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowmanagerinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerformwindowmanagerinterface.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QDesignerFormWindowManagerInterface():new( ... ) + * QDesignerFormWindowManagerInterface( ... ) * QDesignerFormWindowManagerInterface():from( pPtr_OR_oObj_of_type_QDesignerFormWindowManagerInterface ) * QDesignerFormWindowManagerInterface():configure( pPtr_OR_oObj_of_type_QDesignerFormWindowManagerInterface ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerobjectinspectorinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerobjectinspectorinterface.txt index 47cfdc5365..989a5e0a03 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerobjectinspectorinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerobjectinspectorinterface.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QDesignerObjectInspectorInterface():new( ... ) + * QDesignerObjectInspectorInterface( ... ) * QDesignerObjectInspectorInterface():from( pPtr_OR_oObj_of_type_QDesignerObjectInspectorInterface ) * QDesignerObjectInspectorInterface():configure( pPtr_OR_oObj_of_type_QDesignerObjectInspectorInterface ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerpropertyeditorinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerpropertyeditorinterface.txt index 3111d65421..644d5eb223 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerpropertyeditorinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerpropertyeditorinterface.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QDesignerPropertyEditorInterface():new( ... ) + * QDesignerPropertyEditorInterface( ... ) * QDesignerPropertyEditorInterface():from( pPtr_OR_oObj_of_type_QDesignerPropertyEditorInterface ) * QDesignerPropertyEditorInterface():configure( pPtr_OR_oObj_of_type_QDesignerPropertyEditorInterface ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerwidgetboxinterface.txt b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerwidgetboxinterface.txt index 7e3e14bd1e..421aadf2b4 100644 --- a/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerwidgetboxinterface.txt +++ b/harbour/contrib/hbqt/qtdesigner/doc/en/class_qdesignerwidgetboxinterface.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QDesignerWidgetBoxInterface():new( ... ) + * QDesignerWidgetBoxInterface( ... ) * QDesignerWidgetBoxInterface():from( pPtr_OR_oObj_of_type_QDesignerWidgetBoxInterface ) * QDesignerWidgetBoxInterface():configure( pPtr_OR_oObj_of_type_QDesignerWidgetBoxInterface ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp index cea4ad2280..511d6691d7 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerActionEditorInterface.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp index 39397cb322..29db40649f 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormEditorInterface.cpp @@ -66,6 +66,15 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 10/10 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //QExtensionManager * extensionManager () const + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp index 1483558ff0..c52d8581a9 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowCursorInterface.cpp @@ -71,6 +71,11 @@ * enum MoveOperation { NoMove, Start, End, Next, ..., Down } */ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp index 92d740b295..6375145acf 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowInterface.cpp @@ -71,6 +71,17 @@ * enum FeatureFlag { EditFeature, GridFeature, TabOrderFeature, DefaultFeature } */ +/* + * Constructed[ 39/39 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //virtual QDir absoluteDir () const = 0 + * //virtual void layoutFunction ( QString * margin, QString * spacing ) = 0 + * //virtual void setLayoutFunction ( const QString & margin, const QString & spacing ) = 0 + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp index dbc6c553a5..0cdf8ea02d 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerFormWindowManagerInterface.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 26/26 [ 100.00% ] ] + * + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp index 7a99020009..d50b453600 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerObjectInspectorInterface.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp index 6df1bd381e..b2dca62d8c 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerPropertyEditorInterface.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp index f13d003986..356e64257d 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp +++ b/harbour/contrib/hbqt/qtdesigner/g/QDesignerWidgetBoxInterface.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormWindowInterface.prg b/harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormWindowInterface.prg index 01a2d923fb..f698409176 100644 --- a/harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormWindowInterface.prg +++ b/harbour/contrib/hbqt/qtdesigner/g/TQDesignerFormWindowInterface.prg @@ -93,18 +93,16 @@ CREATE CLASS QDesignerFormWindowInterface INHERIT HbQtObjectHandler, HB_QWidget METHOD resourceFiles() METHOD setAuthor( cAuthor ) METHOD setComment( cComment ) - METHOD setContents( pDevice ) + METHOD setContents( ... ) METHOD setExportMacro( cExportMacro ) METHOD setIncludeHints( pIncludeHints ) METHOD setLayoutDefault( nMargin, nSpacing ) METHOD setMainContainer( pMainContainer ) METHOD setPixmapFunction( cPixmapFunction ) - METHOD findFormWindow( pWidget ) - METHOD findFormWindow_1( pObject ) + METHOD findFormWindow( ... ) METHOD clearSelection( lUpdate ) METHOD manageWidget( pWidget ) METHOD selectWidget( pWidget, lSelect ) - METHOD setContents_1( cContents ) METHOD setDirty( lDirty ) METHOD setFeatures( nFeatures ) METHOD setFileName( cFileName ) @@ -211,8 +209,28 @@ METHOD QDesignerFormWindowInterface:setComment( cComment ) RETURN Qt_QDesignerFormWindowInterface_setComment( ::pPtr, cComment ) -METHOD QDesignerFormWindowInterface:setContents( pDevice ) - RETURN Qt_QDesignerFormWindowInterface_setContents( ::pPtr, hbqt_ptr( pDevice ) ) +METHOD QDesignerFormWindowInterface:setContents( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // virtual void setContents ( const QString & contents ) = 0 + // C c QString + RETURN Qt_QDesignerFormWindowInterface_setContents_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // virtual void setContents ( QIODevice * device ) = 0 + // PO p QIODevice + RETURN Qt_QDesignerFormWindowInterface_setContents( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QDesignerFormWindowInterface:setExportMacro( cExportMacro ) @@ -235,12 +253,27 @@ METHOD QDesignerFormWindowInterface:setPixmapFunction( cPixmapFunction ) RETURN Qt_QDesignerFormWindowInterface_setPixmapFunction( ::pPtr, cPixmapFunction ) -METHOD QDesignerFormWindowInterface:findFormWindow( pWidget ) - RETURN Qt_QDesignerFormWindowInterface_findFormWindow( ::pPtr, hbqt_ptr( pWidget ) ) - - -METHOD QDesignerFormWindowInterface:findFormWindow_1( pObject ) - RETURN Qt_QDesignerFormWindowInterface_findFormWindow_1( ::pPtr, hbqt_ptr( pObject ) ) +METHOD QDesignerFormWindowInterface:findFormWindow( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QDesignerFormWindowInterface * findFormWindow ( QWidget * widget ) + // PO p QWidget + RETURN QDesignerFormWindowInterface():from( Qt_QDesignerFormWindowInterface_findFormWindow( ::pPtr, ... ) ) + // QDesignerFormWindowInterface * findFormWindow ( QObject * object ) + // PO p QObject + // RETURN QDesignerFormWindowInterface():from( Qt_QDesignerFormWindowInterface_findFormWindow_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QDesignerFormWindowInterface:clearSelection( lUpdate ) @@ -255,10 +288,6 @@ METHOD QDesignerFormWindowInterface:selectWidget( pWidget, lSelect ) RETURN Qt_QDesignerFormWindowInterface_selectWidget( ::pPtr, hbqt_ptr( pWidget ), lSelect ) -METHOD QDesignerFormWindowInterface:setContents_1( cContents ) - RETURN Qt_QDesignerFormWindowInterface_setContents_1( ::pPtr, cContents ) - - METHOD QDesignerFormWindowInterface:setDirty( lDirty ) RETURN Qt_QDesignerFormWindowInterface_setDirty( ::pPtr, lDirty ) diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqabstractitemmodel.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqabstractitemmodel.txt index 3fd4dfb0a5..7e070d6efc 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqabstractitemmodel.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqabstractitemmodel.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemModel * $SYNTAX$ - * HBQAbstractItemModel():new( ... ) + * HBQAbstractItemModel( ... ) * HBQAbstractItemModel():from( pPtr_OR_oObj_of_type_HBQAbstractItemModel ) * HBQAbstractItemModel():configure( pPtr_OR_oObj_of_type_HBQAbstractItemModel ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqgraphicsitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqgraphicsitem.txt index 3af9a643ae..6ab5fac179 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqgraphicsitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqgraphicsitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsItem * $SYNTAX$ - * HBQGraphicsItem():new( ... ) + * HBQGraphicsItem( ... ) * HBQGraphicsItem():from( pPtr_OR_oObj_of_type_HBQGraphicsItem ) * HBQGraphicsItem():configure( pPtr_OR_oObj_of_type_HBQGraphicsItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqgraphicsscene.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqgraphicsscene.txt index a7ed8960f2..bf1444cdce 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqgraphicsscene.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqgraphicsscene.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsScene * $SYNTAX$ - * HBQGraphicsScene():new( ... ) + * HBQGraphicsScene( ... ) * HBQGraphicsScene():from( pPtr_OR_oObj_of_type_HBQGraphicsScene ) * HBQGraphicsScene():configure( pPtr_OR_oObj_of_type_HBQGraphicsScene ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqplaintextedit.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqplaintextedit.txt index 7bf46ddc98..308275d0cf 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqplaintextedit.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqplaintextedit.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QPlainTextEdit * $SYNTAX$ - * HBQPlainTextEdit():new( ... ) + * HBQPlainTextEdit( ... ) * HBQPlainTextEdit():from( pPtr_OR_oObj_of_type_HBQPlainTextEdit ) * HBQPlainTextEdit():configure( pPtr_OR_oObj_of_type_HBQPlainTextEdit ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqsyntaxhighlighter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqsyntaxhighlighter.txt index 327bf6a0aa..f8bf7a50d5 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqsyntaxhighlighter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqsyntaxhighlighter.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QSyntaxHighlighter * $SYNTAX$ - * HBQSyntaxHighlighter():new( ... ) + * HBQSyntaxHighlighter( ... ) * HBQSyntaxHighlighter():from( pPtr_OR_oObj_of_type_HBQSyntaxHighlighter ) * HBQSyntaxHighlighter():configure( pPtr_OR_oObj_of_type_HBQSyntaxHighlighter ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqtextblockuserdata.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqtextblockuserdata.txt index a19b1f9d93..433f3bc358 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_hbqtextblockuserdata.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_hbqtextblockuserdata.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * HBQTextBlockUserData():new( ... ) + * HBQTextBlockUserData( ... ) * HBQTextBlockUserData():from( pPtr_OR_oObj_of_type_HBQTextBlockUserData ) * HBQTextBlockUserData():configure( pPtr_OR_oObj_of_type_HBQTextBlockUserData ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractbutton.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractbutton.txt index 5ca88b8aa4..4368bae776 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractbutton.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractbutton.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QAbstractButton():new( ... ) + * QAbstractButton( ... ) * QAbstractButton():from( pPtr_OR_oObj_of_type_QAbstractButton ) * QAbstractButton():configure( pPtr_OR_oObj_of_type_QAbstractButton ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractgraphicsshapeitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractgraphicsshapeitem.txt index 93863f5000..cc1626fd21 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractgraphicsshapeitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractgraphicsshapeitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsItem * $SYNTAX$ - * QAbstractGraphicsShapeItem():new( ... ) + * QAbstractGraphicsShapeItem( ... ) * QAbstractGraphicsShapeItem():from( pPtr_OR_oObj_of_type_QAbstractGraphicsShapeItem ) * QAbstractGraphicsShapeItem():configure( pPtr_OR_oObj_of_type_QAbstractGraphicsShapeItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractitemdelegate.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractitemdelegate.txt index c8e179b2bb..81d31d2355 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractitemdelegate.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractitemdelegate.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QAbstractItemDelegate():new( ... ) + * QAbstractItemDelegate( ... ) * QAbstractItemDelegate():from( pPtr_OR_oObj_of_type_QAbstractItemDelegate ) * QAbstractItemDelegate():configure( pPtr_OR_oObj_of_type_QAbstractItemDelegate ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractitemview.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractitemview.txt index 698f8703c9..0e598fe449 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractitemview.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractitemview.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractScrollArea * $SYNTAX$ - * QAbstractItemView():new( ... ) + * QAbstractItemView( ... ) * QAbstractItemView():from( pPtr_OR_oObj_of_type_QAbstractItemView ) * QAbstractItemView():configure( pPtr_OR_oObj_of_type_QAbstractItemView ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractprintdialog.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractprintdialog.txt index 6d69b4f698..172afef59d 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractprintdialog.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractprintdialog.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDialog * $SYNTAX$ - * QAbstractPrintDialog():new( ... ) + * QAbstractPrintDialog( ... ) * QAbstractPrintDialog():from( pPtr_OR_oObj_of_type_QAbstractPrintDialog ) * QAbstractPrintDialog():configure( pPtr_OR_oObj_of_type_QAbstractPrintDialog ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractproxymodel.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractproxymodel.txt index a71c650393..d3c1d599ba 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractproxymodel.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractproxymodel.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemModel * $SYNTAX$ - * QAbstractProxyModel():new( ... ) + * QAbstractProxyModel( ... ) * QAbstractProxyModel():from( pPtr_OR_oObj_of_type_QAbstractProxyModel ) * QAbstractProxyModel():configure( pPtr_OR_oObj_of_type_QAbstractProxyModel ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractscrollarea.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractscrollarea.txt index f9a1d63caf..e2a9c79043 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractscrollarea.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractscrollarea.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QFrame * $SYNTAX$ - * QAbstractScrollArea():new( ... ) + * QAbstractScrollArea( ... ) * QAbstractScrollArea():from( pPtr_OR_oObj_of_type_QAbstractScrollArea ) * QAbstractScrollArea():configure( pPtr_OR_oObj_of_type_QAbstractScrollArea ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractslider.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractslider.txt index 97a7172001..41bee09b5c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractslider.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractslider.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QAbstractSlider():new( ... ) + * QAbstractSlider( ... ) * QAbstractSlider():from( pPtr_OR_oObj_of_type_QAbstractSlider ) * QAbstractSlider():configure( pPtr_OR_oObj_of_type_QAbstractSlider ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractspinbox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractspinbox.txt index b5a33b3962..813978afa7 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractspinbox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstractspinbox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QAbstractSpinBox():new( ... ) + * QAbstractSpinBox( ... ) * QAbstractSpinBox():from( pPtr_OR_oObj_of_type_QAbstractSpinBox ) * QAbstractSpinBox():configure( pPtr_OR_oObj_of_type_QAbstractSpinBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstracttextdocumentlayout.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstracttextdocumentlayout.txt index dcb0550b5a..ac3af2182b 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qabstracttextdocumentlayout.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qabstracttextdocumentlayout.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QAbstractTextDocumentLayout():new( ... ) + * QAbstractTextDocumentLayout( ... ) * QAbstractTextDocumentLayout():from( pPtr_OR_oObj_of_type_QAbstractTextDocumentLayout ) * QAbstractTextDocumentLayout():configure( pPtr_OR_oObj_of_type_QAbstractTextDocumentLayout ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qaction.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qaction.txt index cbeb2d0cd3..2572c78d2f 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qaction.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qaction.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QAction():new( ... ) + * QAction( ... ) * QAction():from( pPtr_OR_oObj_of_type_QAction ) * QAction():configure( pPtr_OR_oObj_of_type_QAction ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qactiongroup.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qactiongroup.txt index 9f77b34aa7..830d45a05c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qactiongroup.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qactiongroup.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QActionGroup():new( ... ) + * QActionGroup( ... ) * QActionGroup():from( pPtr_OR_oObj_of_type_QActionGroup ) * QActionGroup():configure( pPtr_OR_oObj_of_type_QActionGroup ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qapplication.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qapplication.txt index 6f64229a0c..5c745870f8 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qapplication.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qapplication.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QCoreApplication * $SYNTAX$ - * QApplication():new( ... ) + * QApplication( ... ) * QApplication():from( pPtr_OR_oObj_of_type_QApplication ) * QApplication():configure( pPtr_OR_oObj_of_type_QApplication ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qbitmap.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qbitmap.txt index 2a047f3cc5..cf27dfa6ef 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qbitmap.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qbitmap.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QPixmap * $SYNTAX$ - * QBitmap():new( ... ) + * QBitmap( ... ) * QBitmap():from( pPtr_OR_oObj_of_type_QBitmap ) * QBitmap():configure( pPtr_OR_oObj_of_type_QBitmap ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qboxlayout.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qboxlayout.txt index 7335c5e12c..449b10697e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qboxlayout.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qboxlayout.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QLayout * $SYNTAX$ - * QBoxLayout():new( ... ) + * QBoxLayout( ... ) * QBoxLayout():from( pPtr_OR_oObj_of_type_QBoxLayout ) * QBoxLayout():configure( pPtr_OR_oObj_of_type_QBoxLayout ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qbrush.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qbrush.txt index f07ef891fc..76d5eced9e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qbrush.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qbrush.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QBrush():new( ... ) + * QBrush( ... ) * QBrush():from( pPtr_OR_oObj_of_type_QBrush ) * QBrush():configure( pPtr_OR_oObj_of_type_QBrush ) * $ARGUMENTS$ @@ -29,7 +29,8 @@ * :color() -> pQColor * :isOpaque() -> lBool * :matrix() -> pQMatrix - * :setColor( ... ) -> NIL + * :setColor( pColor ) -> NIL + * :setColor_1( nColor ) -> NIL * :setMatrix( pMatrix ) -> NIL * :setStyle( nStyle ) -> NIL * :setTexture( pPixmap ) -> NIL diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qbuttongroup.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qbuttongroup.txt index 198614097b..d3542e13fe 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qbuttongroup.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qbuttongroup.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QButtonGroup():new( ... ) + * QButtonGroup( ... ) * QButtonGroup():from( pPtr_OR_oObj_of_type_QButtonGroup ) * QButtonGroup():configure( pPtr_OR_oObj_of_type_QButtonGroup ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qcalendarwidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qcalendarwidget.txt index 034f3fe921..07116aae97 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qcalendarwidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qcalendarwidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QCalendarWidget():new( ... ) + * QCalendarWidget( ... ) * QCalendarWidget():from( pPtr_OR_oObj_of_type_QCalendarWidget ) * QCalendarWidget():configure( pPtr_OR_oObj_of_type_QCalendarWidget ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qcheckbox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qcheckbox.txt index 0a9c1bd12e..9f73102e7b 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qcheckbox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qcheckbox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractButton * $SYNTAX$ - * QCheckBox():new( ... ) + * QCheckBox( ... ) * QCheckBox():from( pPtr_OR_oObj_of_type_QCheckBox ) * QCheckBox():configure( pPtr_OR_oObj_of_type_QCheckBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qclipboard.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qclipboard.txt index eeed612076..cca9780e97 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qclipboard.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qclipboard.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QClipboard():new( ... ) + * QClipboard( ... ) * QClipboard():from( pPtr_OR_oObj_of_type_QClipboard ) * QClipboard():configure( pPtr_OR_oObj_of_type_QClipboard ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qcolor.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qcolor.txt index cec04f2ab0..742b91b762 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qcolor.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qcolor.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QColor():new( ... ) + * QColor( ... ) * QColor():from( pPtr_OR_oObj_of_type_QColor ) * QColor():configure( pPtr_OR_oObj_of_type_QColor ) * $ARGUMENTS$ @@ -67,7 +67,8 @@ * :setNamedColor( cName ) -> NIL * :setRed( nRed ) -> NIL * :setRedF( nRed ) -> NIL - * :setRgb( ... ) -> NIL + * :setRgb( nRgb ) -> NIL + * :setRgb_1( nR, nG, nB, nA ) -> NIL * :setRgba( nRgba ) -> NIL * :setRgbF( nR, nG, nB, nA ) -> NIL * :spec() -> nSpec diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qcolordialog.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qcolordialog.txt index 334c511f71..ce078c8b3a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qcolordialog.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qcolordialog.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDialog * $SYNTAX$ - * QColorDialog():new( ... ) + * QColorDialog( ... ) * QColorDialog():from( pPtr_OR_oObj_of_type_QColorDialog ) * QColorDialog():configure( pPtr_OR_oObj_of_type_QColorDialog ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qcombobox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qcombobox.txt index e1eb897d9b..e977e2e23c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qcombobox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qcombobox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QComboBox():new( ... ) + * QComboBox( ... ) * QComboBox():from( pPtr_OR_oObj_of_type_QComboBox ) * QComboBox():configure( pPtr_OR_oObj_of_type_QComboBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qcommandlinkbutton.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qcommandlinkbutton.txt index c0de624c5b..60eaa74214 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qcommandlinkbutton.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qcommandlinkbutton.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QPushButton * $SYNTAX$ - * QCommandLinkButton():new( ... ) + * QCommandLinkButton( ... ) * QCommandLinkButton():from( pPtr_OR_oObj_of_type_QCommandLinkButton ) * QCommandLinkButton():configure( pPtr_OR_oObj_of_type_QCommandLinkButton ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qcompleter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qcompleter.txt index fbf1da4cc4..3f4f5b9e8e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qcompleter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qcompleter.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QCompleter():new( ... ) + * QCompleter( ... ) * QCompleter():from( pPtr_OR_oObj_of_type_QCompleter ) * QCompleter():configure( pPtr_OR_oObj_of_type_QCompleter ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qconicalgradient.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qconicalgradient.txt index cc883576c5..10c93757a5 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qconicalgradient.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qconicalgradient.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGradient * $SYNTAX$ - * QConicalGradient():new( ... ) + * QConicalGradient( ... ) * QConicalGradient():from( pPtr_OR_oObj_of_type_QConicalGradient ) * QConicalGradient():configure( pPtr_OR_oObj_of_type_QConicalGradient ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qcontextmenuevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qcontextmenuevent.txt index fb948595f8..04e18f785a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qcontextmenuevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qcontextmenuevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QInputEvent * $SYNTAX$ - * QContextMenuEvent():new( ... ) + * QContextMenuEvent( ... ) * QContextMenuEvent():from( pPtr_OR_oObj_of_type_QContextMenuEvent ) * QContextMenuEvent():configure( pPtr_OR_oObj_of_type_QContextMenuEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qcursor.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qcursor.txt index 38e2a743a1..6d4c9e7fb1 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qcursor.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qcursor.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QCursor():new( ... ) + * QCursor( ... ) * QCursor():from( pPtr_OR_oObj_of_type_QCursor ) * QCursor():configure( pPtr_OR_oObj_of_type_QCursor ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qdatetimeedit.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qdatetimeedit.txt index a898f45740..8717e23b63 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qdatetimeedit.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qdatetimeedit.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractSpinBox * $SYNTAX$ - * QDateTimeEdit():new( ... ) + * QDateTimeEdit( ... ) * QDateTimeEdit():from( pPtr_OR_oObj_of_type_QDateTimeEdit ) * QDateTimeEdit():configure( pPtr_OR_oObj_of_type_QDateTimeEdit ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qdesktopwidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qdesktopwidget.txt index 1b3a5fe5a2..762ed6b805 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qdesktopwidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qdesktopwidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QDesktopWidget():new( ... ) + * QDesktopWidget( ... ) * QDesktopWidget():from( pPtr_OR_oObj_of_type_QDesktopWidget ) * QDesktopWidget():configure( pPtr_OR_oObj_of_type_QDesktopWidget ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qdial.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qdial.txt index e95964031a..25e6c30e5c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qdial.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qdial.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractSlider * $SYNTAX$ - * QDial():new( ... ) + * QDial( ... ) * QDial():from( pPtr_OR_oObj_of_type_QDial ) * QDial():configure( pPtr_OR_oObj_of_type_QDial ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qdialog.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qdialog.txt index 04db76e8c0..eb8db0557a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qdialog.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qdialog.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QDialog():new( ... ) + * QDialog( ... ) * QDialog():from( pPtr_OR_oObj_of_type_QDialog ) * QDialog():configure( pPtr_OR_oObj_of_type_QDialog ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qdirmodel.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qdirmodel.txt index 62f72f2a5f..2a266bd3e7 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qdirmodel.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qdirmodel.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemModel * $SYNTAX$ - * QDirModel():new( ... ) + * QDirModel( ... ) * QDirModel():from( pPtr_OR_oObj_of_type_QDirModel ) * QDirModel():configure( pPtr_OR_oObj_of_type_QDirModel ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qdockwidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qdockwidget.txt index 0d02d25564..0aa371d6a6 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qdockwidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qdockwidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QDockWidget():new( ... ) + * QDockWidget( ... ) * QDockWidget():from( pPtr_OR_oObj_of_type_QDockWidget ) * QDockWidget():configure( pPtr_OR_oObj_of_type_QDockWidget ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qdoublespinbox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qdoublespinbox.txt index 094f994947..73a6924d4b 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qdoublespinbox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qdoublespinbox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractSpinBox * $SYNTAX$ - * QDoubleSpinBox():new( ... ) + * QDoubleSpinBox( ... ) * QDoubleSpinBox():from( pPtr_OR_oObj_of_type_QDoubleSpinBox ) * QDoubleSpinBox():configure( pPtr_OR_oObj_of_type_QDoubleSpinBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qdoublevalidator.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qdoublevalidator.txt index c0f175b648..26af19e4c9 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qdoublevalidator.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qdoublevalidator.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QValidator * $SYNTAX$ - * QDoubleValidator():new( ... ) + * QDoubleValidator( ... ) * QDoubleValidator():from( pPtr_OR_oObj_of_type_QDoubleValidator ) * QDoubleValidator():configure( pPtr_OR_oObj_of_type_QDoubleValidator ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qdrag.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qdrag.txt index 311f72eceb..9ca4148a49 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qdrag.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qdrag.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QDrag():new( ... ) + * QDrag( ... ) * QDrag():from( pPtr_OR_oObj_of_type_QDrag ) * QDrag():configure( pPtr_OR_oObj_of_type_QDrag ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qdragmoveevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qdragmoveevent.txt index 301d373c4c..b07604a18e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qdragmoveevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qdragmoveevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDropEvent * $SYNTAX$ - * QDragMoveEvent():new( ... ) + * QDragMoveEvent( ... ) * QDragMoveEvent():from( pPtr_OR_oObj_of_type_QDragMoveEvent ) * QDragMoveEvent():configure( pPtr_OR_oObj_of_type_QDragMoveEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qdropevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qdropevent.txt index b6160613ac..4a3480574b 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qdropevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qdropevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QEvent * $SYNTAX$ - * QDropEvent():new( ... ) + * QDropEvent( ... ) * QDropEvent():from( pPtr_OR_oObj_of_type_QDropEvent ) * QDropEvent():configure( pPtr_OR_oObj_of_type_QDropEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qerrormessage.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qerrormessage.txt index 61afd5b251..f5ac206aa9 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qerrormessage.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qerrormessage.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDialog * $SYNTAX$ - * QErrorMessage():new( ... ) + * QErrorMessage( ... ) * QErrorMessage():from( pPtr_OR_oObj_of_type_QErrorMessage ) * QErrorMessage():configure( pPtr_OR_oObj_of_type_QErrorMessage ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfiledialog.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfiledialog.txt index 9adf5d2613..243c0e0c2e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfiledialog.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfiledialog.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDialog * $SYNTAX$ - * QFileDialog():new( ... ) + * QFileDialog( ... ) * QFileDialog():from( pPtr_OR_oObj_of_type_QFileDialog ) * QFileDialog():configure( pPtr_OR_oObj_of_type_QFileDialog ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfileiconprovider.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfileiconprovider.txt index 45a4131ad6..60afade2ea 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfileiconprovider.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfileiconprovider.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QFileIconProvider():new( ... ) + * QFileIconProvider( ... ) * QFileIconProvider():from( pPtr_OR_oObj_of_type_QFileIconProvider ) * QFileIconProvider():configure( pPtr_OR_oObj_of_type_QFileIconProvider ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfilesystemmodel.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfilesystemmodel.txt index 6ff2cf08b0..84c2da0b98 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfilesystemmodel.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfilesystemmodel.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemModel * $SYNTAX$ - * QFileSystemModel():new( ... ) + * QFileSystemModel( ... ) * QFileSystemModel():from( pPtr_OR_oObj_of_type_QFileSystemModel ) * QFileSystemModel():configure( pPtr_OR_oObj_of_type_QFileSystemModel ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfocusevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfocusevent.txt index 6c891687e2..0635cec657 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfocusevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfocusevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QEvent * $SYNTAX$ - * QFocusEvent():new( ... ) + * QFocusEvent( ... ) * QFocusEvent():from( pPtr_OR_oObj_of_type_QFocusEvent ) * QFocusEvent():configure( pPtr_OR_oObj_of_type_QFocusEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfocusframe.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfocusframe.txt index 76a52d6af3..672daf828f 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfocusframe.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfocusframe.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QFocusFrame():new( ... ) + * QFocusFrame( ... ) * QFocusFrame():from( pPtr_OR_oObj_of_type_QFocusFrame ) * QFocusFrame():configure( pPtr_OR_oObj_of_type_QFocusFrame ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfont.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfont.txt index 6d130d897c..267ca96e8d 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfont.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfont.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QFont():new( ... ) + * QFont( ... ) * QFont():from( pPtr_OR_oObj_of_type_QFont ) * QFont():configure( pPtr_OR_oObj_of_type_QFont ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontcombobox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontcombobox.txt index 1ff19a8267..084d05f58f 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontcombobox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontcombobox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QComboBox * $SYNTAX$ - * QFontComboBox():new( ... ) + * QFontComboBox( ... ) * QFontComboBox():from( pPtr_OR_oObj_of_type_QFontComboBox ) * QFontComboBox():configure( pPtr_OR_oObj_of_type_QFontComboBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontdatabase.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontdatabase.txt index 80831f23f2..6897908c66 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontdatabase.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontdatabase.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QFontDatabase():new( ... ) + * QFontDatabase( ... ) * QFontDatabase():from( pPtr_OR_oObj_of_type_QFontDatabase ) * QFontDatabase():configure( pPtr_OR_oObj_of_type_QFontDatabase ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontdialog.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontdialog.txt index 21c5a7c686..2844191a99 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontdialog.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontdialog.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDialog * $SYNTAX$ - * QFontDialog():new( ... ) + * QFontDialog( ... ) * QFontDialog():from( pPtr_OR_oObj_of_type_QFontDialog ) * QFontDialog():configure( pPtr_OR_oObj_of_type_QFontDialog ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontinfo.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontinfo.txt index d7f0d4b101..af3a7be27d 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontinfo.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontinfo.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QFontInfo():new( ... ) + * QFontInfo( ... ) * QFontInfo():from( pPtr_OR_oObj_of_type_QFontInfo ) * QFontInfo():configure( pPtr_OR_oObj_of_type_QFontInfo ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontmetrics.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontmetrics.txt index c84edf0140..13899fa6a6 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontmetrics.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontmetrics.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QFontMetrics():new( ... ) + * QFontMetrics( ... ) * QFontMetrics():from( pPtr_OR_oObj_of_type_QFontMetrics ) * QFontMetrics():configure( pPtr_OR_oObj_of_type_QFontMetrics ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontmetricsf.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontmetricsf.txt index fc74b80be8..5ed678d1e8 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qfontmetricsf.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qfontmetricsf.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QFontMetricsF():new( ... ) + * QFontMetricsF( ... ) * QFontMetricsF():from( pPtr_OR_oObj_of_type_QFontMetricsF ) * QFontMetricsF():configure( pPtr_OR_oObj_of_type_QFontMetricsF ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qformlayout.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qformlayout.txt index a3e96e8bd5..7fc4b56806 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qformlayout.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qformlayout.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QLayout * $SYNTAX$ - * QFormLayout():new( ... ) + * QFormLayout( ... ) * QFormLayout():from( pPtr_OR_oObj_of_type_QFormLayout ) * QFormLayout():configure( pPtr_OR_oObj_of_type_QFormLayout ) * $ARGUMENTS$ @@ -27,11 +27,8 @@ * An instance of the object of type QFormLayout * $METHODS$ * :addRow( pLabel, pField ) -> NIL - * :addRow_1( pLabel, pField ) -> NIL - * :addRow_2( pWidget ) -> NIL - * :addRow_3( cLabelText, pField ) -> NIL - * :addRow_4( cLabelText, pField ) -> NIL - * :addRow_5( pLayout ) -> NIL + * :addRow_1( pWidget ) -> NIL + * :addRow_2( cLabelText, pField ) -> NIL * :fieldGrowthPolicy() -> nFieldGrowthPolicy * :formAlignment() -> nQt::Alignment * :getItemPosition( nIndex, @nRowPtr, @nRolePtr ) -> NIL diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qframe.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qframe.txt index 3f5fcf8ef4..78d218ecc6 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qframe.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qframe.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QFrame():new( ... ) + * QFrame( ... ) * QFrame():from( pPtr_OR_oObj_of_type_QFrame ) * QFrame():configure( pPtr_OR_oObj_of_type_QFrame ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgradient.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgradient.txt index 466da84be7..9068400716 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgradient.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgradient.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QGradient():new( ... ) + * QGradient( ... ) * QGradient():from( pPtr_OR_oObj_of_type_QGradient ) * QGradient():configure( pPtr_OR_oObj_of_type_QGradient ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsellipseitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsellipseitem.txt index 5a39fced02..cd5bcd0981 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsellipseitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsellipseitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractGraphicsShapeItem * $SYNTAX$ - * QGraphicsEllipseItem():new( ... ) + * QGraphicsEllipseItem( ... ) * QGraphicsEllipseItem():from( pPtr_OR_oObj_of_type_QGraphicsEllipseItem ) * QGraphicsEllipseItem():configure( pPtr_OR_oObj_of_type_QGraphicsEllipseItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsgridlayout.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsgridlayout.txt index 39ffe7b684..98ef991a65 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsgridlayout.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsgridlayout.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsLayout * $SYNTAX$ - * QGraphicsGridLayout():new( ... ) + * QGraphicsGridLayout( ... ) * QGraphicsGridLayout():from( pPtr_OR_oObj_of_type_QGraphicsGridLayout ) * QGraphicsGridLayout():configure( pPtr_OR_oObj_of_type_QGraphicsGridLayout ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitem.txt index 266eb1bddd..9be686c29f 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QGraphicsItem():new( ... ) + * QGraphicsItem( ... ) * QGraphicsItem():from( pPtr_OR_oObj_of_type_QGraphicsItem ) * QGraphicsItem():configure( pPtr_OR_oObj_of_type_QGraphicsItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitemanimation.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitemanimation.txt index 6268a92630..81e6470d8b 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitemanimation.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitemanimation.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QGraphicsItemAnimation():new( ... ) + * QGraphicsItemAnimation( ... ) * QGraphicsItemAnimation():from( pPtr_OR_oObj_of_type_QGraphicsItemAnimation ) * QGraphicsItemAnimation():configure( pPtr_OR_oObj_of_type_QGraphicsItemAnimation ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitemgroup.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitemgroup.txt index 5de208811b..62810b05cd 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitemgroup.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsitemgroup.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsItem * $SYNTAX$ - * QGraphicsItemGroup():new( ... ) + * QGraphicsItemGroup( ... ) * QGraphicsItemGroup():from( pPtr_OR_oObj_of_type_QGraphicsItemGroup ) * QGraphicsItemGroup():configure( pPtr_OR_oObj_of_type_QGraphicsItemGroup ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslayout.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslayout.txt index 220426d001..c45e47c7c1 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslayout.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslayout.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsLayoutItem * $SYNTAX$ - * QGraphicsLayout():new( ... ) + * QGraphicsLayout( ... ) * QGraphicsLayout():from( pPtr_OR_oObj_of_type_QGraphicsLayout ) * QGraphicsLayout():configure( pPtr_OR_oObj_of_type_QGraphicsLayout ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslayoutitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslayoutitem.txt index 71e4eff037..325cd61cb0 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslayoutitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslayoutitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QGraphicsLayoutItem():new( ... ) + * QGraphicsLayoutItem( ... ) * QGraphicsLayoutItem():from( pPtr_OR_oObj_of_type_QGraphicsLayoutItem ) * QGraphicsLayoutItem():configure( pPtr_OR_oObj_of_type_QGraphicsLayoutItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslinearlayout.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslinearlayout.txt index a3c6dd747f..b5748b2e8a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslinearlayout.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslinearlayout.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsLayout * $SYNTAX$ - * QGraphicsLinearLayout():new( ... ) + * QGraphicsLinearLayout( ... ) * QGraphicsLinearLayout():from( pPtr_OR_oObj_of_type_QGraphicsLinearLayout ) * QGraphicsLinearLayout():configure( pPtr_OR_oObj_of_type_QGraphicsLinearLayout ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslineitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslineitem.txt index 0c83745daf..c891afda19 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslineitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicslineitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsItem * $SYNTAX$ - * QGraphicsLineItem():new( ... ) + * QGraphicsLineItem( ... ) * QGraphicsLineItem():from( pPtr_OR_oObj_of_type_QGraphicsLineItem ) * QGraphicsLineItem():configure( pPtr_OR_oObj_of_type_QGraphicsLineItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspathitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspathitem.txt index c1aff6af15..461ceb2bb2 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspathitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspathitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractGraphicsShapeItem * $SYNTAX$ - * QGraphicsPathItem():new( ... ) + * QGraphicsPathItem( ... ) * QGraphicsPathItem():from( pPtr_OR_oObj_of_type_QGraphicsPathItem ) * QGraphicsPathItem():configure( pPtr_OR_oObj_of_type_QGraphicsPathItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspixmapitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspixmapitem.txt index 3755677ef7..bf00d55b0d 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspixmapitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspixmapitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsItem * $SYNTAX$ - * QGraphicsPixmapItem():new( ... ) + * QGraphicsPixmapItem( ... ) * QGraphicsPixmapItem():from( pPtr_OR_oObj_of_type_QGraphicsPixmapItem ) * QGraphicsPixmapItem():configure( pPtr_OR_oObj_of_type_QGraphicsPixmapItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspolygonitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspolygonitem.txt index c366171e37..fc9caaa429 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspolygonitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicspolygonitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractGraphicsShapeItem * $SYNTAX$ - * QGraphicsPolygonItem():new( ... ) + * QGraphicsPolygonItem( ... ) * QGraphicsPolygonItem():from( pPtr_OR_oObj_of_type_QGraphicsPolygonItem ) * QGraphicsPolygonItem():configure( pPtr_OR_oObj_of_type_QGraphicsPolygonItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsproxywidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsproxywidget.txt index 406de71b96..3186bc92da 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsproxywidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsproxywidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsWidget * $SYNTAX$ - * QGraphicsProxyWidget():new( ... ) + * QGraphicsProxyWidget( ... ) * QGraphicsProxyWidget():from( pPtr_OR_oObj_of_type_QGraphicsProxyWidget ) * QGraphicsProxyWidget():configure( pPtr_OR_oObj_of_type_QGraphicsProxyWidget ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsrectitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsrectitem.txt index 4de880c4df..2e19f29170 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsrectitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsrectitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractGraphicsShapeItem * $SYNTAX$ - * QGraphicsRectItem():new( ... ) + * QGraphicsRectItem( ... ) * QGraphicsRectItem():from( pPtr_OR_oObj_of_type_QGraphicsRectItem ) * QGraphicsRectItem():configure( pPtr_OR_oObj_of_type_QGraphicsRectItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscene.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscene.txt index d76d3a30d7..18719b6932 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscene.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscene.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QGraphicsScene():new( ... ) + * QGraphicsScene( ... ) * QGraphicsScene():from( pPtr_OR_oObj_of_type_QGraphicsScene ) * QGraphicsScene():configure( pPtr_OR_oObj_of_type_QGraphicsScene ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenecontextmenuevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenecontextmenuevent.txt index b788fc4c7a..093decf1e7 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenecontextmenuevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenecontextmenuevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsSceneEvent * $SYNTAX$ - * QGraphicsSceneContextMenuEvent():new( ... ) + * QGraphicsSceneContextMenuEvent( ... ) * QGraphicsSceneContextMenuEvent():from( pPtr_OR_oObj_of_type_QGraphicsSceneContextMenuEvent ) * QGraphicsSceneContextMenuEvent():configure( pPtr_OR_oObj_of_type_QGraphicsSceneContextMenuEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenedragdropevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenedragdropevent.txt index 5710d1dfb9..2096fd4b83 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenedragdropevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenedragdropevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsSceneEvent * $SYNTAX$ - * QGraphicsSceneDragDropEvent():new( ... ) + * QGraphicsSceneDragDropEvent( ... ) * QGraphicsSceneDragDropEvent():from( pPtr_OR_oObj_of_type_QGraphicsSceneDragDropEvent ) * QGraphicsSceneDragDropEvent():configure( pPtr_OR_oObj_of_type_QGraphicsSceneDragDropEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssceneevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssceneevent.txt index 419f0a8f88..ec674be2ba 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssceneevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssceneevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QEvent * $SYNTAX$ - * QGraphicsSceneEvent():new( ... ) + * QGraphicsSceneEvent( ... ) * QGraphicsSceneEvent():from( pPtr_OR_oObj_of_type_QGraphicsSceneEvent ) * QGraphicsSceneEvent():configure( pPtr_OR_oObj_of_type_QGraphicsSceneEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenehelpevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenehelpevent.txt index b015660e96..f12a7cb27d 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenehelpevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenehelpevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsSceneEvent * $SYNTAX$ - * QGraphicsSceneHelpEvent():new( ... ) + * QGraphicsSceneHelpEvent( ... ) * QGraphicsSceneHelpEvent():from( pPtr_OR_oObj_of_type_QGraphicsSceneHelpEvent ) * QGraphicsSceneHelpEvent():configure( pPtr_OR_oObj_of_type_QGraphicsSceneHelpEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenehoverevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenehoverevent.txt index 8fa98b8a17..5d33eb938f 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenehoverevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenehoverevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsSceneEvent * $SYNTAX$ - * QGraphicsSceneHoverEvent():new( ... ) + * QGraphicsSceneHoverEvent( ... ) * QGraphicsSceneHoverEvent():from( pPtr_OR_oObj_of_type_QGraphicsSceneHoverEvent ) * QGraphicsSceneHoverEvent():configure( pPtr_OR_oObj_of_type_QGraphicsSceneHoverEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenemouseevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenemouseevent.txt index 91327955a0..5ac374c9a6 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenemouseevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenemouseevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsSceneEvent * $SYNTAX$ - * QGraphicsSceneMouseEvent():new( ... ) + * QGraphicsSceneMouseEvent( ... ) * QGraphicsSceneMouseEvent():from( pPtr_OR_oObj_of_type_QGraphicsSceneMouseEvent ) * QGraphicsSceneMouseEvent():configure( pPtr_OR_oObj_of_type_QGraphicsSceneMouseEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenemoveevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenemoveevent.txt index 3b4c87e48c..8fb65cabb6 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenemoveevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenemoveevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsSceneEvent * $SYNTAX$ - * QGraphicsSceneMoveEvent():new( ... ) + * QGraphicsSceneMoveEvent( ... ) * QGraphicsSceneMoveEvent():from( pPtr_OR_oObj_of_type_QGraphicsSceneMoveEvent ) * QGraphicsSceneMoveEvent():configure( pPtr_OR_oObj_of_type_QGraphicsSceneMoveEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssceneresizeevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssceneresizeevent.txt index b59d3a1c69..9885491b48 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssceneresizeevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssceneresizeevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsSceneEvent * $SYNTAX$ - * QGraphicsSceneResizeEvent():new( ... ) + * QGraphicsSceneResizeEvent( ... ) * QGraphicsSceneResizeEvent():from( pPtr_OR_oObj_of_type_QGraphicsSceneResizeEvent ) * QGraphicsSceneResizeEvent():configure( pPtr_OR_oObj_of_type_QGraphicsSceneResizeEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenewheelevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenewheelevent.txt index 2cfa1cbc80..7218ce5840 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenewheelevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsscenewheelevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGraphicsSceneEvent * $SYNTAX$ - * QGraphicsSceneWheelEvent():new( ... ) + * QGraphicsSceneWheelEvent( ... ) * QGraphicsSceneWheelEvent():from( pPtr_OR_oObj_of_type_QGraphicsSceneWheelEvent ) * QGraphicsSceneWheelEvent():configure( pPtr_OR_oObj_of_type_QGraphicsSceneWheelEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssimpletextitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssimpletextitem.txt index 933c61f4bb..b43cefcc69 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssimpletextitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicssimpletextitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractGraphicsShapeItem * $SYNTAX$ - * QGraphicsSimpleTextItem():new( ... ) + * QGraphicsSimpleTextItem( ... ) * QGraphicsSimpleTextItem():from( pPtr_OR_oObj_of_type_QGraphicsSimpleTextItem ) * QGraphicsSimpleTextItem():configure( pPtr_OR_oObj_of_type_QGraphicsSimpleTextItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicstextitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicstextitem.txt index 446fab9618..7535a1b78d 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicstextitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicstextitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject, QGraphicsItem * $SYNTAX$ - * QGraphicsTextItem():new( ... ) + * QGraphicsTextItem( ... ) * QGraphicsTextItem():from( pPtr_OR_oObj_of_type_QGraphicsTextItem ) * QGraphicsTextItem():configure( pPtr_OR_oObj_of_type_QGraphicsTextItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsview.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsview.txt index 5ebb72721d..7ab3f37bc4 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsview.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicsview.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractScrollArea * $SYNTAX$ - * QGraphicsView():new( ... ) + * QGraphicsView( ... ) * QGraphicsView():from( pPtr_OR_oObj_of_type_QGraphicsView ) * QGraphicsView():configure( pPtr_OR_oObj_of_type_QGraphicsView ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicswidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicswidget.txt index c1deb0681d..eda9b86c57 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicswidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgraphicswidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject, QGraphicsItem, QGraphicsLayoutItem * $SYNTAX$ - * QGraphicsWidget():new( ... ) + * QGraphicsWidget( ... ) * QGraphicsWidget():from( pPtr_OR_oObj_of_type_QGraphicsWidget ) * QGraphicsWidget():configure( pPtr_OR_oObj_of_type_QGraphicsWidget ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgridlayout.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgridlayout.txt index 22e6b727db..8865f48937 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgridlayout.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgridlayout.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QLayout * $SYNTAX$ - * QGridLayout():new( ... ) + * QGridLayout( ... ) * QGridLayout():from( pPtr_OR_oObj_of_type_QGridLayout ) * QGridLayout():configure( pPtr_OR_oObj_of_type_QGridLayout ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qgroupbox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qgroupbox.txt index ec67a0b3b6..dc7abe6921 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qgroupbox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qgroupbox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QGroupBox():new( ... ) + * QGroupBox( ... ) * QGroupBox():from( pPtr_OR_oObj_of_type_QGroupBox ) * QGroupBox():configure( pPtr_OR_oObj_of_type_QGroupBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qheaderview.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qheaderview.txt index b7dbc3c743..2ddc477321 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qheaderview.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qheaderview.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemView * $SYNTAX$ - * QHeaderView():new( ... ) + * QHeaderView( ... ) * QHeaderView():from( pPtr_OR_oObj_of_type_QHeaderView ) * QHeaderView():configure( pPtr_OR_oObj_of_type_QHeaderView ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qhelpevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qhelpevent.txt index acc4074b4d..bfa08b7695 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qhelpevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qhelpevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QHelpEvent():new( ... ) + * QHelpEvent( ... ) * QHelpEvent():from( pPtr_OR_oObj_of_type_QHelpEvent ) * QHelpEvent():configure( pPtr_OR_oObj_of_type_QHelpEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qicon.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qicon.txt index 693de61827..9e94f242eb 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qicon.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qicon.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QIcon():new( ... ) + * QIcon( ... ) * QIcon():from( pPtr_OR_oObj_of_type_QIcon ) * QIcon():configure( pPtr_OR_oObj_of_type_QIcon ) * $ARGUMENTS$ @@ -32,8 +32,10 @@ * :availableSizes( nMode, nState ) -> pQList * :cacheKey() -> nQint64 * :isNull() -> lBool - * :paint( ... ) -> NIL - * :pixmap( ... ) -> pQPixmap + * :paint( pPainter, pRect, nAlignment, nMode, nState ) -> NIL + * :paint_1( pPainter, nX, nY, nW, nH, nAlignment, nMode, nState ) -> NIL + * :pixmap( pSize, nMode, nState ) -> pQPixmap + * :pixmap_1( nW, nH, nMode, nState ) -> pQPixmap * * $DESCRIPTION$ * diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qimage.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qimage.txt index d9da47520d..bb490258c8 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qimage.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qimage.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QImage():new( ... ) + * QImage( ... ) * QImage():from( pPtr_OR_oObj_of_type_QImage ) * QImage():configure( pPtr_OR_oObj_of_type_QImage ) * $ARGUMENTS$ @@ -28,7 +28,6 @@ * $METHODS$ * :allGray() -> lBool * :bits() -> pUchar - * :bits_1() -> pUchar * :bytesPerLine() -> nInt * :cacheKey() -> nQint64 * :color( nI ) -> nQRgb @@ -42,28 +41,33 @@ * :invertPixels( nMode ) -> NIL * :isGrayscale() -> lBool * :isNull() -> lBool - * :load( ... ) -> lBool + * :load( cFileName, pFormat ) -> lBool + * :load_1( pDevice, pFormat ) -> lBool * :loadFromData( pData, pFormat ) -> lBool * :numBytes() -> nInt * :numColors() -> nInt * :offset() -> pQPoint - * :pixel( ... ) -> nQRgb - * :pixelIndex( ... ) -> nInt + * :pixel( pPosition ) -> nQRgb + * :pixel_1( nX, nY ) -> nQRgb + * :pixelIndex( pPosition ) -> nInt + * :pixelIndex_1( nX, nY ) -> nInt * :rect() -> pQRect - * :save( ... ) -> lBool + * :save( cFileName, pFormat, nQuality ) -> lBool + * :save_1( pDevice, pFormat, nQuality ) -> lBool * :scanLine( nI ) -> pUchar - * :scanLine_1( nI ) -> pUchar * :setColor( nIndex, nColorValue ) -> NIL * :setDotsPerMeterX( nX ) -> NIL * :setDotsPerMeterY( nY ) -> NIL * :setNumColors( nNumColors ) -> NIL * :setOffset( pOffset ) -> NIL - * :setPixel( ... ) -> NIL + * :setPixel( pPosition, nIndex_or_rgb ) -> NIL + * :setPixel_1( nX, nY, nIndex_or_rgb ) -> NIL * :setText( cKey, cText ) -> NIL * :size() -> pQSize * :text( cKey ) -> cQString * :textKeys() -> pQStringList - * :valid( ... ) -> lBool + * :valid( pPos ) -> lBool + * :valid_1( nX, nY ) -> lBool * :width() -> nInt * * $DESCRIPTION$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qimagereader.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qimagereader.txt index ee2f719b69..cb8cd9adb3 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qimagereader.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qimagereader.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QImageReader():new( ... ) + * QImageReader( ... ) * QImageReader():from( pPtr_OR_oObj_of_type_QImageReader ) * QImageReader():configure( pPtr_OR_oObj_of_type_QImageReader ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qimagewriter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qimagewriter.txt index e175c06b54..e8fb8f3d4a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qimagewriter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qimagewriter.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QImageWriter():new( ... ) + * QImageWriter( ... ) * QImageWriter():from( pPtr_OR_oObj_of_type_QImageWriter ) * QImageWriter():configure( pPtr_OR_oObj_of_type_QImageWriter ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qinputdialog.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qinputdialog.txt index a7beafae5a..7d12dfc32e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qinputdialog.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qinputdialog.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDialog * $SYNTAX$ - * QInputDialog():new( ... ) + * QInputDialog( ... ) * QInputDialog():from( pPtr_OR_oObj_of_type_QInputDialog ) * QInputDialog():configure( pPtr_OR_oObj_of_type_QInputDialog ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qinputevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qinputevent.txt index 43601c9ba6..e2485c979e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qinputevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qinputevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QEvent * $SYNTAX$ - * QInputEvent():new( ... ) + * QInputEvent( ... ) * QInputEvent():from( pPtr_OR_oObj_of_type_QInputEvent ) * QInputEvent():configure( pPtr_OR_oObj_of_type_QInputEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qinputmethodevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qinputmethodevent.txt index b5f3191bd8..4610e0c63c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qinputmethodevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qinputmethodevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QEvent * $SYNTAX$ - * QInputMethodEvent():new( ... ) + * QInputMethodEvent( ... ) * QInputMethodEvent():from( pPtr_OR_oObj_of_type_QInputMethodEvent ) * QInputMethodEvent():configure( pPtr_OR_oObj_of_type_QInputMethodEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qintvalidator.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qintvalidator.txt index ddb42203c3..7be1ae30b4 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qintvalidator.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qintvalidator.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QValidator * $SYNTAX$ - * QIntValidator():new( ... ) + * QIntValidator( ... ) * QIntValidator():from( pPtr_OR_oObj_of_type_QIntValidator ) * QIntValidator():configure( pPtr_OR_oObj_of_type_QIntValidator ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qitemdelegate.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qitemdelegate.txt index f9379aabe2..dd9cb98d4f 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qitemdelegate.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qitemdelegate.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemDelegate * $SYNTAX$ - * QItemDelegate():new( ... ) + * QItemDelegate( ... ) * QItemDelegate():from( pPtr_OR_oObj_of_type_QItemDelegate ) * QItemDelegate():configure( pPtr_OR_oObj_of_type_QItemDelegate ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qitemeditorcreatorbase.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qitemeditorcreatorbase.txt index 14a7cb044d..e91480ee19 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qitemeditorcreatorbase.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qitemeditorcreatorbase.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QItemEditorCreatorBase():new( ... ) + * QItemEditorCreatorBase( ... ) * QItemEditorCreatorBase():from( pPtr_OR_oObj_of_type_QItemEditorCreatorBase ) * QItemEditorCreatorBase():configure( pPtr_OR_oObj_of_type_QItemEditorCreatorBase ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qitemeditorfactory.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qitemeditorfactory.txt index 4203bb8595..8eb3ac5fb0 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qitemeditorfactory.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qitemeditorfactory.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QItemEditorFactory():new( ... ) + * QItemEditorFactory( ... ) * QItemEditorFactory():from( pPtr_OR_oObj_of_type_QItemEditorFactory ) * QItemEditorFactory():configure( pPtr_OR_oObj_of_type_QItemEditorFactory ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qitemselection.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qitemselection.txt index 30d31e3626..b2e6e5096f 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qitemselection.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qitemselection.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QList * $SYNTAX$ - * QItemSelection():new( ... ) + * QItemSelection( ... ) * QItemSelection():from( pPtr_OR_oObj_of_type_QItemSelection ) * QItemSelection():configure( pPtr_OR_oObj_of_type_QItemSelection ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qitemselectionmodel.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qitemselectionmodel.txt index d95f0557fc..e925d5e828 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qitemselectionmodel.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qitemselectionmodel.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QItemSelectionModel():new( ... ) + * QItemSelectionModel( ... ) * QItemSelectionModel():from( pPtr_OR_oObj_of_type_QItemSelectionModel ) * QItemSelectionModel():configure( pPtr_OR_oObj_of_type_QItemSelectionModel ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qkeyevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qkeyevent.txt index 67162bdcd1..e4080912a2 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qkeyevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qkeyevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QInputEvent * $SYNTAX$ - * QKeyEvent():new( ... ) + * QKeyEvent( ... ) * QKeyEvent():from( pPtr_OR_oObj_of_type_QKeyEvent ) * QKeyEvent():configure( pPtr_OR_oObj_of_type_QKeyEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qkeysequence.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qkeysequence.txt index 41e4cf75ad..a2199e2916 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qkeysequence.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qkeysequence.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QKeySequence():new( ... ) + * QKeySequence( ... ) * QKeySequence():from( pPtr_OR_oObj_of_type_QKeySequence ) * QKeySequence():configure( pPtr_OR_oObj_of_type_QKeySequence ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qlabel.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qlabel.txt index 6973714483..d589d28984 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qlabel.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qlabel.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QFrame * $SYNTAX$ - * QLabel():new( ... ) + * QLabel( ... ) * QLabel():from( pPtr_OR_oObj_of_type_QLabel ) * QLabel():configure( pPtr_OR_oObj_of_type_QLabel ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qlayout.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qlayout.txt index 44f165447d..8493fff3f1 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qlayout.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qlayout.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject, QLayoutItem * $SYNTAX$ - * QLayout():new( ... ) + * QLayout( ... ) * QLayout():from( pPtr_OR_oObj_of_type_QLayout ) * QLayout():configure( pPtr_OR_oObj_of_type_QLayout ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qlayoutitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qlayoutitem.txt index 6f99514a51..bd3acf88d7 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qlayoutitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qlayoutitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QLayoutItem():new( ... ) + * QLayoutItem( ... ) * QLayoutItem():from( pPtr_OR_oObj_of_type_QLayoutItem ) * QLayoutItem():configure( pPtr_OR_oObj_of_type_QLayoutItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qlcdnumber.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qlcdnumber.txt index 1bdbb0c85e..a8b0277a4a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qlcdnumber.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qlcdnumber.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QFrame * $SYNTAX$ - * QLCDNumber():new( ... ) + * QLCDNumber( ... ) * QLCDNumber():from( pPtr_OR_oObj_of_type_QLCDNumber ) * QLCDNumber():configure( pPtr_OR_oObj_of_type_QLCDNumber ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qlineargradient.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qlineargradient.txt index f27acec83e..4d66b3ba71 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qlineargradient.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qlineargradient.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGradient * $SYNTAX$ - * QLinearGradient():new( ... ) + * QLinearGradient( ... ) * QLinearGradient():from( pPtr_OR_oObj_of_type_QLinearGradient ) * QLinearGradient():configure( pPtr_OR_oObj_of_type_QLinearGradient ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qlineedit.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qlineedit.txt index 0112824df1..c36bf88f4a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qlineedit.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qlineedit.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QLineEdit():new( ... ) + * QLineEdit( ... ) * QLineEdit():from( pPtr_OR_oObj_of_type_QLineEdit ) * QLineEdit():configure( pPtr_OR_oObj_of_type_QLineEdit ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qlistview.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qlistview.txt index 770f8b17ef..d43031148a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qlistview.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qlistview.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemView * $SYNTAX$ - * QListView():new( ... ) + * QListView( ... ) * QListView():from( pPtr_OR_oObj_of_type_QListView ) * QListView():configure( pPtr_OR_oObj_of_type_QListView ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidget.txt index 6ede4439c7..965d2b0908 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QListView * $SYNTAX$ - * QListWidget():new( ... ) + * QListWidget( ... ) * QListWidget():from( pPtr_OR_oObj_of_type_QListWidget ) * QListWidget():configure( pPtr_OR_oObj_of_type_QListWidget ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidgetitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidgetitem.txt index e2a55245f9..7979e27360 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidgetitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qlistwidgetitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QListWidgetItem():new( ... ) + * QListWidgetItem( ... ) * QListWidgetItem():from( pPtr_OR_oObj_of_type_QListWidgetItem ) * QListWidgetItem():configure( pPtr_OR_oObj_of_type_QListWidgetItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmainwindow.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmainwindow.txt index 436ab43117..f9f90402be 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmainwindow.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmainwindow.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QMainWindow():new( ... ) + * QMainWindow( ... ) * QMainWindow():from( pPtr_OR_oObj_of_type_QMainWindow ) * QMainWindow():configure( pPtr_OR_oObj_of_type_QMainWindow ) * $ARGUMENTS$ @@ -26,8 +26,11 @@ * $RETURNS$ * An instance of the object of type QMainWindow * $METHODS$ - * :addDockWidget( ... ) -> NIL - * :addToolBar( ... ) -> NIL + * :addDockWidget( nArea, pDockwidget ) -> NIL + * :addDockWidget_1( nArea, pDockwidget, nOrientation ) -> NIL + * :addToolBar( nArea, pToolbar ) -> NIL + * :addToolBar_1( pToolbar ) -> NIL + * :addToolBar_2( cTitle ) -> pQToolBar * :addToolBarBreak( nArea ) -> NIL * :centralWidget() -> pQWidget * :corner( nCorner ) -> nQt::DockWidgetArea diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmatrix.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmatrix.txt index d3a9df27fd..5780f855d5 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmatrix.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmatrix.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QMatrix():new( ... ) + * QMatrix( ... ) * QMatrix():from( pPtr_OR_oObj_of_type_QMatrix ) * QMatrix():configure( pPtr_OR_oObj_of_type_QMatrix ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmdiarea.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmdiarea.txt index 26d8635f54..24069b0d2d 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmdiarea.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmdiarea.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractScrollArea * $SYNTAX$ - * QMdiArea():new( ... ) + * QMdiArea( ... ) * QMdiArea():from( pPtr_OR_oObj_of_type_QMdiArea ) * QMdiArea():configure( pPtr_OR_oObj_of_type_QMdiArea ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmdisubwindow.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmdisubwindow.txt index 8b775d35a1..492f61aeba 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmdisubwindow.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmdisubwindow.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QMdiSubWindow():new( ... ) + * QMdiSubWindow( ... ) * QMdiSubWindow():from( pPtr_OR_oObj_of_type_QMdiSubWindow ) * QMdiSubWindow():configure( pPtr_OR_oObj_of_type_QMdiSubWindow ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt index 3b8c078cf1..c4ce4098ae 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QMenu():new( ... ) + * QMenu( ... ) * QMenu():from( pPtr_OR_oObj_of_type_QMenu ) * QMenu():configure( pPtr_OR_oObj_of_type_QMenu ) * $ARGUMENTS$ @@ -29,11 +29,17 @@ * :actionAt( pPt ) -> pQAction * :actionGeometry( pAct ) -> pQRect * :activeAction() -> pQAction - * :addAction( ... ) -> pQAction + * :addAction( cText ) -> pQAction + * :addAction_1( pIcon, cText ) -> pQAction + * :addAction_2( cText, pReceiver, pMember, pShortcut ) -> pQAction + * :addAction_3( pIcon, cText, pReceiver, pMember, pShortcut ) -> pQAction + * :addAction_4( pAction ) -> NIL + * :addMenu( pMenu ) -> pQAction * :addSeparator() -> pQAction * :clear() -> NIL * :defaultAction() -> pQAction - * :exec( ... ) -> pQAction + * :exec() -> pQAction + * :exec_1( pP, pAction ) -> pQAction * :hideTearOffMenu() -> NIL * :icon() -> pQIcon * :insertMenu( pBefore, pMenu ) -> pQAction diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmenubar.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmenubar.txt index 617df07f43..aef8a809bf 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmenubar.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmenubar.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QMenuBar():new( ... ) + * QMenuBar( ... ) * QMenuBar():from( pPtr_OR_oObj_of_type_QMenuBar ) * QMenuBar():configure( pPtr_OR_oObj_of_type_QMenuBar ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmessagebox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmessagebox.txt index 3310cfac09..f6f1398809 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmessagebox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmessagebox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDialog * $SYNTAX$ - * QMessageBox():new( ... ) + * QMessageBox( ... ) * QMessageBox():from( pPtr_OR_oObj_of_type_QMessageBox ) * QMessageBox():configure( pPtr_OR_oObj_of_type_QMessageBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmouseevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmouseevent.txt index 51670e6318..4d7ca8b501 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmouseevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmouseevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QInputEvent * $SYNTAX$ - * QMouseEvent():new( ... ) + * QMouseEvent( ... ) * QMouseEvent():from( pPtr_OR_oObj_of_type_QMouseEvent ) * QMouseEvent():configure( pPtr_OR_oObj_of_type_QMouseEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmoveevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmoveevent.txt index b0e1df58f1..a8b8872b55 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmoveevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmoveevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QEvent * $SYNTAX$ - * QMoveEvent():new( ... ) + * QMoveEvent( ... ) * QMoveEvent():from( pPtr_OR_oObj_of_type_QMoveEvent ) * QMoveEvent():configure( pPtr_OR_oObj_of_type_QMoveEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmovie.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmovie.txt index 6111707c2e..51b020d8b0 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmovie.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmovie.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QMovie():new( ... ) + * QMovie( ... ) * QMovie():from( pPtr_OR_oObj_of_type_QMovie ) * QMovie():configure( pPtr_OR_oObj_of_type_QMovie ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpagesetupdialog.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpagesetupdialog.txt index 75d67528af..5a1eac6017 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpagesetupdialog.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpagesetupdialog.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDialog * $SYNTAX$ - * QPageSetupDialog():new( ... ) + * QPageSetupDialog( ... ) * QPageSetupDialog():from( pPtr_OR_oObj_of_type_QPageSetupDialog ) * QPageSetupDialog():configure( pPtr_OR_oObj_of_type_QPageSetupDialog ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintdevice.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintdevice.txt index 9237edc9d2..fcb3ffb2ec 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintdevice.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintdevice.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPaintDevice():new( ... ) + * QPaintDevice( ... ) * QPaintDevice():from( pPtr_OR_oObj_of_type_QPaintDevice ) * QPaintDevice():configure( pPtr_OR_oObj_of_type_QPaintDevice ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintengine.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintengine.txt index b18d27efe4..c4903820bc 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintengine.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintengine.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPaintEngine():new( ... ) + * QPaintEngine( ... ) * QPaintEngine():from( pPtr_OR_oObj_of_type_QPaintEngine ) * QPaintEngine():configure( pPtr_OR_oObj_of_type_QPaintEngine ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt index 01726ddec4..b0320be271 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPainter():new( ... ) + * QPainter( ... ) * QPainter():from( pPtr_OR_oObj_of_type_QPainter ) * QPainter():configure( pPtr_OR_oObj_of_type_QPainter ) * $ARGUMENTS$ @@ -83,7 +83,8 @@ * :scale( nSx, nSy ) -> NIL * :setBackground( pBrush ) -> NIL * :setBackgroundMode( nMode ) -> NIL - * :setBrush( ... ) -> NIL + * :setBrush( pBrush ) -> NIL + * :setBrush_1( nStyle ) -> NIL * :setBrushOrigin( ... ) -> NIL * :setClipPath( pPath, nOperation ) -> NIL * :setClipRect( ... ) -> NIL @@ -98,8 +99,10 @@ * :setRenderHints( nHints, lOn ) -> NIL * :setTransform( pTransform, lCombine ) -> NIL * :setViewTransformEnabled( lEnable ) -> NIL - * :setViewport( ... ) -> NIL - * :setWindow( ... ) -> NIL + * :setViewport( pRectangle ) -> NIL + * :setViewport_1( nX, nY, nWidth, nHeight ) -> NIL + * :setWindow( pRectangle ) -> NIL + * :setWindow_1( nX, nY, nWidth, nHeight ) -> NIL * :setWorldMatrix( pMatrix, lCombine ) -> NIL * :setWorldMatrixEnabled( lEnable ) -> NIL * :setWorldTransform( pMatrix, lCombine ) -> NIL diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainterpath.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainterpath.txt index 22bf09242f..a524d9d575 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainterpath.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainterpath.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPainterPath():new( ... ) + * QPainterPath( ... ) * QPainterPath():from( pPtr_OR_oObj_of_type_QPainterPath ) * QPainterPath():configure( pPtr_OR_oObj_of_type_QPainterPath ) * $ARGUMENTS$ @@ -26,33 +26,44 @@ * $RETURNS$ * An instance of the object of type QPainterPath * $METHODS$ - * :addEllipse( ... ) -> NIL + * :addEllipse( pBoundingRectangle ) -> NIL + * :addEllipse_1( nX, nY, nWidth, nHeight ) -> NIL + * :addEllipse_2( pCenter, nRx, nRy ) -> NIL * :addPath( pPath ) -> NIL * :addPolygon( pPolygon ) -> NIL - * :addRect( ... ) -> NIL + * :addRect( pRectangle ) -> NIL + * :addRect_1( nX, nY, nWidth, nHeight ) -> NIL * :addRegion( pRegion ) -> NIL - * :addRoundedRect( ... ) -> NIL - * :addText( ... ) -> NIL + * :addRoundedRect( pRect, nXRadius, nYRadius, nMode ) -> NIL + * :addRoundedRect_1( nX, nY, nW, nH, nXRadius, nYRadius, nMode ) -> NIL + * :addText( pPoint, pFont, cText ) -> NIL + * :addText_1( nX, nY, pFont, cText ) -> NIL * :angleAtPercent( nT ) -> nQreal - * :arcMoveTo( ... ) -> NIL - * :arcTo( ... ) -> NIL + * :arcMoveTo( pRectangle, nAngle ) -> NIL + * :arcMoveTo_1( nX, nY, nWidth, nHeight, nAngle ) -> NIL + * :arcTo( pRectangle, nStartAngle, nSweepLength ) -> NIL + * :arcTo_1( nX, nY, nWidth, nHeight, nStartAngle, nSweepLength ) -> NIL * :boundingRect() -> pQRectF * :closeSubpath() -> NIL * :connectPath( pPath ) -> NIL * :contains( ... ) -> NIL * :controlPointRect() -> pQRectF - * :cubicTo( ... ) -> NIL + * :cubicTo( pC1, pC2, pEndPoint ) -> NIL + * :cubicTo_1( nC1X, nC1Y, nC2X, nC2Y, nEndPointX, nEndPointY ) -> NIL * :currentPosition() -> pQPointF * :elementCount() -> nInt * :fillRule() -> nQt::FillRule * :intersects( ... ) -> NIL * :isEmpty() -> lBool * :length() -> nQreal - * :lineTo( ... ) -> NIL - * :moveTo( ... ) -> NIL + * :lineTo( pEndPoint ) -> NIL + * :lineTo_1( nX, nY ) -> NIL + * :moveTo( pPoint ) -> NIL + * :moveTo_1( nX, nY ) -> NIL * :percentAtLength( nLen ) -> nQreal * :pointAtPercent( nT ) -> pQPointF - * :quadTo( ... ) -> NIL + * :quadTo( pC, pEndPoint ) -> NIL + * :quadTo_1( nCx, nCy, nEndPointX, nEndPointY ) -> NIL * :setElementPositionAt( nIndex, nX, nY ) -> NIL * :setFillRule( nFillRule ) -> NIL * :slopeAtPercent( nT ) -> nQreal diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintevent.txt index 964862017f..c464794071 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpaintevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QEvent * $SYNTAX$ - * QPaintEvent():new( ... ) + * QPaintEvent( ... ) * QPaintEvent():from( pPtr_OR_oObj_of_type_QPaintEvent ) * QPaintEvent():configure( pPtr_OR_oObj_of_type_QPaintEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpalette.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpalette.txt index 9faf17a281..ab1d9402aa 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpalette.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpalette.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPalette():new( ... ) + * QPalette( ... ) * QPalette():from( pPtr_OR_oObj_of_type_QPalette ) * QPalette():configure( pPtr_OR_oObj_of_type_QPalette ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpen.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpen.txt index 6c92f777d2..1389d2cd1b 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpen.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpen.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPen():new( ... ) + * QPen( ... ) * QPen():from( pPtr_OR_oObj_of_type_QPen ) * QPen():configure( pPtr_OR_oObj_of_type_QPen ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpicture.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpicture.txt index 7399fddbc7..a91adb65ed 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpicture.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpicture.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QPaintDevice * $SYNTAX$ - * QPicture():new( ... ) + * QPicture( ... ) * QPicture():from( pPtr_OR_oObj_of_type_QPicture ) * QPicture():configure( pPtr_OR_oObj_of_type_QPicture ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpixmap.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpixmap.txt index 1c52a08922..1834c1a7cb 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpixmap.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpixmap.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QPaintDevice * $SYNTAX$ - * QPixmap():new( ... ) + * QPixmap( ... ) * QPixmap():from( pPtr_OR_oObj_of_type_QPixmap ) * QPixmap():configure( pPtr_OR_oObj_of_type_QPixmap ) * $ARGUMENTS$ @@ -28,10 +28,13 @@ * $METHODS$ * :cacheKey() -> nQint64 * :createHeuristicMask( lClipTight ) -> pQBitmap - * :createMaskFromColor( ... ) -> pQBitmap + * :createMaskFromColor( pMaskColor, nMode ) -> pQBitmap + * :createMaskFromColor_1( pMaskColor ) -> pQBitmap * :depth() -> nInt * :detach() -> NIL - * :fill( ... ) -> NIL + * :fill( pColor ) -> NIL + * :fill_1( pWidget, pOffset ) -> NIL + * :fill_2( pWidget, nX, nY ) -> NIL * :hasAlpha() -> lBool * :hasAlphaChannel() -> lBool * :height() -> nInt @@ -41,7 +44,8 @@ * :loadFromData( pData, pFormat, nFlags ) -> lBool * :mask() -> pQBitmap * :rect() -> pQRect - * :save( ... ) -> lBool + * :save( cFileName, pFormat, nQuality ) -> lBool + * :save_1( pDevice, pFormat, nQuality ) -> lBool * :setAlphaChannel( pAlphaChannel ) -> NIL * :setMask( pMask ) -> NIL * :size() -> pQSize diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qplaintextdocumentlayout.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qplaintextdocumentlayout.txt index 620a23865b..981e7ab400 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qplaintextdocumentlayout.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qplaintextdocumentlayout.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractTextDocumentLayout * $SYNTAX$ - * QPlainTextDocumentLayout():new( ... ) + * QPlainTextDocumentLayout( ... ) * QPlainTextDocumentLayout():from( pPtr_OR_oObj_of_type_QPlainTextDocumentLayout ) * QPlainTextDocumentLayout():configure( pPtr_OR_oObj_of_type_QPlainTextDocumentLayout ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qplaintextedit.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qplaintextedit.txt index 96761d7e3c..42e40d98a6 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qplaintextedit.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qplaintextedit.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractScrollArea * $SYNTAX$ - * QPlainTextEdit():new( ... ) + * QPlainTextEdit( ... ) * QPlainTextEdit():from( pPtr_OR_oObj_of_type_QPlainTextEdit ) * QPlainTextEdit():configure( pPtr_OR_oObj_of_type_QPlainTextEdit ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpolygon.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpolygon.txt index 7d4c5286a1..5c2c4735bf 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpolygon.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpolygon.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPolygon():new( ... ) + * QPolygon( ... ) * QPolygon():from( pPtr_OR_oObj_of_type_QPolygon ) * QPolygon():configure( pPtr_OR_oObj_of_type_QPolygon ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpolygonf.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpolygonf.txt index 9d5317789f..c7dd457a8c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpolygonf.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpolygonf.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPolygonF():new( ... ) + * QPolygonF( ... ) * QPolygonF():from( pPtr_OR_oObj_of_type_QPolygonF ) * QPolygonF():configure( pPtr_OR_oObj_of_type_QPolygonF ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qprintdialog.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qprintdialog.txt index d85940dd31..a251593b56 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qprintdialog.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qprintdialog.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractPrintDialog * $SYNTAX$ - * QPrintDialog():new( ... ) + * QPrintDialog( ... ) * QPrintDialog():from( pPtr_OR_oObj_of_type_QPrintDialog ) * QPrintDialog():configure( pPtr_OR_oObj_of_type_QPrintDialog ) * $ARGUMENTS$ @@ -30,7 +30,6 @@ * :open( pReceiver, pMember ) -> NIL * :options() -> nPrintDialogOptions * :printer() -> pQPrinter - * :printer_1() -> pQPrinter * :setOption( nOption, lOn ) -> NIL * :setOptions( nOptions ) -> NIL * :setVisible( lVisible ) -> NIL diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qprintengine.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qprintengine.txt index 6e8157aa76..85b435d8fb 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qprintengine.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qprintengine.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPrintEngine():new( ... ) + * QPrintEngine( ... ) * QPrintEngine():from( pPtr_OR_oObj_of_type_QPrintEngine ) * QPrintEngine():configure( pPtr_OR_oObj_of_type_QPrintEngine ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qprinter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qprinter.txt index 9ce45c8fe9..008e472c29 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qprinter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qprinter.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QPaintDevice * $SYNTAX$ - * QPrinter():new( ... ) + * QPrinter( ... ) * QPrinter():from( pPtr_OR_oObj_of_type_QPrinter ) * QPrinter():configure( pPtr_OR_oObj_of_type_QPrinter ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qprinterinfo.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qprinterinfo.txt index 3ad1fcc9af..f36f7f1955 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qprinterinfo.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qprinterinfo.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QPrinterInfo():new( ... ) + * QPrinterInfo( ... ) * QPrinterInfo():from( pPtr_OR_oObj_of_type_QPrinterInfo ) * QPrinterInfo():configure( pPtr_OR_oObj_of_type_QPrinterInfo ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qprintpreviewdialog.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qprintpreviewdialog.txt index 77486eefaa..2ce7f42671 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qprintpreviewdialog.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qprintpreviewdialog.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDialog * $SYNTAX$ - * QPrintPreviewDialog():new( ... ) + * QPrintPreviewDialog( ... ) * QPrintPreviewDialog():from( pPtr_OR_oObj_of_type_QPrintPreviewDialog ) * QPrintPreviewDialog():configure( pPtr_OR_oObj_of_type_QPrintPreviewDialog ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qprogressbar.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qprogressbar.txt index a4c38ad874..5696dfd386 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qprogressbar.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qprogressbar.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QProgressBar():new( ... ) + * QProgressBar( ... ) * QProgressBar():from( pPtr_OR_oObj_of_type_QProgressBar ) * QProgressBar():configure( pPtr_OR_oObj_of_type_QProgressBar ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qprogressdialog.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qprogressdialog.txt index aee8a1a115..d4ff32a254 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qprogressdialog.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qprogressdialog.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDialog * $SYNTAX$ - * QProgressDialog():new( ... ) + * QProgressDialog( ... ) * QProgressDialog():from( pPtr_OR_oObj_of_type_QProgressDialog ) * QProgressDialog():configure( pPtr_OR_oObj_of_type_QProgressDialog ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpushbutton.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpushbutton.txt index 64cb018ad6..5a51fbeca4 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpushbutton.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpushbutton.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractButton * $SYNTAX$ - * QPushButton():new( ... ) + * QPushButton( ... ) * QPushButton():from( pPtr_OR_oObj_of_type_QPushButton ) * QPushButton():configure( pPtr_OR_oObj_of_type_QPushButton ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qradialgradient.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qradialgradient.txt index 95e7be12f0..463832ce60 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qradialgradient.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qradialgradient.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QGradient * $SYNTAX$ - * QRadialGradient():new( ... ) + * QRadialGradient( ... ) * QRadialGradient():from( pPtr_OR_oObj_of_type_QRadialGradient ) * QRadialGradient():configure( pPtr_OR_oObj_of_type_QRadialGradient ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qregexpvalidator.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qregexpvalidator.txt index e47b975f7b..c906f30011 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qregexpvalidator.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qregexpvalidator.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QValidator * $SYNTAX$ - * QRegExpValidator():new( ... ) + * QRegExpValidator( ... ) * QRegExpValidator():from( pPtr_OR_oObj_of_type_QRegExpValidator ) * QRegExpValidator():configure( pPtr_OR_oObj_of_type_QRegExpValidator ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qregion.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qregion.txt index 702712589e..02e0e6d9e6 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qregion.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qregion.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QRegion():new( ... ) + * QRegion( ... ) * QRegion():from( pPtr_OR_oObj_of_type_QRegion ) * QRegion():configure( pPtr_OR_oObj_of_type_QRegion ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qresizeevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qresizeevent.txt index 79448567ea..cbbb5a6aac 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qresizeevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qresizeevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QEvent * $SYNTAX$ - * QResizeEvent():new( ... ) + * QResizeEvent( ... ) * QResizeEvent():from( pPtr_OR_oObj_of_type_QResizeEvent ) * QResizeEvent():configure( pPtr_OR_oObj_of_type_QResizeEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qscrollarea.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qscrollarea.txt index 01e0a8327d..976a01bd0b 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qscrollarea.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qscrollarea.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractScrollArea * $SYNTAX$ - * QScrollArea():new( ... ) + * QScrollArea( ... ) * QScrollArea():from( pPtr_OR_oObj_of_type_QScrollArea ) * QScrollArea():configure( pPtr_OR_oObj_of_type_QScrollArea ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qsessionmanager.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qsessionmanager.txt index 3557be21b2..b9d1a2f8b9 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qsessionmanager.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qsessionmanager.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QSessionManager():new( ... ) + * QSessionManager( ... ) * QSessionManager():from( pPtr_OR_oObj_of_type_QSessionManager ) * QSessionManager():configure( pPtr_OR_oObj_of_type_QSessionManager ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qsizepolicy.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qsizepolicy.txt index 87e2792812..78d634342a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qsizepolicy.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qsizepolicy.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QSizePolicy():new( ... ) + * QSizePolicy( ... ) * QSizePolicy():from( pPtr_OR_oObj_of_type_QSizePolicy ) * QSizePolicy():configure( pPtr_OR_oObj_of_type_QSizePolicy ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qslider.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qslider.txt index 86b5b8417f..f9dded8595 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qslider.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qslider.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractSlider * $SYNTAX$ - * QSlider():new( ... ) + * QSlider( ... ) * QSlider():from( pPtr_OR_oObj_of_type_QSlider ) * QSlider():configure( pPtr_OR_oObj_of_type_QSlider ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qsound.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qsound.txt index 59c67e2a9c..cd8f1a657a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qsound.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qsound.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QSound():new( ... ) + * QSound( ... ) * QSound():from( pPtr_OR_oObj_of_type_QSound ) * QSound():configure( pPtr_OR_oObj_of_type_QSound ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qspaceritem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qspaceritem.txt index c13ccc3a22..e689d7f89c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qspaceritem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qspaceritem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QLayoutItem * $SYNTAX$ - * QSpacerItem():new( ... ) + * QSpacerItem( ... ) * QSpacerItem():from( pPtr_OR_oObj_of_type_QSpacerItem ) * QSpacerItem():configure( pPtr_OR_oObj_of_type_QSpacerItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qspinbox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qspinbox.txt index aa9e708406..abc9c3585e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qspinbox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qspinbox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractSpinBox * $SYNTAX$ - * QSpinBox():new( ... ) + * QSpinBox( ... ) * QSpinBox():from( pPtr_OR_oObj_of_type_QSpinBox ) * QSpinBox():configure( pPtr_OR_oObj_of_type_QSpinBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qsplashscreen.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qsplashscreen.txt index e85ba2d3c7..5eff382235 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qsplashscreen.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qsplashscreen.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QSplashScreen():new( ... ) + * QSplashScreen( ... ) * QSplashScreen():from( pPtr_OR_oObj_of_type_QSplashScreen ) * QSplashScreen():configure( pPtr_OR_oObj_of_type_QSplashScreen ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qsplitter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qsplitter.txt index 57c8ff8777..69698af9ef 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qsplitter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qsplitter.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QFrame * $SYNTAX$ - * QSplitter():new( ... ) + * QSplitter( ... ) * QSplitter():from( pPtr_OR_oObj_of_type_QSplitter ) * QSplitter():configure( pPtr_OR_oObj_of_type_QSplitter ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstackedwidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstackedwidget.txt index 59fda4009c..d434a3b56a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstackedwidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstackedwidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QFrame * $SYNTAX$ - * QStackedWidget():new( ... ) + * QStackedWidget( ... ) * QStackedWidget():from( pPtr_OR_oObj_of_type_QStackedWidget ) * QStackedWidget():configure( pPtr_OR_oObj_of_type_QStackedWidget ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditem.txt index 2e58f17229..d72e37b1fd 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QStandardItem():new( ... ) + * QStandardItem( ... ) * QStandardItem():from( pPtr_OR_oObj_of_type_QStandardItem ) * QStandardItem():configure( pPtr_OR_oObj_of_type_QStandardItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditemmodel.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditemmodel.txt index 724bf774b2..c6940304ae 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditemmodel.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstandarditemmodel.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemModeL * $SYNTAX$ - * QStandardItemModel():new( ... ) + * QStandardItemModel( ... ) * QStandardItemModel():from( pPtr_OR_oObj_of_type_QStandardItemModel ) * QStandardItemModel():configure( pPtr_OR_oObj_of_type_QStandardItemModel ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstatusbar.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstatusbar.txt index e9a17659a9..2501d1c23c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstatusbar.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstatusbar.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QStatusBar():new( ... ) + * QStatusBar( ... ) * QStatusBar():from( pPtr_OR_oObj_of_type_QStatusBar ) * QStatusBar():configure( pPtr_OR_oObj_of_type_QStatusBar ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstringlistmodel.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstringlistmodel.txt index 1014d49768..7e43e46745 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstringlistmodel.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstringlistmodel.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractListModel * $SYNTAX$ - * QStringListModel():new( ... ) + * QStringListModel( ... ) * QStringListModel():from( pPtr_OR_oObj_of_type_QStringListModel ) * QStringListModel():configure( pPtr_OR_oObj_of_type_QStringListModel ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyle.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyle.txt index 6a0cb649e7..2b62f8bb2a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyle.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyle.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QStyle():new( ... ) + * QStyle( ... ) * QStyle():from( pPtr_OR_oObj_of_type_QStyle ) * QStyle():configure( pPtr_OR_oObj_of_type_QStyle ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleditemdelegate.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleditemdelegate.txt index 7c35c512c4..2cf241678a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleditemdelegate.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleditemdelegate.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QStyledItemDelegate():new( ... ) + * QStyledItemDelegate( ... ) * QStyledItemDelegate():from( pPtr_OR_oObj_of_type_QStyledItemDelegate ) * QStyledItemDelegate():configure( pPtr_OR_oObj_of_type_QStyledItemDelegate ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstylefactory.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstylefactory.txt index 869e407781..88ccc2ffd3 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstylefactory.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstylefactory.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QStyleFactory():new( ... ) + * QStyleFactory( ... ) * QStyleFactory():from( pPtr_OR_oObj_of_type_QStyleFactory ) * QStyleFactory():configure( pPtr_OR_oObj_of_type_QStyleFactory ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoption.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoption.txt index a1b1482d0d..78edc8bc00 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoption.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoption.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QStyleOption():new( ... ) + * QStyleOption( ... ) * QStyleOption():from( pPtr_OR_oObj_of_type_QStyleOption ) * QStyleOption():configure( pPtr_OR_oObj_of_type_QStyleOption ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionbutton.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionbutton.txt index ceb76478a5..1dde2962b5 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionbutton.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionbutton.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionButton():new( ... ) + * QStyleOptionButton( ... ) * QStyleOptionButton():from( pPtr_OR_oObj_of_type_QStyleOptionButton ) * QStyleOptionButton():configure( pPtr_OR_oObj_of_type_QStyleOptionButton ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptioncombobox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptioncombobox.txt index 5eb3df5423..a8e834d71b 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptioncombobox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptioncombobox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionComboBox():new( ... ) + * QStyleOptionComboBox( ... ) * QStyleOptionComboBox():from( pPtr_OR_oObj_of_type_QStyleOptionComboBox ) * QStyleOptionComboBox():configure( pPtr_OR_oObj_of_type_QStyleOptionComboBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptioncomplex.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptioncomplex.txt index a1f74523b5..3d13b70f4c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptioncomplex.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptioncomplex.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionComplex():new( ... ) + * QStyleOptionComplex( ... ) * QStyleOptionComplex():from( pPtr_OR_oObj_of_type_QStyleOptionComplex ) * QStyleOptionComplex():configure( pPtr_OR_oObj_of_type_QStyleOptionComplex ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiondockwidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiondockwidget.txt index a39f542014..79cb73d369 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiondockwidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiondockwidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionDockWidget():new( ... ) + * QStyleOptionDockWidget( ... ) * QStyleOptionDockWidget():from( pPtr_OR_oObj_of_type_QStyleOptionDockWidget ) * QStyleOptionDockWidget():configure( pPtr_OR_oObj_of_type_QStyleOptionDockWidget ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionfocusrect.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionfocusrect.txt index 1d70738709..b94edd9a03 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionfocusrect.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionfocusrect.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionFocusRect():new( ... ) + * QStyleOptionFocusRect( ... ) * QStyleOptionFocusRect():from( pPtr_OR_oObj_of_type_QStyleOptionFocusRect ) * QStyleOptionFocusRect():configure( pPtr_OR_oObj_of_type_QStyleOptionFocusRect ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionframe.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionframe.txt index fb997acefc..33ecee5b7d 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionframe.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionframe.txt @@ -18,7 +18,7 @@ * $INHERITS$ * qStyleOption * $SYNTAX$ - * QStyleOptionFrame():new( ... ) + * QStyleOptionFrame( ... ) * QStyleOptionFrame():from( pPtr_OR_oObj_of_type_QStyleOptionFrame ) * QStyleOptionFrame():configure( pPtr_OR_oObj_of_type_QStyleOptionFrame ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiongraphicsitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiongraphicsitem.txt index 4c2c5afac3..5c7b252d81 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiongraphicsitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiongraphicsitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionGraphicsItem():new( ... ) + * QStyleOptionGraphicsItem( ... ) * QStyleOptionGraphicsItem():from( pPtr_OR_oObj_of_type_QStyleOptionGraphicsItem ) * QStyleOptionGraphicsItem():configure( pPtr_OR_oObj_of_type_QStyleOptionGraphicsItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiongroupbox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiongroupbox.txt index 0eda9f799e..3de6e4f954 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiongroupbox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiongroupbox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOptionComplex * $SYNTAX$ - * QStyleOptionGroupBox():new( ... ) + * QStyleOptionGroupBox( ... ) * QStyleOptionGroupBox():from( pPtr_OR_oObj_of_type_QStyleOptionGroupBox ) * QStyleOptionGroupBox():configure( pPtr_OR_oObj_of_type_QStyleOptionGroupBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionheader.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionheader.txt index 4c01624d1c..e926410172 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionheader.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionheader.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionHeader():new( ... ) + * QStyleOptionHeader( ... ) * QStyleOptionHeader():from( pPtr_OR_oObj_of_type_QStyleOptionHeader ) * QStyleOptionHeader():configure( pPtr_OR_oObj_of_type_QStyleOptionHeader ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionmenuitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionmenuitem.txt index ec4fb22e7e..974687137b 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionmenuitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionmenuitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionMenuItem():new( ... ) + * QStyleOptionMenuItem( ... ) * QStyleOptionMenuItem():from( pPtr_OR_oObj_of_type_QStyleOptionMenuItem ) * QStyleOptionMenuItem():configure( pPtr_OR_oObj_of_type_QStyleOptionMenuItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionprogressbar.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionprogressbar.txt index b92df05853..f4cf1e59c1 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionprogressbar.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionprogressbar.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionProgressBar():new( ... ) + * QStyleOptionProgressBar( ... ) * QStyleOptionProgressBar():from( pPtr_OR_oObj_of_type_QStyleOptionProgressBar ) * QStyleOptionProgressBar():configure( pPtr_OR_oObj_of_type_QStyleOptionProgressBar ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionsizegrip.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionsizegrip.txt index e8666733ab..1c847d4d18 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionsizegrip.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionsizegrip.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOptionComplex * $SYNTAX$ - * QStyleOptionSizeGrip():new( ... ) + * QStyleOptionSizeGrip( ... ) * QStyleOptionSizeGrip():from( pPtr_OR_oObj_of_type_QStyleOptionSizeGrip ) * QStyleOptionSizeGrip():configure( pPtr_OR_oObj_of_type_QStyleOptionSizeGrip ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionslider.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionslider.txt index 36bac23dec..a1b41258f1 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionslider.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionslider.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOptionComplex * $SYNTAX$ - * QStyleOptionSlider():new( ... ) + * QStyleOptionSlider( ... ) * QStyleOptionSlider():from( pPtr_OR_oObj_of_type_QStyleOptionSlider ) * QStyleOptionSlider():configure( pPtr_OR_oObj_of_type_QStyleOptionSlider ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionspinbox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionspinbox.txt index 3b290da51e..a9f60646bf 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionspinbox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionspinbox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOptionComplex * $SYNTAX$ - * QStyleOptionSpinBox():new( ... ) + * QStyleOptionSpinBox( ... ) * QStyleOptionSpinBox():from( pPtr_OR_oObj_of_type_QStyleOptionSpinBox ) * QStyleOptionSpinBox():configure( pPtr_OR_oObj_of_type_QStyleOptionSpinBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontab.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontab.txt index 3064cd6bd5..c6d959f8d6 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontab.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontab.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionTab():new( ... ) + * QStyleOptionTab( ... ) * QStyleOptionTab():from( pPtr_OR_oObj_of_type_QStyleOptionTab ) * QStyleOptionTab():configure( pPtr_OR_oObj_of_type_QStyleOptionTab ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontabbarbase.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontabbarbase.txt index 51a73c06e5..14da149c3a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontabbarbase.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontabbarbase.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionTabBarBase():new( ... ) + * QStyleOptionTabBarBase( ... ) * QStyleOptionTabBarBase():from( pPtr_OR_oObj_of_type_QStyleOptionTabBarBase ) * QStyleOptionTabBarBase():configure( pPtr_OR_oObj_of_type_QStyleOptionTabBarBase ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontabwidgetframe.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontabwidgetframe.txt index 765a2f750d..50e2244b6e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontabwidgetframe.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontabwidgetframe.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionTabWidgetFrame():new( ... ) + * QStyleOptionTabWidgetFrame( ... ) * QStyleOptionTabWidgetFrame():from( pPtr_OR_oObj_of_type_QStyleOptionTabWidgetFrame ) * QStyleOptionTabWidgetFrame():configure( pPtr_OR_oObj_of_type_QStyleOptionTabWidgetFrame ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontitlebar.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontitlebar.txt index fc3eba8c98..9960608b85 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontitlebar.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontitlebar.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOptionComplex * $SYNTAX$ - * QStyleOptionTitleBar():new( ... ) + * QStyleOptionTitleBar( ... ) * QStyleOptionTitleBar():from( pPtr_OR_oObj_of_type_QStyleOptionTitleBar ) * QStyleOptionTitleBar():configure( pPtr_OR_oObj_of_type_QStyleOptionTitleBar ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbar.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbar.txt index 85d93d3205..e01b51b44c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbar.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbar.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionToolBar():new( ... ) + * QStyleOptionToolBar( ... ) * QStyleOptionToolBar():from( pPtr_OR_oObj_of_type_QStyleOptionToolBar ) * QStyleOptionToolBar():configure( pPtr_OR_oObj_of_type_QStyleOptionToolBar ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbox.txt index 39c09edb97..061532e07a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionToolBox():new( ... ) + * QStyleOptionToolBox( ... ) * QStyleOptionToolBox():from( pPtr_OR_oObj_of_type_QStyleOptionToolBox ) * QStyleOptionToolBox():configure( pPtr_OR_oObj_of_type_QStyleOptionToolBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbutton.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbutton.txt index 44960d612f..25b05a60f0 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbutton.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptiontoolbutton.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOptionComplex * $SYNTAX$ - * QStyleOptionToolButton():new( ... ) + * QStyleOptionToolButton( ... ) * QStyleOptionToolButton():from( pPtr_OR_oObj_of_type_QStyleOptionToolButton ) * QStyleOptionToolButton():configure( pPtr_OR_oObj_of_type_QStyleOptionToolButton ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionviewitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionviewitem.txt index 75046f30a2..ef1df47264 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionviewitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstyleoptionviewitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QStyleOption * $SYNTAX$ - * QStyleOptionViewItem():new( ... ) + * QStyleOptionViewItem( ... ) * QStyleOptionViewItem():from( pPtr_OR_oObj_of_type_QStyleOptionViewItem ) * QStyleOptionViewItem():configure( pPtr_OR_oObj_of_type_QStyleOptionViewItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qstylepainter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qstylepainter.txt index abcffe2b22..9ad626edd3 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qstylepainter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qstylepainter.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QPainter * $SYNTAX$ - * QStylePainter():new( ... ) + * QStylePainter( ... ) * QStylePainter():from( pPtr_OR_oObj_of_type_QStylePainter ) * QStylePainter():configure( pPtr_OR_oObj_of_type_QStylePainter ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qsyntaxhighlighter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qsyntaxhighlighter.txt index 9a871ef308..43944c532c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qsyntaxhighlighter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qsyntaxhighlighter.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QSyntaxHighlighter():new( ... ) + * QSyntaxHighlighter( ... ) * QSyntaxHighlighter():from( pPtr_OR_oObj_of_type_QSyntaxHighlighter ) * QSyntaxHighlighter():configure( pPtr_OR_oObj_of_type_QSyntaxHighlighter ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qsystemtrayicon.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qsystemtrayicon.txt index a449f06077..3bc2a89973 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qsystemtrayicon.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qsystemtrayicon.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QSystemTrayIcon():new( ... ) + * QSystemTrayIcon( ... ) * QSystemTrayIcon():from( pPtr_OR_oObj_of_type_QSystemTrayIcon ) * QSystemTrayIcon():configure( pPtr_OR_oObj_of_type_QSystemTrayIcon ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtabbar.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtabbar.txt index ac47e6a4e1..72bd9735c3 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtabbar.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtabbar.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QTabBar():new( ... ) + * QTabBar( ... ) * QTabBar():from( pPtr_OR_oObj_of_type_QTabBar ) * QTabBar():configure( pPtr_OR_oObj_of_type_QTabBar ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtableview.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtableview.txt index 8e2cc78737..e85b1f3def 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtableview.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtableview.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemView * $SYNTAX$ - * QTableView():new( ... ) + * QTableView( ... ) * QTableView():from( pPtr_OR_oObj_of_type_QTableView ) * QTableView():configure( pPtr_OR_oObj_of_type_QTableView ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidget.txt index a37ebbf398..39bd7dd3e8 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QTableView * $SYNTAX$ - * QTableWidget():new( ... ) + * QTableWidget( ... ) * QTableWidget():from( pPtr_OR_oObj_of_type_QTableWidget ) * QTableWidget():configure( pPtr_OR_oObj_of_type_QTableWidget ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetitem.txt index 352db94b4b..1c0e816ec3 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTableWidgetItem():new( ... ) + * QTableWidgetItem( ... ) * QTableWidgetItem():from( pPtr_OR_oObj_of_type_QTableWidgetItem ) * QTableWidgetItem():configure( pPtr_OR_oObj_of_type_QTableWidgetItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetselectionrange.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetselectionrange.txt index 1eabc1b3b0..f0ce7e5206 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetselectionrange.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtablewidgetselectionrange.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTableWidgetSelectionRange():new( ... ) + * QTableWidgetSelectionRange( ... ) * QTableWidgetSelectionRange():from( pPtr_OR_oObj_of_type_QTableWidgetSelectionRange ) * QTableWidgetSelectionRange():configure( pPtr_OR_oObj_of_type_QTableWidgetSelectionRange ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtabwidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtabwidget.txt index 165d64e999..e70f538b59 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtabwidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtabwidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QTabWidget():new( ... ) + * QTabWidget( ... ) * QTabWidget():from( pPtr_OR_oObj_of_type_QTabWidget ) * QTabWidget():configure( pPtr_OR_oObj_of_type_QTabWidget ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextblock.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextblock.txt index 5f5a98d29f..1f87d79a41 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextblock.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextblock.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextBlock():new( ... ) + * QTextBlock( ... ) * QTextBlock():from( pPtr_OR_oObj_of_type_QTextBlock ) * QTextBlock():configure( pPtr_OR_oObj_of_type_QTextBlock ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextblockformat.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextblockformat.txt index 80e283e227..d39a6f79de 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextblockformat.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextblockformat.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QTextFormat * $SYNTAX$ - * QTextBlockFormat():new( ... ) + * QTextBlockFormat( ... ) * QTextBlockFormat():from( pPtr_OR_oObj_of_type_QTextBlockFormat ) * QTextBlockFormat():configure( pPtr_OR_oObj_of_type_QTextBlockFormat ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextbrowser.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextbrowser.txt index dfaea96e7b..ae2e9c5216 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextbrowser.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextbrowser.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QTextEdit * $SYNTAX$ - * QTextBrowser():new( ... ) + * QTextBrowser( ... ) * QTextBrowser():from( pPtr_OR_oObj_of_type_QTextBrowser ) * QTextBrowser():configure( pPtr_OR_oObj_of_type_QTextBrowser ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextcharformat.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextcharformat.txt index 88eec4aa88..2a728d3426 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextcharformat.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextcharformat.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QTextFormat * $SYNTAX$ - * QTextCharFormat():new( ... ) + * QTextCharFormat( ... ) * QTextCharFormat():from( pPtr_OR_oObj_of_type_QTextCharFormat ) * QTextCharFormat():configure( pPtr_OR_oObj_of_type_QTextCharFormat ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextcursor.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextcursor.txt index b437488cea..3ce519b70e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextcursor.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextcursor.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextCursor():new( ... ) + * QTextCursor( ... ) * QTextCursor():from( pPtr_OR_oObj_of_type_QTextCursor ) * QTextCursor():configure( pPtr_OR_oObj_of_type_QTextCursor ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocument.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocument.txt index 62b4461a82..10cd948027 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocument.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocument.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QTextDocument():new( ... ) + * QTextDocument( ... ) * QTextDocument():from( pPtr_OR_oObj_of_type_QTextDocument ) * QTextDocument():configure( pPtr_OR_oObj_of_type_QTextDocument ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocumentfragment.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocumentfragment.txt index 2579d6c964..179b94200e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocumentfragment.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocumentfragment.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextDocumentFragment():new( ... ) + * QTextDocumentFragment( ... ) * QTextDocumentFragment():from( pPtr_OR_oObj_of_type_QTextDocumentFragment ) * QTextDocumentFragment():configure( pPtr_OR_oObj_of_type_QTextDocumentFragment ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocumentwriter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocumentwriter.txt index 0fe2514fdc..2de91fcc5e 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocumentwriter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextdocumentwriter.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextDocumentWriter():new( ... ) + * QTextDocumentWriter( ... ) * QTextDocumentWriter():from( pPtr_OR_oObj_of_type_QTextDocumentWriter ) * QTextDocumentWriter():configure( pPtr_OR_oObj_of_type_QTextDocumentWriter ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextedit.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextedit.txt index 1ca5d16de3..fe526ff934 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextedit.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextedit.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractScrollArea * $SYNTAX$ - * QTextEdit():new( ... ) + * QTextEdit( ... ) * QTextEdit():from( pPtr_OR_oObj_of_type_QTextEdit ) * QTextEdit():configure( pPtr_OR_oObj_of_type_QTextEdit ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextformat.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextformat.txt index d5bbb562de..038566b847 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextformat.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextformat.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextFormat():new( ... ) + * QTextFormat( ... ) * QTextFormat():from( pPtr_OR_oObj_of_type_QTextFormat ) * QTextFormat():configure( pPtr_OR_oObj_of_type_QTextFormat ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextfragment.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextfragment.txt index 69c17475cf..9295b3aab7 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextfragment.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextfragment.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextFragment():new( ... ) + * QTextFragment( ... ) * QTextFragment():from( pPtr_OR_oObj_of_type_QTextFragment ) * QTextFragment():configure( pPtr_OR_oObj_of_type_QTextFragment ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextframe.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextframe.txt index 2f379c5ba4..e77678171f 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextframe.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextframe.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QTextObject * $SYNTAX$ - * QTextFrame():new( ... ) + * QTextFrame( ... ) * QTextFrame():from( pPtr_OR_oObj_of_type_QTextFrame ) * QTextFrame():configure( pPtr_OR_oObj_of_type_QTextFrame ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextframeformat.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextframeformat.txt index 80abdb64e6..63bfa300de 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextframeformat.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextframeformat.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QTextFormat * $SYNTAX$ - * QTextFrameFormat():new( ... ) + * QTextFrameFormat( ... ) * QTextFrameFormat():from( pPtr_OR_oObj_of_type_QTextFrameFormat ) * QTextFrameFormat():configure( pPtr_OR_oObj_of_type_QTextFrameFormat ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextimageformat.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextimageformat.txt index b315563222..b5cd29b8e5 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextimageformat.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextimageformat.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QTextCharFormat * $SYNTAX$ - * QTextImageFormat():new( ... ) + * QTextImageFormat( ... ) * QTextImageFormat():from( pPtr_OR_oObj_of_type_QTextImageFormat ) * QTextImageFormat():configure( pPtr_OR_oObj_of_type_QTextImageFormat ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextinlineobject.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextinlineobject.txt index 49ba421ad1..6354faf762 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextinlineobject.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextinlineobject.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextInlineObject():new( ... ) + * QTextInlineObject( ... ) * QTextInlineObject():from( pPtr_OR_oObj_of_type_QTextInlineObject ) * QTextInlineObject():configure( pPtr_OR_oObj_of_type_QTextInlineObject ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextitem.txt index f3b5c76b6b..b390c576a3 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextItem():new( ... ) + * QTextItem( ... ) * QTextItem():from( pPtr_OR_oObj_of_type_QTextItem ) * QTextItem():configure( pPtr_OR_oObj_of_type_QTextItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlayout.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlayout.txt index 9ec65ae3aa..d2fb754a39 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlayout.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlayout.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextLayout():new( ... ) + * QTextLayout( ... ) * QTextLayout():from( pPtr_OR_oObj_of_type_QTextLayout ) * QTextLayout():configure( pPtr_OR_oObj_of_type_QTextLayout ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlength.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlength.txt index 4c6b21a0c4..7510f19fa1 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlength.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlength.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextLength():new( ... ) + * QTextLength( ... ) * QTextLength():from( pPtr_OR_oObj_of_type_QTextLength ) * QTextLength():configure( pPtr_OR_oObj_of_type_QTextLength ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextline.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextline.txt index e231211759..8f0d7b86c4 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextline.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextline.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextLine():new( ... ) + * QTextLine( ... ) * QTextLine():from( pPtr_OR_oObj_of_type_QTextLine ) * QTextLine():configure( pPtr_OR_oObj_of_type_QTextLine ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlist.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlist.txt index ba6bbcf9f0..9173a1dd2c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlist.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlist.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QTextBlockGroup * $SYNTAX$ - * QTextList():new( ... ) + * QTextList( ... ) * QTextList():from( pPtr_OR_oObj_of_type_QTextList ) * QTextList():configure( pPtr_OR_oObj_of_type_QTextList ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlistformat.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlistformat.txt index 2ee9964788..471c705717 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlistformat.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextlistformat.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QTextFormat * $SYNTAX$ - * QTextListFormat():new( ... ) + * QTextListFormat( ... ) * QTextListFormat():from( pPtr_OR_oObj_of_type_QTextListFormat ) * QTextListFormat():configure( pPtr_OR_oObj_of_type_QTextListFormat ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextobject.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextobject.txt index 4e9ab03bc1..6ff7186242 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextobject.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextobject.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QTextObject():new( ... ) + * QTextObject( ... ) * QTextObject():from( pPtr_OR_oObj_of_type_QTextObject ) * QTextObject():configure( pPtr_OR_oObj_of_type_QTextObject ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextoption.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextoption.txt index f0d69d1a72..915fc27549 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtextoption.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtextoption.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTextOption():new( ... ) + * QTextOption( ... ) * QTextOption():from( pPtr_OR_oObj_of_type_QTextOption ) * QTextOption():configure( pPtr_OR_oObj_of_type_QTextOption ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtexttableformat.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtexttableformat.txt index 5c529af0b7..ef126cd80c 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtexttableformat.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtexttableformat.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QTextFrameFormat * $SYNTAX$ - * QTextTableFormat():new( ... ) + * QTextTableFormat( ... ) * QTextTableFormat():from( pPtr_OR_oObj_of_type_QTextTableFormat ) * QTextTableFormat():configure( pPtr_OR_oObj_of_type_QTextTableFormat ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbar.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbar.txt index ff14bd98b1..9b7fe76fbf 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbar.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbar.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QToolBar():new( ... ) + * QToolBar( ... ) * QToolBar():from( pPtr_OR_oObj_of_type_QToolBar ) * QToolBar():configure( pPtr_OR_oObj_of_type_QToolBar ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbox.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbox.txt index 1c926adfcf..ca56b1384a 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbox.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbox.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QFrame * $SYNTAX$ - * QToolBox():new( ... ) + * QToolBox( ... ) * QToolBox():from( pPtr_OR_oObj_of_type_QToolBox ) * QToolBox():configure( pPtr_OR_oObj_of_type_QToolBox ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbutton.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbutton.txt index ab725c247f..a27c992759 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbutton.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtoolbutton.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractButton * $SYNTAX$ - * QToolButton():new( ... ) + * QToolButton( ... ) * QToolButton():from( pPtr_OR_oObj_of_type_QToolButton ) * QToolButton():configure( pPtr_OR_oObj_of_type_QToolButton ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtransform.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtransform.txt index 6ecbd1eba2..12935859f5 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtransform.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtransform.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTransform():new( ... ) + * QTransform( ... ) * QTransform():from( pPtr_OR_oObj_of_type_QTransform ) * QTransform():configure( pPtr_OR_oObj_of_type_QTransform ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtreeview.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtreeview.txt index 2049dd6f89..5e865da032 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtreeview.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtreeview.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAbstractItemView * $SYNTAX$ - * QTreeView():new( ... ) + * QTreeView( ... ) * QTreeView():from( pPtr_OR_oObj_of_type_QTreeView ) * QTreeView():configure( pPtr_OR_oObj_of_type_QTreeView ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidget.txt index a191600711..e129e48bd8 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QTreeView * $SYNTAX$ - * QTreeWidget():new( ... ) + * QTreeWidget( ... ) * QTreeWidget():from( pPtr_OR_oObj_of_type_QTreeWidget ) * QTreeWidget():configure( pPtr_OR_oObj_of_type_QTreeWidget ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidgetitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidgetitem.txt index 432558d6bb..47c83951ac 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidgetitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qtreewidgetitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QTreeWidgetItem():new( ... ) + * QTreeWidgetItem( ... ) * QTreeWidgetItem():from( pPtr_OR_oObj_of_type_QTreeWidgetItem ) * QTreeWidgetItem():configure( pPtr_OR_oObj_of_type_QTreeWidgetItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_quiloader.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_quiloader.txt index 8076aff3ae..04f4111eb5 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_quiloader.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_quiloader.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QUiLoader():new( ... ) + * QUiLoader( ... ) * QUiLoader():from( pPtr_OR_oObj_of_type_QUiLoader ) * QUiLoader():configure( pPtr_OR_oObj_of_type_QUiLoader ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qvalidator.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qvalidator.txt index 7f17b6a2f5..fd0f601692 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qvalidator.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qvalidator.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QValidator():new( ... ) + * QValidator( ... ) * QValidator():from( pPtr_OR_oObj_of_type_QValidator ) * QValidator():configure( pPtr_OR_oObj_of_type_QValidator ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qwheelevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qwheelevent.txt index f4b17f1fb4..0752f0ec05 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qwheelevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qwheelevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QInputEvent * $SYNTAX$ - * QWheelEvent():new( ... ) + * QWheelEvent( ... ) * QWheelEvent():from( pPtr_OR_oObj_of_type_QWheelEvent ) * QWheelEvent():configure( pPtr_OR_oObj_of_type_QWheelEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt index 612e6fb800..3b132d8c29 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qwidget.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject, QPaintDevice * $SYNTAX$ - * QWidget():new( ... ) + * QWidget( ... ) * QWidget():from( pPtr_OR_oObj_of_type_QWidget ) * QWidget():configure( pPtr_OR_oObj_of_type_QWidget ) * $ARGUMENTS$ @@ -52,7 +52,8 @@ * :geometry() -> pQRect * :getContentsMargins( @nLeft, @nTop, @nRight, @nBottom ) -> NIL * :grabKeyboard() -> NIL - * :grabMouse( ... ) -> NIL + * :grabMouse() -> NIL + * :grabMouse_1( pCursor ) -> NIL * :grabShortcut( pKey, nContext ) -> nInt * :hasFocus() -> lBool * :hasMouseTracking() -> lBool @@ -90,7 +91,8 @@ * :minimumSize() -> pQSize * :minimumSizeHint() -> pQSize * :minimumWidth() -> nInt - * :move( ... ) -> NIL + * :move( nX, nY ) -> NIL + * :move_1( pQPoint ) -> NIL * :normalGeometry() -> pQRect * :overrideWindowFlags( nFlags ) -> NIL * :paintEngine() -> pQPaintEngine @@ -101,45 +103,58 @@ * :releaseMouse() -> NIL * :releaseShortcut( nId ) -> NIL * :removeAction( pAction ) -> NIL - * :repaint( ... ) -> NIL - * :resize( ... ) -> NIL + * :repaint( nX, nY, nW, nH ) -> NIL + * :repaint_1( pRect ) -> NIL + * :repaint_2( pRgn ) -> NIL + * :resize( nW, nH ) -> NIL + * :resize_1( pQSize ) -> NIL * :restoreGeometry( pGeometry ) -> lBool * :saveGeometry() -> pQByteArray - * :scroll( ... ) -> NIL + * :scroll( nDx, nDy ) -> NIL + * :scroll_1( nDx, nDy, pR ) -> NIL * :setAcceptDrops( lOn ) -> NIL * :setAttribute( nAttribute, lOn ) -> NIL * :setAutoFillBackground( lEnabled ) -> NIL * :setBackgroundRole( nRole ) -> NIL - * :setBaseSize( ... ) -> NIL + * :setBaseSize( pQSize ) -> NIL + * :setBaseSize_1( nBasew, nBaseh ) -> NIL * :setContentsMargins( nLeft, nTop, nRight, nBottom ) -> NIL * :setContextMenuPolicy( nPolicy ) -> NIL * :setCursor( pQCursor ) -> NIL * :setFixedHeight( nH ) -> NIL - * :setFixedSize( ... ) -> NIL + * :setFixedSize( pS ) -> NIL + * :setFixedSize_1( nW, nH ) -> NIL * :setFixedWidth( nW ) -> NIL - * :setFocus( ... ) -> NIL + * :setFocus( nReason ) -> NIL * :setFocusPolicy( nPolicy ) -> NIL * :setFocusProxy( pW ) -> NIL * :setFont( pQFont ) -> NIL * :setForegroundRole( nRole ) -> NIL - * :setGeometry( ... ) -> NIL + * :setGeometry( pQRect ) -> NIL + * :setGeometry_1( nX, nY, nW, nH ) -> NIL * :setLayout( pLayout ) -> NIL * :setLayoutDirection( nDirection ) -> NIL * :setLocale( pLocale ) -> NIL - * :setMask( ... ) -> NIL + * :setMask( pBitmap ) -> NIL + * :setMask_1( pRegion ) -> NIL * :setMaximumHeight( nMaxh ) -> NIL - * :setMaximumSize( ... ) -> NIL + * :setMaximumSize( pQSize ) -> NIL + * :setMaximumSize_1( nMaxw, nMaxh ) -> NIL * :setMaximumWidth( nMaxw ) -> NIL * :setMinimumHeight( nMinh ) -> NIL - * :setMinimumSize( ... ) -> NIL + * :setMinimumSize( pQSize ) -> NIL + * :setMinimumSize_1( nMinw, nMinh ) -> NIL * :setMinimumWidth( nMinw ) -> NIL * :setMouseTracking( lEnable ) -> NIL * :setPalette( pQPalette ) -> NIL - * :setParent( ... ) -> NIL + * :setParent( pParent ) -> NIL + * :setParent_1( pParent, nF ) -> NIL * :setShortcutAutoRepeat( nId, lEnable ) -> NIL * :setShortcutEnabled( nId, lEnable ) -> NIL - * :setSizeIncrement( ... ) -> NIL - * :setSizePolicy( ... ) -> NIL + * :setSizeIncrement( pQSize ) -> NIL + * :setSizeIncrement_1( nW, nH ) -> NIL + * :setSizePolicy( pPolicy ) -> NIL + * :setSizePolicy_1( nHorizontal, nVertical ) -> NIL * :setStatusTip( cQString ) -> NIL * :setStyle( pStyle ) -> NIL * :setToolTip( cQString ) -> NIL @@ -167,7 +182,9 @@ * :unsetCursor() -> NIL * :unsetLayoutDirection() -> NIL * :unsetLocale() -> NIL - * :update( ... ) -> NIL + * :update( nX, nY, nW, nH ) -> NIL + * :update_1( pRect ) -> NIL + * :update_2( pRgn ) -> NIL * :updateGeometry() -> NIL * :updatesEnabled() -> lBool * :visibleRegion() -> pQRegion @@ -190,8 +207,10 @@ * :hide() -> NIL * :lower() -> NIL * :raise() -> NIL + * :repaint_3() -> NIL * :setDisabled( lDisable ) -> NIL * :setEnabled( lEnable ) -> NIL + * :setFocus_1() -> NIL * :setHidden( lHidden ) -> NIL * :setStyleSheet( cStyleSheet ) -> NIL * :setVisible( lVisible ) -> NIL @@ -202,6 +221,7 @@ * :showMaximized() -> NIL * :showMinimized() -> NIL * :showNormal() -> NIL + * :update_3() -> NIL * * $DESCRIPTION$ * diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qwidgetaction.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qwidgetaction.txt index e8e3559890..3bf5529069 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qwidgetaction.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qwidgetaction.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QAction * $SYNTAX$ - * QWidgetAction():new( ... ) + * QWidgetAction( ... ) * QWidgetAction():from( pPtr_OR_oObj_of_type_QWidgetAction ) * QWidgetAction():configure( pPtr_OR_oObj_of_type_QWidgetAction ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qwidgetitem.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qwidgetitem.txt index 0b94c80ad8..ac406c885d 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qwidgetitem.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qwidgetitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QLayoutItem * $SYNTAX$ - * QWidgetItem():new( ... ) + * QWidgetItem( ... ) * QWidgetItem():from( pPtr_OR_oObj_of_type_QWidgetItem ) * QWidgetItem():configure( pPtr_OR_oObj_of_type_QWidgetItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qwindowstatechangeevent.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qwindowstatechangeevent.txt index 047aaac185..a36906b530 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qwindowstatechangeevent.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qwindowstatechangeevent.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QEvent * $SYNTAX$ - * QWindowStateChangeEvent():new( ... ) + * QWindowStateChangeEvent( ... ) * QWindowStateChangeEvent():from( pPtr_OR_oObj_of_type_QWindowStateChangeEvent ) * QWindowStateChangeEvent():configure( pPtr_OR_oObj_of_type_QWindowStateChangeEvent ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qwizard.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qwizard.txt index 315f6cf355..9d46134853 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qwizard.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qwizard.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QDialog * $SYNTAX$ - * QWizard():new( ... ) + * QWizard( ... ) * QWizard():from( pPtr_OR_oObj_of_type_QWizard ) * QWizard():configure( pPtr_OR_oObj_of_type_QWizard ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qwizardpage.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qwizardpage.txt index 91aa93264b..2610016ce2 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qwizardpage.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qwizardpage.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QWizardPage():new( ... ) + * QWizardPage( ... ) * QWizardPage():from( pPtr_OR_oObj_of_type_QWizardPage ) * QWizardPage():configure( pPtr_OR_oObj_of_type_QWizardPage ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp index 1513922b0c..7b8a8eb897 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQAbstractItemModel.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/HBQGraphicsItem.cpp b/harbour/contrib/hbqt/qtgui/g/HBQGraphicsItem.cpp index 0abe81092a..90e866bbf0 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQGraphicsItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQGraphicsItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 68/68 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp b/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp index f4321a4cd8..f4596ef67a 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQGraphicsScene.cpp @@ -70,6 +70,11 @@ * enum Magnet { Left, Right, Top, Bottom, Vertical, Horizontal } */ +/* + * Constructed[ 19/19 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp index 3cfa019f16..9feb52d6cf 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQPlainTextEdit.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 56/56 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp index f97949f927..bfa4b3e736 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQSyntaxHighlighter.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp b/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp index 3833ed8367..4779900bee 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQTableView.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp b/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp index 9e17f1c448..1b12de96c7 100644 --- a/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp +++ b/harbour/contrib/hbqt/qtgui/g/HBQTextBlockUserData.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp index 7ad0aa3f88..1bed79af7c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 26/26 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp index 7808a58e82..f76ed23bf4 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractGraphicsShapeItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp index 87721b6190..3a4f9b54b3 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractItemDelegate.cpp @@ -70,6 +70,15 @@ * enum EndEditHint { NoHint, EditNextItem, EditPreviousItem, SubmitModelCache, RevertModelCache } */ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // bool helpEvent ( QHelpEvent * event, QAbstractItemView * view, const QStyleOptionViewItem & option, const QModelIndex & index ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp index 1a411c5f84..0b17d3c221 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractItemView.cpp @@ -76,6 +76,11 @@ * enum SelectionMode { SingleSelection, ContiguousSelection, ExtendedSelection, MultiSelection, NoSelection } */ +/* + * Constructed[ 63/63 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp index 9bfca9e8fb..0f556613bf 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractPrintDialog.cpp @@ -76,7 +76,6 @@ * Constructed[ 10/11 [ 90.91% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void setOptionTabs ( const QList & tabs ) */ diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp index f11e838563..7a9e6bf83d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractProxyModel.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp index b828ed21b7..17187bc7dc 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractScrollArea.cpp @@ -66,6 +66,15 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // QWidgetList scrollBarWidgets ( Qt::Alignment alignment ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp index 7009cc280e..851a766f3b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractSlider.cpp @@ -70,6 +70,11 @@ * enum SliderAction { SliderNoAction, SliderSingleStepAdd, SliderSingleStepSub, SliderPageStepAdd, ..., SliderMove } */ +/* + * Constructed[ 24/24 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp index d6ec687e35..96c18d0568 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractSpinBox.cpp @@ -73,6 +73,16 @@ * enum StepEnabledFlag { StepNone, StepUpEnabled, StepDownEnabled } */ +/* + * Constructed[ 26/26 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // virtual void fixup ( QString & input ) const + * // virtual QValidator::State validate ( QString & input, int & pos ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp index 9a12279472..03ea47ebcd 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAbstractTextDocumentLayout.cpp @@ -66,6 +66,16 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 10/10 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //virtual void draw ( QPainter * painter, const PaintContext & context ) = 0 + * //QTextObjectInterface * handlerForObject ( int objectType ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QAction.cpp b/harbour/contrib/hbqt/qtgui/g/QAction.cpp index c481f8fbc4..0a1213509b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QAction.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QAction.cpp @@ -72,14 +72,13 @@ */ /* - * Constructed[ 50/52 [ 96.15% ] ] + * Constructed[ 50/51 [ 98.04% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void setShortcuts ( const QList & shortcuts ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * //QList associatedGraphicsWidgets () const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp index 3d62c07012..4199938106 100644 --- a/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 13/13 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp index eddf9e6fab..9a22f827f7 100644 --- a/harbour/contrib/hbqt/qtgui/g/QApplication.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QApplication.cpp @@ -71,6 +71,31 @@ * enum Type { Tty, GuiClient, GuiServer } */ +/* + * Constructed[ 74/74 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // QInputContext * inputContext () const + * // virtual bool macEventFilter ( EventHandlerCallRef, EventRef ) + * // virtual bool qwsEventFilter ( QWSEvent * ) + * // int qwsProcessEvent ( QWSEvent * ) + * // void qwsSetCustomColors ( QRgb * colortable, int start, int numColors ) + * // void setInputContext ( QInputContext * inputContext ) + * // QWidgetList allWidgets () + * //bool keypadNavigationEnabled () + * //QDecoration & qwsDecoration () + * //void qwsSetDecoration ( QDecoration * ) + * //QDecoration * qwsSetDecoration ( const QString & decoration ) + * //void setKeypadNavigationEnabled ( bool enable ) + * // QWidgetList topLevelWidgets () + * //int autoMaximizeThreshold () const + * //bool autoSipEnabled () const + * //void setAutoMaximizeThreshold ( const int threshold ) + * //void setAutoSipEnabled ( const bool enabled ) + */ + #include #include "hbapi.h" diff --git a/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp b/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp index a575220f9b..2c51890a1a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QBitmap.cpp @@ -66,6 +66,15 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //QBitmap fromData ( const QSize & size, const uchar * bits, QImage::Format monoFormat = QImage::Format_MonoLSB ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp index 09ad758bc4..9157b0ca8d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QBoxLayout.cpp @@ -71,14 +71,8 @@ */ /* - * Constructed[ 20/23 [ 86.96% ] ] + * Constructed[ 20/20 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } - * } - * } */ #include @@ -166,34 +160,36 @@ HB_FUNC( QT_QBOXLAYOUT ) } /* - * void addLayout ( QLayout * layout, int stretch = 0 ) + * void addLayout ( QLayout * layout, int stretch = 0 ) [*D=1*] */ HB_FUNC( QT_QBOXLAYOUT_ADDLAYOUT ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QBOXLAYOUT_ADDLAYOUT()" ) ); - if( p && p->ph && q && q->ph ) + QBoxLayout * p = hbqt_par_QBoxLayout( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QBOXLAYOUT_ADDLAYOUT() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QBoxLayout( 1 )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ) ); } } /* - * void addSpacerItem ( QSpacerItem * spacerItem ) + * void addSpacerItem ( QSpacerItem * spacerItem ) [*D=1*] */ HB_FUNC( QT_QBOXLAYOUT_ADDSPACERITEM ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QBOXLAYOUT_ADDSPACERITEM()" ) ); - if( p && p->ph && q && q->ph ) + QBoxLayout * p = hbqt_par_QBoxLayout( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QBOXLAYOUT_ADDSPACERITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QBoxLayout( 1 )->addSpacerItem( hbqt_par_QSpacerItem( 2 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addSpacerItem( hbqt_par_QSpacerItem( 2 ) ); } } @@ -234,18 +230,19 @@ HB_FUNC( QT_QBOXLAYOUT_ADDSTRUT ) } /* - * void addWidget ( QWidget * widget, int stretch = 0, Qt::Alignment alignment = 0 ) + * void addWidget ( QWidget * widget, int stretch = 0, Qt::Alignment alignment = 0 ) [*D=1*] */ HB_FUNC( QT_QBOXLAYOUT_ADDWIDGET ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QBOXLAYOUT_ADDWIDGET()" ) ); - if( p && p->ph && q && q->ph ) + QBoxLayout * p = hbqt_par_QBoxLayout( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QBOXLAYOUT_ADDWIDGET() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QBoxLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), ( Qt::Alignment ) hb_parni( 4 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), ( Qt::Alignment ) hb_parni( 4 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QBrush.cpp b/harbour/contrib/hbqt/qtgui/g/QBrush.cpp index b1bd559663..ee2abdbb20 100644 --- a/harbour/contrib/hbqt/qtgui/g/QBrush.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QBrush.cpp @@ -67,18 +67,12 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 13/17 [ 76.47% ] ] + * Constructed[ 14/14 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- * - * } - * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * //const QGradient * gradient () const - * //void setColor ( const QColor & color ) - * //void setColor ( Qt::GlobalColor color ) */ #include @@ -279,21 +273,26 @@ HB_FUNC( QT_QBRUSH_MATRIX ) } /* - * void setColor ( ... ) + * void setColor ( const QColor & color ) */ HB_FUNC( QT_QBRUSH_SETCOLOR ) { QBrush * p = hbqt_par_QBrush( 1 ); if( p ) { - if( HB_ISPOINTER( 2 ) ) - { - ( p )->setColor( *hbqt_par_QColor( 2 ) ); - } - else if( HB_ISNUM( 2 ) ) - { - ( p )->setColor( ( Qt::GlobalColor ) hb_parni( 2 ) ); - } + ( p )->setColor( *hbqt_par_QColor( 2 ) ); + } +} + +/* + * void setColor ( Qt::GlobalColor color ) + */ +HB_FUNC( QT_QBRUSH_SETCOLOR_1 ) +{ + QBrush * p = hbqt_par_QBrush( 1 ); + if( p ) + { + ( p )->setColor( ( Qt::GlobalColor ) hb_parni( 2 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp index 3f6be89474..7bf4118448 100644 --- a/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QButtonGroup.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 11/11 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp index b00689bea0..2fa9044acf 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCalendarWidget.cpp @@ -76,7 +76,6 @@ * Constructed[ 38/39 [ 97.44% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QMap dateTextFormat () const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp b/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp index 2918a551ab..7e997954a9 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCheckBox.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp b/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp index 5bc0b81952..c832a55be9 100644 --- a/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QClipboard.cpp @@ -70,6 +70,16 @@ * enum Mode { Clipboard, Selection, FindBuffer } */ +/* + * Constructed[ 13/13 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //const QMimeData * mimeData ( Mode mode = Clipboard ) const + * // QString text ( QString & subtype, Mode mode = Clipboard ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QColor.cpp b/harbour/contrib/hbqt/qtgui/g/QColor.cpp index 2dd1391223..8e2cc8b96c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QColor.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QColor.cpp @@ -71,21 +71,12 @@ */ /* - * Constructed[ 63/71 [ 88.73% ] ] + * Constructed[ 65/65 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- * - * } - * } + * *** Commented out protostypes *** * - * *** Commented out protos which construct fine but do not compile *** - * - * //void setRgb ( QRgb rgb ) - * //void setRgb ( int r, int g, int b, int a = 255 ) * //bool allowX11ColorNames () - * //QColor fromRgb ( QRgb rgb ) - * //QColor fromRgb ( int r, int g, int b, int a = 255 ) * //void setAllowX11ColorNames ( bool enabled ) */ @@ -796,21 +787,26 @@ HB_FUNC( QT_QCOLOR_SETREDF ) } /* - * void setRgb ( ... ) + * void setRgb ( QRgb rgb ) */ HB_FUNC( QT_QCOLOR_SETRGB ) { QColor * p = hbqt_par_QColor( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) - { - ( p )->setRgb( hb_parnl( 2 ) ); - } - else if( hb_pcount() >= 4 && HB_ISNUM( 2 ) ) - { - ( p )->setRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parnidef( 5, 255 ) ); - } + ( p )->setRgb( hb_parnl( 2 ) ); + } +} + +/* + * void setRgb ( int r, int g, int b, int a = 255 ) + */ +HB_FUNC( QT_QCOLOR_SETRGB_1 ) +{ + QColor * p = hbqt_par_QColor( 1 ); + if( p ) + { + ( p )->setRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parnidef( 5, 255 ) ); } } @@ -995,21 +991,26 @@ HB_FUNC( QT_QCOLOR_FROMHSVF ) } /* - * QColor fromRgb ( ... ) + * QColor fromRgb ( QRgb rgb ) */ HB_FUNC( QT_QCOLOR_FROMRGB ) { QColor * p = hbqt_par_QColor( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( ( p )->fromRgb( hb_parnl( 2 ) ) ), true ) ); - } - else if( hb_pcount() >= 4 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( ( p )->fromRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parnidef( 5, 255 ) ) ), true ) ); - } + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( ( p )->fromRgb( hb_parnl( 2 ) ) ), true ) ); + } +} + +/* + * QColor fromRgb ( int r, int g, int b, int a = 255 ) + */ +HB_FUNC( QT_QCOLOR_FROMRGB_1 ) +{ + QColor * p = hbqt_par_QColor( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( ( p )->fromRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parnidef( 5, 255 ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp index 2407d581fa..f12f167f3c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QColorDialog.cpp @@ -71,6 +71,15 @@ * flags ColorDialogOptions */ +/* + * Constructed[ 15/15 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //void open ( QObject * receiver, const char * member ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp index 4960b5ed2f..7dd6599d96 100644 --- a/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QComboBox.cpp @@ -72,12 +72,8 @@ */ /* - * Constructed[ 59/60 [ 98.33% ] ] + * Constructed[ 59/59 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } */ #include @@ -777,16 +773,19 @@ HB_FUNC( QT_QCOMBOBOX_SETVALIDATOR ) } /* - * void setView ( QAbstractItemView * itemView ) + * void setView ( QAbstractItemView * itemView ) [*D=1*] */ HB_FUNC( QT_QCOMBOBOX_SETVIEW ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - if( p && p->ph && q && q->ph ) + QComboBox * p = hbqt_par_QComboBox( 1 ); + if( p ) { - q->bNew = HB_FALSE; - hbqt_par_QComboBox( 1 )->setView( hbqt_par_QAbstractItemView( 2 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setView( hbqt_par_QAbstractItemView( 2 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp b/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp index 057bfc3ebe..721e1ec3fa 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCommandLinkButton.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp index 28be826a4f..dda337b016 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCommonStyle.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp index b566362408..69b6c21cda 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCompleter.cpp @@ -71,6 +71,11 @@ * enum ModelSorting { UnsortedModel, CaseSensitivelySortedModel, CaseInsensitivelySortedModel } */ +/* + * Constructed[ 29/29 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp index 078844bb7c..3cd8e558e8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QConicalGradient.cpp @@ -72,6 +72,11 @@ * enum Type { LinearGradient, RadialGradient, ConicalGradient, NoGradient } */ +/* + * Constructed[ 5/5 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp index bd375efc49..4149351249 100644 --- a/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QContextMenuEvent.cpp @@ -70,6 +70,11 @@ * enum Reason { Mouse, Keyboard, Other } */ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QCursor.cpp b/harbour/contrib/hbqt/qtgui/g/QCursor.cpp index fa93cadf79..66ae3c3bfb 100644 --- a/harbour/contrib/hbqt/qtgui/g/QCursor.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QCursor.cpp @@ -66,6 +66,15 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // HCURSOR_or_HANDLE handle () const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp index 8df8a6dee1..d1222b800d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDateEdit.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp index fc1279d40a..c968e2aa0f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDateTimeEdit.cpp @@ -71,6 +71,11 @@ * flags Sections */ +/* + * Constructed[ 44/44 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp index 2264b684ff..acc8bd7121 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDesktopWidget.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 12/12 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDial.cpp b/harbour/contrib/hbqt/qtgui/g/QDial.cpp index 173d494705..e19c59b930 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDial.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDial.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QDialog.cpp index f7e89036be..c5a7637729 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDialog.cpp @@ -70,6 +70,11 @@ * enum DialogCode { Accepted, Rejected } */ +/* + * Constructed[ 10/10 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp index 86db5fb007..4a5394a739 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDirModel.cpp @@ -70,6 +70,15 @@ * enum Roles { FileIconRole, FilePathRole, FileNameRole } */ +/* + * Constructed[ 37/37 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp index d606d9fa01..0e3d81a440 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDockWidget.cpp @@ -71,6 +71,11 @@ * flags DockWidgetFeatures */ +/* + * Constructed[ 12/12 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp index fbd23b63d2..48b3621f20 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDoubleSpinBox.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 18/18 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp index 83797ec8fc..ad1b7e5b14 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDoubleValidator.cpp @@ -71,6 +71,15 @@ * enum Notation { StandardNotation, ScientificNotation } */ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //virtual QValidator::State validate ( const QString & input, const int & pos ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDrag.cpp b/harbour/contrib/hbqt/qtgui/g/QDrag.cpp index 49a450f71e..ab18fd91b1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDrag.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDrag.cpp @@ -67,12 +67,8 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 11/12 [ 91.67% ] ] + * Constructed[ 11/11 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } */ #include @@ -246,18 +242,19 @@ HB_FUNC( QT_QDRAG_SETHOTSPOT ) } /* - * void setMimeData ( QMimeData * data ) + * void setMimeData ( QMimeData * data ) [*D=1*] */ HB_FUNC( QT_QDRAG_SETMIMEDATA ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QDRAG_SETMIMEDATA()" ) ); - if( p && p->ph && q && q->ph ) + QDrag * p = hbqt_par_QDrag( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QDRAG_SETMIMEDATA() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QDrag( 1 )->setMimeData( hbqt_par_QMimeData( 2 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setMimeData( hbqt_par_QMimeData( 2 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp index fce18e1205..36cafd427a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDragEnterEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp index 8d158d224d..d2254da8f3 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDragLeaveEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp index 845c9d04a0..7a2b888882 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDragMoveEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 5/5 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp index 7f17f7934b..c727929143 100644 --- a/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QDropEvent.cpp @@ -67,12 +67,8 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 10/11 [ 90.91% ] ] + * Constructed[ 10/10 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } */ #include diff --git a/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp b/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp index bd05314339..d3094ccf62 100644 --- a/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QErrorMessage.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp index dd18faee61..8805fffb2f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFileDialog.cpp @@ -76,14 +76,13 @@ */ /* - * Constructed[ 46/51 [ 90.20% ] ] + * Constructed[ 46/47 [ 97.87% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void setSidebarUrls ( const QList & urls ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // void open ( QObject * receiver, const char * member ) * //QString getOpenFileName ( QWidget * parent = 0, const QString & caption = QString(), const QString & dir = QString(), const QString & filter = QString(), QString * selectedFilter = 0, Options options = 0 ) diff --git a/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp b/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp index abf07e2e33..099203e6b6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFileIconProvider.cpp @@ -70,6 +70,11 @@ * enum IconType { Computer, Desktop, Trashcan, Network, ..., File } */ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp b/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp index 900fad039a..89f8324261 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFileSystemModel.cpp @@ -70,6 +70,17 @@ * enum Roles { FileIconRole, FilePathRole, FileNameRole, FilePermissions } */ +/* + * Constructed[ 29/29 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // QFileIconProvider * iconProvider () const + * // virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const + * // void setIconProvider ( QFileIconProvider * provider ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp index ab11911f27..7c7b89be49 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFocusEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp index 7c621a1acf..a4e7473721 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFocusFrame.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFont.cpp b/harbour/contrib/hbqt/qtgui/g/QFont.cpp index 325cd5ff57..69c4aaab6d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFont.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFont.cpp @@ -76,6 +76,19 @@ * enum Weight { Light, Normal, DemiBold, Bold, Black } */ +/* + * Constructed[ 58/58 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // FT_Face freetypeFace () const + * // HFONT handle () const + * // bool isCopyOf ( const QFont & f ) const + * // quint32 macFontID () const + * // QFont resolve ( const QFont & other ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp index 3ebf08ae53..c1980b230d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontComboBox.cpp @@ -71,6 +71,11 @@ * flags FontFilters */ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp b/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp index 065ce44f4e..86bf38d38c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontDatabase.cpp @@ -70,6 +70,16 @@ * enum WritingSystem { Any, Latin, Greek, Cyrillic, ..., Runic } */ +/* + * Constructed[ 23/23 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //QList writingSystems () const + * //QList writingSystems ( const QString & family ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp index 90b1ed71c5..01f248c6d8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontDialog.cpp @@ -71,6 +71,16 @@ * flags FontDialogOptions */ +/* + * Constructed[ 12/12 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // void open ( QObject * receiver, const char * member ) + * // QFont getFont ( bool * ok, QWidget * parent, const char * name ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp b/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp index 2d5c7dfd2c..ed6e94f444 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontInfo.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 12/12 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp b/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp index 43695a726a..328e739ef9 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontMetrics.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 26/26 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp b/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp index a43bda5f3d..fb510be54a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFontMetricsF.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 25/25 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp index 9f086f89c6..730e11aac7 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFormLayout.cpp @@ -72,6 +72,17 @@ * enum RowWrapPolicy { DontWrapRows, WrapLongRows, WrapAllRows } */ +/* + * Constructed[ 33/33 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //void addRow ( QWidget * label, QLayout * field ) + * //void addRow ( const QString & labelText, QLayout * field ) + * //void addRow ( QLayout * layout ) + */ + #include #include @@ -168,22 +179,10 @@ HB_FUNC( QT_QFORMLAYOUT_ADDROW ) } } -/* - * void addRow ( QWidget * label, QLayout * field ) - */ -HB_FUNC( QT_QFORMLAYOUT_ADDROW_1 ) -{ - QFormLayout * p = hbqt_par_QFormLayout( 1 ); - if( p ) - { - ( p )->addRow( hbqt_par_QWidget( 2 ), hbqt_par_QLayout( 3 ) ); - } -} - /* * void addRow ( QWidget * widget ) */ -HB_FUNC( QT_QFORMLAYOUT_ADDROW_2 ) +HB_FUNC( QT_QFORMLAYOUT_ADDROW_1 ) { QFormLayout * p = hbqt_par_QFormLayout( 1 ); if( p ) @@ -195,7 +194,7 @@ HB_FUNC( QT_QFORMLAYOUT_ADDROW_2 ) /* * void addRow ( const QString & labelText, QWidget * field ) */ -HB_FUNC( QT_QFORMLAYOUT_ADDROW_3 ) +HB_FUNC( QT_QFORMLAYOUT_ADDROW_2 ) { QFormLayout * p = hbqt_par_QFormLayout( 1 ); if( p ) @@ -206,32 +205,6 @@ HB_FUNC( QT_QFORMLAYOUT_ADDROW_3 ) } } -/* - * void addRow ( const QString & labelText, QLayout * field ) - */ -HB_FUNC( QT_QFORMLAYOUT_ADDROW_4 ) -{ - QFormLayout * p = hbqt_par_QFormLayout( 1 ); - if( p ) - { - void * pText; - ( p )->addRow( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_QLayout( 3 ) ); - hb_strfree( pText ); - } -} - -/* - * void addRow ( QLayout * layout ) - */ -HB_FUNC( QT_QFORMLAYOUT_ADDROW_5 ) -{ - QFormLayout * p = hbqt_par_QFormLayout( 1 ); - if( p ) - { - ( p )->addRow( hbqt_par_QLayout( 2 ) ); - } -} - /* * FieldGrowthPolicy fieldGrowthPolicy () const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QFrame.cpp index 427f626cfd..22329d1f2c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QFrame.cpp @@ -72,6 +72,11 @@ * enum StyleMask { Shadow_Mask, Shape_Mask } */ +/* + * Constructed[ 13/13 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QGradient.cpp index 15fcb840d9..28fc4af6c8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGradient.cpp @@ -72,6 +72,16 @@ * enum Type { LinearGradient, RadialGradient, ConicalGradient, NoGradient } */ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // void setStops ( const QGradientStops & stopPoints ) + * // QGradientStops stops () const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsEllipseItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsEllipseItem.cpp index b2dbca26d0..218bc6ed51 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsEllipseItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsEllipseItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsGridLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsGridLayout.cpp index e37749fc09..04c3d72e05 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsGridLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsGridLayout.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 42/42 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp index b0ce90976a..f688ae8fed 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsItem.cpp @@ -73,6 +73,11 @@ * flags GraphicsItemFlags */ +/* + * Constructed[ 150/150 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp index 16e5b3cbfa..2677fd65c3 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsItemAnimation.cpp @@ -70,7 +70,6 @@ * Constructed[ 20/25 [ 80.00% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QList > posList () const * QList > rotationList () const diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsItemGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsItemGroup.cpp index 0c7d29933e..9cb1dbe565 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsItemGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsItemGroup.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp index 7487cd99f2..3ed227083f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayout.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp index e83182e7ce..42c1a4eec2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsLayoutItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 35/35 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsLineItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsLineItem.cpp index 0c0532d695..4f7d97dbd6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsLineItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsLineItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 5/5 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsLinearLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsLinearLayout.cpp index 59ae506780..4e6a98de66 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsLinearLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsLinearLayout.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 16/16 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsPathItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsPathItem.cpp index 161fe0a3ec..05db891e34 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsPathItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsPathItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsPixmapItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsPixmapItem.cpp index 7e3742039e..36a8d9c403 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsPixmapItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsPixmapItem.cpp @@ -70,6 +70,11 @@ * enum ShapeMode { MaskShape, BoundingRectShape, HeuristicMaskShape } */ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsPolygonItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsPolygonItem.cpp index 71c448c3e2..2ce9c4d922 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsPolygonItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsPolygonItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp index c2950a9984..d5ebd0e4b6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsProxyWidget.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsRectItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsRectItem.cpp index 82f8c8ca5b..bfff3e2755 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsRectItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsRectItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp index 1967d86bce..63340a1dd0 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsScene.cpp @@ -73,15 +73,13 @@ */ /* - * Constructed[ 69/72 [ 95.83% ] ] + * Constructed[ 69/70 [ 98.57% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * - * } * QGraphicsItemGroup * createItemGroup ( const QList & items ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // virtual QVariant inputMethodQuery ( Qt::InputMethodQuery query ) const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp index a245005f65..78a9be29e5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneContextMenuEvent.cpp @@ -70,6 +70,11 @@ * enum Reason { Mouse, Keyboard, Other } */ +/* + * Constructed[ 5/5 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp index 78bc5a4619..ee64f05e69 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneDragDropEvent.cpp @@ -67,12 +67,8 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 12/13 [ 92.31% ] ] + * Constructed[ 12/12 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } */ #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp index 9433d92d24..2c57537323 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 1/1 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp index 6fe1a89053..28ddc14c30 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHelpEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp index 1c43c736fe..cde11d7751 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneHoverEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp index ed9361cac5..dfa0b15073 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMouseEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 12/12 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp index 52b5baf36a..021faa17e5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneMoveEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp index 21167bbca5..f8e4e35a6d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneResizeEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp index 5d28ed6800..66107d36cc 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSceneWheelEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsSimpleTextItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsSimpleTextItem.cpp index 1f5febd7f8..0edafd29e1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsSimpleTextItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsSimpleTextItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp index a2c245dba1..9e1269f317 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsTextItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 21/21 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp index 2490414ea0..534e1ebb69 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsView.cpp @@ -80,7 +80,6 @@ * Constructed[ 76/77 [ 98.70% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void updateScene ( const QList & rects ) */ diff --git a/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp index 6d12a54003..5cdd04e6c2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGraphicsWidget.cpp @@ -67,15 +67,14 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 46/50 [ 92.00% ] ] + * Constructed[ 46/48 [ 95.83% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void addActions ( QList actions ) * void insertActions ( QAction * before, QList actions ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // const QObjectList & children () const * // virtual void paintWindowFrame ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) diff --git a/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp index e152768aa5..d0f36d8d84 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGridLayout.cpp @@ -67,16 +67,8 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 26/31 [ 83.87% ] ] + * Constructed[ 26/26 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } - * } - * } - * } - * } */ #include @@ -165,82 +157,87 @@ HB_FUNC( QT_QGRIDLAYOUT ) } /* - * void addItem ( QLayoutItem * item, int row, int column, int rowSpan = 1, int columnSpan = 1, Qt::Alignment alignment = 0 ) + * void addItem ( QLayoutItem * item, int row, int column, int rowSpan = 1, int columnSpan = 1, Qt::Alignment alignment = 0 ) [*D=1*] */ HB_FUNC( QT_QGRIDLAYOUT_ADDITEM ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QGRIDLAYOUT_ADDITEM()" ) ); - if( p && p->ph && q && q->ph ) + QGridLayout * p = hbqt_par_QGridLayout( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QGRIDLAYOUT_ADDITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - 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 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addItem( hbqt_par_QLayoutItem( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parnidef( 5, 1 ), hb_parnidef( 6, 1 ), ( Qt::Alignment ) hb_parni( 7 ) ); } } /* - * void addLayout ( QLayout * layout, int row, int column, Qt::Alignment alignment = 0 ) + * void addLayout ( QLayout * layout, int row, int column, Qt::Alignment alignment = 0 ) [*D=1*] */ HB_FUNC( QT_QGRIDLAYOUT_ADDLAYOUT ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QGRIDLAYOUT_ADDLAYOUT()" ) ); - if( p && p->ph && q && q->ph ) + QGridLayout * p = hbqt_par_QGridLayout( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QGRIDLAYOUT_ADDLAYOUT() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QGridLayout( 1 )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( Qt::Alignment ) hb_parni( 5 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( Qt::Alignment ) hb_parni( 5 ) ); } } /* - * void addLayout ( QLayout * layout, int row, int column, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 ) + * void addLayout ( QLayout * layout, int row, int column, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 ) [*D=1*] */ HB_FUNC( QT_QGRIDLAYOUT_ADDLAYOUT_1 ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QGRIDLAYOUT_ADDLAYOUT_1()" ) ); - if( p && p->ph && q && q->ph ) + QGridLayout * p = hbqt_par_QGridLayout( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QGRIDLAYOUT_ADDLAYOUT_1() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - 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 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), ( Qt::Alignment ) hb_parni( 7 ) ); } } /* - * void addWidget ( QWidget * widget, int row, int column, Qt::Alignment alignment = 0 ) + * void addWidget ( QWidget * widget, int row, int column, Qt::Alignment alignment = 0 ) [*D=1*] */ HB_FUNC( QT_QGRIDLAYOUT_ADDWIDGET ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_GRIDQLAYOUT_ADDWIDGET()" ) ); - if( p && p->ph && q && q->ph ) + QGridLayout * p = hbqt_par_QGridLayout( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QGRIDLAYOUT_ADDWIDGET() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QGridLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( Qt::Alignment ) hb_parni( 5 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( Qt::Alignment ) hb_parni( 5 ) ); } } /* - * void addWidget ( QWidget * widget, int fromRow, int fromColumn, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 ) + * void addWidget ( QWidget * widget, int fromRow, int fromColumn, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 ) [*D=1*] */ HB_FUNC( QT_QGRIDLAYOUT_ADDWIDGET_1 ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_GRIDQLAYOUT_ADDWIDGET_1()" ) ); - if( p && p->ph && q && q->ph ) + QGridLayout * p = hbqt_par_QGridLayout( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QGRIDLAYOUT_ADDWIDGET_1() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - 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 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->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/qtgui/g/QGroupBox.cpp b/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp index cfede1ec47..d59db4499a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QGroupBox.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 10/10 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp index 9f42aefce9..02cf91b567 100644 --- a/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QHBoxLayout.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp b/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp index 573fef158e..836151f7be 100644 --- a/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QHeaderView.cpp @@ -70,6 +70,11 @@ * enum ResizeMode { Interactive, Fixed, Stretch, ResizeToContents, Custom } */ +/* + * Constructed[ 57/57 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp index 527d877c9d..0b596da915 100644 --- a/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QHelpEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp index 08058e95a6..ef73941c62 100644 --- a/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QHideEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp index a9c9768df0..4d338e82fb 100644 --- a/harbour/contrib/hbqt/qtgui/g/QIcon.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QIcon.cpp @@ -72,20 +72,11 @@ */ /* - * Constructed[ 8/15 [ 53.33% ] ] + * Constructed[ 10/10 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- * - * } - * } + * *** Commented out protostypes *** * - * *** Commented out protos which construct fine but do not compile *** - * - * //void paint ( QPainter * painter, const QRect & rect, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const - * //void paint ( QPainter * painter, int x, int y, int w, int h, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const - * //QPixmap pixmap ( const QSize & size, Mode mode = Normal, State state = Off ) const - * //QPixmap pixmap ( int w, int h, Mode mode = Normal, State state = Off ) const * //QPixmap pixmap ( int extent, Mode mode = Normal, State state = Off ) const // Not Implemented */ @@ -268,40 +259,50 @@ HB_FUNC( QT_QICON_ISNULL ) } /* - * void paint ( ... ) + * void paint ( QPainter * painter, const QRect & rect, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const */ HB_FUNC( QT_QICON_PAINT ) { QIcon * p = hbqt_par_QIcon( 1 ); if( p ) { - if( HB_ISPOINTER( 2 ) && HB_ISPOINTER( 3 ) ) - { - ( p )->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 ) ); - } - else if( HB_ISPOINTER( 2 ) && HB_ISNUM( 3 ) ) - { - ( p )->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 ) ); - } + ( p )->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 ) ); } } /* - * QPixmap pixmap ( ... ) + * void paint ( QPainter * painter, int x, int y, int w, int h, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const + */ +HB_FUNC( QT_QICON_PAINT_1 ) +{ + QIcon * p = hbqt_par_QIcon( 1 ); + if( p ) + { + ( p )->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 ) ); + } +} + +/* + * QPixmap pixmap ( const QSize & size, Mode mode = Normal, State state = Off ) const */ HB_FUNC( QT_QICON_PIXMAP ) { QIcon * p = hbqt_par_QIcon( 1 ); if( p ) { - if( HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); - } - else if( hb_pcount() >= 3 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); - } + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); + } +} + +/* + * QPixmap pixmap ( int w, int h, Mode mode = Normal, State state = Off ) const + */ +HB_FUNC( QT_QICON_PIXMAP_1 ) +{ + QIcon * p = hbqt_par_QIcon( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QImage.cpp b/harbour/contrib/hbqt/qtgui/g/QImage.cpp index 53c93466e1..a874743132 100644 --- a/harbour/contrib/hbqt/qtgui/g/QImage.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QImage.cpp @@ -72,45 +72,21 @@ */ /* - * Constructed[ 51/82 [ 62.20% ] ] + * Constructed[ 57/60 [ 95.00% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QVector colorTable () const * QImage convertToFormat ( Format format, const QVector & colorTable, Qt::ImageConversionFlags flags = Qt::AutoColor ) const - * } - * } - * } - * } - * } - * } * void setColorTable ( const QVector colors ) - * } - * } - * } * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * - * //QImage copy ( const QRect & rectangle = QRect() ) const - * //QImage copy ( int x, int y, int width, int height ) const - * //bool load ( const QString & fileName, const char * format = 0 ) - * //bool load ( QIODevice * device, const char * format ) + * //uchar * bits () * // bool loadFromData ( const uchar * data, int len, const char * format = 0 ) - * //QRgb pixel ( const QPoint & position ) const - * //QRgb pixel ( int x, int y ) const - * //int pixelIndex ( const QPoint & position ) const - * //int pixelIndex ( int x, int y ) const - * //bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const - * //bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const - * //QImage scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const - * //QImage scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const - * //void setPixel ( const QPoint & position, uint index_or_rgb ) - * //void setPixel ( int x, int y, uint index_or_rgb ) + * //uchar * scanLine ( int i ) * //QImage transformed ( const QMatrix & matrix, Qt::TransformationMode mode = Qt::FastTransformation ) const * //QImage transformed ( const QTransform & matrix, Qt::TransformationMode mode = Qt::FastTransformation ) const - * //bool valid ( const QPoint & pos ) const - * //bool valid ( int x, int y ) const */ #include @@ -252,22 +228,10 @@ HB_FUNC( QT_QIMAGE_ALPHACHANNEL ) } } -/* - * uchar * bits () - */ -HB_FUNC( QT_QIMAGE_BITS ) -{ - QImage * p = hbqt_par_QImage( 1 ); - if( p ) - { - hb_retc( ( const char * ) ( p )->bits() ); - } -} - /* * const uchar * bits () const */ -HB_FUNC( QT_QIMAGE_BITS_1 ) +HB_FUNC( QT_QIMAGE_BITS ) { QImage * p = hbqt_par_QImage( 1 ); if( p ) @@ -325,25 +289,26 @@ HB_FUNC( QT_QIMAGE_CONVERTTOFORMAT ) } /* - * QImage copy ( ... ) + * QImage copy ( const QRect & rectangle = QRect() ) const */ HB_FUNC( QT_QIMAGE_COPY ) { QImage * p = hbqt_par_QImage( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ), true ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ), true ) ); - } - else - { - hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->copy( QRect() ) ), true ) ); - } + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ), true ) ); + } +} + +/* + * QImage copy ( int x, int y, int width, int height ) const + */ +HB_FUNC( QT_QIMAGE_COPY_1 ) +{ + QImage * p = hbqt_par_QImage( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ), true ) ); } } @@ -504,23 +469,28 @@ HB_FUNC( QT_QIMAGE_ISNULL ) } /* - * bool load ( ... ) + * bool load ( const QString & fileName, const char * format = 0 ) */ HB_FUNC( QT_QIMAGE_LOAD ) { QImage * p = hbqt_par_QImage( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISCHAR( 2 ) ) - { - void * pText; - hb_retl( ( p )->load( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_char( 3 ) ) ); - hb_strfree( pText ); - } - else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISPOINTER( 3 ) ) - { - hb_retl( ( p )->load( hbqt_par_QIODevice( 2 ), hbqt_par_char( 3 ) ) ); - } + void * pText; + hb_retl( ( p )->load( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_char( 3 ) ) ); + hb_strfree( pText ); + } +} + +/* + * bool load ( QIODevice * device, const char * format ) + */ +HB_FUNC( QT_QIMAGE_LOAD_1 ) +{ + QImage * p = hbqt_par_QImage( 1 ); + if( p ) + { + hb_retl( ( p )->load( hbqt_par_QIODevice( 2 ), hbqt_par_char( 3 ) ) ); } } @@ -585,40 +555,50 @@ HB_FUNC( QT_QIMAGE_OFFSET ) } /* - * QRgb pixel ( ... ) + * QRgb pixel ( const QPoint & position ) const */ HB_FUNC( QT_QIMAGE_PIXEL ) { QImage * p = hbqt_par_QImage( 1 ); if( p ) { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retnl( ( p )->pixel( *hbqt_par_QPoint( 2 ) ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - hb_retnl( ( p )->pixel( hb_parni( 2 ), hb_parni( 3 ) ) ); - } + hb_retnl( ( p )->pixel( *hbqt_par_QPoint( 2 ) ) ); } } /* - * int pixelIndex ( ... ) + * QRgb pixel ( int x, int y ) const + */ +HB_FUNC( QT_QIMAGE_PIXEL_1 ) +{ + QImage * p = hbqt_par_QImage( 1 ); + if( p ) + { + hb_retnl( ( p )->pixel( hb_parni( 2 ), hb_parni( 3 ) ) ); + } +} + +/* + * int pixelIndex ( const QPoint & position ) const */ HB_FUNC( QT_QIMAGE_PIXELINDEX ) { QImage * p = hbqt_par_QImage( 1 ); if( p ) { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retni( ( p )->pixelIndex( *hbqt_par_QPoint( 2 ) ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - hb_retni( ( p )->pixelIndex( hb_parni( 2 ), hb_parni( 3 ) ) ); - } + hb_retni( ( p )->pixelIndex( *hbqt_par_QPoint( 2 ) ) ); + } +} + +/* + * int pixelIndex ( int x, int y ) const + */ +HB_FUNC( QT_QIMAGE_PIXELINDEX_1 ) +{ + QImage * p = hbqt_par_QImage( 1 ); + if( p ) + { + hb_retni( ( p )->pixelIndex( hb_parni( 2 ), hb_parni( 3 ) ) ); } } @@ -647,42 +627,52 @@ HB_FUNC( QT_QIMAGE_RGBSWAPPED ) } /* - * bool save ( ... ) + * bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const */ HB_FUNC( QT_QIMAGE_SAVE ) { QImage * p = hbqt_par_QImage( 1 ); if( p ) { - if( hb_pcount() >= 2 && HB_ISCHAR( 2 ) ) - { - void * pText; - hb_retl( ( p )->save( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); - hb_strfree( pText ); - } - else if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retl( ( p )->save( hbqt_par_QIODevice( 2 ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); - } + void * pText; + hb_retl( ( p )->save( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); + hb_strfree( pText ); } } /* - * QImage scaled ( ... ) + * bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const + */ +HB_FUNC( QT_QIMAGE_SAVE_1 ) +{ + QImage * p = hbqt_par_QImage( 1 ); + if( p ) + { + hb_retl( ( p )->save( hbqt_par_QIODevice( 2 ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); + } +} + +/* + * QImage scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const */ HB_FUNC( QT_QIMAGE_SCALED ) { QImage * p = hbqt_par_QImage( 1 ); if( p ) { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->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 ) ) ), true ) ); - } - else if( hb_pcount() >= 3 && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->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 ) ) ), true ) ); - } + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->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 ) ) ), true ) ); + } +} + +/* + * QImage scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + */ +HB_FUNC( QT_QIMAGE_SCALED_1 ) +{ + QImage * p = hbqt_par_QImage( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->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 ) ) ), true ) ); } } @@ -710,22 +700,10 @@ HB_FUNC( QT_QIMAGE_SCALEDTOWIDTH ) } } -/* - * uchar * scanLine ( int i ) - */ -HB_FUNC( QT_QIMAGE_SCANLINE ) -{ - QImage * p = hbqt_par_QImage( 1 ); - if( p ) - { - hb_retc( ( const char * ) ( p )->scanLine( hb_parni( 2 ) ) ); - } -} - /* * const uchar * scanLine ( int i ) const */ -HB_FUNC( QT_QIMAGE_SCANLINE_1 ) +HB_FUNC( QT_QIMAGE_SCANLINE ) { QImage * p = hbqt_par_QImage( 1 ); if( p ) @@ -795,21 +773,26 @@ HB_FUNC( QT_QIMAGE_SETOFFSET ) } /* - * void setPixel ( ... ) + * void setPixel ( const QPoint & position, uint index_or_rgb ) */ HB_FUNC( QT_QIMAGE_SETPIXEL ) { QImage * p = hbqt_par_QImage( 1 ); if( p ) { - if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) - { - ( p )->setPixel( *hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); - } - else if( hb_pcount() == 4 && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) - { - ( p )->setPixel( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); - } + ( p )->setPixel( *hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); + } +} + +/* + * void setPixel ( int x, int y, uint index_or_rgb ) + */ +HB_FUNC( QT_QIMAGE_SETPIXEL_1 ) +{ + QImage * p = hbqt_par_QImage( 1 ); + if( p ) + { + ( p )->setPixel( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); } } @@ -887,21 +870,26 @@ HB_FUNC( QT_QIMAGE_TRANSFORMED ) } /* - * bool valid ( ... ) + * bool valid ( const QPoint & pos ) const */ HB_FUNC( QT_QIMAGE_VALID ) { QImage * p = hbqt_par_QImage( 1 ); if( p ) { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retl( ( p )->valid( *hbqt_par_QPoint( 2 ) ) ); - } - else if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retl( ( p )->valid( hb_parni( 2 ), hb_parni( 3 ) ) ); - } + hb_retl( ( p )->valid( *hbqt_par_QPoint( 2 ) ) ); + } +} + +/* + * bool valid ( int x, int y ) const + */ +HB_FUNC( QT_QIMAGE_VALID_1 ) +{ + QImage * p = hbqt_par_QImage( 1 ); + if( p ) + { + hb_retl( ( p )->valid( hb_parni( 2 ), hb_parni( 3 ) ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp b/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp index 73ef577f10..8e5105da4b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QImageReader.cpp @@ -70,6 +70,11 @@ * enum ImageReaderError { FileNotFoundError, DeviceError, UnsupportedFormatError, InvalidDataError, UnknownError } */ +/* + * Constructed[ 39/39 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp b/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp index 1ed9f828a5..5defb54982 100644 --- a/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QImageWriter.cpp @@ -70,6 +70,11 @@ * enum ImageWriterError { DeviceError, UnsupportedFormatError, UnknownError } */ +/* + * Constructed[ 19/19 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp index 75f1b5d72d..5c42af5565 100644 --- a/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QInputDialog.cpp @@ -72,6 +72,11 @@ * flags InputDialogOptions */ +/* + * Constructed[ 44/44 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp index 2fe9b45c3c..5357f742d0 100644 --- a/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QInputEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 1/1 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp index aef79a6180..0f7157d271 100644 --- a/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QInputMethodEvent.cpp @@ -70,6 +70,15 @@ * enum AttributeType { TextFormat, Cursor, Language, Ruby } */ +/* + * Constructed[ 5/5 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // const QList & attributes () const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp index 2083935be8..f739379348 100644 --- a/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QIntValidator.cpp @@ -70,6 +70,15 @@ * enum State { Invalid, Intermediate, Acceptable } */ +/* + * Constructed[ 5/5 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //virtual QValidator::State validate ( QString & input, int & pos ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp index 3e82700453..ecd8b8d065 100644 --- a/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QItemDelegate.cpp @@ -70,6 +70,11 @@ * enum EndEditHint { NoHint, EditNextItem, EditPreviousItem, SubmitModelCache, RevertModelCache } */ +/* + * Constructed[ 10/10 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp b/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp index ed40c55a8b..742795d0b8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QItemEditorCreatorBase.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp b/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp index 31b6c5bbbc..124def46cf 100644 --- a/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QItemEditorFactory.cpp @@ -66,6 +66,15 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //const QItemEditorFactory * defaultFactory () + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp b/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp index 74786e5058..e9b17ce5ae 100644 --- a/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QItemSelection.cpp @@ -66,6 +66,16 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // QModelIndexList indexes () const + * // void split ( const QItemSelectionRange & range, const QItemSelectionRange & other, QItemSelection * result ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp b/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp index 885102abc7..1bc7ce5e9b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QItemSelectionModel.cpp @@ -71,6 +71,17 @@ * flags SelectionFlags */ +/* + * Constructed[ 15/15 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // QModelIndexList selectedColumns ( int row = 0 ) const + * // QModelIndexList selectedIndexes () const + * // QModelIndexList selectedRows ( int column = 0 ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp index d1e5a89e67..d594f733d0 100644 --- a/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QKeyEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp b/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp index 030f9cafe5..2f22bea82d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QKeySequence.cpp @@ -72,6 +72,11 @@ * enum StandardKey { AddTab, Back, Bold, Close, ..., ZoomOut } */ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp b/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp index efe022809f..55fcd6f7c1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLCDNumber.cpp @@ -71,6 +71,11 @@ * enum SegmentStyle { Outline, Filled, Flat } */ +/* + * Constructed[ 19/19 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QLabel.cpp b/harbour/contrib/hbqt/qtgui/g/QLabel.cpp index 92199e3cee..a0cfb55554 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLabel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLabel.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 29/29 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QLayout.cpp index 6f5f4ba43e..ca81ca74e3 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLayout.cpp @@ -71,13 +71,8 @@ */ /* - * Constructed[ 29/31 [ 93.55% ] ] + * Constructed[ 29/29 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } - * } */ #include @@ -147,34 +142,36 @@ HB_FUNC( QT_QLAYOUT_ACTIVATE ) } /* - * virtual void addItem ( QLayoutItem * item ) + * virtual void addItem ( QLayoutItem * item ) [*D=1*] */ HB_FUNC( QT_QLAYOUT_ADDITEM ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QLAYOUT_ADDITEM()" ) ); - if( p && p->ph && q && q->ph ) + QLayout * p = hbqt_par_QLayout( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QLAYOUT_ADDITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QLayout( 1 )->addItem( hbqt_par_QLayoutItem( 2 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addItem( hbqt_par_QLayoutItem( 2 ) ); } } /* - * void addWidget ( QWidget * w ) + * void addWidget ( QWidget * w ) [*D=1*] */ HB_FUNC( QT_QLAYOUT_ADDWIDGET ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QLAYOUT_ADDWIDGET()" ) ); - if( p && p->ph && q && q->ph ) + QLayout * p = hbqt_par_QLayout( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QLAYOUT_ADDWIDGET() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addWidget( hbqt_par_QWidget( 2 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp index 1282c534c8..b42a44d960 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLayoutItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 17/17 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp index eeefcc8a5f..38feda00b8 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLineEdit.cpp @@ -70,6 +70,11 @@ * enum EchoMode { Normal, NoEcho, Password, PasswordEchoOnEdit } */ +/* + * Constructed[ 55/55 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp index fda9342899..2b3fa12685 100644 --- a/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QLinearGradient.cpp @@ -72,6 +72,11 @@ * enum Type { LinearGradient, RadialGradient, ConicalGradient, NoGradient } */ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QListView.cpp b/harbour/contrib/hbqt/qtgui/g/QListView.cpp index fabb0940db..77af875368 100644 --- a/harbour/contrib/hbqt/qtgui/g/QListView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QListView.cpp @@ -74,6 +74,11 @@ * enum ViewMode { ListMode, IconMode } */ +/* + * Constructed[ 29/29 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp index 77c63958cf..856ff145ae 100644 --- a/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QListWidget.cpp @@ -67,13 +67,8 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 32/34 [ 94.12% ] ] + * Constructed[ 32/32 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } - * } */ #include @@ -155,7 +150,7 @@ HB_FUNC( QT_QLISTWIDGET ) { QListWidget * pObj = NULL; - pObj = new QListWidget( hbqt_par_QWidget( 1 ) ) ; + pObj = new QListWidget( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) ; hb_retptrGC( hbqt_gcAllocate_QListWidget( ( void * ) pObj, true ) ); } @@ -175,18 +170,19 @@ HB_FUNC( QT_QLISTWIDGET_ADDITEM ) } /* - * void addItem ( QListWidgetItem * item ) + * void addItem ( QListWidgetItem * item ) [*D=1*] */ HB_FUNC( QT_QLISTWIDGET_ADDITEM_1 ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QLISTWIDGET_ADDITEM()" ) ); - if( p && p->ph && q && q->ph ) + QListWidget * p = hbqt_par_QListWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QLISTWIDGET_ADDITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QListWidget( 1 )->addItem( hbqt_par_QListWidgetItem( 2 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addItem( hbqt_par_QListWidgetItem( 2 ) ); } } @@ -277,18 +273,19 @@ HB_FUNC( QT_QLISTWIDGET_FINDITEMS ) } /* - * void insertItem ( int row, QListWidgetItem * item ) + * void insertItem ( int row, QListWidgetItem * item ) [*D=2*] */ HB_FUNC( QT_QLISTWIDGET_INSERTITEM ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QLISTWIDGET_INSERTITEM()" ) ); - if( p && p->ph && q && q->ph ) + QListWidget * p = hbqt_par_QListWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QLISTWIDGET_INSERTITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QListWidget( 1 )->insertItem( hb_parni( 2 ), hbqt_par_QListWidgetItem( 3 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->insertItem( hb_parni( 2 ), hbqt_par_QListWidgetItem( 3 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp index 5c2bcbafff..0c0d8cc088 100644 --- a/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp @@ -70,6 +70,11 @@ * enum ItemType { Type, UserType } */ +/* + * Constructed[ 35/35 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp index b7a8ef9c49..a276cbe6a1 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp @@ -72,21 +72,8 @@ */ /* - * Constructed[ 46/53 [ 86.79% ] ] + * Constructed[ 49/49 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } - * } - * - * *** Commented out protos which construct fine but do not compile *** - * - * //void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) - * //void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orientation orientation ) - * // void addToolBar ( Qt::ToolBarArea area, QToolBar * toolbar ) - * // void addToolBar ( QToolBar * toolbar ) - * // QToolBar * addToolBar ( const QString & title ) // NOT implemented */ #include @@ -189,44 +176,64 @@ HB_FUNC( QT_QMAINWINDOW ) } /* - * void addDockWidget ( ... ) + * void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) */ HB_FUNC( QT_QMAINWINDOW_ADDDOCKWIDGET ) { QMainWindow * p = hbqt_par_QMainWindow( 1 ); if( p ) { - if( hb_pcount() == 3 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) - { - ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ) ); - } - if( hb_pcount() == 4 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) - { - ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ), ( Qt::Orientation ) hb_parni( 4 ) ); - } + ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ) ); } } /* - * void addToolBar ( ... ) + * void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orientation orientation ) + */ +HB_FUNC( QT_QMAINWINDOW_ADDDOCKWIDGET_1 ) +{ + QMainWindow * p = hbqt_par_QMainWindow( 1 ); + if( p ) + { + ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ), ( Qt::Orientation ) hb_parni( 4 ) ); + } +} + +/* + * void addToolBar ( Qt::ToolBarArea area, QToolBar * toolbar ) */ HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR ) { QMainWindow * p = hbqt_par_QMainWindow( 1 ); if( p ) { - if( hb_pcount() == 3 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) - { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); - ( q )->bNew = false; - ( p )->addToolBar( ( Qt::ToolBarArea ) hb_parni( 2 ), hbqt_par_QToolBar( 3 ) ); - } - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - ( q )->bNew = false; - ( p )->addToolBar( hbqt_par_QToolBar( 2 ) ); - } + ( p )->addToolBar( ( Qt::ToolBarArea ) hb_parni( 2 ), hbqt_par_QToolBar( 3 ) ); + } +} + +/* + * void addToolBar ( QToolBar * toolbar ) + */ +HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR_1 ) +{ + QMainWindow * p = hbqt_par_QMainWindow( 1 ); + if( p ) + { + ( p )->addToolBar( hbqt_par_QToolBar( 2 ) ); + } +} + +/* + * QToolBar * addToolBar ( const QString & title ) // NOT implemented + */ +HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR_2 ) +{ + QMainWindow * p = hbqt_par_QMainWindow( 1 ); + if( p ) + { + void * pText; + hb_retptrGC( hbqt_gcAllocate_QToolBar( ( p )->addToolBar( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); + hb_strfree( pText ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp b/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp index 89d184af77..0d96af9892 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMatrix.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 29/29 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp b/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp index 1667bef997..808387ca1a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMdiArea.cpp @@ -73,6 +73,11 @@ * enum WindowOrder { CreationOrder, StackingOrder, ActivationHistoryOrder } */ +/* + * Constructed[ 26/26 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp b/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp index 0a4340c2ee..fc11fdaf18 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMdiSubWindow.cpp @@ -71,6 +71,11 @@ * flags SubWindowOptions */ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp index 3bfd8a3df6..7c9297f27c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp @@ -67,27 +67,11 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 26/41 [ 63.41% ] ] + * Constructed[ 33/33 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- * - * } - * } - * } + * *** Commented out protostypes *** * - * *** Commented out protos which construct fine but do not compile *** - * - * //QAction * addAction ( const QString & text ) - * //QAction * addAction ( const QIcon & icon, const QString & text ) - * //QAction * addAction ( const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) - * //QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) - * //QAction * addAction ( QAction * action ) - * //QAction * addMenu ( QMenu * menu ) - * //QMenu * addMenu ( const QString & title ) - * //QMenu * addMenu ( const QIcon & icon, const QString & title ) - * //QAction * exec () - * //QAction * exec ( const QPoint & p, QAction * action = 0 ) * // OSMenuRef macMenu ( OSMenuRef merge = 0 ) * // HMENU wceMenu ( bool create = false ) */ @@ -221,7 +205,7 @@ HB_FUNC( QT_QMENU_ACTIVEACTION ) } /* - * QAction * addAction ( ... ) + * QAction * addAction ( const QString & text ) */ HB_FUNC( QT_QMENU_ADDACTION ) { @@ -229,61 +213,102 @@ HB_FUNC( QT_QMENU_ADDACTION ) if( p ) { void * pText; - - if( hb_pcount() >= 5 ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) ); - } - else if( hb_pcount() >= 4 ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ), *hbqt_par_QKeySequence( 5 ) ), false ) ); - } - else if( hb_pcount() == 3 ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); - } - else if( hb_pcount() == 2 && HB_ISCHAR( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); - } - else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - q->bNew = HB_FALSE; - ( p )->addAction( hbqt_par_QAction( 2 ) ); - } - - if( pText ) - { - hb_strfree( pText ); - } + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); + hb_strfree( pText ); } } /* - * QMenu * addMenu ( ... ) + * QAction * addAction ( const QIcon & icon, const QString & text ) + */ +HB_FUNC( QT_QMENU_ADDACTION_1 ) +{ + QMenu * p = hbqt_par_QMenu( 1 ); + if( p ) + { + void * pText; + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); + hb_strfree( pText ); + } +} + +/* + * QAction * addAction ( const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) + */ +HB_FUNC( QT_QMENU_ADDACTION_2 ) +{ + QMenu * p = hbqt_par_QMenu( 1 ); + if( p ) + { + void * pText; + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ), *hbqt_par_QKeySequence( 5 ) ), false ) ); + hb_strfree( pText ); + } +} + +/* + * QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) + */ +HB_FUNC( QT_QMENU_ADDACTION_3 ) +{ + QMenu * p = hbqt_par_QMenu( 1 ); + if( p ) + { + void * pText; + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) ); + hb_strfree( pText ); + } +} + +/* + * void addAction ( QAction * action ) + */ +HB_FUNC( QT_QMENU_ADDACTION_4 ) +{ + QMenu * p = hbqt_par_QMenu( 1 ); + if( p ) + { + ( p )->addAction( hbqt_par_QAction( 2 ) ); + } +} + +/* + * QAction * addMenu ( QMenu * menu ) */ HB_FUNC( QT_QMENU_ADDMENU ) { QMenu * p = hbqt_par_QMenu( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISCHAR( 2 ) ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); - hb_strfree( pText ); - } - else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addMenu( hbqt_par_QMenu( 2 ) ), false ) ); - } - else if( hb_pcount() == 3 ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); - hb_strfree( pText ); - } + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addMenu( hbqt_par_QMenu( 2 ) ), false ) ); + } +} + +/* + * QMenu * addMenu ( const QString & title ) + */ +HB_FUNC( QT_QMENU_ADDMENU_1 ) +{ + QMenu * p = hbqt_par_QMenu( 1 ); + if( p ) + { + void * pText; + hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); + hb_strfree( pText ); + } +} + +/* + * QMenu * addMenu ( const QIcon & icon, const QString & title ) + */ +HB_FUNC( QT_QMENU_ADDMENU_2 ) +{ + QMenu * p = hbqt_par_QMenu( 1 ); + if( p ) + { + void * pText; + hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); + hb_strfree( pText ); } } @@ -324,21 +349,26 @@ HB_FUNC( QT_QMENU_DEFAULTACTION ) } /* - * QAction * exec ( ... ) + * QAction * exec () */ HB_FUNC( QT_QMENU_EXEC ) { QMenu * p = hbqt_par_QMenu( 1 ); if( p ) { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec( *hbqt_par_QPoint( 2 ), hbqt_par_QAction( 3 ) ), false ) ); - } - else - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec(), false ) ); - } + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec(), false ) ); + } +} + +/* + * QAction * exec ( const QPoint & p, QAction * action = 0 ) + */ +HB_FUNC( QT_QMENU_EXEC_1 ) +{ + QMenu * p = hbqt_par_QMenu( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec( *hbqt_par_QPoint( 2 ), hbqt_par_QAction( 3 ) ), false ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp index 359c1a8a09..6a3e161a18 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp @@ -66,6 +66,17 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // QAction * defaultAction () const + * // OSMenuRef macMenu () + * // void setDefaultAction ( QAction * act ) + */ + #include #include @@ -145,7 +156,7 @@ HB_FUNC( QT_QMENUBAR ) { QMenuBar * pObj = NULL; - pObj = new QMenuBar( hbqt_par_QWidget( 1 ) ) ; + pObj = new QMenuBar( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) ; hb_retptrGC( hbqt_gcAllocate_QMenuBar( ( void * ) pObj, true ) ); } diff --git a/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp b/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp index 72eccf1d03..458083e693 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMessageBox.cpp @@ -73,6 +73,11 @@ * flags StandardButtons */ +/* + * Constructed[ 39/39 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp index d2f01fca88..609746a85e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMouseEvent.cpp @@ -70,6 +70,11 @@ * enum Type { None, AccessibilityDescription, AccessibilityHelp, AccessibilityPrepare, ..., MaxUser } */ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp index fce3ef7f7a..ce4c952c7d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMoveEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QMovie.cpp b/harbour/contrib/hbqt/qtgui/g/QMovie.cpp index 2cd4739385..b4c251d561 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMovie.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMovie.cpp @@ -71,6 +71,11 @@ * enum MovieState { NotRunning, Paused, Running } */ +/* + * Constructed[ 28/28 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp index dccea5131a..7def40512c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPageSetupDialog.cpp @@ -71,6 +71,11 @@ * flags PageSetupDialogOptions */ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp index bcbc87f1e4..a1a7d30202 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPaintDevice.cpp @@ -70,6 +70,11 @@ * enum PaintDeviceMetric { PdmWidth, PdmHeight, PdmWidthMM, PdmHeightMM, ..., PdmPhysicalDpiY } */ +/* + * Constructed[ 12/12 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp index f8724539d2..758b12132c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPaintEngine.cpp @@ -75,6 +75,15 @@ * enum Type { X11, Windows, MacPrinter, CoreGraphics, ..., MaxUser } */ +/* + * Constructed[ 23/23 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // virtual void updateState ( const QPaintEngineState & state ) = 0 + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp index 5c63dc459b..7292016680 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPaintEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp index 91ce708137..51c3eff778 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp @@ -73,42 +73,10 @@ */ /* - * Constructed[ 91/266 [ 34.21% ] ] + * Constructed[ 94/94 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- * - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * //QRectF boundingRect ( const QRectF & rectangle, int flags, const QString & text ) * //QRect boundingRect ( const QRect & rectangle, int flags, const QString & text ) @@ -238,8 +206,6 @@ * // void fillRect ( int x, int y, int width, int height, Qt::GlobalColor color ) * // void fillRect ( const QRect & rectangle, Qt::GlobalColor color ) * // void fillRect ( const QRectF & rectangle, Qt::GlobalColor color ) - * //void setBrush ( const QBrush & brush ) - * //void setBrush ( Qt::BrushStyle style ) * //void setBrushOrigin ( const QPointF & position ) * //void setBrushOrigin ( const QPoint & position ) * //void setBrushOrigin ( int x, int y ) @@ -249,10 +215,6 @@ * //void setPen ( const QPen & pen ) * //void setPen ( const QColor & color ) * //void setPen ( Qt::PenStyle style ) - * //void setViewport ( const QRect & rectangle ) - * //void setViewport ( int x, int y, int width, int height ) - * //void setWindow ( const QRect & rectangle ) - * //void setWindow ( int x, int y, int width, int height ) * //void translate ( const QPointF & offset ) * //void translate ( const QPoint & offset ) * //void translate ( qreal dx, qreal dy ) @@ -1595,21 +1557,26 @@ HB_FUNC( QT_QPAINTER_SETBACKGROUNDMODE ) } /* - * void setBrush ( ... ) + * void setBrush ( const QBrush & brush ) */ HB_FUNC( QT_QPAINTER_SETBRUSH ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) - { - ( p )->setBrush( ( Qt::BrushStyle ) hb_parni( 2 ) ); - } - else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setBrush( *hbqt_par_QBrush( 2 ) ); - } + ( p )->setBrush( *hbqt_par_QBrush( 2 ) ); + } +} + +/* + * void setBrush ( Qt::BrushStyle style ) + */ +HB_FUNC( QT_QPAINTER_SETBRUSH_1 ) +{ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + ( p )->setBrush( ( Qt::BrushStyle ) hb_parni( 2 ) ); } } @@ -1830,40 +1797,50 @@ HB_FUNC( QT_QPAINTER_SETVIEWTRANSFORMENABLED ) } /* - * void setViewport ( ... ) + * void setViewport ( const QRect & rectangle ) */ HB_FUNC( QT_QPAINTER_SETVIEWPORT ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->setViewport( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } - else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setViewport( *hbqt_par_QRect( 2 ) ); - } + ( p )->setViewport( *hbqt_par_QRect( 2 ) ); } } /* - * void setWindow ( ... ) + * void setViewport ( int x, int y, int width, int height ) + */ +HB_FUNC( QT_QPAINTER_SETVIEWPORT_1 ) +{ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + ( p )->setViewport( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } +} + +/* + * void setWindow ( const QRect & rectangle ) */ HB_FUNC( QT_QPAINTER_SETWINDOW ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->setWindow( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } - else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setWindow( *hbqt_par_QRect( 2 ) ); - } + ( p )->setWindow( *hbqt_par_QRect( 2 ) ); + } +} + +/* + * void setWindow ( int x, int y, int width, int height ) + */ +HB_FUNC( QT_QPAINTER_SETWINDOW_1 ) +{ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + ( p )->setWindow( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp index 7fe517fd5c..508290a7cc 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp @@ -71,53 +71,17 @@ */ /* - * Constructed[ 41/80 [ 51.25% ] ] + * Constructed[ 52/52 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- * - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } + * *** Commented out protostypes *** * - * *** Commented out protos which construct fine but do not compile *** - * - * //void addEllipse ( const QRectF & boundingRectangle ) - * //void addEllipse ( qreal x, qreal y, qreal width, qreal height ) - * //void addEllipse ( const QPointF & center, qreal rx, qreal ry ) - * //void addRect ( const QRectF & rectangle ) - * //void addRect ( qreal x, qreal y, qreal width, qreal height ) - * //void addRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) - * //void addRoundedRect ( qreal x, qreal y, qreal w, qreal h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) - * //void addText ( const QPointF & point, const QFont & font, const QString & text ) - * //void addText ( qreal x, qreal y, const QFont & font, const QString & text ) - * //void arcMoveTo ( const QRectF & rectangle, qreal angle ) - * //void arcMoveTo ( qreal x, qreal y, qreal width, qreal height, qreal angle ) - * //void arcTo ( const QRectF & rectangle, qreal startAngle, qreal sweepLength ) - * //void arcTo ( qreal x, qreal y, qreal width, qreal height, qreal startAngle, qreal sweepLength ) * //bool contains ( const QPointF & point ) const * //bool contains ( const QRectF & rectangle ) const * //bool contains ( const QPainterPath & p ) const - * //void cubicTo ( const QPointF & c1, const QPointF & c2, const QPointF & endPoint ) - * //void cubicTo ( qreal c1X, qreal c1Y, qreal c2X, qreal c2Y, qreal endPointX, qreal endPointY ) * // const QPainterPath::Element & elementAt ( int index ) const * //bool intersects ( const QRectF & rectangle ) const * //bool intersects ( const QPainterPath & p ) const - * //void lineTo ( const QPointF & endPoint ) - * //void lineTo ( qreal x, qreal y ) - * //void moveTo ( const QPointF & point ) - * //void moveTo ( qreal x, qreal y ) - * //void quadTo ( const QPointF & c, const QPointF & endPoint ) - * //void quadTo ( qreal cx, qreal cy, qreal endPointX, qreal endPointY ) */ #include @@ -195,25 +159,38 @@ HB_FUNC( QT_QPAINTERPATH ) } /* - * void addEllipse ( ... ) + * void addEllipse ( const QRectF & boundingRectangle ) */ HB_FUNC( QT_QPAINTERPATH_ADDELLIPSE ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->addEllipse( *hbqt_par_QRectF( 2 ) ); - } - else if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) - { - ( p )->addEllipse( *hbqt_par_QPointF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->addEllipse( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); - } + ( p )->addEllipse( *hbqt_par_QRectF( 2 ) ); + } +} + +/* + * void addEllipse ( qreal x, qreal y, qreal width, qreal height ) + */ +HB_FUNC( QT_QPAINTERPATH_ADDELLIPSE_1 ) +{ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + ( p )->addEllipse( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); + } +} + +/* + * void addEllipse ( const QPointF & center, qreal rx, qreal ry ) + */ +HB_FUNC( QT_QPAINTERPATH_ADDELLIPSE_2 ) +{ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + ( p )->addEllipse( *hbqt_par_QPointF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); } } @@ -242,21 +219,26 @@ HB_FUNC( QT_QPAINTERPATH_ADDPOLYGON ) } /* - * void addRect ( ... ) + * void addRect ( const QRectF & rectangle ) */ HB_FUNC( QT_QPAINTERPATH_ADDRECT ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->addRect( *hbqt_par_QRectF( 2 ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->addRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); - } + ( p )->addRect( *hbqt_par_QRectF( 2 ) ); + } +} + +/* + * void addRect ( qreal x, qreal y, qreal width, qreal height ) + */ +HB_FUNC( QT_QPAINTERPATH_ADDRECT_1 ) +{ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + ( p )->addRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); } } @@ -273,40 +255,54 @@ HB_FUNC( QT_QPAINTERPATH_ADDREGION ) } /* - * void addRoundedRect ( ... ) + * void addRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) */ HB_FUNC( QT_QPAINTERPATH_ADDROUNDEDRECT ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - if( hb_pcount() >= 4 && HB_ISPOINTER( 2 ) ) - { - ( p )->addRoundedRect( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( Qt::SizeMode ) ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : Qt::AbsoluteSize ) ); - } - else if( hb_pcount() >= 7 && HB_ISNUM( 2 ) ) - { - ( p )->addRoundedRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ), ( Qt::SizeMode ) ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : Qt::AbsoluteSize ) ); - } + ( p )->addRoundedRect( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::SizeMode ) hb_parni( 5 ) : ( Qt::SizeMode ) Qt::AbsoluteSize ) ); } } /* - * void addText ( ... ) + * void addRoundedRect ( qreal x, qreal y, qreal w, qreal h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + */ +HB_FUNC( QT_QPAINTERPATH_ADDROUNDEDRECT_1 ) +{ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + ( p )->addRoundedRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ), ( HB_ISNUM( 8 ) ? ( Qt::SizeMode ) hb_parni( 8 ) : ( Qt::SizeMode ) Qt::AbsoluteSize ) ); + } +} + +/* + * void addText ( const QPointF & point, const QFont & font, const QString & text ) */ HB_FUNC( QT_QPAINTERPATH_ADDTEXT ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) - { - ( p )->addText( *hbqt_par_QPointF( 2 ), *hbqt_par_QFont( 3 ), hbqt_par_QString( 4 ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->addText( hb_parnd( 2 ), hb_parnd( 3 ), *hbqt_par_QFont( 4 ), hbqt_par_QString( 5 ) ); - } + void * pText; + ( p )->addText( *hbqt_par_QPointF( 2 ), *hbqt_par_QFont( 3 ), hb_parstr_utf8( 4, &pText, NULL ) ); + hb_strfree( pText ); + } +} + +/* + * void addText ( qreal x, qreal y, const QFont & font, const QString & text ) + */ +HB_FUNC( QT_QPAINTERPATH_ADDTEXT_1 ) +{ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + void * pText; + ( p )->addText( hb_parnd( 2 ), hb_parnd( 3 ), *hbqt_par_QFont( 4 ), hb_parstr_utf8( 5, &pText, NULL ) ); + hb_strfree( pText ); } } @@ -323,40 +319,50 @@ HB_FUNC( QT_QPAINTERPATH_ANGLEATPERCENT ) } /* - * void arcMoveTo ( ... ) + * void arcMoveTo ( const QRectF & rectangle, qreal angle ) */ HB_FUNC( QT_QPAINTERPATH_ARCMOVETO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) - { - ( p )->arcMoveTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ) ); - } - else if( hb_pcount() == 6 && HB_ISNUM( 2 ) ) - { - ( p )->arcMoveTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ) ); - } + ( p )->arcMoveTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ) ); } } /* - * void arcTo ( ... ) + * void arcMoveTo ( qreal x, qreal y, qreal width, qreal height, qreal angle ) + */ +HB_FUNC( QT_QPAINTERPATH_ARCMOVETO_1 ) +{ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + ( p )->arcMoveTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ) ); + } +} + +/* + * void arcTo ( const QRectF & rectangle, qreal startAngle, qreal sweepLength ) */ HB_FUNC( QT_QPAINTERPATH_ARCTO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) - { - ( p )->arcTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); - } - else if( hb_pcount() == 7 && HB_ISNUM( 2 ) ) - { - ( p )->arcTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); - } + ( p )->arcTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); + } +} + +/* + * void arcTo ( qreal x, qreal y, qreal width, qreal height, qreal startAngle, qreal sweepLength ) + */ +HB_FUNC( QT_QPAINTERPATH_ARCTO_1 ) +{ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + ( p )->arcTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); } } @@ -434,21 +440,26 @@ HB_FUNC( QT_QPAINTERPATH_CONTROLPOINTRECT ) } /* - * void cubicTo ( ... ) + * void cubicTo ( const QPointF & c1, const QPointF & c2, const QPointF & endPoint ) */ HB_FUNC( QT_QPAINTERPATH_CUBICTO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) - { - ( p )->cubicTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ), *hbqt_par_QPointF( 4 ) ); - } - else if( hb_pcount() == 7 && HB_ISNUM( 2 ) ) - { - ( p )->cubicTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); - } + ( p )->cubicTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ), *hbqt_par_QPointF( 4 ) ); + } +} + +/* + * void cubicTo ( qreal c1X, qreal c1Y, qreal c2X, qreal c2Y, qreal endPointX, qreal endPointY ) + */ +HB_FUNC( QT_QPAINTERPATH_CUBICTO_1 ) +{ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + ( p )->cubicTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); } } @@ -546,40 +557,50 @@ HB_FUNC( QT_QPAINTERPATH_LENGTH ) } /* - * void lineTo ( ... ) + * void lineTo ( const QPointF & endPoint ) */ HB_FUNC( QT_QPAINTERPATH_LINETO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->lineTo( *hbqt_par_QPointF( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->lineTo( hb_parnd( 2 ), hb_parnd( 3 ) ); - } + ( p )->lineTo( *hbqt_par_QPointF( 2 ) ); } } /* - * void moveTo ( ... ) + * void lineTo ( qreal x, qreal y ) + */ +HB_FUNC( QT_QPAINTERPATH_LINETO_1 ) +{ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + ( p )->lineTo( hb_parnd( 2 ), hb_parnd( 3 ) ); + } +} + +/* + * void moveTo ( const QPointF & point ) */ HB_FUNC( QT_QPAINTERPATH_MOVETO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->moveTo( *hbqt_par_QPointF( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->moveTo( hb_parnd( 2 ), hb_parnd( 3 ) ); - } + ( p )->moveTo( *hbqt_par_QPointF( 2 ) ); + } +} + +/* + * void moveTo ( qreal x, qreal y ) + */ +HB_FUNC( QT_QPAINTERPATH_MOVETO_1 ) +{ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + ( p )->moveTo( hb_parnd( 2 ), hb_parnd( 3 ) ); } } @@ -608,21 +629,26 @@ HB_FUNC( QT_QPAINTERPATH_POINTATPERCENT ) } /* - * void quadTo ( ... ) + * void quadTo ( const QPointF & c, const QPointF & endPoint ) */ HB_FUNC( QT_QPAINTERPATH_QUADTO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) - { - ( p )->quadTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->quadTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); - } + ( p )->quadTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ) ); + } +} + +/* + * void quadTo ( qreal cx, qreal cy, qreal endPointX, qreal endPointY ) + */ +HB_FUNC( QT_QPAINTERPATH_QUADTO_1 ) +{ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + ( p )->quadTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QPalette.cpp b/harbour/contrib/hbqt/qtgui/g/QPalette.cpp index 6228898b98..7e8518f0dc 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPalette.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPalette.cpp @@ -71,6 +71,11 @@ * enum ColorRole { Window, Background, WindowText, Foreground, ..., NoRole } */ +/* + * Constructed[ 35/35 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPen.cpp b/harbour/contrib/hbqt/qtgui/g/QPen.cpp index 77072792c6..2180f8c686 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPen.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPen.cpp @@ -70,7 +70,6 @@ * Constructed[ 21/23 [ 91.30% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QVector dashPattern () const * void setDashPattern ( const QVector & pattern ) diff --git a/harbour/contrib/hbqt/qtgui/g/QPicture.cpp b/harbour/contrib/hbqt/qtgui/g/QPicture.cpp index 7aaf713e55..4860daa02a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPicture.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPicture.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 11/11 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp b/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp index 55358d2872..b8895cd372 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPixmap.cpp @@ -72,38 +72,17 @@ */ /* - * Constructed[ 32/66 [ 48.48% ] ] + * Constructed[ 39/39 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- * - * } - * } - * } - * } - * } - * } - * } - * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // QRgb * clut () const - * //QPixmap copy ( const QRect & rectangle = QRect() ) const - * //QPixmap copy ( int x, int y, int width, int height ) const - * //QBitmap createMaskFromColor ( const QColor & maskColor, Qt::MaskMode mode ) const - * //QBitmap createMaskFromColor ( const QColor & maskColor ) const - * //void fill ( const QColor & color = Qt::white ) - * //void fill ( const QWidget * widget, const QPoint & offset ) - * //void fill ( const QWidget * widget, int x, int y ) * // Qt::HANDLE handle () const * // bool loadFromData ( const uchar * data, uint len, const char * format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor ) * // int numCols () const * // const uchar * qwsBits () const * // int qwsBytesPerLine () const - * //bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const - * //bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const - * //QPixmap scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const - * //QPixmap scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const * // CGImageRef toMacCGImageRef () const * //HBITMAP toWinHBITMAP ( HBitmapFormat format = NoAlpha ) const * //QPixmap transformed ( const QTransform & transform, Qt::TransformationMode mode = Qt::FastTransformation ) const @@ -111,8 +90,6 @@ * //QPixmap fromMacCGImageRef ( CGImageRef image ) * //QPixmap fromWinHBITMAP ( HBITMAP bitmap, HBitmapFormat format = NoAlpha ) * //QPixmap fromX11Pixmap ( Qt::HANDLE pixmap, ShareMode mode = ImplicitlyShared ) - * //QPixmap grabWidget ( QWidget * widget, const QRect & rectangle ) - * //QPixmap grabWidget ( QWidget * widget, int x = 0, int y = 0, int width = -1, int height = -1 ) * //QPixmap grabWindow ( WId window, int x = 0, int y = 0, int width = -1, int height = -1 ) */ @@ -249,25 +226,26 @@ HB_FUNC( QT_QPIXMAP_CACHEKEY ) } /* - * QPixmap copy ( ... ) + * QPixmap copy ( const QRect & rectangle = QRect() ) const */ HB_FUNC( QT_QPIXMAP_COPY ) { QPixmap * p = hbqt_par_QPixmap( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ), true ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ), true ) ); - } - else - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->copy( QRect() ) ), true ) ); - } + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ), true ) ); + } +} + +/* + * QPixmap copy ( int x, int y, int width, int height ) const + */ +HB_FUNC( QT_QPIXMAP_COPY_1 ) +{ + QPixmap * p = hbqt_par_QPixmap( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ), true ) ); } } @@ -284,25 +262,26 @@ HB_FUNC( QT_QPIXMAP_CREATEHEURISTICMASK ) } /* - * QBitmap createMaskFromColor ( ... ) + * QBitmap createMaskFromColor ( const QColor & maskColor, Qt::MaskMode mode ) const */ HB_FUNC( QT_QPIXMAP_CREATEMASKFROMCOLOR ) { QPixmap * p = hbqt_par_QPixmap( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( ( p )->createMaskFromColor( *hbqt_par_QColor( 2 ) ) ), true ) ); - } - else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISNUM( 3 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( ( p )->createMaskFromColor( *hbqt_par_QColor( 2 ), ( Qt::MaskMode ) hb_parni( 3 ) ) ), true ) ); - } - else - { - ( p )->copy( QRect() ); - } + hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( ( p )->createMaskFromColor( *hbqt_par_QColor( 2 ), ( Qt::MaskMode ) hb_parni( 3 ) ) ), true ) ); + } +} + +/* + * QBitmap createMaskFromColor ( const QColor & maskColor ) const + */ +HB_FUNC( QT_QPIXMAP_CREATEMASKFROMCOLOR_1 ) +{ + QPixmap * p = hbqt_par_QPixmap( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( ( p )->createMaskFromColor( *hbqt_par_QColor( 2 ) ) ), true ) ); } } @@ -331,25 +310,38 @@ HB_FUNC( QT_QPIXMAP_DETACH ) } /* - * void fill ( ... ) + * void fill ( const QColor & color = Qt::white ) */ HB_FUNC( QT_QPIXMAP_FILL ) { QPixmap * p = hbqt_par_QPixmap( 1 ); if( p ) { - if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) && HB_ISNUM( 3 ) ) - { - ( p )->fill( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); - } - else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISPOINTER( 3 ) ) - { - ( p )->fill( hbqt_par_QWidget( 2 ), *hbqt_par_QPoint( 3 ) ); - } - else - { - ( p )->fill( *hbqt_par_QColor( 2 ) ); - } + ( p )->fill( *hbqt_par_QColor( 2 ) ); + } +} + +/* + * void fill ( const QWidget * widget, const QPoint & offset ) + */ +HB_FUNC( QT_QPIXMAP_FILL_1 ) +{ + QPixmap * p = hbqt_par_QPixmap( 1 ); + if( p ) + { + ( p )->fill( hbqt_par_QWidget( 2 ), *hbqt_par_QPoint( 3 ) ); + } +} + +/* + * void fill ( const QWidget * widget, int x, int y ) + */ +HB_FUNC( QT_QPIXMAP_FILL_2 ) +{ + QPixmap * p = hbqt_par_QPixmap( 1 ); + if( p ) + { + ( p )->fill( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); } } @@ -464,42 +456,52 @@ HB_FUNC( QT_QPIXMAP_RECT ) } /* - * bool save ( ... ) + * bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const */ HB_FUNC( QT_QPIXMAP_SAVE ) { QPixmap * p = hbqt_par_QPixmap( 1 ); if( p ) { - if( hb_pcount() >= 2 && HB_ISCHAR( 2 ) ) - { - void * pText; - hb_retl( ( p )->save( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); - hb_strfree( pText ); - } - else if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retl( ( p )->save( hbqt_par_QIODevice( 2 ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); - } + void * pText; + hb_retl( ( p )->save( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); + hb_strfree( pText ); } } /* - * QPixmap scaled ( ... ) + * bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const + */ +HB_FUNC( QT_QPIXMAP_SAVE_1 ) +{ + QPixmap * p = hbqt_par_QPixmap( 1 ); + if( p ) + { + hb_retl( ( p )->save( hbqt_par_QIODevice( 2 ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); + } +} + +/* + * QPixmap scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const */ HB_FUNC( QT_QPIXMAP_SCALED ) { QPixmap * p = hbqt_par_QPixmap( 1 ); if( p ) { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); - } - else if( hb_pcount() >= 3 && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); - } + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); + } +} + +/* + * QPixmap scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + */ +HB_FUNC( QT_QPIXMAP_SCALED_1 ) +{ + QPixmap * p = hbqt_par_QPixmap( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); } } @@ -633,21 +635,26 @@ HB_FUNC( QT_QPIXMAP_FROMIMAGE ) } /* - * QPixmap grabWidget ( ... ) + * QPixmap grabWidget ( QWidget * widget, const QRect & rectangle ) */ HB_FUNC( QT_QPIXMAP_GRABWIDGET ) { QPixmap * p = hbqt_par_QPixmap( 1 ); if( p ) { - if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISPOINTER( 3 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->grabWidget( hbqt_par_QWidget( 2 ), *hbqt_par_QRect( 3 ) ) ), true ) ); - } - else if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->grabWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parnidef( 5, -1 ), hb_parnidef( 6, -1 ) ) ), true ) ); - } + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->grabWidget( hbqt_par_QWidget( 2 ), *hbqt_par_QRect( 3 ) ) ), true ) ); + } +} + +/* + * QPixmap grabWidget ( QWidget * widget, int x = 0, int y = 0, int width = -1, int height = -1 ) + */ +HB_FUNC( QT_QPIXMAP_GRABWIDGET_1 ) +{ + QPixmap * p = hbqt_par_QPixmap( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->grabWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parnidef( 5, -1 ), hb_parnidef( 6, -1 ) ) ), true ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp index c13c2a5813..8988255ff5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPlainTextDocumentLayout.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp index 25341eacb8..831ce10870 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPlainTextEdit.cpp @@ -74,7 +74,6 @@ * Constructed[ 57/59 [ 96.61% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QList extraSelections () const * void setExtraSelections ( const QList & selections ) diff --git a/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp b/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp index 7592c5e3ac..75cc9366ff 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPolygon.cpp @@ -66,6 +66,16 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 13/13 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // void putPoints ( int index, int nPoints, int firstx, int firsty, ... ) + * // void setPoints ( int nPoints, int firstx, int firsty, ... ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp b/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp index 34e92187d0..3c126c525f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPolygonF.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp index 570923b9a1..bf829ef74b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPrintDialog.cpp @@ -71,6 +71,17 @@ * flags PrintDialogOptions */ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // void addButton ( QPushButton * button ) + * //QPrinter * printer () const + * // void setPrinter ( QPrinter * printer, bool pickupSettings = false ) + */ + #include #include @@ -192,22 +203,10 @@ HB_FUNC( QT_QPRINTDIALOG_OPTIONS ) } } -/* - * QPrinter * printer () const - */ -HB_FUNC( QT_QPRINTDIALOG_PRINTER ) -{ - QPrintDialog * p = hbqt_par_QPrintDialog( 1 ); - if( p ) - { - hb_retptrGC( hbqt_gcAllocate_QPrinter( ( p )->printer(), false ) ); - } -} - /* * QPrinter * printer () */ -HB_FUNC( QT_QPRINTDIALOG_PRINTER_1 ) +HB_FUNC( QT_QPRINTDIALOG_PRINTER ) { QPrintDialog * p = hbqt_par_QPrintDialog( 1 ); if( p ) diff --git a/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp index fbc3371cac..74008911bf 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPrintEngine.cpp @@ -70,6 +70,11 @@ * enum PrintEnginePropertyKey { PPK_CollateCopies, PPK_ColorMode, PPK_Creator, PPK_Duplex, ..., PPK_CustomBase } */ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp index de96157ea3..e04d921890 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPrintPreviewDialog.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp b/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp index 1dfd1cd27b..99d17d5b68 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPrinter.cpp @@ -80,6 +80,19 @@ * enum Unit { Millimeter, Point, Inch, Pica, ..., DevicePixel } */ +/* + * Constructed[ 56/56 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // QString printerSelectionOption () const + * // void setPrinterSelectionOption ( const QString & option ) + * // void setWinPageSize ( int pageSize ) + * // QList supportedPaperSources () const + * // int winPageSize () const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPrinterInfo.cpp b/harbour/contrib/hbqt/qtgui/g/QPrinterInfo.cpp index 6c010d8a64..f1f999b849 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPrinterInfo.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPrinterInfo.cpp @@ -70,7 +70,6 @@ * Constructed[ 5/6 [ 83.33% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QList supportedPaperSizes () const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp b/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp index c61edb7571..c565a2b1de 100644 --- a/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QProgressBar.cpp @@ -70,6 +70,11 @@ * enum Direction { TopToBottom, BottomToTop } */ +/* + * Constructed[ 21/21 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp b/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp index 3106ef37c4..8f71c25d6e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QProgressDialog.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 24/24 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp b/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp index 6d7930b8fd..b2d46f0b6a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPushButton.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp b/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp index 8de62dfac6..da56f7bdb4 100644 --- a/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QRadialGradient.cpp @@ -72,6 +72,11 @@ * enum Type { LinearGradient, RadialGradient, ConicalGradient, NoGradient } */ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp b/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp index fc1c8ae9a1..ff486043ed 100644 --- a/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QRadioButton.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp index 8cd558450c..5ad147e06a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QRegExpValidator.cpp @@ -70,6 +70,15 @@ * enum State { Invalid, Intermediate, Acceptable } */ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //virtual QValidator::State validate ( QString & input, int & pos ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QRegion.cpp b/harbour/contrib/hbqt/qtgui/g/QRegion.cpp index 2b16055181..5b91836fc9 100644 --- a/harbour/contrib/hbqt/qtgui/g/QRegion.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QRegion.cpp @@ -71,14 +71,13 @@ */ /* - * Constructed[ 18/20 [ 90.00% ] ] + * Constructed[ 18/19 [ 94.74% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QVector rects () const * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // Handle handle () const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp index 9a1cdd4377..81376c40f0 100644 --- a/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QResizeEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp b/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp index 9f000af44e..15c4d7ae02 100644 --- a/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QScrollArea.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp b/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp index a8a944dc4d..ce5e02fbba 100644 --- a/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QScrollBar.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp b/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp index 2deccb93c4..ce2f52f3be 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSessionManager.cpp @@ -70,6 +70,11 @@ * enum RestartHint { RestartIfRunning, RestartAnyway, RestartImmediately, RestartNever } */ +/* + * Constructed[ 16/16 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp index 3c0cb45e59..229541251a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QShowEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp index 84369074a8..fcd794db92 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSizeGrip.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp b/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp index 2cb50e6efe..5f825fe4e7 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSizePolicy.cpp @@ -73,6 +73,11 @@ * flags ControlTypes */ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QSlider.cpp index f14cbe5566..e91f24ee7f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSlider.cpp @@ -70,6 +70,11 @@ * enum TickPosition { NoTicks, TicksBothSides, TicksAbove, TicksBelow, TicksLeft, TicksRight } */ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QSound.cpp b/harbour/contrib/hbqt/qtgui/g/QSound.cpp index d628671086..9b8c8c5651 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSound.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSound.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp b/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp index 53981b8805..5c57090443 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSpacerItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp index 7835f065f1..db9370b919 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSpinBox.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp b/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp index 9c55fd8d43..7bc26c62d2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSplashScreen.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp b/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp index f8ad8e0f4d..6fb7fa0b61 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSplitter.cpp @@ -67,14 +67,13 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 21/23 [ 91.30% ] ] + * Constructed[ 21/22 [ 95.45% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void setSizes ( const QList & list ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * //QSplitterHandle * handle ( int index ) const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp index 653cd9a807..aed5c26c78 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStackedWidget.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 10/10 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp index c4463543e6..a081187dcb 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp @@ -74,7 +74,6 @@ * Constructed[ 73/79 [ 92.41% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void appendColumn ( const QList & items ) * void appendRow ( const QList & items ) diff --git a/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp index dd35ce897b..1d0a070976 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStandardItemModel.cpp @@ -67,17 +67,16 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 28/33 [ 84.85% ] ] + * Constructed[ 28/32 [ 87.50% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void appendColumn ( const QList & items ) * void appendRow ( const QList & items ) * void insertColumn ( int column, const QList & items ) * void insertRow ( int row, const QList & items ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // const QStandardItem * itemPrototype () const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp index 19d344af66..75dd6fb096 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStatusBar.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 10/10 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp index ff64656fed..bbb09c9e96 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStringListModel.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QStyle.cpp index 92d6397d74..a0ee3f8a03 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyle.cpp @@ -81,6 +81,11 @@ * enum SubElement { SE_PushButtonContents, SE_PushButtonFocusRect, SE_PushButtonLayoutItem, SE_CheckBoxIndicator, ..., SE_TabBarTabText } */ +/* + * Constructed[ 29/29 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp index a07c04ad9d..0f89ae0bfc 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleFactory.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp index bc4014538a..6cdbf5d5f6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturn.cpp @@ -76,7 +76,6 @@ * Constructed[ 0/2 [ 0.00% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * int type * int version diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp index ac49635ba8..98e8c1a99c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnMask.cpp @@ -75,7 +75,6 @@ * Constructed[ 0/1 [ 0.00% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QRegion region */ diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp index bd236d7319..d910540866 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleHintReturnVariant.cpp @@ -76,7 +76,6 @@ * Constructed[ 0/1 [ 0.00% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QVariant variant */ diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp index 365bb12974..4fe6646a6a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOption.cpp @@ -72,6 +72,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + */ + #include #include @@ -163,7 +168,11 @@ HB_FUNC( QT_QSTYLEOPTION_INITFROM ) */ HB_FUNC( QT_QSTYLEOPTION_DIRECTION ) { - hb_retni( ( Qt::LayoutDirection ) hbqt_par_QStyleOption( 1 )->direction ); + QStyleOption * p = hbqt_par_QStyleOption( 1 ); + if( p ) + { + hb_retni( ( Qt::LayoutDirection ) ( p )->direction ); + } } /* @@ -171,7 +180,11 @@ HB_FUNC( QT_QSTYLEOPTION_DIRECTION ) */ HB_FUNC( QT_QSTYLEOPTION_FONTMETRICS ) { - hb_retptrGC( hbqt_gcAllocate_QFontMetrics( new QFontMetrics( hbqt_par_QStyleOption( 1 )->fontMetrics ), true ) ); + QStyleOption * p = hbqt_par_QStyleOption( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QFontMetrics( new QFontMetrics( ( p )->fontMetrics ), true ) ); + } } /* @@ -179,7 +192,11 @@ HB_FUNC( QT_QSTYLEOPTION_FONTMETRICS ) */ HB_FUNC( QT_QSTYLEOPTION_PALETTE ) { - hb_retptrGC( hbqt_gcAllocate_QPalette( new QPalette( hbqt_par_QStyleOption( 1 )->palette ), true ) ); + QStyleOption * p = hbqt_par_QStyleOption( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QPalette( new QPalette( ( p )->palette ), true ) ); + } } /* @@ -187,7 +204,11 @@ HB_FUNC( QT_QSTYLEOPTION_PALETTE ) */ HB_FUNC( QT_QSTYLEOPTION_RECT ) { - hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyleOption( 1 )->rect ), true ) ); + QStyleOption * p = hbqt_par_QStyleOption( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( ( p )->rect ), true ) ); + } } /* @@ -195,7 +216,11 @@ HB_FUNC( QT_QSTYLEOPTION_RECT ) */ HB_FUNC( QT_QSTYLEOPTION_STATE ) { - hb_retni( ( QStyle::State ) hbqt_par_QStyleOption( 1 )->state ); + QStyleOption * p = hbqt_par_QStyleOption( 1 ); + if( p ) + { + hb_retni( ( QStyle::State ) ( p )->state ); + } } /* @@ -203,7 +228,11 @@ HB_FUNC( QT_QSTYLEOPTION_STATE ) */ HB_FUNC( QT_QSTYLEOPTION_TYPE ) { - hb_retni( hbqt_par_QStyleOption( 1 )->type ); + QStyleOption * p = hbqt_par_QStyleOption( 1 ); + if( p ) + { + hb_retni( ( p )->type ); + } } /* @@ -211,7 +240,11 @@ HB_FUNC( QT_QSTYLEOPTION_TYPE ) */ HB_FUNC( QT_QSTYLEOPTION_VERSION ) { - hb_retni( hbqt_par_QStyleOption( 1 )->version ); + QStyleOption * p = hbqt_par_QStyleOption( 1 ); + if( p ) + { + hb_retni( ( p )->version ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp index e94c9db8ac..7ea7fb1b14 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionButton.cpp @@ -73,6 +73,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include @@ -151,7 +156,11 @@ HB_FUNC( QT_QSTYLEOPTIONBUTTON ) */ HB_FUNC( QT_QSTYLEOPTIONBUTTON_FEATURES ) { - hb_retni( ( QStyleOptionButton::ButtonFeatures ) hbqt_par_QStyleOptionButton( 1 )->features ); + QStyleOptionButton * p = hbqt_par_QStyleOptionButton( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionButton::ButtonFeatures ) ( p )->features ); + } } /* @@ -159,7 +168,11 @@ HB_FUNC( QT_QSTYLEOPTIONBUTTON_FEATURES ) */ HB_FUNC( QT_QSTYLEOPTIONBUTTON_ICON ) { - hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionButton( 1 )->icon ), true ) ); + QStyleOptionButton * p = hbqt_par_QStyleOptionButton( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( ( p )->icon ), true ) ); + } } /* @@ -167,7 +180,11 @@ HB_FUNC( QT_QSTYLEOPTIONBUTTON_ICON ) */ HB_FUNC( QT_QSTYLEOPTIONBUTTON_ICONSIZE ) { - hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionButton( 1 )->iconSize ), true ) ); + QStyleOptionButton * p = hbqt_par_QStyleOptionButton( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->iconSize ), true ) ); + } } /* @@ -175,7 +192,11 @@ HB_FUNC( QT_QSTYLEOPTIONBUTTON_ICONSIZE ) */ HB_FUNC( QT_QSTYLEOPTIONBUTTON_TEXT ) { - hb_retstr_utf8( hbqt_par_QStyleOptionButton( 1 )->text.toUtf8().data() ); + QStyleOptionButton * p = hbqt_par_QStyleOptionButton( 1 ); + if( p ) + { + hb_retstr_utf8( ( p )->text.toUtf8().data() ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp index 4c14fa910a..6694e61593 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComboBox.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX ) */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_CURRENTICON ) { - hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionComboBox( 1 )->currentIcon ), true ) ); + QStyleOptionComboBox * p = hbqt_par_QStyleOptionComboBox( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( ( p )->currentIcon ), true ) ); + } } /* @@ -157,7 +166,11 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_CURRENTICON ) */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_CURRENTTEXT ) { - hb_retstr_utf8( hbqt_par_QStyleOptionComboBox( 1 )->currentText.toUtf8().data() ); + QStyleOptionComboBox * p = hbqt_par_QStyleOptionComboBox( 1 ); + if( p ) + { + hb_retstr_utf8( ( p )->currentText.toUtf8().data() ); + } } /* @@ -165,7 +178,11 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_CURRENTTEXT ) */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_EDITABLE ) { - hb_retl( hbqt_par_QStyleOptionComboBox( 1 )->editable ); + QStyleOptionComboBox * p = hbqt_par_QStyleOptionComboBox( 1 ); + if( p ) + { + hb_retl( ( p )->editable ); + } } /* @@ -173,7 +190,11 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_EDITABLE ) */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_FRAME ) { - hb_retl( hbqt_par_QStyleOptionComboBox( 1 )->frame ); + QStyleOptionComboBox * p = hbqt_par_QStyleOptionComboBox( 1 ); + if( p ) + { + hb_retl( ( p )->frame ); + } } /* @@ -181,7 +202,11 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_FRAME ) */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_ICONSIZE ) { - hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionComboBox( 1 )->iconSize ), true ) ); + QStyleOptionComboBox * p = hbqt_par_QStyleOptionComboBox( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->iconSize ), true ) ); + } } /* @@ -189,7 +214,11 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_ICONSIZE ) */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_POPUPRECT ) { - hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionComboBox( 1 )->popupRect ), true ) ); + QStyleOptionComboBox * p = hbqt_par_QStyleOptionComboBox( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( ( p )->popupRect ), true ) ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp index 820aa24f59..b22c0bc4e6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionComplex.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONCOMPLEX ) */ HB_FUNC( QT_QSTYLEOPTIONCOMPLEX_ACTIVESUBCONTROLS ) { - hb_retni( ( QStyle::SubControls ) hbqt_par_QStyleOptionComplex( 1 )->activeSubControls ); + QStyleOptionComplex * p = hbqt_par_QStyleOptionComplex( 1 ); + if( p ) + { + hb_retni( ( QStyle::SubControls ) ( p )->activeSubControls ); + } } /* @@ -157,7 +166,11 @@ HB_FUNC( QT_QSTYLEOPTIONCOMPLEX_ACTIVESUBCONTROLS ) */ HB_FUNC( QT_QSTYLEOPTIONCOMPLEX_SUBCONTROLS ) { - hb_retni( ( QStyle::SubControls ) hbqt_par_QStyleOptionComplex( 1 )->subControls ); + QStyleOptionComplex * p = hbqt_par_QStyleOptionComplex( 1 ); + if( p ) + { + hb_retni( ( QStyle::SubControls ) ( p )->subControls ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp index 217dfeba39..06810f26c6 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionDockWidget.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET ) */ HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET_CLOSABLE ) { - hb_retl( hbqt_par_QStyleOptionDockWidget( 1 )->closable ); + QStyleOptionDockWidget * p = hbqt_par_QStyleOptionDockWidget( 1 ); + if( p ) + { + hb_retl( ( p )->closable ); + } } /* @@ -157,7 +166,11 @@ HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET_CLOSABLE ) */ HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET_FLOATABLE ) { - hb_retl( hbqt_par_QStyleOptionDockWidget( 1 )->floatable ); + QStyleOptionDockWidget * p = hbqt_par_QStyleOptionDockWidget( 1 ); + if( p ) + { + hb_retl( ( p )->floatable ); + } } /* @@ -165,7 +178,11 @@ HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET_FLOATABLE ) */ HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET_MOVABLE ) { - hb_retl( hbqt_par_QStyleOptionDockWidget( 1 )->movable ); + QStyleOptionDockWidget * p = hbqt_par_QStyleOptionDockWidget( 1 ); + if( p ) + { + hb_retl( ( p )->movable ); + } } /* @@ -173,7 +190,11 @@ HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET_MOVABLE ) */ HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET_TITLE ) { - hb_retstr_utf8( hbqt_par_QStyleOptionDockWidget( 1 )->title.toUtf8().data() ); + QStyleOptionDockWidget * p = hbqt_par_QStyleOptionDockWidget( 1 ); + if( p ) + { + hb_retstr_utf8( ( p )->title.toUtf8().data() ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp index 1f6f2c6b09..9ef4c161ac 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFocusRect.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 1/1 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONFOCUSRECT ) */ HB_FUNC( QT_QSTYLEOPTIONFOCUSRECT_BACKGROUNDCOLOR ) { - hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QStyleOptionFocusRect( 1 )->backgroundColor ), true ) ); + QStyleOptionFocusRect * p = hbqt_par_QStyleOptionFocusRect( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( ( p )->backgroundColor ), true ) ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp index 31f5083562..c77e1abf89 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionFrame.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONFRAME ) */ HB_FUNC( QT_QSTYLEOPTIONFRAME_LINEWIDTH ) { - hb_retni( hbqt_par_QStyleOptionFrame( 1 )->lineWidth ); + QStyleOptionFrame * p = hbqt_par_QStyleOptionFrame( 1 ); + if( p ) + { + hb_retni( ( p )->lineWidth ); + } } /* @@ -157,7 +166,11 @@ HB_FUNC( QT_QSTYLEOPTIONFRAME_LINEWIDTH ) */ HB_FUNC( QT_QSTYLEOPTIONFRAME_MIDLINEWIDTH ) { - hb_retni( hbqt_par_QStyleOptionFrame( 1 )->midLineWidth ); + QStyleOptionFrame * p = hbqt_par_QStyleOptionFrame( 1 ); + if( p ) + { + hb_retni( ( p )->midLineWidth ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionGraphicsItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGraphicsItem.cpp index c909e25e4b..7570a94bdf 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionGraphicsItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGraphicsItem.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + */ + #include #include @@ -151,7 +156,11 @@ HB_FUNC( QT_QSTYLEOPTIONGRAPHICSITEM ) */ HB_FUNC( QT_QSTYLEOPTIONGRAPHICSITEM_EXPOSEDRECT ) { - hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QStyleOptionGraphicsItem( 1 )->exposedRect ), true ) ); + QStyleOptionGraphicsItem * p = hbqt_par_QStyleOptionGraphicsItem( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( ( p )->exposedRect ), true ) ); + } } /* @@ -159,7 +168,11 @@ HB_FUNC( QT_QSTYLEOPTIONGRAPHICSITEM_EXPOSEDRECT ) */ HB_FUNC( QT_QSTYLEOPTIONGRAPHICSITEM_LEVELOFDETAIL ) { - hb_retnd( hbqt_par_QStyleOptionGraphicsItem( 1 )->levelOfDetail ); + QStyleOptionGraphicsItem * p = hbqt_par_QStyleOptionGraphicsItem( 1 ); + if( p ) + { + hb_retnd( ( p )->levelOfDetail ); + } } /* @@ -167,7 +180,11 @@ HB_FUNC( QT_QSTYLEOPTIONGRAPHICSITEM_LEVELOFDETAIL ) */ HB_FUNC( QT_QSTYLEOPTIONGRAPHICSITEM_MATRIX ) { - hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QStyleOptionGraphicsItem( 1 )->matrix ), true ) ); + QStyleOptionGraphicsItem * p = hbqt_par_QStyleOptionGraphicsItem( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( ( p )->matrix ), true ) ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp index a37862f85b..64a8e60f92 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionGroupBox.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX ) */ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_FEATURES ) { - hb_retni( ( QStyleOptionFrameV2::FrameFeatures ) hbqt_par_QStyleOptionGroupBox( 1 )->features ); + QStyleOptionGroupBox * p = hbqt_par_QStyleOptionGroupBox( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionFrameV2::FrameFeatures ) ( p )->features ); + } } /* @@ -157,7 +166,11 @@ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_FEATURES ) */ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_LINEWIDTH ) { - hb_retni( hbqt_par_QStyleOptionGroupBox( 1 )->lineWidth ); + QStyleOptionGroupBox * p = hbqt_par_QStyleOptionGroupBox( 1 ); + if( p ) + { + hb_retni( ( p )->lineWidth ); + } } /* @@ -165,7 +178,11 @@ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_LINEWIDTH ) */ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_MIDLINEWIDTH ) { - hb_retni( hbqt_par_QStyleOptionGroupBox( 1 )->midLineWidth ); + QStyleOptionGroupBox * p = hbqt_par_QStyleOptionGroupBox( 1 ); + if( p ) + { + hb_retni( ( p )->midLineWidth ); + } } /* @@ -173,7 +190,11 @@ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_MIDLINEWIDTH ) */ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_TEXT ) { - hb_retstr_utf8( hbqt_par_QStyleOptionGroupBox( 1 )->text.toUtf8().data() ); + QStyleOptionGroupBox * p = hbqt_par_QStyleOptionGroupBox( 1 ); + if( p ) + { + hb_retstr_utf8( ( p )->text.toUtf8().data() ); + } } /* @@ -181,7 +202,11 @@ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_TEXT ) */ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_TEXTALIGNMENT ) { - hb_retni( ( Qt::Alignment ) hbqt_par_QStyleOptionGroupBox( 1 )->textAlignment ); + QStyleOptionGroupBox * p = hbqt_par_QStyleOptionGroupBox( 1 ); + if( p ) + { + hb_retni( ( Qt::Alignment ) ( p )->textAlignment ); + } } /* @@ -189,7 +214,11 @@ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_TEXTALIGNMENT ) */ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_TEXTCOLOR ) { - hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QStyleOptionGroupBox( 1 )->textColor ), true ) ); + QStyleOptionGroupBox * p = hbqt_par_QStyleOptionGroupBox( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( ( p )->textColor ), true ) ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp index 1b5007262b..564e230d88 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionHeader.cpp @@ -74,6 +74,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + */ + #include #include @@ -152,7 +157,11 @@ HB_FUNC( QT_QSTYLEOPTIONHEADER ) */ HB_FUNC( QT_QSTYLEOPTIONHEADER_ICON ) { - hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionHeader( 1 )->icon ), true ) ); + QStyleOptionHeader * p = hbqt_par_QStyleOptionHeader( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( ( p )->icon ), true ) ); + } } /* @@ -160,7 +169,11 @@ HB_FUNC( QT_QSTYLEOPTIONHEADER_ICON ) */ HB_FUNC( QT_QSTYLEOPTIONHEADER_ICONALIGNMENT ) { - hb_retni( ( Qt::Alignment ) hbqt_par_QStyleOptionHeader( 1 )->iconAlignment ); + QStyleOptionHeader * p = hbqt_par_QStyleOptionHeader( 1 ); + if( p ) + { + hb_retni( ( Qt::Alignment ) ( p )->iconAlignment ); + } } /* @@ -168,7 +181,11 @@ HB_FUNC( QT_QSTYLEOPTIONHEADER_ICONALIGNMENT ) */ HB_FUNC( QT_QSTYLEOPTIONHEADER_ORIENTATION ) { - hb_retni( ( Qt::Orientation ) hbqt_par_QStyleOptionHeader( 1 )->orientation ); + QStyleOptionHeader * p = hbqt_par_QStyleOptionHeader( 1 ); + if( p ) + { + hb_retni( ( Qt::Orientation ) ( p )->orientation ); + } } /* @@ -176,7 +193,11 @@ HB_FUNC( QT_QSTYLEOPTIONHEADER_ORIENTATION ) */ HB_FUNC( QT_QSTYLEOPTIONHEADER_POSITION ) { - hb_retni( ( QStyleOptionHeader::SectionPosition ) hbqt_par_QStyleOptionHeader( 1 )->position ); + QStyleOptionHeader * p = hbqt_par_QStyleOptionHeader( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionHeader::SectionPosition ) ( p )->position ); + } } /* @@ -184,7 +205,11 @@ HB_FUNC( QT_QSTYLEOPTIONHEADER_POSITION ) */ HB_FUNC( QT_QSTYLEOPTIONHEADER_SECTION ) { - hb_retni( hbqt_par_QStyleOptionHeader( 1 )->section ); + QStyleOptionHeader * p = hbqt_par_QStyleOptionHeader( 1 ); + if( p ) + { + hb_retni( ( p )->section ); + } } /* @@ -192,7 +217,11 @@ HB_FUNC( QT_QSTYLEOPTIONHEADER_SECTION ) */ HB_FUNC( QT_QSTYLEOPTIONHEADER_SELECTEDPOSITION ) { - hb_retni( ( QStyleOptionHeader::SelectedPosition ) hbqt_par_QStyleOptionHeader( 1 )->selectedPosition ); + QStyleOptionHeader * p = hbqt_par_QStyleOptionHeader( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionHeader::SelectedPosition ) ( p )->selectedPosition ); + } } /* @@ -200,7 +229,11 @@ HB_FUNC( QT_QSTYLEOPTIONHEADER_SELECTEDPOSITION ) */ HB_FUNC( QT_QSTYLEOPTIONHEADER_SORTINDICATOR ) { - hb_retni( ( QStyleOptionHeader::SortIndicator ) hbqt_par_QStyleOptionHeader( 1 )->sortIndicator ); + QStyleOptionHeader * p = hbqt_par_QStyleOptionHeader( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionHeader::SortIndicator ) ( p )->sortIndicator ); + } } /* @@ -208,7 +241,11 @@ HB_FUNC( QT_QSTYLEOPTIONHEADER_SORTINDICATOR ) */ HB_FUNC( QT_QSTYLEOPTIONHEADER_TEXT ) { - hb_retstr_utf8( hbqt_par_QStyleOptionHeader( 1 )->text.toUtf8().data() ); + QStyleOptionHeader * p = hbqt_par_QStyleOptionHeader( 1 ); + if( p ) + { + hb_retstr_utf8( ( p )->text.toUtf8().data() ); + } } /* @@ -216,7 +253,11 @@ HB_FUNC( QT_QSTYLEOPTIONHEADER_TEXT ) */ HB_FUNC( QT_QSTYLEOPTIONHEADER_TEXTALIGNMENT ) { - hb_retni( ( Qt::Alignment ) hbqt_par_QStyleOptionHeader( 1 )->textAlignment ); + QStyleOptionHeader * p = hbqt_par_QStyleOptionHeader( 1 ); + if( p ) + { + hb_retni( ( Qt::Alignment ) ( p )->textAlignment ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp index 9610e16abf..12b3b98d6f 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionMenuItem.cpp @@ -73,6 +73,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 10/10 [ 100.00% ] ] + * + */ + #include #include @@ -151,7 +156,11 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_CHECKTYPE ) { - hb_retni( ( QStyleOptionMenuItem::CheckType ) hbqt_par_QStyleOptionMenuItem( 1 )->checkType ); + QStyleOptionMenuItem * p = hbqt_par_QStyleOptionMenuItem( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionMenuItem::CheckType ) ( p )->checkType ); + } } /* @@ -159,7 +168,11 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_CHECKTYPE ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_CHECKED ) { - hb_retl( hbqt_par_QStyleOptionMenuItem( 1 )->checked ); + QStyleOptionMenuItem * p = hbqt_par_QStyleOptionMenuItem( 1 ); + if( p ) + { + hb_retl( ( p )->checked ); + } } /* @@ -167,7 +180,11 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_CHECKED ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_FONT ) { - hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QStyleOptionMenuItem( 1 )->font ), true ) ); + QStyleOptionMenuItem * p = hbqt_par_QStyleOptionMenuItem( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( ( p )->font ), true ) ); + } } /* @@ -175,7 +192,11 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_FONT ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_ICON ) { - hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionMenuItem( 1 )->icon ), true ) ); + QStyleOptionMenuItem * p = hbqt_par_QStyleOptionMenuItem( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( ( p )->icon ), true ) ); + } } /* @@ -183,7 +204,11 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_ICON ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MAXICONWIDTH ) { - hb_retni( hbqt_par_QStyleOptionMenuItem( 1 )->maxIconWidth ); + QStyleOptionMenuItem * p = hbqt_par_QStyleOptionMenuItem( 1 ); + if( p ) + { + hb_retni( ( p )->maxIconWidth ); + } } /* @@ -191,7 +216,11 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MAXICONWIDTH ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MENUHASCHECKABLEITEMS ) { - hb_retl( hbqt_par_QStyleOptionMenuItem( 1 )->menuHasCheckableItems ); + QStyleOptionMenuItem * p = hbqt_par_QStyleOptionMenuItem( 1 ); + if( p ) + { + hb_retl( ( p )->menuHasCheckableItems ); + } } /* @@ -199,7 +228,11 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MENUHASCHECKABLEITEMS ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MENUITEMTYPE ) { - hb_retni( ( QStyleOptionMenuItem::MenuItemType ) hbqt_par_QStyleOptionMenuItem( 1 )->menuItemType ); + QStyleOptionMenuItem * p = hbqt_par_QStyleOptionMenuItem( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionMenuItem::MenuItemType ) ( p )->menuItemType ); + } } /* @@ -207,7 +240,11 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MENUITEMTYPE ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MENURECT ) { - hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionMenuItem( 1 )->menuRect ), true ) ); + QStyleOptionMenuItem * p = hbqt_par_QStyleOptionMenuItem( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( ( p )->menuRect ), true ) ); + } } /* @@ -215,7 +252,11 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MENURECT ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_TABWIDTH ) { - hb_retni( hbqt_par_QStyleOptionMenuItem( 1 )->tabWidth ); + QStyleOptionMenuItem * p = hbqt_par_QStyleOptionMenuItem( 1 ); + if( p ) + { + hb_retni( ( p )->tabWidth ); + } } /* @@ -223,7 +264,11 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_TABWIDTH ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_TEXT ) { - hb_retstr_utf8( hbqt_par_QStyleOptionMenuItem( 1 )->text.toUtf8().data() ); + QStyleOptionMenuItem * p = hbqt_par_QStyleOptionMenuItem( 1 ); + if( p ) + { + hb_retstr_utf8( ( p )->text.toUtf8().data() ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp index 12189941f1..8bfd110124 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionProgressBar.cpp @@ -72,6 +72,11 @@ * Public Functions */ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include @@ -150,7 +155,11 @@ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR ) */ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_MAXIMUM ) { - hb_retni( hbqt_par_QStyleOptionProgressBar( 1 )->maximum ); + QStyleOptionProgressBar * p = hbqt_par_QStyleOptionProgressBar( 1 ); + if( p ) + { + hb_retni( ( p )->maximum ); + } } /* @@ -158,7 +167,11 @@ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_MAXIMUM ) */ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_MINIMUM ) { - hb_retni( hbqt_par_QStyleOptionProgressBar( 1 )->minimum ); + QStyleOptionProgressBar * p = hbqt_par_QStyleOptionProgressBar( 1 ); + if( p ) + { + hb_retni( ( p )->minimum ); + } } /* @@ -166,7 +179,11 @@ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_MINIMUM ) */ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_PROGRESS ) { - hb_retni( hbqt_par_QStyleOptionProgressBar( 1 )->progress ); + QStyleOptionProgressBar * p = hbqt_par_QStyleOptionProgressBar( 1 ); + if( p ) + { + hb_retni( ( p )->progress ); + } } /* @@ -174,7 +191,11 @@ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_PROGRESS ) */ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_TEXT ) { - hb_retstr_utf8( hbqt_par_QStyleOptionProgressBar( 1 )->text.toUtf8().data() ); + QStyleOptionProgressBar * p = hbqt_par_QStyleOptionProgressBar( 1 ); + if( p ) + { + hb_retstr_utf8( ( p )->text.toUtf8().data() ); + } } /* @@ -182,7 +203,11 @@ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_TEXT ) */ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_TEXTALIGNMENT ) { - hb_retni( ( Qt::Alignment ) hbqt_par_QStyleOptionProgressBar( 1 )->textAlignment ); + QStyleOptionProgressBar * p = hbqt_par_QStyleOptionProgressBar( 1 ); + if( p ) + { + hb_retni( ( Qt::Alignment ) ( p )->textAlignment ); + } } /* @@ -190,7 +215,11 @@ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_TEXTALIGNMENT ) */ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_TEXTVISIBLE ) { - hb_retl( hbqt_par_QStyleOptionProgressBar( 1 )->textVisible ); + QStyleOptionProgressBar * p = hbqt_par_QStyleOptionProgressBar( 1 ); + if( p ) + { + hb_retl( ( p )->textVisible ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp index ca68484d79..ecae15c067 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSizeGrip.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 1/1 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONSIZEGRIP ) */ HB_FUNC( QT_QSTYLEOPTIONSIZEGRIP_CORNER ) { - hb_retni( ( Qt::Corner ) hbqt_par_QStyleOptionSizeGrip( 1 )->corner ); + QStyleOptionSizeGrip * p = hbqt_par_QStyleOptionSizeGrip( 1 ); + if( p ) + { + hb_retni( ( Qt::Corner ) ( p )->corner ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp index 77f19313ed..126f167a19 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSlider.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 12/12 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_DIALWRAPPING ) { - hb_retl( hbqt_par_QStyleOptionSlider( 1 )->dialWrapping ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retl( ( p )->dialWrapping ); + } } /* @@ -157,7 +166,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER_DIALWRAPPING ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_MAXIMUM ) { - hb_retni( hbqt_par_QStyleOptionSlider( 1 )->maximum ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retni( ( p )->maximum ); + } } /* @@ -165,7 +178,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER_MAXIMUM ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_MINIMUM ) { - hb_retni( hbqt_par_QStyleOptionSlider( 1 )->minimum ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retni( ( p )->minimum ); + } } /* @@ -173,7 +190,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER_MINIMUM ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_NOTCHTARGET ) { - hb_retnd( hbqt_par_QStyleOptionSlider( 1 )->notchTarget ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retnd( ( p )->notchTarget ); + } } /* @@ -181,7 +202,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER_NOTCHTARGET ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_ORIENTATION ) { - hb_retni( ( Qt::Orientation ) hbqt_par_QStyleOptionSlider( 1 )->orientation ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retni( ( Qt::Orientation ) ( p )->orientation ); + } } /* @@ -189,7 +214,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER_ORIENTATION ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_PAGESTEP ) { - hb_retni( hbqt_par_QStyleOptionSlider( 1 )->pageStep ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retni( ( p )->pageStep ); + } } /* @@ -197,7 +226,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER_PAGESTEP ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_SINGLESTEP ) { - hb_retni( hbqt_par_QStyleOptionSlider( 1 )->singleStep ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retni( ( p )->singleStep ); + } } /* @@ -205,7 +238,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER_SINGLESTEP ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_SLIDERPOSITION ) { - hb_retni( hbqt_par_QStyleOptionSlider( 1 )->sliderPosition ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retni( ( p )->sliderPosition ); + } } /* @@ -213,7 +250,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER_SLIDERPOSITION ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_SLIDERVALUE ) { - hb_retni( hbqt_par_QStyleOptionSlider( 1 )->sliderValue ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retni( ( p )->sliderValue ); + } } /* @@ -221,7 +262,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER_SLIDERVALUE ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_TICKINTERVAL ) { - hb_retni( hbqt_par_QStyleOptionSlider( 1 )->tickInterval ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retni( ( p )->tickInterval ); + } } /* @@ -229,7 +274,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER_TICKINTERVAL ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_TICKPOSITION ) { - hb_retni( ( QSlider::TickPosition ) hbqt_par_QStyleOptionSlider( 1 )->tickPosition ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retni( ( QSlider::TickPosition ) ( p )->tickPosition ); + } } /* @@ -237,7 +286,11 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER_TICKPOSITION ) */ HB_FUNC( QT_QSTYLEOPTIONSLIDER_UPSIDEDOWN ) { - hb_retl( hbqt_par_QStyleOptionSlider( 1 )->upsideDown ); + QStyleOptionSlider * p = hbqt_par_QStyleOptionSlider( 1 ); + if( p ) + { + hb_retl( ( p )->upsideDown ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp index a22e4f03bd..034674eff4 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionSpinBox.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONSPINBOX ) */ HB_FUNC( QT_QSTYLEOPTIONSPINBOX_BUTTONSYMBOLS ) { - hb_retni( ( QAbstractSpinBox::ButtonSymbols ) hbqt_par_QStyleOptionSpinBox( 1 )->buttonSymbols ); + QStyleOptionSpinBox * p = hbqt_par_QStyleOptionSpinBox( 1 ); + if( p ) + { + hb_retni( ( QAbstractSpinBox::ButtonSymbols ) ( p )->buttonSymbols ); + } } /* @@ -157,7 +166,11 @@ HB_FUNC( QT_QSTYLEOPTIONSPINBOX_BUTTONSYMBOLS ) */ HB_FUNC( QT_QSTYLEOPTIONSPINBOX_FRAME ) { - hb_retl( hbqt_par_QStyleOptionSpinBox( 1 )->frame ); + QStyleOptionSpinBox * p = hbqt_par_QStyleOptionSpinBox( 1 ); + if( p ) + { + hb_retl( ( p )->frame ); + } } /* @@ -165,7 +178,11 @@ HB_FUNC( QT_QSTYLEOPTIONSPINBOX_FRAME ) */ HB_FUNC( QT_QSTYLEOPTIONSPINBOX_STEPENABLED ) { - hb_retni( ( QAbstractSpinBox::StepEnabled ) hbqt_par_QStyleOptionSpinBox( 1 )->stepEnabled ); + QStyleOptionSpinBox * p = hbqt_par_QStyleOptionSpinBox( 1 ); + if( p ) + { + hb_retni( ( QAbstractSpinBox::StepEnabled ) ( p )->stepEnabled ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp index 582a151d67..cd734ab7e5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTab.cpp @@ -75,6 +75,11 @@ * enum TabPosition { Beginning, Middle, End, OnlyOneTab } */ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include @@ -153,7 +158,11 @@ HB_FUNC( QT_QSTYLEOPTIONTAB ) */ HB_FUNC( QT_QSTYLEOPTIONTAB_CORNERWIDGETS ) { - hb_retni( ( QStyleOptionTab::CornerWidgets ) hbqt_par_QStyleOptionTab( 1 )->cornerWidgets ); + QStyleOptionTab * p = hbqt_par_QStyleOptionTab( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionTab::CornerWidgets ) ( p )->cornerWidgets ); + } } /* @@ -161,7 +170,11 @@ HB_FUNC( QT_QSTYLEOPTIONTAB_CORNERWIDGETS ) */ HB_FUNC( QT_QSTYLEOPTIONTAB_ICON ) { - hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionTab( 1 )->icon ), true ) ); + QStyleOptionTab * p = hbqt_par_QStyleOptionTab( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( ( p )->icon ), true ) ); + } } /* @@ -169,7 +182,11 @@ HB_FUNC( QT_QSTYLEOPTIONTAB_ICON ) */ HB_FUNC( QT_QSTYLEOPTIONTAB_POSITION ) { - hb_retni( ( QStyleOptionTab::TabPosition ) hbqt_par_QStyleOptionTab( 1 )->position ); + QStyleOptionTab * p = hbqt_par_QStyleOptionTab( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionTab::TabPosition ) ( p )->position ); + } } /* @@ -177,7 +194,11 @@ HB_FUNC( QT_QSTYLEOPTIONTAB_POSITION ) */ HB_FUNC( QT_QSTYLEOPTIONTAB_ROW ) { - hb_retni( hbqt_par_QStyleOptionTab( 1 )->row ); + QStyleOptionTab * p = hbqt_par_QStyleOptionTab( 1 ); + if( p ) + { + hb_retni( ( p )->row ); + } } /* @@ -185,7 +206,11 @@ HB_FUNC( QT_QSTYLEOPTIONTAB_ROW ) */ HB_FUNC( QT_QSTYLEOPTIONTAB_SELECTEDPOSITION ) { - hb_retni( ( QStyleOptionTab::SelectedPosition ) hbqt_par_QStyleOptionTab( 1 )->selectedPosition ); + QStyleOptionTab * p = hbqt_par_QStyleOptionTab( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionTab::SelectedPosition ) ( p )->selectedPosition ); + } } /* @@ -193,7 +218,11 @@ HB_FUNC( QT_QSTYLEOPTIONTAB_SELECTEDPOSITION ) */ HB_FUNC( QT_QSTYLEOPTIONTAB_SHAPE ) { - hb_retni( ( QTabBar::Shape ) hbqt_par_QStyleOptionTab( 1 )->shape ); + QStyleOptionTab * p = hbqt_par_QStyleOptionTab( 1 ); + if( p ) + { + hb_retni( ( QTabBar::Shape ) ( p )->shape ); + } } /* @@ -201,7 +230,11 @@ HB_FUNC( QT_QSTYLEOPTIONTAB_SHAPE ) */ HB_FUNC( QT_QSTYLEOPTIONTAB_TEXT ) { - hb_retstr_utf8( hbqt_par_QStyleOptionTab( 1 )->text.toUtf8().data() ); + QStyleOptionTab * p = hbqt_par_QStyleOptionTab( 1 ); + if( p ) + { + hb_retstr_utf8( ( p )->text.toUtf8().data() ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp index 93d8dfbbf3..1c90d69a41 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabBarBase.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE ) */ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_SELECTEDTABRECT ) { - hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionTabBarBase( 1 )->selectedTabRect ), true ) ); + QStyleOptionTabBarBase * p = hbqt_par_QStyleOptionTabBarBase( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( ( p )->selectedTabRect ), true ) ); + } } /* @@ -157,7 +166,11 @@ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_SELECTEDTABRECT ) */ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_SHAPE ) { - hb_retni( ( QTabBar::Shape ) hbqt_par_QStyleOptionTabBarBase( 1 )->shape ); + QStyleOptionTabBarBase * p = hbqt_par_QStyleOptionTabBarBase( 1 ); + if( p ) + { + hb_retni( ( QTabBar::Shape ) ( p )->shape ); + } } /* @@ -165,7 +178,11 @@ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_SHAPE ) */ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_TABBARRECT ) { - hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionTabBarBase( 1 )->tabBarRect ), true ) ); + QStyleOptionTabBarBase * p = hbqt_par_QStyleOptionTabBarBase( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( ( p )->tabBarRect ), true ) ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp index 55a086ee2b..aa3ab4a63d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTabWidgetFrame.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME ) */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_LEFTCORNERWIDGETSIZE ) { - hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->leftCornerWidgetSize ), true ) ); + QStyleOptionTabWidgetFrame * p = hbqt_par_QStyleOptionTabWidgetFrame( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->leftCornerWidgetSize ), true ) ); + } } /* @@ -157,7 +166,11 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_LEFTCORNERWIDGETSIZE ) */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_LINEWIDTH ) { - hb_retni( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->lineWidth ); + QStyleOptionTabWidgetFrame * p = hbqt_par_QStyleOptionTabWidgetFrame( 1 ); + if( p ) + { + hb_retni( ( p )->lineWidth ); + } } /* @@ -165,7 +178,11 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_LINEWIDTH ) */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_MIDLINEWIDTH ) { - hb_retni( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->midLineWidth ); + QStyleOptionTabWidgetFrame * p = hbqt_par_QStyleOptionTabWidgetFrame( 1 ); + if( p ) + { + hb_retni( ( p )->midLineWidth ); + } } /* @@ -173,7 +190,11 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_MIDLINEWIDTH ) */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_RIGHTCORNERWIDGETSIZE ) { - hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->rightCornerWidgetSize ), true ) ); + QStyleOptionTabWidgetFrame * p = hbqt_par_QStyleOptionTabWidgetFrame( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->rightCornerWidgetSize ), true ) ); + } } /* @@ -181,7 +202,11 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_RIGHTCORNERWIDGETSIZE ) */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_SHAPE ) { - hb_retni( ( QTabBar::Shape ) hbqt_par_QStyleOptionTabWidgetFrame( 1 )->shape ); + QStyleOptionTabWidgetFrame * p = hbqt_par_QStyleOptionTabWidgetFrame( 1 ); + if( p ) + { + hb_retni( ( QTabBar::Shape ) ( p )->shape ); + } } /* @@ -189,7 +214,11 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_SHAPE ) */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_TABBARSIZE ) { - hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->tabBarSize ), true ) ); + QStyleOptionTabWidgetFrame * p = hbqt_par_QStyleOptionTabWidgetFrame( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->tabBarSize ), true ) ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp index 2b9cfa41b2..868b312aee 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionTitleBar.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR ) */ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR_ICON ) { - hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionTitleBar( 1 )->icon ), true ) ); + QStyleOptionTitleBar * p = hbqt_par_QStyleOptionTitleBar( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( ( p )->icon ), true ) ); + } } /* @@ -157,7 +166,11 @@ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR_ICON ) */ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR_TEXT ) { - hb_retstr_utf8( hbqt_par_QStyleOptionTitleBar( 1 )->text.toUtf8().data() ); + QStyleOptionTitleBar * p = hbqt_par_QStyleOptionTitleBar( 1 ); + if( p ) + { + hb_retstr_utf8( ( p )->text.toUtf8().data() ); + } } /* @@ -165,7 +178,11 @@ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR_TEXT ) */ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR_TITLEBARFLAGS ) { - hb_retni( ( Qt::WindowFlags ) hbqt_par_QStyleOptionTitleBar( 1 )->titleBarFlags ); + QStyleOptionTitleBar * p = hbqt_par_QStyleOptionTitleBar( 1 ); + if( p ) + { + hb_retni( ( Qt::WindowFlags ) ( p )->titleBarFlags ); + } } /* @@ -173,7 +190,11 @@ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR_TITLEBARFLAGS ) */ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR_TITLEBARSTATE ) { - hb_retni( hbqt_par_QStyleOptionTitleBar( 1 )->titleBarState ); + QStyleOptionTitleBar * p = hbqt_par_QStyleOptionTitleBar( 1 ); + if( p ) + { + hb_retni( ( p )->titleBarState ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp index 5f2f61e0fe..4e0951b646 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBar.cpp @@ -74,6 +74,11 @@ * enum ToolBarPosition { Beginning, Middle, End, OnlyOne } */ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include @@ -152,7 +157,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_FEATURES ) { - hb_retni( ( QStyleOptionToolBar::ToolBarFeatures ) hbqt_par_QStyleOptionToolBar( 1 )->features ); + QStyleOptionToolBar * p = hbqt_par_QStyleOptionToolBar( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionToolBar::ToolBarFeatures ) ( p )->features ); + } } /* @@ -160,7 +169,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_FEATURES ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_LINEWIDTH ) { - hb_retni( hbqt_par_QStyleOptionToolBar( 1 )->lineWidth ); + QStyleOptionToolBar * p = hbqt_par_QStyleOptionToolBar( 1 ); + if( p ) + { + hb_retni( ( p )->lineWidth ); + } } /* @@ -168,7 +181,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_LINEWIDTH ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_MIDLINEWIDTH ) { - hb_retni( hbqt_par_QStyleOptionToolBar( 1 )->midLineWidth ); + QStyleOptionToolBar * p = hbqt_par_QStyleOptionToolBar( 1 ); + if( p ) + { + hb_retni( ( p )->midLineWidth ); + } } /* @@ -176,7 +193,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_MIDLINEWIDTH ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_POSITIONOFLINE ) { - hb_retni( ( QStyleOptionToolBar::ToolBarPosition ) hbqt_par_QStyleOptionToolBar( 1 )->positionOfLine ); + QStyleOptionToolBar * p = hbqt_par_QStyleOptionToolBar( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionToolBar::ToolBarPosition ) ( p )->positionOfLine ); + } } /* @@ -184,7 +205,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_POSITIONOFLINE ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_POSITIONWITHINLINE ) { - hb_retni( ( QStyleOptionToolBar::ToolBarPosition ) hbqt_par_QStyleOptionToolBar( 1 )->positionWithinLine ); + QStyleOptionToolBar * p = hbqt_par_QStyleOptionToolBar( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionToolBar::ToolBarPosition ) ( p )->positionWithinLine ); + } } /* @@ -192,7 +217,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_POSITIONWITHINLINE ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_TOOLBARAREA ) { - hb_retni( ( Qt::ToolBarArea ) hbqt_par_QStyleOptionToolBar( 1 )->toolBarArea ); + QStyleOptionToolBar * p = hbqt_par_QStyleOptionToolBar( 1 ); + if( p ) + { + hb_retni( ( Qt::ToolBarArea ) ( p )->toolBarArea ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp index 5b2e427bc3..e41cf4618d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolBox.cpp @@ -71,6 +71,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include @@ -149,7 +154,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBOX ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBOX_ICON ) { - hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionToolBox( 1 )->icon ), true ) ); + QStyleOptionToolBox * p = hbqt_par_QStyleOptionToolBox( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( ( p )->icon ), true ) ); + } } /* @@ -157,7 +166,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBOX_ICON ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBOX_TEXT ) { - hb_retstr_utf8( hbqt_par_QStyleOptionToolBox( 1 )->text.toUtf8().data() ); + QStyleOptionToolBox * p = hbqt_par_QStyleOptionToolBox( 1 ); + if( p ) + { + hb_retstr_utf8( ( p )->text.toUtf8().data() ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp index 8900bf6cb7..25225ff71a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionToolButton.cpp @@ -73,6 +73,11 @@ * flags ToolButtonFeatures */ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + */ + #include #include @@ -151,7 +156,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ARROWTYPE ) { - hb_retni( ( Qt::ArrowType ) hbqt_par_QStyleOptionToolButton( 1 )->arrowType ); + QStyleOptionToolButton * p = hbqt_par_QStyleOptionToolButton( 1 ); + if( p ) + { + hb_retni( ( Qt::ArrowType ) ( p )->arrowType ); + } } /* @@ -159,7 +168,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ARROWTYPE ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_FEATURES ) { - hb_retni( ( QStyleOptionToolButton::ToolButtonFeatures ) hbqt_par_QStyleOptionToolButton( 1 )->features ); + QStyleOptionToolButton * p = hbqt_par_QStyleOptionToolButton( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionToolButton::ToolButtonFeatures ) ( p )->features ); + } } /* @@ -167,7 +180,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_FEATURES ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_FONT ) { - hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QStyleOptionToolButton( 1 )->font ), true ) ); + QStyleOptionToolButton * p = hbqt_par_QStyleOptionToolButton( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( ( p )->font ), true ) ); + } } /* @@ -175,7 +192,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_FONT ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICON ) { - hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionToolButton( 1 )->icon ), true ) ); + QStyleOptionToolButton * p = hbqt_par_QStyleOptionToolButton( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( ( p )->icon ), true ) ); + } } /* @@ -183,7 +204,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICON ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICONSIZE ) { - hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionToolButton( 1 )->iconSize ), true ) ); + QStyleOptionToolButton * p = hbqt_par_QStyleOptionToolButton( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->iconSize ), true ) ); + } } /* @@ -191,7 +216,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICONSIZE ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_POS ) { - hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QStyleOptionToolButton( 1 )->pos ), true ) ); + QStyleOptionToolButton * p = hbqt_par_QStyleOptionToolButton( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( ( p )->pos ), true ) ); + } } /* @@ -199,7 +228,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_POS ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_TEXT ) { - hb_retstr_utf8( hbqt_par_QStyleOptionToolButton( 1 )->text.toUtf8().data() ); + QStyleOptionToolButton * p = hbqt_par_QStyleOptionToolButton( 1 ); + if( p ) + { + hb_retstr_utf8( ( p )->text.toUtf8().data() ); + } } /* @@ -207,7 +240,11 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_TEXT ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_TOOLBUTTONSTYLE ) { - hb_retni( ( Qt::ToolButtonStyle ) hbqt_par_QStyleOptionToolButton( 1 )->toolButtonStyle ); + QStyleOptionToolButton * p = hbqt_par_QStyleOptionToolButton( 1 ); + if( p ) + { + hb_retni( ( Qt::ToolButtonStyle ) ( p )->toolButtonStyle ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp b/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp index 533686c116..33fec0cfbd 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyleOptionViewItem.cpp @@ -72,6 +72,11 @@ * enum StyleOptionVersion { Version } */ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include @@ -150,7 +155,11 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM ) */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DECORATIONALIGNMENT ) { - hb_retni( ( Qt::Alignment ) hbqt_par_QStyleOptionViewItem( 1 )->decorationAlignment ); + QStyleOptionViewItem * p = hbqt_par_QStyleOptionViewItem( 1 ); + if( p ) + { + hb_retni( ( Qt::Alignment ) ( p )->decorationAlignment ); + } } /* @@ -158,7 +167,11 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DECORATIONALIGNMENT ) */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DECORATIONPOSITION ) { - hb_retni( ( QStyleOptionViewItem::Position ) hbqt_par_QStyleOptionViewItem( 1 )->decorationPosition ); + QStyleOptionViewItem * p = hbqt_par_QStyleOptionViewItem( 1 ); + if( p ) + { + hb_retni( ( QStyleOptionViewItem::Position ) ( p )->decorationPosition ); + } } /* @@ -166,7 +179,11 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DECORATIONPOSITION ) */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DECORATIONSIZE ) { - hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionViewItem( 1 )->decorationSize ), true ) ); + QStyleOptionViewItem * p = hbqt_par_QStyleOptionViewItem( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( ( p )->decorationSize ), true ) ); + } } /* @@ -174,7 +191,11 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DECORATIONSIZE ) */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DISPLAYALIGNMENT ) { - hb_retni( ( Qt::Alignment ) hbqt_par_QStyleOptionViewItem( 1 )->displayAlignment ); + QStyleOptionViewItem * p = hbqt_par_QStyleOptionViewItem( 1 ); + if( p ) + { + hb_retni( ( Qt::Alignment ) ( p )->displayAlignment ); + } } /* @@ -182,7 +203,11 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DISPLAYALIGNMENT ) */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_FONT ) { - hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QStyleOptionViewItem( 1 )->font ), true ) ); + QStyleOptionViewItem * p = hbqt_par_QStyleOptionViewItem( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( ( p )->font ), true ) ); + } } /* @@ -190,7 +215,11 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_FONT ) */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_SHOWDECORATIONSELECTED ) { - hb_retl( hbqt_par_QStyleOptionViewItem( 1 )->showDecorationSelected ); + QStyleOptionViewItem * p = hbqt_par_QStyleOptionViewItem( 1 ); + if( p ) + { + hb_retl( ( p )->showDecorationSelected ); + } } /* @@ -198,7 +227,11 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_SHOWDECORATIONSELECTED ) */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_TEXTELIDEMODE ) { - hb_retni( ( Qt::TextElideMode ) hbqt_par_QStyleOptionViewItem( 1 )->textElideMode ); + QStyleOptionViewItem * p = hbqt_par_QStyleOptionViewItem( 1 ); + if( p ) + { + hb_retni( ( Qt::TextElideMode ) ( p )->textElideMode ); + } } diff --git a/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp b/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp index ccd9610f15..27b3e6be6a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStylePainter.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp index 5415678ab0..647fb27767 100644 --- a/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QStyledItemDelegate.cpp @@ -66,6 +66,16 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // QItemEditorFactory * itemEditorFactory () const + * // void setItemEditorFactory ( QItemEditorFactory * factory ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp index f1530c3ea1..5f2e641c8d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSyntaxHighlighter.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp index eeeb93fcaf..9fa8762c88 100644 --- a/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp @@ -71,6 +71,11 @@ * enum MessageIcon { NoIcon, Information, Warning, Critical } */ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp b/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp index a23916d0d1..9cfb29b332 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTabBar.cpp @@ -72,6 +72,17 @@ * enum Shape { RoundedNorth, RoundedSouth, RoundedWest, RoundedEast, ..., TriangularEast } */ +/* + * Constructed[ 44/44 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // int addTab ( const QIcon & icon, const QString & text ) + * // int insertTab ( int index, const QIcon & icon, const QString & text ) + * // void setTabIcon ( int index, const QIcon & icon ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp index 9609c00b7c..ad71260000 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp @@ -72,12 +72,8 @@ */ /* - * Constructed[ 41/42 [ 97.62% ] ] + * Constructed[ 41/41 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } */ #include @@ -165,32 +161,37 @@ HB_FUNC( QT_QTABWIDGET ) } /* - * int addTab ( QWidget * page, const QString & label ) + * int addTab ( QWidget * page, const QString & label ) [*D=1*] */ HB_FUNC( QT_QTABWIDGET_ADDTAB ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABWIDGET_ADDTAB()" ) ); - if( p && p->ph && q && q->ph ) + QTabWidget * p = hbqt_par_QTabWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTABWIDGET_ADDTAB() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - - q->bNew = HB_FALSE; - - hb_retni( hbqt_par_QTabWidget( 1 )->addTab( hbqt_par_QWidget( 2 ), hbqt_par_QString( 3 ) ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + void * pText; + hb_retni( ( p )->addTab( hbqt_par_QWidget( 2 ), hb_parstr_utf8( 3, &pText, NULL ) ) ); + hb_strfree( pText ); } } /* - * int addTab ( QWidget * page, const QIcon & icon, const QString & label ) + * int addTab ( QWidget * page, const QIcon & icon, const QString & label ) [*D=1*] */ HB_FUNC( QT_QTABWIDGET_ADDTAB_1 ) { QTabWidget * p = hbqt_par_QTabWidget( 1 ); if( p ) { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } void * pText; hb_retni( ( p )->addTab( hbqt_par_QWidget( 2 ), ( HB_ISCHAR( 3 ) ? QIcon( hbqt_par_QString( 3 ) ) : *hbqt_par_QIcon( 3 )), hb_parstr_utf8( 4, &pText, NULL ) ) ); hb_strfree( pText ); diff --git a/harbour/contrib/hbqt/qtgui/g/QTableView.cpp b/harbour/contrib/hbqt/qtgui/g/QTableView.cpp index 20c43bdac6..2ebe89bd32 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTableView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTableView.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 42/42 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp index 3ba557dfd2..5d10997399 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTableWidget.cpp @@ -67,17 +67,8 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 49/55 [ 89.09% ] ] + * Constructed[ 49/49 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } - * } - * } - * } - * } - * } */ #include @@ -411,18 +402,19 @@ HB_FUNC( QT_QTABLEWIDGET_SELECTEDRANGES ) } /* - * void setCellWidget ( int row, int column, QWidget * widget ) + * void setCellWidget ( int row, int column, QWidget * widget ) [*D=3*] */ HB_FUNC( QT_QTABLEWIDGET_SETCELLWIDGET ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 4 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETCELLWIDGET()" ) ); - if( p && p->ph && q && q->ph ) + QTableWidget * p = hbqt_par_QTableWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETCELLWIDGET() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QTableWidget( 1 )->setCellWidget( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_QWidget( 4 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 4 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setCellWidget( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_QWidget( 4 ) ); } } @@ -463,50 +455,53 @@ HB_FUNC( QT_QTABLEWIDGET_SETCURRENTCELL_1 ) } /* - * void setCurrentItem ( QTableWidgetItem * item ) + * void setCurrentItem ( QTableWidgetItem * item ) [*D=1*] */ HB_FUNC( QT_QTABLEWIDGET_SETCURRENTITEM ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETCURRENTITEM()" ) ); - if( p && p->ph && q && q->ph ) + QTableWidget * p = hbqt_par_QTableWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETCURRENTITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QTableWidget( 1 )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ) ); } } /* - * void setCurrentItem ( QTableWidgetItem * item, QItemSelectionModel::SelectionFlags command ) + * void setCurrentItem ( QTableWidgetItem * item, QItemSelectionModel::SelectionFlags command ) [*D=1*] */ HB_FUNC( QT_QTABLEWIDGET_SETCURRENTITEM_1 ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETCURRENTITEM_1()" ) ); - if( p && p->ph && q && q->ph ) + QTableWidget * p = hbqt_par_QTableWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETCURRENTITEM_1() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QTableWidget( 1 )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 2 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setCurrentItem( hbqt_par_QTableWidgetItem( 2 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 3 ) ); } } /* - * void setHorizontalHeaderItem ( int column, QTableWidgetItem * item ) + * void setHorizontalHeaderItem ( int column, QTableWidgetItem * item ) [*D=2*] */ HB_FUNC( QT_QTABLEWIDGET_SETHORIZONTALHEADERITEM ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETHORIZONTALHEADERITEM()" ) ); - if( p && p->ph && q && q->ph ) + QTableWidget * p = hbqt_par_QTableWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETHORIZONTALHEADERITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QTableWidget( 1 )->setHorizontalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setHorizontalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); } } @@ -523,18 +518,19 @@ HB_FUNC( QT_QTABLEWIDGET_SETHORIZONTALHEADERLABELS ) } /* - * void setItem ( int row, int column, QTableWidgetItem * item ) + * void setItem ( int row, int column, QTableWidgetItem * item ) [*D=3*] */ HB_FUNC( QT_QTABLEWIDGET_SETITEM ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 4 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETITEM()" ) ); - if( p && p->ph && q && q->ph ) + QTableWidget * p = hbqt_par_QTableWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QTableWidget( 1 )->setItem( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_QTableWidgetItem( 4 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 4 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setItem( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_QTableWidgetItem( 4 ) ); } } @@ -575,18 +571,19 @@ HB_FUNC( QT_QTABLEWIDGET_SETROWCOUNT ) } /* - * void setVerticalHeaderItem ( int row, QTableWidgetItem * item ) + * void setVerticalHeaderItem ( int row, QTableWidgetItem * item ) [*D=2*] */ HB_FUNC( QT_QTABLEWIDGET_SETVERTICALHEADERITEM ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTABLEWIDGET_SETVERTICALHEADERITEM()" ) ); - if( p && p->ph && q && q->ph ) + QTableWidget * p = hbqt_par_QTableWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTABLEWIDGET_SETVERTICALHEADERITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QTableWidget( 1 )->setVerticalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setVerticalHeaderItem( hb_parni( 2 ), hbqt_par_QTableWidgetItem( 3 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp index 3e110e061a..3f5d763365 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp @@ -70,6 +70,11 @@ * enum ItemType { Type, UserType } */ +/* + * Constructed[ 35/35 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp b/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp index 40c5329765..5c840bec16 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTableWidgetSelectionRange.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp index 8a93e9bacc..11ae66e2a5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextBlock.cpp @@ -66,6 +66,16 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 27/27 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //iterator begin () const + * //iterator end () const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp index 8221ee4b75..b90f1d9ea7 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextBlockFormat.cpp @@ -78,7 +78,6 @@ * Constructed[ 19/21 [ 90.48% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void setTabPositions ( const QList & tabs ) * QList tabPositions () const diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp index a7d6d6cace..2946c1b5ee 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextBlockGroup.cpp @@ -66,6 +66,18 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + * + * *** Commented out protostypes *** + * + * //virtual void blockFormatChanged ( const QTextBlock & block ) + * //virtual void blockInserted ( const QTextBlock & block ) + * //QList blockList () const + * //virtual void blockRemoved ( const QTextBlock & block ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp b/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp index 64ec4b7a1d..e649f88c35 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextBrowser.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 20/20 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp index c3cb21ce26..8d1f0f67b4 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextCharFormat.cpp @@ -71,6 +71,11 @@ * enum VerticalAlignment { AlignNormal, AlignSuperScript, AlignSubScript, AlignMiddle, AlignBottom, AlignTop } */ +/* + * Constructed[ 47/47 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp b/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp index 7aeafbfaa4..865dfdf2cf 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextCursor.cpp @@ -72,6 +72,17 @@ * enum SelectionType { Document, BlockUnderCursor, LineUnderCursor, WordUnderCursor } */ +/* + * Constructed[ 58/58 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //QTextTable * currentTable () const + * //QTextTable * insertTable ( int rows, int columns, const QTextTableFormat & format ) + * //QTextTable * insertTable ( int rows, int columns ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp index 5d9d7408a3..f8b8f0adbe 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextDocument.cpp @@ -77,7 +77,6 @@ * Constructed[ 67/68 [ 98.53% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QVector allFormats () const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp index 8e0255d41e..d362f6b82b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextDocumentFragment.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp b/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp index 207ae67dcb..c3c6a33325 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextDocumentWriter.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 10/10 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp index 7271499720..26089e3ded 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextEdit.cpp @@ -73,14 +73,13 @@ */ /* - * Constructed[ 81/83 [ 97.59% ] ] + * Constructed[ 81/82 [ 98.78% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void setExtraSelections ( const QList & selections ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // QList extraSelections () const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp index 06becfb093..1247c2d69b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextFormat.cpp @@ -75,16 +75,15 @@ */ /* - * Constructed[ 41/45 [ 91.11% ] ] + * Constructed[ 41/44 [ 93.18% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QVector lengthVectorProperty ( int propertyId ) const * QMap properties () const * void setProperty ( int propertyId, const QVector & value ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // QTextTableCellFormat toTableCellFormat () const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp index 7095f40d82..9113f556d2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextFragment.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp index cdf4b413d4..c41961f2b4 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextFrame.cpp @@ -66,6 +66,16 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //iterator begin () const + * //iterator end () const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp index 4d6a4074c8..6dbe8c366d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextFrameFormat.cpp @@ -76,6 +76,11 @@ * enum Position { InFlow, FloatLeft, FloatRight } */ +/* + * Constructed[ 29/29 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp index 95702de1ad..c8824d2e29 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextImageFormat.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp b/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp index 8e54559389..1d0067ca44 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextInlineObject.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 13/13 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp index 5c776cdd11..50801cb34c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextItem.cpp @@ -71,6 +71,11 @@ * flags RenderFlags */ +/* + * Constructed[ 6/6 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp index 41e29d2a0c..9a6046dbbb 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextLayout.cpp @@ -71,15 +71,14 @@ */ /* - * Constructed[ 29/32 [ 90.63% ] ] + * Constructed[ 29/31 [ 93.55% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void draw ( QPainter * p, const QPointF & pos, const QVector & selections = QVector (), const QRectF & clip = QRectF() ) const * void setAdditionalFormats ( const QList & formatList ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * //QList additionalFormats () const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp index c22e96f4a6..d57eeb27b9 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextLength.cpp @@ -70,6 +70,11 @@ * enum Type { VariableLength, FixedLength, PercentageLength } */ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp b/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp index 848dc35737..cf1701715d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextLine.cpp @@ -71,6 +71,15 @@ * enum Edge { Leading, Trailing } */ +/* + * Constructed[ 21/21 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * //void draw ( QPainter * painter, const QPointF & position, const QTextLayout::FormatRange * selection = 0 ) const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextList.cpp b/harbour/contrib/hbqt/qtgui/g/QTextList.cpp index f6cf7fcffe..6f13968c9a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextList.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextList.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp index 51e3e71c79..a2d4ddacad 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextListFormat.cpp @@ -70,6 +70,11 @@ * enum Style { ListDisc, ListCircle, ListSquare, ListDecimal, ListLowerAlpha, ListUpperAlpha } */ +/* + * Constructed[ 5/5 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp b/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp index 48fc467247..d473a0e693 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextObject.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp b/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp index b9709fa9f9..09e72e53e0 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextOption.cpp @@ -75,15 +75,14 @@ */ /* - * Constructed[ 13/16 [ 81.25% ] ] + * Constructed[ 13/15 [ 86.67% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void setTabArray ( QList tabStops ) * void setTabs ( QList tabStops ) * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * //QList tabs () const */ diff --git a/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp b/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp index 63dfb857bd..97073aeea5 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTextTableFormat.cpp @@ -70,7 +70,6 @@ * Constructed[ 11/13 [ 84.62% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QVector columnWidthConstraints () const * void setColumnWidthConstraints ( const QVector & constraints ) diff --git a/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp index 3e1883ea2b..a7e87ab331 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTimeEdit.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp index 0f69cef62c..c5430f8e7b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QToolBar.cpp @@ -67,13 +67,8 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 28/30 [ 93.33% ] ] + * Constructed[ 28/28 [ 100.00% ] ] * - * *** Unconvered Prototypes *** - * ----------------------------- - * - * } - * } */ #include @@ -189,19 +184,19 @@ HB_FUNC( QT_QTOOLBAR_ACTIONAT_1 ) } /* - * void addAction ( QAction * action ) + * void addAction ( QAction * action ) [*D=1*] */ HB_FUNC( QT_QTOOLBAR_ADDACTION ) { - HBQT_GC_T_QToolBar * q = ( HBQT_GC_T_QToolBar * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTOOLBAR_ADDACTION()" ) ); - if( p && p->ph && q && q->ph ) + QToolBar * p = hbqt_par_QToolBar( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTOOLBAR_ADDACTION() Qt oject: %p is attached to: %p", ( void * ) p->ph, ( void * ) q->ph ) ); - p->bNew = HB_FALSE; - ( q->ph )->addAction( ( QAction * ) p->ph ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addAction( hbqt_par_QAction( 2 ) ); } } @@ -248,24 +243,21 @@ HB_FUNC( QT_QTOOLBAR_ADDACTION_3 ) } /* - * QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member ) + * QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member ) [*D=3*] */ HB_FUNC( QT_QTOOLBAR_ADDACTION_4 ) { - HBQT_GC_T_QToolBar * q = ( HBQT_GC_T_QToolBar * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 4 ); - - HB_TRACE( HB_TR_DEBUG, ("QTOOLBAR_ADDACTION_4" ) ); - if ( p && p->ph && q && q->ph ) + QToolBar * p = hbqt_par_QToolBar( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTOOLBAR_ADDITEM_4: %p is attached to: %p", (void *) p->ph, (void *) q->ph ) ) ; - p->bNew = HB_FALSE; - if ( q && q->ph ) - hb_retptrGC( hbqt_gcAllocate_QAction( ( q->ph )->addAction( QIcon( hbqt_par_QString( 2 ) ), QToolBar::tr( hb_parc( 3 ) ), (QObject *) ( p->ph), hbqt_par_char( 5 ) ), false ) ); - else + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 4 ); + if( q && q->ph ) { - HB_TRACE( HB_TR_DEBUG, ( "F=QT_QTOOLBAR_ADDACTION_4 FP=hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( QIcon( hbqt_par_QString( 2 ) ), QToolBar::tr( hb_parc( 3 ) ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ) ), false ) ); p is NULL" ) ); + q->bNew = false; } + void * pText; + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ) ), false ) ); + hb_strfree( pText ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp index d346dd05a2..272a52ba59 100644 --- a/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QToolBox.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 20/20 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp b/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp index 3042cad611..ab96d62745 100644 --- a/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QToolButton.cpp @@ -70,6 +70,11 @@ * enum ToolButtonPopupMode { DelayedPopup, MenuButtonPopup, InstantPopup } */ +/* + * Constructed[ 13/13 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTransform.cpp b/harbour/contrib/hbqt/qtgui/g/QTransform.cpp index 9204a59113..6307335c0e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTransform.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTransform.cpp @@ -70,6 +70,11 @@ * enum TransformationType { TxNone, TxTranslate, TxScale, TxRotate, TxShear, TxProject } */ +/* + * Constructed[ 49/49 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp index 8ffb34bfe5..cff2143523 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTreeView.cpp @@ -78,6 +78,11 @@ * flags EditTriggers */ +/* + * Constructed[ 49/49 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp index b9e0328e39..ef379d8bff 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTreeWidget.cpp @@ -67,18 +67,12 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 39/46 [ 84.78% ] ] + * Constructed[ 39/41 [ 95.12% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * - * } * void addTopLevelItems ( const QList & items ) * void insertTopLevelItems ( int index, const QList & items ) - * } - * } - * } - * } */ #include @@ -166,18 +160,19 @@ HB_FUNC( QT_QTREEWIDGET ) } /* - * void addTopLevelItem ( QTreeWidgetItem * item ) + * void addTopLevelItem ( QTreeWidgetItem * item ) [*D=1*] */ HB_FUNC( QT_QTREEWIDGET_ADDTOPLEVELITEM ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_ADDTOPLEVELITEM()" ) ); - if( p && p->ph && q && q->ph ) + QTreeWidget * p = hbqt_par_QTreeWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_ADDTOPLEVELITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QTreeWidget( 1 )->addTopLevelItem( hbqt_par_QTreeWidgetItem( 2 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addTopLevelItem( hbqt_par_QTreeWidgetItem( 2 ) ); } } @@ -424,50 +419,53 @@ HB_FUNC( QT_QTREEWIDGET_SETCOLUMNCOUNT ) } /* - * void setCurrentItem ( QTreeWidgetItem * item ) + * void setCurrentItem ( QTreeWidgetItem * item ) [*D=1*] */ HB_FUNC( QT_QTREEWIDGET_SETCURRENTITEM ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETCURRENTITEM()" ) ); - if( p && p->ph && q && q->ph ) + QTreeWidget * p = hbqt_par_QTreeWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETCURRENTITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QTreeWidget( 1 )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ) ); } } /* - * void setCurrentItem ( QTreeWidgetItem * item, int column ) + * void setCurrentItem ( QTreeWidgetItem * item, int column ) [*D=1*] */ HB_FUNC( QT_QTREEWIDGET_SETCURRENTITEM_1 ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETCURRENTITEM_1()" ) ); - if( p && p->ph && q && q->ph ) + QTreeWidget * p = hbqt_par_QTreeWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETCURRENTITEM_1() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QTreeWidget( 1 )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ) ); } } /* - * void setCurrentItem ( QTreeWidgetItem * item, int column, QItemSelectionModel::SelectionFlags command ) + * void setCurrentItem ( QTreeWidgetItem * item, int column, QItemSelectionModel::SelectionFlags command ) [*D=1*] */ HB_FUNC( QT_QTREEWIDGET_SETCURRENTITEM_2 ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETCURRENTITEM_2()" ) ); - if( p && p->ph && q && q->ph ) + QTreeWidget * p = hbqt_par_QTreeWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETCURRENTITEM_2() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QTreeWidget( 1 )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 4 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setCurrentItem( hbqt_par_QTreeWidgetItem( 2 ), hb_parni( 3 ), ( QItemSelectionModel::SelectionFlags ) hb_parni( 4 ) ); } } @@ -484,18 +482,19 @@ HB_FUNC( QT_QTREEWIDGET_SETFIRSTITEMCOLUMNSPANNED ) } /* - * void setHeaderItem ( QTreeWidgetItem * item ) + * void setHeaderItem ( QTreeWidgetItem * item ) [*D=1*] */ HB_FUNC( QT_QTREEWIDGET_SETHEADERITEM ) { - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGET_SETHEADERITEM()" ) ); - if( p && p->ph && q && q->ph ) + QTreeWidget * p = hbqt_par_QTreeWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTREEWIDGET_SETHEADERITEM() Qt object: %p is attached to: %p", p->ph, q->ph ) ); - q->bNew = HB_FALSE; - hbqt_par_QTreeWidget( 1 )->setHeaderItem( hbqt_par_QTreeWidgetItem( 2 ) ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->setHeaderItem( hbqt_par_QTreeWidgetItem( 2 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp index 41c7bdde1a..b2cef2a11a 100644 --- a/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp @@ -72,12 +72,10 @@ */ /* - * Constructed[ 53/56 [ 94.64% ] ] + * Constructed[ 53/55 [ 96.36% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * - * } * void addChildren ( const QList & children ) * void insertChildren ( int index, const QList & children ) */ @@ -171,19 +169,19 @@ HB_FUNC( QT_QTREEWIDGETITEM ) } /* - * void addChild ( QTreeWidgetItem * child ) + * void addChild ( QTreeWidgetItem * child ) [*D=1*] */ HB_FUNC( QT_QTREEWIDGETITEM_ADDCHILD ) { - HBQT_GC_T_QTreeWidgetItem * q = ( HBQT_GC_T_QTreeWidgetItem * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QTREEWIDGETITEM_ADDCHILD()" ) ); - if( p && p->ph && q && q->ph ) + QTreeWidgetItem * p = hbqt_par_QTreeWidgetItem( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QTOOLBAR_ADDACTION() Qt oject: %p is attached to: %p", ( void * ) p->ph, ( void * ) q->ph ) ); - p->bNew = HB_FALSE; - ( q->ph )->addChild( ( QTreeWidgetItem * ) p->ph ); + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + if( q && q->ph ) + { + q->bNew = false; + } + ( p )->addChild( hbqt_par_QTreeWidgetItem( 2 ) ); } } diff --git a/harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp b/harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp index 851b0577ac..1040dd2ec2 100644 --- a/harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QUiLoader.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp index 9c39170857..8940f1f90e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QVBoxLayout.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QValidator.cpp b/harbour/contrib/hbqt/qtgui/g/QValidator.cpp index e0cd8df3ef..534cd8e938 100644 --- a/harbour/contrib/hbqt/qtgui/g/QValidator.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QValidator.cpp @@ -70,6 +70,16 @@ * enum State { Invalid, Intermediate, Acceptable } */ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // virtual void fixup ( QString & input ) const + * // virtual State validate ( QString & input, int & pos ) const = 0 + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp index 2c5fb29366..1beaee3fdb 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWheelEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 9/9 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp index 59a9379c64..63456edd24 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWidget.cpp @@ -73,93 +73,36 @@ */ /* - * Constructed[ 185/264 [ 70.08% ] ] + * Constructed[ 206/208 [ 99.04% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * - * } * void addActions ( QList actions ) - * } - * } * void insertActions ( QAction * before, QList actions ) - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } - * } * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // QString accessibleDescription () const * // QString accessibleName () const - * //QWidget * childAt ( int x, int y ) const - * //QWidget * childAt ( const QPoint & p ) const * // WId effectiveWinId () const * // virtual HDC getDC () const - * //void grabMouse () - * //void grabMouse ( const QCursor & cursor ) * // QGraphicsProxyWidget * graphicsProxyWidget () const * // bool hasEditFocus () const * // QInputContext * inputContext () * // Qt::HANDLE macCGHandle () const * // Qt::HANDLE macQDHandle () const - * //void move ( int x, int y ) - * //void move ( const QPoint & ) * // virtual void releaseDC ( HDC hdc ) const * //void render ( QPaintDevice * target, const QPoint & targetOffset = QPoint(), const QRegion & sourceRegion = QRegion(), RenderFlags renderFlags = RenderFlags( DrawWindowBackground | DrawChildren ) ) * //void render ( QPainter * painter, const QPoint & targetOffset = QPoint(), const QRegion & sourceRegion = QRegion(), RenderFlags renderFlags = RenderFlags( DrawWindowBackground | DrawChildren ) ) - * //void repaint ( int x, int y, int w, int h ) - * //void repaint ( const QRect & rect ) - * //void repaint ( const QRegion & rgn ) - * //void resize ( int w, int h ) - * //void resize ( const QSize & ) - * //void scroll ( int dx, int dy ) - * //void scroll ( int dx, int dy, const QRect & r ) * // void setAccessibleDescription ( const QString & description ) * // void setAccessibleName ( const QString & name ) - * //void setBaseSize ( const QSize & ) - * //void setBaseSize ( int basew, int baseh ) * // void setEditFocus ( bool enable ) - * //void setFixedSize ( const QSize & s ) - * //void setFixedSize ( int w, int h ) - * //void setFocus ( Qt::FocusReason reason ) - * //void setGeometry ( const QRect & ) - * //void setGeometry ( int x, int y, int w, int h ) * // void setInputContext ( QInputContext * context ) - * //void setMask ( const QBitmap & bitmap ) - * //void setMask ( const QRegion & region ) - * //void setMaximumSize ( const QSize & ) - * //void setMaximumSize ( int maxw, int maxh ) - * //void setMinimumSize ( const QSize & ) - * //void setMinimumSize ( int minw, int minh ) - * //void setParent ( QWidget * parent ) - * //void setParent ( QWidget * parent, Qt::WindowFlags f ) - * //void setSizeIncrement ( const QSize & ) - * //void setSizeIncrement ( int w, int h ) - * //void setSizePolicy ( const QSizePolicy & policy ) - * //void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) * // void setWindowSurface ( QWindowSurface * surface ) - * //void update ( int x, int y, int w, int h ) - * //void update ( const QRect & rect ) - * //void update ( const QRegion & rgn ) - * //WId winId () const + * // WId winId () const * // QWindowSurface * windowSurface () const (preliminary) * //Qt::HANDLE x11PictureHandle () const * //QWidget * find ( WId id ) - * //void repaint () - * //void setFocus () - * //void update () */ #include @@ -297,15 +240,10 @@ HB_FUNC( QT_QWIDGET_ACTIVATEWINDOW ) */ HB_FUNC( QT_QWIDGET_ADDACTION ) { - HBQT_GC_T_QWidget * q = (HBQT_GC_T_QWidget *)hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * p = (HBQT_GC_T *)hb_parptrGC( hbqt_gcFuncs(), 2 ); - - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QWIDGET_ADDACTION()" ) ); - if( p && p->ph && q && q->ph ) + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QWIDGET_ADDACTION() Qt object: %p is attached to: %p", (void * )p->ph, (void *)q->ph ) ); - // p->bNew = HB_FALSE; // The ownership of action is not transferred to this QWidget. - ( q->ph )->addAction( ( QAction * ) p->ph ); + ( p )->addAction( hbqt_par_QAction( 2 ) ); } } @@ -358,21 +296,26 @@ HB_FUNC( QT_QWIDGET_BASESIZE ) } /* - * QWidget * childAt ( ... ) + * QWidget * childAt ( int x, int y ) const */ HB_FUNC( QT_QWIDGET_CHILDAT ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( *hbqt_par_QPoint( 2 ) ), false ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( hb_parni( 2 ), hb_parni( 3 ) ), false ) ); - } + hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( hb_parni( 2 ), hb_parni( 3 ) ), false ) ); + } +} + +/* + * QWidget * childAt ( const QPoint & p ) const + */ +HB_FUNC( QT_QWIDGET_CHILDAT_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( *hbqt_par_QPoint( 2 ) ), false ) ); } } @@ -627,21 +570,26 @@ HB_FUNC( QT_QWIDGET_GRABKEYBOARD ) } /* - * void grabMouse ( ... ) + * void grabMouse () */ HB_FUNC( QT_QWIDGET_GRABMOUSE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->grabMouse( *hbqt_par_QCursor( 2 ) ); - } - else - { - ( p )->grabMouse(); - } + ( p )->grabMouse(); + } +} + +/* + * void grabMouse ( const QCursor & cursor ) + */ +HB_FUNC( QT_QWIDGET_GRABMOUSE_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->grabMouse( *hbqt_par_QCursor( 2 ) ); } } @@ -1090,21 +1038,26 @@ HB_FUNC( QT_QWIDGET_MINIMUMWIDTH ) } /* - * void move ( ... ) + * void move ( int x, int y ) */ HB_FUNC( QT_QWIDGET_MOVE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->move( *hbqt_par_QPoint( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->move( hb_parni( 2 ), hb_parni( 3 ) ); - } + ( p )->move( hb_parni( 2 ), hb_parni( 3 ) ); + } +} + +/* + * void move ( const QPoint & ) + */ +HB_FUNC( QT_QWIDGET_MOVE_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->move( *hbqt_par_QPoint( 2 ) ); } } @@ -1265,53 +1218,62 @@ HB_FUNC( QT_QWIDGET_REMOVEACTION ) } /* - * void repaint ( ... ) + * void repaint ( int x, int y, int w, int h ) */ HB_FUNC( QT_QWIDGET_REPAINT ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - - if( q->type == HBQT_TYPE_QRect ) - { - ( p )->repaint( *hbqt_par_QRect( 2 ) ); - } - else if( q->type == HBQT_TYPE_QRegion ) - { - ( p )->repaint( *hbqt_par_QRegion( 2 ) ); - } - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->repaint( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } - else - { - ( p )->repaint(); - } + ( p )->repaint( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); } } /* - * void resize ( ... ) + * void repaint ( const QRect & rect ) + */ +HB_FUNC( QT_QWIDGET_REPAINT_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->repaint( *hbqt_par_QRect( 2 ) ); + } +} + +/* + * void repaint ( const QRegion & rgn ) + */ +HB_FUNC( QT_QWIDGET_REPAINT_2 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->repaint( *hbqt_par_QRegion( 2 ) ); + } +} + +/* + * void resize ( int w, int h ) */ HB_FUNC( QT_QWIDGET_RESIZE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->resize( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->resize( hb_parni( 2 ), hb_parni( 3 ) ); - } + ( p )->resize( hb_parni( 2 ), hb_parni( 3 ) ); + } +} + +/* + * void resize ( const QSize & ) + */ +HB_FUNC( QT_QWIDGET_RESIZE_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->resize( *hbqt_par_QSize( 2 ) ); } } @@ -1340,21 +1302,26 @@ HB_FUNC( QT_QWIDGET_SAVEGEOMETRY ) } /* - * void scroll ( ... ) + * void scroll ( int dx, int dy ) */ HB_FUNC( QT_QWIDGET_SCROLL ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 4 && HB_ISNUM( 2 ) && HB_ISPOINTER( 4 ) ) - { - ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QRect( 4 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ) ); - } + ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ) ); + } +} + +/* + * void scroll ( int dx, int dy, const QRect & r ) + */ +HB_FUNC( QT_QWIDGET_SCROLL_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QRect( 4 ) ); } } @@ -1407,21 +1374,26 @@ HB_FUNC( QT_QWIDGET_SETBACKGROUNDROLE ) } /* - * void setBaseSize ( ... ) + * void setBaseSize ( const QSize & ) */ HB_FUNC( QT_QWIDGET_SETBASESIZE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setBaseSize( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setBaseSize( hb_parni( 2 ), hb_parni( 3 ) ); - } + ( p )->setBaseSize( *hbqt_par_QSize( 2 ) ); + } +} + +/* + * void setBaseSize ( int basew, int baseh ) + */ +HB_FUNC( QT_QWIDGET_SETBASESIZE_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->setBaseSize( hb_parni( 2 ), hb_parni( 3 ) ); } } @@ -1474,21 +1446,26 @@ HB_FUNC( QT_QWIDGET_SETFIXEDHEIGHT ) } /* - * void setFixedSize ( ... ) + * void setFixedSize ( const QSize & s ) */ HB_FUNC( QT_QWIDGET_SETFIXEDSIZE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setFixedSize( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setFixedSize( hb_parni( 2 ), hb_parni( 3 ) ); - } + ( p )->setFixedSize( *hbqt_par_QSize( 2 ) ); + } +} + +/* + * void setFixedSize ( int w, int h ) + */ +HB_FUNC( QT_QWIDGET_SETFIXEDSIZE_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->setFixedSize( hb_parni( 2 ), hb_parni( 3 ) ); } } @@ -1505,21 +1482,14 @@ HB_FUNC( QT_QWIDGET_SETFIXEDWIDTH ) } /* - * void setFocus ( ... ) + * void setFocus ( Qt::FocusReason reason ) */ HB_FUNC( QT_QWIDGET_SETFOCUS ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) - { - ( p )->setFocus( ( Qt::FocusReason ) hb_parni( 2 ) ); - } - else - { - ( p )->setFocus(); - } + ( p )->setFocus( ( Qt::FocusReason ) hb_parni( 2 ) ); } } @@ -1572,21 +1542,26 @@ HB_FUNC( QT_QWIDGET_SETFOREGROUNDROLE ) } /* - * void setGeometry ( ... ) + * void setGeometry ( const QRect & ) */ HB_FUNC( QT_QWIDGET_SETGEOMETRY ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setGeometry( *hbqt_par_QRect( 2 ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->setGeometry( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } + ( p )->setGeometry( *hbqt_par_QRect( 2 ) ); + } +} + +/* + * void setGeometry ( int x, int y, int w, int h ) + */ +HB_FUNC( QT_QWIDGET_SETGEOMETRY_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->setGeometry( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); } } @@ -1627,23 +1602,26 @@ HB_FUNC( QT_QWIDGET_SETLOCALE ) } /* - * void setMask ( ... ) + * void setMask ( const QBitmap & bitmap ) */ HB_FUNC( QT_QWIDGET_SETMASK ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + ( p )->setMask( *hbqt_par_QBitmap( 2 ) ); + } +} - if( q->type == HBQT_TYPE_QBitmap ) - { - ( p )->setMask( *hbqt_par_QBitmap( 2 ) ); - } - else if( q->type == HBQT_TYPE_QRegion ) - { - ( p )->setMask( *hbqt_par_QRegion( 2 ) ); - } +/* + * void setMask ( const QRegion & region ) + */ +HB_FUNC( QT_QWIDGET_SETMASK_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->setMask( *hbqt_par_QRegion( 2 ) ); } } @@ -1660,21 +1638,26 @@ HB_FUNC( QT_QWIDGET_SETMAXIMUMHEIGHT ) } /* - * void setMaximumSize ( ... ) + * void setMaximumSize ( const QSize & ) */ HB_FUNC( QT_QWIDGET_SETMAXIMUMSIZE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setMaximumSize( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setMaximumSize( hb_parni( 2 ), hb_parni( 3 ) ); - } + ( p )->setMaximumSize( *hbqt_par_QSize( 2 ) ); + } +} + +/* + * void setMaximumSize ( int maxw, int maxh ) + */ +HB_FUNC( QT_QWIDGET_SETMAXIMUMSIZE_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->setMaximumSize( hb_parni( 2 ), hb_parni( 3 ) ); } } @@ -1703,21 +1686,26 @@ HB_FUNC( QT_QWIDGET_SETMINIMUMHEIGHT ) } /* - * void setMinimumSize ( ... ) + * void setMinimumSize ( const QSize & ) */ HB_FUNC( QT_QWIDGET_SETMINIMUMSIZE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setMinimumSize( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setMinimumSize( hb_parni( 2 ), hb_parni( 3 ) ); - } + ( p )->setMinimumSize( *hbqt_par_QSize( 2 ) ); + } +} + +/* + * void setMinimumSize ( int minw, int minh ) + */ +HB_FUNC( QT_QWIDGET_SETMINIMUMSIZE_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->setMinimumSize( hb_parni( 2 ), hb_parni( 3 ) ); } } @@ -1758,21 +1746,26 @@ HB_FUNC( QT_QWIDGET_SETPALETTE ) } /* - * void setParent ( ... ) + * void setParent ( QWidget * parent ) */ HB_FUNC( QT_QWIDGET_SETPARENT ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setParent( hbqt_par_QWidget( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISNUM( 3 ) ) - { - ( p )->setParent( hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ); - } + ( p )->setParent( hbqt_par_QWidget( 2 ) ); + } +} + +/* + * void setParent ( QWidget * parent, Qt::WindowFlags f ) + */ +HB_FUNC( QT_QWIDGET_SETPARENT_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->setParent( hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ); } } @@ -1801,40 +1794,50 @@ HB_FUNC( QT_QWIDGET_SETSHORTCUTENABLED ) } /* - * void setSizeIncrement ( ... ) + * void setSizeIncrement ( const QSize & ) */ HB_FUNC( QT_QWIDGET_SETSIZEINCREMENT ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setSizeIncrement( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setSizeIncrement( hb_parni( 2 ), hb_parni( 3 ) ); - } + ( p )->setSizeIncrement( *hbqt_par_QSize( 2 ) ); } } /* - * void setSizePolicy ( ... ) + * void setSizeIncrement ( int w, int h ) + */ +HB_FUNC( QT_QWIDGET_SETSIZEINCREMENT_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->setSizeIncrement( hb_parni( 2 ), hb_parni( 3 ) ); + } +} + +/* + * void setSizePolicy ( const QSizePolicy & policy ) */ HB_FUNC( QT_QWIDGET_SETSIZEPOLICY ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setSizePolicy( *hbqt_par_QSizePolicy( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setSizePolicy( ( QSizePolicy::Policy ) hb_parni( 2 ), ( QSizePolicy::Policy ) hb_parni( 3 ) ); - } + ( p )->setSizePolicy( *hbqt_par_QSizePolicy( 2 ) ); + } +} + +/* + * void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) + */ +HB_FUNC( QT_QWIDGET_SETSIZEPOLICY_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->setSizePolicy( ( QSizePolicy::Policy ) hb_parni( 2 ), ( QSizePolicy::Policy ) hb_parni( 3 ) ); } } @@ -2175,34 +2178,38 @@ HB_FUNC( QT_QWIDGET_UNSETLOCALE ) } /* - * void update ( ... ) + * void update ( int x, int y, int w, int h ) */ HB_FUNC( QT_QWIDGET_UPDATE ) { QWidget * p = hbqt_par_QWidget( 1 ); if( p ) { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + ( p )->update( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } +} - if( q->type == HBQT_TYPE_QRect ) - { - ( p )->update( *hbqt_par_QRect( 2 ) ); - } - else if( q->type == HBQT_TYPE_QRegion ) - { - ( p )->update( *hbqt_par_QRegion( 2 ) ); - } - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->update( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } - else - { - ( p )->update(); - } +/* + * void update ( const QRect & rect ) + */ +HB_FUNC( QT_QWIDGET_UPDATE_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->update( *hbqt_par_QRect( 2 ) ); + } +} + +/* + * void update ( const QRegion & rgn ) + */ +HB_FUNC( QT_QWIDGET_UPDATE_2 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->update( *hbqt_par_QRegion( 2 ) ); } } @@ -2506,6 +2513,18 @@ HB_FUNC( QT_QWIDGET_RAISE ) } } +/* + * void repaint () + */ +HB_FUNC( QT_QWIDGET_REPAINT_3 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->repaint(); + } +} + /* * void setDisabled ( bool disable ) */ @@ -2530,6 +2549,18 @@ HB_FUNC( QT_QWIDGET_SETENABLED ) } } +/* + * void setFocus () + */ +HB_FUNC( QT_QWIDGET_SETFOCUS_1 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->setFocus(); + } +} + /* * void setHidden ( bool hidden ) */ @@ -2654,6 +2685,18 @@ HB_FUNC( QT_QWIDGET_SHOWNORMAL ) } } +/* + * void update () + */ +HB_FUNC( QT_QWIDGET_UPDATE_3 ) +{ + QWidget * p = hbqt_par_QWidget( 1 ); + if( p ) + { + ( p )->update(); + } +} + /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ diff --git a/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp b/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp index 1062589d5a..b9fee2c34e 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWidgetAction.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp index 472418bca3..560a156d0b 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWidgetItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 2/2 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp b/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp index af56da75b9..700e5a69b7 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWindowStateChangeEvent.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 1/1 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp b/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp index 0009cbe585..b3a4f36e49 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWindowsStyle.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 0/0 [ 0% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/QWizard.cpp b/harbour/contrib/hbqt/qtgui/g/QWizard.cpp index 326d8d7be4..43ccc2dc01 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWizard.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWizard.cpp @@ -78,7 +78,6 @@ * Constructed[ 35/36 [ 97.22% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void setButtonLayout ( const QList & layout ) */ diff --git a/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp b/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp index 6cd02ca9ad..cfe6b8f720 100644 --- a/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QWizardPage.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 17/17 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtgui/g/THBQPlainTextEdit.prg b/harbour/contrib/hbqt/qtgui/g/THBQPlainTextEdit.prg index 39757c7721..f477038ba5 100644 --- a/harbour/contrib/hbqt/qtgui/g/THBQPlainTextEdit.prg +++ b/harbour/contrib/hbqt/qtgui/g/THBQPlainTextEdit.prg @@ -80,10 +80,8 @@ CREATE CLASS HBQPlainTextEdit INHERIT HbQtObjectHandler, HB_QPlainTextEdit FUNCT METHOD hbNextBookmark( nBlock ) METHOD hbPrevBookmark( nBlock ) METHOD hbGotoBookmark( nBlock ) - METHOD hbNumberBlockVisible( lB ) - METHOD hbNumberBlockVisible_1() - METHOD hbHighlightCurrentLine( lB ) - METHOD hbHighlightCurrentLine_1() + METHOD hbNumberBlockVisible( ... ) + METHOD hbHighlightCurrentLine( ... ) METHOD hbSetEventBlock( xBlock ) METHOD hbUpdateLineNumberAreaWidth( nNewBlockCount ) METHOD hbCaseUpper() @@ -176,20 +174,50 @@ METHOD HBQPlainTextEdit:hbGotoBookmark( nBlock ) RETURN Qt_HBQPlainTextEdit_hbGotoBookmark( ::pPtr, nBlock ) -METHOD HBQPlainTextEdit:hbNumberBlockVisible( lB ) - RETURN Qt_HBQPlainTextEdit_hbNumberBlockVisible( ::pPtr, lB ) +METHOD HBQPlainTextEdit:hbNumberBlockVisible( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "L" + // void hbNumberBlockVisible(bool b) + // L l bool + RETURN Qt_HBQPlainTextEdit_hbNumberBlockVisible( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // bool hbNumberBlockVisible() + RETURN Qt_HBQPlainTextEdit_hbNumberBlockVisible_1( ::pPtr, ... ) + ENDCASE + RETURN NIL -METHOD HBQPlainTextEdit:hbNumberBlockVisible_1() - RETURN Qt_HBQPlainTextEdit_hbNumberBlockVisible_1( ::pPtr ) - - -METHOD HBQPlainTextEdit:hbHighlightCurrentLine( lB ) - RETURN Qt_HBQPlainTextEdit_hbHighlightCurrentLine( ::pPtr, lB ) - - -METHOD HBQPlainTextEdit:hbHighlightCurrentLine_1() - RETURN Qt_HBQPlainTextEdit_hbHighlightCurrentLine_1( ::pPtr ) +METHOD HBQPlainTextEdit:hbHighlightCurrentLine( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "L" + // void hbHighlightCurrentLine(bool b) + // L l bool + RETURN Qt_HBQPlainTextEdit_hbHighlightCurrentLine( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // bool hbHighlightCurrentLine() + RETURN Qt_HBQPlainTextEdit_hbHighlightCurrentLine_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD HBQPlainTextEdit:hbSetEventBlock( xBlock ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQAbstractItemView.prg b/harbour/contrib/hbqt/qtgui/g/TQAbstractItemView.prg index 68e6aed55b..f42deafbc5 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQAbstractItemView.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQAbstractItemView.prg @@ -84,8 +84,7 @@ CREATE CLASS QAbstractItemView INHERIT HbQtObjectHandler, HB_QAbstractScrollArea METHOD iconSize() METHOD indexAt( pPoint ) METHOD indexWidget( pIndex ) - METHOD itemDelegate() - METHOD itemDelegate_1( pIndex ) + METHOD itemDelegate( ... ) METHOD itemDelegateForColumn( nColumn ) METHOD itemDelegateForRow( nRow ) METHOD keyboardSearch( cSearch ) @@ -199,12 +198,27 @@ METHOD QAbstractItemView:indexWidget( pIndex ) RETURN Qt_QAbstractItemView_indexWidget( ::pPtr, hbqt_ptr( pIndex ) ) -METHOD QAbstractItemView:itemDelegate() - RETURN Qt_QAbstractItemView_itemDelegate( ::pPtr ) - - -METHOD QAbstractItemView:itemDelegate_1( pIndex ) - RETURN Qt_QAbstractItemView_itemDelegate_1( ::pPtr, hbqt_ptr( pIndex ) ) +METHOD QAbstractItemView:itemDelegate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QAbstractItemDelegate * itemDelegate ( const QModelIndex & index ) const + // PO p QModelIndex + RETURN QAbstractItemDelegate():from( Qt_QAbstractItemView_itemDelegate_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QAbstractItemDelegate * itemDelegate () const + RETURN QAbstractItemDelegate():from( Qt_QAbstractItemView_itemDelegate( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QAbstractItemView:itemDelegateForColumn( nColumn ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQActionGroup.prg b/harbour/contrib/hbqt/qtgui/g/TQActionGroup.prg index 6d09dce147..ba07d03d1d 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQActionGroup.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQActionGroup.prg @@ -72,9 +72,7 @@ CREATE CLASS QActionGroup INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QAct METHOD new( ... ) METHOD actions() - METHOD addAction( pAction ) - METHOD addAction_1( cText ) - METHOD addAction_2( pIcon, cText ) + METHOD addAction( ... ) METHOD checkedAction() METHOD isEnabled() METHOD isExclusive() @@ -101,16 +99,35 @@ METHOD QActionGroup:actions() RETURN Qt_QActionGroup_actions( ::pPtr ) -METHOD QActionGroup:addAction( pAction ) - RETURN Qt_QActionGroup_addAction( ::pPtr, hbqt_ptr( pAction ) ) - - -METHOD QActionGroup:addAction_1( cText ) - RETURN Qt_QActionGroup_addAction_1( ::pPtr, cText ) - - -METHOD QActionGroup:addAction_2( pIcon, cText ) - RETURN Qt_QActionGroup_addAction_2( ::pPtr, hbqt_ptr( pIcon ), cText ) +METHOD QActionGroup:addAction( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PCO" .AND. aV[ 2 ] $ "C" + // QAction * addAction ( const QIcon & icon, const QString & text ) + // PCO p QIcon, C c QString + RETURN QAction():from( Qt_QActionGroup_addAction_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QAction * addAction ( const QString & text ) + // C c QString + RETURN QAction():from( Qt_QActionGroup_addAction_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // QAction * addAction ( QAction * action ) + // PO p QAction + RETURN QAction():from( Qt_QActionGroup_addAction( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QActionGroup:checkedAction() diff --git a/harbour/contrib/hbqt/qtgui/g/TQApplication.prg b/harbour/contrib/hbqt/qtgui/g/TQApplication.prg index cf1100c559..92d8d95661 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQApplication.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQApplication.prg @@ -91,9 +91,7 @@ CREATE CLASS QApplication INHERIT HbQtObjectHandler, HB_QCoreApplication FUNCTIO METHOD doubleClickInterval() METHOD exec() METHOD focusWidget() - METHOD font() - METHOD font_1( pWidget ) - METHOD font_2( pClassName ) + METHOD font( ... ) METHOD fontMetrics() METHOD globalStrut() METHOD isEffectEnabled( nEffect ) @@ -106,9 +104,7 @@ CREATE CLASS QApplication INHERIT HbQtObjectHandler, HB_QCoreApplication FUNCTIO METHOD layoutDirection() METHOD mouseButtons() METHOD overrideCursor() - METHOD palette() - METHOD palette_1( pWidget ) - METHOD palette_2( pClassName ) + METHOD palette( ... ) METHOD quitOnLastWindowClosed() METHOD restoreOverrideCursor() METHOD setActiveWindow( pActive ) @@ -127,20 +123,17 @@ CREATE CLASS QApplication INHERIT HbQtObjectHandler, HB_QCoreApplication FUNCTIO METHOD setQuitOnLastWindowClosed( lQuit ) METHOD setStartDragDistance( nL ) METHOD setStartDragTime( nMs ) - METHOD setStyle( pStyle ) - METHOD setStyle_1( cStyle ) + METHOD setStyle( ... ) METHOD setWheelScrollLines( nInt ) METHOD setWindowIcon( pIcon ) METHOD startDragDistance() METHOD startDragTime() METHOD style() METHOD syncX() - METHOD topLevelAt( pPoint ) - METHOD topLevelAt_1( nX, nY ) + METHOD topLevelAt( ... ) METHOD type() METHOD wheelScrollLines() - METHOD widgetAt( pPoint ) - METHOD widgetAt_1( nX, nY ) + METHOD widgetAt( ... ) METHOD windowIcon() METHOD aboutQt() METHOD closeAllWindows() @@ -238,16 +231,30 @@ METHOD QApplication:focusWidget() RETURN Qt_QApplication_focusWidget( ::pPtr ) -METHOD QApplication:font() - RETURN Qt_QApplication_font( ::pPtr ) - - -METHOD QApplication:font_1( pWidget ) - RETURN Qt_QApplication_font_1( ::pPtr, hbqt_ptr( pWidget ) ) - - -METHOD QApplication:font_2( pClassName ) - RETURN Qt_QApplication_font_2( ::pPtr, hbqt_ptr( pClassName ) ) +METHOD QApplication:font( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QFont font ( const QWidget * widget ) + // PO p QWidget + RETURN QFont():from( Qt_QApplication_font_1( ::pPtr, ... ) ) + // QFont font ( const char * className ) + // PO p char + // RETURN QFont():from( Qt_QApplication_font_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QFont font () + RETURN QFont():from( Qt_QApplication_font( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QApplication:fontMetrics() @@ -298,16 +305,30 @@ METHOD QApplication:overrideCursor() RETURN Qt_QApplication_overrideCursor( ::pPtr ) -METHOD QApplication:palette() - RETURN Qt_QApplication_palette( ::pPtr ) - - -METHOD QApplication:palette_1( pWidget ) - RETURN Qt_QApplication_palette_1( ::pPtr, hbqt_ptr( pWidget ) ) - - -METHOD QApplication:palette_2( pClassName ) - RETURN Qt_QApplication_palette_2( ::pPtr, hbqt_ptr( pClassName ) ) +METHOD QApplication:palette( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPalette palette ( const QWidget * widget ) + // PO p QWidget + RETURN QPalette():from( Qt_QApplication_palette_1( ::pPtr, ... ) ) + // QPalette palette ( const char * className ) + // PO p char + // RETURN QPalette():from( Qt_QApplication_palette_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QPalette palette () + RETURN QPalette():from( Qt_QApplication_palette( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QApplication:quitOnLastWindowClosed() @@ -382,12 +403,28 @@ METHOD QApplication:setStartDragTime( nMs ) RETURN Qt_QApplication_setStartDragTime( ::pPtr, nMs ) -METHOD QApplication:setStyle( pStyle ) - RETURN Qt_QApplication_setStyle( ::pPtr, hbqt_ptr( pStyle ) ) - - -METHOD QApplication:setStyle_1( cStyle ) - RETURN Qt_QApplication_setStyle_1( ::pPtr, cStyle ) +METHOD QApplication:setStyle( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QStyle * setStyle ( const QString & style ) + // C c QString + RETURN QStyle():from( Qt_QApplication_setStyle_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // void setStyle ( QStyle * style ) + // PO p QStyle + RETURN Qt_QApplication_setStyle( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QApplication:setWheelScrollLines( nInt ) @@ -414,12 +451,31 @@ METHOD QApplication:syncX() RETURN Qt_QApplication_syncX( ::pPtr ) -METHOD QApplication:topLevelAt( pPoint ) - RETURN Qt_QApplication_topLevelAt( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QApplication:topLevelAt_1( nX, nY ) - RETURN Qt_QApplication_topLevelAt_1( ::pPtr, nX, nY ) +METHOD QApplication:topLevelAt( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QWidget * topLevelAt ( int x, int y ) + // N n int, N n int + RETURN QWidget():from( Qt_QApplication_topLevelAt_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QWidget * topLevelAt ( const QPoint & point ) + // PO p QPoint + RETURN QWidget():from( Qt_QApplication_topLevelAt( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QApplication:type() @@ -430,12 +486,31 @@ METHOD QApplication:wheelScrollLines() RETURN Qt_QApplication_wheelScrollLines( ::pPtr ) -METHOD QApplication:widgetAt( pPoint ) - RETURN Qt_QApplication_widgetAt( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QApplication:widgetAt_1( nX, nY ) - RETURN Qt_QApplication_widgetAt_1( ::pPtr, nX, nY ) +METHOD QApplication:widgetAt( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QWidget * widgetAt ( int x, int y ) + // N n int, N n int + RETURN QWidget():from( Qt_QApplication_widgetAt_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QWidget * widgetAt ( const QPoint & point ) + // PO p QPoint + RETURN QWidget():from( Qt_QApplication_widgetAt( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QApplication:windowIcon() diff --git a/harbour/contrib/hbqt/qtgui/g/TQBitmap.prg b/harbour/contrib/hbqt/qtgui/g/TQBitmap.prg index 93855f3eb5..cbc419e44f 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQBitmap.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQBitmap.prg @@ -72,8 +72,7 @@ CREATE CLASS QBitmap INHERIT HbQtObjectHandler, HB_QPixmap FUNCTION HB_QBitmap METHOD new( ... ) METHOD clear() - METHOD transformed( pMatrix ) - METHOD transformed_1( pMatrix ) + METHOD transformed( ... ) METHOD fromImage( pImage, nFlags ) ENDCLASS @@ -92,12 +91,27 @@ METHOD QBitmap:clear() RETURN Qt_QBitmap_clear( ::pPtr ) -METHOD QBitmap:transformed( pMatrix ) - RETURN Qt_QBitmap_transformed( ::pPtr, hbqt_ptr( pMatrix ) ) - - -METHOD QBitmap:transformed_1( pMatrix ) - RETURN Qt_QBitmap_transformed_1( ::pPtr, hbqt_ptr( pMatrix ) ) +METHOD QBitmap:transformed( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QBitmap transformed ( const QTransform & matrix ) const + // PO p QTransform + RETURN QBitmap():from( Qt_QBitmap_transformed( ::pPtr, ... ) ) + // QBitmap transformed ( const QMatrix & matrix ) const + // PO p QMatrix + // RETURN QBitmap():from( Qt_QBitmap_transformed_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QBitmap:fromImage( pImage, nFlags ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQBoxLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQBoxLayout.prg index 407e7a07d4..ce20f1655b 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQBoxLayout.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQBoxLayout.prg @@ -87,8 +87,7 @@ CREATE CLASS QBoxLayout INHERIT HbQtObjectHandler, HB_QLayout FUNCTION HB_QBoxLa METHOD setDirection( nDirection ) METHOD setSpacing( nSpacing ) METHOD setStretch( nIndex, nStretch ) - METHOD setStretchFactor( pWidget, nStretch ) - METHOD setStretchFactor_1( pLayout, nStretch ) + METHOD setStretchFactor( ... ) METHOD spacing() METHOD stretch( nIndex ) @@ -168,12 +167,27 @@ METHOD QBoxLayout:setStretch( nIndex, nStretch ) RETURN Qt_QBoxLayout_setStretch( ::pPtr, nIndex, nStretch ) -METHOD QBoxLayout:setStretchFactor( pWidget, nStretch ) - RETURN Qt_QBoxLayout_setStretchFactor( ::pPtr, hbqt_ptr( pWidget ), nStretch ) - - -METHOD QBoxLayout:setStretchFactor_1( pLayout, nStretch ) - RETURN Qt_QBoxLayout_setStretchFactor_1( ::pPtr, hbqt_ptr( pLayout ), nStretch ) +METHOD QBoxLayout:setStretchFactor( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // bool setStretchFactor ( QWidget * widget, int stretch ) + // PO p QWidget, N n int + RETURN Qt_QBoxLayout_setStretchFactor( ::pPtr, ... ) + // bool setStretchFactor ( QLayout * layout, int stretch ) + // PO p QLayout, N n int + // RETURN Qt_QBoxLayout_setStretchFactor_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QBoxLayout:spacing() diff --git a/harbour/contrib/hbqt/qtgui/g/TQBrush.prg b/harbour/contrib/hbqt/qtgui/g/TQBrush.prg index 87849709ac..d3c1fab310 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQBrush.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQBrush.prg @@ -110,11 +110,27 @@ METHOD QBrush:matrix() METHOD QBrush:setColor( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QBrush_setColor( ::pPtr, ... ) + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setColor ( Qt::GlobalColor color ) + // N n Qt::GlobalColor + RETURN Qt_QBrush_setColor_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // void setColor ( const QColor & color ) + // PO p QColor + RETURN Qt_QBrush_setColor( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QBrush:setMatrix( pMatrix ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQButtonGroup.prg b/harbour/contrib/hbqt/qtgui/g/TQButtonGroup.prg index a5394271da..647f29e376 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQButtonGroup.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQButtonGroup.prg @@ -71,8 +71,7 @@ CREATE CLASS QButtonGroup INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QBut METHOD new( ... ) - METHOD addButton( pButton ) - METHOD addButton_1( pButton, nId ) + METHOD addButton( ... ) METHOD button( nId ) METHOD buttons() METHOD checkedButton() @@ -95,12 +94,31 @@ METHOD QButtonGroup:new( ... ) RETURN Self -METHOD QButtonGroup:addButton( pButton ) - RETURN Qt_QButtonGroup_addButton( ::pPtr, hbqt_ptr( pButton ) ) - - -METHOD QButtonGroup:addButton_1( pButton, nId ) - RETURN Qt_QButtonGroup_addButton_1( ::pPtr, hbqt_ptr( pButton ), nId ) +METHOD QButtonGroup:addButton( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void addButton ( QAbstractButton * button, int id ) + // PO p QAbstractButton, N n int + RETURN Qt_QButtonGroup_addButton_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void addButton ( QAbstractButton * button ) + // PO p QAbstractButton + RETURN Qt_QButtonGroup_addButton( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QButtonGroup:button( nId ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQColor.prg b/harbour/contrib/hbqt/qtgui/g/TQColor.prg index 292bec5fbc..2180d5b24a 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQColor.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQColor.prg @@ -324,11 +324,37 @@ METHOD QColor:setRedF( nRed ) METHOD QColor:setRgb( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QColor_setRgb( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void setRgb ( int r, int g, int b, int a = 255 ) + // N n int, N n int, N n int, N n int + RETURN Qt_QColor_setRgb_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void setRgb ( int r, int g, int b, int a = 255 ) + // N n int, N n int, N n int, N n int + RETURN Qt_QColor_setRgb_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setRgb ( QRgb rgb ) + // N n QRgb + RETURN Qt_QColor_setRgb( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QColor:setRgba( nRgba ) @@ -392,11 +418,37 @@ METHOD QColor:fromHsvF( nH, nS, nV, nA ) METHOD QColor:fromRgb( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QColor_fromRgb( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QColor fromRgb ( int r, int g, int b, int a = 255 ) + // N n int, N n int, N n int, N n int + RETURN QColor():from( Qt_QColor_fromRgb_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // QColor fromRgb ( int r, int g, int b, int a = 255 ) + // N n int, N n int, N n int, N n int + RETURN QColor():from( Qt_QColor_fromRgb_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QColor fromRgb ( QRgb rgb ) + // N n QRgb + RETURN QColor():from( Qt_QColor_fromRgb( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QColor:fromRgbF( nR, nG, nB, nA ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQColorDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQColorDialog.prg index 574d06a27d..2403eb972d 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQColorDialog.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQColorDialog.prg @@ -82,8 +82,7 @@ CREATE CLASS QColorDialog INHERIT HbQtObjectHandler, HB_QDialog FUNCTION HB_QCol METHOD testOption( nOption ) METHOD customColor( nIndex ) METHOD customCount() - METHOD getColor( pInitial, pParent, cTitle, nOptions ) - METHOD getColor_1( pInitial, pParent ) + METHOD getColor( ... ) METHOD setCustomColor( nIndex, nColor ) METHOD setStandardColor( nIndex, nColor ) @@ -143,12 +142,42 @@ METHOD QColorDialog:customCount() RETURN Qt_QColorDialog_customCount( ::pPtr ) -METHOD QColorDialog:getColor( pInitial, pParent, cTitle, nOptions ) - RETURN Qt_QColorDialog_getColor( ::pPtr, hbqt_ptr( pInitial ), hbqt_ptr( pParent ), cTitle, nOptions ) - - -METHOD QColorDialog:getColor_1( pInitial, pParent ) - RETURN Qt_QColorDialog_getColor_1( ::pPtr, hbqt_ptr( pInitial ), hbqt_ptr( pParent ) ) +METHOD QColorDialog:getColor( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "C" .AND. aV[ 4 ] $ "N" + // QColor getColor ( const QColor & initial, QWidget * parent, const QString & title, ColorDialogOptions options = 0 ) + // PO p QColor, PO p QWidget, C c QString, N n QColorDialog::ColorDialogOptions + RETURN QColor():from( Qt_QColorDialog_getColor( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "C" + // QColor getColor ( const QColor & initial, QWidget * parent, const QString & title, ColorDialogOptions options = 0 ) + // PO p QColor, PO p QWidget, C c QString, N n QColorDialog::ColorDialogOptions + RETURN QColor():from( Qt_QColorDialog_getColor( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // QColor getColor ( const QColor & initial = Qt::white, QWidget * parent = 0 ) + // PO p QColor, PO p QWidget + RETURN QColor():from( Qt_QColorDialog_getColor_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QColor getColor ( const QColor & initial = Qt::white, QWidget * parent = 0 ) + // PO p QColor, PO p QWidget + RETURN QColor():from( Qt_QColorDialog_getColor_1( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QColorDialog:setCustomColor( nIndex, nColor ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQComboBox.prg b/harbour/contrib/hbqt/qtgui/g/TQComboBox.prg index df364a2911..3be7c344c3 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQComboBox.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQComboBox.prg @@ -71,8 +71,7 @@ CREATE CLASS QComboBox INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QComboB METHOD new( ... ) - METHOD addItem( cText, pUserData ) - METHOD addItem_1( pIcon, cText, pUserData ) + METHOD addItem( ... ) METHOD addItems( pTexts ) METHOD completer() METHOD count() @@ -84,8 +83,7 @@ CREATE CLASS QComboBox INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QComboB METHOD hasFrame() METHOD hidePopup() METHOD iconSize() - METHOD insertItem( nIndex, cText, pUserData ) - METHOD insertItem_1( nIndex, pIcon, cText, pUserData ) + METHOD insertItem( ... ) METHOD insertItems( nIndex, pList ) METHOD insertPolicy() METHOD insertSeparator( nIndex ) @@ -143,12 +141,42 @@ METHOD QComboBox:new( ... ) RETURN Self -METHOD QComboBox:addItem( cText, pUserData ) - RETURN Qt_QComboBox_addItem( ::pPtr, cText, hbqt_ptr( pUserData ) ) - - -METHOD QComboBox:addItem_1( pIcon, cText, pUserData ) - RETURN Qt_QComboBox_addItem_1( ::pPtr, hbqt_ptr( pIcon ), cText, hbqt_ptr( pUserData ) ) +METHOD QComboBox:addItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PCO" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "PO" + // void addItem ( const QIcon & icon, const QString & text, const QVariant & userData = QVariant() ) + // PCO p QIcon, C c QString, PO p QVariant + RETURN Qt_QComboBox_addItem_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // void addItem ( const QString & text, const QVariant & userData = QVariant() ) + // C c QString, PO p QVariant + RETURN Qt_QComboBox_addItem( ::pPtr, ... ) + CASE aV[ 1 ] $ "PCO" .AND. aV[ 2 ] $ "C" + // void addItem ( const QIcon & icon, const QString & text, const QVariant & userData = QVariant() ) + // PCO p QIcon, C c QString, PO p QVariant + RETURN Qt_QComboBox_addItem_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // void addItem ( const QString & text, const QVariant & userData = QVariant() ) + // C c QString, PO p QVariant + RETURN Qt_QComboBox_addItem( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QComboBox:addItems( pTexts ) @@ -195,12 +223,42 @@ METHOD QComboBox:iconSize() RETURN Qt_QComboBox_iconSize( ::pPtr ) -METHOD QComboBox:insertItem( nIndex, cText, pUserData ) - RETURN Qt_QComboBox_insertItem( ::pPtr, nIndex, cText, hbqt_ptr( pUserData ) ) - - -METHOD QComboBox:insertItem_1( nIndex, pIcon, cText, pUserData ) - RETURN Qt_QComboBox_insertItem_1( ::pPtr, nIndex, hbqt_ptr( pIcon ), cText, hbqt_ptr( pUserData ) ) +METHOD QComboBox:insertItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PCO" .AND. aV[ 3 ] $ "C" .AND. aV[ 4 ] $ "PO" + // void insertItem ( int index, const QIcon & icon, const QString & text, const QVariant & userData = QVariant() ) + // N n int, PCO p QIcon, C c QString, PO p QVariant + RETURN Qt_QComboBox_insertItem_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "PO" + // void insertItem ( int index, const QString & text, const QVariant & userData = QVariant() ) + // N n int, C c QString, PO p QVariant + RETURN Qt_QComboBox_insertItem( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PCO" .AND. aV[ 3 ] $ "C" + // void insertItem ( int index, const QIcon & icon, const QString & text, const QVariant & userData = QVariant() ) + // N n int, PCO p QIcon, C c QString, PO p QVariant + RETURN Qt_QComboBox_insertItem_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "C" + // void insertItem ( int index, const QString & text, const QVariant & userData = QVariant() ) + // N n int, C c QString, PO p QVariant + RETURN Qt_QComboBox_insertItem( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QComboBox:insertItems( nIndex, pList ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQConicalGradient.prg b/harbour/contrib/hbqt/qtgui/g/TQConicalGradient.prg index 124d004f04..456b977a53 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQConicalGradient.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQConicalGradient.prg @@ -74,8 +74,7 @@ CREATE CLASS QConicalGradient INHERIT HbQtObjectHandler, HB_QGradient FUNCTION H METHOD angle() METHOD center() METHOD setAngle( nAngle ) - METHOD setCenter( pCenter ) - METHOD setCenter_1( nX, nY ) + METHOD setCenter( ... ) ENDCLASS @@ -101,10 +100,29 @@ METHOD QConicalGradient:setAngle( nAngle ) RETURN Qt_QConicalGradient_setAngle( ::pPtr, nAngle ) -METHOD QConicalGradient:setCenter( pCenter ) - RETURN Qt_QConicalGradient_setCenter( ::pPtr, hbqt_ptr( pCenter ) ) - - -METHOD QConicalGradient:setCenter_1( nX, nY ) - RETURN Qt_QConicalGradient_setCenter_1( ::pPtr, nX, nY ) +METHOD QConicalGradient:setCenter( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setCenter ( qreal x, qreal y ) + // N n qreal, N n qreal + RETURN Qt_QConicalGradient_setCenter_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setCenter ( const QPointF & center ) + // PO p QPointF + RETURN Qt_QConicalGradient_setCenter( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtgui/g/TQCursor.prg b/harbour/contrib/hbqt/qtgui/g/TQCursor.prg index f3979cddbe..2b76306094 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQCursor.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQCursor.prg @@ -78,8 +78,7 @@ CREATE CLASS QCursor INHERIT HbQtObjectHandler FUNCTION HB_QCursor METHOD setShape( nShape ) METHOD shape() METHOD pos() - METHOD setPos( nX, nY ) - METHOD setPos_1( pP ) + METHOD setPos( ... ) ENDCLASS @@ -121,10 +120,29 @@ METHOD QCursor:pos() RETURN Qt_QCursor_pos( ::pPtr ) -METHOD QCursor:setPos( nX, nY ) - RETURN Qt_QCursor_setPos( ::pPtr, nX, nY ) - - -METHOD QCursor:setPos_1( pP ) - RETURN Qt_QCursor_setPos_1( ::pPtr, hbqt_ptr( pP ) ) +METHOD QCursor:setPos( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setPos ( int x, int y ) + // N n int, N n int + RETURN Qt_QCursor_setPos( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setPos ( const QPoint & p ) + // PO p QPoint + RETURN Qt_QCursor_setPos_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtgui/g/TQDesktopWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQDesktopWidget.prg index 75560a806b..ca460c4840 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQDesktopWidget.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQDesktopWidget.prg @@ -71,18 +71,13 @@ CREATE CLASS QDesktopWidget INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QD METHOD new( ... ) - METHOD availableGeometry( nScreen ) - METHOD availableGeometry_1( pWidget ) - METHOD availableGeometry_2( pP ) + METHOD availableGeometry( ... ) METHOD isVirtualDesktop() METHOD numScreens() METHOD primaryScreen() METHOD screen( nScreen ) - METHOD screenGeometry( nScreen ) - METHOD screenGeometry_1( pWidget ) - METHOD screenGeometry_2( pP ) - METHOD screenNumber( pWidget ) - METHOD screenNumber_1( pPoint ) + METHOD screenGeometry( ... ) + METHOD screenNumber( ... ) ENDCLASS @@ -96,16 +91,35 @@ METHOD QDesktopWidget:new( ... ) RETURN Self -METHOD QDesktopWidget:availableGeometry( nScreen ) - RETURN Qt_QDesktopWidget_availableGeometry( ::pPtr, nScreen ) - - -METHOD QDesktopWidget:availableGeometry_1( pWidget ) - RETURN Qt_QDesktopWidget_availableGeometry_1( ::pPtr, hbqt_ptr( pWidget ) ) - - -METHOD QDesktopWidget:availableGeometry_2( pP ) - RETURN Qt_QDesktopWidget_availableGeometry_2( ::pPtr, hbqt_ptr( pP ) ) +METHOD QDesktopWidget:availableGeometry( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // const QRect availableGeometry ( int screen = -1 ) const + // N n int + RETURN QRect():from( Qt_QDesktopWidget_availableGeometry( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // const QRect availableGeometry ( const QWidget * widget ) const + // PO p QWidget + RETURN QRect():from( Qt_QDesktopWidget_availableGeometry_1( ::pPtr, ... ) ) + // const QRect availableGeometry ( const QPoint & p ) const + // PO p QPoint + // RETURN QRect():from( Qt_QDesktopWidget_availableGeometry_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // const QRect availableGeometry ( int screen = -1 ) const + // N n int + RETURN QRect():from( Qt_QDesktopWidget_availableGeometry( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QDesktopWidget:isVirtualDesktop() @@ -124,22 +138,60 @@ METHOD QDesktopWidget:screen( nScreen ) RETURN Qt_QDesktopWidget_screen( ::pPtr, nScreen ) -METHOD QDesktopWidget:screenGeometry( nScreen ) - RETURN Qt_QDesktopWidget_screenGeometry( ::pPtr, nScreen ) +METHOD QDesktopWidget:screenGeometry( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // const QRect screenGeometry ( int screen = -1 ) const + // N n int + RETURN QRect():from( Qt_QDesktopWidget_screenGeometry( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // const QRect screenGeometry ( const QWidget * widget ) const + // PO p QWidget + RETURN QRect():from( Qt_QDesktopWidget_screenGeometry_1( ::pPtr, ... ) ) + // const QRect screenGeometry ( const QPoint & p ) const + // PO p QPoint + // RETURN QRect():from( Qt_QDesktopWidget_screenGeometry_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // const QRect screenGeometry ( int screen = -1 ) const + // N n int + RETURN QRect():from( Qt_QDesktopWidget_screenGeometry( ::pPtr, ... ) ) + ENDCASE + RETURN NIL -METHOD QDesktopWidget:screenGeometry_1( pWidget ) - RETURN Qt_QDesktopWidget_screenGeometry_1( ::pPtr, hbqt_ptr( pWidget ) ) - - -METHOD QDesktopWidget:screenGeometry_2( pP ) - RETURN Qt_QDesktopWidget_screenGeometry_2( ::pPtr, hbqt_ptr( pP ) ) - - -METHOD QDesktopWidget:screenNumber( pWidget ) - RETURN Qt_QDesktopWidget_screenNumber( ::pPtr, hbqt_ptr( pWidget ) ) - - -METHOD QDesktopWidget:screenNumber_1( pPoint ) - RETURN Qt_QDesktopWidget_screenNumber_1( ::pPtr, hbqt_ptr( pPoint ) ) +METHOD QDesktopWidget:screenNumber( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // int screenNumber ( const QWidget * widget = 0 ) const + // PO p QWidget + RETURN Qt_QDesktopWidget_screenNumber( ::pPtr, ... ) + // int screenNumber ( const QPoint & point ) const + // PO p QPoint + // RETURN Qt_QDesktopWidget_screenNumber_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // int screenNumber ( const QWidget * widget = 0 ) const + // PO p QWidget + RETURN Qt_QDesktopWidget_screenNumber( ::pPtr, ... ) + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtgui/g/TQDirModel.prg b/harbour/contrib/hbqt/qtgui/g/TQDirModel.prg index 4e70eae34e..308e5f5942 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQDirModel.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQDirModel.prg @@ -83,8 +83,7 @@ CREATE CLASS QDirModel INHERIT HbQtObjectHandler, HB_QAbstractItemModel FUNCTION METHOD hasChildren( pParent ) METHOD headerData( nSection, nOrientation, nRole ) METHOD iconProvider() - METHOD index( nRow, nColumn, pParent ) - METHOD index_1( cPath, nColumn ) + METHOD index( ... ) METHOD isDir( pIndex ) METHOD isReadOnly() METHOD lazyChildCount() @@ -169,12 +168,42 @@ METHOD QDirModel:iconProvider() RETURN Qt_QDirModel_iconProvider( ::pPtr ) -METHOD QDirModel:index( nRow, nColumn, pParent ) - RETURN Qt_QDirModel_index( ::pPtr, nRow, nColumn, hbqt_ptr( pParent ) ) - - -METHOD QDirModel:index_1( cPath, nColumn ) - RETURN Qt_QDirModel_index_1( ::pPtr, cPath, nColumn ) +METHOD QDirModel:index( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "PO" + // virtual QModelIndex index ( int row, int column, const QModelIndex & parent = QModelIndex() ) const + // N n int, N n int, PO p QModelIndex + RETURN QModelIndex():from( Qt_QDirModel_index( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // QModelIndex index ( const QString & path, int column = 0 ) const + // C c QString, N n int + RETURN QModelIndex():from( Qt_QDirModel_index_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // virtual QModelIndex index ( int row, int column, const QModelIndex & parent = QModelIndex() ) const + // N n int, N n int, PO p QModelIndex + RETURN QModelIndex():from( Qt_QDirModel_index( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QModelIndex index ( const QString & path, int column = 0 ) const + // C c QString, N n int + RETURN QModelIndex():from( Qt_QDirModel_index_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QDirModel:isDir( pIndex ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQDrag.prg b/harbour/contrib/hbqt/qtgui/g/TQDrag.prg index 4e7f898fc2..7181e877d9 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQDrag.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQDrag.prg @@ -71,8 +71,7 @@ CREATE CLASS QDrag INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QDrag METHOD new( ... ) - METHOD exec( nSupportedActions ) - METHOD exec_1( nSupportedActions, nDefaultDropAction ) + METHOD exec( ... ) METHOD hotSpot() METHOD mimeData() METHOD pixmap() @@ -95,12 +94,35 @@ METHOD QDrag:new( ... ) RETURN Self -METHOD QDrag:exec( nSupportedActions ) - RETURN Qt_QDrag_exec( ::pPtr, nSupportedActions ) - - -METHOD QDrag:exec_1( nSupportedActions, nDefaultDropAction ) - RETURN Qt_QDrag_exec_1( ::pPtr, nSupportedActions, nDefaultDropAction ) +METHOD QDrag:exec( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // Qt::DropAction exec ( Qt::DropActions supportedActions, Qt::DropAction defaultDropAction ) + // N n Qt::DropActions, N n Qt::DropAction + RETURN Qt_QDrag_exec_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // Qt::DropAction exec ( Qt::DropActions supportedActions = Qt::MoveAction ) + // N n Qt::DropActions + RETURN Qt_QDrag_exec( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // Qt::DropAction exec ( Qt::DropActions supportedActions = Qt::MoveAction ) + // N n Qt::DropActions + RETURN Qt_QDrag_exec( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QDrag:hotSpot() diff --git a/harbour/contrib/hbqt/qtgui/g/TQDragMoveEvent.prg b/harbour/contrib/hbqt/qtgui/g/TQDragMoveEvent.prg index c8cf436648..c67d6e334e 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQDragMoveEvent.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQDragMoveEvent.prg @@ -71,11 +71,9 @@ CREATE CLASS QDragMoveEvent INHERIT HbQtObjectHandler, HB_QDropEvent FUNCTION HB METHOD new( ... ) - METHOD accept( pRectangle ) - METHOD accept_1() + METHOD accept( ... ) METHOD answerRect() - METHOD ignore( pRectangle ) - METHOD ignore_1() + METHOD ignore( ... ) ENDCLASS @@ -89,22 +87,52 @@ METHOD QDragMoveEvent:new( ... ) RETURN Self -METHOD QDragMoveEvent:accept( pRectangle ) - RETURN Qt_QDragMoveEvent_accept( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QDragMoveEvent:accept_1() - RETURN Qt_QDragMoveEvent_accept_1( ::pPtr ) +METHOD QDragMoveEvent:accept( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void accept ( const QRect & rectangle ) + // PO p QRect + RETURN Qt_QDragMoveEvent_accept( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void accept () + RETURN Qt_QDragMoveEvent_accept_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QDragMoveEvent:answerRect() RETURN Qt_QDragMoveEvent_answerRect( ::pPtr ) -METHOD QDragMoveEvent:ignore( pRectangle ) - RETURN Qt_QDragMoveEvent_ignore( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QDragMoveEvent:ignore_1() - RETURN Qt_QDragMoveEvent_ignore_1( ::pPtr ) +METHOD QDragMoveEvent:ignore( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void ignore ( const QRect & rectangle ) + // PO p QRect + RETURN Qt_QDragMoveEvent_ignore( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void ignore () + RETURN Qt_QDragMoveEvent_ignore_1( ::pPtr, ... ) + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtgui/g/TQErrorMessage.prg b/harbour/contrib/hbqt/qtgui/g/TQErrorMessage.prg index 0ccf452cc1..8fef7d619c 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQErrorMessage.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQErrorMessage.prg @@ -71,8 +71,7 @@ CREATE CLASS QErrorMessage INHERIT HbQtObjectHandler, HB_QDialog FUNCTION HB_QEr METHOD new( ... ) - METHOD showMessage( cMessage ) - METHOD showMessage_1( cMessage, cType ) + METHOD showMessage( ... ) ENDCLASS @@ -86,10 +85,29 @@ METHOD QErrorMessage:new( ... ) RETURN Self -METHOD QErrorMessage:showMessage( cMessage ) - RETURN Qt_QErrorMessage_showMessage( ::pPtr, cMessage ) - - -METHOD QErrorMessage:showMessage_1( cMessage, cType ) - RETURN Qt_QErrorMessage_showMessage_1( ::pPtr, cMessage, cType ) +METHOD QErrorMessage:showMessage( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "C" + // void showMessage ( const QString & message, const QString & type ) + // C c QString, C c QString + RETURN Qt_QErrorMessage_showMessage_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // void showMessage ( const QString & message ) + // C c QString + RETURN Qt_QErrorMessage_showMessage( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtgui/g/TQFileDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQFileDialog.prg index 1875502220..1cc877b067 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQFileDialog.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQFileDialog.prg @@ -96,8 +96,7 @@ CREATE CLASS QFileDialog INHERIT HbQtObjectHandler, HB_QDialog FUNCTION HB_QFile METHOD setAcceptMode( nMode ) METHOD setConfirmOverwrite( lEnabled ) METHOD setDefaultSuffix( cSuffix ) - METHOD setDirectory( cDirectory ) - METHOD setDirectory_1( pDirectory ) + METHOD setDirectory( ... ) METHOD setFileMode( nMode ) METHOD setFilter( nFilters ) METHOD setHistory( pPaths ) @@ -230,12 +229,28 @@ METHOD QFileDialog:setDefaultSuffix( cSuffix ) RETURN Qt_QFileDialog_setDefaultSuffix( ::pPtr, cSuffix ) -METHOD QFileDialog:setDirectory( cDirectory ) - RETURN Qt_QFileDialog_setDirectory( ::pPtr, cDirectory ) - - -METHOD QFileDialog:setDirectory_1( pDirectory ) - RETURN Qt_QFileDialog_setDirectory_1( ::pPtr, hbqt_ptr( pDirectory ) ) +METHOD QFileDialog:setDirectory( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // void setDirectory ( const QString & directory ) + // C c QString + RETURN Qt_QFileDialog_setDirectory( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // void setDirectory ( const QDir & directory ) + // PO p QDir + RETURN Qt_QFileDialog_setDirectory_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFileDialog:setFileMode( nMode ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQFileIconProvider.prg b/harbour/contrib/hbqt/qtgui/g/TQFileIconProvider.prg index 7e548b01cd..21611702c8 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQFileIconProvider.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQFileIconProvider.prg @@ -71,8 +71,7 @@ CREATE CLASS QFileIconProvider INHERIT HbQtObjectHandler FUNCTION HB_QFileIconPr METHOD new( ... ) - METHOD icon( nType ) - METHOD icon_1( pInfo ) + METHOD icon( ... ) METHOD type( pInfo ) ENDCLASS @@ -87,12 +86,28 @@ METHOD QFileIconProvider:new( ... ) RETURN Self -METHOD QFileIconProvider:icon( nType ) - RETURN Qt_QFileIconProvider_icon( ::pPtr, nType ) - - -METHOD QFileIconProvider:icon_1( pInfo ) - RETURN Qt_QFileIconProvider_icon_1( ::pPtr, hbqt_ptr( pInfo ) ) +METHOD QFileIconProvider:icon( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // virtual QIcon icon ( IconType type ) const + // N n QFileIconProvider::IconType + RETURN QIcon():from( Qt_QFileIconProvider_icon( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // virtual QIcon icon ( const QFileInfo & info ) const + // PO p QFileInfo + RETURN QIcon():from( Qt_QFileIconProvider_icon_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFileIconProvider:type( pInfo ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQFontDatabase.prg b/harbour/contrib/hbqt/qtgui/g/TQFontDatabase.prg index 4ba80f485c..48031c1753 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQFontDatabase.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQFontDatabase.prg @@ -81,8 +81,7 @@ CREATE CLASS QFontDatabase INHERIT HbQtObjectHandler FUNCTION HB_QFontDatabase METHOD italic( cFamily, cStyle ) METHOD pointSizes( cFamily, cStyle ) METHOD smoothSizes( cFamily, cStyle ) - METHOD styleString( pFont ) - METHOD styleString_1( pFontInfo ) + METHOD styleString( ... ) METHOD styles( cFamily ) METHOD weight( cFamily, cStyle ) METHOD addApplicationFont( cFileName ) @@ -147,12 +146,27 @@ METHOD QFontDatabase:smoothSizes( cFamily, cStyle ) RETURN Qt_QFontDatabase_smoothSizes( ::pPtr, cFamily, cStyle ) -METHOD QFontDatabase:styleString( pFont ) - RETURN Qt_QFontDatabase_styleString( ::pPtr, hbqt_ptr( pFont ) ) - - -METHOD QFontDatabase:styleString_1( pFontInfo ) - RETURN Qt_QFontDatabase_styleString_1( ::pPtr, hbqt_ptr( pFontInfo ) ) +METHOD QFontDatabase:styleString( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QString styleString ( const QFont & font ) + // PO p QFont + RETURN Qt_QFontDatabase_styleString( ::pPtr, ... ) + // QString styleString ( const QFontInfo & fontInfo ) + // PO p QFontInfo + // RETURN Qt_QFontDatabase_styleString_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFontDatabase:styles( cFamily ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQFontDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQFontDialog.prg index 4923835836..ac24d7c094 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQFontDialog.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQFontDialog.prg @@ -78,11 +78,7 @@ CREATE CLASS QFontDialog INHERIT HbQtObjectHandler, HB_QDialog FUNCTION HB_QFont METHOD setOption( nOption, lOn ) METHOD setOptions( nOptions ) METHOD testOption( nOption ) - METHOD getFont( lOk, pInitial, pParent, cTitle, nOptions ) - METHOD getFont_1( lOk, pInitial, pParent, pName ) - METHOD getFont_2( lOk, pInitial, pParent, cTitle ) - METHOD getFont_3( lOk, pInitial, pParent ) - METHOD getFont_4( lOk, pParent ) + METHOD getFont( ... ) ENDCLASS @@ -124,22 +120,57 @@ METHOD QFontDialog:testOption( nOption ) RETURN Qt_QFontDialog_testOption( ::pPtr, nOption ) -METHOD QFontDialog:getFont( lOk, pInitial, pParent, cTitle, nOptions ) - RETURN Qt_QFontDialog_getFont( ::pPtr, lOk, hbqt_ptr( pInitial ), hbqt_ptr( pParent ), cTitle, nOptions ) - - -METHOD QFontDialog:getFont_1( lOk, pInitial, pParent, pName ) - RETURN Qt_QFontDialog_getFont_1( ::pPtr, lOk, hbqt_ptr( pInitial ), hbqt_ptr( pParent ), hbqt_ptr( pName ) ) - - -METHOD QFontDialog:getFont_2( lOk, pInitial, pParent, cTitle ) - RETURN Qt_QFontDialog_getFont_2( ::pPtr, lOk, hbqt_ptr( pInitial ), hbqt_ptr( pParent ), cTitle ) - - -METHOD QFontDialog:getFont_3( lOk, pInitial, pParent ) - RETURN Qt_QFontDialog_getFont_3( ::pPtr, lOk, hbqt_ptr( pInitial ), hbqt_ptr( pParent ) ) - - -METHOD QFontDialog:getFont_4( lOk, pParent ) - RETURN Qt_QFontDialog_getFont_4( ::pPtr, lOk, hbqt_ptr( pParent ) ) +METHOD QFontDialog:getFont( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "L" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" .AND. aV[ 4 ] $ "C" .AND. aV[ 5 ] $ "N" + // QFont getFont ( bool * ok, const QFont & initial, QWidget * parent, const QString & title, FontDialogOptions options ) + // L @ bool, PO p QFont, PO p QWidget, C c QString, N n QFontDialog::FontDialogOptions + RETURN QFont():from( Qt_QFontDialog_getFont( ::pPtr, ... ) ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "L" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" .AND. aV[ 4 ] $ "C" + // QFont getFont ( bool * ok, const QFont & initial, QWidget * parent, const QString & title ) + // L @ bool, PO p QFont, PO p QWidget, C c QString + RETURN QFont():from( Qt_QFontDialog_getFont_2( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "L" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" .AND. aV[ 4 ] $ "PO" + // QFont getFont ( bool * ok, const QFont & initial, QWidget * parent, const char * name ) + // L @ bool, PO p QFont, PO p QWidget, PO p char + RETURN QFont():from( Qt_QFontDialog_getFont_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "L" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" + // QFont getFont ( bool * ok, const QFont & initial, QWidget * parent = 0 ) + // L @ bool, PO p QFont, PO p QWidget + RETURN QFont():from( Qt_QFontDialog_getFont_3( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "L" .AND. aV[ 2 ] $ "PO" + // QFont getFont ( bool * ok, QWidget * parent = 0 ) + // L @ bool, PO p QWidget + RETURN QFont():from( Qt_QFontDialog_getFont_4( ::pPtr, ... ) ) + // QFont getFont ( bool * ok, const QFont & initial, QWidget * parent = 0 ) + // L @ bool, PO p QFont, PO p QWidget + // RETURN QFont():from( Qt_QFontDialog_getFont_3( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "L" + // QFont getFont ( bool * ok, QWidget * parent = 0 ) + // L @ bool, PO p QWidget + RETURN QFont():from( Qt_QFontDialog_getFont_4( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtgui/g/TQFontMetrics.prg b/harbour/contrib/hbqt/qtgui/g/TQFontMetrics.prg index 19468d04ad..a68803d274 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQFontMetrics.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQFontMetrics.prg @@ -73,10 +73,7 @@ CREATE CLASS QFontMetrics INHERIT HbQtObjectHandler FUNCTION HB_QFontMetrics METHOD ascent() METHOD averageCharWidth() - METHOD boundingRect( pCh ) - METHOD boundingRect_1( cText ) - METHOD boundingRect_2( nX, nY, nWidth, nHeight, nFlags, cText, nTabStops, nTabArray ) - METHOD boundingRect_3( pRect, nFlags, cText, nTabStops, nTabArray ) + METHOD boundingRect( ... ) METHOD descent() METHOD elidedText( cText, nMode, nWidth, nFlags ) METHOD height() @@ -94,8 +91,7 @@ CREATE CLASS QFontMetrics INHERIT HbQtObjectHandler FUNCTION HB_QFontMetrics METHOD strikeOutPos() METHOD tightBoundingRect( cText ) METHOD underlinePos() - METHOD width( cText, nLen ) - METHOD width_1( pCh ) + METHOD width( ... ) METHOD xHeight() ENDCLASS @@ -118,20 +114,56 @@ METHOD QFontMetrics:averageCharWidth() RETURN Qt_QFontMetrics_averageCharWidth( ::pPtr ) -METHOD QFontMetrics:boundingRect( pCh ) - RETURN Qt_QFontMetrics_boundingRect( ::pPtr, hbqt_ptr( pCh ) ) - - -METHOD QFontMetrics:boundingRect_1( cText ) - RETURN Qt_QFontMetrics_boundingRect_1( ::pPtr, cText ) - - -METHOD QFontMetrics:boundingRect_2( nX, nY, nWidth, nHeight, nFlags, cText, nTabStops, nTabArray ) - RETURN Qt_QFontMetrics_boundingRect_2( ::pPtr, nX, nY, nWidth, nHeight, nFlags, cText, nTabStops, nTabArray ) - - -METHOD QFontMetrics:boundingRect_3( pRect, nFlags, cText, nTabStops, nTabArray ) - RETURN Qt_QFontMetrics_boundingRect_3( ::pPtr, hbqt_ptr( pRect ), nFlags, cText, nTabStops, nTabArray ) +METHOD QFontMetrics:boundingRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 8 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "C" .AND. aV[ 7 ] $ "N" .AND. aV[ 8 ] $ "N" + // QRect boundingRect ( int x, int y, int width, int height, int flags, const QString & text, int tabStops = 0, int * tabArray = 0 ) const + // N n int, N n int, N n int, N n int, N n int, C c QString, N n int, N @ int + RETURN QRect():from( Qt_QFontMetrics_boundingRect_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 6 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "C" + // QRect boundingRect ( int x, int y, int width, int height, int flags, const QString & text, int tabStops = 0, int * tabArray = 0 ) const + // N n int, N n int, N n int, N n int, N n int, C c QString, N n int, N @ int + RETURN QRect():from( Qt_QFontMetrics_boundingRect_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "C" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // QRect boundingRect ( const QRect & rect, int flags, const QString & text, int tabStops = 0, int * tabArray = 0 ) const + // PO p QRect, N n int, C c QString, N n int, N @ int + RETURN QRect():from( Qt_QFontMetrics_boundingRect_3( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "C" + // QRect boundingRect ( const QRect & rect, int flags, const QString & text, int tabStops = 0, int * tabArray = 0 ) const + // PO p QRect, N n int, C c QString, N n int, N @ int + RETURN QRect():from( Qt_QFontMetrics_boundingRect_3( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QRect boundingRect ( const QString & text ) const + // C c QString + RETURN QRect():from( Qt_QFontMetrics_boundingRect_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // QRect boundingRect ( QChar ch ) const + // PO p QChar + RETURN QRect():from( Qt_QFontMetrics_boundingRect( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFontMetrics:descent() @@ -202,12 +234,35 @@ METHOD QFontMetrics:underlinePos() RETURN Qt_QFontMetrics_underlinePos( ::pPtr ) -METHOD QFontMetrics:width( cText, nLen ) - RETURN Qt_QFontMetrics_width( ::pPtr, cText, nLen ) - - -METHOD QFontMetrics:width_1( pCh ) - RETURN Qt_QFontMetrics_width_1( ::pPtr, hbqt_ptr( pCh ) ) +METHOD QFontMetrics:width( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // int width ( const QString & text, int len = -1 ) const + // C c QString, N n int + RETURN Qt_QFontMetrics_width( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // int width ( const QString & text, int len = -1 ) const + // C c QString, N n int + RETURN Qt_QFontMetrics_width( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // int width ( QChar ch ) const + // PO p QChar + RETURN Qt_QFontMetrics_width_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFontMetrics:xHeight() diff --git a/harbour/contrib/hbqt/qtgui/g/TQFontMetricsF.prg b/harbour/contrib/hbqt/qtgui/g/TQFontMetricsF.prg index d7f3e2fcd5..6c7b78d815 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQFontMetricsF.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQFontMetricsF.prg @@ -73,9 +73,7 @@ CREATE CLASS QFontMetricsF INHERIT HbQtObjectHandler FUNCTION HB_QFontMetricsF METHOD ascent() METHOD averageCharWidth() - METHOD boundingRect( cText ) - METHOD boundingRect_1( pCh ) - METHOD boundingRect_2( pRect, nFlags, cText, nTabStops, nTabArray ) + METHOD boundingRect( ... ) METHOD descent() METHOD elidedText( cText, nMode, nWidth, nFlags ) METHOD height() @@ -93,8 +91,7 @@ CREATE CLASS QFontMetricsF INHERIT HbQtObjectHandler FUNCTION HB_QFontMetricsF METHOD strikeOutPos() METHOD tightBoundingRect( cText ) METHOD underlinePos() - METHOD width( cText ) - METHOD width_1( pCh ) + METHOD width( ... ) METHOD xHeight() ENDCLASS @@ -117,16 +114,42 @@ METHOD QFontMetricsF:averageCharWidth() RETURN Qt_QFontMetricsF_averageCharWidth( ::pPtr ) -METHOD QFontMetricsF:boundingRect( cText ) - RETURN Qt_QFontMetricsF_boundingRect( ::pPtr, cText ) - - -METHOD QFontMetricsF:boundingRect_1( pCh ) - RETURN Qt_QFontMetricsF_boundingRect_1( ::pPtr, hbqt_ptr( pCh ) ) - - -METHOD QFontMetricsF:boundingRect_2( pRect, nFlags, cText, nTabStops, nTabArray ) - RETURN Qt_QFontMetricsF_boundingRect_2( ::pPtr, hbqt_ptr( pRect ), nFlags, cText, nTabStops, nTabArray ) +METHOD QFontMetricsF:boundingRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "C" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // QRectF boundingRect ( const QRectF & rect, int flags, const QString & text, int tabStops = 0, int * tabArray = 0 ) const + // PO p QRectF, N n int, C c QString, N n int, N @ int + RETURN QRectF():from( Qt_QFontMetricsF_boundingRect_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "C" + // QRectF boundingRect ( const QRectF & rect, int flags, const QString & text, int tabStops = 0, int * tabArray = 0 ) const + // PO p QRectF, N n int, C c QString, N n int, N @ int + RETURN QRectF():from( Qt_QFontMetricsF_boundingRect_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QRectF boundingRect ( const QString & text ) const + // C c QString + RETURN QRectF():from( Qt_QFontMetricsF_boundingRect( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // QRectF boundingRect ( QChar ch ) const + // PO p QChar + RETURN QRectF():from( Qt_QFontMetricsF_boundingRect_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFontMetricsF:descent() @@ -197,12 +220,28 @@ METHOD QFontMetricsF:underlinePos() RETURN Qt_QFontMetricsF_underlinePos( ::pPtr ) -METHOD QFontMetricsF:width( cText ) - RETURN Qt_QFontMetricsF_width( ::pPtr, cText ) - - -METHOD QFontMetricsF:width_1( pCh ) - RETURN Qt_QFontMetricsF_width_1( ::pPtr, hbqt_ptr( pCh ) ) +METHOD QFontMetricsF:width( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // qreal width ( const QString & text ) const + // C c QString + RETURN Qt_QFontMetricsF_width( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // qreal width ( QChar ch ) const + // PO p QChar + RETURN Qt_QFontMetricsF_width_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFontMetricsF:xHeight() diff --git a/harbour/contrib/hbqt/qtgui/g/TQFormLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQFormLayout.prg index b3851d3260..9d25262654 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQFormLayout.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQFormLayout.prg @@ -71,28 +71,17 @@ CREATE CLASS QFormLayout INHERIT HbQtObjectHandler, HB_QLayout FUNCTION HB_QForm METHOD new( ... ) - METHOD addRow( pLabel, pField ) - METHOD addRow_1( pLabel, pField ) - METHOD addRow_2( pWidget ) - METHOD addRow_3( cLabelText, pField ) - METHOD addRow_4( cLabelText, pField ) - METHOD addRow_5( pLayout ) + METHOD addRow( ... ) METHOD fieldGrowthPolicy() METHOD formAlignment() METHOD getItemPosition( nIndex, nRowPtr, nRolePtr ) METHOD getLayoutPosition( pLayout, nRowPtr, nRolePtr ) METHOD getWidgetPosition( pWidget, nRowPtr, nRolePtr ) METHOD horizontalSpacing() - METHOD insertRow( nRow, pLabel, pField ) - METHOD insertRow_1( nRow, pLabel, pField ) - METHOD insertRow_2( nRow, pWidget ) - METHOD insertRow_3( nRow, cLabelText, pField ) - METHOD insertRow_4( nRow, cLabelText, pField ) - METHOD insertRow_5( nRow, pLayout ) + METHOD insertRow( ... ) METHOD itemAt( nRow, nRole ) METHOD labelAlignment() - METHOD labelForField( pField ) - METHOD labelForField_1( pField ) + METHOD labelForField( ... ) METHOD rowCount() METHOD rowWrapPolicy() METHOD setFieldGrowthPolicy( nPolicy ) @@ -120,28 +109,35 @@ METHOD QFormLayout:new( ... ) RETURN Self -METHOD QFormLayout:addRow( pLabel, pField ) - RETURN Qt_QFormLayout_addRow( ::pPtr, hbqt_ptr( pLabel ), hbqt_ptr( pField ) ) - - -METHOD QFormLayout:addRow_1( pLabel, pField ) - RETURN Qt_QFormLayout_addRow_1( ::pPtr, hbqt_ptr( pLabel ), hbqt_ptr( pField ) ) - - -METHOD QFormLayout:addRow_2( pWidget ) - RETURN Qt_QFormLayout_addRow_2( ::pPtr, hbqt_ptr( pWidget ) ) - - -METHOD QFormLayout:addRow_3( cLabelText, pField ) - RETURN Qt_QFormLayout_addRow_3( ::pPtr, cLabelText, hbqt_ptr( pField ) ) - - -METHOD QFormLayout:addRow_4( cLabelText, pField ) - RETURN Qt_QFormLayout_addRow_4( ::pPtr, cLabelText, hbqt_ptr( pField ) ) - - -METHOD QFormLayout:addRow_5( pLayout ) - RETURN Qt_QFormLayout_addRow_5( ::pPtr, hbqt_ptr( pLayout ) ) +METHOD QFormLayout:addRow( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // void addRow ( const QString & labelText, QWidget * field ) + // C c QString, PO p QWidget + RETURN Qt_QFormLayout_addRow_2( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // void addRow ( QWidget * label, QWidget * field ) + // PO p QWidget, PO p QWidget + RETURN Qt_QFormLayout_addRow( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void addRow ( QWidget * widget ) + // PO p QWidget + RETURN Qt_QFormLayout_addRow_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFormLayout:fieldGrowthPolicy() @@ -168,28 +164,44 @@ METHOD QFormLayout:horizontalSpacing() RETURN Qt_QFormLayout_horizontalSpacing( ::pPtr ) -METHOD QFormLayout:insertRow( nRow, pLabel, pField ) - RETURN Qt_QFormLayout_insertRow( ::pPtr, nRow, hbqt_ptr( pLabel ), hbqt_ptr( pField ) ) - - -METHOD QFormLayout:insertRow_1( nRow, pLabel, pField ) - RETURN Qt_QFormLayout_insertRow_1( ::pPtr, nRow, hbqt_ptr( pLabel ), hbqt_ptr( pField ) ) - - -METHOD QFormLayout:insertRow_2( nRow, pWidget ) - RETURN Qt_QFormLayout_insertRow_2( ::pPtr, nRow, hbqt_ptr( pWidget ) ) - - -METHOD QFormLayout:insertRow_3( nRow, cLabelText, pField ) - RETURN Qt_QFormLayout_insertRow_3( ::pPtr, nRow, cLabelText, hbqt_ptr( pField ) ) - - -METHOD QFormLayout:insertRow_4( nRow, cLabelText, pField ) - RETURN Qt_QFormLayout_insertRow_4( ::pPtr, nRow, cLabelText, hbqt_ptr( pField ) ) - - -METHOD QFormLayout:insertRow_5( nRow, pLayout ) - RETURN Qt_QFormLayout_insertRow_5( ::pPtr, nRow, hbqt_ptr( pLayout ) ) +METHOD QFormLayout:insertRow( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "PO" + // void insertRow ( int row, const QString & labelText, QLayout * field ) + // N n int, C c QString, PO p QLayout + RETURN Qt_QFormLayout_insertRow_4( ::pPtr, ... ) + // void insertRow ( int row, const QString & labelText, QWidget * field ) + // N n int, C c QString, PO p QWidget + // RETURN Qt_QFormLayout_insertRow_3( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" + // void insertRow ( int row, QWidget * label, QLayout * field ) + // N n int, PO p QWidget, PO p QLayout + RETURN Qt_QFormLayout_insertRow_1( ::pPtr, ... ) + // void insertRow ( int row, QWidget * label, QWidget * field ) + // N n int, PO p QWidget, PO p QWidget + // RETURN Qt_QFormLayout_insertRow( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // void insertRow ( int row, QWidget * widget ) + // N n int, PO p QWidget + RETURN Qt_QFormLayout_insertRow_2( ::pPtr, ... ) + // void insertRow ( int row, QLayout * layout ) + // N n int, PO p QLayout + // RETURN Qt_QFormLayout_insertRow_5( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFormLayout:itemAt( nRow, nRole ) @@ -200,12 +212,27 @@ METHOD QFormLayout:labelAlignment() RETURN Qt_QFormLayout_labelAlignment( ::pPtr ) -METHOD QFormLayout:labelForField( pField ) - RETURN Qt_QFormLayout_labelForField( ::pPtr, hbqt_ptr( pField ) ) - - -METHOD QFormLayout:labelForField_1( pField ) - RETURN Qt_QFormLayout_labelForField_1( ::pPtr, hbqt_ptr( pField ) ) +METHOD QFormLayout:labelForField( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QWidget * labelForField ( QWidget * field ) const + // PO p QWidget + RETURN QWidget():from( Qt_QFormLayout_labelForField( ::pPtr, ... ) ) + // QWidget * labelForField ( QLayout * field ) const + // PO p QLayout + // RETURN QWidget():from( Qt_QFormLayout_labelForField_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFormLayout:rowCount() diff --git a/harbour/contrib/hbqt/qtgui/g/TQGraphicsEllipseItem.prg b/harbour/contrib/hbqt/qtgui/g/TQGraphicsEllipseItem.prg index 10b9c5a6eb..b4b9a6db39 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQGraphicsEllipseItem.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQGraphicsEllipseItem.prg @@ -72,8 +72,7 @@ CREATE CLASS QGraphicsEllipseItem INHERIT HbQtObjectHandler, HB_QAbstractGraphic METHOD new( ... ) METHOD rect() - METHOD setRect( pRect ) - METHOD setRect_1( nX, nY, nWidth, nHeight ) + METHOD setRect( ... ) METHOD setSpanAngle( nAngle ) METHOD setStartAngle( nAngle ) METHOD spanAngle() @@ -95,12 +94,31 @@ METHOD QGraphicsEllipseItem:rect() RETURN Qt_QGraphicsEllipseItem_rect( ::pPtr ) -METHOD QGraphicsEllipseItem:setRect( pRect ) - RETURN Qt_QGraphicsEllipseItem_setRect( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsEllipseItem:setRect_1( nX, nY, nWidth, nHeight ) - RETURN Qt_QGraphicsEllipseItem_setRect_1( ::pPtr, nX, nY, nWidth, nHeight ) +METHOD QGraphicsEllipseItem:setRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void setRect ( qreal x, qreal y, qreal width, qreal height ) + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QGraphicsEllipseItem_setRect_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setRect ( const QRectF & rect ) + // PO p QRectF + RETURN Qt_QGraphicsEllipseItem_setRect( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsEllipseItem:setSpanAngle( nAngle ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQGraphicsGridLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQGraphicsGridLayout.prg index 09c83ec5b1..05bd4010b2 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQGraphicsGridLayout.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQGraphicsGridLayout.prg @@ -71,8 +71,7 @@ CREATE CLASS QGraphicsGridLayout INHERIT HbQtObjectHandler, HB_QGraphicsLayout F METHOD new( ... ) - METHOD addItem( pItem, nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) - METHOD addItem_1( pItem, nRow, nColumn, nAlignment ) + METHOD addItem( ... ) METHOD alignment( pItem ) METHOD columnAlignment( nColumn ) METHOD columnCount() @@ -83,8 +82,7 @@ CREATE CLASS QGraphicsGridLayout INHERIT HbQtObjectHandler, HB_QGraphicsLayout F METHOD columnStretchFactor( nColumn ) METHOD count() METHOD horizontalSpacing() - METHOD itemAt( nRow, nColumn ) - METHOD itemAt_1( nIndex ) + METHOD itemAt( ... ) METHOD removeAt( nIndex ) METHOD rowAlignment( nRow ) METHOD rowCount() @@ -126,12 +124,45 @@ METHOD QGraphicsGridLayout:new( ... ) RETURN Self -METHOD QGraphicsGridLayout:addItem( pItem, nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) - RETURN Qt_QGraphicsGridLayout_addItem( ::pPtr, hbqt_ptr( pItem ), nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) - - -METHOD QGraphicsGridLayout:addItem_1( pItem, nRow, nColumn, nAlignment ) - RETURN Qt_QGraphicsGridLayout_addItem_1( ::pPtr, hbqt_ptr( pItem ), nRow, nColumn, nAlignment ) +METHOD QGraphicsGridLayout:addItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 6 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "N" + // void addItem ( QGraphicsLayoutItem * item, int row, int column, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 ) + // PO p QGraphicsLayoutItem, N n int, N n int, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGraphicsGridLayout_addItem( ::pPtr, ... ) + ENDCASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // void addItem ( QGraphicsLayoutItem * item, int row, int column, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 ) + // PO p QGraphicsLayoutItem, N n int, N n int, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGraphicsGridLayout_addItem( ::pPtr, ... ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void addItem ( QGraphicsLayoutItem * item, int row, int column, Qt::Alignment alignment = 0 ) + // PO p QGraphicsLayoutItem, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGraphicsGridLayout_addItem_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void addItem ( QGraphicsLayoutItem * item, int row, int column, Qt::Alignment alignment = 0 ) + // PO p QGraphicsLayoutItem, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGraphicsGridLayout_addItem_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsGridLayout:alignment( pItem ) @@ -174,12 +205,31 @@ METHOD QGraphicsGridLayout:horizontalSpacing() RETURN Qt_QGraphicsGridLayout_horizontalSpacing( ::pPtr ) -METHOD QGraphicsGridLayout:itemAt( nRow, nColumn ) - RETURN Qt_QGraphicsGridLayout_itemAt( ::pPtr, nRow, nColumn ) - - -METHOD QGraphicsGridLayout:itemAt_1( nIndex ) - RETURN Qt_QGraphicsGridLayout_itemAt_1( ::pPtr, nIndex ) +METHOD QGraphicsGridLayout:itemAt( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QGraphicsLayoutItem * itemAt ( int row, int column ) const + // N n int, N n int + RETURN QGraphicsLayoutItem():from( Qt_QGraphicsGridLayout_itemAt( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // virtual QGraphicsLayoutItem * itemAt ( int index ) const + // N n int + RETURN QGraphicsLayoutItem():from( Qt_QGraphicsGridLayout_itemAt_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsGridLayout:removeAt( nIndex ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQGraphicsItem.prg b/harbour/contrib/hbqt/qtgui/g/TQGraphicsItem.prg index 97dbb9ea2e..868e3c02ec 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQGraphicsItem.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQGraphicsItem.prg @@ -92,8 +92,7 @@ CREATE CLASS QGraphicsItem INHERIT HbQtObjectHandler FUNCTION HB_QGraphicsItem METHOD data( nKey ) METHOD deviceTransform( pViewportTransform ) METHOD effectiveOpacity() - METHOD ensureVisible( pRect, nXmargin, nYmargin ) - METHOD ensureVisible_1( nX, nY, nW, nH, nXmargin, nYmargin ) + METHOD ensureVisible( ... ) METHOD flags() METHOD grabKeyboard() METHOD grabMouse() @@ -106,9 +105,7 @@ CREATE CLASS QGraphicsItem INHERIT HbQtObjectHandler FUNCTION HB_QGraphicsItem METHOD isAncestorOf( pChild ) METHOD isClipped() METHOD isEnabled() - METHOD isObscured() - METHOD isObscured_1( nX, nY, nW, nH ) - METHOD isObscured_2( pRect ) + METHOD isObscured( ... ) METHOD isObscuredBy( pItem ) METHOD isSelected() METHOD isUnderMouse() @@ -117,54 +114,18 @@ CREATE CLASS QGraphicsItem INHERIT HbQtObjectHandler FUNCTION HB_QGraphicsItem METHOD isWidget() METHOD isWindow() METHOD itemTransform( pOther, lOk ) - METHOD mapFromItem( pItem, pPoint ) - METHOD mapFromItem_1( pItem, pRect ) - METHOD mapFromItem_2( pItem, pPolygon ) - METHOD mapFromItem_3( pItem, pPath ) - METHOD mapFromItem_4( pItem, nX, nY, nW, nH ) - METHOD mapFromItem_5( pItem, nX, nY ) - METHOD mapFromParent( pPoint ) - METHOD mapFromParent_1( pRect ) - METHOD mapFromParent_2( pPolygon ) - METHOD mapFromParent_3( pPath ) - METHOD mapFromParent_4( nX, nY, nW, nH ) - METHOD mapFromParent_5( nX, nY ) - METHOD mapFromScene( pPoint ) - METHOD mapFromScene_1( pRect ) - METHOD mapFromScene_2( pPolygon ) - METHOD mapFromScene_3( pPath ) - METHOD mapFromScene_4( nX, nY, nW, nH ) - METHOD mapFromScene_5( nX, nY ) - METHOD mapRectFromItem( pItem, pRect ) - METHOD mapRectFromItem_1( pItem, nX, nY, nW, nH ) - METHOD mapRectFromParent( pRect ) - METHOD mapRectFromParent_1( nX, nY, nW, nH ) - METHOD mapRectFromScene( pRect ) - METHOD mapRectFromScene_1( nX, nY, nW, nH ) - METHOD mapRectToItem( pItem, pRect ) - METHOD mapRectToItem_1( pItem, nX, nY, nW, nH ) - METHOD mapRectToParent( pRect ) - METHOD mapRectToParent_1( nX, nY, nW, nH ) - METHOD mapRectToScene( pRect ) - METHOD mapRectToScene_1( nX, nY, nW, nH ) - METHOD mapToItem( pItem, pPoint ) - METHOD mapToItem_1( pItem, pRect ) - METHOD mapToItem_2( pItem, pPolygon ) - METHOD mapToItem_3( pItem, pPath ) - METHOD mapToItem_4( pItem, nX, nY, nW, nH ) - METHOD mapToItem_5( pItem, nX, nY ) - METHOD mapToParent( pPoint ) - METHOD mapToParent_1( pRect ) - METHOD mapToParent_2( pPolygon ) - METHOD mapToParent_3( pPath ) - METHOD mapToParent_4( nX, nY, nW, nH ) - METHOD mapToParent_5( nX, nY ) - METHOD mapToScene( pPoint ) - METHOD mapToScene_1( pRect ) - METHOD mapToScene_2( pPolygon ) - METHOD mapToScene_3( pPath ) - METHOD mapToScene_4( nX, nY, nW, nH ) - METHOD mapToScene_5( nX, nY ) + METHOD mapFromItem( ... ) + METHOD mapFromParent( ... ) + METHOD mapFromScene( ... ) + METHOD mapRectFromItem( ... ) + METHOD mapRectFromParent( ... ) + METHOD mapRectFromScene( ... ) + METHOD mapRectToItem( ... ) + METHOD mapRectToParent( ... ) + METHOD mapRectToScene( ... ) + METHOD mapToItem( ... ) + METHOD mapToParent( ... ) + METHOD mapToScene( ... ) METHOD moveBy( nDx, nDy ) METHOD opacity() METHOD opaqueArea() @@ -196,8 +157,7 @@ CREATE CLASS QGraphicsItem INHERIT HbQtObjectHandler FUNCTION HB_QGraphicsItem METHOD setHandlesChildEvents( lEnabled ) METHOD setOpacity( nOpacity ) METHOD setParentItem( pParent ) - METHOD setPos( pPos ) - METHOD setPos_1( nX, nY ) + METHOD setPos( ... ) METHOD setSelected( lSelected ) METHOD setToolTip( cToolTip ) METHOD setTransform( pMatrix, lCombine ) @@ -215,8 +175,7 @@ CREATE CLASS QGraphicsItem INHERIT HbQtObjectHandler FUNCTION HB_QGraphicsItem METHOD ungrabKeyboard() METHOD ungrabMouse() METHOD unsetCursor() - METHOD update( pRect ) - METHOD update_1( nX, nY, nWidth, nHeight ) + METHOD update( ... ) METHOD window() METHOD x() METHOD y() @@ -318,12 +277,42 @@ METHOD QGraphicsItem:effectiveOpacity() RETURN Qt_QGraphicsItem_effectiveOpacity( ::pPtr ) -METHOD QGraphicsItem:ensureVisible( pRect, nXmargin, nYmargin ) - RETURN Qt_QGraphicsItem_ensureVisible( ::pPtr, hbqt_ptr( pRect ), nXmargin, nYmargin ) - - -METHOD QGraphicsItem:ensureVisible_1( nX, nY, nW, nH, nXmargin, nYmargin ) - RETURN Qt_QGraphicsItem_ensureVisible_1( ::pPtr, nX, nY, nW, nH, nXmargin, nYmargin ) +METHOD QGraphicsItem:ensureVisible( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 6 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "N" + // void ensureVisible ( qreal x, qreal y, qreal w, qreal h, int xmargin = 50, int ymargin = 50 ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n int, N n int + RETURN Qt_QGraphicsItem_ensureVisible_1( ::pPtr, ... ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void ensureVisible ( qreal x, qreal y, qreal w, qreal h, int xmargin = 50, int ymargin = 50 ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n int, N n int + RETURN Qt_QGraphicsItem_ensureVisible_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void ensureVisible ( const QRectF & rect = QRectF(), int xmargin = 50, int ymargin = 50 ) + // PO p QRectF, N n int, N n int + RETURN Qt_QGraphicsItem_ensureVisible( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void ensureVisible ( const QRectF & rect = QRectF(), int xmargin = 50, int ymargin = 50 ) + // PO p QRectF, N n int, N n int + RETURN Qt_QGraphicsItem_ensureVisible( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QGraphicsItem:flags() @@ -374,16 +363,34 @@ METHOD QGraphicsItem:isEnabled() RETURN Qt_QGraphicsItem_isEnabled( ::pPtr ) -METHOD QGraphicsItem:isObscured() - RETURN Qt_QGraphicsItem_isObscured( ::pPtr ) - - -METHOD QGraphicsItem:isObscured_1( nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_isObscured_1( ::pPtr, nX, nY, nW, nH ) - - -METHOD QGraphicsItem:isObscured_2( pRect ) - RETURN Qt_QGraphicsItem_isObscured_2( ::pPtr, hbqt_ptr( pRect ) ) +METHOD QGraphicsItem:isObscured( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // bool isObscured ( qreal x, qreal y, qreal w, qreal h ) const + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QGraphicsItem_isObscured_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // bool isObscured ( const QRectF & rect ) const + // PO p QRectF + RETURN Qt_QGraphicsItem_isObscured_2( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // bool isObscured () const + RETURN Qt_QGraphicsItem_isObscured( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QGraphicsItem:isObscuredBy( pItem ) @@ -418,196 +425,424 @@ METHOD QGraphicsItem:itemTransform( pOther, lOk ) RETURN Qt_QGraphicsItem_itemTransform( ::pPtr, hbqt_ptr( pOther ), lOk ) -METHOD QGraphicsItem:mapFromItem( pItem, pPoint ) - RETURN Qt_QGraphicsItem_mapFromItem( ::pPtr, hbqt_ptr( pItem ), hbqt_ptr( pPoint ) ) - - -METHOD QGraphicsItem:mapFromItem_1( pItem, pRect ) - RETURN Qt_QGraphicsItem_mapFromItem_1( ::pPtr, hbqt_ptr( pItem ), hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapFromItem_2( pItem, pPolygon ) - RETURN Qt_QGraphicsItem_mapFromItem_2( ::pPtr, hbqt_ptr( pItem ), hbqt_ptr( pPolygon ) ) - - -METHOD QGraphicsItem:mapFromItem_3( pItem, pPath ) - RETURN Qt_QGraphicsItem_mapFromItem_3( ::pPtr, hbqt_ptr( pItem ), hbqt_ptr( pPath ) ) - - -METHOD QGraphicsItem:mapFromItem_4( pItem, nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapFromItem_4( ::pPtr, hbqt_ptr( pItem ), nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapFromItem_5( pItem, nX, nY ) - RETURN Qt_QGraphicsItem_mapFromItem_5( ::pPtr, hbqt_ptr( pItem ), nX, nY ) - - -METHOD QGraphicsItem:mapFromParent( pPoint ) - RETURN Qt_QGraphicsItem_mapFromParent( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QGraphicsItem:mapFromParent_1( pRect ) - RETURN Qt_QGraphicsItem_mapFromParent_1( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapFromParent_2( pPolygon ) - RETURN Qt_QGraphicsItem_mapFromParent_2( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QGraphicsItem:mapFromParent_3( pPath ) - RETURN Qt_QGraphicsItem_mapFromParent_3( ::pPtr, hbqt_ptr( pPath ) ) - - -METHOD QGraphicsItem:mapFromParent_4( nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapFromParent_4( ::pPtr, nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapFromParent_5( nX, nY ) - RETURN Qt_QGraphicsItem_mapFromParent_5( ::pPtr, nX, nY ) - - -METHOD QGraphicsItem:mapFromScene( pPoint ) - RETURN Qt_QGraphicsItem_mapFromScene( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QGraphicsItem:mapFromScene_1( pRect ) - RETURN Qt_QGraphicsItem_mapFromScene_1( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapFromScene_2( pPolygon ) - RETURN Qt_QGraphicsItem_mapFromScene_2( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QGraphicsItem:mapFromScene_3( pPath ) - RETURN Qt_QGraphicsItem_mapFromScene_3( ::pPtr, hbqt_ptr( pPath ) ) - - -METHOD QGraphicsItem:mapFromScene_4( nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapFromScene_4( ::pPtr, nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapFromScene_5( nX, nY ) - RETURN Qt_QGraphicsItem_mapFromScene_5( ::pPtr, nX, nY ) - - -METHOD QGraphicsItem:mapRectFromItem( pItem, pRect ) - RETURN Qt_QGraphicsItem_mapRectFromItem( ::pPtr, hbqt_ptr( pItem ), hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapRectFromItem_1( pItem, nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapRectFromItem_1( ::pPtr, hbqt_ptr( pItem ), nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapRectFromParent( pRect ) - RETURN Qt_QGraphicsItem_mapRectFromParent( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapRectFromParent_1( nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapRectFromParent_1( ::pPtr, nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapRectFromScene( pRect ) - RETURN Qt_QGraphicsItem_mapRectFromScene( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapRectFromScene_1( nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapRectFromScene_1( ::pPtr, nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapRectToItem( pItem, pRect ) - RETURN Qt_QGraphicsItem_mapRectToItem( ::pPtr, hbqt_ptr( pItem ), hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapRectToItem_1( pItem, nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapRectToItem_1( ::pPtr, hbqt_ptr( pItem ), nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapRectToParent( pRect ) - RETURN Qt_QGraphicsItem_mapRectToParent( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapRectToParent_1( nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapRectToParent_1( ::pPtr, nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapRectToScene( pRect ) - RETURN Qt_QGraphicsItem_mapRectToScene( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapRectToScene_1( nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapRectToScene_1( ::pPtr, nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapToItem( pItem, pPoint ) - RETURN Qt_QGraphicsItem_mapToItem( ::pPtr, hbqt_ptr( pItem ), hbqt_ptr( pPoint ) ) - - -METHOD QGraphicsItem:mapToItem_1( pItem, pRect ) - RETURN Qt_QGraphicsItem_mapToItem_1( ::pPtr, hbqt_ptr( pItem ), hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapToItem_2( pItem, pPolygon ) - RETURN Qt_QGraphicsItem_mapToItem_2( ::pPtr, hbqt_ptr( pItem ), hbqt_ptr( pPolygon ) ) - - -METHOD QGraphicsItem:mapToItem_3( pItem, pPath ) - RETURN Qt_QGraphicsItem_mapToItem_3( ::pPtr, hbqt_ptr( pItem ), hbqt_ptr( pPath ) ) - - -METHOD QGraphicsItem:mapToItem_4( pItem, nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapToItem_4( ::pPtr, hbqt_ptr( pItem ), nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapToItem_5( pItem, nX, nY ) - RETURN Qt_QGraphicsItem_mapToItem_5( ::pPtr, hbqt_ptr( pItem ), nX, nY ) - - -METHOD QGraphicsItem:mapToParent( pPoint ) - RETURN Qt_QGraphicsItem_mapToParent( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QGraphicsItem:mapToParent_1( pRect ) - RETURN Qt_QGraphicsItem_mapToParent_1( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapToParent_2( pPolygon ) - RETURN Qt_QGraphicsItem_mapToParent_2( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QGraphicsItem:mapToParent_3( pPath ) - RETURN Qt_QGraphicsItem_mapToParent_3( ::pPtr, hbqt_ptr( pPath ) ) - - -METHOD QGraphicsItem:mapToParent_4( nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapToParent_4( ::pPtr, nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapToParent_5( nX, nY ) - RETURN Qt_QGraphicsItem_mapToParent_5( ::pPtr, nX, nY ) - - -METHOD QGraphicsItem:mapToScene( pPoint ) - RETURN Qt_QGraphicsItem_mapToScene( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QGraphicsItem:mapToScene_1( pRect ) - RETURN Qt_QGraphicsItem_mapToScene_1( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:mapToScene_2( pPolygon ) - RETURN Qt_QGraphicsItem_mapToScene_2( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QGraphicsItem:mapToScene_3( pPath ) - RETURN Qt_QGraphicsItem_mapToScene_3( ::pPtr, hbqt_ptr( pPath ) ) - - -METHOD QGraphicsItem:mapToScene_4( nX, nY, nW, nH ) - RETURN Qt_QGraphicsItem_mapToScene_4( ::pPtr, nX, nY, nW, nH ) - - -METHOD QGraphicsItem:mapToScene_5( nX, nY ) - RETURN Qt_QGraphicsItem_mapToScene_5( ::pPtr, nX, nY ) +METHOD QGraphicsItem:mapFromItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // QPolygonF mapFromItem ( const QGraphicsItem * item, qreal x, qreal y, qreal w, qreal h ) const + // PO p QGraphicsItem, N n qreal, N n qreal, N n qreal, N n qreal + RETURN QPolygonF():from( Qt_QGraphicsItem_mapFromItem_4( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // QPointF mapFromItem ( const QGraphicsItem * item, qreal x, qreal y ) const + // PO p QGraphicsItem, N n qreal, N n qreal + RETURN QPointF():from( Qt_QGraphicsItem_mapFromItem_5( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // QPainterPath mapFromItem ( const QGraphicsItem * item, const QPainterPath & path ) const + // PO p QGraphicsItem, PO p QPainterPath + RETURN QPainterPath():from( Qt_QGraphicsItem_mapFromItem_3( ::pPtr, ... ) ) + // QPointF mapFromItem ( const QGraphicsItem * item, const QPointF & point ) const + // PO p QGraphicsItem, PO p QPointF + // RETURN QPointF():from( Qt_QGraphicsItem_mapFromItem( ::pPtr, ... ) ) + // QPolygonF mapFromItem ( const QGraphicsItem * item, const QRectF & rect ) const + // PO p QGraphicsItem, PO p QRectF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapFromItem_1( ::pPtr, ... ) ) + // QPolygonF mapFromItem ( const QGraphicsItem * item, const QPolygonF & polygon ) const + // PO p QGraphicsItem, PO p QPolygonF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapFromItem_2( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL + + +METHOD QGraphicsItem:mapFromParent( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QPolygonF mapFromParent ( qreal x, qreal y, qreal w, qreal h ) const + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN QPolygonF():from( Qt_QGraphicsItem_mapFromParent_4( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QPointF mapFromParent ( qreal x, qreal y ) const + // N n qreal, N n qreal + RETURN QPointF():from( Qt_QGraphicsItem_mapFromParent_5( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPainterPath mapFromParent ( const QPainterPath & path ) const + // PO p QPainterPath + RETURN QPainterPath():from( Qt_QGraphicsItem_mapFromParent_3( ::pPtr, ... ) ) + // QPointF mapFromParent ( const QPointF & point ) const + // PO p QPointF + // RETURN QPointF():from( Qt_QGraphicsItem_mapFromParent( ::pPtr, ... ) ) + // QPolygonF mapFromParent ( const QRectF & rect ) const + // PO p QRectF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapFromParent_1( ::pPtr, ... ) ) + // QPolygonF mapFromParent ( const QPolygonF & polygon ) const + // PO p QPolygonF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapFromParent_2( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL + + +METHOD QGraphicsItem:mapFromScene( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QPolygonF mapFromScene ( qreal x, qreal y, qreal w, qreal h ) const + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN QPolygonF():from( Qt_QGraphicsItem_mapFromScene_4( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QPointF mapFromScene ( qreal x, qreal y ) const + // N n qreal, N n qreal + RETURN QPointF():from( Qt_QGraphicsItem_mapFromScene_5( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPainterPath mapFromScene ( const QPainterPath & path ) const + // PO p QPainterPath + RETURN QPainterPath():from( Qt_QGraphicsItem_mapFromScene_3( ::pPtr, ... ) ) + // QPointF mapFromScene ( const QPointF & point ) const + // PO p QPointF + // RETURN QPointF():from( Qt_QGraphicsItem_mapFromScene( ::pPtr, ... ) ) + // QPolygonF mapFromScene ( const QRectF & rect ) const + // PO p QRectF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapFromScene_1( ::pPtr, ... ) ) + // QPolygonF mapFromScene ( const QPolygonF & polygon ) const + // PO p QPolygonF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapFromScene_2( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL + + +METHOD QGraphicsItem:mapRectFromItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // QRectF mapRectFromItem ( const QGraphicsItem * item, qreal x, qreal y, qreal w, qreal h ) const + // PO p QGraphicsItem, N n qreal, N n qreal, N n qreal, N n qreal + RETURN QRectF():from( Qt_QGraphicsItem_mapRectFromItem_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // QRectF mapRectFromItem ( const QGraphicsItem * item, const QRectF & rect ) const + // PO p QGraphicsItem, PO p QRectF + RETURN QRectF():from( Qt_QGraphicsItem_mapRectFromItem( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL + + +METHOD QGraphicsItem:mapRectFromParent( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QRectF mapRectFromParent ( qreal x, qreal y, qreal w, qreal h ) const + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN QRectF():from( Qt_QGraphicsItem_mapRectFromParent_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRectF mapRectFromParent ( const QRectF & rect ) const + // PO p QRectF + RETURN QRectF():from( Qt_QGraphicsItem_mapRectFromParent( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL + + +METHOD QGraphicsItem:mapRectFromScene( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QRectF mapRectFromScene ( qreal x, qreal y, qreal w, qreal h ) const + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN QRectF():from( Qt_QGraphicsItem_mapRectFromScene_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRectF mapRectFromScene ( const QRectF & rect ) const + // PO p QRectF + RETURN QRectF():from( Qt_QGraphicsItem_mapRectFromScene( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL + + +METHOD QGraphicsItem:mapRectToItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // QRectF mapRectToItem ( const QGraphicsItem * item, qreal x, qreal y, qreal w, qreal h ) const + // PO p QGraphicsItem, N n qreal, N n qreal, N n qreal, N n qreal + RETURN QRectF():from( Qt_QGraphicsItem_mapRectToItem_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // QRectF mapRectToItem ( const QGraphicsItem * item, const QRectF & rect ) const + // PO p QGraphicsItem, PO p QRectF + RETURN QRectF():from( Qt_QGraphicsItem_mapRectToItem( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL + + +METHOD QGraphicsItem:mapRectToParent( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QRectF mapRectToParent ( qreal x, qreal y, qreal w, qreal h ) const + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN QRectF():from( Qt_QGraphicsItem_mapRectToParent_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRectF mapRectToParent ( const QRectF & rect ) const + // PO p QRectF + RETURN QRectF():from( Qt_QGraphicsItem_mapRectToParent( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL + + +METHOD QGraphicsItem:mapRectToScene( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QRectF mapRectToScene ( qreal x, qreal y, qreal w, qreal h ) const + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN QRectF():from( Qt_QGraphicsItem_mapRectToScene_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRectF mapRectToScene ( const QRectF & rect ) const + // PO p QRectF + RETURN QRectF():from( Qt_QGraphicsItem_mapRectToScene( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL + + +METHOD QGraphicsItem:mapToItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // QPolygonF mapToItem ( const QGraphicsItem * item, qreal x, qreal y, qreal w, qreal h ) const + // PO p QGraphicsItem, N n qreal, N n qreal, N n qreal, N n qreal + RETURN QPolygonF():from( Qt_QGraphicsItem_mapToItem_4( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // QPointF mapToItem ( const QGraphicsItem * item, qreal x, qreal y ) const + // PO p QGraphicsItem, N n qreal, N n qreal + RETURN QPointF():from( Qt_QGraphicsItem_mapToItem_5( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // QPainterPath mapToItem ( const QGraphicsItem * item, const QPainterPath & path ) const + // PO p QGraphicsItem, PO p QPainterPath + RETURN QPainterPath():from( Qt_QGraphicsItem_mapToItem_3( ::pPtr, ... ) ) + // QPointF mapToItem ( const QGraphicsItem * item, const QPointF & point ) const + // PO p QGraphicsItem, PO p QPointF + // RETURN QPointF():from( Qt_QGraphicsItem_mapToItem( ::pPtr, ... ) ) + // QPolygonF mapToItem ( const QGraphicsItem * item, const QRectF & rect ) const + // PO p QGraphicsItem, PO p QRectF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapToItem_1( ::pPtr, ... ) ) + // QPolygonF mapToItem ( const QGraphicsItem * item, const QPolygonF & polygon ) const + // PO p QGraphicsItem, PO p QPolygonF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapToItem_2( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL + + +METHOD QGraphicsItem:mapToParent( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QPolygonF mapToParent ( qreal x, qreal y, qreal w, qreal h ) const + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN QPolygonF():from( Qt_QGraphicsItem_mapToParent_4( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QPointF mapToParent ( qreal x, qreal y ) const + // N n qreal, N n qreal + RETURN QPointF():from( Qt_QGraphicsItem_mapToParent_5( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPainterPath mapToParent ( const QPainterPath & path ) const + // PO p QPainterPath + RETURN QPainterPath():from( Qt_QGraphicsItem_mapToParent_3( ::pPtr, ... ) ) + // QPointF mapToParent ( const QPointF & point ) const + // PO p QPointF + // RETURN QPointF():from( Qt_QGraphicsItem_mapToParent( ::pPtr, ... ) ) + // QPolygonF mapToParent ( const QRectF & rect ) const + // PO p QRectF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapToParent_1( ::pPtr, ... ) ) + // QPolygonF mapToParent ( const QPolygonF & polygon ) const + // PO p QPolygonF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapToParent_2( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL + + +METHOD QGraphicsItem:mapToScene( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QPolygonF mapToScene ( qreal x, qreal y, qreal w, qreal h ) const + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN QPolygonF():from( Qt_QGraphicsItem_mapToScene_4( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QPointF mapToScene ( qreal x, qreal y ) const + // N n qreal, N n qreal + RETURN QPointF():from( Qt_QGraphicsItem_mapToScene_5( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPainterPath mapToScene ( const QPainterPath & path ) const + // PO p QPainterPath + RETURN QPainterPath():from( Qt_QGraphicsItem_mapToScene_3( ::pPtr, ... ) ) + // QPointF mapToScene ( const QPointF & point ) const + // PO p QPointF + // RETURN QPointF():from( Qt_QGraphicsItem_mapToScene( ::pPtr, ... ) ) + // QPolygonF mapToScene ( const QRectF & rect ) const + // PO p QRectF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapToScene_1( ::pPtr, ... ) ) + // QPolygonF mapToScene ( const QPolygonF & polygon ) const + // PO p QPolygonF + // RETURN QPolygonF():from( Qt_QGraphicsItem_mapToScene_2( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsItem:moveBy( nDx, nDy ) @@ -734,12 +969,31 @@ METHOD QGraphicsItem:setParentItem( pParent ) RETURN Qt_QGraphicsItem_setParentItem( ::pPtr, hbqt_ptr( pParent ) ) -METHOD QGraphicsItem:setPos( pPos ) - RETURN Qt_QGraphicsItem_setPos( ::pPtr, hbqt_ptr( pPos ) ) - - -METHOD QGraphicsItem:setPos_1( nX, nY ) - RETURN Qt_QGraphicsItem_setPos_1( ::pPtr, nX, nY ) +METHOD QGraphicsItem:setPos( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setPos ( qreal x, qreal y ) + // N n qreal, N n qreal + RETURN Qt_QGraphicsItem_setPos_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setPos ( const QPointF & pos ) + // PO p QPointF + RETURN Qt_QGraphicsItem_setPos( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsItem:setSelected( lSelected ) @@ -810,12 +1064,35 @@ METHOD QGraphicsItem:unsetCursor() RETURN Qt_QGraphicsItem_unsetCursor( ::pPtr ) -METHOD QGraphicsItem:update( pRect ) - RETURN Qt_QGraphicsItem_update( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsItem:update_1( nX, nY, nWidth, nHeight ) - RETURN Qt_QGraphicsItem_update_1( ::pPtr, nX, nY, nWidth, nHeight ) +METHOD QGraphicsItem:update( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void update ( qreal x, qreal y, qreal width, qreal height ) + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QGraphicsItem_update_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void update ( const QRectF & rect = QRectF() ) + // PO p QRectF + RETURN Qt_QGraphicsItem_update( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void update ( const QRectF & rect = QRectF() ) + // PO p QRectF + RETURN Qt_QGraphicsItem_update( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QGraphicsItem:window() diff --git a/harbour/contrib/hbqt/qtgui/g/TQGraphicsLayoutItem.prg b/harbour/contrib/hbqt/qtgui/g/TQGraphicsLayoutItem.prg index 2f87dd620f..37c25e85c8 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQGraphicsLayoutItem.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQGraphicsLayoutItem.prg @@ -90,20 +90,16 @@ CREATE CLASS QGraphicsLayoutItem INHERIT HbQtObjectHandler FUNCTION HB_QGraphics METHOD preferredWidth() METHOD setGeometry( pRect ) METHOD setMaximumHeight( nHeight ) - METHOD setMaximumSize( pSize ) - METHOD setMaximumSize_1( nW, nH ) + METHOD setMaximumSize( ... ) METHOD setMaximumWidth( nWidth ) METHOD setMinimumHeight( nHeight ) - METHOD setMinimumSize( pSize ) - METHOD setMinimumSize_1( nW, nH ) + METHOD setMinimumSize( ... ) METHOD setMinimumWidth( nWidth ) METHOD setParentLayoutItem( pParent ) METHOD setPreferredHeight( nHeight ) - METHOD setPreferredSize( pSize ) - METHOD setPreferredSize_1( nW, nH ) + METHOD setPreferredSize( ... ) METHOD setPreferredWidth( nWidth ) - METHOD setSizePolicy( pPolicy ) - METHOD setSizePolicy_1( nHPolicy, nVPolicy, nControlType ) + METHOD setSizePolicy( ... ) METHOD sizePolicy() METHOD updateGeometry() @@ -195,12 +191,31 @@ METHOD QGraphicsLayoutItem:setMaximumHeight( nHeight ) RETURN Qt_QGraphicsLayoutItem_setMaximumHeight( ::pPtr, nHeight ) -METHOD QGraphicsLayoutItem:setMaximumSize( pSize ) - RETURN Qt_QGraphicsLayoutItem_setMaximumSize( ::pPtr, hbqt_ptr( pSize ) ) - - -METHOD QGraphicsLayoutItem:setMaximumSize_1( nW, nH ) - RETURN Qt_QGraphicsLayoutItem_setMaximumSize_1( ::pPtr, nW, nH ) +METHOD QGraphicsLayoutItem:setMaximumSize( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setMaximumSize ( qreal w, qreal h ) + // N n qreal, N n qreal + RETURN Qt_QGraphicsLayoutItem_setMaximumSize_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setMaximumSize ( const QSizeF & size ) + // PO p QSizeF + RETURN Qt_QGraphicsLayoutItem_setMaximumSize( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsLayoutItem:setMaximumWidth( nWidth ) @@ -211,12 +226,31 @@ METHOD QGraphicsLayoutItem:setMinimumHeight( nHeight ) RETURN Qt_QGraphicsLayoutItem_setMinimumHeight( ::pPtr, nHeight ) -METHOD QGraphicsLayoutItem:setMinimumSize( pSize ) - RETURN Qt_QGraphicsLayoutItem_setMinimumSize( ::pPtr, hbqt_ptr( pSize ) ) - - -METHOD QGraphicsLayoutItem:setMinimumSize_1( nW, nH ) - RETURN Qt_QGraphicsLayoutItem_setMinimumSize_1( ::pPtr, nW, nH ) +METHOD QGraphicsLayoutItem:setMinimumSize( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setMinimumSize ( qreal w, qreal h ) + // N n qreal, N n qreal + RETURN Qt_QGraphicsLayoutItem_setMinimumSize_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setMinimumSize ( const QSizeF & size ) + // PO p QSizeF + RETURN Qt_QGraphicsLayoutItem_setMinimumSize( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsLayoutItem:setMinimumWidth( nWidth ) @@ -231,24 +265,69 @@ METHOD QGraphicsLayoutItem:setPreferredHeight( nHeight ) RETURN Qt_QGraphicsLayoutItem_setPreferredHeight( ::pPtr, nHeight ) -METHOD QGraphicsLayoutItem:setPreferredSize( pSize ) - RETURN Qt_QGraphicsLayoutItem_setPreferredSize( ::pPtr, hbqt_ptr( pSize ) ) - - -METHOD QGraphicsLayoutItem:setPreferredSize_1( nW, nH ) - RETURN Qt_QGraphicsLayoutItem_setPreferredSize_1( ::pPtr, nW, nH ) +METHOD QGraphicsLayoutItem:setPreferredSize( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setPreferredSize ( qreal w, qreal h ) + // N n qreal, N n qreal + RETURN Qt_QGraphicsLayoutItem_setPreferredSize_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setPreferredSize ( const QSizeF & size ) + // PO p QSizeF + RETURN Qt_QGraphicsLayoutItem_setPreferredSize( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsLayoutItem:setPreferredWidth( nWidth ) RETURN Qt_QGraphicsLayoutItem_setPreferredWidth( ::pPtr, nWidth ) -METHOD QGraphicsLayoutItem:setSizePolicy( pPolicy ) - RETURN Qt_QGraphicsLayoutItem_setSizePolicy( ::pPtr, hbqt_ptr( pPolicy ) ) - - -METHOD QGraphicsLayoutItem:setSizePolicy_1( nHPolicy, nVPolicy, nControlType ) - RETURN Qt_QGraphicsLayoutItem_setSizePolicy_1( ::pPtr, nHPolicy, nVPolicy, nControlType ) +METHOD QGraphicsLayoutItem:setSizePolicy( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void setSizePolicy ( QSizePolicy::Policy hPolicy, QSizePolicy::Policy vPolicy, QSizePolicy::ControlType controlType = QSizePolicy::DefaultType ) + // N n QSizePolicy::Policy, N n QSizePolicy::Policy, N n QSizePolicy::ControlType + RETURN Qt_QGraphicsLayoutItem_setSizePolicy_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setSizePolicy ( QSizePolicy::Policy hPolicy, QSizePolicy::Policy vPolicy, QSizePolicy::ControlType controlType = QSizePolicy::DefaultType ) + // N n QSizePolicy::Policy, N n QSizePolicy::Policy, N n QSizePolicy::ControlType + RETURN Qt_QGraphicsLayoutItem_setSizePolicy_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setSizePolicy ( const QSizePolicy & policy ) + // PO p QSizePolicy + RETURN Qt_QGraphicsLayoutItem_setSizePolicy( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsLayoutItem:sizePolicy() diff --git a/harbour/contrib/hbqt/qtgui/g/TQGraphicsLineItem.prg b/harbour/contrib/hbqt/qtgui/g/TQGraphicsLineItem.prg index 8b94141e94..6e90e9ebaa 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQGraphicsLineItem.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQGraphicsLineItem.prg @@ -73,8 +73,7 @@ CREATE CLASS QGraphicsLineItem INHERIT HbQtObjectHandler, HB_QGraphicsItem FUNCT METHOD line() METHOD pen() - METHOD setLine( pLine ) - METHOD setLine_1( nX1, nY1, nX2, nY2 ) + METHOD setLine( ... ) METHOD setPen( pPen ) ENDCLASS @@ -97,12 +96,31 @@ METHOD QGraphicsLineItem:pen() RETURN Qt_QGraphicsLineItem_pen( ::pPtr ) -METHOD QGraphicsLineItem:setLine( pLine ) - RETURN Qt_QGraphicsLineItem_setLine( ::pPtr, hbqt_ptr( pLine ) ) - - -METHOD QGraphicsLineItem:setLine_1( nX1, nY1, nX2, nY2 ) - RETURN Qt_QGraphicsLineItem_setLine_1( ::pPtr, nX1, nY1, nX2, nY2 ) +METHOD QGraphicsLineItem:setLine( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void setLine ( qreal x1, qreal y1, qreal x2, qreal y2 ) + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QGraphicsLineItem_setLine_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setLine ( const QLineF & line ) + // PO p QLineF + RETURN Qt_QGraphicsLineItem_setLine( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsLineItem:setPen( pPen ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQGraphicsPixmapItem.prg b/harbour/contrib/hbqt/qtgui/g/TQGraphicsPixmapItem.prg index 8040d98284..9ab9393e45 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQGraphicsPixmapItem.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQGraphicsPixmapItem.prg @@ -73,8 +73,7 @@ CREATE CLASS QGraphicsPixmapItem INHERIT HbQtObjectHandler, HB_QGraphicsItem FUN METHOD offset() METHOD pixmap() - METHOD setOffset( pOffset ) - METHOD setOffset_1( nX, nY ) + METHOD setOffset( ... ) METHOD setPixmap( pPixmap ) METHOD setShapeMode( nMode ) METHOD setTransformationMode( nMode ) @@ -101,12 +100,31 @@ METHOD QGraphicsPixmapItem:pixmap() RETURN Qt_QGraphicsPixmapItem_pixmap( ::pPtr ) -METHOD QGraphicsPixmapItem:setOffset( pOffset ) - RETURN Qt_QGraphicsPixmapItem_setOffset( ::pPtr, hbqt_ptr( pOffset ) ) - - -METHOD QGraphicsPixmapItem:setOffset_1( nX, nY ) - RETURN Qt_QGraphicsPixmapItem_setOffset_1( ::pPtr, nX, nY ) +METHOD QGraphicsPixmapItem:setOffset( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setOffset ( qreal x, qreal y ) + // N n qreal, N n qreal + RETURN Qt_QGraphicsPixmapItem_setOffset_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setOffset ( const QPointF & offset ) + // PO p QPointF + RETURN Qt_QGraphicsPixmapItem_setOffset( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsPixmapItem:setPixmap( pPixmap ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQGraphicsRectItem.prg b/harbour/contrib/hbqt/qtgui/g/TQGraphicsRectItem.prg index 6cb1f3e5ac..f03f4d7824 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQGraphicsRectItem.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQGraphicsRectItem.prg @@ -72,8 +72,7 @@ CREATE CLASS QGraphicsRectItem INHERIT HbQtObjectHandler, HB_QAbstractGraphicsSh METHOD new( ... ) METHOD rect() - METHOD setRect( pRectangle ) - METHOD setRect_1( nX, nY, nWidth, nHeight ) + METHOD setRect( ... ) ENDCLASS @@ -91,10 +90,29 @@ METHOD QGraphicsRectItem:rect() RETURN Qt_QGraphicsRectItem_rect( ::pPtr ) -METHOD QGraphicsRectItem:setRect( pRectangle ) - RETURN Qt_QGraphicsRectItem_setRect( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QGraphicsRectItem:setRect_1( nX, nY, nWidth, nHeight ) - RETURN Qt_QGraphicsRectItem_setRect_1( ::pPtr, nX, nY, nWidth, nHeight ) +METHOD QGraphicsRectItem:setRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void setRect ( qreal x, qreal y, qreal width, qreal height ) + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QGraphicsRectItem_setRect_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setRect ( const QRectF & rectangle ) + // PO p QRectF + RETURN Qt_QGraphicsRectItem_setRect( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtgui/g/TQGraphicsScene.prg b/harbour/contrib/hbqt/qtgui/g/TQGraphicsScene.prg index 48caae024c..79afcea8db 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQGraphicsScene.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQGraphicsScene.prg @@ -72,16 +72,13 @@ CREATE CLASS QGraphicsScene INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QG METHOD new( ... ) METHOD activeWindow() - METHOD addEllipse( pRect, pPen, pBrush ) - METHOD addEllipse_1( nX, nY, nW, nH, pPen, pBrush ) + METHOD addEllipse( ... ) METHOD addItem( pItem ) - METHOD addLine( pLine, pPen ) - METHOD addLine_1( nX1, nY1, nX2, nY2, pPen ) + METHOD addLine( ... ) METHOD addPath( pPath, pPen, pBrush ) METHOD addPixmap( pPixmap ) METHOD addPolygon( pPolygon, pPen, pBrush ) - METHOD addRect( pRect, pPen, pBrush ) - METHOD addRect_1( nX, nY, nW, nH, pPen, pBrush ) + METHOD addRect( ... ) METHOD addSimpleText( cText, pFont ) METHOD addText( cText, pFont ) METHOD addWidget( pWidget, nWFlags ) @@ -95,17 +92,11 @@ CREATE CLASS QGraphicsScene INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QG METHOD foregroundBrush() METHOD hasFocus() METHOD height() - METHOD invalidate( nX, nY, nW, nH, nLayers ) + METHOD invalidate( ... ) METHOD isSortCacheEnabled() - METHOD itemAt( pPosition ) - METHOD itemAt_1( nX, nY ) + METHOD itemAt( ... ) METHOD itemIndexMethod() - METHOD items() - METHOD items_1( pPos ) - METHOD items_2( nX, nY, nW, nH, nMode ) - METHOD items_3( pRectangle, nMode ) - METHOD items_4( pPolygon, nMode ) - METHOD items_5( pPath, nMode ) + METHOD items( ... ) METHOD itemsBoundingRect() METHOD mouseGrabberItem() METHOD palette() @@ -123,23 +114,19 @@ CREATE CLASS QGraphicsScene INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QG METHOD setForegroundBrush( pBrush ) METHOD setItemIndexMethod( nMethod ) METHOD setPalette( pPalette ) - METHOD setSceneRect( pRect ) - METHOD setSceneRect_1( nX, nY, nW, nH ) - METHOD setSelectionArea( pPath ) - METHOD setSelectionArea_1( pPath, nMode ) + METHOD setSceneRect( ... ) + METHOD setSelectionArea( ... ) METHOD setSortCacheEnabled( lEnabled ) METHOD setStickyFocus( lEnabled ) METHOD setStyle( pStyle ) METHOD stickyFocus() METHOD style() - METHOD update( nX, nY, nW, nH ) + METHOD update( ... ) METHOD views() METHOD width() METHOD advance() METHOD clear() METHOD clearSelection() - METHOD invalidate_1( pRect, nLayers ) - METHOD update_1( pRect ) ENDCLASS @@ -157,24 +144,90 @@ METHOD QGraphicsScene:activeWindow() RETURN Qt_QGraphicsScene_activeWindow( ::pPtr ) -METHOD QGraphicsScene:addEllipse( pRect, pPen, pBrush ) - RETURN Qt_QGraphicsScene_addEllipse( ::pPtr, hbqt_ptr( pRect ), hbqt_ptr( pPen ), hbqt_ptr( pBrush ) ) - - -METHOD QGraphicsScene:addEllipse_1( nX, nY, nW, nH, pPen, pBrush ) - RETURN Qt_QGraphicsScene_addEllipse_1( ::pPtr, nX, nY, nW, nH, hbqt_ptr( pPen ), hbqt_ptr( pBrush ) ) +METHOD QGraphicsScene:addEllipse( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 6 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "PO" .AND. aV[ 6 ] $ "PO" + // QGraphicsEllipseItem * addEllipse ( qreal x, qreal y, qreal w, qreal h, const QPen & pen = QPen(), const QBrush & brush = QBrush() ) + // N n qreal, N n qreal, N n qreal, N n qreal, PO p QPen, PO p QBrush + RETURN QGraphicsEllipseItem():from( Qt_QGraphicsScene_addEllipse_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QGraphicsEllipseItem * addEllipse ( qreal x, qreal y, qreal w, qreal h, const QPen & pen = QPen(), const QBrush & brush = QBrush() ) + // N n qreal, N n qreal, N n qreal, N n qreal, PO p QPen, PO p QBrush + RETURN QGraphicsEllipseItem():from( Qt_QGraphicsScene_addEllipse_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" + // QGraphicsEllipseItem * addEllipse ( const QRectF & rect, const QPen & pen = QPen(), const QBrush & brush = QBrush() ) + // PO p QRectF, PO p QPen, PO p QBrush + RETURN QGraphicsEllipseItem():from( Qt_QGraphicsScene_addEllipse( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QGraphicsEllipseItem * addEllipse ( const QRectF & rect, const QPen & pen = QPen(), const QBrush & brush = QBrush() ) + // PO p QRectF, PO p QPen, PO p QBrush + RETURN QGraphicsEllipseItem():from( Qt_QGraphicsScene_addEllipse( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsScene:addItem( pItem ) RETURN Qt_QGraphicsScene_addItem( ::pPtr, hbqt_ptr( pItem ) ) -METHOD QGraphicsScene:addLine( pLine, pPen ) - RETURN Qt_QGraphicsScene_addLine( ::pPtr, hbqt_ptr( pLine ), hbqt_ptr( pPen ) ) - - -METHOD QGraphicsScene:addLine_1( nX1, nY1, nX2, nY2, pPen ) - RETURN Qt_QGraphicsScene_addLine_1( ::pPtr, nX1, nY1, nX2, nY2, hbqt_ptr( pPen ) ) +METHOD QGraphicsScene:addLine( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "PO" + // QGraphicsLineItem * addLine ( qreal x1, qreal y1, qreal x2, qreal y2, const QPen & pen = QPen() ) + // N n qreal, N n qreal, N n qreal, N n qreal, PO p QPen + RETURN QGraphicsLineItem():from( Qt_QGraphicsScene_addLine_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QGraphicsLineItem * addLine ( qreal x1, qreal y1, qreal x2, qreal y2, const QPen & pen = QPen() ) + // N n qreal, N n qreal, N n qreal, N n qreal, PO p QPen + RETURN QGraphicsLineItem():from( Qt_QGraphicsScene_addLine_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // QGraphicsLineItem * addLine ( const QLineF & line, const QPen & pen = QPen() ) + // PO p QLineF, PO p QPen + RETURN QGraphicsLineItem():from( Qt_QGraphicsScene_addLine( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QGraphicsLineItem * addLine ( const QLineF & line, const QPen & pen = QPen() ) + // PO p QLineF, PO p QPen + RETURN QGraphicsLineItem():from( Qt_QGraphicsScene_addLine( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsScene:addPath( pPath, pPen, pBrush ) @@ -189,12 +242,45 @@ METHOD QGraphicsScene:addPolygon( pPolygon, pPen, pBrush ) RETURN Qt_QGraphicsScene_addPolygon( ::pPtr, hbqt_ptr( pPolygon ), hbqt_ptr( pPen ), hbqt_ptr( pBrush ) ) -METHOD QGraphicsScene:addRect( pRect, pPen, pBrush ) - RETURN Qt_QGraphicsScene_addRect( ::pPtr, hbqt_ptr( pRect ), hbqt_ptr( pPen ), hbqt_ptr( pBrush ) ) - - -METHOD QGraphicsScene:addRect_1( nX, nY, nW, nH, pPen, pBrush ) - RETURN Qt_QGraphicsScene_addRect_1( ::pPtr, nX, nY, nW, nH, hbqt_ptr( pPen ), hbqt_ptr( pBrush ) ) +METHOD QGraphicsScene:addRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 6 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "PO" .AND. aV[ 6 ] $ "PO" + // QGraphicsRectItem * addRect ( qreal x, qreal y, qreal w, qreal h, const QPen & pen = QPen(), const QBrush & brush = QBrush() ) + // N n qreal, N n qreal, N n qreal, N n qreal, PO p QPen, PO p QBrush + RETURN QGraphicsRectItem():from( Qt_QGraphicsScene_addRect_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QGraphicsRectItem * addRect ( qreal x, qreal y, qreal w, qreal h, const QPen & pen = QPen(), const QBrush & brush = QBrush() ) + // N n qreal, N n qreal, N n qreal, N n qreal, PO p QPen, PO p QBrush + RETURN QGraphicsRectItem():from( Qt_QGraphicsScene_addRect_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" + // QGraphicsRectItem * addRect ( const QRectF & rect, const QPen & pen = QPen(), const QBrush & brush = QBrush() ) + // PO p QRectF, PO p QPen, PO p QBrush + RETURN QGraphicsRectItem():from( Qt_QGraphicsScene_addRect( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QGraphicsRectItem * addRect ( const QRectF & rect, const QPen & pen = QPen(), const QBrush & brush = QBrush() ) + // PO p QRectF, PO p QPen, PO p QBrush + RETURN QGraphicsRectItem():from( Qt_QGraphicsScene_addRect( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsScene:addSimpleText( cText, pFont ) @@ -249,48 +335,136 @@ METHOD QGraphicsScene:height() RETURN Qt_QGraphicsScene_height( ::pPtr ) -METHOD QGraphicsScene:invalidate( nX, nY, nW, nH, nLayers ) - RETURN Qt_QGraphicsScene_invalidate( ::pPtr, nX, nY, nW, nH, nLayers ) +METHOD QGraphicsScene:invalidate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // void invalidate ( qreal x, qreal y, qreal w, qreal h, SceneLayers layers = AllLayers ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n QGraphicsScene::SceneLayers + RETURN Qt_QGraphicsScene_invalidate( ::pPtr, ... ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void invalidate ( qreal x, qreal y, qreal w, qreal h, SceneLayers layers = AllLayers ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n QGraphicsScene::SceneLayers + RETURN Qt_QGraphicsScene_invalidate( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void invalidate ( const QRectF & rect = QRectF(), SceneLayers layers = AllLayers ) + // PO p QRectF, N n QGraphicsScene::SceneLayers + RETURN Qt_QGraphicsScene_invalidate_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void invalidate ( const QRectF & rect = QRectF(), SceneLayers layers = AllLayers ) + // PO p QRectF, N n QGraphicsScene::SceneLayers + RETURN Qt_QGraphicsScene_invalidate_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QGraphicsScene:isSortCacheEnabled() RETURN Qt_QGraphicsScene_isSortCacheEnabled( ::pPtr ) -METHOD QGraphicsScene:itemAt( pPosition ) - RETURN Qt_QGraphicsScene_itemAt( ::pPtr, hbqt_ptr( pPosition ) ) - - -METHOD QGraphicsScene:itemAt_1( nX, nY ) - RETURN Qt_QGraphicsScene_itemAt_1( ::pPtr, nX, nY ) +METHOD QGraphicsScene:itemAt( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QGraphicsItem * itemAt ( qreal x, qreal y ) const + // N n qreal, N n qreal + RETURN QGraphicsItem():from( Qt_QGraphicsScene_itemAt_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QGraphicsItem * itemAt ( const QPointF & position ) const + // PO p QPointF + RETURN QGraphicsItem():from( Qt_QGraphicsScene_itemAt( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsScene:itemIndexMethod() RETURN Qt_QGraphicsScene_itemIndexMethod( ::pPtr ) -METHOD QGraphicsScene:items() - RETURN Qt_QGraphicsScene_items( ::pPtr ) - - -METHOD QGraphicsScene:items_1( pPos ) - RETURN Qt_QGraphicsScene_items_1( ::pPtr, hbqt_ptr( pPos ) ) - - -METHOD QGraphicsScene:items_2( nX, nY, nW, nH, nMode ) - RETURN Qt_QGraphicsScene_items_2( ::pPtr, nX, nY, nW, nH, nMode ) - - -METHOD QGraphicsScene:items_3( pRectangle, nMode ) - RETURN Qt_QGraphicsScene_items_3( ::pPtr, hbqt_ptr( pRectangle ), nMode ) - - -METHOD QGraphicsScene:items_4( pPolygon, nMode ) - RETURN Qt_QGraphicsScene_items_4( ::pPtr, hbqt_ptr( pPolygon ), nMode ) - - -METHOD QGraphicsScene:items_5( pPath, nMode ) - RETURN Qt_QGraphicsScene_items_5( ::pPtr, hbqt_ptr( pPath ), nMode ) +METHOD QGraphicsScene:items( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // QList items ( qreal x, qreal y, qreal w, qreal h, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // N n qreal, N n qreal, N n qreal, N n qreal, N n Qt::ItemSelectionMode + RETURN Qt_QGraphicsScene_items_2( ::pPtr, ... ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QList items ( qreal x, qreal y, qreal w, qreal h, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // N n qreal, N n qreal, N n qreal, N n qreal, N n Qt::ItemSelectionMode + RETURN Qt_QGraphicsScene_items_2( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // QList items ( const QPolygonF & polygon, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QPolygonF, N n Qt::ItemSelectionMode + RETURN Qt_QGraphicsScene_items_4( ::pPtr, ... ) + // QList items ( const QRectF & rectangle, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QRectF, N n Qt::ItemSelectionMode + // RETURN Qt_QGraphicsScene_items_3( ::pPtr, ... ) + // QList items ( const QPainterPath & path, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QPainterPath, N n Qt::ItemSelectionMode + // RETURN Qt_QGraphicsScene_items_5( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QList items ( const QRectF & rectangle, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QRectF, N n Qt::ItemSelectionMode + RETURN Qt_QGraphicsScene_items_3( ::pPtr, ... ) + // QList items ( const QPolygonF & polygon, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QPolygonF, N n Qt::ItemSelectionMode + // RETURN Qt_QGraphicsScene_items_4( ::pPtr, ... ) + // QList items ( const QPointF & pos ) const + // PO p QPointF + // RETURN Qt_QGraphicsScene_items_1( ::pPtr, ... ) + // QList items ( const QPainterPath & path, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QPainterPath, N n Qt::ItemSelectionMode + // RETURN Qt_QGraphicsScene_items_5( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // QList items () const + RETURN Qt_QGraphicsScene_items( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QGraphicsScene:itemsBoundingRect() @@ -361,20 +535,58 @@ METHOD QGraphicsScene:setPalette( pPalette ) RETURN Qt_QGraphicsScene_setPalette( ::pPtr, hbqt_ptr( pPalette ) ) -METHOD QGraphicsScene:setSceneRect( pRect ) - RETURN Qt_QGraphicsScene_setSceneRect( ::pPtr, hbqt_ptr( pRect ) ) +METHOD QGraphicsScene:setSceneRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void setSceneRect ( qreal x, qreal y, qreal w, qreal h ) + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QGraphicsScene_setSceneRect_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setSceneRect ( const QRectF & rect ) + // PO p QRectF + RETURN Qt_QGraphicsScene_setSceneRect( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QGraphicsScene:setSceneRect_1( nX, nY, nW, nH ) - RETURN Qt_QGraphicsScene_setSceneRect_1( ::pPtr, nX, nY, nW, nH ) - - -METHOD QGraphicsScene:setSelectionArea( pPath ) - RETURN Qt_QGraphicsScene_setSelectionArea( ::pPtr, hbqt_ptr( pPath ) ) - - -METHOD QGraphicsScene:setSelectionArea_1( pPath, nMode ) - RETURN Qt_QGraphicsScene_setSelectionArea_1( ::pPtr, hbqt_ptr( pPath ), nMode ) +METHOD QGraphicsScene:setSelectionArea( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void setSelectionArea ( const QPainterPath & path, Qt::ItemSelectionMode mode ) + // PO p QPainterPath, N n Qt::ItemSelectionMode + RETURN Qt_QGraphicsScene_setSelectionArea_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setSelectionArea ( const QPainterPath & path ) + // PO p QPainterPath + RETURN Qt_QGraphicsScene_setSelectionArea( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsScene:setSortCacheEnabled( lEnabled ) @@ -397,8 +609,35 @@ METHOD QGraphicsScene:style() RETURN Qt_QGraphicsScene_style( ::pPtr ) -METHOD QGraphicsScene:update( nX, nY, nW, nH ) - RETURN Qt_QGraphicsScene_update( ::pPtr, nX, nY, nW, nH ) +METHOD QGraphicsScene:update( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void update ( qreal x, qreal y, qreal w, qreal h ) + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QGraphicsScene_update( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void update ( const QRectF & rect = QRectF() ) + // PO p QRectF + RETURN Qt_QGraphicsScene_update_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void update ( const QRectF & rect = QRectF() ) + // PO p QRectF + RETURN Qt_QGraphicsScene_update_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QGraphicsScene:views() @@ -420,11 +659,3 @@ METHOD QGraphicsScene:clear() METHOD QGraphicsScene:clearSelection() RETURN Qt_QGraphicsScene_clearSelection( ::pPtr ) - -METHOD QGraphicsScene:invalidate_1( pRect, nLayers ) - RETURN Qt_QGraphicsScene_invalidate_1( ::pPtr, hbqt_ptr( pRect ), nLayers ) - - -METHOD QGraphicsScene:update_1( pRect ) - RETURN Qt_QGraphicsScene_update_1( ::pPtr, hbqt_ptr( pRect ) ) - diff --git a/harbour/contrib/hbqt/qtgui/g/TQGraphicsView.prg b/harbour/contrib/hbqt/qtgui/g/TQGraphicsView.prg index 7e16f9c7be..05a5bd8701 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQGraphicsView.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQGraphicsView.prg @@ -74,39 +74,16 @@ CREATE CLASS QGraphicsView INHERIT HbQtObjectHandler, HB_QAbstractScrollArea FUN METHOD alignment() METHOD backgroundBrush() METHOD cacheMode() - METHOD centerOn( pPos ) - METHOD centerOn_1( nX, nY ) - METHOD centerOn_2( pItem ) + METHOD centerOn( ... ) METHOD dragMode() - METHOD ensureVisible( pRect, nXmargin, nYmargin ) - METHOD ensureVisible_1( nX, nY, nW, nH, nXmargin, nYmargin ) - METHOD ensureVisible_2( pItem, nXmargin, nYmargin ) - METHOD fitInView( pRect, nAspectRatioMode ) - METHOD fitInView_1( nX, nY, nW, nH, nAspectRatioMode ) - METHOD fitInView_2( pItem, nAspectRatioMode ) + METHOD ensureVisible( ... ) + METHOD fitInView( ... ) METHOD foregroundBrush() METHOD isInteractive() - METHOD itemAt( pPos ) - METHOD itemAt_1( nX, nY ) - METHOD items() - METHOD items_1( pPos ) - METHOD items_2( nX, nY ) - METHOD items_3( nX, nY, nW, nH, nMode ) - METHOD items_4( pRect, nMode ) - METHOD items_5( pPolygon, nMode ) - METHOD items_6( pPath, nMode ) - METHOD mapFromScene( pPoint ) - METHOD mapFromScene_1( pRect ) - METHOD mapFromScene_2( pPolygon ) - METHOD mapFromScene_3( pPath ) - METHOD mapFromScene_4( nX, nY ) - METHOD mapFromScene_5( nX, nY, nW, nH ) - METHOD mapToScene( pPoint ) - METHOD mapToScene_1( pRect ) - METHOD mapToScene_2( pPolygon ) - METHOD mapToScene_3( pPath ) - METHOD mapToScene_4( nX, nY ) - METHOD mapToScene_5( nX, nY, nW, nH ) + METHOD itemAt( ... ) + METHOD items( ... ) + METHOD mapFromScene( ... ) + METHOD mapToScene( ... ) METHOD matrix() METHOD optimizationFlags() METHOD render( pPainter, pTarget, pSource, nAspectRatioMode ) @@ -134,8 +111,7 @@ CREATE CLASS QGraphicsView INHERIT HbQtObjectHandler, HB_QAbstractScrollArea FUN METHOD setResizeAnchor( nAnchor ) METHOD setRubberBandSelectionMode( nMode ) METHOD setScene( pScene ) - METHOD setSceneRect( pRect ) - METHOD setSceneRect_1( nX, nY, nW, nH ) + METHOD setSceneRect( ... ) METHOD setTransform( pMatrix, lCombine ) METHOD setTransformationAnchor( nAnchor ) METHOD setViewportUpdateMode( nMode ) @@ -172,44 +148,132 @@ METHOD QGraphicsView:cacheMode() RETURN Qt_QGraphicsView_cacheMode( ::pPtr ) -METHOD QGraphicsView:centerOn( pPos ) - RETURN Qt_QGraphicsView_centerOn( ::pPtr, hbqt_ptr( pPos ) ) - - -METHOD QGraphicsView:centerOn_1( nX, nY ) - RETURN Qt_QGraphicsView_centerOn_1( ::pPtr, nX, nY ) - - -METHOD QGraphicsView:centerOn_2( pItem ) - RETURN Qt_QGraphicsView_centerOn_2( ::pPtr, hbqt_ptr( pItem ) ) +METHOD QGraphicsView:centerOn( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void centerOn ( qreal x, qreal y ) + // N n qreal, N n qreal + RETURN Qt_QGraphicsView_centerOn_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void centerOn ( const QPointF & pos ) + // PO p QPointF + RETURN Qt_QGraphicsView_centerOn( ::pPtr, ... ) + // void centerOn ( const QGraphicsItem * item ) + // PO p QGraphicsItem + // RETURN Qt_QGraphicsView_centerOn_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsView:dragMode() RETURN Qt_QGraphicsView_dragMode( ::pPtr ) -METHOD QGraphicsView:ensureVisible( pRect, nXmargin, nYmargin ) - RETURN Qt_QGraphicsView_ensureVisible( ::pPtr, hbqt_ptr( pRect ), nXmargin, nYmargin ) +METHOD QGraphicsView:ensureVisible( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 6 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "N" + // void ensureVisible ( qreal x, qreal y, qreal w, qreal h, int xmargin = 50, int ymargin = 50 ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n int, N n int + RETURN Qt_QGraphicsView_ensureVisible_1( ::pPtr, ... ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void ensureVisible ( qreal x, qreal y, qreal w, qreal h, int xmargin = 50, int ymargin = 50 ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n int, N n int + RETURN Qt_QGraphicsView_ensureVisible_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void ensureVisible ( const QRectF & rect, int xmargin = 50, int ymargin = 50 ) + // PO p QRectF, N n int, N n int + RETURN Qt_QGraphicsView_ensureVisible( ::pPtr, ... ) + // void ensureVisible ( const QGraphicsItem * item, int xmargin = 50, int ymargin = 50 ) + // PO p QGraphicsItem, N n int, N n int + // RETURN Qt_QGraphicsView_ensureVisible_2( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void ensureVisible ( const QRectF & rect, int xmargin = 50, int ymargin = 50 ) + // PO p QRectF, N n int, N n int + RETURN Qt_QGraphicsView_ensureVisible( ::pPtr, ... ) + // void ensureVisible ( const QGraphicsItem * item, int xmargin = 50, int ymargin = 50 ) + // PO p QGraphicsItem, N n int, N n int + // RETURN Qt_QGraphicsView_ensureVisible_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QGraphicsView:ensureVisible_1( nX, nY, nW, nH, nXmargin, nYmargin ) - RETURN Qt_QGraphicsView_ensureVisible_1( ::pPtr, nX, nY, nW, nH, nXmargin, nYmargin ) - - -METHOD QGraphicsView:ensureVisible_2( pItem, nXmargin, nYmargin ) - RETURN Qt_QGraphicsView_ensureVisible_2( ::pPtr, hbqt_ptr( pItem ), nXmargin, nYmargin ) - - -METHOD QGraphicsView:fitInView( pRect, nAspectRatioMode ) - RETURN Qt_QGraphicsView_fitInView( ::pPtr, hbqt_ptr( pRect ), nAspectRatioMode ) - - -METHOD QGraphicsView:fitInView_1( nX, nY, nW, nH, nAspectRatioMode ) - RETURN Qt_QGraphicsView_fitInView_1( ::pPtr, nX, nY, nW, nH, nAspectRatioMode ) - - -METHOD QGraphicsView:fitInView_2( pItem, nAspectRatioMode ) - RETURN Qt_QGraphicsView_fitInView_2( ::pPtr, hbqt_ptr( pItem ), nAspectRatioMode ) +METHOD QGraphicsView:fitInView( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // void fitInView ( qreal x, qreal y, qreal w, qreal h, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n Qt::AspectRatioMode + RETURN Qt_QGraphicsView_fitInView_1( ::pPtr, ... ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void fitInView ( qreal x, qreal y, qreal w, qreal h, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n Qt::AspectRatioMode + RETURN Qt_QGraphicsView_fitInView_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void fitInView ( const QRectF & rect, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio ) + // PO p QRectF, N n Qt::AspectRatioMode + RETURN Qt_QGraphicsView_fitInView( ::pPtr, ... ) + // void fitInView ( const QGraphicsItem * item, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio ) + // PO p QGraphicsItem, N n Qt::AspectRatioMode + // RETURN Qt_QGraphicsView_fitInView_2( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void fitInView ( const QRectF & rect, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio ) + // PO p QRectF, N n Qt::AspectRatioMode + RETURN Qt_QGraphicsView_fitInView( ::pPtr, ... ) + // void fitInView ( const QGraphicsItem * item, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio ) + // PO p QGraphicsItem, N n Qt::AspectRatioMode + // RETURN Qt_QGraphicsView_fitInView_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsView:foregroundBrush() @@ -220,88 +284,180 @@ METHOD QGraphicsView:isInteractive() RETURN Qt_QGraphicsView_isInteractive( ::pPtr ) -METHOD QGraphicsView:itemAt( pPos ) - RETURN Qt_QGraphicsView_itemAt( ::pPtr, hbqt_ptr( pPos ) ) +METHOD QGraphicsView:itemAt( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QGraphicsItem * itemAt ( int x, int y ) const + // N n int, N n int + RETURN QGraphicsItem():from( Qt_QGraphicsView_itemAt_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QGraphicsItem * itemAt ( const QPoint & pos ) const + // PO p QPoint + RETURN QGraphicsItem():from( Qt_QGraphicsView_itemAt( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QGraphicsView:itemAt_1( nX, nY ) - RETURN Qt_QGraphicsView_itemAt_1( ::pPtr, nX, nY ) +METHOD QGraphicsView:items( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // QList items ( int x, int y, int w, int h, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // N n int, N n int, N n int, N n int, N n Qt::ItemSelectionMode + RETURN Qt_QGraphicsView_items_3( ::pPtr, ... ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QList items ( int x, int y, int w, int h, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // N n int, N n int, N n int, N n int, N n Qt::ItemSelectionMode + RETURN Qt_QGraphicsView_items_3( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QList items ( int x, int y ) const + // N n int, N n int + RETURN Qt_QGraphicsView_items_2( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // QList items ( const QPolygon & polygon, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QPolygon, N n Qt::ItemSelectionMode + RETURN Qt_QGraphicsView_items_5( ::pPtr, ... ) + // QList items ( const QPainterPath & path, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QPainterPath, N n Qt::ItemSelectionMode + // RETURN Qt_QGraphicsView_items_6( ::pPtr, ... ) + // QList items ( const QRect & rect, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QRect, N n Qt::ItemSelectionMode + // RETURN Qt_QGraphicsView_items_4( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QList items ( const QPolygon & polygon, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QPolygon, N n Qt::ItemSelectionMode + RETURN Qt_QGraphicsView_items_5( ::pPtr, ... ) + // QList items ( const QRect & rect, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QRect, N n Qt::ItemSelectionMode + // RETURN Qt_QGraphicsView_items_4( ::pPtr, ... ) + // QList items ( const QPoint & pos ) const + // PO p QPoint + // RETURN Qt_QGraphicsView_items_1( ::pPtr, ... ) + // QList items ( const QPainterPath & path, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape ) const + // PO p QPainterPath, N n Qt::ItemSelectionMode + // RETURN Qt_QGraphicsView_items_6( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // QList items () const + RETURN Qt_QGraphicsView_items( ::pPtr, ... ) + ENDCASE + RETURN NIL -METHOD QGraphicsView:items() - RETURN Qt_QGraphicsView_items( ::pPtr ) +METHOD QGraphicsView:mapFromScene( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QPolygon mapFromScene ( qreal x, qreal y, qreal w, qreal h ) const + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN QPolygon():from( Qt_QGraphicsView_mapFromScene_5( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QPoint mapFromScene ( qreal x, qreal y ) const + // N n qreal, N n qreal + RETURN QPoint():from( Qt_QGraphicsView_mapFromScene_4( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPainterPath mapFromScene ( const QPainterPath & path ) const + // PO p QPainterPath + RETURN QPainterPath():from( Qt_QGraphicsView_mapFromScene_3( ::pPtr, ... ) ) + // QPoint mapFromScene ( const QPointF & point ) const + // PO p QPointF + // RETURN QPoint():from( Qt_QGraphicsView_mapFromScene( ::pPtr, ... ) ) + // QPolygon mapFromScene ( const QRectF & rect ) const + // PO p QRectF + // RETURN QPolygon():from( Qt_QGraphicsView_mapFromScene_1( ::pPtr, ... ) ) + // QPolygon mapFromScene ( const QPolygonF & polygon ) const + // PO p QPolygonF + // RETURN QPolygon():from( Qt_QGraphicsView_mapFromScene_2( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QGraphicsView:items_1( pPos ) - RETURN Qt_QGraphicsView_items_1( ::pPtr, hbqt_ptr( pPos ) ) - - -METHOD QGraphicsView:items_2( nX, nY ) - RETURN Qt_QGraphicsView_items_2( ::pPtr, nX, nY ) - - -METHOD QGraphicsView:items_3( nX, nY, nW, nH, nMode ) - RETURN Qt_QGraphicsView_items_3( ::pPtr, nX, nY, nW, nH, nMode ) - - -METHOD QGraphicsView:items_4( pRect, nMode ) - RETURN Qt_QGraphicsView_items_4( ::pPtr, hbqt_ptr( pRect ), nMode ) - - -METHOD QGraphicsView:items_5( pPolygon, nMode ) - RETURN Qt_QGraphicsView_items_5( ::pPtr, hbqt_ptr( pPolygon ), nMode ) - - -METHOD QGraphicsView:items_6( pPath, nMode ) - RETURN Qt_QGraphicsView_items_6( ::pPtr, hbqt_ptr( pPath ), nMode ) - - -METHOD QGraphicsView:mapFromScene( pPoint ) - RETURN Qt_QGraphicsView_mapFromScene( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QGraphicsView:mapFromScene_1( pRect ) - RETURN Qt_QGraphicsView_mapFromScene_1( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsView:mapFromScene_2( pPolygon ) - RETURN Qt_QGraphicsView_mapFromScene_2( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QGraphicsView:mapFromScene_3( pPath ) - RETURN Qt_QGraphicsView_mapFromScene_3( ::pPtr, hbqt_ptr( pPath ) ) - - -METHOD QGraphicsView:mapFromScene_4( nX, nY ) - RETURN Qt_QGraphicsView_mapFromScene_4( ::pPtr, nX, nY ) - - -METHOD QGraphicsView:mapFromScene_5( nX, nY, nW, nH ) - RETURN Qt_QGraphicsView_mapFromScene_5( ::pPtr, nX, nY, nW, nH ) - - -METHOD QGraphicsView:mapToScene( pPoint ) - RETURN Qt_QGraphicsView_mapToScene( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QGraphicsView:mapToScene_1( pRect ) - RETURN Qt_QGraphicsView_mapToScene_1( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsView:mapToScene_2( pPolygon ) - RETURN Qt_QGraphicsView_mapToScene_2( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QGraphicsView:mapToScene_3( pPath ) - RETURN Qt_QGraphicsView_mapToScene_3( ::pPtr, hbqt_ptr( pPath ) ) - - -METHOD QGraphicsView:mapToScene_4( nX, nY ) - RETURN Qt_QGraphicsView_mapToScene_4( ::pPtr, nX, nY ) - - -METHOD QGraphicsView:mapToScene_5( nX, nY, nW, nH ) - RETURN Qt_QGraphicsView_mapToScene_5( ::pPtr, nX, nY, nW, nH ) +METHOD QGraphicsView:mapToScene( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QPolygonF mapToScene ( int x, int y, int w, int h ) const + // N n int, N n int, N n int, N n int + RETURN QPolygonF():from( Qt_QGraphicsView_mapToScene_5( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QPointF mapToScene ( int x, int y ) const + // N n int, N n int + RETURN QPointF():from( Qt_QGraphicsView_mapToScene_4( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPainterPath mapToScene ( const QPainterPath & path ) const + // PO p QPainterPath + RETURN QPainterPath():from( Qt_QGraphicsView_mapToScene_3( ::pPtr, ... ) ) + // QPointF mapToScene ( const QPoint & point ) const + // PO p QPoint + // RETURN QPointF():from( Qt_QGraphicsView_mapToScene( ::pPtr, ... ) ) + // QPolygonF mapToScene ( const QRect & rect ) const + // PO p QRect + // RETURN QPolygonF():from( Qt_QGraphicsView_mapToScene_1( ::pPtr, ... ) ) + // QPolygonF mapToScene ( const QPolygon & polygon ) const + // PO p QPolygon + // RETURN QPolygonF():from( Qt_QGraphicsView_mapToScene_2( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsView:matrix() @@ -412,12 +568,31 @@ METHOD QGraphicsView:setScene( pScene ) RETURN Qt_QGraphicsView_setScene( ::pPtr, hbqt_ptr( pScene ) ) -METHOD QGraphicsView:setSceneRect( pRect ) - RETURN Qt_QGraphicsView_setSceneRect( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsView:setSceneRect_1( nX, nY, nW, nH ) - RETURN Qt_QGraphicsView_setSceneRect_1( ::pPtr, nX, nY, nW, nH ) +METHOD QGraphicsView:setSceneRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void setSceneRect ( qreal x, qreal y, qreal w, qreal h ) + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QGraphicsView_setSceneRect_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setSceneRect ( const QRectF & rect ) + // PO p QRectF + RETURN Qt_QGraphicsView_setSceneRect( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsView:setTransform( pMatrix, lCombine ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQGraphicsWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQGraphicsWidget.prg index 3591208d87..a789b32a31 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQGraphicsWidget.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQGraphicsWidget.prg @@ -88,14 +88,12 @@ CREATE CLASS QGraphicsWidget INHERIT HbQtObjectHandler, HB_QObject, HB_QGraphics METHOD rect() METHOD releaseShortcut( nId ) METHOD removeAction( pAction ) - METHOD resize( pSize ) - METHOD resize_1( nW, nH ) + METHOD resize( ... ) METHOD setAttribute( nAttribute, lOn ) METHOD setContentsMargins( nLeft, nTop, nRight, nBottom ) METHOD setFocusPolicy( nPolicy ) METHOD setFont( pFont ) - METHOD setGeometry( pRect ) - METHOD setGeometry_1( nX, nY, nW, nH ) + METHOD setGeometry( ... ) METHOD setLayout( pLayout ) METHOD setLayoutDirection( nDirection ) METHOD setPalette( pPalette ) @@ -198,12 +196,31 @@ METHOD QGraphicsWidget:removeAction( pAction ) RETURN Qt_QGraphicsWidget_removeAction( ::pPtr, hbqt_ptr( pAction ) ) -METHOD QGraphicsWidget:resize( pSize ) - RETURN Qt_QGraphicsWidget_resize( ::pPtr, hbqt_ptr( pSize ) ) - - -METHOD QGraphicsWidget:resize_1( nW, nH ) - RETURN Qt_QGraphicsWidget_resize_1( ::pPtr, nW, nH ) +METHOD QGraphicsWidget:resize( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void resize ( qreal w, qreal h ) + // N n qreal, N n qreal + RETURN Qt_QGraphicsWidget_resize_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void resize ( const QSizeF & size ) + // PO p QSizeF + RETURN Qt_QGraphicsWidget_resize( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsWidget:setAttribute( nAttribute, lOn ) @@ -222,12 +239,31 @@ METHOD QGraphicsWidget:setFont( pFont ) RETURN Qt_QGraphicsWidget_setFont( ::pPtr, hbqt_ptr( pFont ) ) -METHOD QGraphicsWidget:setGeometry( pRect ) - RETURN Qt_QGraphicsWidget_setGeometry( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QGraphicsWidget:setGeometry_1( nX, nY, nW, nH ) - RETURN Qt_QGraphicsWidget_setGeometry_1( ::pPtr, nX, nY, nW, nH ) +METHOD QGraphicsWidget:setGeometry( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void setGeometry ( qreal x, qreal y, qreal w, qreal h ) + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QGraphicsWidget_setGeometry_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // virtual void setGeometry ( const QRectF & rect ) + // PO p QRectF + RETURN Qt_QGraphicsWidget_setGeometry( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGraphicsWidget:setLayout( pLayout ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQGridLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQGridLayout.prg index 0044dcdd31..79909f8522 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQGridLayout.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQGridLayout.prg @@ -72,10 +72,8 @@ CREATE CLASS QGridLayout INHERIT HbQtObjectHandler, HB_QLayout FUNCTION HB_QGrid METHOD new( ... ) METHOD addItem( pItem, nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) - METHOD addLayout( pLayout, nRow, nColumn, nAlignment ) - METHOD addLayout_1( pLayout, nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) - METHOD addWidget( pWidget, nRow, nColumn, nAlignment ) - METHOD addWidget_1( pWidget, nFromRow, nFromColumn, nRowSpan, nColumnSpan, nAlignment ) + METHOD addLayout( ... ) + METHOD addWidget( ... ) METHOD cellRect( nRow, nColumn ) METHOD columnCount() METHOD columnMinimumWidth( nColumn ) @@ -114,20 +112,86 @@ METHOD QGridLayout:addItem( pItem, nRow, nColumn, nRowSpan, nColumnSpan, nAlignm RETURN Qt_QGridLayout_addItem( ::pPtr, hbqt_ptr( pItem ), nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) -METHOD QGridLayout:addLayout( pLayout, nRow, nColumn, nAlignment ) - RETURN Qt_QGridLayout_addLayout( ::pPtr, hbqt_ptr( pLayout ), nRow, nColumn, nAlignment ) +METHOD QGridLayout:addLayout( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 6 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "N" + // void addLayout ( QLayout * layout, int row, int column, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 ) [*D=1*] + // PO p QLayout, N n int, N n int, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGridLayout_addLayout_1( ::pPtr, ... ) + ENDCASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // void addLayout ( QLayout * layout, int row, int column, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 ) [*D=1*] + // PO p QLayout, N n int, N n int, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGridLayout_addLayout_1( ::pPtr, ... ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void addLayout ( QLayout * layout, int row, int column, Qt::Alignment alignment = 0 ) [*D=1*] + // PO p QLayout, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGridLayout_addLayout( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void addLayout ( QLayout * layout, int row, int column, Qt::Alignment alignment = 0 ) [*D=1*] + // PO p QLayout, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGridLayout_addLayout( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QGridLayout:addLayout_1( pLayout, nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) - RETURN Qt_QGridLayout_addLayout_1( ::pPtr, hbqt_ptr( pLayout ), nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) - - -METHOD QGridLayout:addWidget( pWidget, nRow, nColumn, nAlignment ) - RETURN Qt_QGridLayout_addWidget( ::pPtr, hbqt_ptr( pWidget ), nRow, nColumn, nAlignment ) - - -METHOD QGridLayout:addWidget_1( pWidget, nFromRow, nFromColumn, nRowSpan, nColumnSpan, nAlignment ) - RETURN Qt_QGridLayout_addWidget_1( ::pPtr, hbqt_ptr( pWidget ), nFromRow, nFromColumn, nRowSpan, nColumnSpan, nAlignment ) +METHOD QGridLayout:addWidget( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 6 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "N" + // void addWidget ( QWidget * widget, int fromRow, int fromColumn, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 ) [*D=1*] + // PO p QWidget, N n int, N n int, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGridLayout_addWidget_1( ::pPtr, ... ) + ENDCASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // void addWidget ( QWidget * widget, int fromRow, int fromColumn, int rowSpan, int columnSpan, Qt::Alignment alignment = 0 ) [*D=1*] + // PO p QWidget, N n int, N n int, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGridLayout_addWidget_1( ::pPtr, ... ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void addWidget ( QWidget * widget, int row, int column, Qt::Alignment alignment = 0 ) [*D=1*] + // PO p QWidget, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGridLayout_addWidget( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void addWidget ( QWidget * widget, int row, int column, Qt::Alignment alignment = 0 ) [*D=1*] + // PO p QWidget, N n int, N n int, N n Qt::Alignment + RETURN Qt_QGridLayout_addWidget( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QGridLayout:cellRect( nRow, nColumn ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQHeaderView.prg b/harbour/contrib/hbqt/qtgui/g/TQHeaderView.prg index 9b41f5a26e..2e855f1a31 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQHeaderView.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQHeaderView.prg @@ -84,9 +84,7 @@ CREATE CLASS QHeaderView INHERIT HbQtObjectHandler, HB_QAbstractItemView FUNCTIO METHOD isSortIndicatorShown() METHOD length() METHOD logicalIndex( nVisualIndex ) - METHOD logicalIndexAt( nPosition ) - METHOD logicalIndexAt_1( nX, nY ) - METHOD logicalIndexAt_2( pPos ) + METHOD logicalIndexAt( ... ) METHOD minimumSectionSize() METHOD moveSection( nFrom, nTo ) METHOD offset() @@ -109,8 +107,7 @@ CREATE CLASS QHeaderView INHERIT HbQtObjectHandler, HB_QAbstractItemView FUNCTIO METHOD setHighlightSections( lHighlight ) METHOD setMinimumSectionSize( nSize ) METHOD setMovable( lMovable ) - METHOD setResizeMode( nMode ) - METHOD setResizeMode_1( nLogicalIndex, nMode ) + METHOD setResizeMode( ... ) METHOD setSectionHidden( nLogicalIndex, lHide ) METHOD setSortIndicator( nLogicalIndex, nOrder ) METHOD setSortIndicatorShown( lShow ) @@ -193,16 +190,35 @@ METHOD QHeaderView:logicalIndex( nVisualIndex ) RETURN Qt_QHeaderView_logicalIndex( ::pPtr, nVisualIndex ) -METHOD QHeaderView:logicalIndexAt( nPosition ) - RETURN Qt_QHeaderView_logicalIndexAt( ::pPtr, nPosition ) - - -METHOD QHeaderView:logicalIndexAt_1( nX, nY ) - RETURN Qt_QHeaderView_logicalIndexAt_1( ::pPtr, nX, nY ) - - -METHOD QHeaderView:logicalIndexAt_2( pPos ) - RETURN Qt_QHeaderView_logicalIndexAt_2( ::pPtr, hbqt_ptr( pPos ) ) +METHOD QHeaderView:logicalIndexAt( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // int logicalIndexAt ( int x, int y ) const + // N n int, N n int + RETURN Qt_QHeaderView_logicalIndexAt_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // int logicalIndexAt ( int position ) const + // N n int + RETURN Qt_QHeaderView_logicalIndexAt( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // int logicalIndexAt ( const QPoint & pos ) const + // PO p QPoint + RETURN Qt_QHeaderView_logicalIndexAt_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QHeaderView:minimumSectionSize() @@ -293,12 +309,31 @@ METHOD QHeaderView:setMovable( lMovable ) RETURN Qt_QHeaderView_setMovable( ::pPtr, lMovable ) -METHOD QHeaderView:setResizeMode( nMode ) - RETURN Qt_QHeaderView_setResizeMode( ::pPtr, nMode ) - - -METHOD QHeaderView:setResizeMode_1( nLogicalIndex, nMode ) - RETURN Qt_QHeaderView_setResizeMode_1( ::pPtr, nLogicalIndex, nMode ) +METHOD QHeaderView:setResizeMode( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setResizeMode ( int logicalIndex, ResizeMode mode ) + // N n int, N n QHeaderView::ResizeMode + RETURN Qt_QHeaderView_setResizeMode_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setResizeMode ( ResizeMode mode ) + // N n QHeaderView::ResizeMode + RETURN Qt_QHeaderView_setResizeMode( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QHeaderView:setSectionHidden( nLogicalIndex, lHide ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQIcon.prg b/harbour/contrib/hbqt/qtgui/g/TQIcon.prg index 49b32c206f..6586f9388c 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQIcon.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQIcon.prg @@ -117,17 +117,80 @@ METHOD QIcon:isNull() METHOD QIcon:paint( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QIcon_paint( ::pPtr, ... ) + DO CASE + CASE nP == 8 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "N" .AND. aV[ 7 ] $ "N" .AND. aV[ 8 ] $ "N" + // void paint ( QPainter * painter, int x, int y, int w, int h, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const + // PO p QPainter, N n int, N n int, N n int, N n int, N n Qt::Alignment, N n QIcon::Mode, N n QIcon::State + RETURN Qt_QIcon_paint_1( ::pPtr, ... ) + ENDCASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // void paint ( QPainter * painter, int x, int y, int w, int h, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const + // PO p QPainter, N n int, N n int, N n int, N n int, N n Qt::Alignment, N n QIcon::Mode, N n QIcon::State + RETURN Qt_QIcon_paint_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // void paint ( QPainter * painter, const QRect & rect, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const + // PO p QPainter, PO p QRect, N n Qt::Alignment, N n QIcon::Mode, N n QIcon::State + RETURN Qt_QIcon_paint( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // void paint ( QPainter * painter, const QRect & rect, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const + // PO p QPainter, PO p QRect, N n Qt::Alignment, N n QIcon::Mode, N n QIcon::State + RETURN Qt_QIcon_paint( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QIcon:pixmap( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QIcon_pixmap( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QPixmap pixmap ( int w, int h, Mode mode = Normal, State state = Off ) const + // N n int, N n int, N n QIcon::Mode, N n QIcon::State + RETURN QPixmap():from( Qt_QIcon_pixmap_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // QPixmap pixmap ( const QSize & size, Mode mode = Normal, State state = Off ) const + // PO p QSize, N n QIcon::Mode, N n QIcon::State + RETURN QPixmap():from( Qt_QIcon_pixmap( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QPixmap pixmap ( int w, int h, Mode mode = Normal, State state = Off ) const + // N n int, N n int, N n QIcon::Mode, N n QIcon::State + RETURN QPixmap():from( Qt_QIcon_pixmap_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPixmap pixmap ( const QSize & size, Mode mode = Normal, State state = Off ) const + // PO p QSize, N n QIcon::Mode, N n QIcon::State + RETURN QPixmap():from( Qt_QIcon_pixmap( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtgui/g/TQImage.prg b/harbour/contrib/hbqt/qtgui/g/TQImage.prg index 51e6c4f4a1..ff7ed89018 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQImage.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQImage.prg @@ -74,7 +74,6 @@ CREATE CLASS QImage INHERIT HbQtObjectHandler FUNCTION HB_QImage METHOD allGray() METHOD alphaChannel() METHOD bits() - METHOD bits_1() METHOD bytesPerLine() METHOD cacheKey() METHOD color( nI ) @@ -108,7 +107,6 @@ CREATE CLASS QImage INHERIT HbQtObjectHandler FUNCTION HB_QImage METHOD scaledToHeight( nHeight, nMode ) METHOD scaledToWidth( nWidth, nMode ) METHOD scanLine( nI ) - METHOD scanLine_1( nI ) METHOD setColor( nIndex, nColorValue ) METHOD setDotsPerMeterX( nX ) METHOD setDotsPerMeterY( nY ) @@ -147,10 +145,6 @@ METHOD QImage:bits() RETURN Qt_QImage_bits( ::pPtr ) -METHOD QImage:bits_1() - RETURN Qt_QImage_bits_1( ::pPtr ) - - METHOD QImage:bytesPerLine() RETURN Qt_QImage_bytesPerLine( ::pPtr ) @@ -168,11 +162,34 @@ METHOD QImage:convertToFormat( nFormat, nFlags ) METHOD QImage:copy( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QImage_copy( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QImage copy ( int x, int y, int width, int height ) const + // N n int, N n int, N n int, N n int + RETURN QImage():from( Qt_QImage_copy_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QImage copy ( const QRect & rectangle = QRect() ) const + // PO p QRect + RETURN QImage():from( Qt_QImage_copy( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QImage copy ( const QRect & rectangle = QRect() ) const + // PO p QRect + RETURN QImage():from( Qt_QImage_copy( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QImage:createAlphaMask( nFlags ) @@ -228,11 +245,34 @@ METHOD QImage:isNull() METHOD QImage:load( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QImage_load( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // bool load ( const QString & fileName, const char * format = 0 ) + // C c QString, PO p char + RETURN Qt_QImage_load( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // bool load ( QIODevice * device, const char * format ) + // PO p QIODevice, PO p char + RETURN Qt_QImage_load_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool load ( const QString & fileName, const char * format = 0 ) + // C c QString, PO p char + RETURN Qt_QImage_load( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QImage:loadFromData( pData, pFormat ) @@ -256,19 +296,57 @@ METHOD QImage:offset() METHOD QImage:pixel( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QImage_pixel( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QRgb pixel ( int x, int y ) const + // N n int, N n int + RETURN Qt_QImage_pixel_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRgb pixel ( const QPoint & position ) const + // PO p QPoint + RETURN Qt_QImage_pixel( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QImage:pixelIndex( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QImage_pixelIndex( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // int pixelIndex ( int x, int y ) const + // N n int, N n int + RETURN Qt_QImage_pixelIndex_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // int pixelIndex ( const QPoint & position ) const + // PO p QPoint + RETURN Qt_QImage_pixelIndex( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QImage:rect() @@ -280,19 +358,79 @@ METHOD QImage:rgbSwapped() METHOD QImage:save( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QImage_save( ::pPtr, ... ) + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const + // C c QString, PO p char, N n int + RETURN Qt_QImage_save( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const + // PO p QIODevice, PO p char, N n int + RETURN Qt_QImage_save_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const + // C c QString, PO p char, N n int + RETURN Qt_QImage_save( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const + // PO p QIODevice, PO p char, N n int + RETURN Qt_QImage_save_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QImage:scaled( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QImage_scaled( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QImage scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + // N n int, N n int, N n Qt::AspectRatioMode, N n Qt::TransformationMode + RETURN QImage():from( Qt_QImage_scaled_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // QImage scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + // PO p QSize, N n Qt::AspectRatioMode, N n Qt::TransformationMode + RETURN QImage():from( Qt_QImage_scaled( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QImage scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + // N n int, N n int, N n Qt::AspectRatioMode, N n Qt::TransformationMode + RETURN QImage():from( Qt_QImage_scaled_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QImage scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + // PO p QSize, N n Qt::AspectRatioMode, N n Qt::TransformationMode + RETURN QImage():from( Qt_QImage_scaled( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QImage:scaledToHeight( nHeight, nMode ) @@ -307,10 +445,6 @@ METHOD QImage:scanLine( nI ) RETURN Qt_QImage_scanLine( ::pPtr, nI ) -METHOD QImage:scanLine_1( nI ) - RETURN Qt_QImage_scanLine_1( ::pPtr, nI ) - - METHOD QImage:setColor( nIndex, nColorValue ) RETURN Qt_QImage_setColor( ::pPtr, nIndex, nColorValue ) @@ -332,11 +466,30 @@ METHOD QImage:setOffset( pOffset ) METHOD QImage:setPixel( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QImage_setPixel( ::pPtr, ... ) + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void setPixel ( int x, int y, uint index_or_rgb ) + // N n int, N n int, N n uint + RETURN Qt_QImage_setPixel_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void setPixel ( const QPoint & position, uint index_or_rgb ) + // PO p QPoint, N n uint + RETURN Qt_QImage_setPixel( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QImage:setText( cKey, cText ) @@ -364,11 +517,30 @@ METHOD QImage:transformed( ... ) METHOD QImage:valid( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QImage_valid( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // bool valid ( int x, int y ) const + // N n int, N n int + RETURN Qt_QImage_valid_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // bool valid ( const QPoint & pos ) const + // PO p QPoint + RETURN Qt_QImage_valid( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QImage:width() diff --git a/harbour/contrib/hbqt/qtgui/g/TQImageReader.prg b/harbour/contrib/hbqt/qtgui/g/TQImageReader.prg index 153a72d7e2..1e9bf5986d 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQImageReader.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQImageReader.prg @@ -83,14 +83,13 @@ CREATE CLASS QImageReader INHERIT HbQtObjectHandler FUNCTION HB_QImageReader METHOD fileName() METHOD format() METHOD imageCount() - METHOD imageFormat() + METHOD imageFormat( ... ) METHOD jumpToImage( nImageNumber ) METHOD jumpToNextImage() METHOD loopCount() METHOD nextImageDelay() METHOD quality() - METHOD read() - METHOD read_1( pImage ) + METHOD read( ... ) METHOD scaledClipRect() METHOD scaledSize() METHOD setAutoDetectImageFormat( lEnabled ) @@ -107,8 +106,6 @@ CREATE CLASS QImageReader INHERIT HbQtObjectHandler FUNCTION HB_QImageReader METHOD supportsOption( nOption ) METHOD text( cKey ) METHOD textKeys() - METHOD imageFormat_1( cFileName ) - METHOD imageFormat_2( pDevice ) METHOD supportedImageFormats() ENDCLASS @@ -171,8 +168,31 @@ METHOD QImageReader:imageCount() RETURN Qt_QImageReader_imageCount( ::pPtr ) -METHOD QImageReader:imageFormat() - RETURN Qt_QImageReader_imageFormat( ::pPtr ) +METHOD QImageReader:imageFormat( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QByteArray imageFormat ( const QString & fileName ) + // C c QString + RETURN QByteArray():from( Qt_QImageReader_imageFormat_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // QByteArray imageFormat ( QIODevice * device ) + // PO p QIODevice + RETURN QByteArray():from( Qt_QImageReader_imageFormat_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QImage::Format imageFormat () const + RETURN Qt_QImageReader_imageFormat( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QImageReader:jumpToImage( nImageNumber ) @@ -195,12 +215,27 @@ METHOD QImageReader:quality() RETURN Qt_QImageReader_quality( ::pPtr ) -METHOD QImageReader:read() - RETURN Qt_QImageReader_read( ::pPtr ) - - -METHOD QImageReader:read_1( pImage ) - RETURN Qt_QImageReader_read_1( ::pPtr, hbqt_ptr( pImage ) ) +METHOD QImageReader:read( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // bool read ( QImage * image ) + // PO p QImage + RETURN Qt_QImageReader_read_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // QImage read () + RETURN QImage():from( Qt_QImageReader_read( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QImageReader:scaledClipRect() @@ -267,14 +302,6 @@ METHOD QImageReader:textKeys() RETURN Qt_QImageReader_textKeys( ::pPtr ) -METHOD QImageReader:imageFormat_1( cFileName ) - RETURN Qt_QImageReader_imageFormat_1( ::pPtr, cFileName ) - - -METHOD QImageReader:imageFormat_2( pDevice ) - RETURN Qt_QImageReader_imageFormat_2( ::pPtr, hbqt_ptr( pDevice ) ) - - METHOD QImageReader:supportedImageFormats() RETURN Qt_QImageReader_supportedImageFormats( ::pPtr ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQItemSelectionModel.prg b/harbour/contrib/hbqt/qtgui/g/TQItemSelectionModel.prg index 8085365c8a..73e47238c5 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQItemSelectionModel.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQItemSelectionModel.prg @@ -83,8 +83,7 @@ CREATE CLASS QItemSelectionModel INHERIT HbQtObjectHandler, HB_QObject FUNCTION METHOD clear() METHOD clearSelection() METHOD reset() - METHOD select( pIndex, nCommand ) - METHOD select_1( pSelection, nCommand ) + METHOD select( ... ) METHOD setCurrentIndex( pIndex, nCommand ) ENDCLASS @@ -147,12 +146,27 @@ METHOD QItemSelectionModel:reset() RETURN Qt_QItemSelectionModel_reset( ::pPtr ) -METHOD QItemSelectionModel:select( pIndex, nCommand ) - RETURN Qt_QItemSelectionModel_select( ::pPtr, hbqt_ptr( pIndex ), nCommand ) - - -METHOD QItemSelectionModel:select_1( pSelection, nCommand ) - RETURN Qt_QItemSelectionModel_select_1( ::pPtr, hbqt_ptr( pSelection ), nCommand ) +METHOD QItemSelectionModel:select( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // virtual void select ( const QModelIndex & index, QItemSelectionModel::SelectionFlags command ) + // PO p QModelIndex, N n QItemSelectionModel::SelectionFlags + RETURN Qt_QItemSelectionModel_select( ::pPtr, ... ) + // virtual void select ( const QItemSelection & selection, QItemSelectionModel::SelectionFlags command ) + // PO p QItemSelection, N n QItemSelectionModel::SelectionFlags + // RETURN Qt_QItemSelectionModel_select_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QItemSelectionModel:setCurrentIndex( pIndex, nCommand ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQLCDNumber.prg b/harbour/contrib/hbqt/qtgui/g/TQLCDNumber.prg index 158741ffc6..e45ea9b5bb 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQLCDNumber.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQLCDNumber.prg @@ -71,8 +71,7 @@ CREATE CLASS QLCDNumber INHERIT HbQtObjectHandler, HB_QFrame FUNCTION HB_QLCDNum METHOD new( ... ) - METHOD checkOverflow( nNum ) - METHOD checkOverflow_1( nNum ) + METHOD checkOverflow( ... ) METHOD intValue() METHOD mode() METHOD numDigits() @@ -82,9 +81,7 @@ CREATE CLASS QLCDNumber INHERIT HbQtObjectHandler, HB_QFrame FUNCTION HB_QLCDNum METHOD setSegmentStyle( nSegmentStyle ) METHOD smallDecimalPoint() METHOD value() - METHOD display( cS ) - METHOD display_1( nNum ) - METHOD display_2( nNum ) + METHOD display( ... ) METHOD setBinMode() METHOD setDecMode() METHOD setHexMode() @@ -103,12 +100,27 @@ METHOD QLCDNumber:new( ... ) RETURN Self -METHOD QLCDNumber:checkOverflow( nNum ) - RETURN Qt_QLCDNumber_checkOverflow( ::pPtr, nNum ) - - -METHOD QLCDNumber:checkOverflow_1( nNum ) - RETURN Qt_QLCDNumber_checkOverflow_1( ::pPtr, nNum ) +METHOD QLCDNumber:checkOverflow( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // bool checkOverflow ( double num ) const + // N n double + RETURN Qt_QLCDNumber_checkOverflow( ::pPtr, ... ) + // bool checkOverflow ( int num ) const + // N n int + // RETURN Qt_QLCDNumber_checkOverflow_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QLCDNumber:intValue() @@ -147,16 +159,31 @@ METHOD QLCDNumber:value() RETURN Qt_QLCDNumber_value( ::pPtr ) -METHOD QLCDNumber:display( cS ) - RETURN Qt_QLCDNumber_display( ::pPtr, cS ) - - -METHOD QLCDNumber:display_1( nNum ) - RETURN Qt_QLCDNumber_display_1( ::pPtr, nNum ) - - -METHOD QLCDNumber:display_2( nNum ) - RETURN Qt_QLCDNumber_display_2( ::pPtr, nNum ) +METHOD QLCDNumber:display( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // void display ( const QString & s ) + // C c QString + RETURN Qt_QLCDNumber_display( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" + // void display ( double num ) + // N n double + RETURN Qt_QLCDNumber_display_1( ::pPtr, ... ) + // void display ( int num ) + // N n int + // RETURN Qt_QLCDNumber_display_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QLCDNumber:setBinMode() diff --git a/harbour/contrib/hbqt/qtgui/g/TQLabel.prg b/harbour/contrib/hbqt/qtgui/g/TQLabel.prg index 3f934c3651..757ca6d6b2 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQLabel.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQLabel.prg @@ -95,8 +95,7 @@ CREATE CLASS QLabel INHERIT HbQtObjectHandler, HB_QFrame FUNCTION HB_QLabel METHOD wordWrap() METHOD clear() METHOD setMovie( pMovie ) - METHOD setNum( nNum ) - METHOD setNum_1( nNum ) + METHOD setNum( ... ) METHOD setPicture( pPicture ) METHOD setPixmap( pQPixmap ) METHOD setText( cQString ) @@ -209,12 +208,27 @@ METHOD QLabel:setMovie( pMovie ) RETURN Qt_QLabel_setMovie( ::pPtr, hbqt_ptr( pMovie ) ) -METHOD QLabel:setNum( nNum ) - RETURN Qt_QLabel_setNum( ::pPtr, nNum ) - - -METHOD QLabel:setNum_1( nNum ) - RETURN Qt_QLabel_setNum_1( ::pPtr, nNum ) +METHOD QLabel:setNum( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setNum ( int num ) + // N n int + RETURN Qt_QLabel_setNum( ::pPtr, ... ) + // void setNum ( double num ) + // N n double + // RETURN Qt_QLabel_setNum_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QLabel:setPicture( pPicture ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQLayout.prg index 3e606529ae..adf1867456 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQLayout.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQLayout.prg @@ -87,9 +87,7 @@ CREATE CLASS QLayout INHERIT HbQtObjectHandler, HB_QObject, HB_QLayoutItem FUNCT METHOD parentWidget() METHOD removeItem( pItem ) METHOD removeWidget( pWidget ) - METHOD setAlignment( pW, nAlignment ) - METHOD setAlignment_1( nAlignment ) - METHOD setAlignment_2( pL, nAlignment ) + METHOD setAlignment( ... ) METHOD setContentsMargins( nLeft, nTop, nRight, nBottom ) METHOD setEnabled( lEnable ) METHOD setMenuBar( pWidget ) @@ -177,16 +175,34 @@ METHOD QLayout:removeWidget( pWidget ) RETURN Qt_QLayout_removeWidget( ::pPtr, hbqt_ptr( pWidget ) ) -METHOD QLayout:setAlignment( pW, nAlignment ) - RETURN Qt_QLayout_setAlignment( ::pPtr, hbqt_ptr( pW ), nAlignment ) - - -METHOD QLayout:setAlignment_1( nAlignment ) - RETURN Qt_QLayout_setAlignment_1( ::pPtr, nAlignment ) - - -METHOD QLayout:setAlignment_2( pL, nAlignment ) - RETURN Qt_QLayout_setAlignment_2( ::pPtr, hbqt_ptr( pL ), nAlignment ) +METHOD QLayout:setAlignment( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // bool setAlignment ( QLayout * l, Qt::Alignment alignment ) + // PO p QLayout, N n Qt::Alignment + RETURN Qt_QLayout_setAlignment_2( ::pPtr, ... ) + // bool setAlignment ( QWidget * w, Qt::Alignment alignment ) + // PO p QWidget, N n Qt::Alignment + // RETURN Qt_QLayout_setAlignment( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setAlignment ( Qt::Alignment alignment ) + // N n Qt::Alignment + RETURN Qt_QLayout_setAlignment_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QLayout:setContentsMargins( nLeft, nTop, nRight, nBottom ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQLinearGradient.prg b/harbour/contrib/hbqt/qtgui/g/TQLinearGradient.prg index 170ff7985e..b670672c84 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQLinearGradient.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQLinearGradient.prg @@ -72,10 +72,8 @@ CREATE CLASS QLinearGradient INHERIT HbQtObjectHandler, HB_QGradient FUNCTION HB METHOD new( ... ) METHOD finalStop() - METHOD setFinalStop( pStop ) - METHOD setFinalStop_1( nX, nY ) - METHOD setStart( pStart ) - METHOD setStart_1( nX, nY ) + METHOD setFinalStop( ... ) + METHOD setStart( ... ) METHOD start() ENDCLASS @@ -94,20 +92,58 @@ METHOD QLinearGradient:finalStop() RETURN Qt_QLinearGradient_finalStop( ::pPtr ) -METHOD QLinearGradient:setFinalStop( pStop ) - RETURN Qt_QLinearGradient_setFinalStop( ::pPtr, hbqt_ptr( pStop ) ) +METHOD QLinearGradient:setFinalStop( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setFinalStop ( qreal x, qreal y ) + // N n qreal, N n qreal + RETURN Qt_QLinearGradient_setFinalStop_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setFinalStop ( const QPointF & stop ) + // PO p QPointF + RETURN Qt_QLinearGradient_setFinalStop( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QLinearGradient:setFinalStop_1( nX, nY ) - RETURN Qt_QLinearGradient_setFinalStop_1( ::pPtr, nX, nY ) - - -METHOD QLinearGradient:setStart( pStart ) - RETURN Qt_QLinearGradient_setStart( ::pPtr, hbqt_ptr( pStart ) ) - - -METHOD QLinearGradient:setStart_1( nX, nY ) - RETURN Qt_QLinearGradient_setStart_1( ::pPtr, nX, nY ) +METHOD QLinearGradient:setStart( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setStart ( qreal x, qreal y ) + // N n qreal, N n qreal + RETURN Qt_QLinearGradient_setStart_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setStart ( const QPointF & start ) + // PO p QPointF + RETURN Qt_QLinearGradient_setStart( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QLinearGradient:start() diff --git a/harbour/contrib/hbqt/qtgui/g/TQListWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQListWidget.prg index 6ddb81ce47..e02cc73d58 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQListWidget.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQListWidget.prg @@ -71,8 +71,7 @@ CREATE CLASS QListWidget INHERIT HbQtObjectHandler, HB_QListView FUNCTION HB_QLi METHOD new( ... ) - METHOD addItem( cLabel ) - METHOD addItem_1( pItem ) + METHOD addItem( ... ) METHOD addItems( pLabels ) METHOD closePersistentEditor( pItem ) METHOD count() @@ -80,22 +79,18 @@ CREATE CLASS QListWidget INHERIT HbQtObjectHandler, HB_QListView FUNCTION HB_QLi METHOD currentRow() METHOD editItem( pItem ) METHOD findItems( cText, nFlags ) - METHOD insertItem( nRow, pItem ) - METHOD insertItem_1( nRow, cLabel ) + METHOD insertItem( ... ) METHOD insertItems( nRow, pLabels ) METHOD isSortingEnabled() METHOD item( nRow ) - METHOD itemAt( pP ) - METHOD itemAt_1( nX, nY ) + METHOD itemAt( ... ) METHOD itemWidget( pItem ) METHOD openPersistentEditor( pItem ) METHOD removeItemWidget( pItem ) METHOD row( pItem ) METHOD selectedItems() - METHOD setCurrentItem( pItem ) - METHOD setCurrentItem_1( pItem, nCommand ) - METHOD setCurrentRow( nRow ) - METHOD setCurrentRow_1( nRow, nCommand ) + METHOD setCurrentItem( ... ) + METHOD setCurrentRow( ... ) METHOD setItemWidget( pItem, pWidget ) METHOD setSortingEnabled( lEnable ) METHOD sortItems( nOrder ) @@ -116,12 +111,28 @@ METHOD QListWidget:new( ... ) RETURN Self -METHOD QListWidget:addItem( cLabel ) - RETURN Qt_QListWidget_addItem( ::pPtr, cLabel ) - - -METHOD QListWidget:addItem_1( pItem ) - RETURN Qt_QListWidget_addItem_1( ::pPtr, hbqt_ptr( pItem ) ) +METHOD QListWidget:addItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // void addItem ( const QString & label ) + // C c QString + RETURN Qt_QListWidget_addItem( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // void addItem ( QListWidgetItem * item ) [*D=1*] + // PO p QListWidgetItem + RETURN Qt_QListWidget_addItem_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QListWidget:addItems( pLabels ) @@ -152,12 +163,28 @@ METHOD QListWidget:findItems( cText, nFlags ) RETURN Qt_QListWidget_findItems( ::pPtr, cText, nFlags ) -METHOD QListWidget:insertItem( nRow, pItem ) - RETURN Qt_QListWidget_insertItem( ::pPtr, nRow, hbqt_ptr( pItem ) ) - - -METHOD QListWidget:insertItem_1( nRow, cLabel ) - RETURN Qt_QListWidget_insertItem_1( ::pPtr, nRow, cLabel ) +METHOD QListWidget:insertItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "C" + // void insertItem ( int row, const QString & label ) + // N n int, C c QString + RETURN Qt_QListWidget_insertItem_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // void insertItem ( int row, QListWidgetItem * item ) [*D=2*] + // N n int, PO p QListWidgetItem + RETURN Qt_QListWidget_insertItem( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QListWidget:insertItems( nRow, pLabels ) @@ -172,12 +199,31 @@ METHOD QListWidget:item( nRow ) RETURN Qt_QListWidget_item( ::pPtr, nRow ) -METHOD QListWidget:itemAt( pP ) - RETURN Qt_QListWidget_itemAt( ::pPtr, hbqt_ptr( pP ) ) - - -METHOD QListWidget:itemAt_1( nX, nY ) - RETURN Qt_QListWidget_itemAt_1( ::pPtr, nX, nY ) +METHOD QListWidget:itemAt( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QListWidgetItem * itemAt ( int x, int y ) const + // N n int, N n int + RETURN QListWidgetItem():from( Qt_QListWidget_itemAt_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QListWidgetItem * itemAt ( const QPoint & p ) const + // PO p QPoint + RETURN QListWidgetItem():from( Qt_QListWidget_itemAt( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QListWidget:itemWidget( pItem ) @@ -200,20 +246,58 @@ METHOD QListWidget:selectedItems() RETURN Qt_QListWidget_selectedItems( ::pPtr ) -METHOD QListWidget:setCurrentItem( pItem ) - RETURN Qt_QListWidget_setCurrentItem( ::pPtr, hbqt_ptr( pItem ) ) +METHOD QListWidget:setCurrentItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void setCurrentItem ( QListWidgetItem * item, QItemSelectionModel::SelectionFlags command ) + // PO p QListWidgetItem, N n QItemSelectionModel::SelectionFlags + RETURN Qt_QListWidget_setCurrentItem_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setCurrentItem ( QListWidgetItem * item ) + // PO p QListWidgetItem + RETURN Qt_QListWidget_setCurrentItem( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QListWidget:setCurrentItem_1( pItem, nCommand ) - RETURN Qt_QListWidget_setCurrentItem_1( ::pPtr, hbqt_ptr( pItem ), nCommand ) - - -METHOD QListWidget:setCurrentRow( nRow ) - RETURN Qt_QListWidget_setCurrentRow( ::pPtr, nRow ) - - -METHOD QListWidget:setCurrentRow_1( nRow, nCommand ) - RETURN Qt_QListWidget_setCurrentRow_1( ::pPtr, nRow, nCommand ) +METHOD QListWidget:setCurrentRow( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setCurrentRow ( int row, QItemSelectionModel::SelectionFlags command ) + // N n int, N n QItemSelectionModel::SelectionFlags + RETURN Qt_QListWidget_setCurrentRow_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setCurrentRow ( int row ) + // N n int + RETURN Qt_QListWidget_setCurrentRow( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QListWidget:setItemWidget( pItem, pWidget ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQMainWindow.prg b/harbour/contrib/hbqt/qtgui/g/TQMainWindow.prg index e3245baa8c..d6cb4892be 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQMainWindow.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQMainWindow.prg @@ -131,19 +131,61 @@ METHOD QMainWindow:new( ... ) METHOD QMainWindow:addDockWidget( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QMainWindow_addDockWidget( ::pPtr, ... ) + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orientation orientation ) + // N n Qt::DockWidgetArea, PO p QDockWidget, N n Qt::Orientation + RETURN Qt_QMainWindow_addDockWidget_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) + // N n Qt::DockWidgetArea, PO p QDockWidget + RETURN Qt_QMainWindow_addDockWidget( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QMainWindow:addToolBar( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QMainWindow_addToolBar( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // void addToolBar ( Qt::ToolBarArea area, QToolBar * toolbar ) + // N n Qt::ToolBarArea, PO p QToolBar + RETURN Qt_QMainWindow_addToolBar( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QToolBar * addToolBar ( const QString & title ) // NOT implemented + // C c QString + RETURN QToolBar():from( Qt_QMainWindow_addToolBar_2( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // void addToolBar ( QToolBar * toolbar ) + // PO p QToolBar + RETURN Qt_QMainWindow_addToolBar_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QMainWindow:addToolBarBreak( nArea ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQMatrix.prg b/harbour/contrib/hbqt/qtgui/g/TQMatrix.prg index 4dc079e3c3..d4035a8418 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQMatrix.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQMatrix.prg @@ -81,18 +81,8 @@ CREATE CLASS QMatrix INHERIT HbQtObjectHandler FUNCTION HB_QMatrix METHOD inverted( lInvertible ) METHOD isIdentity() METHOD isInvertible() - METHOD map( nX, nY, nTx, nTy ) - METHOD map_1( nX, nY, nTx, nTy ) - METHOD map_2( pPoint ) - METHOD map_3( pPoint ) - METHOD map_4( pLine ) - METHOD map_5( pLine ) - METHOD map_6( pPolygon ) - METHOD map_7( pPolygon ) - METHOD map_8( pRegion ) - METHOD map_9( pPath ) - METHOD mapRect( pRectangle ) - METHOD mapRect_1( pRectangle ) + METHOD map( ... ) + METHOD mapRect( ... ) METHOD mapToPolygon( pRectangle ) METHOD reset() METHOD rotate( nDegrees ) @@ -153,52 +143,78 @@ METHOD QMatrix:isInvertible() RETURN Qt_QMatrix_isInvertible( ::pPtr ) -METHOD QMatrix:map( nX, nY, nTx, nTy ) - RETURN Qt_QMatrix_map( ::pPtr, nX, nY, nTx, nTy ) +METHOD QMatrix:map( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void map ( int x, int y, int * tx, int * ty ) const + // N n int, N n int, N @ int, N @ int + RETURN Qt_QMatrix_map_1( ::pPtr, ... ) + // void map ( qreal x, qreal y, qreal * tx, qreal * ty ) const + // N n qreal, N n qreal, N @ qreal, N @ qreal + // RETURN Qt_QMatrix_map( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPolygon map ( const QPolygon & polygon ) const + // PO p QPolygon + RETURN QPolygon():from( Qt_QMatrix_map_7( ::pPtr, ... ) ) + // QLine map ( const QLine & line ) const + // PO p QLine + // RETURN QLine():from( Qt_QMatrix_map_5( ::pPtr, ... ) ) + // QPoint map ( const QPoint & point ) const + // PO p QPoint + // RETURN QPoint():from( Qt_QMatrix_map_3( ::pPtr, ... ) ) + // QRegion map ( const QRegion & region ) const + // PO p QRegion + // RETURN QRegion():from( Qt_QMatrix_map_8( ::pPtr, ... ) ) + // QPointF map ( const QPointF & point ) const + // PO p QPointF + // RETURN QPointF():from( Qt_QMatrix_map_2( ::pPtr, ... ) ) + // QPolygonF map ( const QPolygonF & polygon ) const + // PO p QPolygonF + // RETURN QPolygonF():from( Qt_QMatrix_map_6( ::pPtr, ... ) ) + // QLineF map ( const QLineF & line ) const + // PO p QLineF + // RETURN QLineF():from( Qt_QMatrix_map_4( ::pPtr, ... ) ) + // QPainterPath map ( const QPainterPath & path ) const + // PO p QPainterPath + // RETURN QPainterPath():from( Qt_QMatrix_map_9( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QMatrix:map_1( nX, nY, nTx, nTy ) - RETURN Qt_QMatrix_map_1( ::pPtr, nX, nY, nTx, nTy ) - - -METHOD QMatrix:map_2( pPoint ) - RETURN Qt_QMatrix_map_2( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QMatrix:map_3( pPoint ) - RETURN Qt_QMatrix_map_3( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QMatrix:map_4( pLine ) - RETURN Qt_QMatrix_map_4( ::pPtr, hbqt_ptr( pLine ) ) - - -METHOD QMatrix:map_5( pLine ) - RETURN Qt_QMatrix_map_5( ::pPtr, hbqt_ptr( pLine ) ) - - -METHOD QMatrix:map_6( pPolygon ) - RETURN Qt_QMatrix_map_6( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QMatrix:map_7( pPolygon ) - RETURN Qt_QMatrix_map_7( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QMatrix:map_8( pRegion ) - RETURN Qt_QMatrix_map_8( ::pPtr, hbqt_ptr( pRegion ) ) - - -METHOD QMatrix:map_9( pPath ) - RETURN Qt_QMatrix_map_9( ::pPtr, hbqt_ptr( pPath ) ) - - -METHOD QMatrix:mapRect( pRectangle ) - RETURN Qt_QMatrix_mapRect( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QMatrix:mapRect_1( pRectangle ) - RETURN Qt_QMatrix_mapRect_1( ::pPtr, hbqt_ptr( pRectangle ) ) +METHOD QMatrix:mapRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRectF mapRect ( const QRectF & rectangle ) const + // PO p QRectF + RETURN QRectF():from( Qt_QMatrix_mapRect( ::pPtr, ... ) ) + // QRect mapRect ( const QRect & rectangle ) const + // PO p QRect + // RETURN QRect():from( Qt_QMatrix_mapRect_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QMatrix:mapToPolygon( pRectangle ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQMenu.prg b/harbour/contrib/hbqt/qtgui/g/TQMenu.prg index 5e0ccb75a1..8337e2cc1a 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQMenu.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQMenu.prg @@ -123,19 +123,90 @@ METHOD QMenu:activeAction() METHOD QMenu:addAction( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QMenu_addAction( ::pPtr, ... ) + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PCO" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "PO" .AND. aV[ 4 ] $ "PO" .AND. aV[ 5 ] $ "PO" + // QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) + // PCO p QIcon, C c QString, PO p QObject, PO p char, PO p QKeySequence + RETURN QAction():from( Qt_QMenu_addAction_3( ::pPtr, ... ) ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" .AND. aV[ 4 ] $ "PO" + // QAction * addAction ( const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) + // C c QString, PO p QObject, PO p char, PO p QKeySequence + RETURN QAction():from( Qt_QMenu_addAction_2( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PCO" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "PO" .AND. aV[ 4 ] $ "PO" + // QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) + // PCO p QIcon, C c QString, PO p QObject, PO p char, PO p QKeySequence + RETURN QAction():from( Qt_QMenu_addAction_3( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" + // QAction * addAction ( const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) + // C c QString, PO p QObject, PO p char, PO p QKeySequence + RETURN QAction():from( Qt_QMenu_addAction_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PCO" .AND. aV[ 2 ] $ "C" + // QAction * addAction ( const QIcon & icon, const QString & text ) + // PCO p QIcon, C c QString + RETURN QAction():from( Qt_QMenu_addAction_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QAction * addAction ( const QString & text ) + // C c QString + RETURN QAction():from( Qt_QMenu_addAction( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // void addAction ( QAction * action ) + // PO p QAction + RETURN Qt_QMenu_addAction_4( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QMenu:addMenu( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QMenu_addMenu( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PCO" .AND. aV[ 2 ] $ "C" + // QMenu * addMenu ( const QIcon & icon, const QString & title ) + // PCO p QIcon, C c QString + RETURN QMenu():from( Qt_QMenu_addMenu_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QMenu * addMenu ( const QString & title ) + // C c QString + RETURN QMenu():from( Qt_QMenu_addMenu_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // QAction * addMenu ( QMenu * menu ) + // PO p QMenu + RETURN QAction():from( Qt_QMenu_addMenu( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QMenu:addSeparator() @@ -151,11 +222,33 @@ METHOD QMenu:defaultAction() METHOD QMenu:exec( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QMenu_exec( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // QAction * exec ( const QPoint & p, QAction * action = 0 ) + // PO p QPoint, PO p QAction + RETURN QAction():from( Qt_QMenu_exec_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QAction * exec ( const QPoint & p, QAction * action = 0 ) + // PO p QPoint, PO p QAction + RETURN QAction():from( Qt_QMenu_exec_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QAction * exec () + RETURN QAction():from( Qt_QMenu_exec( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QMenu:hideTearOffMenu() diff --git a/harbour/contrib/hbqt/qtgui/g/TQMenuBar.prg b/harbour/contrib/hbqt/qtgui/g/TQMenuBar.prg index 1f117f957e..5b4b3353b2 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQMenuBar.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQMenuBar.prg @@ -72,12 +72,8 @@ CREATE CLASS QMenuBar INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QMenuBar METHOD new( ... ) METHOD activeAction() - METHOD addAction( cText ) - METHOD addAction_1( cText, pReceiver, pMember ) - METHOD addAction_2( pAction ) - METHOD addMenu( pMenu ) - METHOD addMenu_1( cTitle ) - METHOD addMenu_2( pIcon, cTitle ) + METHOD addAction( ... ) + METHOD addMenu( ... ) METHOD addSeparator() METHOD clear() METHOD insertMenu( pBefore, pMenu ) @@ -102,28 +98,66 @@ METHOD QMenuBar:activeAction() RETURN Qt_QMenuBar_activeAction( ::pPtr ) -METHOD QMenuBar:addAction( cText ) - RETURN Qt_QMenuBar_addAction( ::pPtr, cText ) +METHOD QMenuBar:addAction( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" + // QAction * addAction ( const QString & text, const QObject * receiver, const char * member ) + // C c QString, PO p QObject, PO p char + RETURN QAction():from( Qt_QMenuBar_addAction_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QAction * addAction ( const QString & text ) + // C c QString + RETURN QAction():from( Qt_QMenuBar_addAction( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // void addAction ( QAction * action ) + // PO p QAction + RETURN Qt_QMenuBar_addAction_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QMenuBar:addAction_1( cText, pReceiver, pMember ) - RETURN Qt_QMenuBar_addAction_1( ::pPtr, cText, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ) ) - - -METHOD QMenuBar:addAction_2( pAction ) - RETURN Qt_QMenuBar_addAction_2( ::pPtr, hbqt_ptr( pAction ) ) - - -METHOD QMenuBar:addMenu( pMenu ) - RETURN Qt_QMenuBar_addMenu( ::pPtr, hbqt_ptr( pMenu ) ) - - -METHOD QMenuBar:addMenu_1( cTitle ) - RETURN Qt_QMenuBar_addMenu_1( ::pPtr, cTitle ) - - -METHOD QMenuBar:addMenu_2( pIcon, cTitle ) - RETURN Qt_QMenuBar_addMenu_2( ::pPtr, hbqt_ptr( pIcon ), cTitle ) +METHOD QMenuBar:addMenu( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PCO" .AND. aV[ 2 ] $ "C" + // QMenu * addMenu ( const QIcon & icon, const QString & title ) + // PCO p QIcon, C c QString + RETURN QMenu():from( Qt_QMenuBar_addMenu_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QMenu * addMenu ( const QString & title ) + // C c QString + RETURN QMenu():from( Qt_QMenuBar_addMenu_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // QAction * addMenu ( QMenu * menu ) + // PO p QMenu + RETURN QAction():from( Qt_QMenuBar_addMenu( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QMenuBar:addSeparator() diff --git a/harbour/contrib/hbqt/qtgui/g/TQMessageBox.prg b/harbour/contrib/hbqt/qtgui/g/TQMessageBox.prg index b2f7a3c7a5..80298df8dd 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQMessageBox.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQMessageBox.prg @@ -71,9 +71,7 @@ CREATE CLASS QMessageBox INHERIT HbQtObjectHandler, HB_QDialog FUNCTION HB_QMess METHOD new( ... ) - METHOD addButton( pButton, nRole ) - METHOD addButton_1( cText, nRole ) - METHOD addButton_2( nButton ) + METHOD addButton( ... ) METHOD button( nWhich ) METHOD buttonRole( pButton ) METHOD buttons() @@ -86,11 +84,9 @@ CREATE CLASS QMessageBox INHERIT HbQtObjectHandler, HB_QDialog FUNCTION HB_QMess METHOD informativeText() METHOD open( pReceiver, pMember ) METHOD removeButton( pButton ) - METHOD setDefaultButton( pButton ) - METHOD setDefaultButton_1( nButton ) + METHOD setDefaultButton( ... ) METHOD setDetailedText( cText ) - METHOD setEscapeButton( pButton ) - METHOD setEscapeButton_1( nButton ) + METHOD setEscapeButton( ... ) METHOD setIcon( nIcon ) METHOD setIconPixmap( pPixmap ) METHOD setInformativeText( cText ) @@ -123,16 +119,35 @@ METHOD QMessageBox:new( ... ) RETURN Self -METHOD QMessageBox:addButton( pButton, nRole ) - RETURN Qt_QMessageBox_addButton( ::pPtr, hbqt_ptr( pButton ), nRole ) - - -METHOD QMessageBox:addButton_1( cText, nRole ) - RETURN Qt_QMessageBox_addButton_1( ::pPtr, cText, nRole ) - - -METHOD QMessageBox:addButton_2( nButton ) - RETURN Qt_QMessageBox_addButton_2( ::pPtr, nButton ) +METHOD QMessageBox:addButton( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // QPushButton * addButton ( const QString & text, ButtonRole role ) + // C c QString, N n QMessageBox::ButtonRole + RETURN QPushButton():from( Qt_QMessageBox_addButton_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void addButton ( QAbstractButton * button, ButtonRole role ) + // PO p QAbstractButton, N n QMessageBox::ButtonRole + RETURN Qt_QMessageBox_addButton( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QPushButton * addButton ( StandardButton button ) + // N n QMessageBox::StandardButton + RETURN QPushButton():from( Qt_QMessageBox_addButton_2( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QMessageBox:button( nWhich ) @@ -183,24 +198,56 @@ METHOD QMessageBox:removeButton( pButton ) RETURN Qt_QMessageBox_removeButton( ::pPtr, hbqt_ptr( pButton ) ) -METHOD QMessageBox:setDefaultButton( pButton ) - RETURN Qt_QMessageBox_setDefaultButton( ::pPtr, hbqt_ptr( pButton ) ) - - -METHOD QMessageBox:setDefaultButton_1( nButton ) - RETURN Qt_QMessageBox_setDefaultButton_1( ::pPtr, nButton ) +METHOD QMessageBox:setDefaultButton( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setDefaultButton ( StandardButton button ) + // N n QMessageBox::StandardButton + RETURN Qt_QMessageBox_setDefaultButton_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // void setDefaultButton ( QPushButton * button ) + // PO p QPushButton + RETURN Qt_QMessageBox_setDefaultButton( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QMessageBox:setDetailedText( cText ) RETURN Qt_QMessageBox_setDetailedText( ::pPtr, cText ) -METHOD QMessageBox:setEscapeButton( pButton ) - RETURN Qt_QMessageBox_setEscapeButton( ::pPtr, hbqt_ptr( pButton ) ) - - -METHOD QMessageBox:setEscapeButton_1( nButton ) - RETURN Qt_QMessageBox_setEscapeButton_1( ::pPtr, nButton ) +METHOD QMessageBox:setEscapeButton( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setEscapeButton ( StandardButton button ) + // N n QMessageBox::StandardButton + RETURN Qt_QMessageBox_setEscapeButton_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // void setEscapeButton ( QAbstractButton * button ) + // PO p QAbstractButton + RETURN Qt_QMessageBox_setEscapeButton( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QMessageBox:setIcon( nIcon ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQPaintEngine.prg b/harbour/contrib/hbqt/qtgui/g/TQPaintEngine.prg index 57fb61b19f..69dd23a44d 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPaintEngine.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPaintEngine.prg @@ -72,19 +72,14 @@ CREATE CLASS QPaintEngine INHERIT HbQtObjectHandler FUNCTION HB_QPaintEngine METHOD new( ... ) METHOD begin( pPdev ) - METHOD drawEllipse( pRect ) - METHOD drawEllipse_1( pRect ) + METHOD drawEllipse( ... ) METHOD drawImage( pRectangle, pImage, pSr, nFlags ) - METHOD drawLines( pLines, nLineCount ) - METHOD drawLines_1( pLines, nLineCount ) + METHOD drawLines( ... ) METHOD drawPath( pPath ) METHOD drawPixmap( pR, pPm, pSr ) - METHOD drawPoints( pPoints, nPointCount ) - METHOD drawPoints_1( pPoints, nPointCount ) - METHOD drawPolygon( pPoints, nPointCount, nMode ) - METHOD drawPolygon_1( pPoints, nPointCount, nMode ) - METHOD drawRects( pRects, nRectCount ) - METHOD drawRects_1( pRects, nRectCount ) + METHOD drawPoints( ... ) + METHOD drawPolygon( ... ) + METHOD drawRects( ... ) METHOD drawTextItem( pP, pTextItem ) METHOD drawTiledPixmap( pRect, pPixmap, pP ) METHOD end() @@ -111,24 +106,54 @@ METHOD QPaintEngine:begin( pPdev ) RETURN Qt_QPaintEngine_begin( ::pPtr, hbqt_ptr( pPdev ) ) -METHOD QPaintEngine:drawEllipse( pRect ) - RETURN Qt_QPaintEngine_drawEllipse( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QPaintEngine:drawEllipse_1( pRect ) - RETURN Qt_QPaintEngine_drawEllipse_1( ::pPtr, hbqt_ptr( pRect ) ) +METHOD QPaintEngine:drawEllipse( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // virtual void drawEllipse ( const QRectF & rect ) + // PO p QRectF + RETURN Qt_QPaintEngine_drawEllipse( ::pPtr, ... ) + // virtual void drawEllipse ( const QRect & rect ) + // PO p QRect + // RETURN Qt_QPaintEngine_drawEllipse_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPaintEngine:drawImage( pRectangle, pImage, pSr, nFlags ) RETURN Qt_QPaintEngine_drawImage( ::pPtr, hbqt_ptr( pRectangle ), hbqt_ptr( pImage ), hbqt_ptr( pSr ), nFlags ) -METHOD QPaintEngine:drawLines( pLines, nLineCount ) - RETURN Qt_QPaintEngine_drawLines( ::pPtr, hbqt_ptr( pLines ), nLineCount ) - - -METHOD QPaintEngine:drawLines_1( pLines, nLineCount ) - RETURN Qt_QPaintEngine_drawLines_1( ::pPtr, hbqt_ptr( pLines ), nLineCount ) +METHOD QPaintEngine:drawLines( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // virtual void drawLines ( const QLineF * lines, int lineCount ) + // PO p QLineF, N n int + RETURN Qt_QPaintEngine_drawLines( ::pPtr, ... ) + // virtual void drawLines ( const QLine * lines, int lineCount ) + // PO p QLine, N n int + // RETURN Qt_QPaintEngine_drawLines_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPaintEngine:drawPath( pPath ) @@ -139,28 +164,73 @@ METHOD QPaintEngine:drawPixmap( pR, pPm, pSr ) RETURN Qt_QPaintEngine_drawPixmap( ::pPtr, hbqt_ptr( pR ), hbqt_ptr( pPm ), hbqt_ptr( pSr ) ) -METHOD QPaintEngine:drawPoints( pPoints, nPointCount ) - RETURN Qt_QPaintEngine_drawPoints( ::pPtr, hbqt_ptr( pPoints ), nPointCount ) +METHOD QPaintEngine:drawPoints( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // virtual void drawPoints ( const QPointF * points, int pointCount ) + // PO p QPointF, N n int + RETURN Qt_QPaintEngine_drawPoints( ::pPtr, ... ) + // virtual void drawPoints ( const QPoint * points, int pointCount ) + // PO p QPoint, N n int + // RETURN Qt_QPaintEngine_drawPoints_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QPaintEngine:drawPoints_1( pPoints, nPointCount ) - RETURN Qt_QPaintEngine_drawPoints_1( ::pPtr, hbqt_ptr( pPoints ), nPointCount ) +METHOD QPaintEngine:drawPolygon( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // virtual void drawPolygon ( const QPointF * points, int pointCount, PolygonDrawMode mode ) + // PO p QPointF, N n int, N n QPaintEngine::PolygonDrawMode + RETURN Qt_QPaintEngine_drawPolygon( ::pPtr, ... ) + // virtual void drawPolygon ( const QPoint * points, int pointCount, PolygonDrawMode mode ) + // PO p QPoint, N n int, N n QPaintEngine::PolygonDrawMode + // RETURN Qt_QPaintEngine_drawPolygon_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QPaintEngine:drawPolygon( pPoints, nPointCount, nMode ) - RETURN Qt_QPaintEngine_drawPolygon( ::pPtr, hbqt_ptr( pPoints ), nPointCount, nMode ) - - -METHOD QPaintEngine:drawPolygon_1( pPoints, nPointCount, nMode ) - RETURN Qt_QPaintEngine_drawPolygon_1( ::pPtr, hbqt_ptr( pPoints ), nPointCount, nMode ) - - -METHOD QPaintEngine:drawRects( pRects, nRectCount ) - RETURN Qt_QPaintEngine_drawRects( ::pPtr, hbqt_ptr( pRects ), nRectCount ) - - -METHOD QPaintEngine:drawRects_1( pRects, nRectCount ) - RETURN Qt_QPaintEngine_drawRects_1( ::pPtr, hbqt_ptr( pRects ), nRectCount ) +METHOD QPaintEngine:drawRects( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // virtual void drawRects ( const QRectF * rects, int rectCount ) + // PO p QRectF, N n int + RETURN Qt_QPaintEngine_drawRects( ::pPtr, ... ) + // virtual void drawRects ( const QRect * rects, int rectCount ) + // PO p QRect, N n int + // RETURN Qt_QPaintEngine_drawRects_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPaintEngine:drawTextItem( pP, pTextItem ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQPainter.prg b/harbour/contrib/hbqt/qtgui/g/TQPainter.prg index d75fd7e86c..bed87f46f2 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPainter.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPainter.prg @@ -492,11 +492,27 @@ METHOD QPainter:setBackgroundMode( nMode ) METHOD QPainter:setBrush( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainter_setBrush( ::pPtr, ... ) + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setBrush ( Qt::BrushStyle style ) + // N n Qt::BrushStyle + RETURN Qt_QPainter_setBrush_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // void setBrush ( const QBrush & brush ) + // PO p QBrush + RETURN Qt_QPainter_setBrush( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainter:setBrushOrigin( ... ) @@ -568,19 +584,57 @@ METHOD QPainter:setViewTransformEnabled( lEnable ) METHOD QPainter:setViewport( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainter_setViewport( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void setViewport ( int x, int y, int width, int height ) + // N n int, N n int, N n int, N n int + RETURN Qt_QPainter_setViewport_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setViewport ( const QRect & rectangle ) + // PO p QRect + RETURN Qt_QPainter_setViewport( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainter:setWindow( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainter_setWindow( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void setWindow ( int x, int y, int width, int height ) + // N n int, N n int, N n int, N n int + RETURN Qt_QPainter_setWindow_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setWindow ( const QRect & rectangle ) + // PO p QRect + RETURN Qt_QPainter_setWindow( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainter:setWorldMatrix( pMatrix, lCombine ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQPainterPath.prg b/harbour/contrib/hbqt/qtgui/g/TQPainterPath.prg index af4eb48cef..8aac814369 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPainterPath.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPainterPath.prg @@ -104,13 +104,10 @@ CREATE CLASS QPainterPath INHERIT HbQtObjectHandler FUNCTION HB_QPainterPath METHOD simplified() METHOD slopeAtPercent( nT ) METHOD subtracted( pP ) - METHOD toFillPolygon( pMatrix ) - METHOD toFillPolygon_1( pMatrix ) - METHOD toFillPolygons( pMatrix ) - METHOD toFillPolygons_1( pMatrix ) + METHOD toFillPolygon( ... ) + METHOD toFillPolygons( ... ) METHOD toReversed() - METHOD toSubpathPolygons( pMatrix ) - METHOD toSubpathPolygons_1( pMatrix ) + METHOD toSubpathPolygons( ... ) METHOD united( pP ) ENDCLASS @@ -126,11 +123,37 @@ METHOD QPainterPath:new( ... ) METHOD QPainterPath:addEllipse( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainterPath_addEllipse( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void addEllipse ( qreal x, qreal y, qreal width, qreal height ) + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QPainterPath_addEllipse_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void addEllipse ( const QPointF & center, qreal rx, qreal ry ) + // PO p QPointF, N n qreal, N n qreal + RETURN Qt_QPainterPath_addEllipse_2( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void addEllipse ( const QRectF & boundingRectangle ) + // PO p QRectF + RETURN Qt_QPainterPath_addEllipse( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainterPath:addPath( pPath ) @@ -142,11 +165,30 @@ METHOD QPainterPath:addPolygon( pPolygon ) METHOD QPainterPath:addRect( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainterPath_addRect( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void addRect ( qreal x, qreal y, qreal width, qreal height ) + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QPainterPath_addRect_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void addRect ( const QRectF & rectangle ) + // PO p QRectF + RETURN Qt_QPainterPath_addRect( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainterPath:addRegion( pRegion ) @@ -154,19 +196,71 @@ METHOD QPainterPath:addRegion( pRegion ) METHOD QPainterPath:addRoundedRect( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainterPath_addRoundedRect( ::pPtr, ... ) + DO CASE + CASE nP == 7 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "N" .AND. aV[ 7 ] $ "N" + // void addRoundedRect ( qreal x, qreal y, qreal w, qreal h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n qreal, N n qreal, N n Qt::SizeMode + RETURN Qt_QPainterPath_addRoundedRect_1( ::pPtr, ... ) + ENDCASE + CASE nP == 6 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "N" + // void addRoundedRect ( qreal x, qreal y, qreal w, qreal h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n qreal, N n qreal, N n Qt::SizeMode + RETURN Qt_QPainterPath_addRoundedRect_1( ::pPtr, ... ) + ENDCASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void addRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + // PO p QRectF, N n qreal, N n qreal, N n Qt::SizeMode + RETURN Qt_QPainterPath_addRoundedRect( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void addRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + // PO p QRectF, N n qreal, N n qreal, N n Qt::SizeMode + RETURN Qt_QPainterPath_addRoundedRect( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainterPath:addText( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainterPath_addText( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "PO" .AND. aV[ 4 ] $ "C" + // void addText ( qreal x, qreal y, const QFont & font, const QString & text ) + // N n qreal, N n qreal, PO p QFont, C c QString + RETURN Qt_QPainterPath_addText_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "C" + // void addText ( const QPointF & point, const QFont & font, const QString & text ) + // PO p QPointF, PO p QFont, C c QString + RETURN Qt_QPainterPath_addText( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainterPath:angleAtPercent( nT ) @@ -174,19 +268,57 @@ METHOD QPainterPath:angleAtPercent( nT ) METHOD QPainterPath:arcMoveTo( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainterPath_arcMoveTo( ::pPtr, ... ) + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // void arcMoveTo ( qreal x, qreal y, qreal width, qreal height, qreal angle ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QPainterPath_arcMoveTo_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void arcMoveTo ( const QRectF & rectangle, qreal angle ) + // PO p QRectF, N n qreal + RETURN Qt_QPainterPath_arcMoveTo( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainterPath:arcTo( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainterPath_arcTo( ::pPtr, ... ) + DO CASE + CASE nP == 6 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "N" + // void arcTo ( qreal x, qreal y, qreal width, qreal height, qreal startAngle, qreal sweepLength ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QPainterPath_arcTo_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void arcTo ( const QRectF & rectangle, qreal startAngle, qreal sweepLength ) + // PO p QRectF, N n qreal, N n qreal + RETURN Qt_QPainterPath_arcTo( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainterPath:boundingRect() @@ -214,11 +346,30 @@ METHOD QPainterPath:controlPointRect() METHOD QPainterPath:cubicTo( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainterPath_cubicTo( ::pPtr, ... ) + DO CASE + CASE nP == 6 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" .AND. aV[ 6 ] $ "N" + // void cubicTo ( qreal c1X, qreal c1Y, qreal c2X, qreal c2Y, qreal endPointX, qreal endPointY ) + // N n qreal, N n qreal, N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QPainterPath_cubicTo_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" + // void cubicTo ( const QPointF & c1, const QPointF & c2, const QPointF & endPoint ) + // PO p QPointF, PO p QPointF, PO p QPointF + RETURN Qt_QPainterPath_cubicTo( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainterPath:currentPosition() @@ -254,19 +405,57 @@ METHOD QPainterPath:length() METHOD QPainterPath:lineTo( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainterPath_lineTo( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void lineTo ( qreal x, qreal y ) + // N n qreal, N n qreal + RETURN Qt_QPainterPath_lineTo_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void lineTo ( const QPointF & endPoint ) + // PO p QPointF + RETURN Qt_QPainterPath_lineTo( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainterPath:moveTo( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainterPath_moveTo( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void moveTo ( qreal x, qreal y ) + // N n qreal, N n qreal + RETURN Qt_QPainterPath_moveTo_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void moveTo ( const QPointF & point ) + // PO p QPointF + RETURN Qt_QPainterPath_moveTo( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainterPath:percentAtLength( nLen ) @@ -278,11 +467,30 @@ METHOD QPainterPath:pointAtPercent( nT ) METHOD QPainterPath:quadTo( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPainterPath_quadTo( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void quadTo ( qreal cx, qreal cy, qreal endPointX, qreal endPointY ) + // N n qreal, N n qreal, N n qreal, N n qreal + RETURN Qt_QPainterPath_quadTo_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // void quadTo ( const QPointF & c, const QPointF & endPoint ) + // PO p QPointF, PO p QPointF + RETURN Qt_QPainterPath_quadTo( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPainterPath:setElementPositionAt( nIndex, nX, nY ) @@ -305,32 +513,89 @@ METHOD QPainterPath:subtracted( pP ) RETURN Qt_QPainterPath_subtracted( ::pPtr, hbqt_ptr( pP ) ) -METHOD QPainterPath:toFillPolygon( pMatrix ) - RETURN Qt_QPainterPath_toFillPolygon( ::pPtr, hbqt_ptr( pMatrix ) ) +METHOD QPainterPath:toFillPolygon( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPolygonF toFillPolygon ( const QTransform & matrix ) const + // PO p QTransform + RETURN QPolygonF():from( Qt_QPainterPath_toFillPolygon( ::pPtr, ... ) ) + // QPolygonF toFillPolygon ( const QMatrix & matrix = QMatrix() ) const + // PO p QMatrix + // RETURN QPolygonF():from( Qt_QPainterPath_toFillPolygon_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QPolygonF toFillPolygon ( const QMatrix & matrix = QMatrix() ) const + // PO p QMatrix + RETURN QPolygonF():from( Qt_QPainterPath_toFillPolygon_1( ::pPtr, ... ) ) + ENDCASE + RETURN NIL -METHOD QPainterPath:toFillPolygon_1( pMatrix ) - RETURN Qt_QPainterPath_toFillPolygon_1( ::pPtr, hbqt_ptr( pMatrix ) ) - - -METHOD QPainterPath:toFillPolygons( pMatrix ) - RETURN Qt_QPainterPath_toFillPolygons( ::pPtr, hbqt_ptr( pMatrix ) ) - - -METHOD QPainterPath:toFillPolygons_1( pMatrix ) - RETURN Qt_QPainterPath_toFillPolygons_1( ::pPtr, hbqt_ptr( pMatrix ) ) +METHOD QPainterPath:toFillPolygons( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QList toFillPolygons ( const QTransform & matrix ) const + // PO p QTransform + RETURN Qt_QPainterPath_toFillPolygons( ::pPtr, ... ) + // QList toFillPolygons ( const QMatrix & matrix = QMatrix() ) const + // PO p QMatrix + // RETURN Qt_QPainterPath_toFillPolygons_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // QList toFillPolygons ( const QMatrix & matrix = QMatrix() ) const + // PO p QMatrix + RETURN Qt_QPainterPath_toFillPolygons_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QPainterPath:toReversed() RETURN Qt_QPainterPath_toReversed( ::pPtr ) -METHOD QPainterPath:toSubpathPolygons( pMatrix ) - RETURN Qt_QPainterPath_toSubpathPolygons( ::pPtr, hbqt_ptr( pMatrix ) ) - - -METHOD QPainterPath:toSubpathPolygons_1( pMatrix ) - RETURN Qt_QPainterPath_toSubpathPolygons_1( ::pPtr, hbqt_ptr( pMatrix ) ) +METHOD QPainterPath:toSubpathPolygons( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QList toSubpathPolygons ( const QTransform & matrix ) const + // PO p QTransform + RETURN Qt_QPainterPath_toSubpathPolygons( ::pPtr, ... ) + // QList toSubpathPolygons ( const QMatrix & matrix = QMatrix() ) const + // PO p QMatrix + // RETURN Qt_QPainterPath_toSubpathPolygons_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // QList toSubpathPolygons ( const QMatrix & matrix = QMatrix() ) const + // PO p QMatrix + RETURN Qt_QPainterPath_toSubpathPolygons_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QPainterPath:united( pP ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQPalette.prg b/harbour/contrib/hbqt/qtgui/g/TQPalette.prg index 7d06d2898d..ca7ebe0222 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPalette.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPalette.prg @@ -74,13 +74,11 @@ CREATE CLASS QPalette INHERIT HbQtObjectHandler FUNCTION HB_QPalette METHOD alternateBase() METHOD base() METHOD brightText() - METHOD brush( nGroup, nRole ) - METHOD brush_1( nRole ) + METHOD brush( ... ) METHOD button() METHOD buttonText() METHOD cacheKey() - METHOD color( nGroup, nRole ) - METHOD color_1( nRole ) + METHOD color( ... ) METHOD currentColorGroup() METHOD dark() METHOD highlight() @@ -94,10 +92,8 @@ CREATE CLASS QPalette INHERIT HbQtObjectHandler FUNCTION HB_QPalette METHOD mid() METHOD midlight() METHOD resolve( pOther ) - METHOD setBrush( nRole, pBrush ) - METHOD setBrush_1( nGroup, nRole, pBrush ) - METHOD setColor( nRole, pColor ) - METHOD setColor_1( nGroup, nRole, pColor ) + METHOD setBrush( ... ) + METHOD setColor( ... ) METHOD setColorGroup( nCg, pWindowText, pButton, pLight, pDark, pMid, pText, pBright_text, pBase, pWindow ) METHOD setCurrentColorGroup( nCg ) METHOD shadow() @@ -131,12 +127,31 @@ METHOD QPalette:brightText() RETURN Qt_QPalette_brightText( ::pPtr ) -METHOD QPalette:brush( nGroup, nRole ) - RETURN Qt_QPalette_brush( ::pPtr, nGroup, nRole ) - - -METHOD QPalette:brush_1( nRole ) - RETURN Qt_QPalette_brush_1( ::pPtr, nRole ) +METHOD QPalette:brush( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // const QBrush & brush ( ColorGroup group, ColorRole role ) const + // N n QPalette::ColorGroup, N n QPalette::ColorRole + RETURN QBrush():from( Qt_QPalette_brush( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // const QBrush & brush ( ColorRole role ) const + // N n QPalette::ColorRole + RETURN QBrush():from( Qt_QPalette_brush_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPalette:button() @@ -151,12 +166,31 @@ METHOD QPalette:cacheKey() RETURN Qt_QPalette_cacheKey( ::pPtr ) -METHOD QPalette:color( nGroup, nRole ) - RETURN Qt_QPalette_color( ::pPtr, nGroup, nRole ) - - -METHOD QPalette:color_1( nRole ) - RETURN Qt_QPalette_color_1( ::pPtr, nRole ) +METHOD QPalette:color( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // const QColor & color ( ColorGroup group, ColorRole role ) const + // N n QPalette::ColorGroup, N n QPalette::ColorRole + RETURN QColor():from( Qt_QPalette_color( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // const QColor & color ( ColorRole role ) const + // N n QPalette::ColorRole + RETURN QColor():from( Qt_QPalette_color_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPalette:currentColorGroup() @@ -211,20 +245,58 @@ METHOD QPalette:resolve( pOther ) RETURN Qt_QPalette_resolve( ::pPtr, hbqt_ptr( pOther ) ) -METHOD QPalette:setBrush( nRole, pBrush ) - RETURN Qt_QPalette_setBrush( ::pPtr, nRole, hbqt_ptr( pBrush ) ) +METHOD QPalette:setBrush( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "PO" + // void setBrush ( ColorGroup group, ColorRole role, const QBrush & brush ) + // N n QPalette::ColorGroup, N n QPalette::ColorRole, PO p QBrush + RETURN Qt_QPalette_setBrush_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // void setBrush ( ColorRole role, const QBrush & brush ) + // N n QPalette::ColorRole, PO p QBrush + RETURN Qt_QPalette_setBrush( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QPalette:setBrush_1( nGroup, nRole, pBrush ) - RETURN Qt_QPalette_setBrush_1( ::pPtr, nGroup, nRole, hbqt_ptr( pBrush ) ) - - -METHOD QPalette:setColor( nRole, pColor ) - RETURN Qt_QPalette_setColor( ::pPtr, nRole, hbqt_ptr( pColor ) ) - - -METHOD QPalette:setColor_1( nGroup, nRole, pColor ) - RETURN Qt_QPalette_setColor_1( ::pPtr, nGroup, nRole, hbqt_ptr( pColor ) ) +METHOD QPalette:setColor( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "PO" + // void setColor ( ColorGroup group, ColorRole role, const QColor & color ) + // N n QPalette::ColorGroup, N n QPalette::ColorRole, PO p QColor + RETURN Qt_QPalette_setColor_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // void setColor ( ColorRole role, const QColor & color ) + // N n QPalette::ColorRole, PO p QColor + RETURN Qt_QPalette_setColor( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPalette:setColorGroup( nCg, pWindowText, pButton, pLight, pDark, pMid, pText, pBright_text, pBase, pWindow ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQPicture.prg b/harbour/contrib/hbqt/qtgui/g/TQPicture.prg index c97df23838..e6e78a0048 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPicture.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPicture.prg @@ -74,11 +74,9 @@ CREATE CLASS QPicture INHERIT HbQtObjectHandler, HB_QPaintDevice FUNCTION HB_QPi METHOD boundingRect() METHOD data() METHOD isNull() - METHOD load( cFileName, pFormat ) - METHOD load_1( pDev, pFormat ) + METHOD load( ... ) METHOD play( pPainter ) - METHOD save( cFileName, pFormat ) - METHOD save_1( pDev, pFormat ) + METHOD save( ... ) METHOD setBoundingRect( pR ) METHOD setData( pData, nSize ) METHOD size() @@ -107,24 +105,78 @@ METHOD QPicture:isNull() RETURN Qt_QPicture_isNull( ::pPtr ) -METHOD QPicture:load( cFileName, pFormat ) - RETURN Qt_QPicture_load( ::pPtr, cFileName, hbqt_ptr( pFormat ) ) - - -METHOD QPicture:load_1( pDev, pFormat ) - RETURN Qt_QPicture_load_1( ::pPtr, hbqt_ptr( pDev ), hbqt_ptr( pFormat ) ) +METHOD QPicture:load( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // bool load ( const QString & fileName, const char * format = 0 ) + // C c QString, PO p char + RETURN Qt_QPicture_load( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // bool load ( QIODevice * dev, const char * format = 0 ) + // PO p QIODevice, PO p char + RETURN Qt_QPicture_load_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool load ( const QString & fileName, const char * format = 0 ) + // C c QString, PO p char + RETURN Qt_QPicture_load( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // bool load ( QIODevice * dev, const char * format = 0 ) + // PO p QIODevice, PO p char + RETURN Qt_QPicture_load_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPicture:play( pPainter ) RETURN Qt_QPicture_play( ::pPtr, hbqt_ptr( pPainter ) ) -METHOD QPicture:save( cFileName, pFormat ) - RETURN Qt_QPicture_save( ::pPtr, cFileName, hbqt_ptr( pFormat ) ) - - -METHOD QPicture:save_1( pDev, pFormat ) - RETURN Qt_QPicture_save_1( ::pPtr, hbqt_ptr( pDev ), hbqt_ptr( pFormat ) ) +METHOD QPicture:save( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // bool save ( const QString & fileName, const char * format = 0 ) + // C c QString, PO p char + RETURN Qt_QPicture_save( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // bool save ( QIODevice * dev, const char * format = 0 ) + // PO p QIODevice, PO p char + RETURN Qt_QPicture_save_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool save ( const QString & fileName, const char * format = 0 ) + // C c QString, PO p char + RETURN Qt_QPicture_save( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // bool save ( QIODevice * dev, const char * format = 0 ) + // PO p QIODevice, PO p char + RETURN Qt_QPicture_save_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPicture:setBoundingRect( pR ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQPixmap.prg b/harbour/contrib/hbqt/qtgui/g/TQPixmap.prg index 0f83668306..8d22574493 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPixmap.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPixmap.prg @@ -101,8 +101,7 @@ CREATE CLASS QPixmap INHERIT HbQtObjectHandler, HB_QPaintDevice FUNCTION HB_QPix METHOD defaultDepth() METHOD fromImage( pImage, nFlags ) METHOD grabWidget( ... ) - METHOD trueMatrix( pMatrix, nWidth, nHeight ) - METHOD trueMatrix_1( pM, nW, nH ) + METHOD trueMatrix( ... ) ENDCLASS @@ -125,11 +124,34 @@ METHOD QPixmap:cacheKey() METHOD QPixmap:copy( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPixmap_copy( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QPixmap copy ( int x, int y, int width, int height ) const + // N n int, N n int, N n int, N n int + RETURN QPixmap():from( Qt_QPixmap_copy_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPixmap copy ( const QRect & rectangle = QRect() ) const + // PO p QRect + RETURN QPixmap():from( Qt_QPixmap_copy( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QPixmap copy ( const QRect & rectangle = QRect() ) const + // PO p QRect + RETURN QPixmap():from( Qt_QPixmap_copy( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QPixmap:createHeuristicMask( lClipTight ) @@ -137,11 +159,30 @@ METHOD QPixmap:createHeuristicMask( lClipTight ) METHOD QPixmap:createMaskFromColor( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPixmap_createMaskFromColor( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // QBitmap createMaskFromColor ( const QColor & maskColor, Qt::MaskMode mode ) const + // PO p QColor, N n Qt::MaskMode + RETURN QBitmap():from( Qt_QPixmap_createMaskFromColor( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QBitmap createMaskFromColor ( const QColor & maskColor ) const + // PO p QColor + RETURN QBitmap():from( Qt_QPixmap_createMaskFromColor_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPixmap:depth() @@ -153,11 +194,41 @@ METHOD QPixmap:detach() METHOD QPixmap:fill( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPixmap_fill( ::pPtr, ... ) + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void fill ( const QWidget * widget, int x, int y ) + // PO p QWidget, N n int, N n int + RETURN Qt_QPixmap_fill_2( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // void fill ( const QWidget * widget, const QPoint & offset ) + // PO p QWidget, PO p QPoint + RETURN Qt_QPixmap_fill_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void fill ( const QColor & color = Qt::white ) + // PO p QColor + RETURN Qt_QPixmap_fill( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void fill ( const QColor & color = Qt::white ) + // PO p QColor + RETURN Qt_QPixmap_fill( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QPixmap:hasAlpha() @@ -197,19 +268,79 @@ METHOD QPixmap:rect() METHOD QPixmap:save( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPixmap_save( ::pPtr, ... ) + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const + // C c QString, PO p char, N n int + RETURN Qt_QPixmap_save( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const + // PO p QIODevice, PO p char, N n int + RETURN Qt_QPixmap_save_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const + // C c QString, PO p char, N n int + RETURN Qt_QPixmap_save( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const + // PO p QIODevice, PO p char, N n int + RETURN Qt_QPixmap_save_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPixmap:scaled( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPixmap_scaled( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // QPixmap scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + // N n int, N n int, N n Qt::AspectRatioMode, N n Qt::TransformationMode + RETURN QPixmap():from( Qt_QPixmap_scaled( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // QPixmap scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + // PO p QSize, N n Qt::AspectRatioMode, N n Qt::TransformationMode + RETURN QPixmap():from( Qt_QPixmap_scaled_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QPixmap scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + // N n int, N n int, N n Qt::AspectRatioMode, N n Qt::TransformationMode + RETURN QPixmap():from( Qt_QPixmap_scaled( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPixmap scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + // PO p QSize, N n Qt::AspectRatioMode, N n Qt::TransformationMode + RETURN QPixmap():from( Qt_QPixmap_scaled_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPixmap:scaledToHeight( nHeight, nMode ) @@ -257,17 +388,58 @@ METHOD QPixmap:fromImage( pImage, nFlags ) METHOD QPixmap:grabWidget( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QPixmap_grabWidget( ::pPtr, ... ) + DO CASE + CASE nP == 5 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" .AND. aV[ 5 ] $ "N" + // QPixmap grabWidget ( QWidget * widget, int x = 0, int y = 0, int width = -1, int height = -1 ) + // PO p QWidget, N n int, N n int, N n int, N n int + RETURN QPixmap():from( Qt_QPixmap_grabWidget_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // QPixmap grabWidget ( QWidget * widget, const QRect & rectangle ) + // PO p QWidget, PO p QRect + RETURN QPixmap():from( Qt_QPixmap_grabWidget( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPixmap grabWidget ( QWidget * widget, int x = 0, int y = 0, int width = -1, int height = -1 ) + // PO p QWidget, N n int, N n int, N n int, N n int + RETURN QPixmap():from( Qt_QPixmap_grabWidget_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QPixmap:trueMatrix( pMatrix, nWidth, nHeight ) - RETURN Qt_QPixmap_trueMatrix( ::pPtr, hbqt_ptr( pMatrix ), nWidth, nHeight ) - - -METHOD QPixmap:trueMatrix_1( pM, nW, nH ) - RETURN Qt_QPixmap_trueMatrix_1( ::pPtr, hbqt_ptr( pM ), nW, nH ) +METHOD QPixmap:trueMatrix( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // QTransform trueMatrix ( const QTransform & matrix, int width, int height ) + // PO p QTransform, N n int, N n int + RETURN QTransform():from( Qt_QPixmap_trueMatrix( ::pPtr, ... ) ) + // QMatrix trueMatrix ( const QMatrix & m, int w, int h ) + // PO p QMatrix, N n int, N n int + // RETURN QMatrix():from( Qt_QPixmap_trueMatrix_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtgui/g/TQPlainTextEdit.prg b/harbour/contrib/hbqt/qtgui/g/TQPlainTextEdit.prg index 132f7a2414..a685568c80 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPlainTextEdit.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPlainTextEdit.prg @@ -78,8 +78,7 @@ CREATE CLASS QPlainTextEdit INHERIT HbQtObjectHandler, HB_QAbstractScrollArea FU METHOD createStandardContextMenu() METHOD currentCharFormat() METHOD cursorForPosition( pPos ) - METHOD cursorRect( pCursor ) - METHOD cursorRect_1() + METHOD cursorRect( ... ) METHOD cursorWidth() METHOD document() METHOD documentTitle() @@ -169,12 +168,27 @@ METHOD QPlainTextEdit:cursorForPosition( pPos ) RETURN Qt_QPlainTextEdit_cursorForPosition( ::pPtr, hbqt_ptr( pPos ) ) -METHOD QPlainTextEdit:cursorRect( pCursor ) - RETURN Qt_QPlainTextEdit_cursorRect( ::pPtr, hbqt_ptr( pCursor ) ) - - -METHOD QPlainTextEdit:cursorRect_1() - RETURN Qt_QPlainTextEdit_cursorRect_1( ::pPtr ) +METHOD QPlainTextEdit:cursorRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRect cursorRect ( const QTextCursor & cursor ) const + // PO p QTextCursor + RETURN QRect():from( Qt_QPlainTextEdit_cursorRect( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QRect cursorRect () const + RETURN QRect():from( Qt_QPlainTextEdit_cursorRect_1( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QPlainTextEdit:cursorWidth() diff --git a/harbour/contrib/hbqt/qtgui/g/TQPolygon.prg b/harbour/contrib/hbqt/qtgui/g/TQPolygon.prg index b0f08a87c7..3d9f30661d 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPolygon.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPolygon.prg @@ -74,15 +74,12 @@ CREATE CLASS QPolygon INHERIT HbQtObjectHandler FUNCTION HB_QPolygon METHOD boundingRect() METHOD containsPoint( pPoint, nFillRule ) METHOD intersected( pR ) - METHOD point( nIndex, nX, nY ) - METHOD point_1( nIndex ) + METHOD point( ... ) METHOD putPoints( nIndex, nNPoints, pFromPolygon, nFromIndex ) - METHOD setPoint( nIndex, nX, nY ) - METHOD setPoint_1( nIndex, pPoint ) + METHOD setPoint( ... ) METHOD setPoints( nNPoints, nPoints ) METHOD subtracted( pR ) - METHOD translate( nDx, nDy ) - METHOD translate_1( pOffset ) + METHOD translate( ... ) METHOD united( pR ) ENDCLASS @@ -109,24 +106,62 @@ METHOD QPolygon:intersected( pR ) RETURN Qt_QPolygon_intersected( ::pPtr, hbqt_ptr( pR ) ) -METHOD QPolygon:point( nIndex, nX, nY ) - RETURN Qt_QPolygon_point( ::pPtr, nIndex, nX, nY ) - - -METHOD QPolygon:point_1( nIndex ) - RETURN Qt_QPolygon_point_1( ::pPtr, nIndex ) +METHOD QPolygon:point( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void point ( int index, int * x, int * y ) const + // N n int, N @ int, N @ int + RETURN Qt_QPolygon_point( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QPoint point ( int index ) const + // N n int + RETURN QPoint():from( Qt_QPolygon_point_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPolygon:putPoints( nIndex, nNPoints, pFromPolygon, nFromIndex ) RETURN Qt_QPolygon_putPoints( ::pPtr, nIndex, nNPoints, hbqt_ptr( pFromPolygon ), nFromIndex ) -METHOD QPolygon:setPoint( nIndex, nX, nY ) - RETURN Qt_QPolygon_setPoint( ::pPtr, nIndex, nX, nY ) - - -METHOD QPolygon:setPoint_1( nIndex, pPoint ) - RETURN Qt_QPolygon_setPoint_1( ::pPtr, nIndex, hbqt_ptr( pPoint ) ) +METHOD QPolygon:setPoint( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void setPoint ( int index, int x, int y ) + // N n int, N n int, N n int + RETURN Qt_QPolygon_setPoint( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // void setPoint ( int index, const QPoint & point ) + // N n int, PO p QPoint + RETURN Qt_QPolygon_setPoint_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPolygon:setPoints( nNPoints, nPoints ) @@ -137,12 +172,31 @@ METHOD QPolygon:subtracted( pR ) RETURN Qt_QPolygon_subtracted( ::pPtr, hbqt_ptr( pR ) ) -METHOD QPolygon:translate( nDx, nDy ) - RETURN Qt_QPolygon_translate( ::pPtr, nDx, nDy ) - - -METHOD QPolygon:translate_1( pOffset ) - RETURN Qt_QPolygon_translate_1( ::pPtr, hbqt_ptr( pOffset ) ) +METHOD QPolygon:translate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void translate ( int dx, int dy ) + // N n int, N n int + RETURN Qt_QPolygon_translate( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void translate ( const QPoint & offset ) + // PO p QPoint + RETURN Qt_QPolygon_translate_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPolygon:united( pR ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQPolygonF.prg b/harbour/contrib/hbqt/qtgui/g/TQPolygonF.prg index 77f356c083..28ed5c8762 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPolygonF.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPolygonF.prg @@ -77,8 +77,7 @@ CREATE CLASS QPolygonF INHERIT HbQtObjectHandler FUNCTION HB_QPolygonF METHOD isClosed() METHOD subtracted( pR ) METHOD toPolygon() - METHOD translate( pOffset ) - METHOD translate_1( nDx, nDy ) + METHOD translate( ... ) METHOD united( pR ) ENDCLASS @@ -117,12 +116,31 @@ METHOD QPolygonF:toPolygon() RETURN Qt_QPolygonF_toPolygon( ::pPtr ) -METHOD QPolygonF:translate( pOffset ) - RETURN Qt_QPolygonF_translate( ::pPtr, hbqt_ptr( pOffset ) ) - - -METHOD QPolygonF:translate_1( nDx, nDy ) - RETURN Qt_QPolygonF_translate_1( ::pPtr, nDx, nDy ) +METHOD QPolygonF:translate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void translate ( qreal dx, qreal dy ) + // N n qreal, N n qreal + RETURN Qt_QPolygonF_translate_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void translate ( const QPointF & offset ) + // PO p QPointF + RETURN Qt_QPolygonF_translate( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPolygonF:united( pR ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQPrintDialog.prg b/harbour/contrib/hbqt/qtgui/g/TQPrintDialog.prg index bf2c7350c9..cfaf6acd03 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPrintDialog.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPrintDialog.prg @@ -75,7 +75,6 @@ CREATE CLASS QPrintDialog INHERIT HbQtObjectHandler, HB_QAbstractPrintDialog FUN METHOD open( pReceiver, pMember ) METHOD options() METHOD printer() - METHOD printer_1() METHOD setOption( nOption, lOn ) METHOD setOptions( nOptions ) METHOD setVisible( lVisible ) @@ -109,10 +108,6 @@ METHOD QPrintDialog:printer() RETURN Qt_QPrintDialog_printer( ::pPtr ) -METHOD QPrintDialog:printer_1() - RETURN Qt_QPrintDialog_printer_1( ::pPtr ) - - METHOD QPrintDialog:setOption( nOption, lOn ) RETURN Qt_QPrintDialog_setOption( ::pPtr, nOption, lOn ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQPrinter.prg b/harbour/contrib/hbqt/qtgui/g/TQPrinter.prg index bde360327d..cb57af5565 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPrinter.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPrinter.prg @@ -89,13 +89,10 @@ CREATE CLASS QPrinter INHERIT HbQtObjectHandler, HB_QPaintDevice FUNCTION HB_QPr METHOD outputFileName() METHOD outputFormat() METHOD pageOrder() - METHOD pageRect() - METHOD pageRect_1( nUnit ) + METHOD pageRect( ... ) METHOD paintEngine() - METHOD paperRect() - METHOD paperRect_1( nUnit ) - METHOD paperSize() - METHOD paperSize_1( nUnit ) + METHOD paperRect( ... ) + METHOD paperSize( ... ) METHOD paperSource() METHOD printEngine() METHOD printProgram() @@ -118,8 +115,7 @@ CREATE CLASS QPrinter INHERIT HbQtObjectHandler, HB_QPaintDevice FUNCTION HB_QPr METHOD setOutputFormat( nFormat ) METHOD setPageMargins( nLeft, nTop, nRight, nBottom, nUnit ) METHOD setPageOrder( nPageOrder ) - METHOD setPaperSize( nNewPaperSize ) - METHOD setPaperSize_1( pPaperSize, nUnit ) + METHOD setPaperSize( ... ) METHOD setPaperSource( nSource ) METHOD setPrintProgram( cPrintProg ) METHOD setPrintRange( nRange ) @@ -212,32 +208,77 @@ METHOD QPrinter:pageOrder() RETURN Qt_QPrinter_pageOrder( ::pPtr ) -METHOD QPrinter:pageRect() - RETURN Qt_QPrinter_pageRect( ::pPtr ) - - -METHOD QPrinter:pageRect_1( nUnit ) - RETURN Qt_QPrinter_pageRect_1( ::pPtr, nUnit ) +METHOD QPrinter:pageRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QRectF pageRect ( Unit unit ) const + // N n QPrinter::Unit + RETURN QRectF():from( Qt_QPrinter_pageRect_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QRect pageRect () const + RETURN QRect():from( Qt_QPrinter_pageRect( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QPrinter:paintEngine() RETURN Qt_QPrinter_paintEngine( ::pPtr ) -METHOD QPrinter:paperRect() - RETURN Qt_QPrinter_paperRect( ::pPtr ) +METHOD QPrinter:paperRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QRectF paperRect ( Unit unit ) const + // N n QPrinter::Unit + RETURN QRectF():from( Qt_QPrinter_paperRect_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QRect paperRect () const + RETURN QRect():from( Qt_QPrinter_paperRect( ::pPtr, ... ) ) + ENDCASE + RETURN NIL -METHOD QPrinter:paperRect_1( nUnit ) - RETURN Qt_QPrinter_paperRect_1( ::pPtr, nUnit ) - - -METHOD QPrinter:paperSize() - RETURN Qt_QPrinter_paperSize( ::pPtr ) - - -METHOD QPrinter:paperSize_1( nUnit ) - RETURN Qt_QPrinter_paperSize_1( ::pPtr, nUnit ) +METHOD QPrinter:paperSize( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QSizeF paperSize ( Unit unit ) const + // N n QPrinter::Unit + RETURN QSizeF():from( Qt_QPrinter_paperSize_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // PaperSize paperSize () const + RETURN Qt_QPrinter_paperSize( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QPrinter:paperSource() @@ -328,12 +369,31 @@ METHOD QPrinter:setPageOrder( nPageOrder ) RETURN Qt_QPrinter_setPageOrder( ::pPtr, nPageOrder ) -METHOD QPrinter:setPaperSize( nNewPaperSize ) - RETURN Qt_QPrinter_setPaperSize( ::pPtr, nNewPaperSize ) - - -METHOD QPrinter:setPaperSize_1( pPaperSize, nUnit ) - RETURN Qt_QPrinter_setPaperSize_1( ::pPtr, hbqt_ptr( pPaperSize ), nUnit ) +METHOD QPrinter:setPaperSize( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void setPaperSize ( const QSizeF & paperSize, Unit unit ) + // PO p QSizeF, N n QPrinter::Unit + RETURN Qt_QPrinter_setPaperSize_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setPaperSize ( PaperSize newPaperSize ) + // N n QPrinter::PaperSize + RETURN Qt_QPrinter_setPaperSize( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QPrinter:setPaperSource( nSource ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQRadialGradient.prg b/harbour/contrib/hbqt/qtgui/g/TQRadialGradient.prg index 210ab6049c..0053b57900 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQRadialGradient.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQRadialGradient.prg @@ -74,10 +74,8 @@ CREATE CLASS QRadialGradient INHERIT HbQtObjectHandler, HB_QGradient FUNCTION HB METHOD center() METHOD focalPoint() METHOD radius() - METHOD setCenter( pCenter ) - METHOD setCenter_1( nX, nY ) - METHOD setFocalPoint( pFocalPoint ) - METHOD setFocalPoint_1( nX, nY ) + METHOD setCenter( ... ) + METHOD setFocalPoint( ... ) METHOD setRadius( nRadius ) ENDCLASS @@ -104,20 +102,58 @@ METHOD QRadialGradient:radius() RETURN Qt_QRadialGradient_radius( ::pPtr ) -METHOD QRadialGradient:setCenter( pCenter ) - RETURN Qt_QRadialGradient_setCenter( ::pPtr, hbqt_ptr( pCenter ) ) +METHOD QRadialGradient:setCenter( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setCenter ( qreal x, qreal y ) + // N n qreal, N n qreal + RETURN Qt_QRadialGradient_setCenter_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setCenter ( const QPointF & center ) + // PO p QPointF + RETURN Qt_QRadialGradient_setCenter( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QRadialGradient:setCenter_1( nX, nY ) - RETURN Qt_QRadialGradient_setCenter_1( ::pPtr, nX, nY ) - - -METHOD QRadialGradient:setFocalPoint( pFocalPoint ) - RETURN Qt_QRadialGradient_setFocalPoint( ::pPtr, hbqt_ptr( pFocalPoint ) ) - - -METHOD QRadialGradient:setFocalPoint_1( nX, nY ) - RETURN Qt_QRadialGradient_setFocalPoint_1( ::pPtr, nX, nY ) +METHOD QRadialGradient:setFocalPoint( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setFocalPoint ( qreal x, qreal y ) + // N n qreal, N n qreal + RETURN Qt_QRadialGradient_setFocalPoint_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setFocalPoint ( const QPointF & focalPoint ) + // PO p QPointF + RETURN Qt_QRadialGradient_setFocalPoint( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QRadialGradient:setRadius( nRadius ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQRegion.prg b/harbour/contrib/hbqt/qtgui/g/TQRegion.prg index c7670b9467..e50cc6ae2c 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQRegion.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQRegion.prg @@ -72,22 +72,16 @@ CREATE CLASS QRegion INHERIT HbQtObjectHandler FUNCTION HB_QRegion METHOD new( ... ) METHOD boundingRect() - METHOD contains( pP ) - METHOD contains_1( pR ) - METHOD intersected( pR ) - METHOD intersected_1( pRect ) - METHOD intersects( pRegion ) - METHOD intersects_1( pRect ) + METHOD contains( ... ) + METHOD intersected( ... ) + METHOD intersects( ... ) METHOD isEmpty() METHOD numRects() METHOD setRects( pRects, nNumber ) METHOD subtracted( pR ) - METHOD translate( nDx, nDy ) - METHOD translate_1( pPoint ) - METHOD translated( nDx, nDy ) - METHOD translated_1( pP ) - METHOD united( pR ) - METHOD united_1( pRect ) + METHOD translate( ... ) + METHOD translated( ... ) + METHOD united( ... ) METHOD xored( pR ) ENDCLASS @@ -106,28 +100,73 @@ METHOD QRegion:boundingRect() RETURN Qt_QRegion_boundingRect( ::pPtr ) -METHOD QRegion:contains( pP ) - RETURN Qt_QRegion_contains( ::pPtr, hbqt_ptr( pP ) ) +METHOD QRegion:contains( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // bool contains ( const QPoint & p ) const + // PO p QPoint + RETURN Qt_QRegion_contains( ::pPtr, ... ) + // bool contains ( const QRect & r ) const + // PO p QRect + // RETURN Qt_QRegion_contains_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QRegion:contains_1( pR ) - RETURN Qt_QRegion_contains_1( ::pPtr, hbqt_ptr( pR ) ) +METHOD QRegion:intersected( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRegion intersected ( const QRegion & r ) const + // PO p QRegion + RETURN QRegion():from( Qt_QRegion_intersected( ::pPtr, ... ) ) + // QRegion intersected ( const QRect & rect ) const + // PO p QRect + // RETURN QRegion():from( Qt_QRegion_intersected_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QRegion:intersected( pR ) - RETURN Qt_QRegion_intersected( ::pPtr, hbqt_ptr( pR ) ) - - -METHOD QRegion:intersected_1( pRect ) - RETURN Qt_QRegion_intersected_1( ::pPtr, hbqt_ptr( pRect ) ) - - -METHOD QRegion:intersects( pRegion ) - RETURN Qt_QRegion_intersects( ::pPtr, hbqt_ptr( pRegion ) ) - - -METHOD QRegion:intersects_1( pRect ) - RETURN Qt_QRegion_intersects_1( ::pPtr, hbqt_ptr( pRect ) ) +METHOD QRegion:intersects( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // bool intersects ( const QRegion & region ) const + // PO p QRegion + RETURN Qt_QRegion_intersects( ::pPtr, ... ) + // bool intersects ( const QRect & rect ) const + // PO p QRect + // RETURN Qt_QRegion_intersects_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QRegion:isEmpty() @@ -146,28 +185,81 @@ METHOD QRegion:subtracted( pR ) RETURN Qt_QRegion_subtracted( ::pPtr, hbqt_ptr( pR ) ) -METHOD QRegion:translate( nDx, nDy ) - RETURN Qt_QRegion_translate( ::pPtr, nDx, nDy ) +METHOD QRegion:translate( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void translate ( int dx, int dy ) + // N n int, N n int + RETURN Qt_QRegion_translate( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void translate ( const QPoint & point ) + // PO p QPoint + RETURN Qt_QRegion_translate_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QRegion:translate_1( pPoint ) - RETURN Qt_QRegion_translate_1( ::pPtr, hbqt_ptr( pPoint ) ) +METHOD QRegion:translated( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QRegion translated ( int dx, int dy ) const + // N n int, N n int + RETURN QRegion():from( Qt_QRegion_translated( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRegion translated ( const QPoint & p ) const + // PO p QPoint + RETURN QRegion():from( Qt_QRegion_translated_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QRegion:translated( nDx, nDy ) - RETURN Qt_QRegion_translated( ::pPtr, nDx, nDy ) - - -METHOD QRegion:translated_1( pP ) - RETURN Qt_QRegion_translated_1( ::pPtr, hbqt_ptr( pP ) ) - - -METHOD QRegion:united( pR ) - RETURN Qt_QRegion_united( ::pPtr, hbqt_ptr( pR ) ) - - -METHOD QRegion:united_1( pRect ) - RETURN Qt_QRegion_united_1( ::pPtr, hbqt_ptr( pRect ) ) +METHOD QRegion:united( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRegion united ( const QRegion & r ) const + // PO p QRegion + RETURN QRegion():from( Qt_QRegion_united( ::pPtr, ... ) ) + // QRegion united ( const QRect & rect ) const + // PO p QRect + // RETURN QRegion():from( Qt_QRegion_united_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QRegion:xored( pR ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQSessionManager.prg b/harbour/contrib/hbqt/qtgui/g/TQSessionManager.prg index fd7fb083c5..25206dd2cf 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQSessionManager.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQSessionManager.prg @@ -83,8 +83,7 @@ CREATE CLASS QSessionManager INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_Q METHOD sessionId() METHOD sessionKey() METHOD setDiscardCommand( pList ) - METHOD setManagerProperty( cName, pValue ) - METHOD setManagerProperty_1( cName, cValue ) + METHOD setManagerProperty( ... ) METHOD setRestartCommand( pCommand ) METHOD setRestartHint( nHint ) @@ -148,12 +147,28 @@ METHOD QSessionManager:setDiscardCommand( pList ) RETURN Qt_QSessionManager_setDiscardCommand( ::pPtr, hbqt_ptr( pList ) ) -METHOD QSessionManager:setManagerProperty( cName, pValue ) - RETURN Qt_QSessionManager_setManagerProperty( ::pPtr, cName, hbqt_ptr( pValue ) ) - - -METHOD QSessionManager:setManagerProperty_1( cName, cValue ) - RETURN Qt_QSessionManager_setManagerProperty_1( ::pPtr, cName, cValue ) +METHOD QSessionManager:setManagerProperty( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "C" + // void setManagerProperty ( const QString & name, const QString & value ) + // C c QString, C c QString + RETURN Qt_QSessionManager_setManagerProperty_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // void setManagerProperty ( const QString & name, const QStringList & value ) + // C c QString, PO p QStringList + RETURN Qt_QSessionManager_setManagerProperty( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QSessionManager:setRestartCommand( pCommand ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQStandardItem.prg b/harbour/contrib/hbqt/qtgui/g/TQStandardItem.prg index 5de8878d43..6b77dd57d5 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQStandardItem.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQStandardItem.prg @@ -111,8 +111,7 @@ CREATE CLASS QStandardItem INHERIT HbQtObjectHandler FUNCTION HB_QStandardItem METHOD setBackground( pBrush ) METHOD setCheckState( nState ) METHOD setCheckable( lCheckable ) - METHOD setChild( nRow, nColumn, pItem ) - METHOD setChild_1( nRow, pItem ) + METHOD setChild( ... ) METHOD setColumnCount( nColumns ) METHOD setData( pValue, nRole ) METHOD setDragEnabled( lDragEnabled ) @@ -317,12 +316,31 @@ METHOD QStandardItem:setCheckable( lCheckable ) RETURN Qt_QStandardItem_setCheckable( ::pPtr, lCheckable ) -METHOD QStandardItem:setChild( nRow, nColumn, pItem ) - RETURN Qt_QStandardItem_setChild( ::pPtr, nRow, nColumn, hbqt_ptr( pItem ) ) - - -METHOD QStandardItem:setChild_1( nRow, pItem ) - RETURN Qt_QStandardItem_setChild_1( ::pPtr, nRow, hbqt_ptr( pItem ) ) +METHOD QStandardItem:setChild( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "PO" + // void setChild ( int row, int column, QStandardItem * item ) + // N n int, N n int, PO p QStandardItem + RETURN Qt_QStandardItem_setChild( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // void setChild ( int row, QStandardItem * item ) + // N n int, PO p QStandardItem + RETURN Qt_QStandardItem_setChild_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QStandardItem:setColumnCount( nColumns ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQStandardItemModel.prg b/harbour/contrib/hbqt/qtgui/g/TQStandardItemModel.prg index a1716cefce..fa19e9ff24 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQStandardItemModel.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQStandardItemModel.prg @@ -77,16 +77,14 @@ CREATE CLASS QStandardItemModel INHERIT HbQtObjectHandler, HB_QAbstractItemModeL METHOD horizontalHeaderItem( nColumn ) METHOD indexFromItem( pItem ) METHOD insertColumn( nColumn, pParent ) - METHOD insertRow( nRow, pParent ) - METHOD insertRow_1( nRow, pItem ) + METHOD insertRow( ... ) METHOD invisibleRootItem() METHOD item( nRow, nColumn ) METHOD itemFromIndex( pIndex ) METHOD setColumnCount( nColumns ) METHOD setHorizontalHeaderItem( nColumn, pItem ) METHOD setHorizontalHeaderLabels( pLabels ) - METHOD setItem( nRow, nColumn, pItem ) - METHOD setItem_1( nRow, pItem ) + METHOD setItem( ... ) METHOD setItemPrototype( pItem ) METHOD setRowCount( nRows ) METHOD setSortRole( nRole ) @@ -136,12 +134,34 @@ METHOD QStandardItemModel:insertColumn( nColumn, pParent ) RETURN Qt_QStandardItemModel_insertColumn( ::pPtr, nColumn, hbqt_ptr( pParent ) ) -METHOD QStandardItemModel:insertRow( nRow, pParent ) - RETURN Qt_QStandardItemModel_insertRow( ::pPtr, nRow, hbqt_ptr( pParent ) ) - - -METHOD QStandardItemModel:insertRow_1( nRow, pItem ) - RETURN Qt_QStandardItemModel_insertRow_1( ::pPtr, nRow, hbqt_ptr( pItem ) ) +METHOD QStandardItemModel:insertRow( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // bool insertRow ( int row, const QModelIndex & parent = QModelIndex() ) + // N n int, PO p QModelIndex + RETURN Qt_QStandardItemModel_insertRow( ::pPtr, ... ) + // void insertRow ( int row, QStandardItem * item ) + // N n int, PO p QStandardItem + // RETURN Qt_QStandardItemModel_insertRow_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // bool insertRow ( int row, const QModelIndex & parent = QModelIndex() ) + // N n int, PO p QModelIndex + RETURN Qt_QStandardItemModel_insertRow( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QStandardItemModel:invisibleRootItem() @@ -168,12 +188,31 @@ METHOD QStandardItemModel:setHorizontalHeaderLabels( pLabels ) RETURN Qt_QStandardItemModel_setHorizontalHeaderLabels( ::pPtr, hbqt_ptr( pLabels ) ) -METHOD QStandardItemModel:setItem( nRow, nColumn, pItem ) - RETURN Qt_QStandardItemModel_setItem( ::pPtr, nRow, nColumn, hbqt_ptr( pItem ) ) - - -METHOD QStandardItemModel:setItem_1( nRow, pItem ) - RETURN Qt_QStandardItemModel_setItem_1( ::pPtr, nRow, hbqt_ptr( pItem ) ) +METHOD QStandardItemModel:setItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "PO" + // void setItem ( int row, int column, QStandardItem * item ) + // N n int, N n int, PO p QStandardItem + RETURN Qt_QStandardItemModel_setItem( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" + // void setItem ( int row, QStandardItem * item ) + // N n int, PO p QStandardItem + RETURN Qt_QStandardItemModel_setItem_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QStandardItemModel:setItemPrototype( pItem ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQStyle.prg b/harbour/contrib/hbqt/qtgui/g/TQStyle.prg index 912f09fd2b..c812777113 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQStyle.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQStyle.prg @@ -83,17 +83,14 @@ CREATE CLASS QStyle INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QStyle METHOD itemTextRect( pMetrics, pRectangle, nAlignment, lEnabled, cText ) METHOD layoutSpacing( nControl1, nControl2, nOrientation, pOption, pWidget ) METHOD pixelMetric( nMetric, pOption, pWidget ) - METHOD polish( pWidget ) - METHOD polish_1( pApplication ) - METHOD polish_2( pPalette ) + METHOD polish( ... ) METHOD sizeFromContents( nType, pOption, pContentsSize, pWidget ) METHOD standardIcon( nStandardIcon, pOption, pWidget ) METHOD standardPalette() METHOD styleHint( nHint, pOption, pWidget, pReturnData ) METHOD subControlRect( nControl, pOption, nSubControl, pWidget ) METHOD subElementRect( nElement, pOption, pWidget ) - METHOD unpolish( pWidget ) - METHOD unpolish_1( pApplication ) + METHOD unpolish( ... ) METHOD alignedRect( nDirection, nAlignment, pSize, pRectangle ) METHOD sliderPositionFromValue( nMin, nMax, nLogicalValue, nSpan, lUpsideDown ) METHOD sliderValueFromPosition( nMin, nMax, nPosition, nSpan, lUpsideDown ) @@ -161,16 +158,30 @@ METHOD QStyle:pixelMetric( nMetric, pOption, pWidget ) RETURN Qt_QStyle_pixelMetric( ::pPtr, nMetric, hbqt_ptr( pOption ), hbqt_ptr( pWidget ) ) -METHOD QStyle:polish( pWidget ) - RETURN Qt_QStyle_polish( ::pPtr, hbqt_ptr( pWidget ) ) - - -METHOD QStyle:polish_1( pApplication ) - RETURN Qt_QStyle_polish_1( ::pPtr, hbqt_ptr( pApplication ) ) - - -METHOD QStyle:polish_2( pPalette ) - RETURN Qt_QStyle_polish_2( ::pPtr, hbqt_ptr( pPalette ) ) +METHOD QStyle:polish( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // virtual void polish ( QWidget * widget ) + // PO p QWidget + RETURN Qt_QStyle_polish( ::pPtr, ... ) + // virtual void polish ( QApplication * application ) + // PO p QApplication + // RETURN Qt_QStyle_polish_1( ::pPtr, ... ) + // virtual void polish ( QPalette & palette ) + // PO p QPalette + // RETURN Qt_QStyle_polish_2( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QStyle:sizeFromContents( nType, pOption, pContentsSize, pWidget ) @@ -197,12 +208,27 @@ METHOD QStyle:subElementRect( nElement, pOption, pWidget ) RETURN Qt_QStyle_subElementRect( ::pPtr, nElement, hbqt_ptr( pOption ), hbqt_ptr( pWidget ) ) -METHOD QStyle:unpolish( pWidget ) - RETURN Qt_QStyle_unpolish( ::pPtr, hbqt_ptr( pWidget ) ) - - -METHOD QStyle:unpolish_1( pApplication ) - RETURN Qt_QStyle_unpolish_1( ::pPtr, hbqt_ptr( pApplication ) ) +METHOD QStyle:unpolish( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // virtual void unpolish ( QWidget * widget ) + // PO p QWidget + RETURN Qt_QStyle_unpolish( ::pPtr, ... ) + // virtual void unpolish ( QApplication * application ) + // PO p QApplication + // RETURN Qt_QStyle_unpolish_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QStyle:alignedRect( nDirection, nAlignment, pSize, pRectangle ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQStylePainter.prg b/harbour/contrib/hbqt/qtgui/g/TQStylePainter.prg index 7d666cf111..92dd6e4b7e 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQStylePainter.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQStylePainter.prg @@ -71,8 +71,7 @@ CREATE CLASS QStylePainter INHERIT HbQtObjectHandler, HB_QPainter FUNCTION HB_QS METHOD new( ... ) - METHOD begin( pWidget ) - METHOD begin_1( pPd, pWidget ) + METHOD begin( ... ) METHOD drawComplexControl( nCc, pOption ) METHOD drawControl( nCe, pOption ) METHOD drawItemPixmap( pRect, nFlags, pPixmap ) @@ -92,12 +91,31 @@ METHOD QStylePainter:new( ... ) RETURN Self -METHOD QStylePainter:begin( pWidget ) - RETURN Qt_QStylePainter_begin( ::pPtr, hbqt_ptr( pWidget ) ) - - -METHOD QStylePainter:begin_1( pPd, pWidget ) - RETURN Qt_QStylePainter_begin_1( ::pPtr, hbqt_ptr( pPd ), hbqt_ptr( pWidget ) ) +METHOD QStylePainter:begin( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // bool begin ( QPaintDevice * pd, QWidget * widget ) + // PO p QPaintDevice, PO p QWidget + RETURN Qt_QStylePainter_begin_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // bool begin ( QWidget * widget ) + // PO p QWidget + RETURN Qt_QStylePainter_begin( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QStylePainter:drawComplexControl( nCc, pOption ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQTabWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQTabWidget.prg index 4399519dcc..ad1fd212fa 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTabWidget.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTabWidget.prg @@ -71,8 +71,7 @@ CREATE CLASS QTabWidget INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QTabWi METHOD new( ... ) - METHOD addTab( pPage, cLabel ) - METHOD addTab_1( pPage, pIcon, cLabel ) + METHOD addTab( ... ) METHOD clear() METHOD cornerWidget( nCorner ) METHOD count() @@ -82,8 +81,7 @@ CREATE CLASS QTabWidget INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QTabWi METHOD elideMode() METHOD iconSize() METHOD indexOf( pW ) - METHOD insertTab( nIndex, pPage, cLabel ) - METHOD insertTab_1( nIndex, pPage, pIcon, cLabel ) + METHOD insertTab( ... ) METHOD isMovable() METHOD isTabEnabled( nIndex ) METHOD removeTab( nIndex ) @@ -125,12 +123,31 @@ METHOD QTabWidget:new( ... ) RETURN Self -METHOD QTabWidget:addTab( pPage, cLabel ) - RETURN Qt_QTabWidget_addTab( ::pPtr, hbqt_ptr( pPage ), cLabel ) - - -METHOD QTabWidget:addTab_1( pPage, pIcon, cLabel ) - RETURN Qt_QTabWidget_addTab_1( ::pPtr, hbqt_ptr( pPage ), hbqt_ptr( pIcon ), cLabel ) +METHOD QTabWidget:addTab( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PCO" .AND. aV[ 3 ] $ "C" + // int addTab ( QWidget * page, const QIcon & icon, const QString & label ) [*D=1*] + // PO p QWidget, PCO p QIcon, C c QString + RETURN Qt_QTabWidget_addTab_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" + // int addTab ( QWidget * page, const QString & label ) [*D=1*] + // PO p QWidget, C c QString + RETURN Qt_QTabWidget_addTab( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTabWidget:clear() @@ -169,12 +186,31 @@ METHOD QTabWidget:indexOf( pW ) RETURN Qt_QTabWidget_indexOf( ::pPtr, hbqt_ptr( pW ) ) -METHOD QTabWidget:insertTab( nIndex, pPage, cLabel ) - RETURN Qt_QTabWidget_insertTab( ::pPtr, nIndex, hbqt_ptr( pPage ), cLabel ) - - -METHOD QTabWidget:insertTab_1( nIndex, pPage, pIcon, cLabel ) - RETURN Qt_QTabWidget_insertTab_1( ::pPtr, nIndex, hbqt_ptr( pPage ), hbqt_ptr( pIcon ), cLabel ) +METHOD QTabWidget:insertTab( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PCO" .AND. aV[ 4 ] $ "C" + // int insertTab ( int index, QWidget * page, const QIcon & icon, const QString & label ) + // N n int, PO p QWidget, PCO p QIcon, C c QString + RETURN Qt_QTabWidget_insertTab_1( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "C" + // int insertTab ( int index, QWidget * page, const QString & label ) + // N n int, PO p QWidget, C c QString + RETURN Qt_QTabWidget_insertTab( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTabWidget:isMovable() diff --git a/harbour/contrib/hbqt/qtgui/g/TQTableWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQTableWidget.prg index 5d009223d0..3b3419513d 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTableWidget.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTableWidget.prg @@ -82,8 +82,7 @@ CREATE CLASS QTableWidget INHERIT HbQtObjectHandler, HB_QTableView FUNCTION HB_Q METHOD findItems( cText, nFlags ) METHOD horizontalHeaderItem( nColumn ) METHOD item( nRow, nColumn ) - METHOD itemAt( pPoint ) - METHOD itemAt_1( nAx, nAy ) + METHOD itemAt( ... ) METHOD itemPrototype() METHOD openPersistentEditor( pItem ) METHOD removeCellWidget( nRow, nColumn ) @@ -93,10 +92,8 @@ CREATE CLASS QTableWidget INHERIT HbQtObjectHandler, HB_QTableView FUNCTION HB_Q METHOD selectedRanges() METHOD setCellWidget( nRow, nColumn, pWidget ) METHOD setColumnCount( nColumns ) - METHOD setCurrentCell( nRow, nColumn ) - METHOD setCurrentCell_1( nRow, nColumn, nCommand ) - METHOD setCurrentItem( pItem ) - METHOD setCurrentItem_1( pItem, nCommand ) + METHOD setCurrentCell( ... ) + METHOD setCurrentItem( ... ) METHOD setHorizontalHeaderItem( nColumn, pItem ) METHOD setHorizontalHeaderLabels( pLabels ) METHOD setItem( nRow, nColumn, pItem ) @@ -177,12 +174,31 @@ METHOD QTableWidget:item( nRow, nColumn ) RETURN Qt_QTableWidget_item( ::pPtr, nRow, nColumn ) -METHOD QTableWidget:itemAt( pPoint ) - RETURN Qt_QTableWidget_itemAt( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QTableWidget:itemAt_1( nAx, nAy ) - RETURN Qt_QTableWidget_itemAt_1( ::pPtr, nAx, nAy ) +METHOD QTableWidget:itemAt( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QTableWidgetItem * itemAt ( int ax, int ay ) const + // N n int, N n int + RETURN QTableWidgetItem():from( Qt_QTableWidget_itemAt_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QTableWidgetItem * itemAt ( const QPoint & point ) const + // PO p QPoint + RETURN QTableWidgetItem():from( Qt_QTableWidget_itemAt( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTableWidget:itemPrototype() @@ -221,20 +237,58 @@ METHOD QTableWidget:setColumnCount( nColumns ) RETURN Qt_QTableWidget_setColumnCount( ::pPtr, nColumns ) -METHOD QTableWidget:setCurrentCell( nRow, nColumn ) - RETURN Qt_QTableWidget_setCurrentCell( ::pPtr, nRow, nColumn ) +METHOD QTableWidget:setCurrentCell( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void setCurrentCell ( int row, int column, QItemSelectionModel::SelectionFlags command ) + // N n int, N n int, N n QItemSelectionModel::SelectionFlags + RETURN Qt_QTableWidget_setCurrentCell_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setCurrentCell ( int row, int column ) + // N n int, N n int + RETURN Qt_QTableWidget_setCurrentCell( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QTableWidget:setCurrentCell_1( nRow, nColumn, nCommand ) - RETURN Qt_QTableWidget_setCurrentCell_1( ::pPtr, nRow, nColumn, nCommand ) - - -METHOD QTableWidget:setCurrentItem( pItem ) - RETURN Qt_QTableWidget_setCurrentItem( ::pPtr, hbqt_ptr( pItem ) ) - - -METHOD QTableWidget:setCurrentItem_1( pItem, nCommand ) - RETURN Qt_QTableWidget_setCurrentItem_1( ::pPtr, hbqt_ptr( pItem ), nCommand ) +METHOD QTableWidget:setCurrentItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void setCurrentItem ( QTableWidgetItem * item, QItemSelectionModel::SelectionFlags command ) [*D=1*] + // PO p QTableWidgetItem, N n QItemSelectionModel::SelectionFlags + RETURN Qt_QTableWidget_setCurrentItem_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setCurrentItem ( QTableWidgetItem * item ) [*D=1*] + // PO p QTableWidgetItem + RETURN Qt_QTableWidget_setCurrentItem( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTableWidget:setHorizontalHeaderItem( nColumn, pItem ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQTextCursor.prg b/harbour/contrib/hbqt/qtgui/g/TQTextCursor.prg index b0f5f6c756..27b13fe7a9 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTextCursor.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTextCursor.prg @@ -84,8 +84,7 @@ CREATE CLASS QTextCursor INHERIT HbQtObjectHandler FUNCTION HB_QTextCursor METHOD charFormat() METHOD clearSelection() METHOD columnNumber() - METHOD createList( pFormat ) - METHOD createList_1( nStyle ) + METHOD createList( ... ) METHOD currentFrame() METHOD currentList() METHOD deleteChar() @@ -94,20 +93,13 @@ CREATE CLASS QTextCursor INHERIT HbQtObjectHandler FUNCTION HB_QTextCursor METHOD endEditBlock() METHOD hasComplexSelection() METHOD hasSelection() - METHOD insertBlock() - METHOD insertBlock_1( pFormat ) - METHOD insertBlock_2( pFormat, pCharFormat ) + METHOD insertBlock( ... ) METHOD insertFragment( pFragment ) METHOD insertFrame( pFormat ) METHOD insertHtml( cHtml ) - METHOD insertImage( cName ) - METHOD insertImage_1( pFormat ) - METHOD insertImage_2( pFormat, nAlignment ) - METHOD insertImage_3( pImage, cName ) - METHOD insertList( pFormat ) - METHOD insertList_1( nStyle ) - METHOD insertText( cText ) - METHOD insertText_1( cText, pFormat ) + METHOD insertImage( ... ) + METHOD insertList( ... ) + METHOD insertText( ... ) METHOD isCopyOf( pOther ) METHOD isNull() METHOD joinPreviousEditBlock() @@ -194,12 +186,28 @@ METHOD QTextCursor:columnNumber() RETURN Qt_QTextCursor_columnNumber( ::pPtr ) -METHOD QTextCursor:createList( pFormat ) - RETURN Qt_QTextCursor_createList( ::pPtr, hbqt_ptr( pFormat ) ) - - -METHOD QTextCursor:createList_1( nStyle ) - RETURN Qt_QTextCursor_createList_1( ::pPtr, nStyle ) +METHOD QTextCursor:createList( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QTextList * createList ( QTextListFormat::Style style ) + // N n QTextListFormat::Style + RETURN QTextList():from( Qt_QTextCursor_createList_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // QTextList * createList ( const QTextListFormat & format ) + // PO p QTextListFormat + RETURN QTextList():from( Qt_QTextCursor_createList( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextCursor:currentFrame() @@ -234,16 +242,34 @@ METHOD QTextCursor:hasSelection() RETURN Qt_QTextCursor_hasSelection( ::pPtr ) -METHOD QTextCursor:insertBlock() - RETURN Qt_QTextCursor_insertBlock( ::pPtr ) - - -METHOD QTextCursor:insertBlock_1( pFormat ) - RETURN Qt_QTextCursor_insertBlock_1( ::pPtr, hbqt_ptr( pFormat ) ) - - -METHOD QTextCursor:insertBlock_2( pFormat, pCharFormat ) - RETURN Qt_QTextCursor_insertBlock_2( ::pPtr, hbqt_ptr( pFormat ), hbqt_ptr( pCharFormat ) ) +METHOD QTextCursor:insertBlock( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // void insertBlock ( const QTextBlockFormat & format, const QTextCharFormat & charFormat ) + // PO p QTextBlockFormat, PO p QTextCharFormat + RETURN Qt_QTextCursor_insertBlock_2( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void insertBlock ( const QTextBlockFormat & format ) + // PO p QTextBlockFormat + RETURN Qt_QTextCursor_insertBlock_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void insertBlock () + RETURN Qt_QTextCursor_insertBlock( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QTextCursor:insertFragment( pFragment ) @@ -258,36 +284,93 @@ METHOD QTextCursor:insertHtml( cHtml ) RETURN Qt_QTextCursor_insertHtml( ::pPtr, cHtml ) -METHOD QTextCursor:insertImage( cName ) - RETURN Qt_QTextCursor_insertImage( ::pPtr, cName ) +METHOD QTextCursor:insertImage( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" + // void insertImage ( const QImage & image, const QString & name = QString() ) + // PO p QImage, C c QString + RETURN Qt_QTextCursor_insertImage_3( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void insertImage ( const QTextImageFormat & format, QTextFrameFormat::Position alignment ) + // PO p QTextImageFormat, N n QTextFrameFormat::Position + RETURN Qt_QTextCursor_insertImage_2( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // void insertImage ( const QString & name ) + // C c QString + RETURN Qt_QTextCursor_insertImage( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // void insertImage ( const QTextImageFormat & format ) + // PO p QTextImageFormat + RETURN Qt_QTextCursor_insertImage_1( ::pPtr, ... ) + // void insertImage ( const QImage & image, const QString & name = QString() ) + // PO p QImage, C c QString + // RETURN Qt_QTextCursor_insertImage_3( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QTextCursor:insertImage_1( pFormat ) - RETURN Qt_QTextCursor_insertImage_1( ::pPtr, hbqt_ptr( pFormat ) ) +METHOD QTextCursor:insertList( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // QTextList * insertList ( QTextListFormat::Style style ) + // N n QTextListFormat::Style + RETURN QTextList():from( Qt_QTextCursor_insertList_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // QTextList * insertList ( const QTextListFormat & format ) + // PO p QTextListFormat + RETURN QTextList():from( Qt_QTextCursor_insertList( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QTextCursor:insertImage_2( pFormat, nAlignment ) - RETURN Qt_QTextCursor_insertImage_2( ::pPtr, hbqt_ptr( pFormat ), nAlignment ) - - -METHOD QTextCursor:insertImage_3( pImage, cName ) - RETURN Qt_QTextCursor_insertImage_3( ::pPtr, hbqt_ptr( pImage ), cName ) - - -METHOD QTextCursor:insertList( pFormat ) - RETURN Qt_QTextCursor_insertList( ::pPtr, hbqt_ptr( pFormat ) ) - - -METHOD QTextCursor:insertList_1( nStyle ) - RETURN Qt_QTextCursor_insertList_1( ::pPtr, nStyle ) - - -METHOD QTextCursor:insertText( cText ) - RETURN Qt_QTextCursor_insertText( ::pPtr, cText ) - - -METHOD QTextCursor:insertText_1( cText, pFormat ) - RETURN Qt_QTextCursor_insertText_1( ::pPtr, cText, hbqt_ptr( pFormat ) ) +METHOD QTextCursor:insertText( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // void insertText ( const QString & text, const QTextCharFormat & format ) + // C c QString, PO p QTextCharFormat + RETURN Qt_QTextCursor_insertText_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // void insertText ( const QString & text ) + // C c QString + RETURN Qt_QTextCursor_insertText( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextCursor:isCopyOf( pOther ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQTextDocument.prg b/harbour/contrib/hbqt/qtgui/g/TQTextDocument.prg index 01165a69ec..9b4025aa29 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTextDocument.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTextDocument.prg @@ -86,10 +86,7 @@ CREATE CLASS QTextDocument INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QTe METHOD documentMargin() METHOD drawContents( pP, pRect ) METHOD end() - METHOD find( cSubString, pCursor, nOptions ) - METHOD find_1( pExpr, pCursor, nOptions ) - METHOD find_2( cSubString, nPosition, nOptions ) - METHOD find_3( pExpr, nPosition, nOptions ) + METHOD find( ... ) METHOD findBlock( nPos ) METHOD findBlockByLineNumber( nLineNumber ) METHOD findBlockByNumber( nBlockNumber ) @@ -111,7 +108,7 @@ CREATE CLASS QTextDocument INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QTe METHOD pageCount() METHOD pageSize() METHOD print( pPrinter ) - METHOD redo( pCursor ) + METHOD redo( ... ) METHOD resource( nType, pName ) METHOD revision() METHOD rootFrame() @@ -133,11 +130,9 @@ CREATE CLASS QTextDocument INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QTe METHOD textWidth() METHOD toHtml( pEncoding ) METHOD toPlainText() - METHOD undo( pCursor ) + METHOD undo( ... ) METHOD useDesignMetrics() - METHOD redo_1() METHOD setModified( lM ) - METHOD undo_1() ENDCLASS @@ -211,20 +206,58 @@ METHOD QTextDocument:end() RETURN Qt_QTextDocument_end( ::pPtr ) -METHOD QTextDocument:find( cSubString, pCursor, nOptions ) - RETURN Qt_QTextDocument_find( ::pPtr, cSubString, hbqt_ptr( pCursor ), nOptions ) - - -METHOD QTextDocument:find_1( pExpr, pCursor, nOptions ) - RETURN Qt_QTextDocument_find_1( ::pPtr, hbqt_ptr( pExpr ), hbqt_ptr( pCursor ), nOptions ) - - -METHOD QTextDocument:find_2( cSubString, nPosition, nOptions ) - RETURN Qt_QTextDocument_find_2( ::pPtr, cSubString, nPosition, nOptions ) - - -METHOD QTextDocument:find_3( pExpr, nPosition, nOptions ) - RETURN Qt_QTextDocument_find_3( ::pPtr, hbqt_ptr( pExpr ), nPosition, nOptions ) +METHOD QTextDocument:find( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // QTextCursor find ( const QString & subString, int position = 0, FindFlags options = 0 ) const + // C c QString, N n int, N n QTextDocument::FindFlags + RETURN QTextCursor():from( Qt_QTextDocument_find_2( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // QTextCursor find ( const QString & subString, const QTextCursor & cursor, FindFlags options = 0 ) const + // C c QString, PO p QTextCursor, N n QTextDocument::FindFlags + RETURN QTextCursor():from( Qt_QTextDocument_find( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // QTextCursor find ( const QRegExp & expr, int position = 0, FindFlags options = 0 ) const + // PO p QRegExp, N n int, N n QTextDocument::FindFlags + RETURN QTextCursor():from( Qt_QTextDocument_find_3( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // QTextCursor find ( const QRegExp & expr, const QTextCursor & cursor, FindFlags options = 0 ) const + // PO p QRegExp, PO p QTextCursor, N n QTextDocument::FindFlags + RETURN QTextCursor():from( Qt_QTextDocument_find_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // QTextCursor find ( const QString & subString, const QTextCursor & cursor, FindFlags options = 0 ) const + // C c QString, PO p QTextCursor, N n QTextDocument::FindFlags + RETURN QTextCursor():from( Qt_QTextDocument_find( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // QTextCursor find ( const QRegExp & expr, const QTextCursor & cursor, FindFlags options = 0 ) const + // PO p QRegExp, PO p QTextCursor, N n QTextDocument::FindFlags + RETURN QTextCursor():from( Qt_QTextDocument_find_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QTextCursor find ( const QString & subString, int position = 0, FindFlags options = 0 ) const + // C c QString, N n int, N n QTextDocument::FindFlags + RETURN QTextCursor():from( Qt_QTextDocument_find_2( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // QTextCursor find ( const QRegExp & expr, int position = 0, FindFlags options = 0 ) const + // PO p QRegExp, N n int, N n QTextDocument::FindFlags + RETURN QTextCursor():from( Qt_QTextDocument_find_3( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextDocument:findBlock( nPos ) @@ -311,8 +344,27 @@ METHOD QTextDocument:print( pPrinter ) RETURN Qt_QTextDocument_print( ::pPtr, hbqt_ptr( pPrinter ) ) -METHOD QTextDocument:redo( pCursor ) - RETURN Qt_QTextDocument_redo( ::pPtr, hbqt_ptr( pCursor ) ) +METHOD QTextDocument:redo( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void redo ( QTextCursor * cursor ) + // PO p QTextCursor + RETURN Qt_QTextDocument_redo( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void redo () + RETURN Qt_QTextDocument_redo_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QTextDocument:resource( nType, pName ) @@ -399,22 +451,33 @@ METHOD QTextDocument:toPlainText() RETURN Qt_QTextDocument_toPlainText( ::pPtr ) -METHOD QTextDocument:undo( pCursor ) - RETURN Qt_QTextDocument_undo( ::pPtr, hbqt_ptr( pCursor ) ) +METHOD QTextDocument:undo( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void undo ( QTextCursor * cursor ) + // PO p QTextCursor + RETURN Qt_QTextDocument_undo( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void undo () + RETURN Qt_QTextDocument_undo_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QTextDocument:useDesignMetrics() RETURN Qt_QTextDocument_useDesignMetrics( ::pPtr ) -METHOD QTextDocument:redo_1() - RETURN Qt_QTextDocument_redo_1( ::pPtr ) - - METHOD QTextDocument:setModified( lM ) RETURN Qt_QTextDocument_setModified( ::pPtr, lM ) - -METHOD QTextDocument:undo_1() - RETURN Qt_QTextDocument_undo_1( ::pPtr ) - diff --git a/harbour/contrib/hbqt/qtgui/g/TQTextDocumentFragment.prg b/harbour/contrib/hbqt/qtgui/g/TQTextDocumentFragment.prg index 91321932e8..8271eef582 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTextDocumentFragment.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTextDocumentFragment.prg @@ -72,11 +72,9 @@ CREATE CLASS QTextDocumentFragment INHERIT HbQtObjectHandler FUNCTION HB_QTextDo METHOD new( ... ) METHOD isEmpty() - METHOD toHtml( pEncoding ) - METHOD toHtml_1() + METHOD toHtml( ... ) METHOD toPlainText() - METHOD fromHtml( cText ) - METHOD fromHtml_1( cText, pResourceProvider ) + METHOD fromHtml( ... ) METHOD fromPlainText( cPlainText ) ENDCLASS @@ -95,24 +93,58 @@ METHOD QTextDocumentFragment:isEmpty() RETURN Qt_QTextDocumentFragment_isEmpty( ::pPtr ) -METHOD QTextDocumentFragment:toHtml( pEncoding ) - RETURN Qt_QTextDocumentFragment_toHtml( ::pPtr, hbqt_ptr( pEncoding ) ) - - -METHOD QTextDocumentFragment:toHtml_1() - RETURN Qt_QTextDocumentFragment_toHtml_1( ::pPtr ) +METHOD QTextDocumentFragment:toHtml( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QString toHtml ( const QByteArray & encoding ) const + // PO p QByteArray + RETURN Qt_QTextDocumentFragment_toHtml( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // QString toHtml () const + RETURN Qt_QTextDocumentFragment_toHtml_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QTextDocumentFragment:toPlainText() RETURN Qt_QTextDocumentFragment_toPlainText( ::pPtr ) -METHOD QTextDocumentFragment:fromHtml( cText ) - RETURN Qt_QTextDocumentFragment_fromHtml( ::pPtr, cText ) - - -METHOD QTextDocumentFragment:fromHtml_1( cText, pResourceProvider ) - RETURN Qt_QTextDocumentFragment_fromHtml_1( ::pPtr, cText, hbqt_ptr( pResourceProvider ) ) +METHOD QTextDocumentFragment:fromHtml( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // QTextDocumentFragment fromHtml ( const QString & text, const QTextDocument * resourceProvider ) + // C c QString, PO p QTextDocument + RETURN QTextDocumentFragment():from( Qt_QTextDocumentFragment_fromHtml_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QTextDocumentFragment fromHtml ( const QString & text ) + // C c QString + RETURN QTextDocumentFragment():from( Qt_QTextDocumentFragment_fromHtml( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextDocumentFragment:fromPlainText( cPlainText ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQTextDocumentWriter.prg b/harbour/contrib/hbqt/qtgui/g/TQTextDocumentWriter.prg index 52e99ccdbe..ad897a6fc3 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTextDocumentWriter.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTextDocumentWriter.prg @@ -79,8 +79,7 @@ CREATE CLASS QTextDocumentWriter INHERIT HbQtObjectHandler FUNCTION HB_QTextDocu METHOD setDevice( pDevice ) METHOD setFileName( cFileName ) METHOD setFormat( pFormat ) - METHOD write( pDocument ) - METHOD write_1( pFragment ) + METHOD write( ... ) ENDCLASS @@ -126,10 +125,25 @@ METHOD QTextDocumentWriter:setFormat( pFormat ) RETURN Qt_QTextDocumentWriter_setFormat( ::pPtr, hbqt_ptr( pFormat ) ) -METHOD QTextDocumentWriter:write( pDocument ) - RETURN Qt_QTextDocumentWriter_write( ::pPtr, hbqt_ptr( pDocument ) ) - - -METHOD QTextDocumentWriter:write_1( pFragment ) - RETURN Qt_QTextDocumentWriter_write_1( ::pPtr, hbqt_ptr( pFragment ) ) +METHOD QTextDocumentWriter:write( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // bool write ( const QTextDocument * document ) + // PO p QTextDocument + RETURN Qt_QTextDocumentWriter_write( ::pPtr, ... ) + // bool write ( const QTextDocumentFragment & fragment ) + // PO p QTextDocumentFragment + // RETURN Qt_QTextDocumentWriter_write_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL diff --git a/harbour/contrib/hbqt/qtgui/g/TQTextEdit.prg b/harbour/contrib/hbqt/qtgui/g/TQTextEdit.prg index a7cd38396e..6c51edcd28 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTextEdit.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTextEdit.prg @@ -76,13 +76,11 @@ CREATE CLASS QTextEdit INHERIT HbQtObjectHandler, HB_QAbstractScrollArea FUNCTIO METHOD anchorAt( pPos ) METHOD autoFormatting() METHOD canPaste() - METHOD createStandardContextMenu() - METHOD createStandardContextMenu_1( pPosition ) + METHOD createStandardContextMenu( ... ) METHOD currentCharFormat() METHOD currentFont() METHOD cursorForPosition( pPos ) - METHOD cursorRect( pCursor ) - METHOD cursorRect_1() + METHOD cursorRect( ... ) METHOD cursorWidth() METHOD document() METHOD documentTitle() @@ -185,12 +183,27 @@ METHOD QTextEdit:canPaste() RETURN Qt_QTextEdit_canPaste( ::pPtr ) -METHOD QTextEdit:createStandardContextMenu() - RETURN Qt_QTextEdit_createStandardContextMenu( ::pPtr ) - - -METHOD QTextEdit:createStandardContextMenu_1( pPosition ) - RETURN Qt_QTextEdit_createStandardContextMenu_1( ::pPtr, hbqt_ptr( pPosition ) ) +METHOD QTextEdit:createStandardContextMenu( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QMenu * createStandardContextMenu ( const QPoint & position ) + // PO p QPoint + RETURN QMenu():from( Qt_QTextEdit_createStandardContextMenu_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QMenu * createStandardContextMenu () + RETURN QMenu():from( Qt_QTextEdit_createStandardContextMenu( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QTextEdit:currentCharFormat() @@ -205,12 +218,27 @@ METHOD QTextEdit:cursorForPosition( pPos ) RETURN Qt_QTextEdit_cursorForPosition( ::pPtr, hbqt_ptr( pPos ) ) -METHOD QTextEdit:cursorRect( pCursor ) - RETURN Qt_QTextEdit_cursorRect( ::pPtr, hbqt_ptr( pCursor ) ) - - -METHOD QTextEdit:cursorRect_1() - RETURN Qt_QTextEdit_cursorRect_1( ::pPtr ) +METHOD QTextEdit:cursorRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRect cursorRect ( const QTextCursor & cursor ) const + // PO p QTextCursor + RETURN QRect():from( Qt_QTextEdit_cursorRect( ::pPtr, ... ) ) + ENDCASE + CASE nP == 0 + // QRect cursorRect () const + RETURN QRect():from( Qt_QTextEdit_cursorRect_1( ::pPtr, ... ) ) + ENDCASE + RETURN NIL METHOD QTextEdit:cursorWidth() diff --git a/harbour/contrib/hbqt/qtgui/g/TQTextFrameFormat.prg b/harbour/contrib/hbqt/qtgui/g/TQTextFrameFormat.prg index 2f5fe5d343..c33bd81fa0 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTextFrameFormat.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTextFrameFormat.prg @@ -87,8 +87,7 @@ CREATE CLASS QTextFrameFormat INHERIT HbQtObjectHandler, HB_QTextFormat FUNCTION METHOD setBorderBrush( pBrush ) METHOD setBorderStyle( nStyle ) METHOD setBottomMargin( nMargin ) - METHOD setHeight( pHeight ) - METHOD setHeight_1( nHeight ) + METHOD setHeight( ... ) METHOD setLeftMargin( nMargin ) METHOD setMargin( nMargin ) METHOD setPadding( nWidth ) @@ -96,8 +95,7 @@ CREATE CLASS QTextFrameFormat INHERIT HbQtObjectHandler, HB_QTextFormat FUNCTION METHOD setPosition( nPolicy ) METHOD setRightMargin( nMargin ) METHOD setTopMargin( nMargin ) - METHOD setWidth( pWidth ) - METHOD setWidth_1( nWidth ) + METHOD setWidth( ... ) METHOD topMargin() METHOD width() @@ -177,12 +175,28 @@ METHOD QTextFrameFormat:setBottomMargin( nMargin ) RETURN Qt_QTextFrameFormat_setBottomMargin( ::pPtr, nMargin ) -METHOD QTextFrameFormat:setHeight( pHeight ) - RETURN Qt_QTextFrameFormat_setHeight( ::pPtr, hbqt_ptr( pHeight ) ) - - -METHOD QTextFrameFormat:setHeight_1( nHeight ) - RETURN Qt_QTextFrameFormat_setHeight_1( ::pPtr, nHeight ) +METHOD QTextFrameFormat:setHeight( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setHeight ( qreal height ) + // N n qreal + RETURN Qt_QTextFrameFormat_setHeight_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // void setHeight ( const QTextLength & height ) + // PO p QTextLength + RETURN Qt_QTextFrameFormat_setHeight( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextFrameFormat:setLeftMargin( nMargin ) @@ -213,12 +227,28 @@ METHOD QTextFrameFormat:setTopMargin( nMargin ) RETURN Qt_QTextFrameFormat_setTopMargin( ::pPtr, nMargin ) -METHOD QTextFrameFormat:setWidth( pWidth ) - RETURN Qt_QTextFrameFormat_setWidth( ::pPtr, hbqt_ptr( pWidth ) ) - - -METHOD QTextFrameFormat:setWidth_1( nWidth ) - RETURN Qt_QTextFrameFormat_setWidth_1( ::pPtr, nWidth ) +METHOD QTextFrameFormat:setWidth( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setWidth ( qreal width ) + // N n qreal + RETURN Qt_QTextFrameFormat_setWidth_1( ::pPtr, ... ) + CASE aV[ 1 ] $ "PO" + // void setWidth ( const QTextLength & width ) + // PO p QTextLength + RETURN Qt_QTextFrameFormat_setWidth( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextFrameFormat:topMargin() diff --git a/harbour/contrib/hbqt/qtgui/g/TQTextLayout.prg b/harbour/contrib/hbqt/qtgui/g/TQTextLayout.prg index f6db1c9094..37894f8919 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTextLayout.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTextLayout.prg @@ -77,8 +77,7 @@ CREATE CLASS QTextLayout INHERIT HbQtObjectHandler FUNCTION HB_QTextLayout METHOD clearAdditionalFormats() METHOD clearLayout() METHOD createLine() - METHOD drawCursor( pPainter, pPosition, nCursorPosition, nWidth ) - METHOD drawCursor_1( pPainter, pPosition, nCursorPosition ) + METHOD drawCursor( ... ) METHOD endLayout() METHOD font() METHOD isValidCursorPosition( nPos ) @@ -137,12 +136,31 @@ METHOD QTextLayout:createLine() RETURN Qt_QTextLayout_createLine( ::pPtr ) -METHOD QTextLayout:drawCursor( pPainter, pPosition, nCursorPosition, nWidth ) - RETURN Qt_QTextLayout_drawCursor( ::pPtr, hbqt_ptr( pPainter ), hbqt_ptr( pPosition ), nCursorPosition, nWidth ) - - -METHOD QTextLayout:drawCursor_1( pPainter, pPosition, nCursorPosition ) - RETURN Qt_QTextLayout_drawCursor_1( ::pPtr, hbqt_ptr( pPainter ), hbqt_ptr( pPosition ), nCursorPosition ) +METHOD QTextLayout:drawCursor( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void drawCursor ( QPainter * painter, const QPointF & position, int cursorPosition, int width ) const + // PO p QPainter, PO p QPointF, N n int, N n int + RETURN Qt_QTextLayout_drawCursor( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // void drawCursor ( QPainter * painter, const QPointF & position, int cursorPosition ) const + // PO p QPainter, PO p QPointF, N n int + RETURN Qt_QTextLayout_drawCursor_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextLayout:endLayout() diff --git a/harbour/contrib/hbqt/qtgui/g/TQTextLine.prg b/harbour/contrib/hbqt/qtgui/g/TQTextLine.prg index 719e6831f8..d7f82fef8b 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTextLine.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTextLine.prg @@ -72,8 +72,7 @@ CREATE CLASS QTextLine INHERIT HbQtObjectHandler FUNCTION HB_QTextLine METHOD new( ... ) METHOD ascent() - METHOD cursorToX( nCursorPos, nEdge ) - METHOD cursorToX_1( nCursorPos, nEdge ) + METHOD cursorToX( ... ) METHOD descent() METHOD height() METHOD isValid() @@ -83,8 +82,7 @@ CREATE CLASS QTextLine INHERIT HbQtObjectHandler FUNCTION HB_QTextLine METHOD position() METHOD rect() METHOD setLineWidth( nWidth ) - METHOD setNumColumns( nNumColumns ) - METHOD setNumColumns_1( nNumColumns, nAlignmentWidth ) + METHOD setNumColumns( ... ) METHOD setPosition( pPos ) METHOD textLength() METHOD textStart() @@ -109,12 +107,37 @@ METHOD QTextLine:ascent() RETURN Qt_QTextLine_ascent( ::pPtr ) -METHOD QTextLine:cursorToX( nCursorPos, nEdge ) - RETURN Qt_QTextLine_cursorToX( ::pPtr, nCursorPos, nEdge ) - - -METHOD QTextLine:cursorToX_1( nCursorPos, nEdge ) - RETURN Qt_QTextLine_cursorToX_1( ::pPtr, nCursorPos, nEdge ) +METHOD QTextLine:cursorToX( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // qreal cursorToX ( int * cursorPos, Edge edge = Leading ) const + // N @ int, N n QTextLine::Edge + RETURN Qt_QTextLine_cursorToX( ::pPtr, ... ) + // qreal cursorToX ( int cursorPos, Edge edge = Leading ) const + // N n int, N n QTextLine::Edge + // RETURN Qt_QTextLine_cursorToX_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // qreal cursorToX ( int * cursorPos, Edge edge = Leading ) const + // N @ int, N n QTextLine::Edge + RETURN Qt_QTextLine_cursorToX( ::pPtr, ... ) + // qreal cursorToX ( int cursorPos, Edge edge = Leading ) const + // N n int, N n QTextLine::Edge + // RETURN Qt_QTextLine_cursorToX_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextLine:descent() @@ -153,12 +176,31 @@ METHOD QTextLine:setLineWidth( nWidth ) RETURN Qt_QTextLine_setLineWidth( ::pPtr, nWidth ) -METHOD QTextLine:setNumColumns( nNumColumns ) - RETURN Qt_QTextLine_setNumColumns( ::pPtr, nNumColumns ) - - -METHOD QTextLine:setNumColumns_1( nNumColumns, nAlignmentWidth ) - RETURN Qt_QTextLine_setNumColumns_1( ::pPtr, nNumColumns, nAlignmentWidth ) +METHOD QTextLine:setNumColumns( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setNumColumns ( int numColumns, qreal alignmentWidth ) + // N n int, N n qreal + RETURN Qt_QTextLine_setNumColumns_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setNumColumns ( int numColumns ) + // N n int + RETURN Qt_QTextLine_setNumColumns( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTextLine:setPosition( pPos ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQToolBar.prg b/harbour/contrib/hbqt/qtgui/g/TQToolBar.prg index cd937d485b..3da2aad0ac 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQToolBar.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQToolBar.prg @@ -71,13 +71,8 @@ CREATE CLASS QToolBar INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QToolBar METHOD new( ... ) - METHOD actionAt( pP ) - METHOD actionAt_1( nX, nY ) - METHOD addAction( pAction ) - METHOD addAction_1( cText ) - METHOD addAction_2( pIcon, cText ) - METHOD addAction_3( cText, pReceiver, pMember ) - METHOD addAction_4( pIcon, cText, pReceiver, pMember ) + METHOD actionAt( ... ) + METHOD addAction( ... ) METHOD addSeparator() METHOD addWidget( pWidget ) METHOD allowedAreas() @@ -112,32 +107,76 @@ METHOD QToolBar:new( ... ) RETURN Self -METHOD QToolBar:actionAt( pP ) - RETURN Qt_QToolBar_actionAt( ::pPtr, hbqt_ptr( pP ) ) +METHOD QToolBar:actionAt( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QAction * actionAt ( int x, int y ) const + // N n int, N n int + RETURN QAction():from( Qt_QToolBar_actionAt_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QAction * actionAt ( const QPoint & p ) const + // PO p QPoint + RETURN QAction():from( Qt_QToolBar_actionAt( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QToolBar:actionAt_1( nX, nY ) - RETURN Qt_QToolBar_actionAt_1( ::pPtr, nX, nY ) - - -METHOD QToolBar:addAction( pAction ) - RETURN Qt_QToolBar_addAction( ::pPtr, hbqt_ptr( pAction ) ) - - -METHOD QToolBar:addAction_1( cText ) - RETURN Qt_QToolBar_addAction_1( ::pPtr, cText ) - - -METHOD QToolBar:addAction_2( pIcon, cText ) - RETURN Qt_QToolBar_addAction_2( ::pPtr, hbqt_ptr( pIcon ), cText ) - - -METHOD QToolBar:addAction_3( cText, pReceiver, pMember ) - RETURN Qt_QToolBar_addAction_3( ::pPtr, cText, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ) ) - - -METHOD QToolBar:addAction_4( pIcon, cText, pReceiver, pMember ) - RETURN Qt_QToolBar_addAction_4( ::pPtr, hbqt_ptr( pIcon ), cText, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ) ) +METHOD QToolBar:addAction( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "PCO" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "PO" .AND. aV[ 4 ] $ "PO" + // QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member ) [*D=3*] + // PCO p QIcon, C c QString, PO p QObject, PO p char + RETURN QAction():from( Qt_QToolBar_addAction_4( ::pPtr, ... ) ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" + // QAction * addAction ( const QString & text, const QObject * receiver, const char * member ) + // C c QString, PO p QObject, PO p char + RETURN QAction():from( Qt_QToolBar_addAction_3( ::pPtr, ... ) ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PCO" .AND. aV[ 2 ] $ "C" + // QAction * addAction ( const QIcon & icon, const QString & text ) + // PCO p QIcon, C c QString + RETURN QAction():from( Qt_QToolBar_addAction_2( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // QAction * addAction ( const QString & text ) + // C c QString + RETURN QAction():from( Qt_QToolBar_addAction_1( ::pPtr, ... ) ) + CASE aV[ 1 ] $ "PO" + // void addAction ( QAction * action ) [*D=1*] + // PO p QAction + RETURN Qt_QToolBar_addAction( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QToolBar:addSeparator() diff --git a/harbour/contrib/hbqt/qtgui/g/TQToolBox.prg b/harbour/contrib/hbqt/qtgui/g/TQToolBox.prg index 489f47820e..1023a8a32d 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQToolBox.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQToolBox.prg @@ -71,14 +71,12 @@ CREATE CLASS QToolBox INHERIT HbQtObjectHandler, HB_QFrame FUNCTION HB_QToolBox METHOD new( ... ) - METHOD addItem( pWidget, pIconSet, cText ) - METHOD addItem_1( pW, cText ) + METHOD addItem( ... ) METHOD count() METHOD currentIndex() METHOD currentWidget() METHOD indexOf( pWidget ) - METHOD insertItem( nIndex, pWidget, pIcon, cText ) - METHOD insertItem_1( nIndex, pWidget, cText ) + METHOD insertItem( ... ) METHOD isItemEnabled( nIndex ) METHOD itemIcon( nIndex ) METHOD itemText( nIndex ) @@ -104,12 +102,31 @@ METHOD QToolBox:new( ... ) RETURN Self -METHOD QToolBox:addItem( pWidget, pIconSet, cText ) - RETURN Qt_QToolBox_addItem( ::pPtr, hbqt_ptr( pWidget ), hbqt_ptr( pIconSet ), cText ) - - -METHOD QToolBox:addItem_1( pW, cText ) - RETURN Qt_QToolBox_addItem_1( ::pPtr, hbqt_ptr( pW ), cText ) +METHOD QToolBox:addItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PCO" .AND. aV[ 3 ] $ "C" + // int addItem ( QWidget * widget, const QIcon & iconSet, const QString & text ) + // PO p QWidget, PCO p QIcon, C c QString + RETURN Qt_QToolBox_addItem( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" + // int addItem ( QWidget * w, const QString & text ) + // PO p QWidget, C c QString + RETURN Qt_QToolBox_addItem_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QToolBox:count() @@ -128,12 +145,31 @@ METHOD QToolBox:indexOf( pWidget ) RETURN Qt_QToolBox_indexOf( ::pPtr, hbqt_ptr( pWidget ) ) -METHOD QToolBox:insertItem( nIndex, pWidget, pIcon, cText ) - RETURN Qt_QToolBox_insertItem( ::pPtr, nIndex, hbqt_ptr( pWidget ), hbqt_ptr( pIcon ), cText ) - - -METHOD QToolBox:insertItem_1( nIndex, pWidget, cText ) - RETURN Qt_QToolBox_insertItem_1( ::pPtr, nIndex, hbqt_ptr( pWidget ), cText ) +METHOD QToolBox:insertItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PCO" .AND. aV[ 4 ] $ "C" + // int insertItem ( int index, QWidget * widget, const QIcon & icon, const QString & text ) + // N n int, PO p QWidget, PCO p QIcon, C c QString + RETURN Qt_QToolBox_insertItem( ::pPtr, ... ) + ENDCASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "C" + // int insertItem ( int index, QWidget * widget, const QString & text ) + // N n int, PO p QWidget, C c QString + RETURN Qt_QToolBox_insertItem_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QToolBox:isItemEnabled( nIndex ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQTransform.prg b/harbour/contrib/hbqt/qtgui/g/TQTransform.prg index cdff5d1164..8ae46b031a 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTransform.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTransform.prg @@ -92,18 +92,8 @@ CREATE CLASS QTransform INHERIT HbQtObjectHandler FUNCTION HB_QTransform METHOD isRotating() METHOD isScaling() METHOD isTranslating() - METHOD map( nX, nY, nTx, nTy ) - METHOD map_1( pP ) - METHOD map_2( pPoint ) - METHOD map_3( pL ) - METHOD map_4( pLine ) - METHOD map_5( pPolygon ) - METHOD map_6( pPolygon ) - METHOD map_7( pRegion ) - METHOD map_8( pPath ) - METHOD map_9( nX, nY, nTx, nTy ) - METHOD mapRect( pRectangle ) - METHOD mapRect_1( pRectangle ) + METHOD map( ... ) + METHOD mapRect( ... ) METHOD mapToPolygon( pRectangle ) METHOD reset() METHOD rotate( nAngle, nAxis ) @@ -217,52 +207,78 @@ METHOD QTransform:isTranslating() RETURN Qt_QTransform_isTranslating( ::pPtr ) -METHOD QTransform:map( nX, nY, nTx, nTy ) - RETURN Qt_QTransform_map( ::pPtr, nX, nY, nTx, nTy ) +METHOD QTransform:map( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void map ( qreal x, qreal y, qreal * tx, qreal * ty ) const + // N n qreal, N n qreal, N @ qreal, N @ qreal + RETURN Qt_QTransform_map( ::pPtr, ... ) + // void map ( int x, int y, int * tx, int * ty ) const + // N n int, N n int, N @ int, N @ int + // RETURN Qt_QTransform_map_9( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QPointF map ( const QPointF & p ) const + // PO p QPointF + RETURN QPointF():from( Qt_QTransform_map_1( ::pPtr, ... ) ) + // QRegion map ( const QRegion & region ) const + // PO p QRegion + // RETURN QRegion():from( Qt_QTransform_map_7( ::pPtr, ... ) ) + // QPoint map ( const QPoint & point ) const + // PO p QPoint + // RETURN QPoint():from( Qt_QTransform_map_2( ::pPtr, ... ) ) + // QLine map ( const QLine & l ) const + // PO p QLine + // RETURN QLine():from( Qt_QTransform_map_3( ::pPtr, ... ) ) + // QPolygonF map ( const QPolygonF & polygon ) const + // PO p QPolygonF + // RETURN QPolygonF():from( Qt_QTransform_map_5( ::pPtr, ... ) ) + // QPainterPath map ( const QPainterPath & path ) const + // PO p QPainterPath + // RETURN QPainterPath():from( Qt_QTransform_map_8( ::pPtr, ... ) ) + // QPolygon map ( const QPolygon & polygon ) const + // PO p QPolygon + // RETURN QPolygon():from( Qt_QTransform_map_6( ::pPtr, ... ) ) + // QLineF map ( const QLineF & line ) const + // PO p QLineF + // RETURN QLineF():from( Qt_QTransform_map_4( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QTransform:map_1( pP ) - RETURN Qt_QTransform_map_1( ::pPtr, hbqt_ptr( pP ) ) - - -METHOD QTransform:map_2( pPoint ) - RETURN Qt_QTransform_map_2( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QTransform:map_3( pL ) - RETURN Qt_QTransform_map_3( ::pPtr, hbqt_ptr( pL ) ) - - -METHOD QTransform:map_4( pLine ) - RETURN Qt_QTransform_map_4( ::pPtr, hbqt_ptr( pLine ) ) - - -METHOD QTransform:map_5( pPolygon ) - RETURN Qt_QTransform_map_5( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QTransform:map_6( pPolygon ) - RETURN Qt_QTransform_map_6( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QTransform:map_7( pRegion ) - RETURN Qt_QTransform_map_7( ::pPtr, hbqt_ptr( pRegion ) ) - - -METHOD QTransform:map_8( pPath ) - RETURN Qt_QTransform_map_8( ::pPtr, hbqt_ptr( pPath ) ) - - -METHOD QTransform:map_9( nX, nY, nTx, nTy ) - RETURN Qt_QTransform_map_9( ::pPtr, nX, nY, nTx, nTy ) - - -METHOD QTransform:mapRect( pRectangle ) - RETURN Qt_QTransform_mapRect( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QTransform:mapRect_1( pRectangle ) - RETURN Qt_QTransform_mapRect_1( ::pPtr, hbqt_ptr( pRectangle ) ) +METHOD QTransform:mapRect( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QRectF mapRect ( const QRectF & rectangle ) const + // PO p QRectF + RETURN QRectF():from( Qt_QTransform_mapRect( ::pPtr, ... ) ) + // QRect mapRect ( const QRect & rectangle ) const + // PO p QRect + // RETURN QRect():from( Qt_QTransform_mapRect_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTransform:mapToPolygon( pRectangle ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQTreeWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQTreeWidget.prg index cc31a88d5a..83a4cb9abc 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQTreeWidget.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQTreeWidget.prg @@ -84,17 +84,14 @@ CREATE CLASS QTreeWidget INHERIT HbQtObjectHandler, HB_QTreeView FUNCTION HB_QTr METHOD invisibleRootItem() METHOD isFirstItemColumnSpanned( pItem ) METHOD itemAbove( pItem ) - METHOD itemAt( pP ) - METHOD itemAt_1( nX, nY ) + METHOD itemAt( ... ) METHOD itemBelow( pItem ) METHOD itemWidget( pItem, nColumn ) METHOD openPersistentEditor( pItem, nColumn ) METHOD removeItemWidget( pItem, nColumn ) METHOD selectedItems() METHOD setColumnCount( nColumns ) - METHOD setCurrentItem( pItem ) - METHOD setCurrentItem_1( pItem, nColumn ) - METHOD setCurrentItem_2( pItem, nColumn, nCommand ) + METHOD setCurrentItem( ... ) METHOD setFirstItemColumnSpanned( pItem, lSpan ) METHOD setHeaderItem( pItem ) METHOD setHeaderLabel( cLabel ) @@ -175,12 +172,31 @@ METHOD QTreeWidget:itemAbove( pItem ) RETURN Qt_QTreeWidget_itemAbove( ::pPtr, hbqt_ptr( pItem ) ) -METHOD QTreeWidget:itemAt( pP ) - RETURN Qt_QTreeWidget_itemAt( ::pPtr, hbqt_ptr( pP ) ) - - -METHOD QTreeWidget:itemAt_1( nX, nY ) - RETURN Qt_QTreeWidget_itemAt_1( ::pPtr, nX, nY ) +METHOD QTreeWidget:itemAt( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QTreeWidgetItem * itemAt ( int x, int y ) const + // N n int, N n int + RETURN QTreeWidgetItem():from( Qt_QTreeWidget_itemAt_1( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QTreeWidgetItem * itemAt ( const QPoint & p ) const + // PO p QPoint + RETURN QTreeWidgetItem():from( Qt_QTreeWidget_itemAt( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTreeWidget:itemBelow( pItem ) @@ -207,16 +223,38 @@ METHOD QTreeWidget:setColumnCount( nColumns ) RETURN Qt_QTreeWidget_setColumnCount( ::pPtr, nColumns ) -METHOD QTreeWidget:setCurrentItem( pItem ) - RETURN Qt_QTreeWidget_setCurrentItem( ::pPtr, hbqt_ptr( pItem ) ) - - -METHOD QTreeWidget:setCurrentItem_1( pItem, nColumn ) - RETURN Qt_QTreeWidget_setCurrentItem_1( ::pPtr, hbqt_ptr( pItem ), nColumn ) - - -METHOD QTreeWidget:setCurrentItem_2( pItem, nColumn, nCommand ) - RETURN Qt_QTreeWidget_setCurrentItem_2( ::pPtr, hbqt_ptr( pItem ), nColumn, nCommand ) +METHOD QTreeWidget:setCurrentItem( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // void setCurrentItem ( QTreeWidgetItem * item, int column, QItemSelectionModel::SelectionFlags command ) [*D=1*] + // PO p QTreeWidgetItem, N n int, N n QItemSelectionModel::SelectionFlags + RETURN Qt_QTreeWidget_setCurrentItem_2( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void setCurrentItem ( QTreeWidgetItem * item, int column ) [*D=1*] + // PO p QTreeWidgetItem, N n int + RETURN Qt_QTreeWidget_setCurrentItem_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setCurrentItem ( QTreeWidgetItem * item ) [*D=1*] + // PO p QTreeWidgetItem + RETURN Qt_QTreeWidget_setCurrentItem( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QTreeWidget:setFirstItemColumnSpanned( pItem, lSpan ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQWidget.prg b/harbour/contrib/hbqt/qtgui/g/TQWidget.prg index 982b3ed7c2..d9f402c273 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQWidget.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQWidget.prg @@ -302,11 +302,30 @@ METHOD QWidget:baseSize() METHOD QWidget:childAt( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_childAt( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // QWidget * childAt ( int x, int y ) const + // N n int, N n int + RETURN QWidget():from( Qt_QWidget_childAt( ::pPtr, ... ) ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // QWidget * childAt ( const QPoint & p ) const + // PO p QPoint + RETURN QWidget():from( Qt_QWidget_childAt_1( ::pPtr, ... ) ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:childrenRect() @@ -390,11 +409,26 @@ METHOD QWidget:grabKeyboard() METHOD QWidget:grabMouse( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_grabMouse( ::pPtr, ... ) + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void grabMouse ( const QCursor & cursor ) + // PO p QCursor + RETURN Qt_QWidget_grabMouse_1( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void grabMouse () + RETURN Qt_QWidget_grabMouse( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QWidget:grabShortcut( pKey, nContext ) @@ -546,11 +580,30 @@ METHOD QWidget:minimumWidth() METHOD QWidget:move( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_move( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void move ( int x, int y ) + // N n int, N n int + RETURN Qt_QWidget_move( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void move ( const QPoint & ) + // PO p QPoint + RETURN Qt_QWidget_move_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:nativeParentWidget() @@ -606,19 +659,63 @@ METHOD QWidget:removeAction( pAction ) METHOD QWidget:repaint( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_repaint( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void repaint ( int x, int y, int w, int h ) + // N n int, N n int, N n int, N n int + RETURN Qt_QWidget_repaint( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void repaint ( const QRect & rect ) + // PO p QRect + RETURN Qt_QWidget_repaint_1( ::pPtr, ... ) + // void repaint ( const QRegion & rgn ) + // PO p QRegion + // RETURN Qt_QWidget_repaint_2( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void repaint () + RETURN Qt_QWidget_repaint_3( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QWidget:resize( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_resize( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void resize ( int w, int h ) + // N n int, N n int + RETURN Qt_QWidget_resize( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void resize ( const QSize & ) + // PO p QSize + RETURN Qt_QWidget_resize_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:restoreGeometry( pGeometry ) @@ -630,11 +727,30 @@ METHOD QWidget:saveGeometry() METHOD QWidget:scroll( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_scroll( ::pPtr, ... ) + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "PO" + // void scroll ( int dx, int dy, const QRect & r ) + // N n int, N n int, PO p QRect + RETURN Qt_QWidget_scroll_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void scroll ( int dx, int dy ) + // N n int, N n int + RETURN Qt_QWidget_scroll( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:setAcceptDrops( lOn ) @@ -654,11 +770,30 @@ METHOD QWidget:setBackgroundRole( nRole ) METHOD QWidget:setBaseSize( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_setBaseSize( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setBaseSize ( int basew, int baseh ) + // N n int, N n int + RETURN Qt_QWidget_setBaseSize_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setBaseSize ( const QSize & ) + // PO p QSize + RETURN Qt_QWidget_setBaseSize( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:setContentsMargins( nLeft, nTop, nRight, nBottom ) @@ -678,11 +813,30 @@ METHOD QWidget:setFixedHeight( nH ) METHOD QWidget:setFixedSize( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_setFixedSize( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setFixedSize ( int w, int h ) + // N n int, N n int + RETURN Qt_QWidget_setFixedSize_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setFixedSize ( const QSize & s ) + // PO p QSize + RETURN Qt_QWidget_setFixedSize( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:setFixedWidth( nW ) @@ -690,11 +844,26 @@ METHOD QWidget:setFixedWidth( nW ) METHOD QWidget:setFocus( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_setFocus( ::pPtr, ... ) + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "N" + // void setFocus ( Qt::FocusReason reason ) + // N n Qt::FocusReason + RETURN Qt_QWidget_setFocus( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void setFocus () + RETURN Qt_QWidget_setFocus_1( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QWidget:setFocusPolicy( nPolicy ) @@ -714,11 +883,30 @@ METHOD QWidget:setForegroundRole( nRole ) METHOD QWidget:setGeometry( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_setGeometry( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void setGeometry ( int x, int y, int w, int h ) + // N n int, N n int, N n int, N n int + RETURN Qt_QWidget_setGeometry_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setGeometry ( const QRect & ) + // PO p QRect + RETURN Qt_QWidget_setGeometry( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:setLayout( pLayout ) @@ -734,11 +922,26 @@ METHOD QWidget:setLocale( pLocale ) METHOD QWidget:setMask( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_setMask( ::pPtr, ... ) + DO CASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setMask ( const QBitmap & bitmap ) + // PO p QBitmap + RETURN Qt_QWidget_setMask( ::pPtr, ... ) + // void setMask ( const QRegion & region ) + // PO p QRegion + // RETURN Qt_QWidget_setMask_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:setMaximumHeight( nMaxh ) @@ -746,11 +949,30 @@ METHOD QWidget:setMaximumHeight( nMaxh ) METHOD QWidget:setMaximumSize( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_setMaximumSize( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setMaximumSize ( int maxw, int maxh ) + // N n int, N n int + RETURN Qt_QWidget_setMaximumSize_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setMaximumSize ( const QSize & ) + // PO p QSize + RETURN Qt_QWidget_setMaximumSize( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:setMaximumWidth( nMaxw ) @@ -762,11 +984,30 @@ METHOD QWidget:setMinimumHeight( nMinh ) METHOD QWidget:setMinimumSize( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_setMinimumSize( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setMinimumSize ( int minw, int minh ) + // N n int, N n int + RETURN Qt_QWidget_setMinimumSize_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setMinimumSize ( const QSize & ) + // PO p QSize + RETURN Qt_QWidget_setMinimumSize( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:setMinimumWidth( nMinw ) @@ -782,11 +1023,30 @@ METHOD QWidget:setPalette( pQPalette ) METHOD QWidget:setParent( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_setParent( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" + // void setParent ( QWidget * parent, Qt::WindowFlags f ) + // PO p QWidget, N n Qt::WindowFlags + RETURN Qt_QWidget_setParent_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setParent ( QWidget * parent ) + // PO p QWidget + RETURN Qt_QWidget_setParent( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:setShortcutAutoRepeat( nId, lEnable ) @@ -798,19 +1058,57 @@ METHOD QWidget:setShortcutEnabled( nId, lEnable ) METHOD QWidget:setSizeIncrement( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_setSizeIncrement( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setSizeIncrement ( int w, int h ) + // N n int, N n int + RETURN Qt_QWidget_setSizeIncrement_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setSizeIncrement ( const QSize & ) + // PO p QSize + RETURN Qt_QWidget_setSizeIncrement( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:setSizePolicy( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_setSizePolicy( ::pPtr, ... ) + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" + // void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) + // N n QSizePolicy::Policy, N n QSizePolicy::Policy + RETURN Qt_QWidget_setSizePolicy_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void setSizePolicy ( const QSizePolicy & policy ) + // PO p QSizePolicy + RETURN Qt_QWidget_setSizePolicy( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWidget:setStatusTip( cQString ) @@ -922,11 +1220,36 @@ METHOD QWidget:unsetLocale() METHOD QWidget:update( ... ) - LOCAL p + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) FOR EACH p IN { ... } hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) NEXT - RETURN Qt_QWidget_update( ::pPtr, ... ) + DO CASE + CASE nP == 4 + DO CASE + CASE aV[ 1 ] $ "N" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" .AND. aV[ 4 ] $ "N" + // void update ( int x, int y, int w, int h ) + // N n int, N n int, N n int, N n int + RETURN Qt_QWidget_update( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void update ( const QRect & rect ) + // PO p QRect + RETURN Qt_QWidget_update_1( ::pPtr, ... ) + // void update ( const QRegion & rgn ) + // PO p QRegion + // RETURN Qt_QWidget_update_2( ::pPtr, ... ) + ENDCASE + CASE nP == 0 + // void update () + RETURN Qt_QWidget_update_3( ::pPtr, ... ) + ENDCASE + RETURN NIL METHOD QWidget:updateGeometry() diff --git a/harbour/contrib/hbqt/qtgui/qth/QBrush.qth b/harbour/contrib/hbqt/qtgui/qth/QBrush.qth index 58bc099e47..ec3bc6a597 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QBrush.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QBrush.qth @@ -182,24 +182,8 @@ const QColor & color () const //const QGradient * gradient () const bool isOpaque () const const QMatrix & matrix () const - -void setColor ( ... ){ - QBrush * p = hbqt_par_QBrush( 1 ); - if( p ) - { - if( HB_ISPOINTER( 2 ) ) - { - ( p )->setColor( *hbqt_par_QColor( 2 ) ); - } - else if( HB_ISNUM( 2 ) ) - { - ( p )->setColor( ( Qt::GlobalColor ) hb_parni( 2 ) ); - } - } -} -//void setColor ( const QColor & color ) -//void setColor ( Qt::GlobalColor color ) - +void setColor ( const QColor & color ) +void setColor ( Qt::GlobalColor color ) void setMatrix ( const QMatrix & matrix ) void setStyle ( Qt::BrushStyle style ) void setTexture ( const QPixmap & pixmap ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QColor.qth b/harbour/contrib/hbqt/qtgui/qth/QColor.qth index 0e92f06d7e..598fefa55f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QColor.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QColor.qth @@ -173,27 +173,10 @@ void setHsvF ( qreal h, qreal s, qreal v, qreal a = 1.0 ) void setNamedColor ( const QString & name ) void setRed ( int red ) void setRedF ( qreal red ) - -void setRgb ( ... ){ - QColor * p = hbqt_par_QColor( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) - { - ( p )->setRgb( hb_parnl( 2 ) ); - } - else if( hb_pcount() >= 4 && HB_ISNUM( 2 ) ) - { - ( p )->setRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parnidef( 5, 255 ) ); - } - } -} -//void setRgb ( QRgb rgb ) -//void setRgb ( int r, int g, int b, int a = 255 ) - +void setRgb ( QRgb rgb ) +void setRgb ( int r, int g, int b, int a = 255 ) void setRgba ( QRgb rgba ) void setRgbF ( qreal r, qreal g, qreal b, qreal a = 1.0 ) - Spec spec () const QColor toCmyk () const QColor toHsv () const @@ -202,8 +185,6 @@ int value () const qreal valueF () const int yellow () const qreal yellowF () const - - //bool allowX11ColorNames () QStringList colorNames () QColor fromCmyk ( int c, int m, int y, int k, int a = 255 ) @@ -211,22 +192,8 @@ QColor fromCmykF ( qreal c, qreal m, qreal y, qreal k, qreal a = 1.0 ) QColor fromHsv ( int h, int s, int v, int a = 255 ) QColor fromHsvF ( qreal h, qreal s, qreal v, qreal a = 1.0 ) -QColor fromRgb ( ... ){ - QColor * p = hbqt_par_QColor( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( ( p )->fromRgb( hb_parnl( 2 ) ) ), true ) ); - } - else if( hb_pcount() >= 4 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( ( p )->fromRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parnidef( 5, 255 ) ) ), true ) ); - } - } -} -//QColor fromRgb ( QRgb rgb ) -//QColor fromRgb ( int r, int g, int b, int a = 255 ) +QColor fromRgb ( QRgb rgb ) +QColor fromRgb ( int r, int g, int b, int a = 255 ) QColor fromRgbF ( qreal r, qreal g, qreal b, qreal a = 1.0 ) QColor fromRgba ( QRgb rgba ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QFormLayout.qth b/harbour/contrib/hbqt/qtgui/qth/QFormLayout.qth index 16c39f17b2..e114705084 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFormLayout.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFormLayout.qth @@ -81,11 +81,11 @@ enum RowWrapPolicy { DontWrapRows, WrapLongRows, WrapAllRows } void addRow ( QWidget * label, QWidget * field ) -void addRow ( QWidget * label, QLayout * field ) +//void addRow ( QWidget * label, QLayout * field ) void addRow ( QWidget * widget ) void addRow ( const QString & labelText, QWidget * field ) -void addRow ( const QString & labelText, QLayout * field ) -void addRow ( QLayout * layout ) +//void addRow ( const QString & labelText, QLayout * field ) +//void addRow ( QLayout * layout ) FieldGrowthPolicy fieldGrowthPolicy () const Qt::Alignment formAlignment () const void getItemPosition ( int index, int * rowPtr, ItemRole * rolePtr ) const diff --git a/harbour/contrib/hbqt/qtgui/qth/QIcon.qth b/harbour/contrib/hbqt/qtgui/qth/QIcon.qth index 815239d8ae..d07a6142a2 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QIcon.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QIcon.qth @@ -123,40 +123,10 @@ void addPixmap ( const QPixmap & pixmap, Mode mode = Normal, State state = Off ) QList availableSizes ( Mode mode = Normal, State state = Off ) const qint64 cacheKey () const bool isNull () const - -void paint ( ... ){ - QIcon * p = hbqt_par_QIcon( 1 ); - if( p ) - { - if( HB_ISPOINTER( 2 ) && HB_ISPOINTER( 3 ) ) - { - ( p )->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 ) ); - } - else if( HB_ISPOINTER( 2 ) && HB_ISNUM( 3 ) ) - { - ( p )->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 ) ); - } - } -} -//void paint ( QPainter * painter, const QRect & rect, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const -//void paint ( QPainter * painter, int x, int y, int w, int h, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const - -QPixmap pixmap ( ... ){ - QIcon * p = hbqt_par_QIcon( 1 ); - if( p ) - { - if( HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); - } - else if( hb_pcount() >= 3 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); - } - } -} -//QPixmap pixmap ( const QSize & size, Mode mode = Normal, State state = Off ) const -//QPixmap pixmap ( int w, int h, Mode mode = Normal, State state = Off ) const +void paint ( QPainter * painter, const QRect & rect, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const +void paint ( QPainter * painter, int x, int y, int w, int h, Qt::Alignment alignment = Qt::AlignCenter, Mode mode = Normal, State state = Off ) const +QPixmap pixmap ( const QSize & size, Mode mode = Normal, State state = Off ) const +QPixmap pixmap ( int w, int h, Mode mode = Normal, State state = Off ) const //QPixmap pixmap ( int extent, Mode mode = Normal, State state = Off ) const // Not Implemented diff --git a/harbour/contrib/hbqt/qtgui/qth/QImage.qth b/harbour/contrib/hbqt/qtgui/qth/QImage.qth index f8763a2e5a..b7d484370f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QImage.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QImage.qth @@ -144,31 +144,10 @@ int bytesPerLine () const qint64 cacheKey () const QRgb color ( int i ) const QVector colorTable () const - QImage convertToFormat ( Format format, Qt::ImageConversionFlags flags = Qt::AutoColor ) const QImage convertToFormat ( Format format, const QVector & colorTable, Qt::ImageConversionFlags flags = Qt::AutoColor ) const - -QImage copy ( ... ){ - QImage * p = hbqt_par_QImage( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ), true ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ), true ) ); - } - else - { - hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->copy( QRect() ) ), true ) ); - } - } -} -//QImage copy ( const QRect & rectangle = QRect() ) const -//QImage copy ( int x, int y, int width, int height ) const - +QImage copy ( const QRect & rectangle = QRect() ) const +QImage copy ( int x, int y, int width, int height ) const QImage createAlphaMask ( Qt::ImageConversionFlags flags = Qt::AutoColor ) const QImage createHeuristicMask ( bool clipTight = true ) const QImage createMaskFromColor ( QRgb color, Qt::MaskMode mode = Qt::MaskInColor ) const @@ -182,106 +161,24 @@ int height () const void invertPixels ( InvertMode mode = InvertRgb ) bool isGrayscale () const bool isNull () const - -bool load ( ... ){ - QImage * p = hbqt_par_QImage( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISCHAR( 2 ) ) - { - void * pText; - hb_retl( ( p )->load( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_char( 3 ) ) ); - hb_strfree( pText ); - } - else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISPOINTER( 3 ) ) - { - hb_retl( ( p )->load( hbqt_par_QIODevice( 2 ), hbqt_par_char( 3 ) ) ); - } - } -} -//bool load ( const QString & fileName, const char * format = 0 ) -//bool load ( QIODevice * device, const char * format ) - +bool load ( const QString & fileName, const char * format = 0 ) +bool load ( QIODevice * device, const char * format ) // bool loadFromData ( const uchar * data, int len, const char * format = 0 ) bool loadFromData ( const QByteArray & data, const char * format = 0 ) QImage mirrored ( bool horizontal = false, bool vertical = true ) const int numBytes () const int numColors () const QPoint offset () const - -QRgb pixel ( ... ){ - QImage * p = hbqt_par_QImage( 1 ); - if( p ) - { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retnl( ( p )->pixel( *hbqt_par_QPoint( 2 ) ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - hb_retnl( ( p )->pixel( hb_parni( 2 ), hb_parni( 3 ) ) ); - } - } -} -//QRgb pixel ( const QPoint & position ) const -//QRgb pixel ( int x, int y ) const - -int pixelIndex ( ... ){ - QImage * p = hbqt_par_QImage( 1 ); - if( p ) - { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retni( ( p )->pixelIndex( *hbqt_par_QPoint( 2 ) ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - hb_retni( ( p )->pixelIndex( hb_parni( 2 ), hb_parni( 3 ) ) ); - } - } -} -//int pixelIndex ( const QPoint & position ) const -//int pixelIndex ( int x, int y ) const - +QRgb pixel ( const QPoint & position ) const +QRgb pixel ( int x, int y ) const +int pixelIndex ( const QPoint & position ) const +int pixelIndex ( int x, int y ) const QRect rect () const QImage rgbSwapped () const - -bool save ( ... ){ - QImage * p = hbqt_par_QImage( 1 ); - if( p ) - { - if( hb_pcount() >= 2 && HB_ISCHAR( 2 ) ) - { - void * pText; - hb_retl( ( p )->save( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); - hb_strfree( pText ); - } - else if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retl( ( p )->save( hbqt_par_QIODevice( 2 ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); - } - } -} -//bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const -//bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const - -QImage scaled ( ... ){ - QImage * p = hbqt_par_QImage( 1 ); - if( p ) - { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->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 ) ) ), true ) ); - } - else if( hb_pcount() >= 3 && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( ( p )->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 ) ) ), true ) ); - } - } -} -//QImage scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const -//QImage scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const - +bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const +bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const +QImage scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const +QImage scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const QImage scaledToHeight ( int height, Qt::TransformationMode mode = Qt::FastTransformation ) const QImage scaledToWidth ( int width, Qt::TransformationMode mode = Qt::FastTransformation ) const //uchar * scanLine ( int i ) @@ -292,24 +189,8 @@ void setDotsPerMeterX ( int x ) void setDotsPerMeterY ( int y ) void setNumColors ( int numColors ) void setOffset ( const QPoint & offset ) - -void setPixel ( ... ){ - QImage * p = hbqt_par_QImage( 1 ); - if( p ) - { - if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) - { - ( p )->setPixel( *hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); - } - else if( hb_pcount() == 4 && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) - { - ( p )->setPixel( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); - } - } -} -//void setPixel ( const QPoint & position, uint index_or_rgb ) -//void setPixel ( int x, int y, uint index_or_rgb ) - +void setPixel ( const QPoint & position, uint index_or_rgb ) +void setPixel ( int x, int y, uint index_or_rgb ) void setText ( const QString & key, const QString & text ) QSize size () const QString text ( const QString & key = QString() ) const @@ -334,23 +215,8 @@ QImage transformed ( ... ){ //QImage transformed ( const QMatrix & matrix, Qt::TransformationMode mode = Qt::FastTransformation ) const //QImage transformed ( const QTransform & matrix, Qt::TransformationMode mode = Qt::FastTransformation ) const -bool valid ( ... ){ - QImage * p = hbqt_par_QImage( 1 ); - if( p ) - { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retl( ( p )->valid( *hbqt_par_QPoint( 2 ) ) ); - } - else if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retl( ( p )->valid( hb_parni( 2 ), hb_parni( 3 ) ) ); - } - } -} -//bool valid ( const QPoint & pos ) const -//bool valid ( int x, int y ) const - +bool valid ( const QPoint & pos ) const +bool valid ( int x, int y ) const int width () const diff --git a/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth b/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth index 18de2fd851..3833251d4c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth @@ -95,45 +95,11 @@ flags DockOptions -void addDockWidget ( ... ){ - QMainWindow * p = hbqt_par_QMainWindow( 1 ); - if( p ) - { - if( hb_pcount() == 3 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) - { - ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ) ); - } - if( hb_pcount() == 4 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) - { - ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ), ( Qt::Orientation ) hb_parni( 4 ) ); - } - } -} -//void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) -//void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orientation orientation ) - -void addToolBar ( ... ){ - QMainWindow * p = hbqt_par_QMainWindow( 1 ); - if( p ) - { - if( hb_pcount() == 3 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) - { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); - ( q )->bNew = false; - ( p )->addToolBar( ( Qt::ToolBarArea ) hb_parni( 2 ), hbqt_par_QToolBar( 3 ) ); - } - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - ( q )->bNew = false; - ( p )->addToolBar( hbqt_par_QToolBar( 2 ) ); - } - } -} -// void addToolBar ( Qt::ToolBarArea area, QToolBar * toolbar ) -// void addToolBar ( QToolBar * toolbar ) -// QToolBar * addToolBar ( const QString & title ) // NOT implemented - +void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) +void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orientation orientation ) +void addToolBar ( Qt::ToolBarArea area, QToolBar * toolbar ) +void addToolBar ( QToolBar * toolbar ) +QToolBar * addToolBar ( const QString & title ) // NOT implemented void addToolBarBreak ( Qt::ToolBarArea area = Qt::TopToolBarArea ) QWidget * centralWidget () const Qt::DockWidgetArea corner ( Qt::Corner corner ) const diff --git a/harbour/contrib/hbqt/qtgui/qth/QMenu.qth b/harbour/contrib/hbqt/qtgui/qth/QMenu.qth index 46aafa5eec..2782a80f4e 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMenu.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMenu.qth @@ -86,93 +86,22 @@ QAction * actionAt ( const QPoint & pt ) const QRect actionGeometry ( QAction * act ) const QAction * activeAction () const -QAction * addAction ( ... ){ - QMenu * p = hbqt_par_QMenu( 1 ); - if( p ) - { - void * pText; +QAction * addAction ( const QString & text ) +QAction * addAction ( const QIcon & icon, const QString & text ) +QAction * addAction ( const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) +QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) +void addAction ( QAction * action ) - if( hb_pcount() >= 5 ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) ); - } - else if( hb_pcount() >= 4 ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ), *hbqt_par_QKeySequence( 5 ) ), false ) ); - } - else if( hb_pcount() == 3 ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); - } - else if( hb_pcount() == 2 && HB_ISCHAR( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); - } - else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - q->bNew = HB_FALSE; - ( p )->addAction( hbqt_par_QAction( 2 ) ); - } - - if( pText ) - { - hb_strfree( pText ); - } - } -} -//QAction * addAction ( const QString & text ) -//QAction * addAction ( const QIcon & icon, const QString & text ) -//QAction * addAction ( const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) -//QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) -//QAction * addAction ( QAction * action ) - -QMenu * addMenu ( ... ){ - QMenu * p = hbqt_par_QMenu( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISCHAR( 2 ) ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); - hb_strfree( pText ); - } - else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addMenu( hbqt_par_QMenu( 2 ) ), false ) ); - } - else if( hb_pcount() == 3 ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); - hb_strfree( pText ); - } - } -} -//QAction * addMenu ( QMenu * menu ) -//QMenu * addMenu ( const QString & title ) -//QMenu * addMenu ( const QIcon & icon, const QString & title ) +QAction * addMenu ( QMenu * menu ) +QMenu * addMenu ( const QString & title ) +QMenu * addMenu ( const QIcon & icon, const QString & title ) QAction * addSeparator () void clear () QAction * defaultAction () const -QAction * exec ( ... ){ - QMenu * p = hbqt_par_QMenu( 1 ); - if( p ) - { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec( *hbqt_par_QPoint( 2 ), hbqt_par_QAction( 3 ) ), false ) ); - } - else - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec(), false ) ); - } - } -} -//QAction * exec () -//QAction * exec ( const QPoint & p, QAction * action = 0 ) +QAction * exec () +QAction * exec ( const QPoint & p, QAction * action = 0 ) void hideTearOffMenu () QIcon icon () const diff --git a/harbour/contrib/hbqt/qtgui/qth/QMenuBar.qth b/harbour/contrib/hbqt/qtgui/qth/QMenuBar.qth index 8dbd2a5599..a55439fdb4 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMenuBar.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMenuBar.qth @@ -69,7 +69,7 @@ New = pParent */ HB_FUNC( QT_QMENUBAR ) { - hb_retptr( ( QMenuBar* ) new QMenuBar( hbqt_par_QWidget( 1 ) ) ); + hb_retptr( new QMenuBar( HB_ISPOINTER( 1 ) ? hbqt_par_QWidget( 1 ) : 0 ) ); } diff --git a/harbour/contrib/hbqt/qtgui/qth/QPainter.qth b/harbour/contrib/hbqt/qtgui/qth/QPainter.qth index c563e65f2f..50ff25b999 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPainter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPainter.qth @@ -1006,23 +1006,8 @@ void save () void scale ( qreal sx, qreal sy ) void setBackground ( const QBrush & brush ) void setBackgroundMode ( Qt::BGMode mode ) - -void setBrush ( ... ){ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) - { - ( p )->setBrush( ( Qt::BrushStyle ) hb_parni( 2 ) ); - } - else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setBrush( *hbqt_par_QBrush( 2 ) ); - } - } -} -//void setBrush ( const QBrush & brush ) -//void setBrush ( Qt::BrushStyle style ) +void setBrush ( const QBrush & brush ) +void setBrush ( Qt::BrushStyle style ) void setBrushOrigin ( ... ){ QPainter * p = hbqt_par_QPainter( 1 ); @@ -1118,40 +1103,10 @@ void setRenderHint ( RenderHint hint, bool on = true ) void setRenderHints ( RenderHints hints, bool on = true ) void setTransform ( const QTransform & transform, bool combine = false ) void setViewTransformEnabled ( bool enable ) - -void setViewport ( ... ){ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->setViewport( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } - else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setViewport( *hbqt_par_QRect( 2 ) ); - } - } -} -//void setViewport ( const QRect & rectangle ) -//void setViewport ( int x, int y, int width, int height ) - -void setWindow ( ... ){ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->setWindow( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } - else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setWindow( *hbqt_par_QRect( 2 ) ); - } - } -} -//void setWindow ( const QRect & rectangle ) -//void setWindow ( int x, int y, int width, int height ) +void setViewport ( const QRect & rectangle ) +void setViewport ( int x, int y, int width, int height ) +void setWindow ( const QRect & rectangle ) +void setWindow ( int x, int y, int width, int height ) void setWorldMatrix ( const QMatrix & matrix, bool combine = false ) void setWorldMatrixEnabled ( bool enable ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth b/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth index 8d1ff547df..4d9eefbb1f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth @@ -83,120 +83,23 @@ enum ElementType { MoveToElement, LineToElement, CurveToElement, CurveToDataElem -void addEllipse ( ... ){ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->addEllipse( *hbqt_par_QRectF( 2 ) ); - } - else if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) - { - ( p )->addEllipse( *hbqt_par_QPointF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->addEllipse( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); - } - } -} -//void addEllipse ( const QRectF & boundingRectangle ) -//void addEllipse ( qreal x, qreal y, qreal width, qreal height ) -//void addEllipse ( const QPointF & center, qreal rx, qreal ry ) - +void addEllipse ( const QRectF & boundingRectangle ) +void addEllipse ( qreal x, qreal y, qreal width, qreal height ) +void addEllipse ( const QPointF & center, qreal rx, qreal ry ) void addPath ( const QPainterPath & path ) void addPolygon ( const QPolygonF & polygon ) - -void addRect ( ... ){ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->addRect( *hbqt_par_QRectF( 2 ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->addRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); - } - } -} -//void addRect ( const QRectF & rectangle ) -//void addRect ( qreal x, qreal y, qreal width, qreal height ) - +void addRect ( const QRectF & rectangle ) +void addRect ( qreal x, qreal y, qreal width, qreal height ) void addRegion ( const QRegion & region ) - -void addRoundedRect ( ... ){ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - if( hb_pcount() >= 4 && HB_ISPOINTER( 2 ) ) - { - ( p )->addRoundedRect( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( Qt::SizeMode ) ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : Qt::AbsoluteSize ) ); - } - else if( hb_pcount() >= 7 && HB_ISNUM( 2 ) ) - { - ( p )->addRoundedRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ), ( Qt::SizeMode ) ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : Qt::AbsoluteSize ) ); - } - } -} -//void addRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) -//void addRoundedRect ( qreal x, qreal y, qreal w, qreal h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) - -void addText ( ... ){ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) - { - ( p )->addText( *hbqt_par_QPointF( 2 ), *hbqt_par_QFont( 3 ), hbqt_par_QString( 4 ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->addText( hb_parnd( 2 ), hb_parnd( 3 ), *hbqt_par_QFont( 4 ), hbqt_par_QString( 5 ) ); - } - } -} -//void addText ( const QPointF & point, const QFont & font, const QString & text ) -//void addText ( qreal x, qreal y, const QFont & font, const QString & text ) - +void addRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) +void addRoundedRect ( qreal x, qreal y, qreal w, qreal h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) +void addText ( const QPointF & point, const QFont & font, const QString & text ) +void addText ( qreal x, qreal y, const QFont & font, const QString & text ) qreal angleAtPercent ( qreal t ) const - -void arcMoveTo ( ... ){ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) - { - ( p )->arcMoveTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ) ); - } - else if( hb_pcount() == 6 && HB_ISNUM( 2 ) ) - { - ( p )->arcMoveTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ) ); - } - } -} -//void arcMoveTo ( const QRectF & rectangle, qreal angle ) -//void arcMoveTo ( qreal x, qreal y, qreal width, qreal height, qreal angle ) - -void arcTo ( ... ){ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) - { - ( p )->arcTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); - } - else if( hb_pcount() == 7 && HB_ISNUM( 2 ) ) - { - ( p )->arcTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); - } - } -} -//void arcTo ( const QRectF & rectangle, qreal startAngle, qreal sweepLength ) -//void arcTo ( qreal x, qreal y, qreal width, qreal height, qreal startAngle, qreal sweepLength ) - +void arcMoveTo ( const QRectF & rectangle, qreal angle ) +void arcMoveTo ( qreal x, qreal y, qreal width, qreal height, qreal angle ) +void arcTo ( const QRectF & rectangle, qreal startAngle, qreal sweepLength ) +void arcTo ( qreal x, qreal y, qreal width, qreal height, qreal startAngle, qreal sweepLength ) QRectF boundingRect () const void closeSubpath () void connectPath ( const QPainterPath & path ) @@ -226,24 +129,8 @@ void contains ( ... ){ //bool contains ( const QPainterPath & p ) const QRectF controlPointRect () const - -void cubicTo ( ... ){ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) - { - ( p )->cubicTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ), *hbqt_par_QPointF( 4 ) ); - } - else if( hb_pcount() == 7 && HB_ISNUM( 2 ) ) - { - ( p )->cubicTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); - } - } -} -//void cubicTo ( const QPointF & c1, const QPointF & c2, const QPointF & endPoint ) -//void cubicTo ( qreal c1X, qreal c1Y, qreal c2X, qreal c2Y, qreal endPointX, qreal endPointY ) - +void cubicTo ( const QPointF & c1, const QPointF & c2, const QPointF & endPoint ) +void cubicTo ( qreal c1X, qreal c1Y, qreal c2X, qreal c2Y, qreal endPointX, qreal endPointY ) QPointF currentPosition () const // const QPainterPath::Element & elementAt ( int index ) const int elementCount () const @@ -271,61 +158,14 @@ void intersects ( ... ){ bool isEmpty () const qreal length () const - -void lineTo ( ... ){ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->lineTo( *hbqt_par_QPointF( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->lineTo( hb_parnd( 2 ), hb_parnd( 3 ) ); - } - } -} -//void lineTo ( const QPointF & endPoint ) -//void lineTo ( qreal x, qreal y ) - -void moveTo ( ... ){ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->moveTo( *hbqt_par_QPointF( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->moveTo( hb_parnd( 2 ), hb_parnd( 3 ) ); - } - } -} -//void moveTo ( const QPointF & point ) -//void moveTo ( qreal x, qreal y ) - +void lineTo ( const QPointF & endPoint ) +void lineTo ( qreal x, qreal y ) +void moveTo ( const QPointF & point ) +void moveTo ( qreal x, qreal y ) qreal percentAtLength ( qreal len ) const QPointF pointAtPercent ( qreal t ) const - -void quadTo ( ... ){ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) - { - ( p )->quadTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->quadTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); - } - } -} -//void quadTo ( const QPointF & c, const QPointF & endPoint ) -//void quadTo ( qreal cx, qreal cy, qreal endPointX, qreal endPointY ) - +void quadTo ( const QPointF & c, const QPointF & endPoint ) +void quadTo ( qreal cx, qreal cy, qreal endPointX, qreal endPointY ) void setElementPositionAt ( int index, qreal x, qreal y ) void setFillRule ( Qt::FillRule fillRule ) QPainterPath simplified () const diff --git a/harbour/contrib/hbqt/qtgui/qth/QPixmap.qth b/harbour/contrib/hbqt/qtgui/qth/QPixmap.qth index 5e13d5c641..a2fb731511 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPixmap.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPixmap.qth @@ -128,87 +128,24 @@ qint64 cacheKey () const # // QRgb * clut () const # - -QPixmap copy ( ... ){ - QPixmap * p = hbqt_par_QPixmap( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ), true ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ), true ) ); - } - else - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->copy( QRect() ) ), true ) ); - } - } -} -//QPixmap copy ( const QRect & rectangle = QRect() ) const -//QPixmap copy ( int x, int y, int width, int height ) const - +QPixmap copy ( const QRect & rectangle = QRect() ) const +QPixmap copy ( int x, int y, int width, int height ) const QBitmap createHeuristicMask ( bool clipTight = true ) const - -QBitmap createMaskFromColor ( ... ){ - QPixmap * p = hbqt_par_QPixmap( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( ( p )->createMaskFromColor( *hbqt_par_QColor( 2 ) ) ), true ) ); - } - else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISNUM( 3 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( ( p )->createMaskFromColor( *hbqt_par_QColor( 2 ), ( Qt::MaskMode ) hb_parni( 3 ) ) ), true ) ); - } - else - { - ( p )->copy( QRect() ); - } - } -} -//QBitmap createMaskFromColor ( const QColor & maskColor, Qt::MaskMode mode ) const -//QBitmap createMaskFromColor ( const QColor & maskColor ) const - +QBitmap createMaskFromColor ( const QColor & maskColor, Qt::MaskMode mode ) const +QBitmap createMaskFromColor ( const QColor & maskColor ) const int depth () const void detach () - -void fill ( ... ){ - QPixmap * p = hbqt_par_QPixmap( 1 ); - if( p ) - { - if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) && HB_ISNUM( 3 ) ) - { - ( p )->fill( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); - } - else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISPOINTER( 3 ) ) - { - ( p )->fill( hbqt_par_QWidget( 2 ), *hbqt_par_QPoint( 3 ) ); - } - else - { - ( p )->fill( *hbqt_par_QColor( 2 ) ); - } - } -} -//void fill ( const QColor & color = Qt::white ) -//void fill ( const QWidget * widget, const QPoint & offset ) -//void fill ( const QWidget * widget, int x, int y ) - +void fill ( const QColor & color = Qt::white ) +void fill ( const QWidget * widget, const QPoint & offset ) +void fill ( const QWidget * widget, int x, int y ) // Qt::HANDLE handle () const - bool hasAlpha () const bool hasAlphaChannel () const int height () const bool isNull () const bool isQBitmap () const bool load ( const QString & fileName, const char * format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor ) - // bool loadFromData ( const uchar * data, uint len, const char * format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor ) - bool loadFromData ( const QByteArray & data, const char * format = 0, Qt::ImageConversionFlags flags = Qt::AutoColor ) QBitmap mask () const @@ -217,52 +154,16 @@ QBitmap mask () const // int qwsBytesPerLine () const QRect rect () const - -bool save ( ... ){ - QPixmap * p = hbqt_par_QPixmap( 1 ); - if( p ) - { - if( hb_pcount() >= 2 && HB_ISCHAR( 2 ) ) - { - void * pText; - hb_retl( ( p )->save( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); - hb_strfree( pText ); - } - else if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retl( ( p )->save( hbqt_par_QIODevice( 2 ), hbqt_par_char( 3 ), hb_parnidef( 4, -1 ) ) ); - } - } -} -//bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const -//bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const - - -QPixmap scaled ( ... ){ - QPixmap * p = hbqt_par_QPixmap( 1 ); - if( p ) - { - if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); - } - else if( hb_pcount() >= 3 && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->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 ) ) ), true ) ); - } - } -} -//QPixmap scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const -//QPixmap scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const - - +bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const +bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const +QPixmap scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const +QPixmap scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const QPixmap scaledToHeight ( int height, Qt::TransformationMode mode = Qt::FastTransformation ) const QPixmap scaledToWidth ( int width, Qt::TransformationMode mode = Qt::FastTransformation ) const void setAlphaChannel ( const QPixmap & alphaChannel ) void setMask ( const QBitmap & mask ) QSize size () const QImage toImage () const - // CGImageRef toMacCGImageRef () const //HBITMAP toWinHBITMAP ( HBitmapFormat format = NoAlpha ) const @@ -288,26 +189,13 @@ QPixmap transformed ( ... ){ int width () const int defaultDepth () QPixmap fromImage ( const QImage & image, Qt::ImageConversionFlags flags = Qt::AutoColor ) + //QPixmap fromMacCGImageRef ( CGImageRef image ) //QPixmap fromWinHBITMAP ( HBITMAP bitmap, HBitmapFormat format = NoAlpha ) //QPixmap fromX11Pixmap ( Qt::HANDLE pixmap, ShareMode mode = ImplicitlyShared ) -QPixmap grabWidget ( ... ){ - QPixmap * p = hbqt_par_QPixmap( 1 ); - if( p ) - { - if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISPOINTER( 3 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->grabWidget( hbqt_par_QWidget( 2 ), *hbqt_par_QRect( 3 ) ) ), true ) ); - } - else if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( ( p )->grabWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parnidef( 5, -1 ), hb_parnidef( 6, -1 ) ) ), true ) ); - } - } -} -//QPixmap grabWidget ( QWidget * widget, const QRect & rectangle ) -//QPixmap grabWidget ( QWidget * widget, int x = 0, int y = 0, int width = -1, int height = -1 ) +QPixmap grabWidget ( QWidget * widget, const QRect & rectangle ) +QPixmap grabWidget ( QWidget * widget, int x = 0, int y = 0, int width = -1, int height = -1 ) //QPixmap grabWindow ( WId window, int x = 0, int y = 0, int width = -1, int height = -1 ) QTransform trueMatrix ( const QTransform & matrix, int width, int height ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QWidget.qth b/harbour/contrib/hbqt/qtgui/qth/QWidget.qth index 22d641bf85..4cc2f64a9e 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QWidget.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QWidget.qth @@ -102,22 +102,8 @@ bool autoFillBackground () const QPalette::ColorRole backgroundRole () const QSize baseSize () const -QWidget * childAt ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( *hbqt_par_QPoint( 2 ) ), false ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - hb_retptrGC( hbqt_gcAllocate_QWidget( ( p )->childAt( hb_parni( 2 ), hb_parni( 3 ) ), false ) ); - } - } -} -//QWidget * childAt ( int x, int y ) const -//QWidget * childAt ( const QPoint & p ) const +QWidget * childAt ( int x, int y ) const +QWidget * childAt ( const QPoint & p ) const QRect childrenRect () const QRegion childrenRegion () const @@ -145,22 +131,8 @@ void getContentsMargins ( int * left, int * top, int * right, int * bottom ) con // virtual HDC getDC () const void grabKeyboard () -void grabMouse ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->grabMouse( *hbqt_par_QCursor( 2 ) ); - } - else - { - ( p )->grabMouse(); - } - } -} -//void grabMouse () -//void grabMouse ( const QCursor & cursor ) +void grabMouse () +void grabMouse ( const QCursor & cursor ) int grabShortcut ( const QKeySequence & key, Qt::ShortcutContext context = Qt::WindowShortcut ) // QGraphicsProxyWidget * graphicsProxyWidget () const @@ -206,22 +178,8 @@ QSize minimumSize () const virtual QSize minimumSizeHint () const int minimumWidth () const -void move ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->move( *hbqt_par_QPoint( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->move( hb_parni( 2 ), hb_parni( 3 ) ); - } - } -} -//void move ( int x, int y ) -//void move ( const QPoint & ) +void move ( int x, int y ) +void move ( const QPoint & ) QWidget * nativeParentWidget () const QWidget * nextInFocusChain () const @@ -241,73 +199,18 @@ void removeAction ( QAction * action ) //void render ( QPaintDevice * target, const QPoint & targetOffset = QPoint(), const QRegion & sourceRegion = QRegion(), RenderFlags renderFlags = RenderFlags( DrawWindowBackground | DrawChildren ) ) //void render ( QPainter * painter, const QPoint & targetOffset = QPoint(), const QRegion & sourceRegion = QRegion(), RenderFlags renderFlags = RenderFlags( DrawWindowBackground | DrawChildren ) ) -void repaint ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); +void repaint ( int x, int y, int w, int h ) +void repaint ( const QRect & rect ) +void repaint ( const QRegion & rgn ) - if( q->type == HBQT_TYPE_QRect ) - { - ( p )->repaint( *hbqt_par_QRect( 2 ) ); - } - else if( q->type == HBQT_TYPE_QRegion ) - { - ( p )->repaint( *hbqt_par_QRegion( 2 ) ); - } - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->repaint( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } - else - { - ( p )->repaint(); - } - } -} -//void repaint ( int x, int y, int w, int h ) -//void repaint ( const QRect & rect ) -//void repaint ( const QRegion & rgn ) - -void resize ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->resize( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->resize( hb_parni( 2 ), hb_parni( 3 ) ); - } - } -} -//void resize ( int w, int h ) -//void resize ( const QSize & ) +void resize ( int w, int h ) +void resize ( const QSize & ) bool restoreGeometry ( const QByteArray & geometry ) QByteArray saveGeometry () const -void scroll ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 4 && HB_ISNUM( 2 ) && HB_ISPOINTER( 4 ) ) - { - ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QRect( 4 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->scroll( hb_parni( 2 ), hb_parni( 3 ) ); - } - } -} -//void scroll ( int dx, int dy ) -//void scroll ( int dx, int dy, const QRect & r ) +void scroll ( int dx, int dy ) +void scroll ( int dx, int dy, const QRect & r ) void setAcceptDrops ( bool on ) // void setAccessibleDescription ( const QString & description ) @@ -316,22 +219,8 @@ void setAttribute ( Qt::WidgetAttribute attribute, bool on = true ) void setAutoFillBackground ( bool enabled ) void setBackgroundRole ( QPalette::ColorRole role ) -void setBaseSize ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setBaseSize( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setBaseSize( hb_parni( 2 ), hb_parni( 3 ) ); - } - } -} -//void setBaseSize ( const QSize & ) -//void setBaseSize ( int basew, int baseh ) +void setBaseSize ( const QSize & ) +void setBaseSize ( int basew, int baseh ) void setContentsMargins ( int left, int top, int right, int bottom ) void setContextMenuPolicy ( Qt::ContextMenuPolicy policy ) @@ -339,183 +228,55 @@ void setCursor ( const QCursor & ) // void setEditFocus ( bool enable ) void setFixedHeight ( int h ) -void setFixedSize ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setFixedSize( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setFixedSize( hb_parni( 2 ), hb_parni( 3 ) ); - } - } -} -//void setFixedSize ( const QSize & s ) -//void setFixedSize ( int w, int h ) +void setFixedSize ( const QSize & s ) +void setFixedSize ( int w, int h ) void setFixedWidth ( int w ) -void setFocus ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) - { - ( p )->setFocus( ( Qt::FocusReason ) hb_parni( 2 ) ); - } - else - { - ( p )->setFocus(); - } - } -} -//void setFocus ( Qt::FocusReason reason ) +void setFocus ( Qt::FocusReason reason ) void setFocusPolicy ( Qt::FocusPolicy policy ) void setFocusProxy ( QWidget * w ) void setFont ( const QFont & ) void setForegroundRole ( QPalette::ColorRole role ) -void setGeometry ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setGeometry( *hbqt_par_QRect( 2 ) ); - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->setGeometry( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } - } -} -//void setGeometry ( const QRect & ) -//void setGeometry ( int x, int y, int w, int h ) +void setGeometry ( const QRect & ) +void setGeometry ( int x, int y, int w, int h ) // void setInputContext ( QInputContext * context ) void setLayout ( QLayout * layout ) void setLayoutDirection ( Qt::LayoutDirection direction ) void setLocale ( const QLocale & locale ) -void setMask ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - - if( q->type == HBQT_TYPE_QBitmap ) - { - ( p )->setMask( *hbqt_par_QBitmap( 2 ) ); - } - else if( q->type == HBQT_TYPE_QRegion ) - { - ( p )->setMask( *hbqt_par_QRegion( 2 ) ); - } - } -} -//void setMask ( const QBitmap & bitmap ) -//void setMask ( const QRegion & region ) +void setMask ( const QBitmap & bitmap ) +void setMask ( const QRegion & region ) void setMaximumHeight ( int maxh ) -void setMaximumSize ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setMaximumSize( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setMaximumSize( hb_parni( 2 ), hb_parni( 3 ) ); - } - } -} -//void setMaximumSize ( const QSize & ) -//void setMaximumSize ( int maxw, int maxh ) +void setMaximumSize ( const QSize & ) +void setMaximumSize ( int maxw, int maxh ) void setMaximumWidth ( int maxw ) void setMinimumHeight ( int minh ) -void setMinimumSize ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setMinimumSize( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setMinimumSize( hb_parni( 2 ), hb_parni( 3 ) ); - } - } -} -//void setMinimumSize ( const QSize & ) -//void setMinimumSize ( int minw, int minh ) +void setMinimumSize ( const QSize & ) +void setMinimumSize ( int minw, int minh ) void setMinimumWidth ( int minw ) void setMouseTracking ( bool enable ) void setPalette ( const QPalette & ) -void setParent ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setParent( hbqt_par_QWidget( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) && HB_ISNUM( 3 ) ) - { - ( p )->setParent( hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ); - } - } -} -//void setParent ( QWidget * parent ) -//void setParent ( QWidget * parent, Qt::WindowFlags f ) +void setParent ( QWidget * parent ) +void setParent ( QWidget * parent, Qt::WindowFlags f ) void setShortcutAutoRepeat ( int id, bool enable = true ) void setShortcutEnabled ( int id, bool enable = true ) -void setSizeIncrement ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setSizeIncrement( *hbqt_par_QSize( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setSizeIncrement( hb_parni( 2 ), hb_parni( 3 ) ); - } - } -} -//void setSizeIncrement ( const QSize & ) -//void setSizeIncrement ( int w, int h ) +void setSizeIncrement ( const QSize & ) +void setSizeIncrement ( int w, int h ) -void setSizePolicy ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - ( p )->setSizePolicy( *hbqt_par_QSizePolicy( 2 ) ); - } - else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) - { - ( p )->setSizePolicy( ( QSizePolicy::Policy ) hb_parni( 2 ), ( QSizePolicy::Policy ) hb_parni( 3 ) ); - } - } -} -//void setSizePolicy ( const QSizePolicy & policy ) -//void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) +void setSizePolicy ( const QSizePolicy & policy ) +void setSizePolicy ( QSizePolicy::Policy horizontal, QSizePolicy::Policy vertical ) void setStatusTip ( const QString & ) void setStyle ( QStyle * style ) @@ -546,43 +307,16 @@ void unsetCursor () void unsetLayoutDirection () void unsetLocale () -void update ( ... ){ - QWidget * p = hbqt_par_QWidget( 1 ); - if( p ) - { - if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) - { - HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - - if( q->type == HBQT_TYPE_QRect ) - { - ( p )->update( *hbqt_par_QRect( 2 ) ); - } - else if( q->type == HBQT_TYPE_QRegion ) - { - ( p )->update( *hbqt_par_QRegion( 2 ) ); - } - } - else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) - { - ( p )->update( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } - else - { - ( p )->update(); - } - } -} -//void update ( int x, int y, int w, int h ) -//void update ( const QRect & rect ) -//void update ( const QRegion & rgn ) +void update ( int x, int y, int w, int h ) +void update ( const QRect & rect ) +void update ( const QRegion & rgn ) void updateGeometry () bool updatesEnabled () const QRegion visibleRegion () const QString whatsThis () const int width () const -//WId winId () const +// WId winId () const QWidget * window () const QString windowFilePath () const Qt::WindowFlags windowFlags () const @@ -610,10 +344,10 @@ bool close () void hide () void lower () void raise () -//void repaint () +void repaint () void setDisabled ( bool disable ) void setEnabled ( bool enable ) -//void setFocus () +void setFocus () void setHidden ( bool hidden ) void setStyleSheet ( const QString & styleSheet ) virtual void setVisible ( bool visible ) @@ -624,7 +358,7 @@ void showFullScreen () void showMaximized () void showMinimized () void showNormal () -//void update () +void update () diff --git a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qftp.txt b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qftp.txt index 03ea89eb9f..d1d54bf8d9 100644 --- a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qftp.txt +++ b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qftp.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QFtp():new( ... ) + * QFtp( ... ) * QFtp():from( pPtr_OR_oObj_of_type_QFtp ) * QFtp():configure( pPtr_OR_oObj_of_type_QFtp ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttp.txt b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttp.txt index 2c158a98d0..5ed4f08a82 100644 --- a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttp.txt +++ b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttp.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QHttp():new( ... ) + * QHttp( ... ) * QHttp():from( pPtr_OR_oObj_of_type_QHttp ) * QHttp():configure( pPtr_OR_oObj_of_type_QHttp ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttpheader.txt b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttpheader.txt index 60b1af4c8e..eea2083ff1 100644 --- a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttpheader.txt +++ b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttpheader.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QHttpHeader():new( ... ) + * QHttpHeader( ... ) * QHttpHeader():from( pPtr_OR_oObj_of_type_QHttpHeader ) * QHttpHeader():configure( pPtr_OR_oObj_of_type_QHttpHeader ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttprequestheader.txt b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttprequestheader.txt index 4a3f9d66d8..7b97c41d15 100644 --- a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttprequestheader.txt +++ b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttprequestheader.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QHttpHeader * $SYNTAX$ - * QHttpRequestHeader():new( ... ) + * QHttpRequestHeader( ... ) * QHttpRequestHeader():from( pPtr_OR_oObj_of_type_QHttpRequestHeader ) * QHttpRequestHeader():configure( pPtr_OR_oObj_of_type_QHttpRequestHeader ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttpresponseheader.txt b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttpresponseheader.txt index 304286db9a..4a9ee3d301 100644 --- a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttpresponseheader.txt +++ b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qhttpresponseheader.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QHttpHeader * $SYNTAX$ - * QHttpResponseHeader():new( ... ) + * QHttpResponseHeader( ... ) * QHttpResponseHeader():from( pPtr_OR_oObj_of_type_QHttpResponseHeader ) * QHttpResponseHeader():configure( pPtr_OR_oObj_of_type_QHttpResponseHeader ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qnetworkrequest.txt b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qnetworkrequest.txt index 4705300b1d..8cdae2d51b 100644 --- a/harbour/contrib/hbqt/qtnetwork/doc/en/class_qnetworkrequest.txt +++ b/harbour/contrib/hbqt/qtnetwork/doc/en/class_qnetworkrequest.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QNetworkRequest():new( ... ) + * QNetworkRequest( ... ) * QNetworkRequest():from( pPtr_OR_oObj_of_type_QNetworkRequest ) * QNetworkRequest():configure( pPtr_OR_oObj_of_type_QNetworkRequest ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp b/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp index cfd83082ff..892c7f5240 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QFtp.cpp @@ -74,6 +74,15 @@ * enum TransferType { Binary, Ascii } */ +/* + * Constructed[ 26/26 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // qint64 read ( char * data, qint64 maxlen ) + */ + #include #include diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp index a1aa89ffac..22a27fe607 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QHttp.cpp @@ -72,6 +72,18 @@ * enum State { Unconnected, HostLookup, Connecting, Sending, ..., Closing } */ +/* + * Constructed[ 24/24 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // qint64 read ( char * data, qint64 maxlen ) + * // int setProxy ( const QNetworkProxy & proxy ) + * // int setSocket ( QTcpSocket * socket ) + * //void ignoreSslErrors () + */ + #include #include diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp index b5ebf4b2f3..f19b79d948 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpHeader.cpp @@ -70,7 +70,6 @@ * Constructed[ 18/19 [ 94.74% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * void setValues ( const QList > & values ) */ diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp index 6bdded447e..b333c0ad5f 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpRequestHeader.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 5/5 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp b/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp index 168b758982..96317af60d 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QHttpResponseHeader.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 5/5 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp b/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp index 7a4afa4879..93187529a0 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp +++ b/harbour/contrib/hbqt/qtnetwork/g/QNetworkRequest.cpp @@ -72,6 +72,16 @@ * enum KnownHeaders { ContentTypeHeader, ContentLengthHeader, LocationHeader, LastModifiedHeader, CookieHeader, SetCookieHeader } */ +/* + * Constructed[ 10/10 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // void setSslConfiguration ( const QSslConfiguration & config ) + * // QSslConfiguration sslConfiguration () const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtnetwork/g/TQFtp.prg b/harbour/contrib/hbqt/qtnetwork/g/TQFtp.prg index 3980680f4c..4e48e96acf 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/TQFtp.prg +++ b/harbour/contrib/hbqt/qtnetwork/g/TQFtp.prg @@ -86,8 +86,7 @@ CREATE CLASS QFtp INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QFtp METHOD list( cDir ) METHOD login( cUser, cPassword ) METHOD mkdir( cDir ) - METHOD put( pDev, cFile, nType ) - METHOD put_1( pData, cFile, nType ) + METHOD put( ... ) METHOD rawCommand( cCommand ) METHOD readAll() METHOD remove( cFile ) @@ -170,12 +169,37 @@ METHOD QFtp:mkdir( cDir ) RETURN Qt_QFtp_mkdir( ::pPtr, cDir ) -METHOD QFtp:put( pDev, cFile, nType ) - RETURN Qt_QFtp_put( ::pPtr, hbqt_ptr( pDev ), cFile, nType ) - - -METHOD QFtp:put_1( pData, cFile, nType ) - RETURN Qt_QFtp_put_1( ::pPtr, hbqt_ptr( pData ), cFile, nType ) +METHOD QFtp:put( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" .AND. aV[ 3 ] $ "N" + // int put ( QIODevice * dev, const QString & file, TransferType type = Binary ) + // PO p QIODevice, C c QString, N n QFtp::TransferType + RETURN Qt_QFtp_put( ::pPtr, ... ) + // int put ( const QByteArray & data, const QString & file, TransferType type = Binary ) + // PO p QByteArray, C c QString, N n QFtp::TransferType + // RETURN Qt_QFtp_put_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "C" + // int put ( QIODevice * dev, const QString & file, TransferType type = Binary ) + // PO p QIODevice, C c QString, N n QFtp::TransferType + RETURN Qt_QFtp_put( ::pPtr, ... ) + // int put ( const QByteArray & data, const QString & file, TransferType type = Binary ) + // PO p QByteArray, C c QString, N n QFtp::TransferType + // RETURN Qt_QFtp_put_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QFtp:rawCommand( cCommand ) diff --git a/harbour/contrib/hbqt/qtnetwork/g/TQHttp.prg b/harbour/contrib/hbqt/qtnetwork/g/TQHttp.prg index bb585d4e5f..53001bf2a1 100644 --- a/harbour/contrib/hbqt/qtnetwork/g/TQHttp.prg +++ b/harbour/contrib/hbqt/qtnetwork/g/TQHttp.prg @@ -84,13 +84,10 @@ CREATE CLASS QHttp INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QHttp METHOD hasPendingRequests() METHOD head( cPath ) METHOD lastResponse() - METHOD post( cPath, pData, pTo ) - METHOD post_1( cPath, pData, pTo ) + METHOD post( ... ) METHOD readAll() - METHOD request( pHeader, pData, pTo ) - METHOD request_1( pHeader, pData, pTo ) - METHOD setHost( cHostName, nPort ) - METHOD setHost_1( cHostName, nMode, nPort ) + METHOD request( ... ) + METHOD setHost( ... ) METHOD setProxy( cHost, nPort, cUsername, cPassword ) METHOD setUser( cUserName, cPassword ) METHOD state() @@ -160,32 +157,115 @@ METHOD QHttp:lastResponse() RETURN Qt_QHttp_lastResponse( ::pPtr ) -METHOD QHttp:post( cPath, pData, pTo ) - RETURN Qt_QHttp_post( ::pPtr, cPath, hbqt_ptr( pData ), hbqt_ptr( pTo ) ) - - -METHOD QHttp:post_1( cPath, pData, pTo ) - RETURN Qt_QHttp_post_1( ::pPtr, cPath, hbqt_ptr( pData ), hbqt_ptr( pTo ) ) +METHOD QHttp:post( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" + // int post ( const QString & path, QIODevice * data, QIODevice * to = 0 ) + // C c QString, PO p QIODevice, PO p QIODevice + RETURN Qt_QHttp_post( ::pPtr, ... ) + // int post ( const QString & path, const QByteArray & data, QIODevice * to = 0 ) + // C c QString, PO p QByteArray, PO p QIODevice + // RETURN Qt_QHttp_post_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // int post ( const QString & path, QIODevice * data, QIODevice * to = 0 ) + // C c QString, PO p QIODevice, PO p QIODevice + RETURN Qt_QHttp_post( ::pPtr, ... ) + // int post ( const QString & path, const QByteArray & data, QIODevice * to = 0 ) + // C c QString, PO p QByteArray, PO p QIODevice + // RETURN Qt_QHttp_post_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QHttp:readAll() RETURN Qt_QHttp_readAll( ::pPtr ) -METHOD QHttp:request( pHeader, pData, pTo ) - RETURN Qt_QHttp_request( ::pPtr, hbqt_ptr( pHeader ), hbqt_ptr( pData ), hbqt_ptr( pTo ) ) +METHOD QHttp:request( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "PO" + // int request ( const QHttpRequestHeader & header, QIODevice * data = 0, QIODevice * to = 0 ) + // PO p QHttpRequestHeader, PO p QIODevice, PO p QIODevice + RETURN Qt_QHttp_request( ::pPtr, ... ) + // int request ( const QHttpRequestHeader & header, const QByteArray & data, QIODevice * to = 0 ) + // PO p QHttpRequestHeader, PO p QByteArray, PO p QIODevice + // RETURN Qt_QHttp_request_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // int request ( const QHttpRequestHeader & header, const QByteArray & data, QIODevice * to = 0 ) + // PO p QHttpRequestHeader, PO p QByteArray, PO p QIODevice + RETURN Qt_QHttp_request_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // int request ( const QHttpRequestHeader & header, QIODevice * data = 0, QIODevice * to = 0 ) + // PO p QHttpRequestHeader, PO p QIODevice, PO p QIODevice + RETURN Qt_QHttp_request( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL -METHOD QHttp:request_1( pHeader, pData, pTo ) - RETURN Qt_QHttp_request_1( ::pPtr, hbqt_ptr( pHeader ), hbqt_ptr( pData ), hbqt_ptr( pTo ) ) - - -METHOD QHttp:setHost( cHostName, nPort ) - RETURN Qt_QHttp_setHost( ::pPtr, cHostName, nPort ) - - -METHOD QHttp:setHost_1( cHostName, nMode, nPort ) - RETURN Qt_QHttp_setHost_1( ::pPtr, cHostName, nMode, nPort ) +METHOD QHttp:setHost( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "N" + // int setHost ( const QString & hostName, ConnectionMode mode, quint16 port = 0 ) + // C c QString, N n QHttp::ConnectionMode, N n quint16 + RETURN Qt_QHttp_setHost_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "N" + // int setHost ( const QString & hostName, quint16 port = 80 ) + // C c QString, N n quint16 + RETURN Qt_QHttp_setHost( ::pPtr, ... ) + // int setHost ( const QString & hostName, ConnectionMode mode, quint16 port = 0 ) + // C c QString, N n QHttp::ConnectionMode, N n quint16 + // RETURN Qt_QHttp_setHost_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "C" + // int setHost ( const QString & hostName, quint16 port = 80 ) + // C c QString, N n quint16 + RETURN Qt_QHttp_setHost( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QHttp:setProxy( cHost, nPort, cUsername, cPassword ) diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebframe.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebframe.txt index 2d0807cd44..cc36935f35 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebframe.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebframe.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QWebFrame():new( ... ) + * QWebFrame( ... ) * QWebFrame():from( pPtr_OR_oObj_of_type_QWebFrame ) * QWebFrame():configure( pPtr_OR_oObj_of_type_QWebFrame ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistory.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistory.txt index d4e69b1e1e..aa0f216979 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistory.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistory.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QWebHistory():new( ... ) + * QWebHistory( ... ) * QWebHistory():from( pPtr_OR_oObj_of_type_QWebHistory ) * QWebHistory():configure( pPtr_OR_oObj_of_type_QWebHistory ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryinterface.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryinterface.txt index d1298c4bdf..fed3f7449f 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryinterface.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryinterface.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QWebHistoryInterface():new( ... ) + * QWebHistoryInterface( ... ) * QWebHistoryInterface():from( pPtr_OR_oObj_of_type_QWebHistoryInterface ) * QWebHistoryInterface():configure( pPtr_OR_oObj_of_type_QWebHistoryInterface ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryitem.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryitem.txt index db5d2bc7b7..6caea6c27c 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryitem.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhistoryitem.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QWebHistoryItem():new( ... ) + * QWebHistoryItem( ... ) * QWebHistoryItem():from( pPtr_OR_oObj_of_type_QWebHistoryItem ) * QWebHistoryItem():configure( pPtr_OR_oObj_of_type_QWebHistoryItem ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhittestresult.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhittestresult.txt index a706a3d211..47234ca513 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhittestresult.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebhittestresult.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QWebHitTestResult():new( ... ) + * QWebHitTestResult( ... ) * QWebHitTestResult():from( pPtr_OR_oObj_of_type_QWebHitTestResult ) * QWebHitTestResult():configure( pPtr_OR_oObj_of_type_QWebHitTestResult ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpage.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpage.txt index 3e96bae16e..86ea0c5e85 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpage.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpage.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QWebPage():new( ... ) + * QWebPage( ... ) * QWebPage():from( pPtr_OR_oObj_of_type_QWebPage ) * QWebPage():configure( pPtr_OR_oObj_of_type_QWebPage ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt index 4b522d300e..422e733c76 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebpluginfactory.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QObject * $SYNTAX$ - * QWebPluginFactory():new( ... ) + * QWebPluginFactory( ... ) * QWebPluginFactory():from( pPtr_OR_oObj_of_type_QWebPluginFactory ) * QWebPluginFactory():configure( pPtr_OR_oObj_of_type_QWebPluginFactory ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt index a9d742f1c2..f357992c60 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsecurityorigin.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QWebSecurityOrigin():new( ... ) + * QWebSecurityOrigin( ... ) * QWebSecurityOrigin():from( pPtr_OR_oObj_of_type_QWebSecurityOrigin ) * QWebSecurityOrigin():configure( pPtr_OR_oObj_of_type_QWebSecurityOrigin ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsettings.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsettings.txt index abac5c0e3b..f34bc094be 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsettings.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebsettings.txt @@ -18,7 +18,7 @@ * $INHERITS$ * * $SYNTAX$ - * QWebSettings():new( ... ) + * QWebSettings( ... ) * QWebSettings():from( pPtr_OR_oObj_of_type_QWebSettings ) * QWebSettings():configure( pPtr_OR_oObj_of_type_QWebSettings ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebview.txt b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebview.txt index a238556146..052587fd7f 100644 --- a/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebview.txt +++ b/harbour/contrib/hbqt/qtwebkit/doc/en/class_qwebview.txt @@ -18,7 +18,7 @@ * $INHERITS$ * QWidget * $SYNTAX$ - * QWebView():new( ... ) + * QWebView( ... ) * QWebView():from( pPtr_OR_oObj_of_type_QWebView ) * QWebView():configure( pPtr_OR_oObj_of_type_QWebView ) * $ARGUMENTS$ diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp index a6fa64bc7e..66935f3469 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebFrame.cpp @@ -67,14 +67,13 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 38/40 [ 95.00% ] ] + * Constructed[ 38/39 [ 97.44% ] ] * * *** Unconvered Prototypes *** - * ----------------------------- * * QMultiMap metaData () const * - * *** Commented out protos which construct fine but do not compile *** + * *** Commented out protostypes *** * * // void load ( const QWebNetworkRequest & req ) */ diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp index 8d797d1a3b..f283331068 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistory.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 17/17 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp index cb546ae6f2..5e6bd1d863 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryInterface.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 4/4 [ 100.00% ] ] + * + */ + #include #include diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp index 75b78a25f9..7ac85f04a0 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHistoryItem.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 8/8 [ 100.00% ] ] + * + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp index 677b39a902..ebabd66b76 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebHitTestResult.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 14/14 [ 100.00% ] ] + * + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp index f9e5073fe7..511150d61e 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPage.cpp @@ -76,6 +76,18 @@ * flags FindFlags */ +/* + * Constructed[ 31/31 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // virtual bool extension ( Extension extension, const ExtensionOption * option = 0, ExtensionReturn * output = 0 ) + * // QNetworkAccessManager * networkAccessManager () const + * // void setNetworkAccessManager ( QNetworkAccessManager * manager ) + * //QUndoStack * undoStack () const + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp index 4be73e7224..42a3acfe6b 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebPluginFactory.cpp @@ -71,6 +71,16 @@ * enum Extension { } */ +/* + * Constructed[ 3/3 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // virtual bool extension ( Extension extension, const ExtensionOption * option = 0, ExtensionReturn * output = 0 ) + * // virtual QList plugins () const = 0 + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp index dce2a33327..b9a4ba96ae 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebSecurityOrigin.cpp @@ -66,6 +66,15 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 7/7 [ 100.00% ] ] + * + * + * *** Commented out protostypes *** + * + * // QList databases () const + */ + #include #include diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp index 1965248723..cb449702c9 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebSettings.cpp @@ -73,6 +73,11 @@ * enum WebGraphic { MissingImageGraphic, MissingPluginGraphic, DefaultFrameIconGraphic, TextAreaSizeGripCornerGraphic } */ +/* + * Constructed[ 25/25 [ 100.00% ] ] + * + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp index fb50d69a0c..3bf4c83bf0 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp +++ b/harbour/contrib/hbqt/qtwebkit/g/QWebView.cpp @@ -66,6 +66,11 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +/* + * Constructed[ 26/26 [ 100.00% ] ] + * + */ + #include #include "hbqtgui.h" diff --git a/harbour/contrib/hbqt/qtwebkit/g/TQWebFrame.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebFrame.prg index 89e28c1713..ce15b86d1f 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/TQWebFrame.prg +++ b/harbour/contrib/hbqt/qtwebkit/g/TQWebFrame.prg @@ -71,8 +71,7 @@ CREATE CLASS QWebFrame INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QWebFra METHOD new( ... ) - METHOD addToJavaScriptWindowObject( cName, pObject ) - METHOD addToJavaScriptWindowObject_1( cName, pObject, nOwn ) + METHOD addToJavaScriptWindowObject( ... ) METHOD childFrames() METHOD contentsSize() METHOD frameName() @@ -83,8 +82,7 @@ CREATE CLASS QWebFrame INHERIT HbQtObjectHandler, HB_QObject FUNCTION HB_QWebFra METHOD page() METHOD parentFrame() METHOD pos() - METHOD render( pPainter, pClip ) - METHOD render_1( pPainter ) + METHOD render( ... ) METHOD renderTreeDump() METHOD scroll( nDx, nDy ) METHOD scrollBarMaximum( nOrientation ) @@ -122,12 +120,31 @@ METHOD QWebFrame:new( ... ) RETURN Self -METHOD QWebFrame:addToJavaScriptWindowObject( cName, pObject ) - RETURN Qt_QWebFrame_addToJavaScriptWindowObject( ::pPtr, cName, hbqt_ptr( pObject ) ) - - -METHOD QWebFrame:addToJavaScriptWindowObject_1( cName, pObject, nOwn ) - RETURN Qt_QWebFrame_addToJavaScriptWindowObject_1( ::pPtr, cName, hbqt_ptr( pObject ), nOwn ) +METHOD QWebFrame:addToJavaScriptWindowObject( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" .AND. aV[ 3 ] $ "N" + // void addToJavaScriptWindowObject ( const QString & name, QObject * object, QScriptEngine::ValueOwnership own ) + // C c QString, PO p QObject, N n QScriptEngine::ValueOwnership + RETURN Qt_QWebFrame_addToJavaScriptWindowObject_1( ::pPtr, ... ) + ENDCASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "C" .AND. aV[ 2 ] $ "PO" + // void addToJavaScriptWindowObject ( const QString & name, QObject * object ) + // C c QString, PO p QObject + RETURN Qt_QWebFrame_addToJavaScriptWindowObject( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWebFrame:childFrames() @@ -170,12 +187,31 @@ METHOD QWebFrame:pos() RETURN Qt_QWebFrame_pos( ::pPtr ) -METHOD QWebFrame:render( pPainter, pClip ) - RETURN Qt_QWebFrame_render( ::pPtr, hbqt_ptr( pPainter ), hbqt_ptr( pClip ) ) - - -METHOD QWebFrame:render_1( pPainter ) - RETURN Qt_QWebFrame_render_1( ::pPtr, hbqt_ptr( pPainter ) ) +METHOD QWebFrame:render( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 2 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "PO" + // void render ( QPainter * painter, const QRegion & clip ) + // PO p QPainter, PO p QRegion + RETURN Qt_QWebFrame_render( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void render ( QPainter * painter ) + // PO p QPainter + RETURN Qt_QWebFrame_render_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWebFrame:renderTreeDump() diff --git a/harbour/contrib/hbqt/qtwebkit/g/TQWebView.prg b/harbour/contrib/hbqt/qtwebkit/g/TQWebView.prg index dc89e523ac..80dfe2bcf7 100644 --- a/harbour/contrib/hbqt/qtwebkit/g/TQWebView.prg +++ b/harbour/contrib/hbqt/qtwebkit/g/TQWebView.prg @@ -75,8 +75,7 @@ CREATE CLASS QWebView INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QWebView METHOD history() METHOD icon() METHOD isModified() - METHOD load( pUrl ) - METHOD load_1( pRequest, nOperation, pBody ) + METHOD load( ... ) METHOD page() METHOD pageAction( nAction ) METHOD selectedText() @@ -126,12 +125,34 @@ METHOD QWebView:isModified() RETURN Qt_QWebView_isModified( ::pPtr ) -METHOD QWebView:load( pUrl ) - RETURN Qt_QWebView_load( ::pPtr, hbqt_ptr( pUrl ) ) - - -METHOD QWebView:load_1( pRequest, nOperation, pBody ) - RETURN Qt_QWebView_load_1( ::pPtr, hbqt_ptr( pRequest ), nOperation, hbqt_ptr( pBody ) ) +METHOD QWebView:load( ... ) + LOCAL p, aP, nP, aV := {} + aP := hb_aParams() + nP := len( aP ) + ::valtypes( aP, aV ) + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + DO CASE + CASE nP == 3 + DO CASE + CASE aV[ 1 ] $ "PO" .AND. aV[ 2 ] $ "N" .AND. aV[ 3 ] $ "PO" + // void load ( const QNetworkRequest & request, QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation, const QByteArray & body = QByteArray() ) + // PO p QNetworkRequest, N n QNetworkAccessManager::Operation, PO p QByteArray + RETURN Qt_QWebView_load_1( ::pPtr, ... ) + ENDCASE + CASE nP == 1 + DO CASE + CASE aV[ 1 ] $ "PO" + // void load ( const QUrl & url ) + // PO p QUrl + RETURN Qt_QWebView_load( ::pPtr, ... ) + // void load ( const QNetworkRequest & request, QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation, const QByteArray & body = QByteArray() ) + // PO p QNetworkRequest, N n QNetworkAccessManager::Operation, PO p QByteArray + // RETURN Qt_QWebView_load_1( ::pPtr, ... ) + ENDCASE + ENDCASE + RETURN NIL METHOD QWebView:page() diff --git a/harbour/contrib/hbqt/utils/hbqtgen.prg b/harbour/contrib/hbqt/utils/hbqtgen.prg index 06e4743d8e..4771e12a2c 100644 --- a/harbour/contrib/hbqt/utils/hbqtgen.prg +++ b/harbour/contrib/hbqt/utils/hbqtgen.prg @@ -678,9 +678,7 @@ METHOD HbQtSource:build() /* Methods Body */ FOR EACH oMtd IN ::aMethods - IF oMtd:lValid - ::buildMethodBody( oMtd ) - ENDIF + ::buildMethodBody( oMtd ) NEXT /* Pull .cpp copyright text */ @@ -893,7 +891,7 @@ METHOD HbQtSource:build() /* Build Document File */ IF !empty( ::doc_ ) - ::buildDocument( ::cProject, ::cWidget, ::cls_, ::doc_, ::cPathDoc, ::subCls_, ::docum_ ) + ::buildDocument() ENDIF /* Distribute in specific lib subfolder */ @@ -997,29 +995,29 @@ METHOD HbQtSource:buildMethodBody( oMtd ) /*----------------------------------------------------------------------*/ METHOD HbQtSource:buildClass() - LOCAL s, n, cM, cC, oMtd, oArg, cP, txt_:={} + LOCAL s, n, cM, cC, oMtd, oArg, cP, txt_:={}, a_, lClub FOR EACH oMtd IN ::aMethods - IF oMtd:lValid - cM := "" ; cC := "::pPtr, " - IF oMtd:nArgs > 0 - FOR EACH oArg IN oMtd:hArgs - cP := strtran( strtran( oArg:cDoc, "@", "" ), "::", "_" ) - cM += cP + ", " - cC += iif( left( cP, 1 ) == "p", "hbqt_ptr( " + cP + " )", cP ) + ", " - NEXT - ENDIF - cM := alltrim( cM ) ; cM := iif( right( cM,1 ) == ",", substr( cM, 1, len( cM ) - 1 ), cM ) - cC := allTrim( cC ) ; cC := iif( right( cC,1 ) == ",", substr( cC, 1, len( cC ) - 1 ), cC ) - - cM := oMtd:cHBFunc + "(" + iif( empty( cM ), "", " " ) + cM + iif( empty( cM ), "", " " ) + ")" - cC := "Qt_" + ::cWidget + "_" + oMtd:cHBFunc + "(" + iif( empty( cC ), "", " " ) + cC + iif( empty( cC ), "", " " ) + ")" - - oMtd:cMtdDef := cM - oMtd:cMtdCall := cC + cM := "" ; cC := "::pPtr, " + IF oMtd:nArgs > 0 + FOR EACH oArg IN oMtd:hArgs + cP := strtran( strtran( oArg:cDoc, "@", "" ), "::", "_" ) + cM += cP + ", " + cC += iif( left( cP, 1 ) == "p", "hbqt_ptr( " + cP + " )", cP ) + ", " + NEXT ENDIF + cM := alltrim( cM ) ; cM := iif( right( cM,1 ) == ",", substr( cM, 1, len( cM ) - 1 ), cM ) + cC := allTrim( cC ) ; cC := iif( right( cC,1 ) == ",", substr( cC, 1, len( cC ) - 1 ), cC ) + + cM := oMtd:cHBFunc + "(" + iif( empty( cM ), "", " " ) + cM + iif( empty( cM ), "", " " ) + ")" + cC := "Qt_" + ::cWidget + "_" + oMtd:cHBFunc + "(" + iif( empty( cC ), "", " " ) + cC + iif( empty( cC ), "", " " ) + ")" + + oMtd:cMtdDef := cM + oMtd:cMtdCall := cC NEXT + lClub := ascan( ::cls_, {|e_| lower( e_[ 1 ] ) == "clubmethods" .AND. lower( e_[ 2 ] ) == "no" } ) == 0 + BuildCopyrightText( @txt_, 1 ) aadd( txt_, "" ) @@ -1031,47 +1029,80 @@ METHOD HbQtSource:buildClass() n := ascan( ::cls_, {|e_| left( lower( e_[ 1 ] ), 7 ) == "inherit" .and. !empty( e_[ 2 ] ) } ) s := "CREATE CLASS " + ::cWidget + " INHERIT HbQtObjectHandler" + iif( n > 0, ", " + strtran( ::cls_[ n, 2 ], "Q", "HB_Q" ), "" ) + " FUNCTION HB_" + ::cWidget - aadd( txt_, s ) - aadd( txt_, " " ) - aadd( txt_, " METHOD new( ... )" ) - aadd( txt_, " " ) + aadd( txt_, s ) + aadd( txt_, " " ) + aadd( txt_, " METHOD new( ... )" ) + aadd( txt_, " " ) FOR EACH oMtd IN ::aMethods - IF oMtd:lValid - aadd( txt_, " METHOD " + oMtd:cMtdDef ) + IF lClub + IF ! oMtd:isSibling + IF oMtd:nSiblings > 0 + aadd( txt_, " METHOD " + oMtd:cHBFunc + "( ... )" ) + ELSE + aadd( txt_, " METHOD " + oMtd:cMtdDef ) + ENDIF + ENDIF + ELSE + aadd( txt_, " METHOD " + oMtd:cMtdDef ) ENDIF NEXT - aadd( txt_, " " ) - aadd( txt_, " ENDCLASS" ) - aadd( txt_, " " ) - aadd( txt_, " " ) - aadd( txt_, "METHOD " + ::cWidget + ":new( ... )" ) - aadd( txt_, " LOCAL p" ) - aadd( txt_, " FOR EACH p IN { ... }" ) + aadd( txt_, " " ) + aadd( txt_, " ENDCLASS" ) + aadd( txt_, " " ) + aadd( txt_, " " ) + aadd( txt_, "METHOD " + ::cWidget + ":new( ... )" ) + aadd( txt_, " LOCAL p" ) + aadd( txt_, " FOR EACH p IN { ... }" ) aadd( txt_, " hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )" ) - aadd( txt_, " NEXT" ) - aadd( txt_, " ::pPtr := Qt_" + ::cWidget + "( ... )" ) - aadd( txt_, " RETURN Self" ) - aadd( txt_, " " ) + aadd( txt_, " NEXT" ) + aadd( txt_, " ::pPtr := Qt_" + ::cWidget + "( ... )" ) + aadd( txt_, " RETURN Self" ) + aadd( txt_, " " ) FOR EACH oMtd IN ::aMethods - IF oMtd:lValid - aadd( txt_, "" ) - aadd( txt_, "METHOD " + ::cWidget + ":" + oMtd:cMtdDef ) - IF "..." $ oMtd:cMtdDef - aadd( txt_, " LOCAL p" ) - aadd( txt_, " FOR EACH p IN { ... }" ) - aadd( txt_, " hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )" ) - aadd( txt_, " NEXT" ) - ENDIF - aadd( txt_, " RETURN " + oMtd:cMtdCall ) - aadd( txt_, "" ) + IF "..." $ oMtd:cMtdDef /* reworked at c++ level - embed as is */ + aadd( txt_, "" ) + aadd( txt_, "METHOD " + ::cWidget + ":" + oMtd:cMtdDef ) + aadd( txt_, " LOCAL p" ) + aadd( txt_, " FOR EACH p IN { ... }" ) + aadd( txt_, " hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )" ) + aadd( txt_, " NEXT" ) + aadd( txt_, " RETURN " + oMtd:cMtdCall ) + aadd( txt_, "" ) + + ELSEIF lClub .AND. oMtd:nSiblings > 0 /* has more calls with same name */ + aadd( txt_, "" ) + aadd( txt_, "METHOD " + ::cWidget + ":" + oMtd:cHBFunc + "( ... )" ) + aadd( txt_, " LOCAL p, aP, nP, aV := {}" ) + aadd( txt_, " aP := hb_aParams()" ) + aadd( txt_, " nP := len( aP )" ) + aadd( txt_, " ::valtypes( aP, aV )" ) + aadd( txt_, " FOR EACH p IN { ... }" ) + aadd( txt_, " hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) )" ) + aadd( txt_, " NEXT" ) + // + a_:= hbide_pullSameMethods( oMtd:cFun, ::aMethods, ::cWidget ) + aeval( a_, {|e| aadd( txt_, e ) } ) + // + aadd( txt_, " RETURN NIL" ) + aadd( txt_, "" ) + + ELSEIF lClub .AND. oMtd:isSibling /* is another call with same name handedlled previously - do nothing */ + // Skip + + ELSE /* as usual */ + aadd( txt_, "" ) + aadd( txt_, "METHOD " + ::cWidget + ":" + oMtd:cMtdDef ) + aadd( txt_, " RETURN " + oMtd:cMtdCall ) + aadd( txt_, "" ) + ENDIF NEXT IF !empty( ::subCls_ ) - aadd( txt_, "" ) + aadd( txt_, "" ) aeval( ::subCls_, {|e| aadd( txt_, e ) } ) - aadd( txt_, "" ) + aadd( txt_, "" ) ENDIF /* Generate .prg */ @@ -1081,6 +1112,149 @@ METHOD HbQtSource:buildClass() /*----------------------------------------------------------------------*/ +STATIC FUNCTION hbide_pullSameMethods( cFun, aMethods, cWidget ) + LOCAL i, oMtd, a_:={}, b_:={}, c_:={}, nArgs, n, txt_:={}, cSpc, cCrc, lFirst, nMtds + + FOR EACH oMtd IN aMethods + IF oMtd:cFun == cFun + aadd( a_, oMtd ) + ENDIF + NEXT + asort( a_, , , {|e,f| strzero( e:nArgs,2 ) + iif( e:nArgs == 0, "", e:hArgs[ 1 ]:cTypeHB ) > strzero( f:nArgs, 2 ) + iif( f:nArgs == 0, "", f:hArgs[ 1 ]:cTypeHB ) } ) + + /* know the maximum groups by number of parameters - first CASE */ + aeval( a_, {|o| iif( ascan( b_, o:nArgs ) == 0, aadd( b_, o:nArgs ), NIL ) } ) + /* also take into account optional arguments if any */ + aeval( a_, {|o| iif( ascan( b_, o:nArgsReal ) == 0, aadd( b_, o:nArgsReal ), NIL ) } ) + + /* Build the structure number of parameters wise */ + FOR EACH nArgs IN b_ + aadd( c_, { nArgs, {} } ) + n := len( c_ ) + FOR EACH oMtd IN a_ + IF oMtd:nArgs == nArgs + aadd( c_[ n,2 ], oMtd ) + ENDIF + NEXT + /* Again append methods with optional arguments */ + FOR EACH oMtd IN a_ + IF oMtd:nArgsReal < oMtd:nArgs .AND. oMtd:nArgsReal == nArgs + aadd( c_[ n,2 ], oMtd ) + ENDIF + NEXT + NEXT + + /* stack groups based on parameters descending */ + asort( c_, , , {|e,f| e[ 1 ] > f[ 1 ] } ) + + /* again sort no of arguments based methods by type of arguments */ + FOR i := 10 TO 0 STEP -1 /* consider maximum 10 arguments */ + IF ( n := ascan( c_, {|e_| e_[ 1 ] == i } ) ) > 0 + a_:= c_[ n,2 ] + asort( a_, , , {|e,f| TY( e, c_[ n,1 ] ) < TY( f, c_[ n,1 ] ) } ) + ENDIF + NEXT + + cSpc := " " + aadd( txt_, cSpc + "DO CASE" ) + FOR EACH b_ IN c_ + n := b_[ 1 ] + a_:= b_[ 2 ] + aadd( txt_, cSpc + "CASE nP == " + hb_ntos( n ) ) + cCrc := "xxx" + nMtds := 0 + IF n > 0 + lFirst := .t. + aadd( txt_, cSpc + cSpc + "DO CASE" ) + ENDIF + FOR EACH oMtd IN a_ + IF n > 0 + IF cCrc != TY( oMtd, n ) + cCrc := TY( oMtd, n ) + nMtds := 0 + IF ! lFirst + lFirst := .t. + aadd( txt_, cSpc + cSpc + "ENDCASE" ) + ENDIF + + aadd( txt_, cSpc + cSpc + "CASE " + TY_TYPES( oMtd,n ) ) + ENDIF + ENDIF + nMtds++ + hbide_addReturnMethod( txt_, oMtd, cWidget, iif( n == 0, 6, 9 ), nMtds ) + NEXT + IF n > 0 + aadd( txt_, cSpc + cSpc + "ENDCASE" ) + ENDIF + NEXT + aadd( txt_, cSpc + "ENDCASE" ) + + RETURN txt_ + +/*----------------------------------------------------------------------*/ + +STATIC FUNCTION hbide_addReturnMethod( txt_, oM, cWidget, nInd, nCount ) + LOCAL s, cFun, sp := space( nInd ) + LOCAL cRetCast := oM:oRet:cCast + + aadd( txt_, sp + " " + "// " + oM:cProto ) + IF !empty( s := hbide_methodInfo( oM ) ) + aadd( txt_, sp + " " + "// " + s ) + ENDIF + IF ! ( "::" $ cRetCast ) .AND. ; + ! ( "<" $ cRetCast ) .AND. ; + ! ( cRetCast $ "QString,QRgb" ) .AND. ; + ( left( cRetCast, 1 ) == "Q" .OR. left( cRetCast, 3 ) == "HBQ" ) + + cFun := cRetCast + "():from( " + "Qt_" + cWidget + "_" + oM:cHBFunc + "( ::pPtr, ... )" + " )" + + /* Workable but then code needs to be changed - defer for now*/ + //cFun := cRetCast + "( " + "Qt_" + cWidget + "_" + oM:cHBFunc + "( ::pPtr, ... )" + " )" + ELSE + cFun := "Qt_" + cWidget + "_" + oM:cHBFunc + "( ::pPtr, ... )" + + ENDIF + s := sp + iif( nCount > 1, "// ", "" ) + "RETURN " + cFun + aadd( txt_, s ) + IF nCount > 1 + HB_TRACE( HB_TR_ALWAYS, s ) /* needed to refine the engine further */ + ENDIF + RETURN NIL + +/*----------------------------------------------------------------------*/ + +STATIC FUNCTION hbide_methodInfo( oMtd ) + LOCAL s := "", oArg + FOR EACH oArg IN oMtd:hArgs + s += oArg:cTypeHB + " " + left( oArg:cDoc, 1 ) + " " + oArg:cCast + ", " + NEXT + s := trim( s ) + s := iif( right( s,1 ) == ",", substr( s, 1, len( s ) - 1 ), s ) + RETURN s + +/*----------------------------------------------------------------------*/ + +STATIC FUNCTION TY_TYPES( oM, nArgs ) + LOCAL i, s := "" + FOR i := 1 TO nArgs + s += "aV[ " + hb_ntos( i ) + ' ] $ "' + oM:hArgs[ i ]:cTypeHB + '"' + " .AND. " + NEXT + IF " .AND. " $ s + s := substr( s, 1, len( s ) - 7 ) + ENDIF + RETURN s + +/*----------------------------------------------------------------------*/ + +STATIC FUNCTION TY( oM, nArgs ) + LOCAL i, s := "" + FOR i := 1 TO nArgs + s += pad( oM:hArgs[ i ]:cTypeHB, 3 ) + NEXT + RETURN s + +/*----------------------------------------------------------------------*/ + METHOD HbQtSource:buildDocument() LOCAL cText, n, n1, n2, nLen, pWidget, cRet, cLib, cFile, i, cInherits, cHdr @@ -1178,10 +1352,6 @@ METHOD HbQtSource:parseVariables( cProto ) ::buildCppCode( oMtd ) - oMtd:lValid := ! Empty( oMtd:cCmd ) - - aadd( ::aMethods, oMtd ) - RETURN oMtd:lValid /*----------------------------------------------------------------------*/ @@ -1253,6 +1423,7 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) oMtd:cDocNM := THIS_PROPER( oArg:cName ) oMtd:nArgs++ + oMtd:nArgsOpt += iif( oArg:lOptional, 1, 0 ) IF empty( cFirstParamCast ) cFirstParamCast := oArg:cCast @@ -1263,31 +1434,37 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) DO CASE CASE oArg:cCast == "..." - oArg:cBody := "..." - oArg:cDoc := "..." + oArg:cBody := "..." + oArg:cDoc := "..." + oArg:cTypeHB := "..." CASE oArg:cCast == "PHB_ITEM" - oArg:cBody := "hb_param( " + cHBIdx + ", HB_IT_ANY )" - oArg:cDoc := "x" + oMtd:cDocNM + oArg:cBody := "hb_param( " + cHBIdx + ", HB_IT_ANY )" + oArg:cDoc := "x" + oMtd:cDocNM + oArg:cTypeHB := "X" CASE oArg:cCast == "T" - oArg:cBody := "hb_param( " + cHBIdx + ", HB_IT_ANY )" - oArg:cDoc := "x" + oMtd:cDocNM + oArg:cBody := "hb_param( " + cHBIdx + ", HB_IT_ANY )" + oArg:cDoc := "x" + oMtd:cDocNM + oArg:cTypeHB := "X" CASE oArg:cCast $ ::cInt .and. oArg:lFar aadd( oMtd:aPre, { oArg:cCast + " i" + oMtd:cDocNM + " = 0;", oMtd:nHBIdx, "i" + oMtd:cDocNM, "hb_storni" } ) - oArg:cBody := "&i" + oMtd:cDocNM - oArg:cDoc := "@n" + oMtd:cDocNM + oArg:cBody := "&i" + oMtd:cDocNM + oArg:cDoc := "@n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE oArg:cCast $ ::cIntLong .and. oArg:lFar aadd( oMtd:aPre, { oArg:cCast + " i" + oMtd:cDocNM + " = 0;", oMtd:nHBIdx, "i" + oMtd:cDocNM, "hb_stornl" } ) - oArg:cBody := "&i" + oMtd:cDocNM - oArg:cDoc := "@n" + oMtd:cDocNM + oArg:cBody := "&i" + oMtd:cDocNM + oArg:cDoc := "@n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE oArg:cCast $ ::cIntLongLong .and. oArg:lFar aadd( oMtd:aPre, { oArg:cCast + " i" + oMtd:cDocNM + " = 0;", oMtd:nHBIdx, "i" + oMtd:cDocNM, "hb_stornint" } ) - oArg:cBody := "&i" + oMtd:cDocNM - oArg:cDoc := "@n" + oMtd:cDocNM + oArg:cBody := "&i" + oMtd:cDocNM + oArg:cDoc := "@n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE oArg:cCast $ ::cInt IF !empty( oArg:cDefault ) .AND. !( oArg:cDefault == "0" ) @@ -1295,7 +1472,8 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) ELSE oArg:cBody := "hb_parni( " + cHBIdx + " )" ENDIF - oArg:cDoc := "n" + oMtd:cDocNM + oArg:cDoc := "n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE oArg:cCast $ ::cIntLong IF !empty( oArg:cDefault ) .AND. !( oArg:cDefault == "0" ) @@ -1303,7 +1481,8 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) ELSE oArg:cBody := "hb_parnl( " + cHBIdx + " )" ENDIF - oArg:cDoc := "n" + oMtd:cDocNM + oArg:cDoc := "n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE oArg:cCast $ "qlonglong,qulonglong" IF !empty( oArg:cDefault ) .AND. !( oArg:cDefault == "0" ) @@ -1311,7 +1490,8 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) ELSE oArg:cBody := "( " + oArg:cCast + " ) hb_parnint( " + cHBIdx + " )" ENDIF - oArg:cDoc := "n" + oMtd:cDocNM + oArg:cDoc := "n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE oArg:cCast $ ::cIntLongLong IF !empty( oArg:cDefault ) .AND. !( oArg:cDefault == "0" ) @@ -1319,37 +1499,45 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) ELSE oArg:cBody := "hb_parnint( " + cHBIdx + " )" ENDIF - oArg:cDoc := "n" + oMtd:cDocNM + oArg:cDoc := "n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE oArg:cCast $ "double,qreal" .and. oArg:lFar aadd( oMtd:aPre, { "qreal qr" + oMtd:cDocNM + " = 0;", oMtd:nHBIdx, "qr" + oMtd:cDocNM, "hb_stornd" } ) - oArg:cBody := "&qr" + oMtd:cDocNM - oArg:cDoc := "@n" + oMtd:cDocNM + oArg:cBody := "&qr" + oMtd:cDocNM + oArg:cDoc := "@n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE oArg:cCast $ "double,qreal,float" - oArg:cBody := "hb_parnd( " + cHBIdx + " )" - oArg:cDoc := "n" + oMtd:cDocNM + oArg:cBody := "hb_parnd( " + cHBIdx + " )" + oArg:cDoc := "n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE oArg:cCast == "uchar" .and. oArg:lFar .and. !( oArg:lConst ) - oArg:cBody := "( char * ) hb_parc( " + cHBIdx + " )" - oArg:cDoc := "c" + oMtd:cDocNM + oArg:cBody := "( char * ) hb_parc( " + cHBIdx + " )" + oArg:cDoc := "c" + oMtd:cDocNM + oArg:cTypeHB := "C" CASE oArg:cCast == "uchar" .and. !( oArg:lFar ) .and. !( oArg:lConst ) - oArg:cBody := "( char ) hb_parni( " + cHBIdx + " )" - oArg:cDoc := "n" + oMtd:cDocNM + oArg:cBody := "( char ) hb_parni( " + cHBIdx + " )" + oArg:cDoc := "n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE oArg:cCast == "char" .and. oArg:lFar .and. !( oArg:lConst ) - oArg:cBody := "( char * ) hb_parc( " + cHBIdx + " )" - oArg:cDoc := "c" + oMtd:cDocNM + oArg:cBody := "( char * ) hb_parc( " + cHBIdx + " )" + oArg:cDoc := "c" + oMtd:cDocNM + oArg:cTypeHB := "C" CASE oArg:cCast == "char" .and. !( oArg:lFar ) .and. !( oArg:lConst ) - oArg:cBody := "( char ) hb_parni( " + cHBIdx + " )" - oArg:cDoc := "c" + oMtd:cDocNM + oArg:cBody := "( char ) hb_parni( " + cHBIdx + " )" + oArg:cDoc := "c" + oMtd:cDocNM + oArg:cTypeHB := "C" CASE ( "::" $ oArg:cCast ) .and. oArg:lFar aadd( oMtd:aPre, { oArg:cCast + " i" + oMtd:cDocNM + " = ( " + oArg:cCast + " ) 0;", oMtd:nHBIdx, "i" + oMtd:cDocNM, "hb_storni" } ) - oArg:cBody := "&i" + oMtd:cDocNM - oArg:cDoc := "@n" + oMtd:cDocNM + oArg:cBody := "&i" + oMtd:cDocNM + oArg:cDoc := "@n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE ( "::" $ oArg:cCast ) s := "( " + oArg:cCast + " ) hb_parni( " + cHBIdx + " )" @@ -1365,33 +1553,40 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) ELSE oArg:cBody := s ENDIF - oArg:cDoc := "n" + oMtd:cDocNM + oArg:cDoc := "n" + oMtd:cDocNM + oArg:cTypeHB := "N" CASE oArg:cCast == "bool" .and. oArg:lFar aadd( oMtd:aPre, { "bool i" + oMtd:cDocNM + " = 0;", oMtd:nHBIdx, "i" + oMtd:cDocNM, "hb_stornl" } ) - oArg:cBody := "&i" + oMtd:cDocNM - oArg:cDoc := "@l" + oMtd:cDocNM + oArg:cBody := "&i" + oMtd:cDocNM + oArg:cDoc := "@l" + oMtd:cDocNM + oArg:cTypeHB := "L" CASE oArg:cCast == "bool" - oArg:cBody := "hb_parl( " + cHBIdx + " )" - oArg:cDoc := "l" + oMtd:cDocNM + oArg:cBody := "hb_parl( " + cHBIdx + " )" + oArg:cDoc := "l" + oMtd:cDocNM + oArg:cTypeHB := "L" CASE oArg:cCast == "QString" - oArg:cBody := "hb_parstr_utf8( " + cHBIdx + ", &pText, NULL )" - oArg:cDoc := "c" + oMtd:cDocNM + oArg:cBody := "hb_parstr_utf8( " + cHBIdx + ", &pText, NULL )" + oArg:cDoc := "c" + oMtd:cDocNM + oArg:cTypeHB := "C" CASE oArg:cCast == "FT_Face" - oArg:cBody := "hbqt_par_FT_Face( " + cHBIdx + " )" - oArg:cDoc := "c" + oMtd:cDocNM + oArg:cBody := "hbqt_par_FT_Face( " + cHBIdx + " )" + oArg:cDoc := "c" + oMtd:cDocNM + oArg:cTypeHB := "C" CASE oArg:cCast == "QIcon" s := "*hbqt_par_QIcon( " + cHBIdx + " )" - oArg:cBody := "( HB_ISCHAR( " + cHBIdx + " ) ? " + "QIcon( hbqt_par_QString( " + cHBIdx + " ) )" + " : " + s + ")" - oArg:cDoc := "p" + oMtd:cDocNM + oArg:cBody := "( HB_ISCHAR( " + cHBIdx + " ) ? " + "QIcon( hbqt_par_QString( " + cHBIdx + " ) )" + " : " + s + ")" + oArg:cDoc := "p" + oMtd:cDocNM + oArg:cTypeHB := "PCO" CASE oArg:lFar - oArg:cBody := "hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" - oArg:cDoc := "p" + oMtd:cDocNM + oArg:cBody := "hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" + oArg:cDoc := "p" + oMtd:cDocNM + oArg:cTypeHB := "PO" CASE oArg:lAnd .and. oArg:lConst s := "*hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" @@ -1400,19 +1595,23 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) ELSE oArg:cBody := s ENDIF - oArg:cDoc := "p" + oMtd:cDocNM + oArg:cDoc := "p" + oMtd:cDocNM + oArg:cTypeHB := "PO" CASE oArg:lAnd - oArg:cBody := "*hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" - oArg:cDoc := "p" + oMtd:cDocNM + oArg:cBody := "*hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" + oArg:cDoc := "p" + oMtd:cDocNM + oArg:cTypeHB := "PO" CASE oArg:cCast == "QChar" - oArg:cBody := "*hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" - oArg:cDoc := "p" + oMtd:cDocNM + oArg:cBody := "*hbqt_par_" + oArg:cCast + "( " + cHBIdx + " )" + oArg:cDoc := "p" + oMtd:cDocNM + oArg:cTypeHB := "PO" OTHERWISE - oArg:cBody := "" - oArg:cDoc := "" + oArg:cBody := "" /* Just in case */ + oArg:cDoc := "" + oArg:cTypeHB := "" ENDCASE @@ -1421,6 +1620,8 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) NEXT ENDIF + oMtd:nArgsReal := oMtd:nArgs - oMtd:nArgsOpt + IF right( oMtd:cParas, 2 ) == ", " oMtd:cParas := substr( oMtd:cParas, 1, len( oMtd:cParas ) - 2 ) oMtd:cDocs := substr( oMtd:cDocs , 1, len( oMtd:cDocs ) - 2 ) @@ -1428,15 +1629,6 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) ::buildCppCode( oMtd ) - /* Lists to be disabled in parameters - TODO */ - IF "<" $ oMtd:cPar - oMtd:cCmd := "" - ENDIF - - oMtd:lValid := ! Empty( oMtd:cCmd ) - - aadd( ::aMethods, oMtd ) - RETURN oMtd:lValid /*----------------------------------------------------------------------*/ @@ -1577,6 +1769,15 @@ METHOD HbQtSource:buildCppCode( oMtd ) ENDIF ENDCASE + /* Lists to be disabled in parameters - TODO */ + IF "<" $ oMtd:cPar + oMtd:cCmd := "" + ENDIF + + IF ( oMtd:lValid := ! Empty( oMtd:cCmd ) ) + aadd( ::aMethods, oMtd ) + ENDIF + RETURN Self /*----------------------------------------------------------------------*/ @@ -1622,6 +1823,9 @@ CLASS HbqtMethod DATA oRet DATA nArgs INIT 0 // Number of arguments contained + DATA nArgsOpt INIT 0 // Number of optional arguments contained + DATA nArgsReal INIT 0 // Number of minimum arguments to be supplied + DATA hArgs INIT {=>} DATA fBody_ INIT {} diff --git a/harbour/contrib/hbxbp/xbpbrowse.prg b/harbour/contrib/hbxbp/xbpbrowse.prg index caeb968774..005aae225c 100644 --- a/harbour/contrib/hbxbp/xbpbrowse.prg +++ b/harbour/contrib/hbxbp/xbpbrowse.prg @@ -749,6 +749,7 @@ METHOD XbpBrowse:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::oGridLayout:setHorizontalSpacing( 0 ) ::oGridLayout:setVerticalSpacing( 0 ) /* Rows */ +#if 0 ::oGridLayout:addWidget_1( ::oLeftView , 0, 0, 1, 1 ) ::oGridLayout:addWidget_1( ::oLeftFooterView , 1, 0, 1, 1 ) // @@ -761,7 +762,20 @@ METHOD XbpBrowse:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::oGridLayout:addWidget_1( ::oHScrollBar , 2, 0, 1, 3 ) /* Columns */ ::oGridLayout:addWidget_1( ::oVScrollBar , 0, 3, 2, 1 ) - +#else + ::oGridLayout:addWidget( ::oLeftView , 0, 0, 1, 1 ) + ::oGridLayout:addWidget( ::oLeftFooterView , 1, 0, 1, 1 ) + // + ::oGridLayout:addWidget( ::oTableView , 0, 1, 1, 1 ) + ::oGridLayout:addWidget( ::oFooterView , 1, 1, 1, 1 ) + // + ::oGridLayout:addWidget( ::oRightView , 0, 2, 1, 1 ) + ::oGridLayout:addWidget( ::oRightFooterView, 1, 2, 1, 1 ) + // + ::oGridLayout:addWidget( ::oHScrollBar , 2, 0, 1, 3 ) + /* Columns */ + ::oGridLayout:addWidget( ::oVScrollBar , 0, 3, 2, 1 ) +#endif IF ::visible ::show() ENDIF diff --git a/harbour/contrib/hbxbp/xbplistbox.prg b/harbour/contrib/hbxbp/xbplistbox.prg index 7fcba97066..71a23c9cf3 100644 --- a/harbour/contrib/hbxbp/xbplistbox.prg +++ b/harbour/contrib/hbxbp/xbplistbox.prg @@ -338,7 +338,9 @@ METHOD XbpListBox:destroy() METHOD XbpListBox:addItem( cItem ) LOCAL qItm := QListWidgetItem() - qItm:setText( cItem ) ; ::oWidget:addItem_1( qItm ) + qItm:setText( cItem ) + //::oWidget:addItem_1( qItm ) + ::oWidget:addItem( qItm ) aadd( ::aItems, qItm ) RETURN len( ::aItems )