diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e81bca3f42..ef1579f313 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,25 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-23 11:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/hbqreportsmanager.prg + * contrib/hbide/idebrowse.prg + * contrib/hbide/idedocks.prg + * contrib/hbide/ideedit.prg + * contrib/hbide/idefindreplace.prg + * contrib/hbide/idefunctions.prg + * contrib/hbide/ideharbourhelp.prg + * contrib/hbide/idehome.prg + * contrib/hbide/idesaveload.prg + * contrib/hbide/ideshortcuts.prg + + * contrib/hbxbp/xbpbrowse.prg + * contrib/hbxbp/xbplistbox.prg + * contrib/hbxbp/xbpprintdialog.prg + * contrib/hbxbp/xbptreeview.prg + ! Changed: :connect( "QClass *", ... ) => :connect( "QClass*", ... ) + This way we are uniform with signal notation also confirm to Qt protocol. + 2010-10-23 10:27 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idebrowse.prg * contrib/hbide/idedocks.prg diff --git a/harbour/contrib/hbide/hbqreportsmanager.prg b/harbour/contrib/hbide/hbqreportsmanager.prg index dc0db05d69..b08cb3f58c 100644 --- a/harbour/contrib/hbide/hbqreportsmanager.prg +++ b/harbour/contrib/hbide/hbqreportsmanager.prg @@ -362,7 +362,7 @@ METHOD HbqReportsManager:buildDesignReport() ::qTreeObjects:setObjectName( "ObjectsTree" ) ::qTreeObjects:setIconSize( QSize( 12,12 ) ) ::qTreeObjects:setIndentation( 12 ) - ::qTreeObjects:connect( "itemClicked(QTreeWidgetItem *,int)", {|p,p1| ::execEvent( "treeObjects_clicked", p, p1 ) } ) + ::qTreeObjects:connect( "itemClicked(QTreeWidgetItem*,int)", {|p,p1| ::execEvent( "treeObjects_clicked", p, p1 ) } ) ::qTabL1 := QTabWidget() ::qSplL:addWidget( ::qTabL1 ) @@ -1518,7 +1518,7 @@ METHOD HbqReportsManager:printPreview( qPrinter ) qDlg := QPrintPreviewDialog( qPrinter, ::qView ) - qDlg:connect( "paintRequested(QPrinter *)", {|p| ::paintRequested( p ) } ) + qDlg:connect( "paintRequested(QPrinter*)", {|p| ::paintRequested( p ) } ) qDlg:setWindowTitle( "HBReportGenerator : " + iif( !empty( ::cSaved ), ::cSaved, "Untitled" ) ) qDlg:move( 20, 20 ) diff --git a/harbour/contrib/hbide/idebrowse.prg b/harbour/contrib/hbide/idebrowse.prg index 306d6e8e34..456dff67f9 100644 --- a/harbour/contrib/hbide/idebrowse.prg +++ b/harbour/contrib/hbide/idebrowse.prg @@ -1187,7 +1187,7 @@ METHOD IdeBrowsePanel:new( oIde, cPanel, oManager ) ::qWidget:setTabShape( QTabWidget_Triangular ) ::qWidget:setViewMode( QMdiArea_TabbedView ) - ::qWidget:connect( "subWindowActivated(QMdiSubWindow *)", {|p| ::execEvent( "mdiArea_subWindowActivated", p ) } ) + ::qWidget:connect( "subWindowActivated(QMdiSubWindow*)", {|p| ::execEvent( "mdiArea_subWindowActivated", p ) } ) RETURN Self @@ -1822,7 +1822,6 @@ METHOD IdeBrowse:buildMdiWindow() ::nID := ++nID -// ::qMdi := QMdiSubWindow *( ::oDlg:oWidget ) ::qMdi := QMdiSubWindow( ::oDlg:oWidget ) // ::qMdi:setWidget( ::oWnd:oWidget ) diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 6def27f922..5b2307ffba 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -1078,7 +1078,7 @@ METHOD IdeDocks:buildStackedWidget() ::oDa:addChild( ::oStackedWidget ) - ::oStackedWidget:oWidget:connect( "subWindowActivated(QMdiSubWindow *)", {|p| ::execEvent( "mdiArea_subWindowActivated", p ) } ) + ::oStackedWidget:oWidget:connect( "subWindowActivated(QMdiSubWindow*)", {|p| ::execEvent( "mdiArea_subWindowActivated", p ) } ) ELSE /* Its parent will be drawing area and pages will be XbpTabWidgets() */ diff --git a/harbour/contrib/hbide/ideedit.prg b/harbour/contrib/hbide/ideedit.prg index fd17c85757..a5f0590de8 100644 --- a/harbour/contrib/hbide/ideedit.prg +++ b/harbour/contrib/hbide/ideedit.prg @@ -1845,10 +1845,10 @@ METHOD IdeEdit:printPreview() LOCAL qDlg := QPrintPreviewDialog( ::oDlg:oWidget ) qDlg:setWindowTitle( "hbIDE Preview Dialog" ) - qDlg:connect( "paintRequested(QPrinter *)", {|p| ::paintRequested( p ) } ) + qDlg:connect( "paintRequested(QPrinter*)", {|p| ::paintRequested( p ) } ) * qDlg:setWindowState( Qt_WindowMaximized ) qDlg:exec() - qDlg:disconnect( "paintRequested(QPrinter *)" ) + qDlg:disconnect( "paintRequested(QPrinter*)" ) RETURN self diff --git a/harbour/contrib/hbide/idefindreplace.prg b/harbour/contrib/hbide/idefindreplace.prg index 25a73e3c14..2150f8d2b5 100644 --- a/harbour/contrib/hbide/idefindreplace.prg +++ b/harbour/contrib/hbide/idefindreplace.prg @@ -1397,9 +1397,9 @@ METHOD IdeFindInFiles:print() qDlg := QPrintPreviewDialog( ::oUI ) qDlg:setWindowTitle( "Harbour-QT Preview Dialog" ) - qDlg:connect( "paintRequested(QPrinter *)", {|p| ::paintRequested( p ) } ) + qDlg:connect( "paintRequested(QPrinter*)", {|p| ::paintRequested( p ) } ) qDlg:exec() - qDlg:disconnect( "paintRequested(QPrinter *)" ) + qDlg:disconnect( "paintRequested(QPrinter*)" ) RETURN self diff --git a/harbour/contrib/hbide/idefunctions.prg b/harbour/contrib/hbide/idefunctions.prg index 55b8224cbe..b1cbbc3ed5 100644 --- a/harbour/contrib/hbide/idefunctions.prg +++ b/harbour/contrib/hbide/idefunctions.prg @@ -142,7 +142,7 @@ METHOD IdeFunctions:create( oIde ) ::oUI:q_buttonTag :connect( "clicked()" , {| | ::execEvent( "buttonTag_clicked" ) } ) ::oUI:q_buttonClose :connect( "clicked()" , {| | ::execEvent( "buttonClose_clicked" ) } ) ::oUI:q_tableFuncList:connect( "itemSelectionChanged()" , {| | ::execEvent( "tableFuncList_itemSelectionChanged" ) } ) - ::oUI:q_tableFuncList:connect( "itemDoubleClicked(QTableWidgetItem *)", {|p| ::execEvent( "tableFuncList_itemDoubleClicked", p ) } ) + ::oUI:q_tableFuncList:connect( "itemDoubleClicked(QTableWidgetItem*)", {|p| ::execEvent( "tableFuncList_itemDoubleClicked", p ) } ) RETURN Self diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg index 48b273949b..aa1788e810 100644 --- a/harbour/contrib/hbide/ideharbourhelp.prg +++ b/harbour/contrib/hbide/ideharbourhelp.prg @@ -400,7 +400,7 @@ METHOD IdeHarbourHelp:installSignals() ::oUI:q_editInstall :connect( "textChanged(QString)" , {|p| ::execEvent( "editInstall_textChanged" , p ) } ) ::oUI:q_editIndex :connect( "textChanged(QString)" , {|p| ::execEvent( "editIndex_textChanged" , p ) } ) ::oUI:q_editIndex :connect( "returnPressed()" , {| | ::execEvent( "editIndex_returnPressed" ) } ) - ::oUI:q_listIndex :connect( "itemDoubleClicked(QListWidgetItem *)", {|p| ::execEvent( "listIndex_ItemDoubleClicked" , p ) } ) + ::oUI:q_listIndex :connect( "itemDoubleClicked(QListWidgetItem*)", {|p| ::execEvent( "listIndex_ItemDoubleClicked" , p ) } ) ::oUI:q_treeDoc :connect( "itemSelectionChanged()" , {| | ::execEvent( "treeDoc_itemSelectionChanged" ) } ) ::oUI:q_treeCategory :connect( "itemSelectionChanged()" , {| | ::execEvent( "treeCategory_itemSelectionChanged" ) } ) @@ -1304,9 +1304,9 @@ METHOD IdeHarbourHelp:print() qDlg := QPrintPreviewDialog( ::oUI ) qDlg:setWindowTitle( "Harbour Help Document" ) - qDlg:connect( "paintRequested(QPrinter *)", {|p| ::paintRequested( p ) } ) + qDlg:connect( "paintRequested(QPrinter*)", {|p| ::paintRequested( p ) } ) qDlg:exec() - qDlg:disconnect( "paintRequested(QPrinter *)" ) + qDlg:disconnect( "paintRequested(QPrinter*)" ) RETURN self diff --git a/harbour/contrib/hbide/idehome.prg b/harbour/contrib/hbide/idehome.prg index 3fba1eb935..f20fbc5325 100644 --- a/harbour/contrib/hbide/idehome.prg +++ b/harbour/contrib/hbide/idehome.prg @@ -156,7 +156,7 @@ METHOD IdeHome:create( oIde ) METHOD IdeHome:destroy() IF !empty( ::qPrnDlg ) - ::qPrnDlg:disconnect( "paintRequested(QPrinter *)" ) + ::qPrnDlg:disconnect( "paintRequested(QPrinter*)" ) ::qPrnDlg := NIL ENDIF @@ -240,7 +240,7 @@ METHOD IdeHome:print() ::qPrnDlg := QPrintPreviewDialog() ::qPrnDlg:setWindowTitle( "Welcome::Projects" ) ::qPrnDlg:setWindowIcon( hbide_image( "hbide" ) ) - ::qPrnDlg:connect( "paintRequested(QPrinter *)", {|p| ::paintRequested( p ) } ) + ::qPrnDlg:connect( "paintRequested(QPrinter*)", {|p| ::paintRequested( p ) } ) ENDIF ::qPrnDlg:exec() diff --git a/harbour/contrib/hbide/idesaveload.prg b/harbour/contrib/hbide/idesaveload.prg index e0d24b38aa..adab786eb6 100644 --- a/harbour/contrib/hbide/idesaveload.prg +++ b/harbour/contrib/hbide/idesaveload.prg @@ -1042,7 +1042,7 @@ METHOD IdeSetup:disConnectSlots() ::oUI:q_buttonKeyUp :disconnect( "clicked()" ) ::oUI:q_buttonKeyDown :disconnect( "clicked()" ) - ::oUI:q_tableVar :disconnect( "itemActivated(QTableWidgetItem *)" ) + ::oUI:q_tableVar :disconnect( "itemActivated(QTableWidgetItem*)" ) ::oUI:q_buttonSelFont :disconnect( "clicked()" ) ::oUI:q_buttonClose :disConnect( "clicked()" ) @@ -1105,7 +1105,7 @@ METHOD IdeSetup:connectSlots() ::oUI:q_buttonKeyUp :connect( "clicked()" , {| | ::execEvent( "buttonKeyUp_clicked" ) } ) ::oUI:q_buttonKeyDown :connect( "clicked()" , {| | ::execEvent( "buttonKeyDown_clicked" ) } ) - ::oUI:q_tableVar :connect( "itemActivated(QTableWidgetItem *)", {|p| ::execEvent( "tableVar_keyPress", p ) } ) + ::oUI:q_tableVar :connect( "itemActivated(QTableWidgetItem*)", {|p| ::execEvent( "tableVar_keyPress", p ) } ) ::oUI:q_buttonSelFont :connect( "clicked()" , {| | ::execEvent( "buttonSelFont_clicked" ) } ) ::oUI:q_buttonClose :connect( "clicked()" , {| | ::execEvent( "buttonClose_clicked" ) } ) diff --git a/harbour/contrib/hbide/ideshortcuts.prg b/harbour/contrib/hbide/ideshortcuts.prg index dac83db75c..33eff1945d 100644 --- a/harbour/contrib/hbide/ideshortcuts.prg +++ b/harbour/contrib/hbide/ideshortcuts.prg @@ -600,10 +600,10 @@ METHOD IdeShortcuts:buildSignals() ::oUI:q_buttonSave :connect( "clicked()" , {| | ::execEvent( buttonSave_clicked ) } ) ::oUI:q_buttonSaveAs:connect( "clicked()" , {| | ::execEvent( buttonSaveAs_clicked ) } ) ::oUI:q_buttonDelete:connect( "clicked()" , {| | ::execEvent( buttonDelete_clicked ) } ) - ::oUI:q_listMethods :connect( "itemDoubleClicked(QListWidgetItem *)" , {|p| ::execEvent( listMethods_itemDoubleClicked, p ) } ) + ::oUI:q_listMethods :connect( "itemDoubleClicked(QListWidgetItem*)" , {|p| ::execEvent( listMethods_itemDoubleClicked, p ) } ) ::oUI:q_listMethods :connect( "currentRowChanged(int)" , {|p| ::execEvent( listMethods_currentRowChanged, p ) } ) ::oUI:q_tableMacros :connect( "itemSelectionChanged()" , {| | ::execEvent( tableMacros_itemSelectionChanged ) } ) - ::oUI:q_tableMacros :connect( "itemDoubleClicked(QTableWidgetItem *)", {|p| ::execEvent( tableMacros_itemDoubleClicked, p ) } ) + ::oUI:q_tableMacros :connect( "itemDoubleClicked(QTableWidgetItem*)", {|p| ::execEvent( tableMacros_itemDoubleClicked, p ) } ) RETURN Self diff --git a/harbour/contrib/hbxbp/xbpbrowse.prg b/harbour/contrib/hbxbp/xbpbrowse.prg index a740fe2dad..1928853b0a 100644 --- a/harbour/contrib/hbxbp/xbpbrowse.prg +++ b/harbour/contrib/hbxbp/xbpbrowse.prg @@ -566,8 +566,8 @@ METHOD XbpBrowse:connect() ::oWidget : connect( QEvent_Resize , {| | ::execSlot( __ev_frame_resized__ ) } ) - ::qDelegate : connect( "closeEditor(QWidget *,QAbstractItemDelegate::EndEditHint)", {|p,p1 | ::execSlot( __editor_closeEditor__, p, p1 ) } ) - ::qDelegate : connect( "commitData(QWidget *)" , {|p | ::execSlot( __editor_commitData__ , p ) } ) + ::qDelegate : connect( "closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)", {|p,p1 | ::execSlot( __editor_closeEditor__, p, p1 ) } ) + ::qDelegate : connect( "commitData(QWidget*)" , {|p | ::execSlot( __editor_commitData__ , p ) } ) RETURN Self @@ -595,8 +595,8 @@ METHOD XbpBrowse:disconnect() ::oWidget : disconnect( QEvent_Resize ) - ::qDelegate : disconnect( "closeEditor(QWidget *,QAbstractItemDelegate::EndEditHint)" ) - ::qDelegate : disconnect( "commitData(QWidget *)" ) + ::qDelegate : disconnect( "closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)" ) + ::qDelegate : disconnect( "commitData(QWidget*)" ) RETURN Self diff --git a/harbour/contrib/hbxbp/xbplistbox.prg b/harbour/contrib/hbxbp/xbplistbox.prg index ec1a297cef..159c70dfc8 100644 --- a/harbour/contrib/hbxbp/xbplistbox.prg +++ b/harbour/contrib/hbxbp/xbplistbox.prg @@ -195,18 +195,18 @@ METHOD XbpListBox:connect() // ::oWidget:connect( QEvent_ContextMenu, {|e| ::grabEvent( QEvent_ContextMenu, e ) } ) - ::oWidget:connect( "currentItemChanged(QListWidgetItem *,QListWidgetItem *)", {|p,p1| ::execSlot( "currentItemChanged(QListWidgetItem *,QListWidgetItem *)", p, p1 ) } ) - ::oWidget:connect( "currentRowChanged(int)" , {|p,p1| ::execSlot( "currentRowChanged(int)" , p, p1 ) } ) - ::oWidget:connect( "currentTextChanged(QString)" , {|p,p1| ::execSlot( "currentTextChanged(QString)" , p, p1 ) } ) - ::oWidget:connect( "itemActivated(QListWidgetItem *)" , {|p,p1| ::execSlot( "itemActivated(QListWidgetItem *)" , p, p1 ) } ) - ::oWidget:connect( "itemChanged(QListWidgetItem *)" , {|p,p1| ::execSlot( "itemChanged(QListWidgetItem *)" , p, p1 ) } ) - ::oWidget:connect( "itemClicked(QListWidgetItem *)" , {|p,p1| ::execSlot( "itemClicked(QListWidgetItem *)" , p, p1 ) } ) - ::oWidget:connect( "itemDoubleClicked(QListWidgetItem *)" , {|p,p1| ::execSlot( "itemDoubleClicked(QListWidgetItem *)" , p, p1 ) } ) - ::oWidget:connect( "itemEntered(QListWidgetItem *)" , {|p,p1| ::execSlot( "itemEntered(QListWidgetItem *)" , p, p1 ) } ) - ::oWidget:connect( "itemPressed(QListWidgetItem *)" , {|p,p1| ::execSlot( "itemPressed(QListWidgetItem *)" , p, p1 ) } ) - ::oWidget:connect( "itemSelectionChanged()" , {|p,p1| ::execSlot( "itemSelectionChanged()" , p, p1 ) } ) + ::oWidget:connect( "currentItemChanged(QListWidgetItem*,QListWidgetItem*)", {|p,p1| ::execSlot( "currentItemChanged(QListWidgetItem*,QListWidgetItem*)", p, p1 ) } ) + ::oWidget:connect( "currentRowChanged(int)" , {|p,p1| ::execSlot( "currentRowChanged(int)" , p, p1 ) } ) + ::oWidget:connect( "currentTextChanged(QString)" , {|p,p1| ::execSlot( "currentTextChanged(QString)" , p, p1 ) } ) + ::oWidget:connect( "itemActivated(QListWidgetItem*)" , {|p,p1| ::execSlot( "itemActivated(QListWidgetItem*)" , p, p1 ) } ) + ::oWidget:connect( "itemChanged(QListWidgetItem*)" , {|p,p1| ::execSlot( "itemChanged(QListWidgetItem*)" , p, p1 ) } ) + ::oWidget:connect( "itemClicked(QListWidgetItem*)" , {|p,p1| ::execSlot( "itemClicked(QListWidgetItem*)" , p, p1 ) } ) + ::oWidget:connect( "itemDoubleClicked(QListWidgetItem*)" , {|p,p1| ::execSlot( "itemDoubleClicked(QListWidgetItem*)" , p, p1 ) } ) + ::oWidget:connect( "itemEntered(QListWidgetItem*)" , {|p,p1| ::execSlot( "itemEntered(QListWidgetItem*)" , p, p1 ) } ) + ::oWidget:connect( "itemPressed(QListWidgetItem*)" , {|p,p1| ::execSlot( "itemPressed(QListWidgetItem*)" , p, p1 ) } ) + ::oWidget:connect( "itemSelectionChanged()" , {|p,p1| ::execSlot( "itemSelectionChanged()" , p, p1 ) } ) - ::oWidget:connect( "customContextMenuRequested(QPoint)" , {|p1 | ::execSlot( "customContextMenuRequested(QPoint)" , p1 ) } ) + ::oWidget:connect( "customContextMenuRequested(QPoint)" , {|p1 | ::execSlot( "customContextMenuRequested(QPoint)" , p1 ) } ) RETURN Self @@ -216,18 +216,18 @@ 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( "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)" ) + ::oWidget:disconnect( "customContextMenuRequested(QPoint)" ) RETURN Self @@ -297,26 +297,26 @@ METHOD XbpListBox:execSlot( cSlot, p ) CASE "currentRowChanged(int)" ::nCurSelected := p + 1 EXIT - CASE "itemClicked(QListWidgetItem *)" + CASE "itemClicked(QListWidgetItem*)" ::toggleSelected( nIndex ) ::itemMarked() EXIT - CASE "itemDoubleClicked(QListWidgetItem *)" + CASE "itemDoubleClicked(QListWidgetItem*)" ::itemSelected() EXIT - CASE "itemEntered(QListWidgetItem *)" + CASE "itemEntered(QListWidgetItem*)" ::oWidget:setToolTip( qItm:text() ) EXIT #if 0 - CASE "currentItemChanged(QListWidgetItem *,QListWidgetItem *)" + CASE "currentItemChanged(QListWidgetItem*,QListWidgetItem*)" EXIT CASE "currentTextChanged(QString)" EXIT - CASE "itemActivated(QListWidgetItem *)" + CASE "itemActivated(QListWidgetItem*)" EXIT - CASE "itemChanged(QListWidgetItem *)" + CASE "itemChanged(QListWidgetItem*)" EXIT - CASE "itemPressed(QListWidgetItem *)" + CASE "itemPressed(QListWidgetItem*)" EXIT CASE "itemSelectionChanged()" EXIT diff --git a/harbour/contrib/hbxbp/xbpprintdialog.prg b/harbour/contrib/hbxbp/xbpprintdialog.prg index df718c3239..a276e8047f 100644 --- a/harbour/contrib/hbxbp/xbpprintdialog.prg +++ b/harbour/contrib/hbxbp/xbpprintdialog.prg @@ -112,7 +112,7 @@ METHOD XbpPrintDialog:create( oParent, oOwner ) ::oWidget := QPrintDialog() - ::oWidget:connect( "accepted(QPrinter *)", {|p| ::pPrinter := p } ) + ::oWidget:connect( "accepted(QPrinter*)", {|p| ::pPrinter := p } ) ::postCreate() RETURN Self diff --git a/harbour/contrib/hbxbp/xbptreeview.prg b/harbour/contrib/hbxbp/xbptreeview.prg index 5ae8831e9c..6f199b1472 100644 --- a/harbour/contrib/hbxbp/xbptreeview.prg +++ b/harbour/contrib/hbxbp/xbptreeview.prg @@ -194,15 +194,15 @@ METHOD XbpTreeView:execSlot( cSlot, p ) ENDIF DO CASE - CASE cSlot == "itemCollapsed(QTreeWidgetItem *)" + CASE cSlot == "itemCollapsed(QTreeWidgetItem*)" ::itemCollapsed( oItem, {0,0,0,0} ) - CASE cSlot == "itemExpanded(QTreeWidgetItem *)" + CASE cSlot == "itemExpanded(QTreeWidgetItem*)" ::itemExpanded( oItem, {0,0,0,0} ) - CASE cSlot == "itemClicked(QTreeWidgetItem *,int)" + CASE cSlot == "itemClicked(QTreeWidgetItem*,int)" ::itemMarked( oItem, {0,0,0,0} ) - CASE cSlot == "itemDoubleClicked(QTreeWidgetItem *,int)" + CASE cSlot == "itemDoubleClicked(QTreeWidgetItem*,int)" ::itemSelected( oItem, {0,0,0,0} ) - CASE cSlot == "itemEntered(QTreeWidgetItem *,int)" + CASE cSlot == "itemEntered(QTreeWidgetItem*,int)" ::oWidget:setToolTip( iif( empty( oItem:tooltipText ), oItem:caption, oItem:tooltipText ) ) CASE cSlot == "customContextMenuRequested(QPoint)" IF hb_isBlock( ::hb_contextMenu ) @@ -215,10 +215,10 @@ METHOD XbpTreeView:execSlot( cSlot, p ) ENDIF ENDIF #if 0 - CASE cSlot == "currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)" - CASE cSlot == "itemPressed(QTreeWidgetItem *,int)" - CASE cSlot == "itemActivated(QTreeWidgetItem *,int)" - CASE cSlot == "itemChanged(QTreeWidgetItem *,int)" + CASE cSlot == "currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)" + CASE cSlot == "itemPressed(QTreeWidgetItem*,int)" + CASE cSlot == "itemActivated(QTreeWidgetItem*,int)" + CASE cSlot == "itemChanged(QTreeWidgetItem*,int)" CASE cSlot == "itemSelectionChanged()" #endif ENDCASE @@ -265,17 +265,17 @@ METHOD XbpTreeView:destroy() METHOD XbpTreeView:connect() - ::oWidget:connect( "itemCollapsed(QTreeWidgetItem *)" , {|p1 | ::execSlot( "itemCollapsed(QTreeWidgetItem *)" , p1 ) } ) - ::oWidget:connect( "itemExpanded(QTreeWidgetItem *)" , {|p1 | ::execSlot( "itemExpanded(QTreeWidgetItem *)" , p1 ) } ) -* ::oWidget:connect( "currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)" , {|p,p1| ::execSlot( "currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)", p, p1 ) } ) -* ::oWidget:connect( "itemActivated(QTreeWidgetItem *,int)" , {|p,p1| ::execSlot( "itemActivated(QTreeWidgetItem *,int)" , p, p1 ) } ) -* ::oWidget:connect( "itemChanged(QTreeWidgetItem *,int)" , {|p,p1| ::execSlot( "itemChanged(QTreeWidgetItem *,int)" , p, p1 ) } ) - ::oWidget:connect( "itemClicked(QTreeWidgetItem *,int)" , {|p,p1| ::execSlot( "itemClicked(QTreeWidgetItem *,int)" , p, p1 ) } ) - ::oWidget:connect( "itemDoubleClicked(QTreeWidgetItem *,int)" , {|p,p1| ::execSlot( "itemDoubleClicked(QTreeWidgetItem *,int)" , p, p1 ) } ) - ::oWidget:connect( "itemEntered(QTreeWidgetItem *,int)" , {|p,p1| ::execSlot( "itemEntered(QTreeWidgetItem *,int)" , p, p1 ) } ) -* ::oWidget:connect( "itemPressed(QTreeWidgetItem *,int)" , {|p,p1| ::execSlot( "itemPressed(QTreeWidgetItem *,int)" , p, p1 ) } ) -* ::oWidget:connect( "itemSelectionChanged()" , {|p1 | ::execSlot( "itemSelectionChanged()" , p1 ) } ) - ::oWidget:connect( "customContextMenuRequested(QPoint)" , {|p1 | ::execSlot( "customContextMenuRequested(QPoint)", p1 ) } ) + ::oWidget:connect( "itemCollapsed(QTreeWidgetItem*)" , {|p1 | ::execSlot( "itemCollapsed(QTreeWidgetItem*)" , p1 ) } ) + ::oWidget:connect( "itemExpanded(QTreeWidgetItem*)" , {|p1 | ::execSlot( "itemExpanded(QTreeWidgetItem*)" , p1 ) } ) +* ::oWidget:connect( "currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)", {|p,p1| ::execSlot( "currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)", p, p1 ) } ) +* ::oWidget:connect( "itemActivated(QTreeWidgetItem*,int)" , {|p,p1| ::execSlot( "itemActivated(QTreeWidgetItem*,int)" , p, p1 ) } ) +* ::oWidget:connect( "itemChanged(QTreeWidgetItem*,int)" , {|p,p1| ::execSlot( "itemChanged(QTreeWidgetItem*,int)" , p, p1 ) } ) + ::oWidget:connect( "itemClicked(QTreeWidgetItem*,int)" , {|p,p1| ::execSlot( "itemClicked(QTreeWidgetItem*,int)" , p, p1 ) } ) + ::oWidget:connect( "itemDoubleClicked(QTreeWidgetItem*,int)" , {|p,p1| ::execSlot( "itemDoubleClicked(QTreeWidgetItem*,int)" , p, p1 ) } ) + ::oWidget:connect( "itemEntered(QTreeWidgetItem*,int)" , {|p,p1| ::execSlot( "itemEntered(QTreeWidgetItem*,int)" , p, p1 ) } ) +* ::oWidget:connect( "itemPressed(QTreeWidgetItem*,int)" , {|p,p1| ::execSlot( "itemPressed(QTreeWidgetItem*,int)" , p, p1 ) } ) +* ::oWidget:connect( "itemSelectionChanged()" , {|p1 | ::execSlot( "itemSelectionChanged()" , p1 ) } ) + ::oWidget:connect( "customContextMenuRequested(QPoint)" , {|p1 | ::execSlot( "customContextMenuRequested(QPoint)" , p1 ) } ) RETURN Self @@ -283,15 +283,15 @@ 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( "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)" )