From d645e7ca38ca5187d5cbbe524acb3a96b8575e6c Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sun, 20 Mar 2011 06:31:04 +0000 Subject: [PATCH] 2011-03-19 23:26 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/hbpprocess.prg * contrib/hbxbp/xbp3state.prg * contrib/hbxbp/xbpbrowse.prg * contrib/hbxbp/xbpcheckbox.prg * contrib/hbxbp/xbpcombobox.prg * contrib/hbxbp/xbpdialog.prg * contrib/hbxbp/xbphtmlviewer.prg * contrib/hbxbp/xbplistbox.prg * contrib/hbxbp/xbpmenubar.prg * contrib/hbxbp/xbppushbutton.prg * contrib/hbxbp/xbpradiobutton.prg * contrib/hbxbp/xbprtf.prg * contrib/hbxbp/xbpscrollbar.prg * contrib/hbxbp/xbpsle.prg * contrib/hbxbp/xbpspinbutton.prg * contrib/hbxbp/xbptabpage.prg * contrib/hbxbp/xbptoolbar.prg * contrib/hbxbp/xbptreeview.prg * contrib/hbxbp/xbpwindow.prg ! Removed: occurances and methods calling :disconnect(). It is automatic with destructors. --- harbour/ChangeLog | 23 +++++++++++++++++ harbour/contrib/hbxbp/hbpprocess.prg | 3 ++- harbour/contrib/hbxbp/xbp3state.prg | 8 ------ harbour/contrib/hbxbp/xbpbrowse.prg | 32 ------------------------ harbour/contrib/hbxbp/xbpcheckbox.prg | 8 ------ harbour/contrib/hbxbp/xbpcombobox.prg | 10 -------- harbour/contrib/hbxbp/xbpdialog.prg | 12 --------- harbour/contrib/hbxbp/xbphtmlviewer.prg | 2 +- harbour/contrib/hbxbp/xbplistbox.prg | 27 -------------------- harbour/contrib/hbxbp/xbpmenubar.prg | 4 --- harbour/contrib/hbxbp/xbppushbutton.prg | 9 ------- harbour/contrib/hbxbp/xbpradiobutton.prg | 7 ------ harbour/contrib/hbxbp/xbprtf.prg | 16 ------------ harbour/contrib/hbxbp/xbpscrollbar.prg | 8 ------ harbour/contrib/hbxbp/xbpsle.prg | 17 ------------- harbour/contrib/hbxbp/xbpspinbutton.prg | 16 ------------ harbour/contrib/hbxbp/xbptabpage.prg | 10 -------- harbour/contrib/hbxbp/xbptoolbar.prg | 3 --- harbour/contrib/hbxbp/xbptreeview.prg | 21 ---------------- harbour/contrib/hbxbp/xbpwindow.prg | 30 ---------------------- 20 files changed, 26 insertions(+), 240 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d908f4556d..ae989c3573 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,29 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-19 23:26 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbxbp/hbpprocess.prg + * contrib/hbxbp/xbp3state.prg + * contrib/hbxbp/xbpbrowse.prg + * contrib/hbxbp/xbpcheckbox.prg + * contrib/hbxbp/xbpcombobox.prg + * contrib/hbxbp/xbpdialog.prg + * contrib/hbxbp/xbphtmlviewer.prg + * contrib/hbxbp/xbplistbox.prg + * contrib/hbxbp/xbpmenubar.prg + * contrib/hbxbp/xbppushbutton.prg + * contrib/hbxbp/xbpradiobutton.prg + * contrib/hbxbp/xbprtf.prg + * contrib/hbxbp/xbpscrollbar.prg + * contrib/hbxbp/xbpsle.prg + * contrib/hbxbp/xbpspinbutton.prg + * contrib/hbxbp/xbptabpage.prg + * contrib/hbxbp/xbptoolbar.prg + * contrib/hbxbp/xbptreeview.prg + * contrib/hbxbp/xbpwindow.prg + ! Removed: occurances and methods calling :disconnect(). + It is automatic with destructors. + 2011-03-19 23:21 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/hbmk2_qt.hbs * contrib/hbqt/qtcore/hbqt.h diff --git a/harbour/contrib/hbxbp/hbpprocess.prg b/harbour/contrib/hbxbp/hbpprocess.prg index 8c8d17aa0b..4dac111bab 100644 --- a/harbour/contrib/hbxbp/hbpprocess.prg +++ b/harbour/contrib/hbxbp/hbpprocess.prg @@ -300,11 +300,12 @@ METHOD HbpProcess:finish() ::qProcess:disconnect( "stateChanged(int)" ) ::qProcess:disconnect( "error(int)" ) #endif + #if 0 ::qProcess:disconnect( "started()" ) ::qProcess:disconnect( "readyReadStandardOutput()" ) ::qProcess:disconnect( "readyReadStandardError()" ) ::qProcess:disconnect( "finished(int,QProcess::ExitStatus)" ) - + #endif IF hb_isBlock( ::bFinish ) eval( ::bFinish, ::nExitCode, ::nExitStatus, Self ) ENDIF diff --git a/harbour/contrib/hbxbp/xbp3state.prg b/harbour/contrib/hbxbp/xbp3state.prg index 4471c3eff5..21f0fd9915 100644 --- a/harbour/contrib/hbxbp/xbp3state.prg +++ b/harbour/contrib/hbxbp/xbp3state.prg @@ -85,7 +85,6 @@ CLASS Xbp3State INHERIT XbpWindow, DataRef METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD destroy() METHOD connect() - METHOD disconnect() METHOD handleEvent( nEvent, mp1, mp2 ) METHOD setCaption( xCaption ) @@ -158,15 +157,8 @@ METHOD Xbp3State:connect() /*----------------------------------------------------------------------*/ -METHOD Xbp3State:disconnect() - ::oWidget:disconnect( "stateChanged(int)" ) - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD Xbp3State:destroy() - ::disconnect() ::xbpWindow:destroy() RETURN NIL diff --git a/harbour/contrib/hbxbp/xbpbrowse.prg b/harbour/contrib/hbxbp/xbpbrowse.prg index 7549185e53..7daf1f4d7f 100644 --- a/harbour/contrib/hbxbp/xbpbrowse.prg +++ b/harbour/contrib/hbxbp/xbpbrowse.prg @@ -455,7 +455,6 @@ EXPORTED: ACCESS getDbfModel() INLINE ::oDbfModel METHOD openPersistentEditor() METHOD connect() - METHOD disconnect() METHOD setFocus() INLINE ::oTableView:setFocus() @@ -477,8 +476,6 @@ EXPORTED: METHOD XbpBrowse:destroy() LOCAL i - ::disconnect() - ::bSkipBlock := NIL ::bGoTopBlock := NIL ::bGoBottomBlock := NIL @@ -573,35 +570,6 @@ METHOD XbpBrowse:connect() /*----------------------------------------------------------------------*/ -METHOD XbpBrowse:disconnect() - - ::oLeftHeaderView : disconnect( "sectionPressed(int)" ) - ::oLeftFooterView : disconnect( "sectionPressed(int)" ) - - ::oRightHeaderView : disconnect( "sectionPressed(int)" ) - ::oRightFooterView : disconnect( "sectionPressed(int)" ) - - ::oTableView : disconnect( QEvent_KeyPress ) - ::oTableView : disconnect( "customContextMenuRequested(QPoint)" ) - - ::oHScrollBar : disconnect( "actionTriggered(int)" ) - ::oHScrollBar : disconnect( "sliderReleased()" ) - - ::oVScrollBar : disconnect( "actionTriggered(int)" ) - ::oVScrollBar : disconnect( "sliderReleased()" ) - - ::oHeaderView : disconnect( "sectionPressed(int)" ) - ::oHeaderView : disconnect( "sectionResized(int,int,int)" ) - - ::oWidget : disconnect( QEvent_Resize ) - - ::qDelegate : disconnect( "closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)" ) - ::qDelegate : disconnect( "commitData(QWidget*)" ) - - RETURN Self - -/*----------------------------------------------------------------------*/ - /* Just to retain TBrowse functionality: in the future */ METHOD XbpBrowse:init( nTop, nLeft, nBottom, nRight ) diff --git a/harbour/contrib/hbxbp/xbpcheckbox.prg b/harbour/contrib/hbxbp/xbpcheckbox.prg index 6c10c209aa..afc6c75964 100644 --- a/harbour/contrib/hbxbp/xbpcheckbox.prg +++ b/harbour/contrib/hbxbp/xbpcheckbox.prg @@ -87,7 +87,6 @@ CLASS XbpCheckBox INHERIT XbpWindow, DataRef METHOD handleEvent( nEvent, mp1, mp2 ) METHOD execSlot( cSlot, p ) METHOD connect() - METHOD disconnect() METHOD setCaption( xCaption ) METHOD selected( ... ) SETGET @@ -157,15 +156,8 @@ METHOD XbpCheckBox:connect() /*----------------------------------------------------------------------*/ -METHOD XbpCheckBox:disconnect() - ::oWidget:disconnect( "stateChanged(int)" ) - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpCheckBox:destroy() - ::disconnect() ::xbpWindow:destroy() RETURN NIL diff --git a/harbour/contrib/hbxbp/xbpcombobox.prg b/harbour/contrib/hbxbp/xbpcombobox.prg index 73b990076c..390325f4e2 100644 --- a/harbour/contrib/hbxbp/xbpcombobox.prg +++ b/harbour/contrib/hbxbp/xbpcombobox.prg @@ -85,7 +85,6 @@ CLASS XbpComboBox INHERIT XbpWindow METHOD handleEvent( nEvent, mp1, mp2 ) VIRTUAL METHOD execSlot( cSlot, p ) METHOD connect() - METHOD disconnect() METHOD listBoxFocus( lFocus ) VIRTUAL // -> lOldFocus METHOD sleSize() VIRTUAL // -> aOldSize @@ -165,17 +164,8 @@ METHOD XbpComboBox:connect() /*----------------------------------------------------------------------*/ -METHOD XbpComboBox:disconnect() - ::oWidget:disconnect( "highlighted(int)" ) - ::oWidget:disconnect( "activated(int)" ) -* ::oWidget:disconnect( "currentIndexChanged(int)" ) - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpComboBox:destroy() - ::disconnect() ::xbpWindow:destroy() RETURN NIL diff --git a/harbour/contrib/hbxbp/xbpdialog.prg b/harbour/contrib/hbxbp/xbpdialog.prg index 2ab0ffa564..1cde8da65c 100644 --- a/harbour/contrib/hbxbp/xbpdialog.prg +++ b/harbour/contrib/hbxbp/xbpdialog.prg @@ -221,16 +221,10 @@ METHOD XbpDialog:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) /*----------------------------------------------------------------------*/ METHOD XbpDialog:destroy() - LOCAL qtObj HB_TRACE( HB_TR_DEBUG, ". " ) HB_TRACE( HB_TR_DEBUG, "<<<<<<<<<< XbpDialog:destroy B >>>>>>>>>>" ) - ::disconnectWindowEvents() - ::oWidget:disconnect( QEvent_Close ) - ::oWidget:disconnect( QEvent_WindowActivate ) - ::oWidget:disconnect( QEvent_WindowDeactivate ) - IF !empty( ::oEventLoop ) hbxbp_SetEventLoop( NIL ) ::oEventLoop:exit( 0 ) @@ -238,13 +232,7 @@ METHOD XbpDialog:destroy() ENDIF ::oMenu := NIL - IF ::isViaQtObject - qtObj := ::oWidget - ENDIF ::XbpWindow:destroy() - IF ::isViaQtObject - qtObj:destroy() - ENDIF HB_TRACE( HB_TR_DEBUG, "<<<<<<<<<< XbpDialog:destroy E >>>>>>>>>>" ) HB_TRACE( HB_TR_DEBUG, ". " ) diff --git a/harbour/contrib/hbxbp/xbphtmlviewer.prg b/harbour/contrib/hbxbp/xbphtmlviewer.prg index e5967fe904..20dae40346 100644 --- a/harbour/contrib/hbxbp/xbphtmlviewer.prg +++ b/harbour/contrib/hbxbp/xbphtmlviewer.prg @@ -185,7 +185,7 @@ METHOD XbpHTMLViewer:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible METHOD XbpHTMLViewer:destroy() ::oWidget:stop() - ::disconnect() + IF !empty( ::oURL ) ::oURL := NIL ENDIF diff --git a/harbour/contrib/hbxbp/xbplistbox.prg b/harbour/contrib/hbxbp/xbplistbox.prg index 57aaf3e18f..8ca4e4d945 100644 --- a/harbour/contrib/hbxbp/xbplistbox.prg +++ b/harbour/contrib/hbxbp/xbplistbox.prg @@ -119,7 +119,6 @@ CLASS XbpListBox INHERIT XbpWindow, DataRef METHOD getItemIndex( pItm ) METHOD toggleSelected( nIndex ) METHOD connect() - METHOD disConnect() METHOD setItemColorFG( nIndex, aRGB ) @@ -211,27 +210,6 @@ METHOD XbpListBox:connect() /*----------------------------------------------------------------------*/ -METHOD XbpListBox:disConnect() - -// ::oWidget:disconnect( QEvent_ContextMenu ) - - ::oWidget:disConnect( "currentItemChanged(QListWidgetItem*,QListWidgetItem*)" ) - ::oWidget:disConnect( "currentRowChanged(int)" ) - ::oWidget:disConnect( "currentTextChanged(QString)" ) - ::oWidget:disConnect( "itemActivated(QListWidgetItem*)" ) - ::oWidget:disConnect( "itemChanged(QListWidgetItem*)" ) - ::oWidget:disConnect( "itemClicked(QListWidgetItem*)" ) - ::oWidget:disConnect( "itemDoubleClicked(QListWidgetItem*)" ) - ::oWidget:disConnect( "itemEntered(QListWidgetItem*)" ) - ::oWidget:disConnect( "itemPressed(QListWidgetItem*)" ) - ::oWidget:disConnect( "itemSelectionChanged()" ) - - ::oWidget:disconnect( "customContextMenuRequested(QPoint)" ) - - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpListBox:toggleSelected( nIndex ) LOCAL n @@ -344,8 +322,6 @@ METHOD XbpListBox:clear( lConnect ) DEFAULT lConnect TO .t. - ::disConnect() - FOR EACH qItm IN ::aItems qItm := NIL NEXT @@ -355,9 +331,6 @@ METHOD XbpListBox:clear( lConnect ) ::oWidget:clear() ENDIF ENDIF - IF lConnect - ::connect() - ENDIF RETURN .t. diff --git a/harbour/contrib/hbxbp/xbpmenubar.prg b/harbour/contrib/hbxbp/xbpmenubar.prg index 2678c9a8d6..52ba6288f4 100644 --- a/harbour/contrib/hbxbp/xbpmenubar.prg +++ b/harbour/contrib/hbxbp/xbpmenubar.prg @@ -218,10 +218,6 @@ METHOD xbpMenuBar:delAllItems() METHOD xbpMenuBar:delItem( aItem ) IF hb_isObject( aItem[ 5 ] ) .AND. __ObjGetClsName( aItem[ 5 ] ) == "QACTION" - IF !( aItem[ 5 ]:isSeparator() ) - aItem[ 5 ]:disConnect( "triggered(bool)" ) - aItem[ 5 ]:disConnect( "hovered()" ) - ENDIF ::oWidget:removeAction( aItem[ 5 ] ) aItem[ 5 ] := NIL ENDIF diff --git a/harbour/contrib/hbxbp/xbppushbutton.prg b/harbour/contrib/hbxbp/xbppushbutton.prg index 2b92d85001..451928ca5d 100644 --- a/harbour/contrib/hbxbp/xbppushbutton.prg +++ b/harbour/contrib/hbxbp/xbppushbutton.prg @@ -93,7 +93,6 @@ CLASS XbpPushButton INHERIT XbpWindow METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD destroy() METHOD connect() - METHOD disconnect() METHOD handleEvent( nEvent, mp1, mp2 ) METHOD execSlot( cSlot, p ) METHOD setStyle() VIRTUAL @@ -172,16 +171,8 @@ METHOD XbpPushButton:connect() /*----------------------------------------------------------------------*/ -METHOD XbpPushButton:disconnect() - ::oWidget:disconnect( "clicked()" ) - ::oWidget:disconnect( "pressed()" ) - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpPushButton:destroy() - ::disconnect() ::xbpWindow:destroy() RETURN NIL diff --git a/harbour/contrib/hbxbp/xbpradiobutton.prg b/harbour/contrib/hbxbp/xbpradiobutton.prg index b9b9fe334c..776c9397d2 100644 --- a/harbour/contrib/hbxbp/xbpradiobutton.prg +++ b/harbour/contrib/hbxbp/xbpradiobutton.prg @@ -85,7 +85,6 @@ CLASS XbpRadioButton INHERIT XbpWindow, DataRef METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD destroy() METHOD connect() - METHOD disconnect() METHOD handleEvent( nEvent, mp1, mp2 ) METHOD execSlot( cSlot, p ) @@ -156,12 +155,6 @@ METHOD XbpRadioButton:connect() /*----------------------------------------------------------------------*/ -METHOD XbpRadioButton:disconnect() - ::oWidget:disconnect( "clicked()" ) - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpRadioButton:destroy() ::xbpWindow:destroy() diff --git a/harbour/contrib/hbxbp/xbprtf.prg b/harbour/contrib/hbxbp/xbprtf.prg index 2423912e65..75ad2f22c6 100644 --- a/harbour/contrib/hbxbp/xbprtf.prg +++ b/harbour/contrib/hbxbp/xbprtf.prg @@ -81,7 +81,6 @@ CLASS XbpRtf INHERIT XbpWindow METHOD configure() METHOD destroy() METHOD connect() - METHOD disconnect() METHOD handleEvent( nEvent, mp1, mp2 ) VIRTUAL METHOD execSlot( cSlot, p ) METHOD setStyle() VIRTUAL @@ -233,23 +232,8 @@ METHOD XbpRtf:connect() /*----------------------------------------------------------------------*/ -METHOD XbpRtf:disconnect() - -* ::oWidget:disconnect( "copyAvailable(bool)" ) - ::oWidget:disconnect( "currentCharFormatChanged(QTextCharFormat)" ) - ::oWidget:disconnect( "cursorPositionChanged()" ) - ::oWidget:disconnect( "redoAvailable(bool)" ) - ::oWidget:disconnect( "undoAvailable(bool)" ) - ::oWidget:disconnect( "textChanged()" ) - ::oWidget:disconnect( "selectionChanged()" ) - - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpRtf:destroy() - ::disconnect() ::xbpWindow:destroy() ::oTextDocument := NIL diff --git a/harbour/contrib/hbxbp/xbpscrollbar.prg b/harbour/contrib/hbxbp/xbpscrollbar.prg index 95c8bf335f..6fc892eae8 100644 --- a/harbour/contrib/hbxbp/xbpscrollbar.prg +++ b/harbour/contrib/hbxbp/xbpscrollbar.prg @@ -88,7 +88,6 @@ CLASS XbpScrollBar INHERIT XbpWindow, DataRef METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) VIRTUAL METHOD destroy() METHOD connect() - METHOD disconnect() METHOD scroll( ... ) SETGET @@ -190,15 +189,8 @@ METHOD XbpScrollBar:connect() /*----------------------------------------------------------------------*/ -METHOD XbpScrollBar:disconnect() - ::oWidget:disconnect( "actionTriggered(int)" ) - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpScrollBar:destroy() - ::disconnect() ::xbpWindow:destroy() RETURN NIL diff --git a/harbour/contrib/hbxbp/xbpsle.prg b/harbour/contrib/hbxbp/xbpsle.prg index d26990fba2..97311bebf8 100644 --- a/harbour/contrib/hbxbp/xbpsle.prg +++ b/harbour/contrib/hbxbp/xbpsle.prg @@ -93,7 +93,6 @@ CLASS XbpSLE INHERIT XbpWindow, DataRef METHOD handleEvent( nEvent, mp1, mp2 ) METHOD execSlot( cSlot, p, p2 ) METHOD connect() - METHOD disconnect() METHOD clear() INLINE ::oWidget:clear() METHOD copyMarked() INLINE ::oWidget:copy() @@ -180,24 +179,8 @@ METHOD XbpSLE:connect() /*----------------------------------------------------------------------*/ -METHOD XbpSLE:disconnect() - #if 0 - ::oWidget:disconnect( QEvent_FocusIn ) - ::oWidget:disconnect( QEvent_FocusOut ) - #endif - ::oWidget:disconnect( "cursorPositionChanged(int,int)" ) -* ::oWidget:disconnect( "editingFinished()" ) - ::oWidget:disconnect( "returnPressed()" ) -* ::oWidget:disconnect( "selectionChanged()" ) - ::oWidget:disconnect( "textChanged(QString)" ) - ::oWidget:disconnect( "textEdited(QString)" ) - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpSLE:destroy() - ::disconnect() ::xbpWindow:destroy() RETURN NIL diff --git a/harbour/contrib/hbxbp/xbpspinbutton.prg b/harbour/contrib/hbxbp/xbpspinbutton.prg index e7051078d4..3f3915daf5 100644 --- a/harbour/contrib/hbxbp/xbpspinbutton.prg +++ b/harbour/contrib/hbxbp/xbpspinbutton.prg @@ -95,7 +95,6 @@ CLASS XbpSpinButton INHERIT XbpWindow, DataRef METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) VIRTUAL METHOD destroy() METHOD connect() - METHOD disconnect() METHOD handleEvent( nEvent, mp1, mp2 ) METHOD execSlot( cSlot, p ) @@ -215,23 +214,8 @@ METHOD XbpSpinButton:connect() /*----------------------------------------------------------------------*/ -METHOD XbpSpinButton:disconnect() - - #if 0 - ::oWidget:connect( QEvent_FocusIn ) - ::oWidget:connect( QEvent_FocusOut ) - ::oWidget:connect( QEvent_KeyPress ) - #endif - - ::oWidget:disconnect( "valueChanged(int)" ) - - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpSpinButton:destroy() - ::disconnect() ::xbpWindow:destroy() RETURN NIL diff --git a/harbour/contrib/hbxbp/xbptabpage.prg b/harbour/contrib/hbxbp/xbptabpage.prg index 5cfdd79fe5..7587af2028 100644 --- a/harbour/contrib/hbxbp/xbptabpage.prg +++ b/harbour/contrib/hbxbp/xbptabpage.prg @@ -250,7 +250,6 @@ CLASS XbpTabWidget INHERIT XbpWindow METHOD destroy() METHOD execSlot( cSlot, p ) METHOD connect() - METHOD disconnect() ENDCLASS @@ -298,17 +297,8 @@ METHOD XbpTabWidget:connect() /*----------------------------------------------------------------------*/ -METHOD XbpTabWidget:disconnect() - ::oWidget:disconnect( "currentChanged(int)" ) - ::oWidget:disconnect( "tabCloseRequested(int)" ) - ::oWidget:disconnect( "customContextMenuRequested(QPoint)" ) - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpTabWidget:destroy() - ::disconnect() ::oParent:oTabWidget := NIL ::xbpWindow:destroy() diff --git a/harbour/contrib/hbxbp/xbptoolbar.prg b/harbour/contrib/hbxbp/xbptoolbar.prg index 8e1c6d41e5..bf22d7bf58 100644 --- a/harbour/contrib/hbxbp/xbptoolbar.prg +++ b/harbour/contrib/hbxbp/xbptoolbar.prg @@ -200,9 +200,6 @@ METHOD XbpToolbar:destroy() IF aItem[ 3 ] == XBPTOOLBAR_BUTTON_DEFAULT oBtn := aItem[ 2 ] aItem := NIL - - oBtn:oAction:disConnect( "triggered(bool)" ) - oBtn:oAction := NIL ELSE aItem := NIL diff --git a/harbour/contrib/hbxbp/xbptreeview.prg b/harbour/contrib/hbxbp/xbptreeview.prg index c4e2742896..8dba1b0733 100644 --- a/harbour/contrib/hbxbp/xbptreeview.prg +++ b/harbour/contrib/hbxbp/xbptreeview.prg @@ -93,7 +93,6 @@ CLASS XbpTreeView INHERIT XbpWindow, DataRef METHOD itemFromPos( aPos ) METHOD connect() - METHOD disconnect() DATA sl_itemCollapsed DATA sl_itemExpanded @@ -225,8 +224,6 @@ METHOD XbpTreeView:handleEvent( nEvent, mp1, mp2 ) METHOD XbpTreeView:destroy() LOCAL i - ::disconnect() - FOR i := len( ::aItems ) TO 1 step -1 ::aItems[ i ]:destroy() NEXT @@ -266,24 +263,6 @@ METHOD XbpTreeView:connect() /*----------------------------------------------------------------------*/ -METHOD XbpTreeView:disconnect() - - ::oWidget:disconnect( "itemCollapsed(QTreeWidgetItem*)" ) - ::oWidget:disconnect( "itemExpanded(QTreeWidgetItem*)" ) -* ::oWidget:disconnect( "currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)" ) -* ::oWidget:disconnect( "itemActivated(QTreeWidgetItem*,int)" ) -* ::oWidget:disconnect( "itemChanged(QTreeWidgetItem*,int)" ) - ::oWidget:disconnect( "itemClicked(QTreeWidgetItem*,int)" ) - ::oWidget:disconnect( "itemDoubleClicked(QTreeWidgetItem*,int)" ) - ::oWidget:disconnect( "itemEntered(QTreeWidgetItem*,int)" ) -* ::oWidget:disconnect( "itemPressed(QTreeWidgetItem*,int)" ) -* ::oWidget:disconnect( "itemSelectionChanged()" ) - ::oWidget:disconnect( "customContextMenuRequested(QPoint)" ) - - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpTreeView:configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::Initialize( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg index 02cd72a780..ec5ad0266b 100644 --- a/harbour/contrib/hbxbp/xbpwindow.prg +++ b/harbour/contrib/hbxbp/xbpwindow.prg @@ -250,7 +250,6 @@ CLASS XbpWindow INHERIT XbpPartHandler METHOD setFocus() METHOD sendMessage() METHOD connectWindowEvents() - METHOD disconnectWindowEvents() METHOD clearSlots() /* Called in the initializer - Unique in the application */ @@ -417,35 +416,6 @@ METHOD XbpWindow:connectWindowEvents() /*----------------------------------------------------------------------*/ -METHOD XbpWindow:disconnectWindowEvents() - - ::oWidget:connect( QEvent_MouseButtonPress , {|e| ::grabEvent( QEvent_MouseButtonPress , e ) } ) - ::oWidget:connect( QEvent_MouseButtonRelease , {|e| ::grabEvent( QEvent_MouseButtonRelease , e ) } ) - ::oWidget:connect( QEvent_MouseMove , {|e| ::grabEvent( QEvent_MouseMove , e ) } ) - ::oWidget:connect( QEvent_MouseButtonDblClick, {|e| ::grabEvent( QEvent_MouseButtonDblClick, e ) } ) - ::oWidget:connect( QEvent_Enter , {|e| ::grabEvent( QEvent_Enter , e ) } ) - ::oWidget:connect( QEvent_Leave , {|e| ::grabEvent( QEvent_Leave , e ) } ) - ::oWidget:connect( QEvent_Wheel , {|e| ::grabEvent( QEvent_Wheel , e ) } ) - - ::oWidget:connect( QEvent_FocusIn , {|e| ::grabEvent( QEvent_FocusIn , e ) } ) - ::oWidget:connect( QEvent_FocusOut , {|e| ::grabEvent( QEvent_FocusOut , e ) } ) - ::oWidget:connect( QEvent_DragEnter , {|e| ::grabEvent( QEvent_DragEnter , e ) } ) - ::oWidget:connect( QEvent_DragLeave , {|e| ::grabEvent( QEvent_DragLeave , e ) } ) - ::oWidget:connect( QEvent_DragMove , {|e| ::grabEvent( QEvent_DragMove , e ) } ) - ::oWidget:connect( QEvent_Drop , {|e| ::grabEvent( QEvent_Drop , e ) } ) - ::oWidget:connect( QEvent_WhatsThis , {|e| ::grabEvent( QEvent_WhatsThis , e ) } ) - ::oWidget:connect( QEvent_KeyPress , {|e| ::grabEvent( QEvent_KeyPress , e ) } ) - - ::oWidget:connect( QEvent_ContextMenu , {|e| ::grabEvent( QEvent_ContextMenu , e ) } ) - - ::oWidget:connect( QEvent_Move , {|e| ::grabEvent( QEvent_Move , e ) } ) -* ::oWidget:connect( QEvent_Paint , {|e| ::grabEvent( QEvent_Paint , e ) } ) -* ::oWidget:connect( QEvent_Resize , {|e| ::grabEvent( QEvent_Resize , e ) } ) - - RETURN Self - -/*----------------------------------------------------------------------*/ - METHOD XbpWindow:destroy() ::oParent := NIL