2009-12-19 09:14 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

* contrib/hbide/hbide.prg * contrib/hbxbp/xbpqtuiloader.prg * contrib/hbxbp/xbpstatusbar.prg ! Removed QT_PTROF() and QT_PTROFXBP() macro calls entirely. We can delete these macros alltogether.
2009-12-19 17:17:29 +00:00
parent 632842e7db
commit a56f87bc97
4 changed files with 39 additions and 32 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-12-19 09:14 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * contrib/hbide/hbide.prg
+  * contrib/hbxbp/xbpqtuiloader.prg
+  * contrib/hbxbp/xbpstatusbar.prg
+    ! Removed QT_PTROF() and QT_PTROFXBP() macro calls entirely.
+      We can delete these macros alltogether.
+
 2009-12-19 08:15 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
  * contrib/hbxbp/xbpbrowse.prg
  * contrib/hbxbp/xbprtf.prg
--- a/harbour/contrib/hbide/hbide.prg
+++ b/harbour/contrib/hbide/hbide.prg
@@ -300,12 +300,12 @@ METHOD HbIde:create( cProjIni )

   ::oDa:oWidget:setLayout( ::qLayout )

-   ::qSplitter := QSplitter():new( QT_PTROFXBP( ::oDa ) )
+   ::qSplitter := QSplitter():new( ::oDa:oWidget )

   ::qLayout:addWidget_1( ::qSplitter, 0, 0, 1, 1 )

-   ::qSplitter:addWidget( QT_PTROFXBP( ::oProjTree      ) )
-   ::qSplitter:addWidget( QT_PTROFXBP( ::oDa:oTabWidget ) )
+   ::qSplitter:addWidget( ::oProjTree:oWidget )
+   ::qSplitter:addWidget( ::oDa:oTabWidget:oWidget )

   ::qSplitter:show()

@@ -426,7 +426,7 @@ METHOD HbIde:saveConfig()
   aadd( txt_, "[FILES]" )
   FOR n := 1 TO nTabs
      pTab      := ::qTabWidget:widget( n-1 )
-      nTab      := ascan( ::aTabs, {|e_| hbqt_IsEqualGcQtPointer( QT_PTROFXBP( e_[ 1 ] ), pTab ) } )
+      nTab      := ascan( ::aTabs, {|e_| hbqt_IsEqualGcQtPointer( e_[ 1 ]:oWidget:pPtr, pTab ) } )
      qEdit     := ::aTabs[ nTab, 2 ]
      qHScr     := QScrollBar():configure( qEdit:horizontalScrollBar() )
      qVScr     := QScrollBar():configure( qEdit:verticalScrollBar() )
@@ -625,10 +625,10 @@ METHOD HbIde:editSource( cSourceFile, nPos, nHPos, nVPos )

   oTab := ::buildTabPage( ::oDa, cSourceFile )

-   qEdit := QPlainTextEdit():new( QT_PTROFXBP( oTab ) )
+   qEdit := QPlainTextEdit():new( oTab:oWidget )
   qEdit:setPlainText( memoread( cSourceFile ) )
   qEdit:setLineWrapMode( QTextEdit_NoWrap )
-   qEdit:setFont( QT_PTROFXBP( ::oFont ) )
+   qEdit:setFont( ::oFont:oWidget )
   qEdit:ensureCursorVisible()

   qDocument := QTextDocument():configure( qEdit:document() )
@@ -684,8 +684,8 @@ METHOD HbIde:buildTabPage( oWnd, cSource )

   oTab:create()

-   ::qTabWidget:setCurrentIndex( ::qTabWidget:indexOf( QT_PTROFXBP( oTab ) ) )
-   ::qTabWidget:setTabTooltip( ::qTabWidget:indexOf( QT_PTROFXBP( oTab ) ), cSource )
+   ::qTabWidget:setCurrentIndex( ::qTabWidget:indexOf( oTab:oWidget ) )
+   ::qTabWidget:setTabTooltip( ::qTabWidget:indexOf( oTab:oWidget ), cSource )

   oTab:tabActivate    := {|mp1,mp2,oXbp| ::activateTab( mp1, mp2, oXbp ) }
   oTab:closeRequested := {|mp1,mp2,oXbp| ::closeTab( mp1, mp2, oXbp ) }
