diff options
Diffstat (limited to 'lib/kofficecore')
| -rw-r--r-- | lib/kofficecore/KoApplication.cpp | 4 | ||||
| -rw-r--r-- | lib/kofficecore/KoDetailsPane.cpp | 44 | ||||
| -rw-r--r-- | lib/kofficecore/KoDocument.cpp | 36 | ||||
| -rw-r--r-- | lib/kofficecore/KoDocumentInfoDlg.cpp | 88 | ||||
| -rw-r--r-- | lib/kofficecore/KoFileDialog.cpp | 4 | ||||
| -rw-r--r-- | lib/kofficecore/KoFilterChain.cpp | 8 | ||||
| -rw-r--r-- | lib/kofficecore/KoFilterManager.cpp | 6 | ||||
| -rw-r--r-- | lib/kofficecore/KoMainWindow.cpp | 88 | ||||
| -rw-r--r-- | lib/kofficecore/KoOpenPane.cpp | 50 | ||||
| -rw-r--r-- | lib/kofficecore/KoSpeaker.cpp | 2 | ||||
| -rw-r--r-- | lib/kofficecore/KoView.cpp | 46 | ||||
| -rw-r--r-- | lib/kofficecore/Koversiondialog.cpp | 8 |
12 files changed, 192 insertions, 192 deletions
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp index 75a0d5e1..6429d6eb 100644 --- a/lib/kofficecore/KoApplication.cpp +++ b/lib/kofficecore/KoApplication.cpp @@ -132,7 +132,7 @@ bool KoApplication::start() return false; KoMainWindow *shell = new KoMainWindow( doc->instance() ); shell->show(); - TQObject::connect(doc, TQT_SIGNAL(sigProgress(int)), shell, TQT_SLOT(slotProgress(int))); + TQObject::connect(doc, TQ_SIGNAL(sigProgress(int)), shell, TQ_SLOT(slotProgress(int))); // for initDoc to fill in the recent docs list // and for KoDocument::slotStarted doc->addShell( shell ); @@ -144,7 +144,7 @@ bool KoApplication::start() } // FIXME This needs to be moved someplace else - TQObject::disconnect(doc, TQT_SIGNAL(sigProgress(int)), shell, TQT_SLOT(slotProgress(int))); + TQObject::disconnect(doc, TQ_SIGNAL(sigProgress(int)), shell, TQ_SLOT(slotProgress(int))); } else { bool print = koargs->isSet("print"); bool doTemplate = koargs->isSet("template"); diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 7fcf1164..457f2944 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -100,11 +100,11 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TQString fullTemplateName = cfgGrp.readPathEntry("FullTemplateName"); d->m_alwaysUseTemplate = cfgGrp.readPathEntry("AlwaysUseTemplate"); - connect(m_alwaysUseCheckBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(alwaysUseClicked())); + connect(m_alwaysUseCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(alwaysUseClicked())); changePalette(); if(kapp) { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(changePalette())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette())); } TDEListViewItem* selectItem = 0; @@ -125,13 +125,13 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, } } - connect(m_documentList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(openTemplate(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(openTemplate(TQListViewItem*))); - connect(m_openButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(openTemplate())); + connect(m_documentList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(openTemplate(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(openTemplate(TQListViewItem*))); + connect(m_openButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(openTemplate())); if(selectItem) { m_documentList->setSelected(selectItem, true); @@ -284,7 +284,7 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst changePalette(); if(kapp) { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(changePalette())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette())); } TQString oldGroup = instance->config()->group(); @@ -334,23 +334,23 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst instance->config()->setGroup( oldGroup ); - connect(m_documentList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(openFile(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(openFile(TQListViewItem*))); - connect(m_openButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(openFile())); + connect(m_documentList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(openFile(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(openFile(TQListViewItem*))); + connect(m_openButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(openFile())); m_documentList->setSelected(m_documentList->firstChild(), true); d->m_previewJob = TDEIO::filePreview(fileList, 200, 200); - connect(d->m_previewJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(previewResult(TDEIO::Job*))); - connect(d->m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), - this, TQT_SLOT(updatePreview(const KFileItem*, const TQPixmap&))); + connect(d->m_previewJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(previewResult(TDEIO::Job*))); + connect(d->m_previewJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), + this, TQ_SLOT(updatePreview(const KFileItem*, const TQPixmap&))); } KoRecentDocumentsPane::~KoRecentDocumentsPane() diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 6a6331de..85397acc 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -231,7 +231,7 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec d = new Private; m_bEmpty = TRUE; - connect( &d->m_autoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoSave() ) ); + connect( &d->m_autoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoSave() ) ); setAutoSave( s_defaultAutoSave ); d->m_bSingleViewMode = singleViewMode; @@ -264,7 +264,7 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec // A way to 'fix' the job's window, since we have no widget known to KParts if ( !singleViewMode ) - connect( this, TQT_SIGNAL( started( TDEIO::Job* ) ), TQT_SLOT( slotStarted( TDEIO::Job* ) ) ); + connect( this, TQ_SIGNAL( started( TDEIO::Job* ) ), TQ_SLOT( slotStarted( TDEIO::Job* ) ) ); } KoDocument::~KoDocument() @@ -277,8 +277,8 @@ KoDocument::~KoDocument() TQPtrListIterator<KoDocumentChild> childIt( d->m_children ); for (; childIt.current(); ++childIt ) - disconnect( childIt.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotChildDestroyed() ) ); + disconnect( childIt.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotChildDestroyed() ) ); // Tell our views that the document is already destroyed and // that they shouldn't try to access it. @@ -544,7 +544,7 @@ void KoDocument::slotAutoSave() { if ( isModified() && d->modifiedAfterAutosave && !d->m_bLoading ) { - connect( this, TQT_SIGNAL( sigProgress( int ) ), shells().current(), TQT_SLOT( slotProgress( int ) ) ); + connect( this, TQ_SIGNAL( sigProgress( int ) ), shells().current(), TQ_SLOT( slotProgress( int ) ) ); emit sigStatusBarMessage( i18n("Autosaving...") ); d->m_autosaving = true; bool ret = saveNativeFormat( autoSaveFile( m_file ) ); @@ -555,7 +555,7 @@ void KoDocument::slotAutoSave() } d->m_autosaving = false; emit sigClearStatusBarMessage(); - disconnect( this, TQT_SIGNAL( sigProgress( int ) ), shells().current(), TQT_SLOT( slotProgress( int ) ) ); + disconnect( this, TQ_SIGNAL( sigProgress( int ) ), shells().current(), TQ_SLOT( slotProgress( int ) ) ); if ( !ret ) emit sigStatusBarMessage( i18n("Error during autosave! Partition full?") ); } @@ -657,10 +657,10 @@ void KoDocument::insertChild( KoDocumentChild *child ) d->m_children.append( child ); - connect( child, TQT_SIGNAL( changed( KoChild * ) ), - this, TQT_SLOT( slotChildChanged( KoChild * ) ) ); - connect( child, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotChildDestroyed() ) ); + connect( child, TQ_SIGNAL( changed( KoChild * ) ), + this, TQ_SLOT( slotChildChanged( KoChild * ) ) ); + connect( child, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotChildDestroyed() ) ); // It may be that insertChild is called without the KoDocumentChild // having a KoDocument attached, yet. This happens for example @@ -2576,7 +2576,7 @@ void KoDocument::openExistingFile( const TQString& file ) setModified( false ); if( ok ) - TQTimer::singleShot( 0, this, TQT_SLOT( deleteOpenPane() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteOpenPane() ) ); } void KoDocument::openTemplate( const TQString& file ) @@ -2611,14 +2611,14 @@ KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, TDEInstance* instance, TQWidget *customDoc = createCustomDocumentWidget(openPane); if(customDoc) { openPane->setCustomDocumentWidget( customDoc ); - connect( customDoc, TQT_SIGNAL( documentSelected() ), this, TQT_SLOT( startCustomDocument() ) ); + connect( customDoc, TQ_SIGNAL( documentSelected() ), this, TQ_SLOT( startCustomDocument() ) ); } openPane->show(); - connect( openPane, TQT_SIGNAL( openExistingFile( const TQString& ) ), - this, TQT_SLOT( openExistingFile( const TQString& ) ) ); - connect( openPane, TQT_SIGNAL( openTemplate( const TQString& ) ), - this, TQT_SLOT( openTemplate( const TQString& ) ) ); + connect( openPane, TQ_SIGNAL( openExistingFile( const TQString& ) ), + this, TQ_SLOT( openExistingFile( const TQString& ) ) ); + connect( openPane, TQ_SIGNAL( openTemplate( const TQString& ) ), + this, TQ_SLOT( openTemplate( const TQString& ) ) ); return openPane; } @@ -2637,7 +2637,7 @@ void KoDocument::deleteOpenPane() { if( d->m_startUpWidget ) { d->m_startUpWidget->hide(); - TQTimer::singleShot(1000, this, TQT_SLOT(deleteOpenPaneDelayed())); + TQTimer::singleShot(1000, this, TQ_SLOT(deleteOpenPaneDelayed())); shells().getFirst()->factory()->container("mainToolBar", shells().getFirst())->show(); shells().getFirst()->setRootDocument( this ); @@ -2663,7 +2663,7 @@ bool KoDocument::showEmbedInitDialog(TQWidget* parent) pane->layout()->setMargin(0); dlg.setMainWidget(pane); dlg.setInitialSize(dlg.configDialogSize("EmbedInitDialog")); - connect(this, TQT_SIGNAL(closeEmbedInitDialog()), &dlg, TQT_SLOT(slotOk())); + connect(this, TQ_SIGNAL(closeEmbedInitDialog()), &dlg, TQ_SLOT(slotOk())); bool ok = dlg.exec() == TQDialog::Accepted; diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index b799eab3..c1cd4936 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -220,36 +220,36 @@ void KoDocumentInfoDlg::addAuthorPage( KoDocumentInfoAuthor *authorInfo ) d->m_authorWidget->leStreet->setText( authorInfo->street() ); d->m_authorWidget->leAuthorPosition->setText( authorInfo->position() ); - connect( d->m_authorWidget->leFullName, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leInitial, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leAuthorTitle, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leCompany, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leEmail, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leTelephoneWork, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leTelephoneHome, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leFax, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leCountry, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->lePostalCode, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leCity, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leStreet, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leAuthorPosition, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->pbLoadKABC, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( loadFromKABC() ) ); - connect( d->m_authorWidget->pbDelete, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( deleteInfo() ) ); + connect( d->m_authorWidget->leFullName, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leInitial, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leAuthorTitle, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leCompany, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leEmail, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leTelephoneWork, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leTelephoneHome, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leFax, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leCountry, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->lePostalCode, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leCity, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leStreet, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leAuthorPosition, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->pbLoadKABC, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( loadFromKABC() ) ); + connect( d->m_authorWidget->pbDelete, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( deleteInfo() ) ); } void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo ) @@ -274,18 +274,18 @@ void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo ) d->m_aboutWidget->leDocKeywords->setText( aboutInfo->keywords() ); d->m_aboutWidget->meDocAbstract->setText( aboutInfo->abstract() ); - connect( d->m_aboutWidget->leDocTitle, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->meDocAbstract, TQT_SIGNAL( textChanged() ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->leDocSubject, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->leDocKeywords, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->pbReset, TQT_SIGNAL( clicked() ), - aboutInfo, TQT_SLOT( resetMetaData() ) ); - connect( d->m_aboutWidget->pbReset, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( resetMetaData() ) ); + connect( d->m_aboutWidget->leDocTitle, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->meDocAbstract, TQ_SIGNAL( textChanged() ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->leDocSubject, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->leDocKeywords, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->pbReset, TQ_SIGNAL( clicked() ), + aboutInfo, TQ_SLOT( resetMetaData() ) ); + connect( d->m_aboutWidget->pbReset, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( resetMetaData() ) ); } void KoDocumentInfoDlg::addUserMetadataPage( KoDocumentInfoUserMetadata *userMetadataInfo ) @@ -426,8 +426,8 @@ KoDocumentInfoPropsPage::KoDocumentInfoPropsPage( KPropertiesDialog *props, } d->m_dlg = new KoDocumentInfoDlg( d->m_info, 0, 0, props ); - connect( d->m_dlg, TQT_SIGNAL( changed() ), - this, TQT_SIGNAL( changed() ) ); + connect( d->m_dlg, TQ_SIGNAL( changed() ), + this, TQ_SIGNAL( changed() ) ); } KoDocumentInfoPropsPage::~KoDocumentInfoPropsPage() diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp index 84c5bde8..97a934b1 100644 --- a/lib/kofficecore/KoFileDialog.cpp +++ b/lib/kofficecore/KoFileDialog.cpp @@ -30,8 +30,8 @@ KoFileDialog::KoFileDialog(const TQString& startDir, const TQString& filter, bool modal) : KFileDialog( startDir, filter, parent, name, modal ) { - connect( filterWidget, TQT_SIGNAL( activated( int) ), - this, TQT_SLOT( slotChangedfilter( int ) ) ); + connect( filterWidget, TQ_SIGNAL( activated( int) ), + this, TQ_SLOT( slotChangedfilter( int ) ) ); } void KoFileDialog::slotChangedfilter( int index ) diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp index 91123fd3..1f30ff47 100644 --- a/lib/kofficecore/KoFilterChain.cpp +++ b/lib/kofficecore/KoFilterChain.cpp @@ -84,8 +84,8 @@ int KoFilterChain::ChainLink::lruPartIndex() const void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentFilter ) const { // progress information - TQObject::connect( m_filter, TQT_SIGNAL( sigProgress( int ) ), - m_chain->manager(), TQT_SIGNAL( sigProgress( int ) ) ); + TQObject::connect( m_filter, TQ_SIGNAL( sigProgress( int ) ), + m_chain->manager(), TQ_SIGNAL( sigProgress( int ) ) ); if ( !parentFilter ) return; @@ -110,10 +110,10 @@ void KoFilterChain::ChainLink::setupConnections( const KoFilter* sender, const T if ( strncmp( slotIt.current(), SLOT_PREFIX, SLOT_PREFIX_LEN ) == 0 ) { if ( strcmp( signalIt.current() + SIGNAL_PREFIX_LEN, slotIt.current() + SLOT_PREFIX_LEN ) == 0 ) { TQCString signalString; - signalString.setNum( TQSIGNAL_CODE ); + signalString.setNum( TQ_SIGNAL_CODE ); signalString += signalIt.current(); TQCString slotString; - slotString.setNum( TQSLOT_CODE ); + slotString.setNum( TQ_SLOT_CODE ); slotString += slotIt.current(); TQObject::connect( sender, signalString, receiver, slotString ); } diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index e22d5f3e..44b83712 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -89,7 +89,7 @@ KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeType m_filterList->centerCurrentItem (); m_filterList->setFocus (); - connect (m_filterList, TQT_SIGNAL (selected (int)), this, TQT_SLOT (slotOk ())); + connect (m_filterList, TQ_SIGNAL (selected (int)), this, TQ_SLOT (slotOk ())); } KoFilterChooser::~KoFilterChooser () @@ -119,8 +119,8 @@ KoFilterManager::KoFilterManager( KoDocument* document ) : d = new KoFilterManager::Private; d -> m_batch = false; if ( document ) - TQObject::connect( this, TQT_SIGNAL( sigProgress( int ) ), - document, TQT_SIGNAL( sigProgress( int ) ) ); + TQObject::connect( this, TQ_SIGNAL( sigProgress( int ) ), + document, TQ_SIGNAL( sigProgress( int ) ) ); } diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index c2680b44..cce7fff2 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -192,8 +192,8 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_manager = new KoPartManager( this ); - connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActivePartChanged( KParts::Part * ) ) ); + connect( d->m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActivePartChanged( KParts::Part * ) ) ); if ( instance ) setInstance( instance, false ); // don't load plugins! we don't want @@ -205,41 +205,41 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) setXMLFile( findMostRecentXMLFile( allFiles, doc ) ); setLocalXMLFile( locateLocal( "data", "koffice/koffice_shell.rc" ) ); - KStdAction::openNew( this, TQT_SLOT( slotFileNew() ), actionCollection(), "file_new" ); - KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); - m_recent = KStdAction::openRecent( this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection() ); - d->m_paSave = KStdAction::save( this, TQT_SLOT( slotFileSave() ), actionCollection(), "file_save" ); - d->m_paSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs() ), actionCollection(), "file_save_as" ); - d->m_paPrint = KStdAction::print( this, TQT_SLOT( slotFilePrint() ), actionCollection(), "file_print" ); - d->m_paPrintPreview = KStdAction::printPreview( this, TQT_SLOT( slotFilePrintPreview() ), actionCollection(), "file_print_preview" ); - d->m_sendfile = KStdAction::mail( this, TQT_SLOT( slotEmailFile() ), actionCollection(), "file_send_file"); + KStdAction::openNew( this, TQ_SLOT( slotFileNew() ), actionCollection(), "file_new" ); + KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); + m_recent = KStdAction::openRecent( this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection() ); + d->m_paSave = KStdAction::save( this, TQ_SLOT( slotFileSave() ), actionCollection(), "file_save" ); + d->m_paSaveAs = KStdAction::saveAs( this, TQ_SLOT( slotFileSaveAs() ), actionCollection(), "file_save_as" ); + d->m_paPrint = KStdAction::print( this, TQ_SLOT( slotFilePrint() ), actionCollection(), "file_print" ); + d->m_paPrintPreview = KStdAction::printPreview( this, TQ_SLOT( slotFilePrintPreview() ), actionCollection(), "file_print_preview" ); + d->m_sendfile = KStdAction::mail( this, TQ_SLOT( slotEmailFile() ), actionCollection(), "file_send_file"); - d->m_paCloseFile = KStdAction::close( this, TQT_SLOT( slotFileClose() ), actionCollection(), "file_close" ); - KStdAction::quit( this, TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" ); + d->m_paCloseFile = KStdAction::close( this, TQ_SLOT( slotFileClose() ), actionCollection(), "file_close" ); + KStdAction::quit( this, TQ_SLOT( slotFileQuit() ), actionCollection(), "file_quit" ); d->m_reloadfile = new TDEAction( i18n( "Reload"), 0, - this, TQT_SLOT( slotReloadFile() ), + this, TQ_SLOT( slotReloadFile() ), actionCollection(), "file_reload_file"); d->m_versionsfile = new TDEAction( i18n( "Versions..."), 0, - this, TQT_SLOT( slotVersionsFile() ), + this, TQ_SLOT( slotVersionsFile() ), actionCollection(), "file_versions_file"); d->m_importFile = new TDEAction( i18n( "I&mport..." ), 0, // clashing accel key :( - this, TQT_SLOT( slotImportFile() ), + this, TQ_SLOT( slotImportFile() ), actionCollection(), "file_import_file"); d->m_exportFile = new TDEAction( i18n( "E&xport..." ), 0, - this, TQT_SLOT( slotExportFile() ), + this, TQ_SLOT( slotExportFile() ), actionCollection(), "file_export_file"); /* The following entry opens the document information dialog. Since the action is named so it intends to show data this entry should not have a trailing ellipses (...). */ d->m_paDocInfo = new TDEAction( i18n( "&Document Information" ), "documentinfo", 0, - this, TQT_SLOT( slotDocumentInfo() ), + this, TQ_SLOT( slotDocumentInfo() ), actionCollection(), "file_documentinfo" ); - KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() ); - KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); d->m_paDocInfo->setEnabled( false ); d->m_paSaveAs->setEnabled( false ); @@ -260,20 +260,20 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) // set up the action "list" for "Close all Views" (hacky :) (Werner) d->m_veryHackyActionList.append( new TDEAction(i18n("&Close All Views"), "window-close", - "ctrl+shift+w", this, TQT_SLOT(slotCloseAllViews()), + "ctrl+shift+w", this, TQ_SLOT(slotCloseAllViews()), actionCollection(), "view_closeallviews") ); // set up the action list for the splitter stuff d->m_splitViewActionList.append(new TDEAction(i18n("&Split View"), "view_split", 0, - this, TQT_SLOT(slotSplitView()), + this, TQ_SLOT(slotSplitView()), actionCollection(), "view_split")); d->m_removeView=new TDEAction(i18n("&Remove View"), "view_remove", 0, - this, TQT_SLOT(slotRemoveView()), + this, TQ_SLOT(slotRemoveView()), actionCollection(), "view_rm_splitter"); d->m_splitViewActionList.append(d->m_removeView); d->m_removeView->setEnabled(false); d->m_orientation=new TDESelectAction(i18n("Splitter &Orientation"), "view_orientation", 0, - this, TQT_SLOT(slotSetOrientation()), + this, TQ_SLOT(slotSetOrientation()), actionCollection(), "view_splitter_orientation"); TQStringList items; items << i18n("&Vertical") @@ -596,9 +596,9 @@ bool KoMainWindow::openDocumentInternal( const KURL & url, KoDocument *newdoc ) return false; d->m_firstTime=true; - connect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - connect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotLoadCompleted())); - connect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotLoadCanceled( const TQString & ))); + connect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + connect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotLoadCompleted())); + connect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotLoadCanceled( const TQString & ))); newdoc->addShell( this ); // used by openURL bool openRet = (!isImporting ()) ? newdoc->openURL(url) : newdoc->import(url); if(!openRet) @@ -639,9 +639,9 @@ void KoMainWindow::slotLoadCompleted() // We had no document, set the new one setRootDocument( newdoc ); } - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotLoadCanceled( const TQString & ))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotLoadCompleted())); + disconnect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotLoadCanceled( const TQString & ))); } void KoMainWindow::slotLoadCanceled( const TQString & errMsg ) @@ -652,9 +652,9 @@ void KoMainWindow::slotLoadCanceled( const TQString & errMsg ) // ... can't delete the document, it's the one who emitted the signal... KoDocument* newdoc = (KoDocument *)(sender()); - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotLoadCanceled( const TQString & ))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotLoadCompleted())); + disconnect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotLoadCanceled( const TQString & ))); newdoc->removeShell(this); delete newdoc; @@ -672,10 +672,10 @@ void KoMainWindow::slotSaveCompleted() { kdDebug(30003) << "KoMainWindow::slotSaveCompleted" << endl; KoDocument* pDoc = (KoDocument *)(sender()); - disconnect(pDoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(pDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSaveCompleted())); - disconnect(pDoc, TQT_SIGNAL(canceled( const TQString & )), - this, TQT_SLOT(slotSaveCanceled( const TQString & ))); + disconnect(pDoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(pDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSaveCompleted())); + disconnect(pDoc, TQ_SIGNAL(canceled( const TQString & )), + this, TQ_SLOT(slotSaveCanceled( const TQString & ))); } // returns true if we should save, false otherwise. @@ -739,10 +739,10 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent ) else reset_url = false; - connect(pDoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - connect(pDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSaveCompleted())); - connect(pDoc, TQT_SIGNAL(canceled( const TQString & )), - this, TQT_SLOT(slotSaveCanceled( const TQString & ))); + connect(pDoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + connect(pDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSaveCompleted())); + connect(pDoc, TQ_SIGNAL(canceled( const TQString & )), + this, TQ_SLOT(slotSaveCanceled( const TQString & ))); KURL oldURL = pDoc->url(); TQString oldFile = pDoc->file(); @@ -1088,8 +1088,8 @@ void KoMainWindow::chooseNewDocument( int /*KoDocument::InitDocFlags*/ initDocFl return; //FIXME: This needs to be handled differently - connect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); + connect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); if ( ( !doc && ( initDocFlags == KoDocument::InitDocFileNew ) ) || ( doc && !doc->isEmpty() ) ) { @@ -1286,7 +1286,7 @@ void KoMainWindow::slotConfigureToolbars() if (rootDocument()) saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() ); KEditToolbar edit(factory(), this); - connect(&edit,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + connect(&edit,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); (void) edit.exec(); } @@ -1541,7 +1541,7 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart ) TDEToggleAction * act = new TDEToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0, actionCollection(), tb->name() ); act->setCheckedState(i18n("Hide %1 Toolbar").arg( tb->text() )); - connect( act, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToolbarToggled( bool ) ) ); + connect( act, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToolbarToggled( bool ) ) ); act->setChecked ( !tb->isHidden() ); d->m_toolbarList.append( act ); } diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 3d7ff56e..0e38706a 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -105,18 +105,18 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& #if KDE_IS_VERSION(3,4,0) m_sectionList->setShadeSortColumn(false); #endif - connect(m_sectionList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_sectionList, TQT_SIGNAL(pressed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*))); - connect(m_sectionList, TQT_SIGNAL(spacePressed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*))); - connect(m_sectionList, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(pressed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(spacePressed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*))); KGuiItem openExistingGItem(i18n("Open Existing Document..."), "document-open"); m_openExistingButton->setGuiItem(openExistingGItem); - connect(m_openExistingButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showOpenFileDialog())); + connect(m_openExistingButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showOpenFileDialog())); initRecentDocs(); initTemplates(templateType); @@ -136,8 +136,8 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& sizes = cfgGrp.readIntListEntry("DetailsPaneSplitterSizes"); emit splitterResized(0, sizes); - connect(this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - this, TQT_SLOT(saveSplitterSizes(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + this, TQ_SLOT(saveSplitterSizes(KoDetailsPaneBase*, const TQValueList<int>&))); } KoOpenPane::~KoOpenPane() @@ -171,12 +171,12 @@ void KoOpenPane::showOpenFileDialog() void KoOpenPane::initRecentDocs() { KoRecentDocumentsPane* recentDocPane = new KoRecentDocumentsPane(this, d->m_instance); - connect(recentDocPane, TQT_SIGNAL(openFile(const TQString&)), this, TQT_SIGNAL(openExistingFile(const TQString&))); + connect(recentDocPane, TQ_SIGNAL(openFile(const TQString&)), this, TQ_SIGNAL(openExistingFile(const TQString&))); TQListViewItem* item = addPane(i18n("Recent Documents"), "document-open", recentDocPane, 0); - connect(recentDocPane, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); - connect(this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - recentDocPane, TQT_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(recentDocPane, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + recentDocPane, TQ_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); KoSectionListItem* separator = new KoSectionListItem(m_sectionList, "", 1); separator->setEnabled(false); @@ -203,15 +203,15 @@ void KoOpenPane::initTemplates(const TQString& templateType) KoTemplatesPane* pane = new KoTemplatesPane(this, d->m_instance, group, templateTree.defaultTemplate()); - connect(pane, TQT_SIGNAL(openTemplate(const TQString&)), this, TQT_SIGNAL(openTemplate(const TQString&))); - connect(pane, TQT_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), - this, TQT_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&))); - connect(this, TQT_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), - pane, TQT_SLOT(changeAlwaysUseTemplate(KoTemplatesPane*, const TQString&))); - connect(pane, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); - connect(this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - pane, TQT_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(pane, TQ_SIGNAL(openTemplate(const TQString&)), this, TQ_SIGNAL(openTemplate(const TQString&))); + connect(pane, TQ_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), + this, TQ_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&))); + connect(this, TQ_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), + pane, TQ_SLOT(changeAlwaysUseTemplate(KoTemplatesPane*, const TQString&))); + connect(pane, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + pane, TQ_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); TQListViewItem* item = addPane(group->name(), group->first()->loadPicture(d->m_instance), pane, group->sortingWeight() + templateOffset); diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index d85a6995..2d1a62e2 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -210,7 +210,7 @@ void KoSpeaker::readConfig(TDEConfig* config) if (d->m_speakFlags & (SpeakPointerWidget | SpeakFocusWidget)) { if (startKttsd()) { d->m_timer = new TQTimer( this ); - connect( d->m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(probe()) ); + connect( d->m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(probe()) ); d->m_timer->start( d->m_timeout ); } } diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 6bebf91e..cca65063 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -120,14 +120,14 @@ KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) setMouseTracking( true ); - connect( d->m_doc, TQT_SIGNAL( childChanged( KoDocumentChild * ) ), - this, TQT_SLOT( slotChildChanged( KoDocumentChild * ) ) ); + connect( d->m_doc, TQ_SIGNAL( childChanged( KoDocumentChild * ) ), + this, TQ_SLOT( slotChildChanged( KoDocumentChild * ) ) ); - connect( d->m_doc, TQT_SIGNAL( sigBeginOperation() ), - this, TQT_SLOT( beginOperation() ) ); + connect( d->m_doc, TQ_SIGNAL( sigBeginOperation() ), + this, TQ_SLOT( beginOperation() ) ); - connect( d->m_doc, TQT_SIGNAL( sigEndOperation() ), - this, TQT_SLOT( endOperation() ) ); + connect( d->m_doc, TQ_SIGNAL( sigEndOperation() ), + this, TQ_SLOT( endOperation() ) ); actionCollection()->setWidget( this ); @@ -145,20 +145,20 @@ KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) if ( sb ) // No statusbar in e.g. konqueror { coll->setHighlightingEnabled( true ); - connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); - - connect( d->m_doc, TQT_SIGNAL( sigStatusBarMessage( const TQString& ) ), - this, TQT_SLOT( slotActionStatusText( const TQString& ) ) ); - connect( d->m_doc, TQT_SIGNAL( sigClearStatusBarMessage() ), - this, TQT_SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); + + connect( d->m_doc, TQ_SIGNAL( sigStatusBarMessage( const TQString& ) ), + this, TQ_SLOT( slotActionStatusText( const TQString& ) ) ); + connect( d->m_doc, TQ_SIGNAL( sigClearStatusBarMessage() ), + this, TQ_SLOT( slotClearStatusText() ) ); } d->m_doc->setCurrent(); d->m_scrollTimer = new TQTimer( this ); - connect (d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) ); + connect (d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ) ); } KoView::~KoView() @@ -627,7 +627,7 @@ void KoView::slotAutoScroll( ) void KoView::setupGlobalActions() { actionNewView = new TDEAction( i18n( "&New View" ), "window-new", 0, - this, TQT_SLOT( newView() ), + this, TQ_SLOT( newView() ), actionCollection(), "view_newview" ); } @@ -763,8 +763,8 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView ) // Setting the frameGeometry is done in setInitialFrameGeometry, which is // also called right after activation. - connect( view, TQT_SIGNAL( activated( bool ) ), - parentView(), TQT_SLOT( slotChildActivated( bool ) ) ); + connect( view, TQ_SIGNAL( activated( bool ) ), + parentView(), TQ_SLOT( slotChildActivated( bool ) ) ); } KoViewChild::~KoViewChild() @@ -852,10 +852,10 @@ void KoViewChild::setInitialFrameGeometry() kdDebug() << k_funcinfo << endl; // Connect only now, so that the GUI building doesn't move us around. - connect( m_frame, TQT_SIGNAL( geometryChanged() ), - this, TQT_SLOT( slotFrameGeometryChanged() ) ); - connect( m_child, TQT_SIGNAL( changed( KoChild * ) ), - this, TQT_SLOT( slotDocGeometryChanged() ) ); + connect( m_frame, TQ_SIGNAL( geometryChanged() ), + this, TQ_SLOT( slotFrameGeometryChanged() ) ); + connect( m_child, TQ_SIGNAL( changed( KoChild * ) ), + this, TQ_SLOT( slotDocGeometryChanged() ) ); // Set frameGeometry from childGeometry slotDocGeometryChanged(); diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp index 8759ef66..a0929fec 100644 --- a/lib/kofficecore/Koversiondialog.cpp +++ b/lib/kofficecore/Koversiondialog.cpp @@ -66,10 +66,10 @@ KoVersionDialog::KoVersionDialog( TQWidget* parent, const char* name ) grid1->addWidget(m_pOpen,4,2); - connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); - connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); - connect( m_pOpen, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpen() ) ); - connect( m_pModify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotModify() ) ); + connect( m_pRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) ); + connect( m_pAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); + connect( m_pOpen, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpen() ) ); + connect( m_pModify, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotModify() ) ); updateButton(); |