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

2011-03-19 23:26 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* 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.
This commit is contained in:
Pritpal Bedi
2011-03-20 06:31:04 +00:00
parent d9735d4b87
commit d645e7ca38
20 changed files with 26 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
harbour/ChangeLog
View File

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

3
harbour/contrib/hbxbp/hbpprocess.prg
View File

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

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

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

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

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

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

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

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

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

12
harbour/contrib/hbxbp/xbpdialog.prg
View File

@@ -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, ". " )

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

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

27
harbour/contrib/hbxbp/xbplistbox.prg
View File

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

4
harbour/contrib/hbxbp/xbpmenubar.prg
View File

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

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

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

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

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

16
harbour/contrib/hbxbp/xbprtf.prg
View File

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

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

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

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

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

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

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

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

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

3
harbour/contrib/hbxbp/xbptoolbar.prg
View File

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

21
harbour/contrib/hbxbp/xbptreeview.prg
View File

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

30
harbour/contrib/hbxbp/xbpwindow.prg
View File

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