@@ -695,7 +695,7 @@ METHOD HbIde:buildTabPage( oWnd, cSource )
 /*----------------------------------------------------------------------*/

 METHOD HbIde:setTabImage( oTab, qEdit, nPos, lFirst, qDocument )
-   LOCAL nIndex    := ::qTabWidget:indexOf( QT_PTROFXBP( oTab ) )
+   LOCAL nIndex    := ::qTabWidget:indexOf( oTab:oWidget )
   LOCAL lModified := qDocument:isModified()

   ::qTabWidget:setTabIcon( nIndex, s_resPath + iif( lModified, "tabmodified.png", "tabunmodified.png" ) )
@@ -735,7 +735,7 @@ METHOD HbIde:closeSource( nTab )
   IF !empty( nTab  )
      ::oFuncList:clear()
      ::saveSource( nTab )
-      ::qTabWidget:removeTab( ::qTabWidget:indexOf( QT_PTROFXBP( ::aTabs[ nTab,1 ] ) ) )
+      ::qTabWidget:removeTab( ::qTabWidget:indexOf( ::aTabs[ nTab,1 ]:oWidget ) )

      cSource := ::aTabs[ nTab, 5 ]

@@ -805,7 +805,7 @@ METHOD HbIde:saveSource( nTab, lConfirm )
         ENDIF
      ENDIF

-      nIndex := ::qTabWidget:indexOf( QT_PTROFXBP( ::aTabs[ nTab, 1 ] ) )
+      nIndex := ::qTabWidget:indexOf( ::aTabs[ nTab, 1 ]:oWidget )
      ::qTabWidget:setTabIcon( nIndex, s_resPath + "tabunmodified.png" )
      ::oSBar:getItem( 7 ):caption := " "
   ENDIF
@@ -1028,13 +1028,13 @@ METHOD HbIde:manageItemSelected( oXbpTreeItem )
      IF ( n := ascan( ::aTabs, {|e_| PathNormalized( e_[ 5 ] ) == cSource } ) ) == 0
         ::editSource( cSource )
      ELSE
-         ::qTabWidget:setCurrentIndex( ::qTabWidget:indexOf( QT_PTROFXBP( ::aTabs[ n,1 ] ) ) )
+         ::qTabWidget:setCurrentIndex( ::qTabWidget:indexOf( ::aTabs[ n,1 ]:oWidget ) )
      ENDIF

   CASE ::aProjData[ n, 2 ] == "Opened Source"
      cSource := ::aProjData[ n, 5 ]
      IF ( n := ascan( ::aTabs, {|e_| PathNormalized( e_[ 5 ] ) == cSource } ) ) > 0
-         ::qTabWidget:setCurrentIndex( ::qTabWidget:indexOf( QT_PTROFXBP( ::aTabs[ n,1 ] ) ) )
+         ::qTabWidget:setCurrentIndex( ::qTabWidget:indexOf( ::aTabs[ n,1 ]:oWidget ) )
      ENDIF

   CASE ::aProjData[ n, 2 ] == "Path"
@@ -1209,7 +1209,7 @@ METHOD HbIde:buildDialog()
 METHOD HbIde:buildFuncList()

   ::oDockR := XbpWindow():new( ::oDa )
-   ::oDockR:oWidget := QDockWidget():new( QT_PTROFXBP( ::oDlg ) )
+   ::oDockR:oWidget := QDockWidget():new( ::oDlg:oWidget )
   ::oDlg:addChild( ::oDockR )
   ::oDockR:oWidget:setFeatures( QDockWidget_DockWidgetClosable + QDockWidget_DockWidgetMovable )
   ::oDockR:oWidget:setAllowedAreas( Qt_RightDockWidgetArea )
@@ -1228,9 +1228,9 @@ METHOD HbIde:buildFuncList()

   ::oFuncList:oWidget:setEditTriggers( QAbstractItemView_NoEditTriggers )

