fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-10-12 22:20 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* 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 )
This commit is contained in:
Pritpal Bedi
2010-10-13 05:26:33 +00:00
parent d5180e5680
commit 3b7b686f85
26 changed files with 109 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
harbour/ChangeLog
View File

@@ -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.

26
harbour/contrib/hbide/hbqreportsmanager.prg
View File

@@ -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"

2
harbour/contrib/hbide/hbqtoolbar.prg
View File

@@ -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"

4
harbour/contrib/hbide/idebrowse.prg
View File

@@ -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()

12
harbour/contrib/hbide/idedocks.prg
View File

@@ -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()

4
harbour/contrib/hbide/ideedit.prg
View File

@@ -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

2
harbour/contrib/hbide/ideeditor.prg
View File

@@ -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

4
harbour/contrib/hbide/ideharbourhelp.prg
View File

@@ -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 )

6
harbour/contrib/hbide/idehome.prg
View File

@@ -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()

2
harbour/contrib/hbide/idemain.prg
View File

@@ -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() )

2
harbour/contrib/hbide/idethemes.prg
View File

@@ -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 )

2
harbour/contrib/hbqt/qtcore/hbqt_misc.prg
View File

@@ -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 )

8
harbour/contrib/hbqt/qtgui/THbQtUI.prg
View File

@@ -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()

2
harbour/contrib/hbxbp/xbp3state.prg
View File

@@ -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

7
harbour/contrib/hbxbp/xbpbrowse.prg
View File

@@ -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 */

2
harbour/contrib/hbxbp/xbpcheckbox.prg
View File

@@ -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

2
harbour/contrib/hbxbp/xbpcombobox.prg
View File

@@ -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 )

2
harbour/contrib/hbxbp/xbpmle.prg
View File

@@ -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

2
harbour/contrib/hbxbp/xbppushbutton.prg
View File

@@ -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 )

2
harbour/contrib/hbxbp/xbpradiobutton.prg
View File

@@ -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

2
harbour/contrib/hbxbp/xbpscrollbar.prg
View File

@@ -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

2
harbour/contrib/hbxbp/xbpsle.prg
View File

@@ -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

2
harbour/contrib/hbxbp/xbpspinbutton.prg
View File

@@ -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

82
harbour/contrib/hbxbp/xbpstatic.prg
View File

@@ -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

2
harbour/contrib/hbxbp/xbpstatusbar.prg
View File

@@ -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

2
harbour/contrib/hbxbp/xbptabpage.prg
View File

@@ -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