From 3b7b686f852d13bc629465c778b86c4e89dd0a4b Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Wed, 13 Oct 2010 05:26:33 +0000 Subject: [PATCH] 2010-10-12 22:20 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/hbqt_misc.prg * contrib/hbqt/qtgui/THbQtUI.prg * contrib/hbxbp/xbp3state.prg * contrib/hbxbp/xbpbrowse.prg * contrib/hbxbp/xbpcheckbox.prg * contrib/hbxbp/xbpcombobox.prg * contrib/hbxbp/xbpmle.prg * contrib/hbxbp/xbppushbutton.prg * contrib/hbxbp/xbpradiobutton.prg * contrib/hbxbp/xbpscrollbar.prg * contrib/hbxbp/xbpsle.prg * contrib/hbxbp/xbpspinbutton.prg * contrib/hbxbp/xbpstatic.prg * contrib/hbxbp/xbpstatusbar.prg * contrib/hbxbp/xbptabpage.prg * contrib/hbide/hbqreportsmanager.prg * contrib/hbide/hbqtoolbar.prg * contrib/hbide/idebrowse.prg * contrib/hbide/idedocks.prg * contrib/hbide/ideedit.prg * contrib/hbide/ideeditor.prg * contrib/hbide/ideharbourhelp.prg * contrib/hbide/idehome.prg * contrib/hbide/idemain.prg * contrib/hbide/idethemes.prg % Optimized: Q*Class():from( pPtr ) => HB_Q*Class():from( pPtr ) --- harbour/ChangeLog | 30 ++++++++ harbour/contrib/hbide/hbqreportsmanager.prg | 26 +++---- harbour/contrib/hbide/hbqtoolbar.prg | 2 +- harbour/contrib/hbide/idebrowse.prg | 4 +- harbour/contrib/hbide/idedocks.prg | 12 +-- harbour/contrib/hbide/ideedit.prg | 4 +- harbour/contrib/hbide/ideeditor.prg | 2 +- harbour/contrib/hbide/ideharbourhelp.prg | 4 +- harbour/contrib/hbide/idehome.prg | 6 +- harbour/contrib/hbide/idemain.prg | 2 +- harbour/contrib/hbide/idethemes.prg | 2 +- harbour/contrib/hbqt/qtcore/hbqt_misc.prg | 2 +- harbour/contrib/hbqt/qtgui/THbQtUI.prg | 8 +- harbour/contrib/hbxbp/xbp3state.prg | 2 +- harbour/contrib/hbxbp/xbpbrowse.prg | 7 +- harbour/contrib/hbxbp/xbpcheckbox.prg | 2 +- harbour/contrib/hbxbp/xbpcombobox.prg | 2 +- harbour/contrib/hbxbp/xbpmle.prg | 2 +- harbour/contrib/hbxbp/xbppushbutton.prg | 2 +- harbour/contrib/hbxbp/xbpradiobutton.prg | 2 +- harbour/contrib/hbxbp/xbpscrollbar.prg | 2 +- harbour/contrib/hbxbp/xbpsle.prg | 2 +- harbour/contrib/hbxbp/xbpspinbutton.prg | 2 +- harbour/contrib/hbxbp/xbpstatic.prg | 82 +++++++-------------- harbour/contrib/hbxbp/xbpstatusbar.prg | 2 +- harbour/contrib/hbxbp/xbptabpage.prg | 2 +- 26 files changed, 109 insertions(+), 106 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index afbb03cf81..2ce9e13e6f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,36 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-12 22:20 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtcore/hbqt_misc.prg + * contrib/hbqt/qtgui/THbQtUI.prg + + * contrib/hbxbp/xbp3state.prg + * contrib/hbxbp/xbpbrowse.prg + * contrib/hbxbp/xbpcheckbox.prg + * contrib/hbxbp/xbpcombobox.prg + * contrib/hbxbp/xbpmle.prg + * contrib/hbxbp/xbppushbutton.prg + * contrib/hbxbp/xbpradiobutton.prg + * contrib/hbxbp/xbpscrollbar.prg + * contrib/hbxbp/xbpsle.prg + * contrib/hbxbp/xbpspinbutton.prg + * contrib/hbxbp/xbpstatic.prg + * contrib/hbxbp/xbpstatusbar.prg + * contrib/hbxbp/xbptabpage.prg + + * contrib/hbide/hbqreportsmanager.prg + * contrib/hbide/hbqtoolbar.prg + * contrib/hbide/idebrowse.prg + * contrib/hbide/idedocks.prg + * contrib/hbide/ideedit.prg + * contrib/hbide/ideeditor.prg + * contrib/hbide/ideharbourhelp.prg + * contrib/hbide/idehome.prg + * contrib/hbide/idemain.prg + * contrib/hbide/idethemes.prg + % Optimized: Q*Class():from( pPtr ) => HB_Q*Class():from( pPtr ) + 2010-10-12 18:22 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idefindreplace.prg ! Fixed: another regression. diff --git a/harbour/contrib/hbide/hbqreportsmanager.prg b/harbour/contrib/hbide/hbqreportsmanager.prg index eb34091ffc..f9c6fac185 100644 --- a/harbour/contrib/hbide/hbqreportsmanager.prg +++ b/harbour/contrib/hbide/hbqreportsmanager.prg @@ -428,7 +428,7 @@ METHOD HbqReportsManager:execEvent( cEvent, p, p1, p2 ) SWITCH cEvent CASE "graphicsScene_block" - qEvent := QGraphicsSceneDragDropEvent():from( p1 ) + qEvent := HB_QGraphicsSceneDragDropEvent():from( p1 ) DO CASE CASE p == 21001 @@ -507,7 +507,7 @@ METHOD HbqReportsManager:execEvent( cEvent, p, p1, p2 ) EXIT CASE "treeObjects_clicked" - qItem := QTreeWidgetItem():from( p ) + qItem := HB_QTreeWidgetItem():from( p ) IF hb_hHasKey( ::hItems, qItem:text( 0 ) ) ::qScene:clearSelection() //::hItems[ qItem:text( 0 ) ]:setSelected( .t. ) @@ -532,7 +532,7 @@ METHOD HbqReportsManager:execEvent( cEvent, p, p1, p2 ) EXIT ENDIF - qEvent := QMouseEvent():from( p ) + qEvent := HB_QMouseEvent():from( p ) qRC := QRect( ::qPos:x() - 5, ::qPos:y() - 5, 10, 10 ):normalized() IF qRC:contains( qEvent:pos() ) @@ -564,7 +564,7 @@ METHOD HbqReportsManager:execEvent( cEvent, p, p1, p2 ) ::pAct := NIL EXIT CASE "QEvent_MousePressMenu" - qEvent := QMouseEvent():from( p ) + qEvent := HB_QMouseEvent():from( p ) ::qPos := qEvent:pos() ::qAct := ::qShapesMenu:actionAt( qEvent:pos() ) EXIT @@ -1065,7 +1065,7 @@ METHOD HbqReportsManager:zoom( nMode ) METHOD HbqReportsManager:contextMenuScene( p1 ) LOCAL qMenu, qEvent, qAct - qEvent := QGraphicsSceneContextMenuEvent():from( p1 ) + qEvent := HB_QGraphicsSceneContextMenuEvent():from( p1 ) qMenu := QMenu( ::qView ) qMenu:addAction( "Refresh" ) @@ -1089,7 +1089,7 @@ METHOD HbqReportsManager:contextMenuItem( p1, p2 ) HB_SYMBOL_UNUSED( p2 ) - qEvent := QGraphicsSceneContextMenuEvent():from( p1 ) + qEvent := HB_QGraphicsSceneContextMenuEvent():from( p1 ) qMenu := QMenu() qMenu:addAction( "Cut" ) @@ -1531,7 +1531,7 @@ METHOD HbqReportsManager:printPreview( qPrinter ) /*----------------------------------------------------------------------*/ METHOD HbqReportsManager:paintRequested( pPrinter ) - LOCAL qPrinter := QPrinter():from( pPrinter ) + LOCAL qPrinter := HB_QPrinter():from( pPrinter ) ::printReport( qPrinter ) @@ -1799,7 +1799,7 @@ METHOD HqrGraphicsItem:execEvent( cEvent, p, p1, p2 ) ::oRM:objectSelected( Self ) CASE p == 21017 - //qPainter := QPainter():from( p1 ) + //qPainter := HB_QPainter():from( p1 ) qPainter := HB_QPainter():from( p1 ) qRect := HB_QRectF():from( p2 ) ::draw( qPainter, qRect ) @@ -1815,19 +1815,19 @@ METHOD HqrGraphicsItem:execEvent( cEvent, p, p1, p2 ) /*----------------------------------------------------------------------*/ METHOD HqrGraphicsItem:contextMenu( p1, p2 ) - LOCAL qMenu, qEvent, pAct + LOCAL qMenu, qEvent, qAct HB_SYMBOL_UNUSED( p2 ) - qEvent := QGraphicsSceneContextMenuEvent():from( p1 ) + qEvent := HB_QGraphicsSceneContextMenuEvent():from( p1 ) qMenu := QMenu() qMenu:addAction( "Cut" ) qMenu:addAction( "Copy" ) - pAct := qMenu:exec( qEvent:screenPos() ) - IF pAct:isValidObject() - SWITCH ( QAction():configure( pAct ) ):text() + qAct := qMenu:exec( qEvent:screenPos() ) + IF qAct:isValidObject() + SWITCH qAct:text() CASE "Cut" EXIT CASE "Copy" diff --git a/harbour/contrib/hbide/hbqtoolbar.prg b/harbour/contrib/hbide/hbqtoolbar.prg index 0406177d29..b7b4f558af 100644 --- a/harbour/contrib/hbide/hbqtoolbar.prg +++ b/harbour/contrib/hbide/hbqtoolbar.prg @@ -160,7 +160,7 @@ METHOD HbqToolbar:destroy() METHOD HbqToolbar:execEvent( cEvent, p, p1 ) LOCAL qEvent, qRC - qEvent := QMouseEvent():from( p ) + qEvent := HB_QMouseEvent():from( p ) SWITCH cEvent CASE "QEvent_MouseLeave" diff --git a/harbour/contrib/hbide/idebrowse.prg b/harbour/contrib/hbide/idebrowse.prg index ce4a2ce63b..61e0674203 100644 --- a/harbour/contrib/hbide/idebrowse.prg +++ b/harbour/contrib/hbide/idebrowse.prg @@ -493,12 +493,12 @@ METHOD IdeBrowseManager:execEvent( cEvent, p, p1 ) SWITCH cEvent CASE "dockDbu_dragEnterEvent" - qEvent := QDragEnterEvent():from( p ) + qEvent := HB_QDragEnterEvent():from( p ) qEvent:acceptProposedAction() EXIT CASE "dockDbu_dropEvent" - qEvent := QDropEvent():from( p ) + qEvent := HB_QDropEvent():from( p ) qMime := qEvent:mimeData() IF qMime:hasUrls() qList := qMime:hbUrlList() diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 37dada1835..1eb0e90b47 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -541,13 +541,13 @@ METHOD IdeDocks:execEvent( cEvent, p, p1 ) EXIT CASE "QEvent_WindowStateChange" - qEvent := QWindowStateChangeEvent():from( p ) + qEvent := HB_QWindowStateChangeEvent():from( p ) ::nPrevWindowState := qEvent:oldState() EXIT CASE "QEvent_Hide" IF ::lSystemTrayAvailable .AND. ::lMinimizeInSystemTray - qEvent := QHideEvent():from( p ) + qEvent := HB_QHideEvent():from( p ) IF ! ::lChanging ::lChanging := .t. IF qEvent:spontaneous() @@ -590,12 +590,12 @@ METHOD IdeDocks:execEvent( cEvent, p, p1 ) EXIT CASE "editWidget_dragEnterEvent" - qEvent := QDragEnterEvent():from( p ) + qEvent := HB_QDragEnterEvent():from( p ) qEvent:acceptProposedAction() EXIT CASE "editWidget_dropEvent" - qEvent := QDropEvent():from( p ) + qEvent := HB_QDropEvent():from( p ) qMime := qEvent:mimeData() IF qMime:hasUrls() qList := qMime:hbUrlList() @@ -610,12 +610,12 @@ METHOD IdeDocks:execEvent( cEvent, p, p1 ) CASE "projectTree_dragEnterEvent" HB_TRACE( HB_TR_DEBUG, "projectTree_dragEnterEvent" ) - QDragEnterEvent():from( p ):acceptProposedAction() + HB_QDragEnterEvent():from( p ):acceptProposedAction() EXIT CASE "projectTree_dropEvent" HB_TRACE( HB_TR_DEBUG, "projectTree_dropEvent" ) - qEvent := QDropEvent():from( p ) + qEvent := HB_QDropEvent():from( p ) qMime := qEvent:mimeData() IF qMime:hasUrls() qList := qMime:hbUrlList() diff --git a/harbour/contrib/hbide/ideedit.prg b/harbour/contrib/hbide/ideedit.prg index e22199d92c..8b528806f6 100644 --- a/harbour/contrib/hbide/ideedit.prg +++ b/harbour/contrib/hbide/ideedit.prg @@ -604,7 +604,7 @@ METHOD IdeEdit:execKeyEvent( nMode, nEvent, p, p1 ) SWITCH nEvent CASE QEvent_KeyPress - qEvent := QKeyEvent():from( p ) + qEvent := HB_QKeyEvent():from( p ) key := qEvent:key() kbm := qEvent:modifiers() @@ -1856,7 +1856,7 @@ METHOD IdeEdit:printPreview() METHOD IdeEdit:paintRequested( pPrinter ) LOCAL qPrinter - qPrinter := QPrinter():from( pPrinter ) + qPrinter := HB_QPrinter():from( pPrinter ) ::qEdit:print( qPrinter ) RETURN Self diff --git a/harbour/contrib/hbide/ideeditor.prg b/harbour/contrib/hbide/ideeditor.prg index 70cd4165a0..92ae922d69 100644 --- a/harbour/contrib/hbide/ideeditor.prg +++ b/harbour/contrib/hbide/ideeditor.prg @@ -1012,7 +1012,7 @@ METHOD IdeEditsManager:printPreview() METHOD IdeEditsManager:paintRequested( pPrinter ) LOCAL qPrinter - qPrinter := QPrinter():from( pPrinter ) + qPrinter := HB_QPrinter():from( pPrinter ) ::qCurEdit:print( qPrinter ) RETURN Self diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg index d0b6858d6b..03ae327306 100644 --- a/harbour/contrib/hbide/ideharbourhelp.prg +++ b/harbour/contrib/hbide/ideharbourhelp.prg @@ -430,7 +430,7 @@ METHOD IdeHarbourHelp:execEvent( nMode, p, p1 ) EXIT CASE "browserView_anchorClicked" - qUrl := QUrl():from( p ) + qUrl := HB_QUrl():from( p ) cText := lower( qUrl:toString() ) nLen := len( cText ) IF ( n := ascan( ::aFunctions, {|e_| left( e_[ 6 ], nLen ) == cText } ) ) > 0 @@ -1313,7 +1313,7 @@ METHOD IdeHarbourHelp:print() /*----------------------------------------------------------------------*/ METHOD IdeHarbourHelp:paintRequested( pPrinter ) - LOCAL qPrinter := QPrinter():configure( pPrinter ) + LOCAL qPrinter := HB_QPrinter():from( pPrinter ) ::oUI:q_browserView:print( qPrinter ) diff --git a/harbour/contrib/hbide/idehome.prg b/harbour/contrib/hbide/idehome.prg index 19eab50cda..daf848cd1f 100644 --- a/harbour/contrib/hbide/idehome.prg +++ b/harbour/contrib/hbide/idehome.prg @@ -182,7 +182,7 @@ METHOD IdeHome:execEvent( nMode, p ) ENDIF CASE nMode == browserStat_anchorClicked - qUrl := QUrl():from( p ) + qUrl := HB_QUrl():from( p ) cText := lower( qUrl:toString() ) IF "prj-" $ cText @@ -250,7 +250,7 @@ METHOD IdeHome:print() /*----------------------------------------------------------------------*/ METHOD IdeHome:paintRequested( pPrinter ) - LOCAL qPrinter := QPrinter():configure( pPrinter ) + LOCAL qPrinter := HB_QPrinter():from( pPrinter ) ::qCurBrowser:print( qPrinter ) @@ -289,7 +289,7 @@ METHOD IdeHome:buildWelcomeTab() ::qWelcomeBrowser := qBrw ::qCurBrowser := qBrw - qBrw:connect( "anchorClicked(QUrl)" , {|p| ::execEvent( browserStat_anchorClicked, p ) } ) + qBrw:connect( "anchorClicked(QUrl)" , {|p| ::execEvent( browserStat_anchorClicked , p ) } ) qBrw:connect( "customContextMenuRequested(QPoint)", {|p| ::execEvent( browserWelcome_contextMenuRequested, p ) } ) qSList := QStringList() diff --git a/harbour/contrib/hbide/idemain.prg b/harbour/contrib/hbide/idemain.prg index b677015a39..f2ce5cb3ca 100644 --- a/harbour/contrib/hbide/idemain.prg +++ b/harbour/contrib/hbide/idemain.prg @@ -1444,7 +1444,7 @@ METHOD HbIde:setCodec( cCodec ) /*----------------------------------------------------------------------*/ METHOD HbIde:testPainter( qPainter ) - LOCAL qP := QPainter():from( qPainter ) + LOCAL qP := HB_QPainter():from( qPainter ) HB_TRACE( HB_TR_DEBUG, "qPainter:isActive()", qP:isActive() ) diff --git a/harbour/contrib/hbide/idethemes.prg b/harbour/contrib/hbide/idethemes.prg index 92844f6e77..d582fd59ec 100644 --- a/harbour/contrib/hbide/idethemes.prg +++ b/harbour/contrib/hbide/idethemes.prg @@ -751,7 +751,7 @@ METHOD IdeThemes:selectThemeProc( nMode, p ) DO CASE CASE nMode == 1 - qModalIndex := QModelIndex():from( p ) + qModalIndex := HB_QModelIndex():from( p ) ::cSelTheme := ::aThemes[ qModalIndex:row() + 1, 1 ] ::oSL:done( 1 ) diff --git a/harbour/contrib/hbqt/qtcore/hbqt_misc.prg b/harbour/contrib/hbqt/qtcore/hbqt_misc.prg index 4dd9d838c0..3a1b9fc372 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_misc.prg +++ b/harbour/contrib/hbqt/qtcore/hbqt_misc.prg @@ -128,7 +128,7 @@ METHOD HbQtObjectHandler:connect( cnEvent, bBlock ) IF Empty( ::pEvents ) ::pEvents := Qt_Events_New() - ::installEventFilter( HBQEvents():from( ::pEvents ) ) + ::installEventFilter( HB_HBQEvents():from( ::pEvents ) ) ENDIF RETURN Qt_Events_Connect( ::pEvents, ::pPtr, cnEvent, bBlock ) diff --git a/harbour/contrib/hbqt/qtgui/THbQtUI.prg b/harbour/contrib/hbqt/qtgui/THbQtUI.prg index 17a5c8ccb3..521ea5711f 100644 --- a/harbour/contrib/hbqt/qtgui/THbQtUI.prg +++ b/harbour/contrib/hbqt/qtgui/THbQtUI.prg @@ -246,13 +246,13 @@ METHOD HbQtUI:loadUI( cUiFull, qParent ) pWidget := qUiLoader:load( qFile, qParent ) DO CASE CASE ::widgets[ 1,1 ] == "QWidget" - oWidget := QWidget():from( pWidget ) + oWidget := HB_QWidget():from( pWidget ) CASE ::widgets[ 1,1 ] == "QDialog" - oWidget := QDialog():from( pWidget ) + oWidget := HB_QDialog():from( pWidget ) CASE ::widgets[ 1,1 ] == "QMainWindow" - oWidget := QMainWindow():from( pWidget ) + oWidget := HB_QMainWindow():from( pWidget ) OTHERWISE - oWidget := QWidget():from( pWidget ) + oWidget := HB_QWidget():from( pWidget ) ENDCASE #endif qFile:close() diff --git a/harbour/contrib/hbxbp/xbp3state.prg b/harbour/contrib/hbxbp/xbp3state.prg index 67fc87e00f..f64bc4f723 100644 --- a/harbour/contrib/hbxbp/xbp3state.prg +++ b/harbour/contrib/hbxbp/xbp3state.prg @@ -135,7 +135,7 @@ METHOD Xbp3State:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, l ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - ::oWidget := QCheckBox():from( pQtObject ) + ::oWidget := HB_QCheckBox():from( pQtObject ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpbrowse.prg b/harbour/contrib/hbxbp/xbpbrowse.prg index 3d3b157c01..acf9cb8612 100644 --- a/harbour/contrib/hbxbp/xbpbrowse.prg +++ b/harbour/contrib/hbxbp/xbpbrowse.prg @@ -566,8 +566,8 @@ METHOD XbpBrowse:connect() ::oWidget : connect( QEvent_Resize , {| | ::execSlot( __ev_frame_resized__ ) } ) - ::qDelegate : connect( "closeEditor(QWidget,int)" , {|p,p1 | ::execSlot( __editor_closeEditor__, p, p1 ) } ) - ::qDelegate : connect( "commitData(QWidget)" , {|p | ::execSlot( __editor_commitData__ , p ) } ) +HB_TRACE( HB_TR_ALWAYS, ::qDelegate : connect( "closeEditor(QWidget,int)" , {|p,p1 | ::execSlot( __editor_closeEditor__, p, p1 ) } )) +HB_TRACE( HB_TR_ALWAYS, ::qDelegate : connect( "commitData(QWidget)" , {|p | ::execSlot( __editor_commitData__ , p ) } )) RETURN Self @@ -976,6 +976,7 @@ METHOD XbpBrowse:manageCommitData( pWidget ) LOCAL oCol := ::columns[ ::colPos ] LOCAL cTyp := valtype( eval( oCol:block ) ) + HB_TRACE( HB_TR_ALWAYS, cTxt ) DO CASE CASE cTyp == "C" oCol:setData( cTxt ) @@ -994,7 +995,7 @@ METHOD XbpBrowse:manageCommitData( pWidget ) METHOD XbpBrowse:manageEditorClosed( pWidget, nHint ) HB_QLineEdit():from( pWidget ):close() - +HB_TRACE( HB_TR_ALWAYS, nHint, QAbstractItemDelegate_NoHint, QAbstractItemDelegate_SubmitModelCache ) DO CASE CASE nHint == QAbstractItemDelegate_NoHint /* 0 RETURN is presses */ diff --git a/harbour/contrib/hbxbp/xbpcheckbox.prg b/harbour/contrib/hbxbp/xbpcheckbox.prg index b98e665c2d..20c6749bfe 100644 --- a/harbour/contrib/hbxbp/xbpcheckbox.prg +++ b/harbour/contrib/hbxbp/xbpcheckbox.prg @@ -134,7 +134,7 @@ METHOD XbpCheckBox:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - ::oWidget := QCheckBox():from( pQtObject ) + ::oWidget := HB_QCheckBox():from( pQtObject ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpcombobox.prg b/harbour/contrib/hbxbp/xbpcombobox.prg index 9175601fe8..75ade93a73 100644 --- a/harbour/contrib/hbxbp/xbpcombobox.prg +++ b/harbour/contrib/hbxbp/xbpcombobox.prg @@ -164,7 +164,7 @@ METHOD XbpComboBox:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - ::oWidget := QComboBox():from( pQtObject ) + ::oWidget := HB_QComboBox():from( pQtObject ) ELSE ::oSLE := XbpSLE():new():create( ::oParent, ::oOwner, ::aPos, ::aSize, ::aPresParams, ::lVisible ) ::oLB := XbpListBox():new():create( ::oParent, ::oOwner, ::aPos, ::aSize, ::aPresParams, ::lVisible ) diff --git a/harbour/contrib/hbxbp/xbpmle.prg b/harbour/contrib/hbxbp/xbpmle.prg index 33e337bd8e..d4b9baa286 100644 --- a/harbour/contrib/hbxbp/xbpmle.prg +++ b/harbour/contrib/hbxbp/xbpmle.prg @@ -191,7 +191,7 @@ METHOD XbpMLE:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVis ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - ::oWidget := QPlainTextEdit():from( pQtObject ) + ::oWidget := HB_QPlainTextEdit():from( pQtObject ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbppushbutton.prg b/harbour/contrib/hbxbp/xbppushbutton.prg index 74ebd45184..c85fba3836 100644 --- a/harbour/contrib/hbxbp/xbppushbutton.prg +++ b/harbour/contrib/hbxbp/xbppushbutton.prg @@ -146,7 +146,7 @@ METHOD XbpPushButton:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParam ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - ::oWidget := QPushButton():from( pQtObject ) + ::oWidget := HB_QPushButton():from( pQtObject ) ELSE ::oWidget := QPushButton( ::oParent:oWidget ) diff --git a/harbour/contrib/hbxbp/xbpradiobutton.prg b/harbour/contrib/hbxbp/xbpradiobutton.prg index e1b9027a80..fb7210f5c6 100644 --- a/harbour/contrib/hbxbp/xbpradiobutton.prg +++ b/harbour/contrib/hbxbp/xbpradiobutton.prg @@ -133,7 +133,7 @@ METHOD XbpRadioButton:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresPara ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - ::oWidget := QRadioButton():from( pQtObject ) + ::oWidget := HB_QRadioButton():from( pQtObject ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpscrollbar.prg b/harbour/contrib/hbxbp/xbpscrollbar.prg index d2c7f03517..da7c8c357f 100644 --- a/harbour/contrib/hbxbp/xbpscrollbar.prg +++ b/harbour/contrib/hbxbp/xbpscrollbar.prg @@ -138,7 +138,7 @@ METHOD XbpScrollBar:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - ::oWidget := QScrollBar():from( pQtObject ) + ::oWidget := HB_QScrollBar():from( pQtObject ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpsle.prg b/harbour/contrib/hbxbp/xbpsle.prg index 4849fc1191..16601181b7 100644 --- a/harbour/contrib/hbxbp/xbpsle.prg +++ b/harbour/contrib/hbxbp/xbpsle.prg @@ -170,7 +170,7 @@ METHOD XbpSLE:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVis ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - ::oWidget := QLineEdit():from( pQtObject ) + ::oWidget := HB_QLineEdit():from( pQtObject ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpspinbutton.prg b/harbour/contrib/hbxbp/xbpspinbutton.prg index a626dc84e1..20cd513ddf 100644 --- a/harbour/contrib/hbxbp/xbpspinbutton.prg +++ b/harbour/contrib/hbxbp/xbpspinbutton.prg @@ -168,7 +168,7 @@ METHOD XbpSpinButton:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParam ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - ::oWidget := QSpinBox():from( pQtObject ) + ::oWidget := HB_QSpinBox():from( pQtObject ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpstatic.prg b/harbour/contrib/hbxbp/xbpstatic.prg index aae6c0c6b6..fb0460c149 100644 --- a/harbour/contrib/hbxbp/xbpstatic.prg +++ b/harbour/contrib/hbxbp/xbpstatic.prg @@ -253,62 +253,34 @@ METHOD XbpStatic:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, l ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - DO CASE - CASE ::type == XBPSTATIC_TYPE_TEXT - ::oWidget := QLabel():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_GROUPBOX - ::oWidget := QGroupBox():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_RAISEDBOX - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_RECESSEDBOX - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_RAISEDRECT - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_RECESSEDRECT - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_FGNDFRAME // rectangle in foreground color, not filled - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_BGNDFRAME - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_FGNDRECT - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_BGNDRECT - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_HALFTONERECT - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_HALFTONEFRAME - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_RAISEDLINE - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_RECESSEDLINE - ::oWidget := QFrame():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_ICON - ::oWidget := QLabel():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_SYSICON - ::oWidget := QLabel():from( pQtObject ) - - CASE ::type == XBPSTATIC_TYPE_BITMAP - ::oWidget := QLabel():from( pQtObject ) - + SWITCH ::type + CASE XBPSTATIC_TYPE_ICON + CASE XBPSTATIC_TYPE_SYSICON + CASE XBPSTATIC_TYPE_BITMAP + CASE XBPSTATIC_TYPE_TEXT + ::oWidget := HB_QLabel():from( pQtObject ) + EXIT + CASE XBPSTATIC_TYPE_GROUPBOX + ::oWidget := HB_QGroupBox():from( pQtObject ) + EXIT + CASE XBPSTATIC_TYPE_RAISEDBOX + CASE XBPSTATIC_TYPE_RECESSEDBOX + CASE XBPSTATIC_TYPE_RAISEDRECT + CASE XBPSTATIC_TYPE_RECESSEDRECT + CASE XBPSTATIC_TYPE_FGNDFRAME // rectangle in foreground color, not filled + CASE XBPSTATIC_TYPE_BGNDFRAME + CASE XBPSTATIC_TYPE_FGNDRECT + CASE XBPSTATIC_TYPE_BGNDRECT + CASE XBPSTATIC_TYPE_HALFTONERECT + CASE XBPSTATIC_TYPE_HALFTONEFRAME + CASE XBPSTATIC_TYPE_RAISEDLINE + CASE XBPSTATIC_TYPE_RECESSEDLINE + ::oWidget := HB_QFrame():from( pQtObject ) + EXIT OTHERWISE - ::oWidget := QFrame():from( pQtObject ) - - ENDCASE + ::oWidget := HB_QFrame():from( pQtObject ) + EXIT + ENDSWITCH ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbpstatusbar.prg b/harbour/contrib/hbxbp/xbpstatusbar.prg index 5a2263eb1b..20ab24291c 100644 --- a/harbour/contrib/hbxbp/xbpstatusbar.prg +++ b/harbour/contrib/hbxbp/xbpstatusbar.prg @@ -144,7 +144,7 @@ METHOD XbpStatusBar:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - ::oWidget := QStatusBar():from( pQtObject ) + ::oWidget := HB_QStatusBar():from( pQtObject ) ENDIF RETURN Self diff --git a/harbour/contrib/hbxbp/xbptabpage.prg b/harbour/contrib/hbxbp/xbptabpage.prg index a18aafcb50..f7f8fa354c 100644 --- a/harbour/contrib/hbxbp/xbptabpage.prg +++ b/harbour/contrib/hbxbp/xbptabpage.prg @@ -158,7 +158,7 @@ METHOD XbpTabPage:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, ::xbpWindow:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF hb_isPointer( pQtObject ) - ::oWidget := QWidget():from( pQtObject ) + ::oWidget := HB_QWidget():from( pQtObject ) ENDIF