-   ::oDockR:oWidget:setWidget( QT_PTROFXBP( ::oFuncList ) )
+   ::oDockR:oWidget:setWidget( ::oFuncList:oWidget )

-   ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, QT_PTROFXBP( ::oDockR ), Qt_Horizontal )
+   ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oDockR:oWidget, Qt_Horizontal )

   IF ::aIni[ INI_HBIDE, FunctionListVisible ] == "YES"
      ::lDockRVisible := .t.
@@ -1336,8 +1336,8 @@ METHOD HbIde:buildBottomArea()
   ::buildLinkResults()
   ::buildOutputResults()

-   ::oDlg:oWidget:tabifyDockWidget( QT_PTROFXBP( ::oDockB ), QT_PTROFXBP( ::oDockB1 ) )
-   ::oDlg:oWidget:tabifyDockWidget( QT_PTROFXBP( ::oDockB1 ), QT_PTROFXBP( ::oDockB2 ) )
+   ::oDlg:oWidget:tabifyDockWidget( ::oDockB:oWidget , ::oDockB1:oWidget )
+   ::oDlg:oWidget:tabifyDockWidget( ::oDockB1:oWidget, ::oDockB2:oWidget )

   RETURN Self

@@ -1346,7 +1346,7 @@ METHOD HbIde:buildBottomArea()
 METHOD HbIde:buildCompileResults()

   ::oDockB := XbpWindow():new( ::oDa )
-   ::oDockB:oWidget := QDockWidget():new( QT_PTROFXBP( ::oDlg ) )
+   ::oDockB:oWidget := QDockWidget():new( ::oDlg:oWidget )
   ::oDlg:addChild( ::oDockB )
   ::oDockB:oWidget:setFeatures( QDockWidget_DockWidgetClosable )
   ::oDockB:oWidget:setAllowedAreas( Qt_BottomDockWidgetArea )
@@ -1356,9 +1356,9 @@ METHOD HbIde:buildCompileResults()
   ::oDockB:oWidget:setFocusPolicy( Qt_NoFocus )

   ::oCompileResult := XbpMLE():new( ::oDockB ):create( , , { 0,0 }, { 100,400 }, , .t. )
-   ::oDockB:oWidget:setWidget( QT_PTROFXBP( ::oCompileResult ) )
+   ::oDockB:oWidget:setWidget( ::oCompileResult:oWidget )

-   ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, QT_PTROFXBP( ::oDockB ), Qt_Vertical )
+   ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB:oWidget, Qt_Vertical )
   ::oDockB:hide()

   RETURN Self
@@ -1368,7 +1368,7 @@ METHOD HbIde:buildCompileResults()
 METHOD HbIde:buildLinkResults()

   ::oDockB1 := XbpWindow():new( ::oDa )
-   ::oDockB1:oWidget := QDockWidget():new( QT_PTROFXBP( ::oDlg ) )
+   ::oDockB1:oWidget := QDockWidget():new( ::oDlg:oWidget )
   ::oDlg:addChild( ::oDockB1 )
   ::oDockB1:oWidget:setFeatures( QDockWidget_DockWidgetClosable )
   ::oDockB1:oWidget:setAllowedAreas( Qt_BottomDockWidgetArea )
@@ -1378,9 +1378,9 @@ METHOD HbIde:buildLinkResults()
   ::oDockB1:oWidget:setFocusPolicy( Qt_NoFocus )

   ::oLinkResult := XbpMLE():new( ::oDockB1 ):create( , , { 0,0 }, { 100, 400 }, , .t. )
-   ::oDockB1:oWidget:setWidget( QT_PTROFXBP( ::oLinkResult ) )
+   ::oDockB1:oWidget:setWidget( ::oLinkResult:oWidget )

-   ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, QT_PTROFXBP( ::oDockB1 ), Qt_Vertical )
+   ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB1:oWidget, Qt_Vertical )
   ::oDockB1:hide()

   RETURN Self
