From 9e94ee99cd260efb279f2c810ea2c2cc7839e6ae Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 28 Dec 2023 16:37:54 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 4d0e92e869aeab286a753010ee87be3bd30cafe4) --- part/kxmleditorpart.cpp | 128 ++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 64 deletions(-) (limited to 'part/kxmleditorpart.cpp') diff --git a/part/kxmleditorpart.cpp b/part/kxmleditorpart.cpp index 671486f..01a4dcd 100644 --- a/part/kxmleditorpart.cpp +++ b/part/kxmleditorpart.cpp @@ -114,51 +114,51 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge // file actions if(fReadWrite) { - KStdAction::save(this, SLOT(save()), actionCollection()); - KStdAction::saveAs(this, SLOT(slotFileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); } // edit actions - m_pActEditFind = KStdAction::find( this, SLOT(slotEditFind()), actionCollection()); - m_pActEditFindNext = KStdAction::findNext( this, SLOT(slotEditFindNext()), actionCollection()); + m_pActEditFind = KStdAction::find( this, TQ_SLOT(slotEditFind()), actionCollection()); + m_pActEditFindNext = KStdAction::findNext( this, TQ_SLOT(slotEditFindNext()), actionCollection()); m_pActEditDeselect = new TDEAction( i18n("D&eselect Node"), CTRL+Key_E, this, - SLOT(slotEditDeselect()), actionCollection(), "deselect" ); + TQ_SLOT(slotEditDeselect()), actionCollection(), "deselect" ); // view actions m_pActViewNodeUp = new TDEAction( i18n("To &Parent Node"), "up", 0, this, - SLOT(slotViewNodeUp()), actionCollection(), "treeitem_up" ); + TQ_SLOT(slotViewNodeUp()), actionCollection(), "treeitem_up" ); m_pActViewExpNode = new TDEToolBarPopupAction( i18n("&Expand Node"), "expand_node", CTRL+Key_Plus, this, - SLOT(slotViewExpNode()), actionCollection(), "treeitem_expand" ); + TQ_SLOT(slotViewExpNode()), actionCollection(), "treeitem_expand" ); TDEPopupMenu * pMenuExpNode = m_pActViewExpNode->popupMenu(); - connect( pMenuExpNode, SIGNAL(activated(int)), this, SLOT(slotViewExpNode(int)) ); + connect( pMenuExpNode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotViewExpNode(int)) ); for ( uint i = 1; i <= 8; i++ ) pMenuExpNode->insertItem( i18n("Expand To Level %1").arg(i), i-1 ); m_pActViewColNode = new TDEToolBarPopupAction( i18n("&Collapse Node"), "collapse_node", CTRL+Key_Minus, this, - SLOT(slotViewColNode()), actionCollection(), "treeitem_collapse" ); + TQ_SLOT(slotViewColNode()), actionCollection(), "treeitem_collapse" ); TDEPopupMenu * pMenuColNode = m_pActViewColNode->popupMenu(); - connect( pMenuColNode, SIGNAL(activated(int)), this, SLOT(slotViewColNode(int)) ); + connect( pMenuColNode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotViewColNode(int)) ); for ( uint i = 0; i <= 7; i++ ) pMenuColNode->insertItem( i18n("Collapse To Level %1").arg(i), i ); // bookmark actions m_pActBookmarksToggle = new TDEAction( i18n("&Toggle Bookmark"), "bookmark_add", CTRL+Key_B, this, - SLOT(slotBookmarksToggle()), actionCollection(), "bookmark_toggle" ); + TQ_SLOT(slotBookmarksToggle()), actionCollection(), "bookmark_toggle" ); m_pActBookmarksPrev = new TDEAction( i18n("&Previous Bookmark"), "bookmark_prev", SHIFT+Key_F5, this, - SLOT(slotBookmarksPrev()), actionCollection(), "bookmark_prev" ); + TQ_SLOT(slotBookmarksPrev()), actionCollection(), "bookmark_prev" ); m_pActBookmarksNext = new TDEAction( i18n("&Next Bookmark"), "bookmark_next", Key_F5, this, - SLOT(slotBookmarksNext()), actionCollection(), "bookmark_next" ); + TQ_SLOT(slotBookmarksNext()), actionCollection(), "bookmark_next" ); // settings actions new TDEAction( i18n("&Configure KXMLEditor..."), "configure", 0, this, - SLOT (slotConfigure()), actionCollection(), "configure" ); + TQ_SLOT (slotConfigure()), actionCollection(), "configure" ); // path toolbar m_pActPathCombo = new KXmlEditorComboAction( i18n("Path Bar"), 0, this, - SLOT(slotPathSelected(const TQString &)), actionCollection(), "path_combo" ); + TQ_SLOT(slotPathSelected(const TQString &)), actionCollection(), "path_combo" ); new TDEAction( i18n("Clear Path Bar"), BarIcon("locationbar_erase", 16), 0, this, - SLOT(slotPathClear()), actionCollection(), "path_clear" ); + TQ_SLOT(slotPathClear()), actionCollection(), "path_clear" ); TQLabel *m_locationLabel = new ToolbarLabel( i18n("Path: ") ); new KWidgetAction( m_locationLabel, i18n("Path: "), 0, this, 0, actionCollection(), "path_label" ); m_locationLabel->setBuddy( m_pActPathCombo->comboBox()); @@ -167,9 +167,9 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge { setXMLFile( "kxmleditorpartBrowseUI.rc", true ); - KStdAction::cut( m_pBrowserExt, SLOT(slotEditCut()), actionCollection(), "cut" ); - KStdAction::copy( m_pBrowserExt, SLOT(slotEditCopy()), actionCollection(), "copy" ); - KStdAction::paste( m_pBrowserExt, SLOT(slotEditPaste()), actionCollection(), "paste"); + KStdAction::cut( m_pBrowserExt, TQ_SLOT(slotEditCut()), actionCollection(), "cut" ); + KStdAction::copy( m_pBrowserExt, TQ_SLOT(slotEditCopy()), actionCollection(), "copy" ); + KStdAction::paste( m_pBrowserExt, TQ_SLOT(slotEditPaste()), actionCollection(), "paste"); m_pCmdHistory = 0L; @@ -182,13 +182,13 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge else { // document specific actions here - m_pActVersionEncoding = new TDEAction( i18n("&Version && Encoding..."), 0, 0, this, SLOT(slotActVersionEncoding()), actionCollection(), "xml_ins_spec_procins" ); - m_pActAttachSchema = new TDEAction(i18n("Attach Schema..."),0,0,this,SLOT(slotActAttachSchema()), actionCollection(), "xml_attach_schema"); - m_pActDetachSchema = new TDEAction(i18n("Detach Schema"),0,0,this,SLOT(slotActDetachSchema()), actionCollection(), "xml_detach_schema"); - m_pActAttachStylesheet = new TDEAction(i18n("Attach Stylesheet..."),0,0,this,SLOT(slotActAttachStylesheet()), actionCollection(), "xml_attach_stylesheet"); - m_pActDetachStylesheet = new TDEAction(i18n("Detach Stylesheet"),0,0,this,SLOT(slotActDetachStylesheet()), actionCollection(), "xml_detach_stylesheet"); + m_pActVersionEncoding = new TDEAction( i18n("&Version && Encoding..."), 0, 0, this, TQ_SLOT(slotActVersionEncoding()), actionCollection(), "xml_ins_spec_procins" ); + m_pActAttachSchema = new TDEAction(i18n("Attach Schema..."),0,0,this,TQ_SLOT(slotActAttachSchema()), actionCollection(), "xml_attach_schema"); + m_pActDetachSchema = new TDEAction(i18n("Detach Schema"),0,0,this,TQ_SLOT(slotActDetachSchema()), actionCollection(), "xml_detach_schema"); + m_pActAttachStylesheet = new TDEAction(i18n("Attach Stylesheet..."),0,0,this,TQ_SLOT(slotActAttachStylesheet()), actionCollection(), "xml_attach_stylesheet"); + m_pActDetachStylesheet = new TDEAction(i18n("Detach Stylesheet"),0,0,this,TQ_SLOT(slotActDetachStylesheet()), actionCollection(), "xml_detach_stylesheet"); - KStdAction::print( this, SLOT(slotActPrint()), actionCollection(), "print" ); + KStdAction::print( this, TQ_SLOT(slotActPrint()), actionCollection(), "print" ); m_pActAttachSchema->setEnabled(false); m_pActDetachSchema->setEnabled(false); @@ -196,35 +196,35 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge // undo & redo - KStdAction::undo(this, SLOT(slotActUndo()), actionCollection()); - KStdAction::redo(this, SLOT(slotActRedo()), actionCollection()); + KStdAction::undo(this, TQ_SLOT(slotActUndo()), actionCollection()); + KStdAction::redo(this, TQ_SLOT(slotActRedo()), actionCollection()); m_pCmdHistory = new KCommandHistory(actionCollection()); - m_pActEditCut = KStdAction::cut( this, SLOT(slotEditCut()), actionCollection()); - m_pActEditCopy = KStdAction::copy( this, SLOT(slotEditCopy()), actionCollection()); - m_pActEditPaste = KStdAction::paste( this, SLOT(slotEditPaste()), actionCollection()); + m_pActEditCut = KStdAction::cut( this, TQ_SLOT(slotEditCut()), actionCollection()); + m_pActEditCopy = KStdAction::copy( this, TQ_SLOT(slotEditCopy()), actionCollection()); + m_pActEditPaste = KStdAction::paste( this, TQ_SLOT(slotEditPaste()), actionCollection()); // Move node Up & Down - m_pActXmlMoveNodeUp = new TDEAction( i18n("&Move Up"), "xml_move_item_up", CTRL+Key_U, this, SLOT(slotXmlMoveNodeUp()), actionCollection(), "xml_move_item_up" ); - m_pActXmlMoveNodeDown = new TDEAction( i18n("Move &Down"), "xml_move_item_down", CTRL+Key_D, this, SLOT(slotXmlMoveNodeDown()), actionCollection(), "xml_move_item_down" ); + m_pActXmlMoveNodeUp = new TDEAction( i18n("&Move Up"), "xml_move_item_up", CTRL+Key_U, this, TQ_SLOT(slotXmlMoveNodeUp()), actionCollection(), "xml_move_item_up" ); + m_pActXmlMoveNodeDown = new TDEAction( i18n("Move &Down"), "xml_move_item_down", CTRL+Key_D, this, TQ_SLOT(slotXmlMoveNodeDown()), actionCollection(), "xml_move_item_down" ); // Insert actions - m_pActXmlElementInsert = new TDEAction( i18n("&Element..."), "xml_insert_element", CTRL+SHIFT+Key_E, this, SLOT(slotXmlElementInsert()), actionCollection(), "xml_ins_element" ); - m_pActXmlAttributesAdd = new TDEAction( i18n("&Attribute..."), "xml_insert_attribute", CTRL+SHIFT+Key_A, this, SLOT(slotXmlAttributesAdd()), actionCollection(), "xml_add_attribute" ); - m_pActInsertText = new TDEAction( i18n("&Text..."), "xml_text", CTRL+SHIFT+Key_T, this, SLOT(slotActInsertText()), actionCollection(), "insert_text" ); - m_pActInsertCDATA = new TDEAction( i18n("C&DATA..."), "xml_cdata", CTRL+SHIFT+Key_D, this, SLOT(slotActInsertCDATA()), actionCollection(), "insert_cdata" ); - m_pActInsertComment = new TDEAction( i18n("&Comment..."), "xml_comment", CTRL+SHIFT+Key_C, this, SLOT(slotActInsertComment()), actionCollection(), "insert_comment" ); - m_pActXmlProcInstrInsert = new TDEAction( i18n("&Processing Instruction..."), "xml_insert_procins", CTRL+SHIFT+Key_P, this, SLOT(slotXmlProcInstrInsert()), actionCollection(), "xml_ins_procins" ); + m_pActXmlElementInsert = new TDEAction( i18n("&Element..."), "xml_insert_element", CTRL+SHIFT+Key_E, this, TQ_SLOT(slotXmlElementInsert()), actionCollection(), "xml_ins_element" ); + m_pActXmlAttributesAdd = new TDEAction( i18n("&Attribute..."), "xml_insert_attribute", CTRL+SHIFT+Key_A, this, TQ_SLOT(slotXmlAttributesAdd()), actionCollection(), "xml_add_attribute" ); + m_pActInsertText = new TDEAction( i18n("&Text..."), "xml_text", CTRL+SHIFT+Key_T, this, TQ_SLOT(slotActInsertText()), actionCollection(), "insert_text" ); + m_pActInsertCDATA = new TDEAction( i18n("C&DATA..."), "xml_cdata", CTRL+SHIFT+Key_D, this, TQ_SLOT(slotActInsertCDATA()), actionCollection(), "insert_cdata" ); + m_pActInsertComment = new TDEAction( i18n("&Comment..."), "xml_comment", CTRL+SHIFT+Key_C, this, TQ_SLOT(slotActInsertComment()), actionCollection(), "insert_comment" ); + m_pActXmlProcInstrInsert = new TDEAction( i18n("&Processing Instruction..."), "xml_insert_procins", CTRL+SHIFT+Key_P, this, TQ_SLOT(slotXmlProcInstrInsert()), actionCollection(), "xml_ins_procins" ); // Edit node properties - m_pActProperties = new TDEAction(i18n("&Properties..."),"edit",0,this,SLOT(slotActProperties()),actionCollection(),"edit_properties"); - m_pActEditRawXml = new TDEAction(i18n("Edit &raw XML..."), 0, 0, this, SLOT(slotActEditRawXml()),actionCollection(),"edit_as_raw_xml"); + m_pActProperties = new TDEAction(i18n("&Properties..."),"edit",0,this,TQ_SLOT(slotActProperties()),actionCollection(),"edit_properties"); + m_pActEditRawXml = new TDEAction(i18n("Edit &raw XML..."), 0, 0, this, TQ_SLOT(slotActEditRawXml()),actionCollection(),"edit_as_raw_xml"); // delete actions - m_pActXmlAttributeDel = new TDEAction( i18n("&Delete"), "editdelete", 0, this, SLOT(slotXmlAttributeDel()), actionCollection(), "xml_del_attribute" ); - m_pActXmlAttributesDel = new TDEAction( i18n("Delete all Attributes..."), 0, 0, this, SLOT(slotXmlAttributesDel()), actionCollection(), "xml_del_attributes" ); - m_pActDelete = new TDEAction(i18n("&Delete"),"editdelete",0,this,SLOT(slotActDelete()),actionCollection(),"edit_delete"); + m_pActXmlAttributeDel = new TDEAction( i18n("&Delete"), "editdelete", 0, this, TQ_SLOT(slotXmlAttributeDel()), actionCollection(), "xml_del_attribute" ); + m_pActXmlAttributesDel = new TDEAction( i18n("Delete all Attributes..."), 0, 0, this, TQ_SLOT(slotXmlAttributesDel()), actionCollection(), "xml_del_attributes" ); + m_pActDelete = new TDEAction(i18n("&Delete"),"editdelete",0,this,TQ_SLOT(slotActDelete()),actionCollection(),"edit_delete"); setXMLFile( "kxmleditorpartEditUI.rc", true ); @@ -244,13 +244,13 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge // create the tree view ------------------- m_pViewTree = new KXE_TreeView( this, pSplitter, "KXMLEditorPart treeview" ); - connect( m_pViewTree, SIGNAL(sigSelectionCleared(bool)), this, SLOT(slotSelectionCleared(bool)) ); - connect( m_pViewTree, SIGNAL(sigSelectionChanged(const TQDomElement &)), this, SLOT(slotSelectionChanged(const TQDomElement &)) ); - connect( m_pViewTree, SIGNAL(sigSelectionChanged(const TQDomCharacterData &)), this, SLOT(slotSelectionChanged(const TQDomCharacterData &)) ); - connect( m_pViewTree, SIGNAL(sigSelectionChanged(const TQDomProcessingInstruction &)), this, SLOT(slotSelectionChanged(const TQDomProcessingInstruction &)) ); - connect( m_pViewTree, SIGNAL(sigContextMenuRequested(const TQString&,const TQPoint&)), this, SLOT(slotContextMenuRequested(const TQString&,const TQPoint&)) ); - connect( m_pViewTree, SIGNAL(itemRenamed(TQListViewItem *)), this, SLOT(slotItemRenamedInplace(TQListViewItem *)) ); - connect( m_pViewTree, SIGNAL(sigKeyPressed(TQKeyEvent* )),this,SLOT(slotTreeViewKeyPressed(TQKeyEvent*))); + connect( m_pViewTree, TQ_SIGNAL(sigSelectionCleared(bool)), this, TQ_SLOT(slotSelectionCleared(bool)) ); + connect( m_pViewTree, TQ_SIGNAL(sigSelectionChanged(const TQDomElement &)), this, TQ_SLOT(slotSelectionChanged(const TQDomElement &)) ); + connect( m_pViewTree, TQ_SIGNAL(sigSelectionChanged(const TQDomCharacterData &)), this, TQ_SLOT(slotSelectionChanged(const TQDomCharacterData &)) ); + connect( m_pViewTree, TQ_SIGNAL(sigSelectionChanged(const TQDomProcessingInstruction &)), this, TQ_SLOT(slotSelectionChanged(const TQDomProcessingInstruction &)) ); + connect( m_pViewTree, TQ_SIGNAL(sigContextMenuRequested(const TQString&,const TQPoint&)), this, TQ_SLOT(slotContextMenuRequested(const TQString&,const TQPoint&)) ); + connect( m_pViewTree, TQ_SIGNAL(itemRenamed(TQListViewItem *)), this, TQ_SLOT(slotItemRenamedInplace(TQListViewItem *)) ); + connect( m_pViewTree, TQ_SIGNAL(sigKeyPressed(TQKeyEvent* )),this,TQ_SLOT(slotTreeViewKeyPressed(TQKeyEvent*))); // create tab widget ---------------------- m_pTabWidget = new TQTabWidget( pSplitter, "KXMLEditorPart tabwidget"); @@ -259,9 +259,9 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge // create element view m_pViewElement = new KXE_ViewElement( m_pTabWidget, instance()->config(), "KXMLEditorPart element view" ); m_pTabWidget->addTab( m_pViewElement, g_iconElement, i18n("Element") ); - connect( m_pViewElement, SIGNAL(sigContextMenuRequested(const TQString&,const TQPoint&)), this, SLOT(slotContextMenuRequested(const TQString&,const TQPoint&)) ); - connect( m_pViewElement, SIGNAL(sigAttributeNameChangedInplace(const TQDomAttr&, const TQString)), this, SLOT(slotAttributeNameChangedInplace(const TQDomAttr&, const TQString)) ); - connect( m_pViewElement, SIGNAL(sigAttributeValueChangedInplace(const TQDomAttr&, const TQString)), this, SLOT(slotAttributeValueChangedInplace(const TQDomAttr&, const TQString)) ); + connect( m_pViewElement, TQ_SIGNAL(sigContextMenuRequested(const TQString&,const TQPoint&)), this, TQ_SLOT(slotContextMenuRequested(const TQString&,const TQPoint&)) ); + connect( m_pViewElement, TQ_SIGNAL(sigAttributeNameChangedInplace(const TQDomAttr&, const TQString)), this, TQ_SLOT(slotAttributeNameChangedInplace(const TQDomAttr&, const TQString)) ); + connect( m_pViewElement, TQ_SIGNAL(sigAttributeValueChangedInplace(const TQDomAttr&, const TQString)), this, TQ_SLOT(slotAttributeValueChangedInplace(const TQDomAttr&, const TQString)) ); // create edit widget, that display XML character data contents m_pViewContents = new TQTextEdit( m_pTabWidget, "KXMLEditorPart contents view" ); @@ -276,9 +276,9 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge m_pViewProcInstr->setReadOnly( true ); m_pViewProcInstr->setWordWrap( TQTextEdit::NoWrap ); - connect( this, SIGNAL(started(TDEIO::Job*)), this, SLOT(started()) ); - connect( this, SIGNAL(completed()), this, SLOT(completed()) ); - connect( this, SIGNAL(canceled(const TQString &)), this, SLOT(canceled()) ); + connect( this, TQ_SIGNAL(started(TDEIO::Job*)), this, TQ_SLOT(started()) ); + connect( this, TQ_SIGNAL(completed()), this, TQ_SLOT(completed()) ); + connect( this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(canceled()) ); ////////////////////////////// // INIT BEGIN STATE @@ -1849,16 +1849,16 @@ void KXMLEditorPart::setDocument(KXEDocument *pDocument) if (pDocument) { // open document notification - connect(pDocument,SIGNAL(sigOpened()),this,SLOT(slotDocOpened())); + connect(pDocument,TQ_SIGNAL(sigOpened()),this,TQ_SLOT(slotDocOpened())); // document modification is also dispatched - connect(pDocument,SIGNAL(sigModified(bool)),this,SLOT(setModified(bool))); + connect(pDocument,TQ_SIGNAL(sigModified(bool)),this,TQ_SLOT(setModified(bool))); // update notifications - connect(pDocument,SIGNAL(sigNodeChanged(const TQDomElement&)),this,SLOT(updateNodeChanged(const TQDomElement&))); - connect(pDocument,SIGNAL(sigNodeChanged(const TQDomProcessingInstruction&)),this,SLOT(updateNodeChanged(const TQDomProcessingInstruction&))); - connect(pDocument,SIGNAL(sigNodeChanged(const TQDomCharacterData&)),this,SLOT(updateNodeChanged(const TQDomCharacterData&))); - connect(pDocument,SIGNAL(sigNodeCreated(const TQDomNode&)),this,SLOT(updateNodeCreated(const TQDomNode&))); - connect(pDocument,SIGNAL(sigNodeDeleted(const TQDomNode&)),this,SLOT(updateNodeDeleted(const TQDomNode&))); - connect(pDocument,SIGNAL(sigNodeMoved(const TQDomNode&)),this,SLOT(updateNodeMoved(const TQDomNode&))); + connect(pDocument,TQ_SIGNAL(sigNodeChanged(const TQDomElement&)),this,TQ_SLOT(updateNodeChanged(const TQDomElement&))); + connect(pDocument,TQ_SIGNAL(sigNodeChanged(const TQDomProcessingInstruction&)),this,TQ_SLOT(updateNodeChanged(const TQDomProcessingInstruction&))); + connect(pDocument,TQ_SIGNAL(sigNodeChanged(const TQDomCharacterData&)),this,TQ_SLOT(updateNodeChanged(const TQDomCharacterData&))); + connect(pDocument,TQ_SIGNAL(sigNodeCreated(const TQDomNode&)),this,TQ_SLOT(updateNodeCreated(const TQDomNode&))); + connect(pDocument,TQ_SIGNAL(sigNodeDeleted(const TQDomNode&)),this,TQ_SLOT(updateNodeDeleted(const TQDomNode&))); + connect(pDocument,TQ_SIGNAL(sigNodeMoved(const TQDomNode&)),this,TQ_SLOT(updateNodeMoved(const TQDomNode&))); // merging document action collection insertChildClient(pDocument); } -- cgit v1.2.1