From 95987712031659784eeb48cf553f2ac9c19fe562 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Fri, 18 Dec 2009 06:39:44 +0000 Subject: [PATCH] 2009-12-17 22:24 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/hbide.prg * contrib/hbide/idemisc.prg * contrib/hbqt/tests/demoqt.prg * contrib/hbxbp/xbpbrowse.prg * contrib/hbxbp/xbphtmlviewer.prg * contrib/hbxbp/xbpmenubar.prg * contrib/hbxbp/xbppushbutton.prg * contrib/hbxbp/xbprtf.prg * contrib/hbxbp/xbptoolbar.prg * contrib/hbxbp/xbpwindow.prg ! Further cleanup of QT_PTROF() macro. * contrib/hbqt/generator/hbqtgen.prg ! Minor. --- harbour/ChangeLog | 18 ++++++++++++ harbour/contrib/hbide/hbide.prg | 15 +++++----- harbour/contrib/hbide/idemisc.prg | 4 +-- harbour/contrib/hbqt/generator/hbqtgen.prg | 1 - harbour/contrib/hbqt/tests/demoqt.prg | 30 +++++++++---------- harbour/contrib/hbxbp/xbpbrowse.prg | 34 +++++++++++----------- harbour/contrib/hbxbp/xbphtmlviewer.prg | 18 ++++++------ harbour/contrib/hbxbp/xbpmenubar.prg | 6 ++-- harbour/contrib/hbxbp/xbppushbutton.prg | 4 +-- harbour/contrib/hbxbp/xbprtf.prg | 28 +++++++++--------- harbour/contrib/hbxbp/xbptoolbar.prg | 4 +-- harbour/contrib/hbxbp/xbpwindow.prg | 14 ++++----- 12 files changed, 96 insertions(+), 80 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 542fa1916e..3f0457e8f7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,24 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-17 22:24 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbide/hbide.prg + * contrib/hbide/idemisc.prg + + * contrib/hbqt/tests/demoqt.prg + + * contrib/hbxbp/xbpbrowse.prg + * contrib/hbxbp/xbphtmlviewer.prg + * contrib/hbxbp/xbpmenubar.prg + * contrib/hbxbp/xbppushbutton.prg + * contrib/hbxbp/xbprtf.prg + * contrib/hbxbp/xbptoolbar.prg + * contrib/hbxbp/xbpwindow.prg + ! Further cleanup of QT_PTROF() macro. + + * contrib/hbqt/generator/hbqtgen.prg + ! Minor. + 2009-12-18 04:08 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rtl/gtxwc/gtxwc.c ! fixed yet another one memory leak diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index 0cf09d033d..110d7088c5 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -360,15 +360,15 @@ METHOD HbIde:create( cProjIni ) ENDDO /* Very important - destroy resources */ - HBXBP_DEBUG( "----------------------------------------------" ) + HBXBP_DEBUG( "------------------------------------------------------" ) HBXBP_DEBUG( "Before ::oDlg:destroy()", memory( 1001 ), hbqt_getMemUsed() ) - HBXBP_DEBUG( "----------------------------------------------" ) + HBXBP_DEBUG( "------------------------------------------------------" ) ::oDlg:destroy() - HBXBP_DEBUG( "----------------------------------------------" ) + HBXBP_DEBUG( "------------------------------------------------------" ) HBXBP_DEBUG( "After ::oDlg:destroy()", memory( 1001 ), hbqt_getMemUsed() ) - HBXBP_DEBUG( "----------------------------------------------" ) + HBXBP_DEBUG( "------------------------------------------------------" ) ::qCursor:pPtr := 0 ::oFont := NIL @@ -1932,9 +1932,9 @@ METHOD HbIde:readProcessInfo( nMode, iBytes ) ENDIF CASE nMode == 4 - HBXBP_DEBUG( Qt_DisConnect_Signal( QT_PTROF( ::qProcess ), "finished(int,int)" ) ) - HBXBP_DEBUG( Qt_DisConnect_Signal( QT_PTROF( ::qProcess ), "readyReadStandardOutput()" ) ) - HBXBP_DEBUG( Qt_DisConnect_Signal( QT_PTROF( ::qProcess ), "readyReadStandardError()" ) ) + Qt_DisConnect_Signal( QT_PTROF( ::qProcess ), "finished(int,int)" ) + Qt_DisConnect_Signal( QT_PTROF( ::qProcess ), "readyReadStandardOutput()" ) + Qt_DisConnect_Signal( QT_PTROF( ::qProcess ), "readyReadStandardError()" ) ::qProcess:kill() ::qProcess:pPtr := 0 @@ -1945,4 +1945,3 @@ METHOD HbIde:readProcessInfo( nMode, iBytes ) RETURN nil /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbide/idemisc.prg b/harbour/contrib/hbide/idemisc.prg index 56b12f4c1f..fb2defd8ce 100644 --- a/harbour/contrib/hbide/idemisc.prg +++ b/harbour/contrib/hbide/idemisc.prg @@ -86,7 +86,7 @@ PROCEDURE JustACall() FUNCTION ExecPopup( aPops, aPos, qParent ) LOCAL i, qPop, qPoint, qAct, nAct, cAct, xRet, pAct - qPop := QMenu():new( IIF( hb_isObject( qParent ), QT_PTROF( qParent ), NIL ) ) + qPop := QMenu():new( IIF( hb_isObject( qParent ), qParent, NIL ) ) FOR i := 1 TO len( aPops ) IF empty( aPops[ i,1 ] ) @@ -97,7 +97,7 @@ FUNCTION ExecPopup( aPops, aPos, qParent ) NEXT qPoint := QPoint():new( aPos[ 1 ], aPos[ 2 ] ) - pAct := qPop:exec_1( QT_PTROF( qPoint ) ) + pAct := qPop:exec_1( qPoint ) qAct := QAction():configure( pAct ) IF !empty( qAct:pPtr ) .and. !empty( cAct := qAct:text() ) diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index 2989667405..b3da4c7055 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -1609,7 +1609,6 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut, subCls_ ) DO CASE CASE cClassType == "PLAINOBJECT" aadd( txt_, 'METHOD ' + cWidget + ':new( ... )' ) -// aadd( txt_, 'METHOD New( ... ) CLASS ' + cWidget ) aadd( txt_, '' ) aadd( txt_, ' ::pPtr := Qt_' + cWidget + '( ... )' ) aadd( txt_, '' ) diff --git a/harbour/contrib/hbqt/tests/demoqt.prg b/harbour/contrib/hbqt/tests/demoqt.prg index f94fbd6ef6..701af9d53e 100644 --- a/harbour/contrib/hbqt/tests/demoqt.prg +++ b/harbour/contrib/hbqt/tests/demoqt.prg @@ -162,7 +162,7 @@ HBQT_DEBUG( "-----------------b-----------------" ) oProg := Build_ProgressBar( oDA, { 30,300 }, { 200,30 } ) aList := Build_ListBox( oDA, { 310,240 }, { 150, 100 } ) -HBQT_DEBUG( "connected: " + IIF( QT_CONNECT_EVENT( QT_PTROF( oWnd ), 6, {|o,e| My_Events( o, e ) } ), "Yes", "No" ) ) + QT_CONNECT_EVENT( QT_PTROF( oWnd ), 6, {|o,e| My_Events( o, e ) } ) oWnd:Show() @@ -231,7 +231,7 @@ PROCEDURE ExecOneMore() oWnd:setStatusBar( oSBar ) oSBar:showMessage( "Harbour-QT Statusbar Ready!" ) - oEventLoop := QEventLoop():new( QT_PTROF( oWnd ) ) + oEventLoop := QEventLoop():new( oWnd ) DO WHILE .t. oEventLoop:processEvents() @@ -290,20 +290,20 @@ STATIC FUNCTION Build_ToolBar( oWnd ) LOCAL oTB, oActNew, oActOpen, oActSave /* Create a Toolbar Object */ - oTB := QToolBar():new()// QT_PTROF( oWnd ) ) + oTB := QToolBar():new() /* Create an action */ - oActNew := QAction():new( QT_PTROF( oWnd ) ) + oActNew := QAction():new( oWnd ) oActNew:setText( "&New" ) oActNew:setIcon( "new.png" ) oActNew:setToolTip( "A New File" ) /* Attach codeblock to be triggered */ Qt_Connect_Signal( QT_PTROF( oActNew ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "New" , w, l ) } ) /* Attach Action with Toolbar */ - oTB:addAction( QT_PTROF( oActNew ) ) + oTB:addAction( oActNew ) /* Create another action */ - oActOpen := QAction():new( QT_PTROF( oWnd ) ) + oActOpen := QAction():new( oWnd ) oActOpen:setText( "&Open" ) oActOpen:setIcon( "open.png" ) oActOpen:setToolTip( "Select a file to be opened!" ) @@ -315,7 +315,7 @@ STATIC FUNCTION Build_ToolBar( oWnd ) oTB:addSeparator() /* Create another action */ - oActSave := QAction():new( QT_PTROF( oWnd ) ) + oActSave := QAction():new( oWnd ) oActSave:setText( "&Save" ) oActSave:setIcon( "save.png" ) oActSave:setToolTip( "Save this file!" ) @@ -330,15 +330,15 @@ STATIC FUNCTION Build_ToolBar( oWnd ) /////////////////////////////////////////////////////////// #if 0 /* Build another toolbar - we will have two toolbats now */ - oTB := QToolBar():new( QT_PTROF( oWnd ) ) + oTB := QToolBar():new( oWnd ) - oAct := QAction():new( QT_PTROF( oWnd ) ) + oAct := QAction():new( oWnd ) oAct:setText( "&Colors" ) oAct:setToolTip( "Colors Dialog" ) Qt_Connect_Signal( QT_PTROF( oAct ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Colors", w, l ) } ) oTB:addAction( oAct ) - oAct := QAction():new( QT_PTROF( oWnd ) ) + oAct := QAction():new( oWnd ) oAct:setText( "&Fonts" ) oAct:setToolTip( "Fonts Dialog" ) Qt_Connect_Signal( QT_PTROF( oAct ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Fonts", w, l ) } ) @@ -346,13 +346,13 @@ STATIC FUNCTION Build_ToolBar( oWnd ) oTB:addSeparator() - oAct := QAction():new( QT_PTROF( oWnd ) ) + oAct := QAction():new( oWnd ) oAct:setText( "&PgSetup" ) oAct:setToolTip( "Page Setup Dialog" ) Qt_Connect_Signal( QT_PTROF( oAct ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "PageSetup", w, l ) } ) oTB:addAction( oAct ) - oAct := QAction():new( QT_PTROF( oWnd ) ) + oAct := QAction():new( oWnd ) oAct:setText( "&Preview" ) oAct:setToolTip( "Page Preview Dialog" ) Qt_Connect_Signal( QT_PTROF( oAct ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Preview", w, l ) } ) @@ -360,19 +360,19 @@ STATIC FUNCTION Build_ToolBar( oWnd ) oTB:addSeparator() - oAct := QAction():new( QT_PTROF( oWnd ) ) + oAct := QAction():new( oWnd ) oAct:setText( "&Webpage" ) oAct:setToolTip( "Web Browser Dialog" ) Qt_Connect_Signal( QT_PTROF( oAct ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "WebPage", w, l ) } ) oTB:addAction( oAct ) - oAct := QAction():new( QT_PTROF( oWnd ) ) + oAct := QAction():new( oWnd ) oAct:setText( "&Wizard" ) oAct:setToolTip( "Generic Wizard Dialog" ) Qt_Connect_Signal( QT_PTROF( oAct ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Wizard", w, l ) } ) oTB:addAction( oAct ) - oAct := QAction():new( QT_PTROF( oWnd ) ) + oAct := QAction():new( oWnd ) oAct:setText( "&SystemTray" ) oAct:setToolTip( "Show in System Tray!" ) Qt_Connect_Signal( QT_PTROF( oAct ), QT_EVE_TRIGGERED_B, {|w,l| ShowInSystemTray( oWnd, w, l ) } ) diff --git a/harbour/contrib/hbxbp/xbpbrowse.prg b/harbour/contrib/hbxbp/xbpbrowse.prg index 6185428729..0634e6c70f 100644 --- a/harbour/contrib/hbxbp/xbpbrowse.prg +++ b/harbour/contrib/hbxbp/xbpbrowse.prg @@ -514,9 +514,9 @@ METHOD XbpBrowse:buildLeftFreeze() // //::oLeftFooterView:hide() - ::connect( QT_PTROF( ::oLeftView ) , "mousePressEvent()" , {|o,p| ::exeBlock( 31, p, o ) } ) - ::connect( QT_PTROF( ::oLeftHeaderView ), "sectionPressed(int)", {|o,i| ::exeBlock( 31, i, o ) } ) - ::connect( QT_PTROF( ::oLeftFooterView ), "sectionPressed(int)", {|o,i| ::exeBlock( 31, i, o ) } ) + ::connect( ::oLeftView , "mousePressEvent()" , {|o,p| ::exeBlock( 31, p, o ) } ) + ::connect( ::oLeftHeaderView, "sectionPressed(int)", {|o,i| ::exeBlock( 31, i, o ) } ) + ::connect( ::oLeftFooterView, "sectionPressed(int)", {|o,i| ::exeBlock( 31, i, o ) } ) RETURN Self @@ -560,9 +560,9 @@ METHOD XbpBrowse:buildRightFreeze() ::oRightFooterModel := HBDbfModel():new( {|p1,p2,p3,p4| ::supplyInfo( 162, p1, p2, p3, p4 ) } ) ::oRightFooterView:setModel( ::oRightFooterModel ) - ::connect( QT_PTROF( ::oRightView ) , "mousePressEvent()" , {|o,p| ::exeBlock( 31, p, o ) } ) - ::connect( QT_PTROF( ::oRightHeaderView ), "sectionPressed(int)", {|o,i| ::exeBlock( 31, i, o ) } ) - ::connect( QT_PTROF( ::oRightFooterView ), "sectionPressed(int)", {|o,i| ::exeBlock( 31, i, o ) } ) + ::connect( ::oRightView , "mousePressEvent()" , {|o,p| ::exeBlock( 31, p, o ) } ) + ::connect( ::oRightHeaderView, "sectionPressed(int)", {|o,i| ::exeBlock( 31, i, o ) } ) + ::connect( ::oRightFooterView, "sectionPressed(int)", {|o,i| ::exeBlock( 31, i, o ) } ) RETURN Self @@ -589,27 +589,27 @@ METHOD XbpBrowse:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::oTableView:setSelectionBehavior( IF( ::cursorMode == XBPBRW_CURSOR_ROW, QAbstractItemView_SelectRows, QAbstractItemView_SelectItems ) ) /* Connect Keyboard Events */ - ::connect( QT_PTROF( ::oTableView ), "keyPressEvent()" , {|o,p | ::exeBlock( 1, p, o ) } ) - ::connect( QT_PTROF( ::oTableView ), "mousePressEvent()" , {|o,p | ::exeBlock( 2, p, o ) } ) - ::connect( QT_PTROF( ::oTableView ), "mouseDoubleClickEvent()" , {|o,p | ::exeBlock( 3, p, o ) } ) - ::connect( QT_PTROF( ::oTableView ), "wheelEvent()" , {|o,p | ::exeBlock( 4, p, o ) } ) - ::connect( QT_PTROF( ::oTableView ), "scrollContentsBy(int,int)" , {|o,p,p1| ::exeBlock(11, p, p1, o ) } ) + ::connect( ::oTableView, "keyPressEvent()" , {|o,p | ::exeBlock( 1, p, o ) } ) + ::connect( ::oTableView, "mousePressEvent()" , {|o,p | ::exeBlock( 2, p, o ) } ) + ::connect( ::oTableView, "mouseDoubleClickEvent()" , {|o,p | ::exeBlock( 3, p, o ) } ) + ::connect( ::oTableView, "wheelEvent()" , {|o,p | ::exeBlock( 4, p, o ) } ) + ::connect( ::oTableView, "scrollContentsBy(int,int)" , {|o,p,p1| ::exeBlock(11, p, p1, o ) } ) /* Finetune Horizontal Scrollbar */ ::oTableView:setHorizontalScrollBarPolicy( Qt_ScrollBarAlwaysOff ) // ::oHScrollBar := QScrollBar():new() ::oHScrollBar:setOrientation( Qt_Horizontal ) - ::connect( QT_PTROF( ::oHScrollBar ), "actionTriggered(int)" , {|o,i| ::exeBlock( 103, i, o ) } ) - ::connect( QT_PTROF( ::oHScrollBar ), "sliderReleased()" , {|o,i| ::exeBlock( 104, i, o ) } ) + ::connect( ::oHScrollBar, "actionTriggered(int)" , {|o,i| ::exeBlock( 103, i, o ) } ) + ::connect( ::oHScrollBar, "sliderReleased()" , {|o,i| ::exeBlock( 104, i, o ) } ) /* Replace Vertical Scrollbar with our own */ ::oTableView:setVerticalScrollBarPolicy( Qt_ScrollBarAlwaysOff ) // ::oVScrollBar := QScrollBar():new() ::oVScrollBar:setOrientation( Qt_Vertical ) - ::connect( QT_PTROF( ::oVScrollBar ), "actionTriggered(int)" , {|o,i| ::exeBlock( 101, i, o ) } ) - ::connect( QT_PTROF( ::oVScrollBar ), "sliderReleased()" , {|o,i| ::exeBlock( 102, i, o ) } ) + ::connect( ::oVScrollBar, "actionTriggered(int)" , {|o,i| ::exeBlock( 101, i, o ) } ) + ::connect( ::oVScrollBar, "sliderReleased()" , {|o,i| ::exeBlock( 102, i, o ) } ) /* Veritical Header because of Performance boost */ ::oVHeaderView := QHeaderView() @@ -621,8 +621,8 @@ METHOD XbpBrowse:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::oHeaderView:configure( ::oTableView:horizontalHeader() ) ::oHeaderView:setHighlightSections( .F. ) // - ::connect( QT_PTROF( ::oHeaderView ), "sectionPressed(int)" , {|o,i | ::exeBlock( 111, i, o ) } ) - ::connect( QT_PTROF( ::oHeaderView ), "sectionResized(int,int,int)", {|o,i,i1,i2| ::exeBlock( 121, i, i1, i2, o ) } ) + ::connect( ::oHeaderView, "sectionPressed(int)" , {|o,i | ::exeBlock( 111, i, o ) } ) + ::connect( ::oHeaderView, "sectionResized(int,int,int)", {|o,i,i1,i2| ::exeBlock( 121, i, i1, i2, o ) } ) /* .DBF Manipulation Model */ ::oDbfModel := HBDbfModel():new( {|p1,p2,p3,p4| ::supplyInfo( 141, p1, p2, p3, p4 ) } ) diff --git a/harbour/contrib/hbxbp/xbphtmlviewer.prg b/harbour/contrib/hbxbp/xbphtmlviewer.prg index fd1e7ffada..2aba12d0b3 100644 --- a/harbour/contrib/hbxbp/xbphtmlviewer.prg +++ b/harbour/contrib/hbxbp/xbphtmlviewer.prg @@ -157,15 +157,15 @@ METHOD XbpHTMLViewer:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible #if 0 /* Discontinued till QWebKit is integrated separately - Pritpal */ ::oWidget := QWebView():new( ::pParent ) - ::Connect( QT_PTROF( ::oWidget ), "iconChanged()" , {|o,p| ::exeBlock( 1,p,o ) } ) - ::Connect( QT_PTROF( ::oWidget ), "linkClicked(QUrl)" , {|o,p| ::exeBlock( 2,p,o ) } ) - ::Connect( QT_PTROF( ::oWidget ), "loadFinished(bool)" , {|o,p| ::exeBlock( 3,p,o ) } ) - ::Connect( QT_PTROF( ::oWidget ), "loadProgress(int)" , {|o,p| ::exeBlock( 4,p,o ) } ) - ::Connect( QT_PTROF( ::oWidget ), "loadStarted()" , {|o,p| ::exeBlock( 5,p,o ) } ) - ::Connect( QT_PTROF( ::oWidget ), "titleChanged(QString)" , {|o,p| ::exeBlock( 6,p,o ) } ) - ::Connect( QT_PTROF( ::oWidget ), "urlChanged(QUrl)" , {|o,p| ::exeBlock( 7,p,o ) } ) - ::Connect( QT_PTROF( ::oWidget ), "selectionChanged()" , {|o,p| ::exeBlock( 8,p,o ) } ) - ::Connect( QT_PTROF( ::oWidget ), "statusBarMessage(QString)", {|o,p| ::exeBlock( 9,p,o ) } ) + ::Connect( ::oWidget, "iconChanged()" , {|o,p| ::exeBlock( 1,p,o ) } ) + ::Connect( ::oWidget, "linkClicked(QUrl)" , {|o,p| ::exeBlock( 2,p,o ) } ) + ::Connect( ::oWidget, "loadFinished(bool)" , {|o,p| ::exeBlock( 3,p,o ) } ) + ::Connect( ::oWidget, "loadProgress(int)" , {|o,p| ::exeBlock( 4,p,o ) } ) + ::Connect( ::oWidget, "loadStarted()" , {|o,p| ::exeBlock( 5,p,o ) } ) + ::Connect( ::oWidget, "titleChanged(QString)" , {|o,p| ::exeBlock( 6,p,o ) } ) + ::Connect( ::oWidget, "urlChanged(QUrl)" , {|o,p| ::exeBlock( 7,p,o ) } ) + ::Connect( ::oWidget, "selectionChanged()" , {|o,p| ::exeBlock( 8,p,o ) } ) + ::Connect( ::oWidget, "statusBarMessage(QString)", {|o,p| ::exeBlock( 9,p,o ) } ) #if 0 ::mapEvent( evNavigateComplete, {| cURL | ::xNavigateComplete( cURL ) } ) #endif diff --git a/harbour/contrib/hbxbp/xbpmenubar.prg b/harbour/contrib/hbxbp/xbpmenubar.prg index 580e406047..bbc9f87399 100644 --- a/harbour/contrib/hbxbp/xbpmenubar.prg +++ b/harbour/contrib/hbxbp/xbpmenubar.prg @@ -317,7 +317,7 @@ METHOD xbpMenuBar:placeItem( xCaption, bAction, nStyle, nAttrb, nMode, nPos ) aItem := { QMF_SEPARATOR, 0, 0, NIL, oAction } CASE cType == "C" - oAction := QAction():new( QT_PTROF( ::oWidget ) ) + oAction := QAction():new( ::oWidget ) cCaption := strtran( xCaption, '~', '&' ) IF ( n := at( '|', cCaption ) ) > 0 cIcon := substr( cCaption, 1, n-1 ) @@ -336,8 +336,8 @@ METHOD xbpMenuBar:placeItem( xCaption, bAction, nStyle, nAttrb, nMode, nPos ) oAction:setShortcut( oKey ) ENDIF - ::Connect( QT_PTROF( oAction ), "triggered(bool)", {|| ::exeBlock( nMenuItemID ) } ) - ::Connect( QT_PTROF( oAction ), "hovered()" , {|| ::exeHovered( nMenuItemID ) } ) + ::Connect( oAction, "triggered(bool)", {|| ::exeBlock( nMenuItemID ) } ) + ::Connect( oAction, "hovered()" , {|| ::exeHovered( nMenuItemID ) } ) DO CASE CASE nAttrb == XBPMENUBAR_MIA_CHECKED diff --git a/harbour/contrib/hbxbp/xbppushbutton.prg b/harbour/contrib/hbxbp/xbppushbutton.prg index 2bc6fa361b..d1eaae5428 100644 --- a/harbour/contrib/hbxbp/xbppushbutton.prg +++ b/harbour/contrib/hbxbp/xbppushbutton.prg @@ -129,7 +129,7 @@ METHOD XbpPushButton:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ::oWidget:setDefault( .t. ) ENDIF - ::Connect( QT_PTROF( ::oWidget ), "clicked()", {|| ::exeBlock() } ) + ::Connect( ::oWidget, "clicked()", {|| ::exeBlock() } ) ::oParent:AddChild( SELF ) RETURN Self @@ -159,7 +159,7 @@ METHOD XbpPushButton:hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParam ENDIF - ::Connect( QT_PTROF( ::oWidget ), "clicked()", {|| ::exeBlock() } ) + ::Connect( ::oWidget, "clicked()", {|| ::exeBlock() } ) ::addAsChild() RETURN Self diff --git a/harbour/contrib/hbxbp/xbprtf.prg b/harbour/contrib/hbxbp/xbprtf.prg index 8b48c2a691..24a0a78fa0 100644 --- a/harbour/contrib/hbxbp/xbprtf.prg +++ b/harbour/contrib/hbxbp/xbprtf.prg @@ -348,9 +348,9 @@ METHOD XbpRtf:print( oXbpPrinter, lOnlySelection ) ENDIF IF hb_isLogical( lOnlySelection ) .and. lOnlySelection - ::oWidget:print( QT_PTROF( oXbpPrinter:oWidget ) ) + ::oWidget:print( oXbpPrinter:oWidget ) ELSE - ::oWidget:print( QT_PTROF( oXbpPrinter:oWidget ) ) + ::oWidget:print( oXbpPrinter:oWidget ) ENDIF RETURN Self @@ -422,7 +422,7 @@ METHOD XbpRtf:selAlignment( ... ) // XBPRTF_ALIGN_LEFT oTBFormat := QTextBlockFormat():configure( ::oCurCursor:blockFormat() ) xRet := oTBFormat:alignment() oTBFormat:setAlignment( hbxbp_ConvertAFactFromXBP( "RTFSELALIGNMENT", aP[ 1 ] ) ) - ::oCurCursor:setBlockFormat( QT_PTROF( oTBFormat ) ) + ::oCurCursor:setBlockFormat( oTBFormat ) ENDIF RETURN xRet @@ -436,7 +436,7 @@ METHOD XbpRtf:selBold( ... ) // .F. ::oTextCharFormat:pPtr := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() ::oTextCharFormat:setFontWeight( QFont_Bold ) - ::oCurCursor:setCharFormat( QT_PTROF( ::oTextCharFormat ) ) + ::oCurCursor:setCharFormat( ::oTextCharFormat ) ENDIF ENDIF RETURN xRet @@ -466,7 +466,7 @@ METHOD XbpRtf:selCharOffset( ... ) // 0 nAlign := IF( aP[ 1 ] < 0, -1, IF( aP[ 1 ] > 0, 1, 0 ) ) xRet := ::oTextCharFormat:verticalAlignment() ::oTextCharFormat:setVerticalAlignment( hbxbp_ConvertAFactFromXBP( "RtfVerticalAlign", nAlign ) ) - ::oCurCursor:setCharFormat( QT_PTROF( ::oTextCharFormat ) ) + ::oCurCursor:setCharFormat( ::oTextCharFormat ) ENDIF ENDIF RETURN xRet @@ -485,8 +485,8 @@ METHOD XbpRtf:selColor( ... ) nColor := hbxbp_ConvertAFactFromXBP( "COLOR", aP[ 1 ] ) oColor := QColor():new( nColor ) oBrush := QBrush():new( "QColor", QT_PTROF( oColor ) ) - ::oTextCharFormat:setForeground( QT_PTROF( oBrush ) ) - ::oCurCursor:setCharFormat( QT_PTROF( ::oTextCharFormat ) ) + ::oTextCharFormat:setForeground( oBrush ) + ::oCurCursor:setCharFormat( ::oTextCharFormat ) ENDIF ENDIF RETURN xRet @@ -501,8 +501,8 @@ METHOD XbpRtf:selFont( ... ) // "" IF len( aP ) >= 1 .and. hb_isObject( aP[ 1 ] ) ::oTextCharFormat:pPtr := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() - ::oTextCharFormat:setFont( QT_PTROF( aP[ 1 ]:oWidget ) ) - ::oCurCursor:setCharFormat( QT_PTROF( ::oTextCharFormat ) ) + ::oTextCharFormat:setFont( aP[ 1 ]:oWidget ) + ::oCurCursor:setCharFormat( ::oTextCharFormat ) ENDIF ENDIF RETURN xRet @@ -518,7 +518,7 @@ METHOD XbpRtf:selFontName( ... ) // "" IF ::oTextCharFormat:isValid() xRet := ::oTextCharFormat:fontFamily() ::oTextCharFormat:setFontFamily( aP[ 1 ] ) - ::oCurCursor:setCharFormat( QT_PTROF( ::oTextCharFormat ) ) + ::oCurCursor:setCharFormat( ::oTextCharFormat ) ENDIF ENDIF RETURN xRet @@ -534,7 +534,7 @@ METHOD XbpRtf:selFontSize( ... ) // 0 xRet := ::oTextCharFormat:fontPointSize() IF len( aP ) >= 1 .and. hb_isNumeric( aP[ 1 ] ) ::oTextCharFormat:setFontPointSize( aP[ 1 ] ) - ::oCurCursor:setCharFormat( QT_PTROF( ::oTextCharFormat ) ) + ::oCurCursor:setCharFormat( ::oTextCharFormat ) ENDIF ENDIF RETURN xRet @@ -571,7 +571,7 @@ METHOD XbpRtf:selItalic( ... ) // .F. ::oTextCharFormat:pPtr := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() ::oTextCharFormat:setFontItalic( aP[ 1 ] ) - ::oCurCursor:setCharFormat( QT_PTROF( ::oTextCharFormat ) ) + ::oCurCursor:setCharFormat( ::oTextCharFormat ) ENDIF ENDIF RETURN xRet @@ -622,7 +622,7 @@ METHOD XbpRtf:selStrikeThru( ... ) // .F. ::oTextCharFormat:pPtr := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() ::oTextCharFormat:setFontStrikeOut( aP[ 1 ] ) - ::oCurCursor:setCharFormat( QT_PTROF( ::oTextCharFormat ) ) + ::oCurCursor:setCharFormat( ::oTextCharFormat ) ENDIF ENDIF RETURN xRet @@ -674,7 +674,7 @@ METHOD XbpRtf:selUnderline( ... ) // .F. ::oTextCharFormat:pPtr := ::oCurCursor:charFormat() IF ::oTextCharFormat:isValid() ::oTextCharFormat:setFontUnderline( aP[ 1 ] ) - ::oCurCursor:setCharFormat( QT_PTROF( ::oTextCharFormat ) ) + ::oCurCursor:setCharFormat( ::oTextCharFormat ) ENDIF ENDIF RETURN xRet diff --git a/harbour/contrib/hbxbp/xbptoolbar.prg b/harbour/contrib/hbxbp/xbptoolbar.prg index cb5a87d365..1b6fa94813 100644 --- a/harbour/contrib/hbxbp/xbptoolbar.prg +++ b/harbour/contrib/hbxbp/xbptoolbar.prg @@ -261,7 +261,7 @@ METHOD XbpToolbar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS ELSE /* Create an action */ - oBtn:oAction := QAction():new( QT_PTROF( ::oWidget ) ) + oBtn:oAction := QAction():new( ::oWidget ) oBtn:oAction:setText( cCaption ) IF valtype( xImage ) == "C" .and. hb_FileExists( xImage ) @@ -269,7 +269,7 @@ METHOD XbpToolbar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS ENDIF /* Attach codeblock to be triggered */ - ::Connect( QT_PTROF( oBtn:oAction ), "triggered(bool)", {|| ::exeBlock( oBtn ) } ) + ::Connect( oBtn:oAction, "triggered(bool)", {|| ::exeBlock( oBtn ) } ) /* Attach Action with Toolbar */ ::oWidget:addAction( oBtn:oAction ) diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg index 4a83c5a408..4ac4ac26b2 100644 --- a/harbour/contrib/hbxbp/xbpwindow.prg +++ b/harbour/contrib/hbxbp/xbpwindow.prg @@ -393,8 +393,8 @@ METHOD XbpWindow:setQtProperty( cProperty ) METHOD XbpWindow:connect( pWidget, cSignal, bBlock ) LOCAL lSuccess - IF ( lSuccess := Qt_Connect_Signal( pWidget, cSignal, bBlock ) ) - aadd( ::aConnections, { pWidget, cSignal } ) + IF ( lSuccess := Qt_Connect_Signal( hbqt_ptr( pWidget ), cSignal, bBlock ) ) + aadd( ::aConnections, { hbqt_ptr( pWidget ), cSignal } ) ENDIF RETURN lSuccess @@ -404,8 +404,8 @@ METHOD XbpWindow:connect( pWidget, cSignal, bBlock ) METHOD XbpWindow:connectEvent( pWidget, nEvent, bBlock ) LOCAL lSuccess - IF ( lSuccess := Qt_Connect_Event( pWidget, nEvent, bBlock ) ) - aadd( ::aEConnections, { pWidget, nEvent } ) + IF ( lSuccess := Qt_Connect_Event( hbqt_ptr( pWidget ), nEvent, bBlock ) ) + aadd( ::aEConnections, { hbqt_ptr( pWidget ), nEvent } ) ENDIF RETURN lSuccess @@ -735,8 +735,8 @@ METHOD XbpWindow:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible METHOD XbpWindow:destroy() LOCAL cXbp := __ObjGetClsName( self ) -//HBXBP_DEBUG( ". " ) -//HBXBP_DEBUG( hb_threadId(),"Destroy: "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ), hbqt_getMemUsed() ) +HBXBP_DEBUG( ". " ) +HBXBP_DEBUG( hb_threadId(),"Destroy: "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ), hbqt_getMemUsed() ) IF cXbp == "XBPDIALOG" hbxbp_SetEventLoop( NIL ) @@ -772,7 +772,7 @@ METHOD XbpWindow:destroy() ::oWidget:pPtr := 0 ::oWidget := NIL -//HBXBP_DEBUG( hb_threadId()," Destroy: "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ), hbqt_getMemUsed() ) +HBXBP_DEBUG( hb_threadId()," Destroy: "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ), hbqt_getMemUsed() ) RETURN NIL