@@ -1390,7 +1390,7 @@ METHOD HbIde:buildLinkResults()
 METHOD HbIde:buildOutputResults()

   ::oDockB2 := XbpWindow():new( ::oDa )
-   ::oDockB2:oWidget := QDockWidget():new( QT_PTROFXBP( ::oDlg ) )
+   ::oDockB2:oWidget := QDockWidget():new( ::oDlg:oWidget )
   ::oDlg:addChild( ::oDockB2 )
   ::oDockB2:oWidget:setFeatures( QDockWidget_DockWidgetClosable )
   ::oDockB2:oWidget:setAllowedAreas( Qt_BottomDockWidgetArea )
@@ -1403,9 +1403,9 @@ METHOD HbIde:buildOutputResults()
   ::oOutputResult:wordWrap := .f.
   //::oOutputResult:dataLink := {|x| IIf( x==NIL, cText, cText := x ) }

-   ::oDockB2:oWidget:setWidget( QT_PTROFXBP( ::oOutputResult ) )
+   ::oDockB2:oWidget:setWidget( ::oOutputResult:oWidget )

-   ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, QT_PTROFXBP( ::oDockB2 ), Qt_Vertical )
+   ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB2:oWidget, Qt_Vertical )
   ::oDockB2:hide()

   RETURN Self
@@ -1417,7 +1417,7 @@ METHOD HbIde:buildOutputResults()
 METHOD HbIde:printPreview()
   LOCAL qDlg

-   qDlg := QPrintPreviewDialog():new( QT_PTROFXBP( ::oDlg ) )
+   qDlg := QPrintPreviewDialog():new( ::oDlg:oWidget )
   qDlg:setWindowTitle( "Harbour-QT Preview Dialog" )
   Qt_Connect_Signal( qDlg, "paintRequested(QPrinter)", {|o,p| ::paintRequested( p,o ) } )
   qDlg:exec()
@@ -1550,7 +1550,7 @@ METHOD HbIde:loadUI( cUi )
      qFile := QFile():new( cUiFull )
      IF qFile:open( 1 )
         qUiLoader  := QUiLoader():new()
-         qDialog    := QDialog():configure( qUiLoader:load( qFile, QT_PTROFXBP( ::oDlg ) ) )
+         qDialog    := QDialog():configure( qUiLoader:load( qFile, ::oDlg:oWidget ) )
         qFile:close()
      ENDIF
   ENDIF
--- a/harbour/contrib/hbxbp/xbpqtuiloader.prg
+++ b/harbour/contrib/hbxbp/xbpqtuiloader.prg
@@ -227,7 +227,7 @@ METHOD XbpQtUiLoader:loadUI( cUiFull )
   qFile := QFile():new( cUiFull )
   IF qFile:open( 1 )
      qUiLoader  := QUiLoader():new()
-      pWidget    := qUiLoader:load( qFile, IF( empty( ::oParent ), NIL, QT_PTROFXBP( ::oParent ) ) )
+      pWidget    := qUiLoader:load( qFile, IF( empty( ::oParent ), NIL, ::oParent:oWidget ) )
      DO CASE
      CASE ::widgets[ 1,1 ] == "QWidget"
         qWidget    := QWidget():configure( pWidget )
--- a/harbour/contrib/hbxbp/xbpstatusbar.prg
+++ b/harbour/contrib/hbxbp/xbpstatusbar.prg
@@ -202,10 +202,10 @@ METHOD XbpStatusBar:addItem( cCaption, xImage, cDLL, nStyle, cKey, nMode )

   IF nMode == -1
      oPanel := XbpStatusBarPanel():new( cCaption, nStyle, cKey ):create()
-      ::oWidget:addPermanentWidget( QT_PTROFXBP( oPanel ), 1 )
+      ::oWidget:addPermanentWidget( oPanel:oWidget, 1 )
   ELSE
      oPanel := XbpStatusBarPanel():new( cCaption, nStyle, cKey ):create()
-      ::oWidget:addWidget( QT_PTROFXBP( oPanel ) )
+      ::oWidget:addWidget( oPanel:oWidget )
   ENDIF

   oPanel:oParent := self