From 4d0e92e869aeab286a753010ee87be3bd30cafe4 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 --- kxmleditor/kxmleditorshell.cpp | 40 ++++++------- part/actions.cpp | 4 +- part/kxe_treeview.cpp | 8 +-- part/kxe_viewattributes.cpp | 6 +- part/kxe_viewelement.cpp | 8 +-- part/kxearchiveextssettings.cpp | 12 ++-- part/kxeattributedialog.cpp | 6 +- part/kxechardatadialog.cpp | 2 +- part/kxeconfiguration.cpp | 14 ++--- part/kxeelementdialog.cpp | 4 +- part/kxenewfilesettings.cpp | 10 ++-- part/kxeprintsettings.cpp | 10 ++-- part/kxeprocinstrdialog.cpp | 6 +- part/kxesettings.cpp | 2 +- part/kxespecprocinstrdialog.cpp | 2 +- part/kxetexteditordialog.cpp | 4 +- part/kxetextviewsettings.cpp | 18 +++--- part/kxetreeviewsettings.cpp | 16 ++--- part/kxmleditorpart.cpp | 128 ++++++++++++++++++++-------------------- 19 files changed, 150 insertions(+), 150 deletions(-) diff --git a/kxmleditor/kxmleditorshell.cpp b/kxmleditor/kxmleditorshell.cpp index 91188d0..57d407a 100644 --- a/kxmleditor/kxmleditorshell.cpp +++ b/kxmleditor/kxmleditorshell.cpp @@ -56,26 +56,26 @@ KXMLEditorShell::KXMLEditorShell( const char * name, WFlags f ) setXMLFile("kxmleditorshell.rc"); - KStdAction::openNew( this,SLOT(slotActFileNew()),actionCollection() ); - KStdAction::open( this, SLOT(slotFileOpen()), actionCollection() ); - m_pActFileOpenRecent = KStdAction::openRecent( this, SLOT(slotFileOpenRecent(const KURL&)), actionCollection() ); + KStdAction::openNew( this,TQ_SLOT(slotActFileNew()),actionCollection() ); + KStdAction::open( this, TQ_SLOT(slotFileOpen()), actionCollection() ); + m_pActFileOpenRecent = KStdAction::openRecent( this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection() ); m_pActFileOpenRecent->loadEntries( instance()->config() ); - m_pActReload = new TDEAction( i18n("Reloa&d"), "reload", Key_F5, this, SLOT(slotFileReload()), actionCollection(), "reload" ); + m_pActReload = new TDEAction( i18n("Reloa&d"), "reload", Key_F5, this, TQ_SLOT(slotFileReload()), actionCollection(), "reload" ); - TDEToggleAction * pActToggleMainToolBar = KStdAction::showToolbar( this, SLOT(slotToggleMainToolBar()), actionCollection() ); - TDEToggleAction * pActToggleStatusBar = KStdAction::showStatusbar( this, SLOT(slotToggleStatusBar()), actionCollection() ); - KStdAction::keyBindings( this, SLOT(slotConfigureKeys()), actionCollection() ); - KStdAction::configureToolbars( this, SLOT(slotConfigureToolbars()), actionCollection() ); + TDEToggleAction * pActToggleMainToolBar = KStdAction::showToolbar( this, TQ_SLOT(slotToggleMainToolBar()), actionCollection() ); + TDEToggleAction * pActToggleStatusBar = KStdAction::showStatusbar( this, TQ_SLOT(slotToggleStatusBar()), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT(slotConfigureKeys()), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT(slotConfigureToolbars()), actionCollection() ); - KStdAction::mail( this, SLOT(mail()), actionCollection() ); - KStdAction::close( this, SLOT(slotActClose()), actionCollection() ); - KStdAction::quit( this, SLOT(close()), actionCollection()); + KStdAction::mail( this, TQ_SLOT(mail()), actionCollection() ); + KStdAction::close( this, TQ_SLOT(slotActClose()), actionCollection() ); + KStdAction::quit( this, TQ_SLOT(close()), actionCollection()); // L.V. moved to part pActPrint = KStdAction::print( 0, 0, actionCollection(), "print" ); - pActCloseW = new TDEAction( i18n("&Close"), 0, 0, this,SLOT(slotActWindowClose()), actionCollection(), "window_close" ); - pActCloseAllW = new TDEAction( i18n("Close &all"), 0, 0, this,SLOT(slotActWindowCloseAll()), actionCollection(), "window_close_all" ); - pActCloseAllO = new TDEAction( i18n("Close all &others"), 0, 0, this,SLOT(slotActWindowCloseAllOthers()), actionCollection(), "window_close_all_others" ); + pActCloseW = new TDEAction( i18n("&Close"), 0, 0, this,TQ_SLOT(slotActWindowClose()), actionCollection(), "window_close" ); + pActCloseAllW = new TDEAction( i18n("Close &all"), 0, 0, this,TQ_SLOT(slotActWindowCloseAll()), actionCollection(), "window_close_all" ); + pActCloseAllO = new TDEAction( i18n("Close all &others"), 0, 0, this,TQ_SLOT(slotActWindowCloseAllOthers()), actionCollection(), "window_close_all_others" ); ////////////////////////////// // CREATE STATUSBAR @@ -355,8 +355,8 @@ void KXMLEditorShell::setPart(KParts::ReadWritePart* pPart) { if(pPart) { - connect(static_cast (pPart), SIGNAL(sigAddRecentURL(const KURL &)), - this, SLOT(slotAddRecentURL(const KURL &)) ); + connect(static_cast (pPart), TQ_SIGNAL(sigAddRecentURL(const KURL &)), + this, TQ_SLOT(slotAddRecentURL(const KURL &)) ); } } @@ -372,9 +372,9 @@ void KXMLEditorShell::setPart(KParts::ReadWritePart* pPart) KParts::BrowserExtension * pBrowserExt = 0; if ( (pBrowserExt = KParts::BrowserExtension::childObject(pPart)) ) // if there is one { - connect( pBrowserExt, SIGNAL(enableAction( const char *, bool )), this, SLOT(slotEnableBrowserExtActions( const char *, bool )) ); + connect( pBrowserExt, TQ_SIGNAL(enableAction( const char *, bool )), this, TQ_SLOT(slotEnableBrowserExtActions( const char *, bool )) ); - // L.V. moved to part. connect(pActPrint,SIGNAL(activated()),pBrowserExt, SLOT(print())); + // L.V. moved to part. connect(pActPrint,TQ_SIGNAL(activated()),pBrowserExt, TQ_SLOT(print())); //pActPrint->setEnabled(pBrowserExt->isActionEnabled("print")); } @@ -395,7 +395,7 @@ void KXMLEditorShell::setPart(KParts::ReadWritePart* pPart) if(!m_windowMenu) kdDebug() << "KXMLEditorShell::setPart - m_windowMenu is NULL" << endl; else - connect(m_windowMenu,SIGNAL(aboutToShow()),this,SLOT(slotBeforeWindowMenuShown())); + connect(m_windowMenu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotBeforeWindowMenuShown())); } KParts::ReadWritePart* KXMLEditorShell::createXMLPart(TQObject *parent) @@ -476,7 +476,7 @@ void KXMLEditorShell::slotBeforeWindowMenuShown() TQPtrListIterator it (*(manager()->shells())); for (it.toFirst(); it.current();++it) { - int id = m_windowMenu->insertItem(it.current()->caption(),it.current(),SLOT(slotActivate())); + int id = m_windowMenu->insertItem(it.current()->caption(),it.current(),TQ_SLOT(slotActivate())); m_windowMenu->setItemChecked(id,it.current()==this); } } diff --git a/part/actions.cpp b/part/actions.cpp index 79aea8d..febaaf2 100644 --- a/part/actions.cpp +++ b/part/actions.cpp @@ -73,11 +73,11 @@ int KXmlEditorComboAction::plug(TQWidget *w, int index) m_pCombo->setEditable(true); m_pCombo->setInsertionPolicy(TQComboBox::NoInsertion); toolBar->insertWidget( id, 70, m_pCombo, index ); - connect( m_pCombo, SIGNAL(activated(const TQString&)), m_receiver, m_member ); + connect( m_pCombo, TQ_SIGNAL(activated(const TQString&)), m_receiver, m_member ); addContainer( toolBar, id ); - connect(toolBar, SIGNAL(destroyed()), this, SLOT(slotDestroyed())); + connect(toolBar, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed())); toolBar->setItemAutoSized(id, true); diff --git a/part/kxe_treeview.cpp b/part/kxe_treeview.cpp index e16b3c8..bcb0bd8 100644 --- a/part/kxe_treeview.cpp +++ b/part/kxe_treeview.cpp @@ -55,8 +55,8 @@ KXE_TreeView::KXE_TreeView( KXMLGUIClient * pGUIClient, TQWidget * pParent, cons setSelectionMode(TQListView::Single); - connect( this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()) ); - connect( this, SIGNAL(expanded(TQListViewItem*)), this, SLOT(slotItemExpanded(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); + connect( this, TQ_SIGNAL(expanded(TQListViewItem*)), this, TQ_SLOT(slotItemExpanded(TQListViewItem*)) ); setReadWrite(false); @@ -65,12 +65,12 @@ KXE_TreeView::KXE_TreeView( KXMLGUIClient * pGUIClient, TQWidget * pParent, cons m_pDropItem = 0; m_autoOpenTimer = new TQTimer(this); - connect(m_autoOpenTimer, SIGNAL(timeout()), this, SLOT(slotAutoOpenFolder())); + connect(m_autoOpenTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoOpenFolder())); // Apply current configuration slotTreeViewSettingsChanged(); // and make sure to be informed about its changes. - connect( KXMLEditorFactory::configuration()->treeview(), SIGNAL(sigChanged()), this, SLOT(slotTreeViewSettingsChanged()) ); + connect( KXMLEditorFactory::configuration()->treeview(), TQ_SIGNAL(sigChanged()), this, TQ_SLOT(slotTreeViewSettingsChanged()) ); } void KXE_TreeView::setReadWrite( bool fReadWrite ) diff --git a/part/kxe_viewattributes.cpp b/part/kxe_viewattributes.cpp index 59084cf..e18aa10 100644 --- a/part/kxe_viewattributes.cpp +++ b/part/kxe_viewattributes.cpp @@ -34,7 +34,7 @@ KXE_ViewAttributes::KXE_ViewAttributes( TQWidget * pParent, const char * pszName setColumnReadOnly( 1, true ); setColumnReadOnly( 2, true ); - connect( this, SIGNAL(valueChanged(int,int)), this, SLOT(slotItemRenamedInplace(int,int)) ); + connect( this, TQ_SIGNAL(valueChanged(int,int)), this, TQ_SLOT(slotItemRenamedInplace(int,int)) ); } TQDomAttr KXE_ViewAttributes::getSelectedAttribute() const @@ -56,9 +56,9 @@ void KXE_ViewAttributes::setReadWrite( bool fReadWrite ) setColumnReadOnly( 2, ! fReadWrite ); if ( fReadWrite ) - connect( this, SIGNAL(contextMenuRequested(int,int,const TQPoint&)), this, SLOT(slotContextMenuRequested(int,int,const TQPoint&)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), this, TQ_SLOT(slotContextMenuRequested(int,int,const TQPoint&)) ); else - disconnect( this, SIGNAL(contextMenuRequested(int,int,const TQPoint&)), this, SLOT(slotContextMenuRequested(int,int,const TQPoint&)) ); + disconnect( this, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), this, TQ_SLOT(slotContextMenuRequested(int,int,const TQPoint&)) ); } void KXE_ViewAttributes::slotContextMenuRequested( int nRow, int nCol, const TQPoint & pos ) diff --git a/part/kxe_viewelement.cpp b/part/kxe_viewelement.cpp index 2c7b4ba..9d77de1 100644 --- a/part/kxe_viewelement.cpp +++ b/part/kxe_viewelement.cpp @@ -41,10 +41,10 @@ KXE_ViewElement::KXE_ViewElement( TQWidget * pParent, TDEConfig *pConfig, const setOpaqueResize(true); m_pConfig = pConfig; m_pViewAttributes = new KXE_ViewAttributes( this, "table of element attributes"); - connect( m_pViewAttributes, SIGNAL(sigContextMenuRequested(const TQString&,const TQPoint&)), this, SIGNAL(sigContextMenuRequested(const TQString&,const TQPoint&)) ); + connect( m_pViewAttributes, TQ_SIGNAL(sigContextMenuRequested(const TQString&,const TQPoint&)), this, TQ_SIGNAL(sigContextMenuRequested(const TQString&,const TQPoint&)) ); - connect( m_pViewAttributes, SIGNAL(sigAttributeNameChangedInplace(const TQDomAttr&, const TQString)), this, SIGNAL(sigAttributeNameChangedInplace(const TQDomAttr&, const TQString)) ); - connect( m_pViewAttributes, SIGNAL(sigAttributeValueChangedInplace(const TQDomAttr&, const TQString)), this, SIGNAL(sigAttributeValueChangedInplace(const TQDomAttr&, const TQString)) ); + connect( m_pViewAttributes, TQ_SIGNAL(sigAttributeNameChangedInplace(const TQDomAttr&, const TQString)), this, TQ_SIGNAL(sigAttributeNameChangedInplace(const TQDomAttr&, const TQString)) ); + connect( m_pViewAttributes, TQ_SIGNAL(sigAttributeValueChangedInplace(const TQDomAttr&, const TQString)), this, TQ_SIGNAL(sigAttributeValueChangedInplace(const TQDomAttr&, const TQString)) ); m_pViewPlainXML = new KTextEdit( this, "plain XML" ); m_pViewPlainXML->setReadOnly(true); @@ -64,7 +64,7 @@ KXE_ViewElement::KXE_ViewElement( TQWidget * pParent, TDEConfig *pConfig, const // Apply current configuration slotTextViewSettingsChanged(); // and make sure to be informed about its changes. - connect( KXMLEditorFactory::configuration()->textview(), SIGNAL(sigChanged()), this, SLOT(slotTextViewSettingsChanged()) ); + connect( KXMLEditorFactory::configuration()->textview(), TQ_SIGNAL(sigChanged()), this, TQ_SLOT(slotTextViewSettingsChanged()) ); } KXE_ViewElement::~KXE_ViewElement() diff --git a/part/kxearchiveextssettings.cpp b/part/kxearchiveextssettings.cpp index 7344552..4832419 100644 --- a/part/kxearchiveextssettings.cpp +++ b/part/kxearchiveextssettings.cpp @@ -71,13 +71,13 @@ TQWidget * KXEArchiveExtsSettings::dialogPage( TQFrame * pParent ) // and fill its widgets with the corresponding values updatePage(); - connect( m_pDialogPage->m_pExtensions, SIGNAL(highlighted(const TQString&)), this, SLOT(slotPageEditExtension(const TQString&)) ); - connect( m_pDialogPage->m_pBtnNew, SIGNAL(clicked()), this, SLOT(slotPageAddExtension()) ); - connect( m_pDialogPage->m_pBtnDelete, SIGNAL(clicked()), this, SLOT(slotPageDeleteExtension()) ); - connect( m_pDialogPage->m_pExtension, SIGNAL(textChanged(const TQString&)), this, SLOT(slotPageUpdateExtension(const TQString&)) ); + connect( m_pDialogPage->m_pExtensions, TQ_SIGNAL(highlighted(const TQString&)), this, TQ_SLOT(slotPageEditExtension(const TQString&)) ); + connect( m_pDialogPage->m_pBtnNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPageAddExtension()) ); + connect( m_pDialogPage->m_pBtnDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPageDeleteExtension()) ); + connect( m_pDialogPage->m_pExtension, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPageUpdateExtension(const TQString&)) ); - connect( m_pDialogPage->m_pBtnNew, SIGNAL(clicked()), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pBtnDelete, SIGNAL(clicked()), this, SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pBtnNew, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pBtnDelete, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(sigDialogPageChanged()) ); } return m_pDialogPage; diff --git a/part/kxeattributedialog.cpp b/part/kxeattributedialog.cpp index a9fba96..09f2e7e 100644 --- a/part/kxeattributedialog.cpp +++ b/part/kxeattributedialog.cpp @@ -27,9 +27,9 @@ KXEAttributeDialog::KXEAttributeDialog( TQWidget * pParent, const char * pszName, bool fModal, WFlags fl ) : KXEAttributeDialogBase( pParent, pszName, fModal, fl ) { - connect( m_pEditNamespace, SIGNAL(textChanged(const TQString &)), this, SLOT(slotNamespaceChanged(const TQString &)) ); - connect( m_pEditQName, SIGNAL(textChanged(const TQString &)), this, SLOT(slotNameChanged(const TQString &)) ); - connect( m_pEditValue, SIGNAL(textChanged(const TQString &)), this, SLOT(slotValueChanged(const TQString &)) ); + connect( m_pEditNamespace, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotNamespaceChanged(const TQString &)) ); + connect( m_pEditQName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotNameChanged(const TQString &)) ); + connect( m_pEditValue, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotValueChanged(const TQString &)) ); } void KXEAttributeDialog::clearDialog() diff --git a/part/kxechardatadialog.cpp b/part/kxechardatadialog.cpp index eb1f5c2..5cde48c 100644 --- a/part/kxechardatadialog.cpp +++ b/part/kxechardatadialog.cpp @@ -28,7 +28,7 @@ KXECharDataDialog::KXECharDataDialog( TQWidget * pParent, const char * pszName, bool fModal, WFlags fl ) : KXECharDataDialogBase( pParent, pszName, fModal, fl ) { - connect( m_pEditData, SIGNAL(textChanged()), this, SLOT(slotDataChanged()) ); + connect( m_pEditData, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotDataChanged()) ); } void KXECharDataDialog::clearDialog() diff --git a/part/kxeconfiguration.cpp b/part/kxeconfiguration.cpp index 6e8c425..4d25856 100644 --- a/part/kxeconfiguration.cpp +++ b/part/kxeconfiguration.cpp @@ -90,8 +90,8 @@ void KXEConfiguration::showDialog() "configuration dialog", // name false, // not modal true ); // show separator - connect( m_pDialog, SIGNAL(applyClicked()), this, SLOT(slotDlgApplied()) ); - connect( m_pDialog, SIGNAL(okClicked()), this, SLOT(slotDlgApplied()) ); + connect( m_pDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotDlgApplied()) ); + connect( m_pDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDlgApplied()) ); // and add the pages TQFrame * pFrame; @@ -105,7 +105,7 @@ void KXEConfiguration::showDialog() pLayout = new TQVBoxLayout( pFrame ); pPage = m_pTreeView->dialogPage( pFrame ); pLayout->addWidget( pPage ); - connect( m_pTreeView, SIGNAL(sigDialogPageChanged()), this, SLOT(slotDlgChanged()) ); + connect( m_pTreeView, TQ_SIGNAL(sigDialogPageChanged()), this, TQ_SLOT(slotDlgChanged()) ); // - text view properties page pFrame = m_pDialog->addPage( m_pTextView->dialogPageName(), @@ -114,7 +114,7 @@ void KXEConfiguration::showDialog() pLayout = new TQVBoxLayout( pFrame ); pPage = m_pTextView->dialogPage( pFrame ); pLayout->addWidget( pPage ); - connect( m_pTextView, SIGNAL(sigDialogPageChanged()), this, SLOT(slotDlgChanged()) ); + connect( m_pTextView, TQ_SIGNAL(sigDialogPageChanged()), this, TQ_SLOT(slotDlgChanged()) ); // - new file settings page pFrame = m_pDialog->addPage( m_pNewFile->dialogPageName(), @@ -123,7 +123,7 @@ void KXEConfiguration::showDialog() pLayout = new TQVBoxLayout( pFrame ); pPage = m_pNewFile->dialogPage( pFrame ); pLayout->addWidget( pPage ); - connect( m_pNewFile, SIGNAL(sigDialogPageChanged()), this, SLOT(slotDlgChanged()) ); + connect( m_pNewFile, TQ_SIGNAL(sigDialogPageChanged()), this, TQ_SLOT(slotDlgChanged()) ); // - printing's settings page pFrame = m_pDialog->addPage( m_pPrint->dialogPageName(), @@ -132,7 +132,7 @@ void KXEConfiguration::showDialog() pLayout = new TQVBoxLayout( pFrame ); pPage = m_pPrint->dialogPage( pFrame ); pLayout->addWidget( pPage ); - connect( m_pPrint, SIGNAL(sigDialogPageChanged()), this, SLOT(slotDlgChanged()) ); + connect( m_pPrint, TQ_SIGNAL(sigDialogPageChanged()), this, TQ_SLOT(slotDlgChanged()) ); // - archive extensions page pFrame = m_pDialog->addPage( m_pArcExts->dialogPageName(), @@ -141,7 +141,7 @@ void KXEConfiguration::showDialog() pLayout = new TQVBoxLayout( pFrame ); pPage = m_pArcExts->dialogPage( pFrame ); pLayout->addWidget( pPage ); - connect( m_pArcExts, SIGNAL(sigDialogPageChanged()), this, SLOT(slotDlgChanged()) ); + connect( m_pArcExts, TQ_SIGNAL(sigDialogPageChanged()), this, TQ_SLOT(slotDlgChanged()) ); } if ( m_pDialog->isVisible() ) // If the dialog is visible (probably opened by diff --git a/part/kxeelementdialog.cpp b/part/kxeelementdialog.cpp index adfadfd..b5006d0 100644 --- a/part/kxeelementdialog.cpp +++ b/part/kxeelementdialog.cpp @@ -28,8 +28,8 @@ KXEElementDialog::KXEElementDialog( TQWidget * pParent, const char * pszName, bool fModal, WFlags fl ) : KXEElementDialogBase( pParent, pszName, fModal, fl ) { - connect( m_pEditNsURI, SIGNAL(textChanged(const TQString&)), this, SLOT(slotNsURIChanged(const TQString&)) ); - connect( m_pEditName, SIGNAL(textChanged(const TQString&)), this, SLOT(slotNameChanged(const TQString&)) ); + connect( m_pEditNsURI, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotNsURIChanged(const TQString&)) ); + connect( m_pEditName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotNameChanged(const TQString&)) ); } void KXEElementDialog::clearDialog() diff --git a/part/kxenewfilesettings.cpp b/part/kxenewfilesettings.cpp index c23d4b4..a108a98 100644 --- a/part/kxenewfilesettings.cpp +++ b/part/kxenewfilesettings.cpp @@ -92,11 +92,11 @@ TQWidget * KXENewFileSettings::dialogPage( TQFrame * pParent ) m_pDialogPage->m_pDfltEncoding->insertStringList( encodings() ); updatePage(); - connect( m_pDialogPage->m_pDfltVersion, SIGNAL(textChanged(const TQString&)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pDfltEncoding, SIGNAL(activated(int)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pNewFileCreatBehav1, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pNewFileCreatBehav2, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pNewFileCreatBehav3, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pDfltVersion, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pDfltEncoding, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pNewFileCreatBehav1, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pNewFileCreatBehav2, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pNewFileCreatBehav3, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); } return m_pDialogPage; diff --git a/part/kxeprintsettings.cpp b/part/kxeprintsettings.cpp index f04b965..0a76e60 100644 --- a/part/kxeprintsettings.cpp +++ b/part/kxeprintsettings.cpp @@ -98,11 +98,11 @@ TQWidget * KXEPrintSettings::dialogPage( TQFrame * pParent ) // and fill its widgets with the corresponding values updatePage(); - connect( m_pDialogPage->m_pFontFamily, SIGNAL(activated(int)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pFontSize, SIGNAL(valueChanged(int)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pIndentSteps, SIGNAL(valueChanged(int)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pWithHeader, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pWithFooter, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pFontFamily, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pFontSize, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pIndentSteps, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pWithHeader, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pWithFooter, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); } return m_pDialogPage; diff --git a/part/kxeprocinstrdialog.cpp b/part/kxeprocinstrdialog.cpp index ef5287b..49e942b 100644 --- a/part/kxeprocinstrdialog.cpp +++ b/part/kxeprocinstrdialog.cpp @@ -31,9 +31,9 @@ KXEProcInstrDialog::KXEProcInstrDialog( TQWidget * pParent, const char * pszName : KXEProcInstrDialogBase( pParent, pszName, fModal, fl ) { // signals and slots connections - connect( m_pBtnOK, SIGNAL( clicked() ), this, SLOT( slotAccept() ) ); - connect( m_pEditData, SIGNAL(textChanged()), this, SLOT(slotDataChanged()) ); - connect( m_pEditTarget, SIGNAL(textChanged(const TQString &)), this, SLOT(slotTargetChanged(const TQString &)) ); + connect( m_pBtnOK, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAccept() ) ); + connect( m_pEditData, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotDataChanged()) ); + connect( m_pEditTarget, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTargetChanged(const TQString &)) ); } diff --git a/part/kxesettings.cpp b/part/kxesettings.cpp index d367cbd..62d9c0a 100644 --- a/part/kxesettings.cpp +++ b/part/kxesettings.cpp @@ -24,7 +24,7 @@ KXESettings::KXESettings( const TQString & strConfigGroup, TQObject * pParent, m_bPageChanged( false ), m_strConfigGroup( strConfigGroup ) { - connect( this, SIGNAL(sigDialogPageChanged()), this, SLOT(slotDialogPageChanged()) ); + connect( this, TQ_SIGNAL(sigDialogPageChanged()), this, TQ_SLOT(slotDialogPageChanged()) ); } void KXESettings::setConfigGroup( TDEConfig * pConfig ) const diff --git a/part/kxespecprocinstrdialog.cpp b/part/kxespecprocinstrdialog.cpp index 299b9e7..933569a 100644 --- a/part/kxespecprocinstrdialog.cpp +++ b/part/kxespecprocinstrdialog.cpp @@ -42,7 +42,7 @@ KXESpecProcInstrDialog::KXESpecProcInstrDialog(TQWidget *parent, const char *nam m_pDontShowAgain->hide(); // signals and slots connections - connect( m_pBtnOK, SIGNAL( clicked() ), this, SLOT( slotAccept() ) ); + connect( m_pBtnOK, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAccept() ) ); } KXESpecProcInstrDialog::~KXESpecProcInstrDialog() diff --git a/part/kxetexteditordialog.cpp b/part/kxetexteditordialog.cpp index 18c782c..8426858 100644 --- a/part/kxetexteditordialog.cpp +++ b/part/kxetexteditordialog.cpp @@ -34,12 +34,12 @@ KXETextEditorDialog::KXETextEditorDialog(TQWidget *parent, const char *name) { m_pSyntaxHighlighter = new KXESyntaxHighlighter(m_pTextEditor); - connect( m_pTextEditor, SIGNAL(textChanged()), this, SLOT(slotTextChanged()) ); + connect( m_pTextEditor, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); // Apply current configuration slotTextViewSettingsChanged(); // and make sure to be informed about its changes. - connect( KXMLEditorFactory::configuration()->textview(), SIGNAL(sigChanged()), this, SLOT(slotTextViewSettingsChanged()) ); + connect( KXMLEditorFactory::configuration()->textview(), TQ_SIGNAL(sigChanged()), this, TQ_SLOT(slotTextViewSettingsChanged()) ); } KXETextEditorDialog::~KXETextEditorDialog() diff --git a/part/kxetextviewsettings.cpp b/part/kxetextviewsettings.cpp index 94f5eda..b995ca9 100644 --- a/part/kxetextviewsettings.cpp +++ b/part/kxetextviewsettings.cpp @@ -132,15 +132,15 @@ TQWidget * KXETextViewSettings::dialogPage( TQFrame * pParent ) // and fill its widgets with the corresponding values updatePage(); - connect( m_pDialogPage->m_pColorDfltText, SIGNAL(changed(const TQColor&)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pColorElemNames, SIGNAL(changed(const TQColor&)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pColorAttrNames, SIGNAL(changed(const TQColor&)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pColorAttrValues, SIGNAL(changed(const TQColor&)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pColorSyntaxChars, SIGNAL(changed(const TQColor&)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pColorComments, SIGNAL(changed(const TQColor&)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pColorErrors, SIGNAL(changed(const TQColor&)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pIndentSteps, SIGNAL(valueChanged(int)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pCheckBoxWrapOn, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pColorDfltText, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pColorElemNames, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pColorAttrNames, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pColorAttrValues, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pColorSyntaxChars, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pColorComments, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pColorErrors, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pIndentSteps, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pCheckBoxWrapOn, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); } return m_pDialogPage; diff --git a/part/kxetreeviewsettings.cpp b/part/kxetreeviewsettings.cpp index 7c6f5d6..3437a98 100644 --- a/part/kxetreeviewsettings.cpp +++ b/part/kxetreeviewsettings.cpp @@ -105,14 +105,14 @@ TQWidget * KXETreeViewSettings::dialogPage( TQFrame * pParent ) // and fill its widgets with the corresponding values updatePage(); - connect( m_pDialogPage->m_pCreateItemsOnDemand, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pDecorateRoot, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pDfltExpLevel, SIGNAL(valueChanged(int)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pEnableDrag, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pEnableDrop, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pElemDisplMode1, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pElemDisplMode2, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); - connect( m_pDialogPage->m_pElemDisplMode3, SIGNAL(toggled(bool)), this, SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pCreateItemsOnDemand, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pDecorateRoot, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pDfltExpLevel, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pEnableDrag, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pEnableDrop, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pElemDisplMode1, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pElemDisplMode2, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); + connect( m_pDialogPage->m_pElemDisplMode3, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(sigDialogPageChanged()) ); } return m_pDialogPage; 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