diff options
Diffstat (limited to 'kword')
34 files changed, 528 insertions, 528 deletions
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 3412b029a..e006903cd 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -111,8 +111,8 @@ KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KW viewport()->setMouseTracking( TRUE ); m_scrollTimer = new TQTimer( this ); - connect( m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( doAutoScroll() ) ); + connect( m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); viewport()->setFocusProxy( this ); viewport()->setFocusPolicy( TQWidget::WheelFocus ); @@ -122,17 +122,17 @@ KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KW installEventFilter( this ); KCursor::setAutoHideCursor( this, true, true ); - connect( this, TQT_SIGNAL(contentsMoving( int, int )), - this, TQT_SLOT(slotContentsMoving( int, int )) ); + connect( this, TQ_SIGNAL(contentsMoving( int, int )), + this, TQ_SLOT(slotContentsMoving( int, int )) ); - connect( m_doc, TQT_SIGNAL( newContentsSize() ), - this, TQT_SLOT( slotNewContentsSize() ) ); + connect( m_doc, TQ_SIGNAL( newContentsSize() ), + this, TQ_SLOT( slotNewContentsSize() ) ); - connect( m_doc, TQT_SIGNAL( mainTextHeightChanged() ), - this, TQT_SLOT( slotMainTextHeightChanged() ) ); + connect( m_doc, TQ_SIGNAL( mainTextHeightChanged() ), + this, TQ_SLOT( slotMainTextHeightChanged() ) ); - connect( m_doc, TQT_SIGNAL( sig_terminateEditing( KWFrameSet * ) ), - this, TQT_SLOT( terminateEditing( KWFrameSet * ) ) ); + connect( m_doc, TQ_SIGNAL( sig_terminateEditing( KWFrameSet * ) ), + this, TQ_SLOT( terminateEditing( KWFrameSet * ) ) ); slotNewContentsSize(); @@ -162,10 +162,10 @@ KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KW } m_doc->deleteInitialEditingInfo(); - connect(frameViewManager(), TQT_SIGNAL(sigFrameResized(const TQValueList<KWFrame*>&)), - m_doc, TQT_SLOT(framesChanged(const TQValueList<KWFrame*>&))); - connect(frameViewManager(), TQT_SIGNAL(sigFrameMoved(const TQValueList<KWFrame*>&)), - m_doc, TQT_SLOT(framesChanged(const TQValueList<KWFrame*>&))); + connect(frameViewManager(), TQ_SIGNAL(sigFrameResized(const TQValueList<KWFrame*>&)), + m_doc, TQ_SLOT(framesChanged(const TQValueList<KWFrame*>&))); + connect(frameViewManager(), TQ_SIGNAL(sigFrameMoved(const TQValueList<KWFrame*>&)), + m_doc, TQ_SLOT(framesChanged(const TQValueList<KWFrame*>&))); } KWCanvas::~KWCanvas() @@ -175,10 +175,10 @@ KWCanvas::~KWCanvas() m_currentFrameSetEdit = 0; delete m_viewMode; m_viewMode = 0; - disconnect(frameViewManager(), TQT_SIGNAL(sigFrameResized(const TQValueList<KWFrame*>&)), - m_doc, TQT_SLOT(framesChanged(const TQValueList<KWFrame*>&))); - disconnect(frameViewManager(), TQT_SIGNAL(sigFrameMoved(const TQValueList<KWFrame*>&)), - m_doc, TQT_SLOT(framesChanged(const TQValueList<KWFrame*>&))); + disconnect(frameViewManager(), TQ_SIGNAL(sigFrameResized(const TQValueList<KWFrame*>&)), + m_doc, TQ_SLOT(framesChanged(const TQValueList<KWFrame*>&))); + disconnect(frameViewManager(), TQ_SIGNAL(sigFrameMoved(const TQValueList<KWFrame*>&)), + m_doc, TQ_SLOT(framesChanged(const TQValueList<KWFrame*>&))); delete m_frameViewManager; m_frameViewManager = 0; } @@ -1631,7 +1631,7 @@ void KWCanvas::slotContentsMoving( int cx, int cy ) // so that it will reposition any active embedded object. // This needs to be delayed since contents moving is emitted -before- moving, // and from resizeEvent it's too early too. - TQTimer::singleShot( 0, this, TQT_SIGNAL( viewTransformationsChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SIGNAL( viewTransformationsChanged() ) ); } void KWCanvas::slotMainTextHeightChanged() diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 093c59416..efee2e575 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -117,9 +117,9 @@ KWConfig::KWConfig( KWView* parent ) } else m_ttsPage = 0; m_doc = parent->kWordDocument(); - connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply())); + connect(this, TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotApply())); - connect( m_interfacePage, TQT_SIGNAL( unitChanged( int ) ), TQT_SLOT( unitChanged( int ) ) ); + connect( m_interfacePage, TQ_SIGNAL( unitChanged( int ) ), TQ_SLOT( unitChanged( int ) ) ); unitChanged( parent->kWordDocument()->unit() ); } @@ -275,7 +275,7 @@ ConfigureInterfacePage::ConfigureInterfacePage( KWView *view, TQVBox *box, char m_unitCombo = new TQComboBox( hbUnit ); m_unitCombo->insertStringList( KoUnit::listOfUnitName() ); - connect(m_unitCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(unitChanged(int))); + connect(m_unitCombo, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(unitChanged(int))); unitLabel->setBuddy( m_unitCombo ); TQString unitHelp = i18n("Select the unit type used every time a distance or width/height " "is displayed or entered. This one setting is for the whole of KWord: all dialogs, the rulers etc. " @@ -731,7 +731,7 @@ ConfigureDefaultDocPage::ConfigureDefaultDocPage( KWView *view, TQVBox *box, cha fontName->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); TQPushButton *chooseButton = new TQPushButton(i18n("Choose..."), fontContainer); - connect(chooseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectNewDefaultFont())); + connect(chooseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectNewDefaultFont())); fontLayout->addWidget(fontTitle, 0, 0); fontLayout->addWidget(fontName, 0, 1); @@ -957,9 +957,9 @@ ConfigurePathPage::ConfigurePathPage( KWView *view, TQVBox *box, char *name ) (void) new TQListViewItem( m_pPathView, i18n("Backup Path"),doc->backupPath() ); m_modifyPath = new TQPushButton( i18n("Modify Path..."), gbPathGroup); - connect( m_modifyPath, TQT_SIGNAL( clicked ()), this, TQT_SLOT( slotModifyPath())); - connect( m_pPathView, TQT_SIGNAL( doubleClicked (TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT( slotModifyPath())); - connect( m_pPathView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), this, TQT_SLOT( slotSelectionChanged(TQListViewItem * ))); + connect( m_modifyPath, TQ_SIGNAL( clicked ()), this, TQ_SLOT( slotModifyPath())); + connect( m_pPathView, TQ_SIGNAL( doubleClicked (TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT( slotModifyPath())); + connect( m_pPathView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )), this, TQ_SLOT( slotSelectionChanged(TQListViewItem * ))); slotSelectionChanged(m_pPathView->currentItem()); } @@ -1076,9 +1076,9 @@ ConfigureTTSPage::ConfigureTTSPage( KWView *view, TQVBox *box, char *name ) m_iniPollingInterval->setValue(config->readNumEntry("PollingInterval", 600)); screenReaderOptionChanged(); - connect(m_cbSpeakPointerWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakFocusWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakAccelerators, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakPointerWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakFocusWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakAccelerators, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); } void ConfigureTTSPage::slotDefault() diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp index 7f17f55f2..e5f1f3325 100644 --- a/kword/KWCreateBookmarkDia.cpp +++ b/kword/KWCreateBookmarkDia.cpp @@ -53,7 +53,7 @@ void KWCreateBookmarkDia::init() KWCreateBookmarkDiaBase *dia = new KWCreateBookmarkDiaBase( this ); m_bookmarkName = dia->m_bookmarkName; enableButtonOK( false ); - connect( m_bookmarkName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(nameChanged( const TQString &))); + connect( m_bookmarkName, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(nameChanged( const TQString &))); setMainWidget( dia ); m_bookmarkName->setFocus(); } @@ -93,18 +93,18 @@ KWSelectBookmarkDia::KWSelectBookmarkDia( const TQStringList & _list, KWDocument grid->addMultiCellWidget(m_bookmarkList, 0, 4, 0, 0); m_bookmarkList->insertStringList(_list); - connect(m_bookmarkList, TQT_SIGNAL( selectionChanged ()), this, TQT_SLOT(slotSelectionChanged())); - connect(m_bookmarkList, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )), this, TQT_SLOT(slotOk())); - connect(m_bookmarkList, TQT_SIGNAL(returnPressed ( TQListBoxItem * )), this, TQT_SLOT(slotOk())); + connect(m_bookmarkList, TQ_SIGNAL( selectionChanged ()), this, TQ_SLOT(slotSelectionChanged())); + connect(m_bookmarkList, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )), this, TQ_SLOT(slotOk())); + connect(m_bookmarkList, TQ_SIGNAL(returnPressed ( TQListBoxItem * )), this, TQ_SLOT(slotOk())); m_pbRename = new TQPushButton( i18n("Rename Bookmark"), page ); grid->addWidget( m_pbRename, 0, 1); - connect( m_pbRename, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRenameBookmark())); + connect( m_pbRename, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRenameBookmark())); m_pbDelete = new TQPushButton( i18n("Delete Bookmark"), page ); grid->addWidget( m_pbDelete, 1, 1); - connect( m_pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteBookmark())); + connect( m_pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteBookmark())); m_bookmarkList->setFocus(); slotSelectionChanged(); diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp index f6595c00c..55ebd6731 100644 --- a/kword/KWDocStruct.cpp +++ b/kword/KWDocStruct.cpp @@ -1059,14 +1059,14 @@ KWDocStructTree::KWDocStructTree(TQWidget* parent, KWDocument* doc, KWGUI* gui) addColumn( i18n( "Document Structure" ) ); setFullWidth( true ); - connect( this, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - this, TQT_SLOT( slotDoubleClicked(TQListViewItem*)) ); - connect( this, TQT_SIGNAL( returnPressed(TQListViewItem*) ), - this, TQT_SLOT( slotReturnPressed(TQListViewItem* )) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&,int)), - this, TQT_SLOT( slotRightButtonClicked(TQListViewItem *, const TQPoint&, int))); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + this, TQ_SLOT( slotDoubleClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL( returnPressed(TQListViewItem*) ), + this, TQ_SLOT( slotReturnPressed(TQListViewItem* )) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&,int)), + this, TQ_SLOT( slotRightButtonClicked(TQListViewItem *, const TQPoint&, int))); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } KWDocStructTree::~KWDocStructTree() @@ -1202,7 +1202,7 @@ KWDocStruct::KWDocStruct(TQWidget* parent, KWDocument* doc, KWGUI* gui) m_tree->setAlternateBackground( TDEGlobalSettings::alternateBackgroundColor() ); TDEListViewSearchLine* searchLine = new TDEListViewSearchLine( searchBar, m_tree ); searchBar->setStretchableWidget( searchLine ); - connect( eraseButton, TQT_SIGNAL( clicked() ), searchLine, TQT_SLOT( clear() ) ); + connect( eraseButton, TQ_SIGNAL( clicked() ), searchLine, TQ_SLOT( clear() ) ); m_layout->addWidget(searchBar); m_layout->addWidget(m_tree); diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 5a6e886ea..c6469aceb 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -220,8 +220,8 @@ KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* pa m_layoutViewMode = 0; m_commandHistory = new KWCommandHistory( this ); - connect( m_commandHistory, TQT_SIGNAL( documentRestored() ), this, TQT_SLOT( slotDocumentRestored() ) ); - connect( m_commandHistory, TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) ); + connect( m_commandHistory, TQ_SIGNAL( documentRestored() ), this, TQ_SLOT( slotDocumentRestored() ) ); + connect( m_commandHistory, TQ_SIGNAL( commandExecuted() ), this, TQ_SLOT( slotCommandExecuted() ) ); //styleMask = U_FONT_FAMILY_ALL_SIZE | U_COLOR | U_BORDER | U_INDENT | // U_NUMBERING | U_ALIGN | U_TABS | U_SMART; @@ -1936,10 +1936,10 @@ void KWDocument::endOfLoading() // called by both oasis and oldxml // Connect to notifications from main text-frameset if ( frameset ) { - connect( frameset->textObject(), TQT_SIGNAL( chapterParagraphFormatted( KoTextParag * ) ), - TQT_SLOT( slotChapterParagraphFormatted( KoTextParag * ) ) ); - connect( frameset, TQT_SIGNAL( mainTextHeightChanged() ), - TQT_SIGNAL( mainTextHeightChanged() ) ); + connect( frameset->textObject(), TQ_SIGNAL( chapterParagraphFormatted( KoTextParag * ) ), + TQ_SLOT( slotChapterParagraphFormatted( KoTextParag * ) ) ); + connect( frameset, TQ_SIGNAL( mainTextHeightChanged() ), + TQ_SIGNAL( mainTextHeightChanged() ) ); } // Note that more stuff will happen in completeLoading @@ -2439,7 +2439,7 @@ bool KWDocument::completeLoading( KoStore *store ) emit newContentsSize(); repaintAllViews( true ); // in case any view exists already reactivateBgSpellChecking(); - connect( documentInfo(), TQT_SIGNAL( sigDocumentInfoModifed()),this,TQT_SLOT(slotDocumentInfoModifed() ) ); + connect( documentInfo(), TQ_SIGNAL( sigDocumentInfoModifed()),this,TQ_SLOT(slotDocumentInfoModifed() ) ); //desactivate bgspellchecking //attributes isReadWrite is not placed at the beginning ! @@ -3730,8 +3730,8 @@ void KWDocument::removeView( KoView *view ) void KWDocument::addShell( KoMainWindow *shell ) { - connect( shell, TQT_SIGNAL( documentSaved() ), m_commandHistory, TQT_SLOT( documentSaved() ) ); - connect( shell, TQT_SIGNAL( saveDialogShown() ), this, TQT_SLOT( saveDialogShown() ) ); + connect( shell, TQ_SIGNAL( documentSaved() ), m_commandHistory, TQ_SLOT( documentSaved() ) ); + connect( shell, TQ_SIGNAL( saveDialogShown() ), this, TQ_SLOT( saveDialogShown() ) ); KoDocument::addShell( shell ); } @@ -3895,7 +3895,7 @@ KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e void KWDocument::delayedRepaintAllViews() { if (!m_repaintAllViewsPending) { - TQTimer::singleShot( 0, this, TQT_SLOT( slotRepaintAllViews() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRepaintAllViews() ) ); m_repaintAllViewsPending=true; } } @@ -3910,7 +3910,7 @@ void KWDocument::delayedRecalcFrames( int fromPage ) { if ( m_recalcFramesPending == -1 || fromPage < m_recalcFramesPending ) { m_recalcFramesPending = fromPage; - TQTimer::singleShot( 0, this, TQT_SLOT( slotRecalcFrames() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRecalcFrames() ) ); } } @@ -4333,7 +4333,7 @@ void KWDocument::frameChanged( KWFrame * frame ) { if(! m_framesChangedHandler) { m_framesChangedHandler = new FramesChangedHandler(this); - TQTimer::singleShot( 0, this, TQT_SLOT( updateFramesChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateFramesChanged() ) ); } m_framesChangedHandler->addFrame(frame); } diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp index eaa7982ef..1517516cf 100644 --- a/kword/KWEditPersonnalExpression.cpp +++ b/kword/KWEditPersonnalExpression.cpp @@ -103,16 +103,16 @@ KWEditPersonnalExpression::KWEditPersonnalExpression( TQWidget *parent, const ch else initGroupList(); - connect(m_groupList,TQT_SIGNAL(selectionChanged()), this,TQT_SLOT(slotGroupSelected())); - connect(m_ExpressionsList,TQT_SIGNAL(selectionChanged()), this,TQT_SLOT(slotExpressionSelected())); + connect(m_groupList,TQ_SIGNAL(selectionChanged()), this,TQ_SLOT(slotGroupSelected())); + connect(m_ExpressionsList,TQ_SIGNAL(selectionChanged()), this,TQ_SLOT(slotExpressionSelected())); if(m_groupList->count() > 0) m_groupList->setSelected(0, true); - connect(m_groupLineEdit,TQT_SIGNAL(textChanged(const TQString&)), this,TQT_SLOT(slotUpdateGroupName(const TQString&))); - connect(m_expressionLineEdit,TQT_SIGNAL(textChanged(const TQString&)), this,TQT_SLOT(slotUpdateExpression(const TQString&))); - connect(m_addExpression, TQT_SIGNAL( clicked() ), this,TQT_SLOT( slotAddExpression() )); - connect(m_delExpression, TQT_SIGNAL( clicked() ), this,TQT_SLOT( slotRemoveExpression() )); - connect(m_addGroup, TQT_SIGNAL( clicked() ), this,TQT_SLOT( slotAddGroup())); - connect(m_delGroup, TQT_SIGNAL( clicked() ), this,TQT_SLOT( slotRemoveGroup() )); + connect(m_groupLineEdit,TQ_SIGNAL(textChanged(const TQString&)), this,TQ_SLOT(slotUpdateGroupName(const TQString&))); + connect(m_expressionLineEdit,TQ_SIGNAL(textChanged(const TQString&)), this,TQ_SLOT(slotUpdateExpression(const TQString&))); + connect(m_addExpression, TQ_SIGNAL( clicked() ), this,TQ_SLOT( slotAddExpression() )); + connect(m_delExpression, TQ_SIGNAL( clicked() ), this,TQ_SLOT( slotRemoveExpression() )); + connect(m_addGroup, TQ_SIGNAL( clicked() ), this,TQ_SLOT( slotAddGroup())); + connect(m_delGroup, TQ_SIGNAL( clicked() ), this,TQ_SLOT( slotRemoveGroup() )); updateWidget(); setFocus(); diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp index 9214038ac..ae22cf3fb 100644 --- a/kword/KWFootNoteDia.cpp +++ b/kword/KWFootNoteDia.cpp @@ -60,8 +60,8 @@ KWFootNoteDia::KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering m_rbManual->setChecked( true ); m_footLine = new TQLineEdit( grp); m_footLine->setText( _manualString ); - connect( m_footLine, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT(footLineChanged( const TQString & ))); - connect( grp, TQT_SIGNAL( clicked ( int ) ), this, TQT_SLOT(footNoteTypeChanged())); + connect( m_footLine, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT(footLineChanged( const TQString & ))); + connect( grp, TQ_SIGNAL( clicked ( int ) ), this, TQ_SLOT(footNoteTypeChanged())); grid->addWidget( m_footLine, 2, 1); @@ -79,7 +79,7 @@ KWFootNoteDia::KWFootNoteDia( NoteType _noteType, KWFootNoteVariable::Numbering footNoteTypeChanged(); setButtonText( KDialogBase::User1, i18n("C&onfigure...") ); - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotConfigurate())); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotConfigurate())); } void KWFootNoteDia::footNoteTypeChanged() diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp index 98f27cfa6..d3aabc0c4 100644 --- a/kword/KWFormulaFrameSet.cpp +++ b/kword/KWFormulaFrameSet.cpp @@ -92,10 +92,10 @@ void KWFormulaFrameSet::init() // there is no need to move the KFormulaContainer anymore, it remains at (0,0). formula->moveTo( 0, 0 ); - connect( formula, TQT_SIGNAL( formulaChanged( double, double ) ), - this, TQT_SLOT( slotFormulaChanged( double, double ) ) ); - connect( formula, TQT_SIGNAL( errorMsg( const TQString& ) ), - this, TQT_SLOT( slotErrorMessage( const TQString& ) ) ); + connect( formula, TQ_SIGNAL( formulaChanged( double, double ) ), + this, TQ_SLOT( slotFormulaChanged( double, double ) ) ); + connect( formula, TQ_SIGNAL( errorMsg( const TQString& ) ), + this, TQ_SLOT( slotErrorMessage( const TQString& ) ) ); /* if ( isFloating() ) { @@ -293,10 +293,10 @@ void KWFormulaFrameSet::paste( TQDomNode& formulaElem ) if (!formulaElem.isNull()) { if (formula == 0) { formula = m_doc->formulaDocument()->createFormula( -1, false ); - connect(formula, TQT_SIGNAL(formulaChanged(double, double)), - this, TQT_SLOT(slotFormulaChanged(double, double))); - connect( formula, TQT_SIGNAL( errorMsg( const TQString& ) ), - this, TQT_SLOT( slotErrorMessage( const TQString& ) ) ); + connect(formula, TQ_SIGNAL(formulaChanged(double, double)), + this, TQ_SLOT(slotFormulaChanged(double, double))); + connect( formula, TQ_SIGNAL( errorMsg( const TQString& ) ), + this, TQ_SLOT( slotErrorMessage( const TQString& ) ) ); } m_doc->formulaDocument()->setCreationStrategy( "Oasis" ); if ( !formula->loadMathML( formulaElem.firstChild().toElement() ) ) { @@ -362,10 +362,10 @@ KWFormulaFrameSetEdit::KWFormulaFrameSetEdit(KWFormulaFrameSet* fs, KWCanvas* ca { formulaView = new KFormula::View( fs->getFormula() ); - connect( formulaView, TQT_SIGNAL( cursorChanged( bool, bool ) ), - this, TQT_SLOT( cursorChanged( bool, bool ) ) ); - connect( fs->getFormula(), TQT_SIGNAL( leaveFormula( Container*, FormulaCursor*, int ) ), - this, TQT_SLOT( slotLeaveFormula( Container*, FormulaCursor*, int ) ) ); + connect( formulaView, TQ_SIGNAL( cursorChanged( bool, bool ) ), + this, TQ_SLOT( cursorChanged( bool, bool ) ) ); + connect( fs->getFormula(), TQ_SIGNAL( leaveFormula( Container*, FormulaCursor*, int ) ), + this, TQ_SLOT( slotLeaveFormula( Container*, FormulaCursor*, int ) ) ); fs->m_edit = this; diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index a74fc3e35..d141935b3 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -332,8 +332,8 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options if(m_frameType==FT_PICTURE) { m_cbAspectRatio = new TQCheckBox (i18n("Retain original aspect ratio"),m_tab1); - connect( m_cbAspectRatio, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotKeepRatioToggled(bool))); + connect( m_cbAspectRatio, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotKeepRatioToggled(bool))); bool show=true; bool on=true; if(m_frame) { @@ -450,7 +450,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options "This is what happens for the \"main text frameset\", but this option makes it possible " "to choose the same behavior for other framesets, for instance in magazine layouts.")); if ( m_rResizeFrame ) - connect( m_reconnect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setFrameBehaviorInputOn() ) ); + connect( m_reconnect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setFrameBehaviorInputOn() ) ); m_onpGrid->addRowSpacing( 0, KDialog::marginHint() + 5 ); m_onpGrid->addWidget( m_reconnect, 1, 0 ); @@ -458,7 +458,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options TQWhatsThis::add(m_noFollowup, i18n("<b>Do not create a followup frame:</b><br/>" "When a new page is created, no frame will be created for this frameset.")); if ( m_rResizeFrame ) - connect( m_noFollowup, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setFrameBehaviorInputOn() ) ); + connect( m_noFollowup, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setFrameBehaviorInputOn() ) ); m_onpGrid->addWidget( m_noFollowup, 2, 0 ); m_copyRadio= new TQRadioButton (i18n ("Place a copy of this frame"), m_onNewPage); @@ -469,7 +469,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options "makes it possible to choose the same behavior for other framesets, for " "instance a company logo and/or title that should appear exactly the same on every page.")); if ( m_rResizeFrame ) - connect( m_copyRadio, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setFrameBehaviorInputOff() ) ); + connect( m_copyRadio, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setFrameBehaviorInputOff() ) ); m_onpGrid->addWidget( m_copyRadio, 3, 0); enableOnNewPageOptions(); @@ -556,7 +556,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options m_cbProtectContent = new TQCheckBox( i18n("Protect content"), m_tab1); TQWhatsThis::add(m_cbProtectContent, i18n("<b>Protect content:</b><br/>" "Disallow changes to be made to the contents of the frame(s).")); - connect( m_cbProtectContent, TQT_SIGNAL(toggled ( bool ) ), this, TQT_SLOT(slotProtectContentChanged( bool ))); + connect( m_cbProtectContent, TQ_SIGNAL(toggled ( bool ) ), this, TQ_SLOT(slotProtectContentChanged( bool ))); row++; m_grid1->addMultiCellWidget(m_cbProtectContent,row,row, 0, 1); if( m_frameType != FT_TEXT || m_frame!=0 && m_frame->frameSet()==0) { @@ -778,7 +778,7 @@ void KWFrameDia::setupTab2() { // TAB Text Runaround enableRunAround(); // Changing the type of runaround needs to enable/disable the runaround-side options - connect( m_runGroup, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( enableRunAround() ) ); + connect( m_runGroup, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( enableRunAround() ) ); } void KWFrameDia::setupTab3(){ // TAB Frameset @@ -801,7 +801,7 @@ void KWFrameDia::setupTab3(){ // TAB Frameset m_rExistingFrameset->setText( i18n("Select existing frameset to connect frame to:") ); tabLayout->addWidget( m_rExistingFrameset ); myGroup->insert(m_rExistingFrameset,1); - connect (m_rExistingFrameset, TQT_SIGNAL( toggled(bool)), this, TQT_SLOT(ensureValidFramesetSelected())); + connect (m_rExistingFrameset, TQ_SIGNAL( toggled(bool)), this, TQ_SLOT(ensureValidFramesetSelected())); TQHBoxLayout *layout2 = new TQHBoxLayout( 0, 0, 6); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); @@ -812,8 +812,8 @@ void KWFrameDia::setupTab3(){ // TAB Frameset m_lFrameSList->addColumn( i18n("Frameset Name") ); m_lFrameSList->setAllColumnsShowFocus( true ); m_lFrameSList->header()->setMovingEnabled( false ); - connect( m_lFrameSList, TQT_SIGNAL(selectionChanged ()),this,TQT_SLOT(selectExistingFrameset ()) ); - connect (m_lFrameSList, TQT_SIGNAL( selectionChanged()), this, TQT_SLOT(ensureValidFramesetSelected())); + connect( m_lFrameSList, TQ_SIGNAL(selectionChanged ()),this,TQ_SLOT(selectExistingFrameset ()) ); + connect (m_lFrameSList, TQ_SIGNAL( selectionChanged()), this, TQ_SLOT(ensureValidFramesetSelected())); layout2->addWidget( m_lFrameSList ); tabLayout->addLayout( layout2 ); @@ -881,14 +881,14 @@ void KWFrameDia::setupTab3(){ // TAB Frameset } m_eFrameSetName->setText( m_oldFrameSetName ); - connect( m_lFrameSList, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - this, TQT_SLOT( connectListSelected( TQListViewItem * ) ) ); - connect(m_eFrameSetName, TQT_SIGNAL(textChanged ( const TQString & ) ), - this,TQT_SLOT(textNameFrameChanged ( const TQString & ) ) ); - connect(m_eFrameSetName, TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(textNameFrameChanged ( const TQString & ) )); - connect( m_rNewFrameset, TQT_SIGNAL(toggled (bool)), - this,TQT_SLOT(selectNewFrameset (bool)) ); + connect( m_lFrameSList, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + this, TQ_SLOT( connectListSelected( TQListViewItem * ) ) ); + connect(m_eFrameSetName, TQ_SIGNAL(textChanged ( const TQString & ) ), + this,TQ_SLOT(textNameFrameChanged ( const TQString & ) ) ); + connect(m_eFrameSetName, TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(textNameFrameChanged ( const TQString & ) )); + connect( m_rNewFrameset, TQ_SIGNAL(toggled (bool)), + this,TQ_SLOT(selectNewFrameset (bool)) ); } void KWFrameDia::selectExistingFrameset() { @@ -929,14 +929,14 @@ void KWFrameDia::setupTab4() { // TAB Geometry m_floating = new TQCheckBox( i18n("Frame is inline"), m_tab4 ); - connect( m_floating, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotFloatingToggled(bool) ) ); + connect( m_floating, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotFloatingToggled(bool) ) ); int row = 0; grid4->addMultiCellWidget( m_floating, row, row, 0, 1 ); row++; m_protectSize = new TQCheckBox( i18n("Protect size and position"), m_tab4); grid4->addMultiCellWidget( m_protectSize, row, row, 0, 1 ); - connect( m_protectSize, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotProtectSizeToggled(bool) ) ); + connect( m_protectSize, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotProtectSizeToggled(bool) ) ); /* ideally the following properties could be given to any floating frame: Position: (y) @@ -984,8 +984,8 @@ void KWFrameDia::setupTab4() { // TAB Geometry m_sw = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); m_sw->resize( m_sw->sizeHint() ); - connect( m_sw, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotUpdateHeightForWidth(double)) ); + connect( m_sw, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotUpdateHeightForWidth(double)) ); pGrid->addWidget( m_sw, 2, 1 ); @@ -994,8 +994,8 @@ void KWFrameDia::setupTab4() { // TAB Geometry pGrid->addWidget( m_lh, 2, 2 ); m_sh = new KoUnitDoubleSpinBox( m_grp1, 0, 9999, 1, 0.0, m_doc->unit() ); - connect( m_sh, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotUpdateWidthForHeight(double)) ); + connect( m_sh, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotUpdateWidthForHeight(double)) ); m_sh->resize( m_sh->sizeHint() ); @@ -1176,8 +1176,8 @@ void KWFrameDia::setupTab5() { // Tab Background fill/color m_brushColor = new KColorButton( TQt::white, KWDocument::defaultBgColor(0), m_tab5 ); grid5->addWidget(m_brushColor,row++,0); -// connect( m_brushColor, TQT_SIGNAL( changed( const TQColor & ) ), -// this, TQT_SLOT( updateBrushPreview() ) ); +// connect( m_brushColor, TQ_SIGNAL( changed( const TQColor & ) ), +// this, TQ_SLOT( updateBrushPreview() ) ); // ########################### @@ -1213,14 +1213,14 @@ void KWFrameDia::setupTab5() { // Tab Background fill/color brushStyle->insertItem( i18n( "Diagonal Lines ( / )" ) ); brushStyle->insertItem( i18n( "Diagonal Lines ( \\ )" ) ); brushStyle->insertItem( i18n( "Diagonal Crossing Lines" ) ); - connect( brushStyle, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( updateBrushPreview() ) ); + connect( brushStyle, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( updateBrushPreview() ) ); updateBrushPreview(); #endif - connect( m_transparentCB, TQT_SIGNAL( toggled( bool ) ), labelBgColor, TQT_SLOT( setDisabled( bool ) ) ); - connect( m_transparentCB, TQT_SIGNAL( toggled( bool ) ), m_brushColor, TQT_SLOT( setDisabled( bool ) ) ); + connect( m_transparentCB, TQ_SIGNAL( toggled( bool ) ), labelBgColor, TQ_SLOT( setDisabled( bool ) ) ); + connect( m_transparentCB, TQ_SIGNAL( toggled( bool ) ), m_brushColor, TQ_SLOT( setDisabled( bool ) ) ); initBrush(); TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding); @@ -1281,10 +1281,10 @@ void KWFrameDia::setupTab6() // Border style m_bBottom->setToggleButton( true ); grid->addWidget( bb, 6, 0 ); - connect( m_bLeft, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( brdLeftToggled( bool ) ) ); - connect( m_bRight, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( brdRightToggled( bool ) ) ); - connect( m_bTop, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( brdTopToggled( bool ) ) ); - connect( m_bBottom, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( brdBottomToggled( bool ) ) ); + connect( m_bLeft, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( brdLeftToggled( bool ) ) ); + connect( m_bRight, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( brdRightToggled( bool ) ) ); + connect( m_bTop, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( brdTopToggled( bool ) ) ); + connect( m_bBottom, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( brdBottomToggled( bool ) ) ); initBorderSettings(); @@ -1296,8 +1296,8 @@ void KWFrameDia::setupTab6() // Border style TQVBoxLayout *lay1 = new TQVBoxLayout( grp->layout() ); lay1->addWidget(m_prev3); - connect( m_prev3, TQT_SIGNAL( choosearea(TQMouseEvent * ) ), - this, TQT_SLOT( slotPressEvent(TQMouseEvent *) ) ); + connect( m_prev3, TQ_SIGNAL( choosearea(TQMouseEvent * ) ), + this, TQ_SLOT( slotPressEvent(TQMouseEvent *) ) ); // update the bordet preview widget m_prev3->setLeftBorder( m_leftBorder ); @@ -2433,10 +2433,10 @@ KWFourSideConfigWidget::KWFourSideConfigWidget( KWDocument* doc, const TQString& mGrid->addWidget( m_inputBottom, 3, 3 ); mGrid->setRowSpacing( 0, KDialog::spacingHint() + 5 ); - connect( m_inputLeft, TQT_SIGNAL( valueChanged(double)), this, TQT_SLOT( slotValueChanged( double ))); - connect( m_inputRight, TQT_SIGNAL( valueChanged(double)), this, TQT_SLOT( slotValueChanged( double ))); - connect( m_inputTop, TQT_SIGNAL( valueChanged(double)), this, TQT_SLOT( slotValueChanged( double ))); - connect( m_inputBottom, TQT_SIGNAL( valueChanged(double)), this, TQT_SLOT( slotValueChanged( double ))); + connect( m_inputLeft, TQ_SIGNAL( valueChanged(double)), this, TQ_SLOT( slotValueChanged( double ))); + connect( m_inputRight, TQ_SIGNAL( valueChanged(double)), this, TQ_SLOT( slotValueChanged( double ))); + connect( m_inputTop, TQ_SIGNAL( valueChanged(double)), this, TQ_SLOT( slotValueChanged( double ))); + connect( m_inputBottom, TQ_SIGNAL( valueChanged(double)), this, TQ_SLOT( slotValueChanged( double ))); } // Called right after the ctor, so m_synchronize can't be checked diff --git a/kword/KWFrameLayout.cpp b/kword/KWFrameLayout.cpp index 8db6227ac..25931240e 100644 --- a/kword/KWFrameLayout.cpp +++ b/kword/KWFrameLayout.cpp @@ -495,7 +495,7 @@ void KWFrameLayout::layout( KWFrameSet* mainTextFrameSet, int numColumns, //m_doc->invalidate(); // ### This means the layout will be done during painting. Not good. // What about mainTextFrameSet->invalidate() or even layout()? - //TQTimer::singleShot( 0, m_doc, TQT_SLOT( invalidate() ) ); + //TQTimer::singleShot( 0, m_doc, TQ_SLOT( invalidate() ) ); // Invalidate main textframeset only, and from top of page only. // Otherwise loading a long document (with headers/footers) takes ages, diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp index d612be05f..d07382381 100644 --- a/kword/KWFrameSet.cpp +++ b/kword/KWFrameSet.cpp @@ -52,8 +52,8 @@ KWFrameSet::KWFrameSet( KWDocument *doc ) // Send our "repaintChanged" signals to the document. setName("KWFrameSet"); if(m_doc) { - connect( this, TQT_SIGNAL( repaintChanged( KWFrameSet * ) ), - doc, TQT_SLOT( slotRepaintChanged( KWFrameSet * ) ) ); + connect( this, TQ_SIGNAL( repaintChanged( KWFrameSet * ) ), + doc, TQ_SLOT( slotRepaintChanged( KWFrameSet * ) ) ); m_pageManager = doc->pageManager(); } m_frames.setAutoDelete( true ); diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index dddfbac93..d94865c4f 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -158,7 +158,7 @@ KWFrameStyleManager::KWFrameStyleManager( TQWidget *_parent, KWDocument *_doc, switchStyle(); setInitialSize( TQSize( 600, 370 ) ); setButtonText( KDialogBase::User1, i18n("Import From File...") ); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(importFromFile())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(importFromFile())); } KWFrameStyleManager::~KWFrameStyleManager() @@ -198,32 +198,32 @@ void KWFrameStyleManager::setupWidget() m_moveUpButton = new TQPushButton( frame1, "moveUpButton" ); m_moveUpButton->setIconSet( SmallIconSet( "go-up" ) ); - connect( m_moveUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveUpStyle() ) ); + connect( m_moveUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveUpStyle() ) ); frame1Layout->addWidget( m_moveUpButton, 1, 1 ); m_moveDownButton = new TQPushButton( frame1, "moveDownButton" ); m_moveDownButton->setIconSet( SmallIconSet( "go-down" ) ); - connect( m_moveDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveDownStyle() ) ); + connect( m_moveDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveDownStyle() ) ); frame1Layout->addWidget( m_moveDownButton, 1, 0 ); m_deleteButton = new TQPushButton( frame1, "deleteButton" ); m_deleteButton->setText( i18n( "&Delete" ) ); - connect( m_deleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteStyle() ) ); + connect( m_deleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteStyle() ) ); frame1Layout->addWidget( m_deleteButton, 2, 1 ); m_newButton = new TQPushButton( frame1, "newButton" ); m_newButton->setText( i18n( "New" ) ); - connect( m_newButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addStyle() ) ); + connect( m_newButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addStyle() ) ); frame1Layout->addWidget( m_newButton, 2, 0 ); m_tabs = new TQTabWidget( frame1 ); frame1Layout->addMultiCellWidget( m_tabs, 0, 2, 2, 2 ); - connect( m_stylesList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( switchStyle() ) ); - connect( m_tabs, TQT_SIGNAL( currentChanged ( TQWidget * ) ), this, TQT_SLOT( switchTabs() ) ); + connect( m_stylesList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( switchStyle() ) ); + connect( m_tabs, TQ_SIGNAL( currentChanged ( TQWidget * ) ), this, TQ_SLOT( switchTabs() ) ); } void KWFrameStyleManager::addGeneralTab() @@ -248,7 +248,7 @@ void KWFrameStyleManager::addGeneralTab() m_nameString = new TQLineEdit( tab ); m_nameString->resize(m_nameString->sizeHint() ); - connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); + connect( m_nameString, TQ_SIGNAL( textChanged( const TQString &) ), this, TQ_SLOT( renameStyle(const TQString &) ) ); tabLayout->addWidget( m_nameString, 0, 1 ); @@ -584,8 +584,8 @@ KWFrameStyleBackgroundTab::KWFrameStyleBackgroundTab( TQWidget * parent ) brushColor = new KColorButton( TQt::white, bgwidget ); grid->addWidget(brushColor,row++,0); - connect( brushColor, TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( updateBrushConfiguration( const TQColor & ) ) ); + connect( brushColor, TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( updateBrushConfiguration( const TQColor & ) ) ); TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding); grid->addItem( spacer,row,0 ); diff --git a/kword/KWFrameViewManager.cpp b/kword/KWFrameViewManager.cpp index a00705847..96b6cc5d8 100644 --- a/kword/KWFrameViewManager.cpp +++ b/kword/KWFrameViewManager.cpp @@ -43,8 +43,8 @@ KWFrameViewManager::KWFrameViewManager(KWDocument *doc) { ++frameSets; } m_blockEvents = false; - connect(doc, TQT_SIGNAL( sigFrameSetAdded(KWFrameSet*)), TQT_SLOT( slotFrameSetAdded(KWFrameSet*))); - connect(doc, TQT_SIGNAL( sigFrameSetRemoved(KWFrameSet*)), TQT_SLOT( slotFrameSetRemoved(KWFrameSet*))); + connect(doc, TQ_SIGNAL( sigFrameSetAdded(KWFrameSet*)), TQ_SLOT( slotFrameSetAdded(KWFrameSet*))); + connect(doc, TQ_SIGNAL( sigFrameSetRemoved(KWFrameSet*)), TQ_SLOT( slotFrameSetRemoved(KWFrameSet*))); recalculateFrameCache(); } @@ -66,9 +66,9 @@ void KWFrameViewManager::removeKWFramesListener(KWFramesListener *listener) { void KWFrameViewManager::slotFrameSetAdded(KWFrameSet *fs) { if(! m_blockEvents) m_frameEvents.append(new FrameEvent(FrameEvent::FrameSetAdded, fs)); - connect(fs, TQT_SIGNAL( sigFrameAdded(KWFrame*)), TQT_SLOT( slotFrameAdded(KWFrame *))); - connect(fs, TQT_SIGNAL( sigFrameRemoved(KWFrame*)), TQT_SLOT( slotFrameRemoved(KWFrame *))); - connect(fs, TQT_SIGNAL( sigNameChanged(KWFrameSet*)), TQT_SLOT( slotFrameSetRenamed(KWFrameSet *))); + connect(fs, TQ_SIGNAL( sigFrameAdded(KWFrame*)), TQ_SLOT( slotFrameAdded(KWFrame *))); + connect(fs, TQ_SIGNAL( sigFrameRemoved(KWFrame*)), TQ_SLOT( slotFrameRemoved(KWFrame *))); + connect(fs, TQ_SIGNAL( sigNameChanged(KWFrameSet*)), TQ_SLOT( slotFrameSetRenamed(KWFrameSet *))); TQPtrListIterator<KWFrame> frames = fs->frameIterator(); while(frames.current()) { KWFrame *f = frames.current(); @@ -80,9 +80,9 @@ void KWFrameViewManager::slotFrameSetAdded(KWFrameSet *fs) { void KWFrameViewManager::slotFrameSetRemoved(KWFrameSet *fs) { if(! m_blockEvents) m_frameEvents.append(new FrameEvent(FrameEvent::FrameSetRemoved, fs)); - disconnect(fs, TQT_SIGNAL( sigFrameAdded(KWFrame*)), this, TQT_SLOT( slotFrameAdded(KWFrame *))); - disconnect(fs, TQT_SIGNAL( sigFrameRemoved(KWFrame*)), this, TQT_SLOT( slotFrameRemoved(KWFrame *))); - disconnect(fs, TQT_SIGNAL( sigNameChanged(KWFrameSet*)), this, TQT_SLOT( slotFrameSetRenamed(KWFrameSet *))); + disconnect(fs, TQ_SIGNAL( sigFrameAdded(KWFrame*)), this, TQ_SLOT( slotFrameAdded(KWFrame *))); + disconnect(fs, TQ_SIGNAL( sigFrameRemoved(KWFrame*)), this, TQ_SLOT( slotFrameRemoved(KWFrame *))); + disconnect(fs, TQ_SIGNAL( sigNameChanged(KWFrameSet*)), this, TQ_SLOT( slotFrameSetRenamed(KWFrameSet *))); TQPtrListIterator<KWFrame> frames = fs->frameIterator(); while(frames.current()) { KWFrame *f = frames.current(); @@ -145,7 +145,7 @@ void KWFrameViewManager::requestFireEvents() { if(m_queueRequested && !m_blockEvents) return; m_queueRequested = true; - TQTimer::singleShot ( 0, this, TQT_SLOT(fireEvents()) ); + TQTimer::singleShot ( 0, this, TQ_SLOT(fireEvents()) ); } void KWFrameViewManager::fireEvents() { diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp index 55b8219ee..002b0bf0c 100644 --- a/kword/KWInsertPicDia.cpp +++ b/kword/KWInsertPicDia.cpp @@ -94,7 +94,7 @@ KWInsertPicDia::KWInsertPicDia( TQWidget *parent, bool _inline, bool _keepRatio, TQPushButton *pbImage = new TQPushButton( i18n( "Choose &Picture..." ), page ); grid->addWidget( pbImage, 0, 0 ); - connect( pbImage, TQT_SIGNAL( clicked() ), TQT_SLOT( slotChooseImage() ) ); + connect( pbImage, TQ_SIGNAL( clicked() ), TQ_SLOT( slotChooseImage() ) ); m_cbInline = new TQCheckBox( i18n( "Insert picture inline" ), page ); grid->addWidget( m_cbInline, 1, 0 ); @@ -138,7 +138,7 @@ void KWInsertPicDia::slotChooseImage() { kdDebug() << "KWInsertPicDia::slotChooseImage cancelled by user." << endl; // Close, but delayed, otherwise it won't work (we only return from the ctor) - TQTimer::singleShot( 0, this, TQT_SLOT( cancel() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( cancel() ) ); return; } enableButtonOK ( m_preview->setPicture( m_picture ) ); diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index b43e81c56..7de86eb95 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -351,8 +351,8 @@ KWMailMergeChoosePluginDialog::KWMailMergeChoosePluginDialog( TDETrader::OfferLi } descriptionLabel->show(); - connect( chooser, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( pluginChanged( int ) ) ); + connect( chooser, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( pluginChanged( int ) ) ); layout->addWidget( label ); layout->addWidget( chooser ); @@ -425,11 +425,11 @@ KWMailMergeConfigDialog::KWMailMergeConfigDialog(TQWidget *parent,KWMailMergeDat enableDisableEdit(); - connect(edit,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditClicked())); - connect(create,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotCreateClicked())); - connect(open,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotOpenClicked())); - connect(preview,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPreviewClicked())); - connect(document,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotDocumentClicked())); + connect(edit,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditClicked())); + connect(create,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotCreateClicked())); + connect(open,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotOpenClicked())); + connect(preview,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPreviewClicked())); + connect(document,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotDocumentClicked())); } void KWMailMergeConfigDialog::enableDisableEdit() @@ -528,10 +528,10 @@ KWMailMergeVariableInsertDia::KWMailMergeVariableInsertDia( TQWidget *parent, KW names->insertItem( m_db->version() ?it.data():it.key(), -1 ); setInitialSize( TQSize( 350, 400 ) ); - connect( names, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - connect( names, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - this, TQT_SLOT( slotOk() ) ); + connect( names, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + connect( names, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + this, TQ_SLOT( slotOk() ) ); setFocus(); enableButtonOK( names->currentItem() != -1 ); diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp index dcb3b197a..282c723ea 100644 --- a/kword/KWMailMergeLabelAction.cpp +++ b/kword/KWMailMergeLabelAction.cpp @@ -123,7 +123,7 @@ int KWMailMergeLabelAction::plug( TQWidget *widget, int index ) addContainer( tb, id ); - connect( tb, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( tb, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp index 255f084ed..50063362d 100644 --- a/kword/KWPartFrameSet.cpp +++ b/kword/KWPartFrameSet.cpp @@ -76,8 +76,8 @@ void KWPartFrameSet::setChild( KWDocumentChild* child ) assert( !m_child ); m_child = child; m_child->setPartFrameSet( this ); - TQObject::connect( m_child, TQT_SIGNAL( changed( KoChild * ) ), - this, TQT_SLOT( slotChildChanged() ) ); + TQObject::connect( m_child, TQ_SIGNAL( changed( KoChild * ) ), + this, TQ_SLOT( slotChildChanged() ) ); } KWPartFrameSet::~KWPartFrameSet() @@ -271,8 +271,8 @@ KWPartFrameSetEdit::KWPartFrameSetEdit( KWPartFrameSet * fs, KWCanvas * canvas ) kdDebug(32001) << "KWPartFrameSetEdit::KWPartFrameSetEdit " << endl; m_dcop=0L; fs->startEditing(); - TQObject::connect( m_canvas->gui()->getView(), TQT_SIGNAL( activated( bool ) ), - this, TQT_SLOT( slotChildActivated( bool ) ) ); + TQObject::connect( m_canvas->gui()->getView(), TQ_SIGNAL( activated( bool ) ), + this, TQ_SLOT( slotChildActivated( bool ) ) ); } KWPartFrameSetEdit::~KWPartFrameSetEdit() diff --git a/kword/KWResizeTableDia.cpp b/kword/KWResizeTableDia.cpp index c4f5ce015..81be575c2 100644 --- a/kword/KWResizeTableDia.cpp +++ b/kword/KWResizeTableDia.cpp @@ -52,7 +52,7 @@ void KWResizeTableDia::setupTab1(int resizeColumn) { rc = new TQLabel( i18n( "Width:" ), page ); m_position= new KoUnitDoubleSpinBox( page, 0.01, m_table->anchorFrameset()->isFloating() ? m_table->anchorFrameset()->frame(0)->width(): 9999, 1, 0.0, m_doc->unit(), m_doc->unit() ); slotValueChanged( m_value->value()); - connect( m_value, TQT_SIGNAL( valueChanged ( int )), this, TQT_SLOT( slotValueChanged( int ))); + connect( m_value, TQ_SIGNAL( valueChanged ( int )), this, TQ_SLOT( slotValueChanged( int ))); } bool KWResizeTableDia::doResize() diff --git a/kword/KWSplitCellDia.cpp b/kword/KWSplitCellDia.cpp index fd141c293..dd41bf4ca 100644 --- a/kword/KWSplitCellDia.cpp +++ b/kword/KWSplitCellDia.cpp @@ -78,8 +78,8 @@ KWSplitCellDia::KWSplitCellDia( TQWidget* parent, const char* name, unsigned int grid->activate(); enableButtonOK( !(m_rows==1 && m_cols==1) ); - connect( nRows, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( rowsChanged( int ) ) ); - connect( nCols, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( colsChanged( int ) ) ); + connect( nRows, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( rowsChanged( int ) ) ); + connect( nCols, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( colsChanged( int ) ) ); setFocus(); } diff --git a/kword/KWStartupWidget.cpp b/kword/KWStartupWidget.cpp index 0499a4273..014efd277 100644 --- a/kword/KWStartupWidget.cpp +++ b/kword/KWStartupWidget.cpp @@ -43,16 +43,16 @@ KWStartupWidget::KWStartupWidget(TQWidget *parent, KWDocument *doc, const KoColu m_columnsWidget = new KoPageLayoutColumns(m_columnsTab, m_columns, m_doc->unit(), m_layout); lay->addWidget(m_columnsWidget); - connect (m_columnsWidget, TQT_SIGNAL( propertyChange(KoColumns&)), - this, TQT_SLOT (columnsUpdated( KoColumns&))); + connect (m_columnsWidget, TQ_SIGNAL( propertyChange(KoColumns&)), + this, TQ_SLOT (columnsUpdated( KoColumns&))); - connect (m_sizeWidget, TQT_SIGNAL( propertyChange(KoPageLayout&)), - this, TQT_SLOT (sizeUpdated( KoPageLayout&))); + connect (m_sizeWidget, TQ_SIGNAL( propertyChange(KoPageLayout&)), + this, TQ_SLOT (sizeUpdated( KoPageLayout&))); - connect (m_createButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT (buttonClicked()) ); + connect (m_createButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT (buttonClicked()) ); - connect (m_WpStyleCheckbox, TQT_SIGNAL(toggled(bool)), m_sizeWidget, TQT_SLOT(setEnableBorders(bool))); - connect (m_WpStyleCheckbox, TQT_SIGNAL(toggled(bool)), m_columnsWidget, TQT_SLOT(setEnableColumns(bool))); + connect (m_WpStyleCheckbox, TQ_SIGNAL(toggled(bool)), m_sizeWidget, TQ_SLOT(setEnableBorders(bool))); + connect (m_WpStyleCheckbox, TQ_SIGNAL(toggled(bool)), m_columnsWidget, TQ_SLOT(setEnableColumns(bool))); } void KWStartupWidget::sizeUpdated(KoPageLayout &layout) { diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp index 82b15bf10..3fd139bc6 100644 --- a/kword/KWStatisticsDialog.cpp +++ b/kword/KWStatisticsDialog.cpp @@ -280,7 +280,7 @@ void KWStatisticsDialog::addBox( TQFrame *page, TQLabel **resultLabel, bool calc TQVBoxLayout *noteLayout = new TQVBoxLayout( w, KDialog::marginHint(), 0 ); TQCheckBox *calcWithFootNote = new TQCheckBox( i18n("&Include text from foot- and endnotes"), w); noteLayout->addWidget( calcWithFootNote ); - connect( calcWithFootNote, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( slotRefreshValue(bool))); + connect( calcWithFootNote, TQ_SIGNAL(toggled ( bool )), this, TQ_SLOT( slotRefreshValue(bool))); } diff --git a/kword/KWTableDia.cpp b/kword/KWTableDia.cpp index 6c68c32e6..06cf3860d 100644 --- a/kword/KWTableDia.cpp +++ b/kword/KWTableDia.cpp @@ -154,7 +154,7 @@ void KWTableDia::setupTab1( int rows, int cols, CellSize wid, CellSize hei, bool cbIsFloating->setChecked( floating ); grid->addMultiCellWidget( cbIsFloating, 9, 9, 0, 2 ); - connect( cbIsFloating, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( slotInlineTable( bool ) ) ); + connect( cbIsFloating, TQ_SIGNAL( toggled ( bool ) ), this, TQ_SLOT( slotInlineTable( bool ) ) ); #endif } else @@ -163,7 +163,7 @@ void KWTableDia::setupTab1( int rows, int cols, CellSize wid, CellSize hei, bool cbReapplyTemplate1 = new TQCheckBox( i18n("Reapply template to table"), tab1 ); grid->addMultiCellWidget( cbReapplyTemplate1, 9, 9, 0, 2); - connect( cbReapplyTemplate1, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( slotSetReapply( bool ) ) ); + connect( cbReapplyTemplate1, TQ_SIGNAL( toggled ( bool ) ), this, TQ_SLOT( slotSetReapply( bool ) ) ); } grid->addRowSpacing( 0, lRows->height() ); @@ -214,8 +214,8 @@ void KWTableDia::setupTab1( int rows, int cols, CellSize wid, CellSize hei, bool grid->activate(); - connect( nRows, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( rowsChanged( int ) ) ); - connect( nCols, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( colsChanged( int ) ) ); + connect( nRows, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( rowsChanged( int ) ) ); + connect( nCols, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( colsChanged( int ) ) ); } void KWTableDia::setupTab2(const TQString & _templateName, int format ) @@ -235,7 +235,7 @@ void KWTableDia::setupTab2(const TQString & _templateName, int format ) grid->setRowStretch( 0, 1); grid->setRowStretch( 1, 0); - connect( cbReapplyTemplate2, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( slotSetReapply( bool ) ) ); + connect( cbReapplyTemplate2, TQ_SIGNAL( toggled ( bool ) ), this, TQ_SLOT( slotSetReapply( bool ) ) ); } grid->activate(); } diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index 64e9ba135..9e083eec0 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -201,7 +201,7 @@ KWTableStyleManager::KWTableStyleManager( TQWidget *_parent, KWDocument *_doc ) switchStyle(); setInitialSize( TQSize( 450, 450 ) ); setButtonText( KDialogBase::User1, i18n("Import From File...") ); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(importFromFile())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(importFromFile())); } @@ -239,24 +239,24 @@ void KWTableStyleManager::setupWidget() m_moveUpButton = new TQPushButton( frame1, "moveUpButton" ); m_moveUpButton->setIconSet( SmallIconSet( "go-up" ) ); - connect( m_moveUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveUpStyle() ) ); + connect( m_moveUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveUpStyle() ) ); frame1Layout->addWidget( m_moveUpButton, 1, 1 ); m_moveDownButton = new TQPushButton( frame1, "moveDownButton" ); m_moveDownButton->setIconSet( SmallIconSet( "go-down" ) ); - connect( m_moveDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveDownStyle() ) ); + connect( m_moveDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveDownStyle() ) ); frame1Layout->addWidget( m_moveDownButton, 1, 0 ); m_deleteButton = new TQPushButton( frame1, "deleteButton" ); m_deleteButton->setText( i18n( "&Delete" ) ); - connect( m_deleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteStyle() ) ); + connect( m_deleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteStyle() ) ); frame1Layout->addWidget( m_deleteButton, 2, 1 ); m_newButton = new TQPushButton( frame1, "newButton" ); m_newButton->setText( i18n( "New" ) ); - connect( m_newButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addStyle() ) ); + connect( m_newButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addStyle() ) ); frame1Layout->addWidget( m_newButton, 2, 0 ); @@ -266,7 +266,7 @@ void KWTableStyleManager::setupWidget() frame1Layout->addMultiCellWidget( main, 0, 2, 2, 2 ); - connect( m_stylesList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( switchStyle() ) ); + connect( m_stylesList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( switchStyle() ) ); } void KWTableStyleManager::setupMain() @@ -281,7 +281,7 @@ void KWTableStyleManager::setupMain() m_nameString = new TQLineEdit( main ); m_nameString->resize(m_nameString->sizeHint() ); - connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); + connect( m_nameString, TQ_SIGNAL( textChanged( const TQString &) ), this, TQ_SLOT( renameStyle(const TQString &) ) ); mainLayout->addWidget( m_nameString, 0, 1 ); @@ -309,16 +309,16 @@ void KWTableStyleManager::setupMain() m_style = new TQComboBox( adjustBox ); updateAllStyleCombos(); - connect( m_frameStyle, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( selectFrameStyle(int) ) ); - connect( m_style, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( selectStyle(int) ) ); + connect( m_frameStyle, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( selectFrameStyle(int) ) ); + connect( m_style, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( selectStyle(int) ) ); m_changeFrameStyleButton = new TQPushButton( adjustBox ); m_changeFrameStyleButton->setText( i18n( "Change..." ) ); - connect( m_changeFrameStyleButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeFrameStyle() ) ); + connect( m_changeFrameStyleButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changeFrameStyle() ) ); m_changeStyleButton = new TQPushButton( adjustBox ); m_changeStyleButton->setText( i18n( "Change..." ) ); - connect( m_changeStyleButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeStyle() ) ); + connect( m_changeStyleButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changeStyle() ) ); adjustLayout->addWidget( frameStyleLabel, 0, 0 ); adjustLayout->addWidget( styleLabel, 1, 0 ); diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index cff93a813..0a5f9e892 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -589,13 +589,13 @@ KWTableTemplateSelector::KWTableTemplateSelector( KWDocument *_doc, TQWidget *_p grid->setColStretch( 1, 1 ); grid->activate(); - connect( cbFirstRow, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbFirstRowChanged( bool ) ) ); - connect( cbFirstCol, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbFirstColChanged( bool ) ) ); - connect( cbLastRow, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbLastRowChanged( bool ) ) ); - connect( cbLastCol, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbLastColChanged( bool ) ) ); - connect( cbBody, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbBodyChanged( bool ) ) ); + connect( cbFirstRow, TQ_SIGNAL( toggled( bool ) ), preview, TQ_SLOT( cbFirstRowChanged( bool ) ) ); + connect( cbFirstCol, TQ_SIGNAL( toggled( bool ) ), preview, TQ_SLOT( cbFirstColChanged( bool ) ) ); + connect( cbLastRow, TQ_SIGNAL( toggled( bool ) ), preview, TQ_SLOT( cbLastRowChanged( bool ) ) ); + connect( cbLastCol, TQ_SIGNAL( toggled( bool ) ), preview, TQ_SLOT( cbLastColChanged( bool ) ) ); + connect( cbBody, TQ_SIGNAL( toggled( bool ) ), preview, TQ_SLOT( cbBodyChanged( bool ) ) ); - connect( lbTemplates, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( changeTableTemplate() ) ); + connect( lbTemplates, TQ_SIGNAL( selectionChanged () ), this, TQ_SLOT( changeTableTemplate() ) ); TQListBoxItem * item = lbTemplates->findItem( _tableTemplate ); int index = 0; if ( item ) diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index 195ecd5d7..d0fbff38c 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -156,25 +156,25 @@ void KWTextFrameSet::init() m_textobj = new KoTextObject( textdoc, m_doc->styleCollection()->findStyle( "Standard" ), this, (m_name+"-textobj").utf8() ); m_doc->backSpeller()->registerNewTextObject( m_textobj ); - connect( m_textobj, TQT_SIGNAL( availableHeightNeeded() ), - TQT_SLOT( slotAvailableHeightNeeded() ) ); - connect( m_textobj, TQT_SIGNAL( afterFormatting( int, KoTextParag*, bool* ) ), - TQT_SLOT( slotAfterFormatting( int, KoTextParag*, bool* ) ) ); - //connect( m_textobj, TQT_SIGNAL( formattingFirstParag() ), - // TQT_SLOT( slotFormattingFirstParag() ) ); - //connect( m_textobj, TQT_SIGNAL( chapterParagraphFormatted( KoTextParag * ) ), - // TQT_SLOT( slotChapterParagraphFormatted( KoTextParag * ) ) ); - connect( m_textobj, TQT_SIGNAL( newCommand( KCommand * ) ), - TQT_SLOT( slotNewCommand( KCommand * ) ) ); - connect( m_textobj, TQT_SIGNAL( repaintChanged( KoTextObject* ) ), - TQT_SLOT( slotRepaintChanged() ) ); - connect( m_textobj, TQT_SIGNAL( paragraphDeleted( KoTextParag*) ), - TQT_SLOT( slotParagraphDeleted(KoTextParag*) )); - - connect( m_textobj, TQT_SIGNAL( paragraphCreated( KoTextParag*) ), - TQT_SLOT( slotParagraphCreated(KoTextParag*) )); - connect( m_textobj, TQT_SIGNAL( paragraphModified( KoTextParag*, int, int, int) ), - TQT_SLOT( slotParagraphModified(KoTextParag*, int, int, int) )); + connect( m_textobj, TQ_SIGNAL( availableHeightNeeded() ), + TQ_SLOT( slotAvailableHeightNeeded() ) ); + connect( m_textobj, TQ_SIGNAL( afterFormatting( int, KoTextParag*, bool* ) ), + TQ_SLOT( slotAfterFormatting( int, KoTextParag*, bool* ) ) ); + //connect( m_textobj, TQ_SIGNAL( formattingFirstParag() ), + // TQ_SLOT( slotFormattingFirstParag() ) ); + //connect( m_textobj, TQ_SIGNAL( chapterParagraphFormatted( KoTextParag * ) ), + // TQ_SLOT( slotChapterParagraphFormatted( KoTextParag * ) ) ); + connect( m_textobj, TQ_SIGNAL( newCommand( KCommand * ) ), + TQ_SLOT( slotNewCommand( KCommand * ) ) ); + connect( m_textobj, TQ_SIGNAL( repaintChanged( KoTextObject* ) ), + TQ_SLOT( slotRepaintChanged() ) ); + connect( m_textobj, TQ_SIGNAL( paragraphDeleted( KoTextParag*) ), + TQ_SLOT( slotParagraphDeleted(KoTextParag*) )); + + connect( m_textobj, TQ_SIGNAL( paragraphCreated( KoTextParag*) ), + TQ_SLOT( slotParagraphCreated(KoTextParag*) )); + connect( m_textobj, TQ_SIGNAL( paragraphModified( KoTextParag*, int, int, int) ), + TQ_SLOT( slotParagraphModified(KoTextParag*, int, int, int) )); } void KWTextFrameSet::slotParagraphModified(KoTextParag* _parag, int /*KoTextParag::ParagModifyType*/ _type, int start, int length) @@ -3099,11 +3099,11 @@ KWTextFrameSetEdit::KWTextFrameSetEdit( KWTextFrameSet * fs, KWCanvas * canvas ) //kdDebug(32001) << "KWTextFrameSetEdit::KWTextFrameSetEdit " << fs->name() << endl; KoTextView::setReadWrite( fs->kWordDocument()->isReadWrite() ); KoTextObject* textobj = fs->textObject(); - connect( textobj, TQT_SIGNAL( selectionChanged(bool) ), canvas, TQT_SIGNAL( selectionChanged(bool) ) ); - connect( fs, TQT_SIGNAL( frameDeleted(KWFrame *) ), this, TQT_SLOT( slotFrameDeleted(KWFrame *) ) ); - connect( textView(), TQT_SIGNAL( cut() ), TQT_SLOT( cut() ) ); - connect( textView(), TQT_SIGNAL( copy() ), TQT_SLOT( copy() ) ); - connect( textView(), TQT_SIGNAL( paste() ), TQT_SLOT( paste() ) ); + connect( textobj, TQ_SIGNAL( selectionChanged(bool) ), canvas, TQ_SIGNAL( selectionChanged(bool) ) ); + connect( fs, TQ_SIGNAL( frameDeleted(KWFrame *) ), this, TQ_SLOT( slotFrameDeleted(KWFrame *) ) ); + connect( textView(), TQ_SIGNAL( cut() ), TQ_SLOT( cut() ) ); + connect( textView(), TQ_SIGNAL( copy() ), TQ_SLOT( copy() ) ); + connect( textView(), TQ_SIGNAL( paste() ), TQ_SLOT( paste() ) ); updateUI( true, true ); if( canvas->gui() && canvas->gui()->getHorzRuler()) @@ -3133,7 +3133,7 @@ KoTextViewIface* KWTextFrameSetEdit::dcopObject() void KWTextFrameSetEdit::terminate(bool removeSelection) { - disconnect( textView()->textObject(), TQT_SIGNAL( selectionChanged(bool) ), m_canvas, TQT_SIGNAL( selectionChanged(bool) ) ); + disconnect( textView()->textObject(), TQ_SIGNAL( selectionChanged(bool) ), m_canvas, TQ_SIGNAL( selectionChanged(bool) ) ); textView()->terminate(removeSelection); } diff --git a/kword/KWView.cpp b/kword/KWView.cpp index fdf776dc2..278ea451b 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -267,8 +267,8 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW setXMLFile( "kword.rc" ); - TQObject::connect( this, TQT_SIGNAL( embeddImage( const TQString & ) ), - this, TQT_SLOT( slotEmbedImage( const TQString & ) ) ); + TQObject::connect( this, TQ_SIGNAL( embeddImage( const TQString & ) ), + this, TQ_SLOT( slotEmbedImage( const TQString & ) ) ); setKeyCompression( TRUE ); setAcceptDrops( TRUE ); @@ -312,52 +312,52 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW addStatusBarItem( m_sbUnitLabel, 0 ); } - connect( m_doc, TQT_SIGNAL( modified( bool ) ), - this, TQT_SLOT( documentModified( bool )) ); + connect( m_doc, TQ_SIGNAL( modified( bool ) ), + this, TQ_SLOT( documentModified( bool )) ); - connect( m_doc, TQT_SIGNAL( numPagesChanged() ), - this, TQT_SLOT( numPagesChanged()) ); + connect( m_doc, TQ_SIGNAL( numPagesChanged() ), + this, TQ_SLOT( numPagesChanged()) ); - connect( m_doc, TQT_SIGNAL( pageLayoutChanged( const KoPageLayout& ) ), - this, TQT_SLOT( slotPageLayoutChanged( const KoPageLayout& )) ); + connect( m_doc, TQ_SIGNAL( pageLayoutChanged( const KoPageLayout& ) ), + this, TQ_SLOT( slotPageLayoutChanged( const KoPageLayout& )) ); - connect( m_doc, TQT_SIGNAL( docStructureChanged(int) ), - this, TQT_SLOT( docStructChanged(int)) ); + connect( m_doc, TQ_SIGNAL( docStructureChanged(int) ), + this, TQ_SLOT( docStructChanged(int)) ); - connect( m_doc, TQT_SIGNAL( unitChanged(KoUnit::Unit) ), - this, TQT_SLOT( slotUnitChanged(KoUnit::Unit) ) ); + connect( m_doc, TQ_SIGNAL( unitChanged(KoUnit::Unit) ), + this, TQ_SLOT( slotUnitChanged(KoUnit::Unit) ) ); - connect( m_doc, TQT_SIGNAL( sig_refreshMenuCustomVariable()), - this, TQT_SLOT( refreshCustomMenu())); + connect( m_doc, TQ_SIGNAL( sig_refreshMenuCustomVariable()), + this, TQ_SLOT( refreshCustomMenu())); - connect( m_doc, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotDocumentLoadingCompleted() ) ); + connect( m_doc, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotDocumentLoadingCompleted() ) ); - connect( frameViewManager(), TQT_SIGNAL(sigFrameSelectionChanged()), - this, TQT_SLOT( frameSelectedChanged())); + connect( frameViewManager(), TQ_SIGNAL(sigFrameSelectionChanged()), + this, TQ_SLOT( frameSelectedChanged())); - connect( frameViewManager(), TQT_SIGNAL(sigFrameSetRenamed()), - this, TQT_SLOT( updateFrameStatusBarItem())); + connect( frameViewManager(), TQ_SIGNAL(sigFrameSetRenamed()), + this, TQ_SLOT( updateFrameStatusBarItem())); - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( clipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( clipboardDataChanged() ) ); - connect( m_gui->canvasWidget(), TQT_SIGNAL(currentFrameSetEditChanged()), - this, TQT_SLOT(slotFrameSetEditChanged()) ); + connect( m_gui->canvasWidget(), TQ_SIGNAL(currentFrameSetEditChanged()), + this, TQ_SLOT(slotFrameSetEditChanged()) ); - connect( m_gui->canvasWidget(), TQT_SIGNAL( currentMouseModeChanged(int) ), - this, TQT_SLOT( showMouseMode(int) ) ); + connect( m_gui->canvasWidget(), TQ_SIGNAL( currentMouseModeChanged(int) ), + this, TQ_SLOT( showMouseMode(int) ) ); - connect( m_gui->canvasWidget(), TQT_SIGNAL( overwriteModeChanged( bool ) ), - this, TQT_SLOT( changeOverwriteMode( bool ) ) ); + connect( m_gui->canvasWidget(), TQ_SIGNAL( overwriteModeChanged( bool ) ), + this, TQ_SLOT( changeOverwriteMode( bool ) ) ); // Cut and copy are directly connected to the selectionChanged signal if ( m_doc->isReadWrite() ) { - connect( m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - this, TQT_SLOT(slotChangeCutState(bool )) ); - connect (m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - this, TQT_SLOT(slotChangeCaseState(bool ))); + connect( m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + this, TQ_SLOT(slotChangeCutState(bool )) ); + connect (m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + this, TQ_SLOT(slotChangeCaseState(bool ))); } else { @@ -365,28 +365,28 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW m_actionChangeCase->setEnabled( false ); } - connect( m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - m_actionEditCopy, TQT_SLOT(setEnabled(bool)) ); + connect( m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + m_actionEditCopy, TQ_SLOT(setEnabled(bool)) ); - //connect (m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - // m_actionCreateStyleFromSelection, TQT_SLOT(setEnabled(bool))); + //connect (m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + // m_actionCreateStyleFromSelection, TQ_SLOT(setEnabled(bool))); - connect (m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - m_actionConvertToTextBox, TQT_SLOT(setEnabled(bool))); - connect (m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - m_actionAddPersonalExpression, TQT_SLOT(setEnabled(bool ))); - connect (m_gui->canvasWidget(), TQT_SIGNAL(selectionChanged(bool)), - m_actionSortText, TQT_SLOT(setEnabled(bool ))); + connect (m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + m_actionConvertToTextBox, TQ_SLOT(setEnabled(bool))); + connect (m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + m_actionAddPersonalExpression, TQ_SLOT(setEnabled(bool ))); + connect (m_gui->canvasWidget(), TQ_SIGNAL(selectionChanged(bool)), + m_actionSortText, TQ_SLOT(setEnabled(bool ))); - connect( m_gui->canvasWidget(), TQT_SIGNAL(docStructChanged(int)), - this, TQT_SLOT(docStructChanged(int))); + connect( m_gui->canvasWidget(), TQ_SIGNAL(docStructChanged(int)), + this, TQ_SLOT(docStructChanged(int))); - connect( m_gui->canvasWidget(), TQT_SIGNAL(updateRuler()), - this, TQT_SLOT(slotUpdateRuler())); + connect( m_gui->canvasWidget(), TQ_SIGNAL(updateRuler()), + this, TQ_SLOT(slotUpdateRuler())); if ( shell() ) { - connect( shell(), TQT_SIGNAL( documentSaved()), m_doc,TQT_SLOT(slotDocumentInfoModifed() ) ); + connect( shell(), TQ_SIGNAL( documentSaved()), m_doc,TQ_SLOT(slotDocumentInfoModifed() ) ); changeNbOfRecentFiles( m_doc->maxRecentFiles() ); } @@ -405,8 +405,8 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW // Determine initial scroll position // We do this delayed, so that the GUI has been fully constructed // (and e.g. the statusbar can repaint). - TQTimer::singleShot( 0, this, TQT_SLOT( slotSetInitialPosition() ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotSetInitialPosition() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); } KWView::~KWView() @@ -563,72 +563,72 @@ void KWView::setupActions() // -------------- File menu m_actionExtraCreateTemplate = new TDEAction( i18n( "&Create Template From Document..." ), 0, - this, TQT_SLOT( extraCreateTemplate() ), + this, TQ_SLOT( extraCreateTemplate() ), actionCollection(), "extra_template" ); m_actionExtraCreateTemplate->setToolTip( i18n( "Save this document and use it later as a template" ) ); m_actionExtraCreateTemplate->setWhatsThis( i18n( "You can save this document as a template.<br><br>You can use this new template as a starting point for another document." ) ); - m_actionFileStatistics = new TDEAction( i18n( "Statistics" ), 0, this, TQT_SLOT( fileStatistics() ), actionCollection(), "file_statistics" ); + m_actionFileStatistics = new TDEAction( i18n( "Statistics" ), 0, this, TQ_SLOT( fileStatistics() ), actionCollection(), "file_statistics" ); m_actionFileStatistics->setToolTip( i18n( "Sentence, word and letter counts for this document" ) ); m_actionFileStatistics->setWhatsThis( i18n( "Information on the number of letters, words, syllables and sentences for this document.<p>Evaluates readability using the Flesch reading score." ) ); // -------------- Edit actions - m_actionEditCut = KStdAction::cut( this, TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); - m_actionEditCopy = KStdAction::copy( this, TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); - m_actionEditPaste = KStdAction::paste( this, TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); - m_actionEditFind = KStdAction::find( this, TQT_SLOT( editFind() ), actionCollection(), "edit_find" ); - m_actionEditFindNext = KStdAction::findNext( this, TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); - m_actionEditFindPrevious = KStdAction::findPrev( this, TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); - m_actionEditReplace = KStdAction::replace( this, TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); - m_actionEditSelectAll = KStdAction::selectAll( this, TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); - new TDEAction( i18n( "Select All Frames" ), 0, this, TQT_SLOT( editSelectAllFrames() ), actionCollection(), "edit_selectallframes" ); + m_actionEditCut = KStdAction::cut( this, TQ_SLOT( editCut() ), actionCollection(), "edit_cut" ); + m_actionEditCopy = KStdAction::copy( this, TQ_SLOT( editCopy() ), actionCollection(), "edit_copy" ); + m_actionEditPaste = KStdAction::paste( this, TQ_SLOT( editPaste() ), actionCollection(), "edit_paste" ); + m_actionEditFind = KStdAction::find( this, TQ_SLOT( editFind() ), actionCollection(), "edit_find" ); + m_actionEditFindNext = KStdAction::findNext( this, TQ_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); + m_actionEditFindPrevious = KStdAction::findPrev( this, TQ_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); + m_actionEditReplace = KStdAction::replace( this, TQ_SLOT( editReplace() ), actionCollection(), "edit_replace" ); + m_actionEditSelectAll = KStdAction::selectAll( this, TQ_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); + new TDEAction( i18n( "Select All Frames" ), 0, this, TQ_SLOT( editSelectAllFrames() ), actionCollection(), "edit_selectallframes" ); m_actionEditSelectCurrentFrame = new TDEAction( i18n( "Select Frame" ), 0, - 0, this, TQT_SLOT( editSelectCurrentFrame() ), + 0, this, TQ_SLOT( editSelectCurrentFrame() ), actionCollection(), "edit_selectcurrentframe" ); - m_actionSpellCheck = KStdAction::spelling( this, TQT_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); + m_actionSpellCheck = KStdAction::spelling( this, TQ_SLOT( slotSpellCheck() ), actionCollection(), "extra_spellcheck" ); m_actionDeletePage = new TDEAction( i18n( "Delete Page" ), "delslide", 0, - this, TQT_SLOT( deletePage() ), + this, TQ_SLOT( deletePage() ), actionCollection(), "delete_page" ); kdDebug() << m_doc->pageCount() << " " << (m_doc->processingType() == KWDocument::DTP) << endl; (void) new TDEAction( i18n( "Configure Mai&l Merge..." ), "configure",0, - this, TQT_SLOT( editMailMergeDataBase() ), + this, TQ_SLOT( editMailMergeDataBase() ), actionCollection(), "edit_sldatabase" ); (void) new KWMailMergeLabelAction( i18n("Drag Mail Merge Variable"), 0, - this, TQT_SLOT(editMailMergeDataBase()), actionCollection(), "mailmerge_draglabel" ); + this, TQ_SLOT(editMailMergeDataBase()), actionCollection(), "mailmerge_draglabel" ); -// (void) new KWMailMergeComboAction::KWMailMergeComboAction(i18n("Insert Mailmerge Var"),0,this, TQT_SLOT(JWJWJW()),actionCollection(),"mailmerge_varchooser"); +// (void) new KWMailMergeComboAction::KWMailMergeComboAction(i18n("Insert Mailmerge Var"),0,this, TQ_SLOT(JWJWJW()),actionCollection(),"mailmerge_varchooser"); // -------------- Frame menu m_actionEditDelFrame = new TDEAction( i18n( "&Delete Frame" ), 0, - this, TQT_SLOT( editDeleteFrame() ), + this, TQ_SLOT( editDeleteFrame() ), actionCollection(), "edit_delframe" ); m_actionEditDelFrame->setToolTip( i18n( "Delete the currently selected frame(s)." ) ); m_actionEditDelFrame->setWhatsThis( i18n( "Delete the currently selected frame(s)." ) ); - m_actionCreateLinkedFrame = new TDEAction( i18n( "Create Linked Copy" ), 0, this, TQT_SLOT( createLinkedFrame() ), actionCollection(), "create_linked_frame" ); + m_actionCreateLinkedFrame = new TDEAction( i18n( "Create Linked Copy" ), 0, this, TQ_SLOT( createLinkedFrame() ), actionCollection(), "create_linked_frame" ); m_actionCreateLinkedFrame->setToolTip( i18n( "Create a copy of the current frame, always showing the same contents" ) ); m_actionCreateLinkedFrame->setWhatsThis( i18n("Create a copy of the current frame, that remains linked to it. This means they always show the same contents: modifying the contents in such a frame will update all its linked copies.") ); m_actionRaiseFrame = new TDEAction( i18n( "Ra&ise Frame" ), "raise", - TQt::CTRL +TQt::SHIFT+ TQt::Key_R, this, TQT_SLOT( raiseFrame() ), + TQt::CTRL +TQt::SHIFT+ TQt::Key_R, this, TQ_SLOT( raiseFrame() ), actionCollection(), "raiseframe" ); m_actionRaiseFrame->setToolTip( i18n( "Raise the currently selected frame so that it appears above all the other frames" ) ); m_actionRaiseFrame->setWhatsThis( i18n( "Raise the currently selected frame so that it appears above all the other frames. This is only useful if frames overlap each other. If multiple frames are selected they are all raised in turn." ) ); m_actionLowerFrame = new TDEAction( i18n( "&Lower Frame" ), "lower", - TQt::CTRL +TQt::SHIFT+ TQt::Key_L, this, TQT_SLOT( lowerFrame() ), + TQt::CTRL +TQt::SHIFT+ TQt::Key_L, this, TQ_SLOT( lowerFrame() ), actionCollection(), "lowerframe" ); m_actionLowerFrame->setToolTip( i18n( "Lower the currently selected frame so that it disappears under any frame that overlaps it" ) ); m_actionLowerFrame->setWhatsThis( i18n( "Lower the currently selected frame so that it disappears under any frame that overlaps it. If multiple frames are selected they are all lowered in turn." ) ); m_actionBringToFront= new TDEAction( i18n( "Bring to Front" ), "bring_forward", - 0, this, TQT_SLOT( bringToFront() ), + 0, this, TQ_SLOT( bringToFront() ), actionCollection(), "bring_tofront_frame" ); m_actionSendBackward= new TDEAction( i18n( "Send to Back" ), "send_backward", - 0, this, TQT_SLOT( sendToBack() ), + 0, this, TQ_SLOT( sendToBack() ), actionCollection(), "send_toback_frame" ); @@ -637,14 +637,14 @@ void KWView::setupActions() if ( !m_doc->isEmbedded() ) { m_actionViewTextMode = new TDEToggleAction( i18n( "Text Mode" ), 0, - this, TQT_SLOT( viewTextMode() ), + this, TQ_SLOT( viewTextMode() ), actionCollection(), "view_textmode" ); m_actionViewTextMode->setToolTip( i18n( "Only show the text of the document." ) ); m_actionViewTextMode->setWhatsThis( i18n( "Do not show any pictures, formatting or layout. KWord will display only the text for editing." ) ); m_actionViewTextMode->setExclusiveGroup( "viewmodes" ); m_actionViewPageMode = new TDEToggleAction( i18n( "&Page Mode" ), 0, - this, TQT_SLOT( viewPageMode() ), + this, TQ_SLOT( viewPageMode() ), actionCollection(), "view_pagemode" ); m_actionViewPageMode->setWhatsThis( i18n( "Switch to page mode.<br><br> Page mode is designed to make editing your text easy.<br><br>This function is most frequently used to return to text editing after switching to preview mode." ) ); m_actionViewPageMode->setToolTip( i18n( "Switch to page editing mode." ) ); @@ -652,7 +652,7 @@ void KWView::setupActions() m_actionViewPageMode->setExclusiveGroup( "viewmodes" ); m_actionViewPageMode->setChecked( true ); m_actionViewPreviewMode = new TDEToggleAction( i18n( "Pre&view Mode" ), 0, - this, TQT_SLOT( viewPreviewMode() ), + this, TQ_SLOT( viewPreviewMode() ), actionCollection(), "view_previewmode" ); m_actionViewPreviewMode->setWhatsThis( i18n( "Zoom out from your document to get a look at several pages of your document.<br><br>The number of pages per line can be customized." ) ); m_actionViewPreviewMode->setToolTip( i18n( "Zoom out to a multiple page view." ) ); @@ -667,26 +667,26 @@ void KWView::setupActions() } m_actionViewFormattingChars = new TDEToggleAction( i18n( "&Formatting Characters" ), 0, - this, TQT_SLOT( slotViewFormattingChars() ), + this, TQ_SLOT( slotViewFormattingChars() ), actionCollection(), "view_formattingchars" ); m_actionViewFormattingChars->setToolTip( i18n( "Toggle the display of non-printing characters." ) ); m_actionViewFormattingChars->setWhatsThis( i18n( "Toggle the display of non-printing characters.<br><br>When this is enabled, KWord shows you tabs, spaces, carriage returns and other non-printing characters." ) ); m_actionViewFrameBorders = new TDEToggleAction( i18n( "Frame &Borders" ), 0, - this, TQT_SLOT( slotViewFrameBorders() ), + this, TQ_SLOT( slotViewFrameBorders() ), actionCollection(), "view_frameborders" ); m_actionViewFrameBorders->setToolTip( i18n( "Turns the border display on and off." ) ); m_actionViewFrameBorders->setWhatsThis( i18n( "Turns the border display on and off.<br><br>The borders are never printed. This option is useful to see how the document will appear on the printed page." ) ); m_actionViewHeader = new TDEToggleAction( i18n( "Enable Document &Headers" ), 0, - this, TQT_SLOT( viewHeader() ), + this, TQ_SLOT( viewHeader() ), actionCollection(), "format_header" ); m_actionViewHeader->setCheckedState(i18n("Disable Document &Headers")); m_actionViewHeader->setToolTip( i18n( "Shows and hides header display." ) ); m_actionViewHeader->setWhatsThis( i18n( "Selecting this option toggles the display of headers in KWord.<br><br>Headers are special frames at the top of each page which can contain page numbers or other information." ) ); m_actionViewFooter = new TDEToggleAction( i18n( "Enable Document Foo&ters" ), 0, - this, TQT_SLOT( viewFooter() ), + this, TQ_SLOT( viewFooter() ), actionCollection(), "format_footer" ); m_actionViewFooter->setCheckedState(i18n("Disable Document Foo&ters")); m_actionViewFooter->setToolTip( i18n( "Shows and hides footer display." ) ); @@ -695,21 +695,21 @@ void KWView::setupActions() m_actionViewZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "view_zoom" ); - connect( m_actionViewZoom, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( viewZoom( const TQString & ) ) ); + connect( m_actionViewZoom, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( viewZoom( const TQString & ) ) ); m_actionViewZoom->setEditable(true); changeZoomMenu( ); // -------------- Insert menu m_actionInsertSpecialChar = new TDEAction( i18n( "Sp&ecial Character..." ), "char", TQt::ALT + TQt::SHIFT + TQt::Key_C, - this, TQT_SLOT( insertSpecialChar() ), + this, TQ_SLOT( insertSpecialChar() ), actionCollection(), "insert_specialchar" ); m_actionInsertSpecialChar->setToolTip( i18n( "Insert one or more symbols or letters not found on the keyboard." ) ); m_actionInsertSpecialChar->setWhatsThis( i18n( "Insert one or more symbols or letters not found on the keyboard." ) ); m_actionInsertFrameBreak = new TDEAction( TQString(), TQt::CTRL + TQt::Key_Return, - this, TQT_SLOT( insertFrameBreak() ), + this, TQ_SLOT( insertFrameBreak() ), actionCollection(), "insert_framebreak" ); if ( m_doc->processingType() == KWDocument::WP ) { m_actionInsertFrameBreak->setText( i18n( "Page Break" ) ); @@ -722,45 +722,45 @@ void KWView::setupActions() } /*actionInsertPage =*/ new TDEAction( m_doc->processingType() == KWDocument::WP ? i18n( "Page" ) : i18n( "Page..." ), "page", 0, - this, TQT_SLOT( insertPage() ), + this, TQ_SLOT( insertPage() ), actionCollection(), "insert_page" ); m_actionInsertLink = new TDEAction( i18n( "Link..." ), 0, - this, TQT_SLOT( insertLink() ), + this, TQ_SLOT( insertLink() ), actionCollection(), "insert_link" ); m_actionInsertLink->setToolTip( i18n( "Insert a Web address, email address or hyperlink to a file." ) ); m_actionInsertLink->setWhatsThis( i18n( "Insert a Web address, email address or hyperlink to a file." ) ); m_actionInsertComment = new TDEAction( i18n( "Comment..." ), 0, - this, TQT_SLOT( insertComment() ), + this, TQ_SLOT( insertComment() ), actionCollection(), "insert_comment" ); m_actionInsertComment->setToolTip( i18n( "Insert a comment about the selected text." ) ); m_actionInsertComment->setWhatsThis( i18n( "Insert a comment about the selected text. These comments are not designed to appear on the final page." ) ); m_actionEditComment = new TDEAction( i18n("Edit Comment..."), 0, - this, TQT_SLOT(editComment()), + this, TQ_SLOT(editComment()), actionCollection(), "edit_comment"); m_actionEditComment->setToolTip( i18n( "Change the content of a comment." ) ); m_actionEditComment->setWhatsThis( i18n( "Change the content of a comment." ) ); m_actionRemoveComment = new TDEAction( i18n("Remove Comment"), 0, - this, TQT_SLOT(removeComment()), + this, TQ_SLOT(removeComment()), actionCollection(), "remove_comment"); m_actionRemoveComment->setToolTip( i18n( "Remove the selected document comment." ) ); m_actionRemoveComment->setWhatsThis( i18n( "Remove the selected document comment." ) ); m_actionCopyTextOfComment = new TDEAction( i18n("Copy Text of Comment..."), 0, - this, TQT_SLOT(copyTextOfComment()), + this, TQ_SLOT(copyTextOfComment()), actionCollection(), "copy_text_comment"); m_actionInsertFootEndNote = new TDEAction( i18n( "&Footnote/Endnote..." ), 0, - this, TQT_SLOT( insertFootNote() ), + this, TQ_SLOT( insertFootNote() ), actionCollection(), "insert_footendnote" ); m_actionInsertFootEndNote->setToolTip( i18n( "Insert a footnote referencing the selected text." ) ); m_actionInsertFootEndNote->setWhatsThis( i18n( "Insert a footnote referencing the selected text." ) ); m_actionInsertContents = new TDEAction( i18n( "Table of &Contents" ), 0, - this, TQT_SLOT( insertContents() ), + this, TQ_SLOT( insertContents() ), actionCollection(), "insert_contents" ); m_actionInsertContents->setToolTip( i18n( "Insert table of contents at the current cursor position." ) ); m_actionInsertContents->setWhatsThis( i18n( "Insert table of contents at the current cursor position." ) ); @@ -786,7 +786,7 @@ void KWView::setupActions() actionInsertVariable->popupMenu()->insertSeparator(); m_actionRefreshAllVariable = new TDEAction( i18n( "&Refresh All Variables" ), 0, - this, TQT_SLOT( refreshAllVariable() ), + this, TQ_SLOT( refreshAllVariable() ), actionCollection(), "refresh_all_variable" ); m_actionRefreshAllVariable->setToolTip( i18n( "Update all variables to current values." ) ); m_actionRefreshAllVariable->setWhatsThis( i18n( "Update all variables in the document to current values.<br><br>This will update page numbers, dates or any other variables that need updating." ) ); @@ -798,90 +798,90 @@ void KWView::setupActions() loadexpressionActions( m_actionInsertExpression); m_actionToolsCreateText = new TDEToggleAction( i18n( "Te&xt Frame" ), "frame_text", TQt::Key_F10 /*same as kpr*/, - this, TQT_SLOT( toolsCreateText() ), + this, TQ_SLOT( toolsCreateText() ), actionCollection(), "tools_createtext" ); m_actionToolsCreateText->setToolTip( i18n( "Create a new text frame." ) ); m_actionToolsCreateText->setWhatsThis( i18n( "Create a new text frame." ) ); m_actionToolsCreateText->setExclusiveGroup( "tools" ); m_actionInsertFormula = new TDEAction( i18n( "For&mula" ), "frame_formula", TQt::Key_F4, - this, TQT_SLOT( insertFormula() ), + this, TQ_SLOT( insertFormula() ), actionCollection(), "tools_formula" ); m_actionInsertFormula->setToolTip( i18n( "Insert a formula into a new frame." ) ); m_actionInsertFormula->setWhatsThis( i18n( "Insert a formula into a new frame." ) ); m_actionInsertTable = new TDEAction( i18n( "&Table..." ), "inline_table", TQt::Key_F5, - this, TQT_SLOT( insertTable() ), + this, TQ_SLOT( insertTable() ), actionCollection(), "insert_table" ); m_actionInsertTable->setToolTip( i18n( "Create a table." ) ); m_actionInsertTable->setWhatsThis( i18n( "Create a table.<br><br>The table can either exist in a frame of its own or inline." ) ); m_actionToolsCreatePix = new TDEToggleAction( i18n( "P&icture..." ), "frame_image", // or inline_image ? TQt::SHIFT + TQt::Key_F5 /*same as kpr*/, - this, TQT_SLOT( insertPicture() ), + this, TQ_SLOT( insertPicture() ), actionCollection(), "insert_picture" ); m_actionToolsCreatePix->setToolTip( i18n( "Create a new frame for a picture." ) ); m_actionToolsCreatePix->setWhatsThis( i18n( "Create a new frame for a picture or diagram." ) ); m_actionToolsCreatePix->setExclusiveGroup( "tools" ); m_actionToolsCreatePart = new KoPartSelectAction( i18n( "&Object Frame" ), "frame_query", - this, TQT_SLOT( toolsPart() ), + this, TQ_SLOT( toolsPart() ), actionCollection(), "tools_part" ); m_actionToolsCreatePart->setToolTip( i18n( "Insert an object into a new frame." ) ); m_actionToolsCreatePart->setWhatsThis( i18n( "Insert an object into a new frame." ) ); m_actionInsertFile = new TDEAction( i18n( "Fi&le..." ), 0, - this, TQT_SLOT( insertFile() ), + this, TQ_SLOT( insertFile() ), actionCollection(), "insert_file" ); // ------------------------- Format menu m_actionFormatFont = new TDEAction( i18n( "&Font..." ), TQt::ALT + TQt::CTRL + TQt::Key_F, - this, TQT_SLOT( formatFont() ), + this, TQ_SLOT( formatFont() ), actionCollection(), "format_font" ); m_actionFormatFont->setToolTip( i18n( "Change character size, font, boldface, italics etc." ) ); m_actionFormatFont->setWhatsThis( i18n( "Change the attributes of the currently selected characters." ) ); m_actionFormatParag = new TDEAction( i18n( "&Paragraph..." ), TQt::ALT + TQt::CTRL + TQt::Key_P, - this, TQT_SLOT( formatParagraph() ), + this, TQ_SLOT( formatParagraph() ), actionCollection(), "format_paragraph" ); m_actionFormatParag->setToolTip( i18n( "Change paragraph margins, text flow, borders, bullets, numbering etc." ) ); m_actionFormatParag->setWhatsThis( i18n( "Change paragraph margins, text flow, borders, bullets, numbering etc.<p>Select text in multiple paragraphs to change the formatting of all selected paragraphs.<p>If no text is selected, the paragraph where the cursor is located will be changed." ) ); m_actionFormatFrameSet = new TDEAction( i18n( "F&rame/Frameset Properties" ), 0, - this, TQT_SLOT( formatFrameSet() ), + this, TQ_SLOT( formatFrameSet() ), actionCollection(), "format_frameset" ); m_actionFormatFrameSet->setToolTip( i18n( "Alter frameset properties." ) ); m_actionFormatFrameSet->setWhatsThis( i18n( "Alter frameset properties.<p>Currently you can change the frame background." ) ); m_actionFormatPage = new TDEAction( i18n( "Page &Layout..." ), 0, - this, TQT_SLOT( formatPage() ), + this, TQ_SLOT( formatPage() ), actionCollection(), "format_page" ); m_actionFormatPage->setToolTip( i18n( "Change properties of entire page." ) ); m_actionFormatPage->setWhatsThis( i18n( "Change properties of the entire page.<p>Currently you can change paper size, paper orientation, header and footer sizes, and column settings." ) ); m_actionFormatFrameStylist = new TDEAction( i18n( "&Frame Style Manager" ), 0 /*shortcut?*/, - this, TQT_SLOT( extraFrameStylist() ), + this, TQ_SLOT( extraFrameStylist() ), actionCollection(), "frame_stylist" ); m_actionFormatFrameStylist->setToolTip( i18n( "Change attributes of framestyles." ) ); m_actionFormatFrameStylist->setWhatsThis( i18n( "Change background and borders of framestyles.<p>Multiple framestyles can be changed using the dialog box." ) ); m_actionFormatStylist = new TDEAction( i18n( "&Style Manager" ), TQt::ALT + TQt::CTRL + TQt::Key_S, - this, TQT_SLOT( extraStylist() ), + this, TQ_SLOT( extraStylist() ), actionCollection(), "format_stylist" ); m_actionFormatStylist->setToolTip( i18n( "Change attributes of styles." ) ); m_actionFormatStylist->setWhatsThis( i18n( "Change font and paragraph attributes of styles.<p>Multiple styles can be changed using the dialog box." ) ); m_actionFormatFontSize = new TDEFontSizeAction( i18n( "Font Size" ), 0, actionCollection(), "format_fontsize" ); - connect( m_actionFormatFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - this, TQT_SLOT( textSizeSelected( int ) ) ); + connect( m_actionFormatFontSize, TQ_SIGNAL( fontSizeChanged( int ) ), + this, TQ_SLOT( textSizeSelected( int ) ) ); - m_actionFontSizeIncrease = new TDEAction( i18n("Increase Font Size"), "fontsizeup", TQt::CTRL + TQt::Key_Greater, this, TQT_SLOT( increaseFontSize() ), actionCollection(), "increase_fontsize" ); - m_actionFontSizeDecrease = new TDEAction( i18n("Decrease Font Size"), "fontsizedown", TQt::CTRL + TQt::Key_Less, this, TQT_SLOT( decreaseFontSize() ), actionCollection(), "decrease_fontsize" ); + m_actionFontSizeIncrease = new TDEAction( i18n("Increase Font Size"), "fontsizeup", TQt::CTRL + TQt::Key_Greater, this, TQ_SLOT( increaseFontSize() ), actionCollection(), "increase_fontsize" ); + m_actionFontSizeDecrease = new TDEAction( i18n("Decrease Font Size"), "fontsizedown", TQt::CTRL + TQt::Key_Less, this, TQ_SLOT( decreaseFontSize() ), actionCollection(), "decrease_fontsize" ); #ifdef KFONTACTION_HAS_CRITERIA_ARG m_actionFormatFontFamily = new TDEFontAction( TDEFontChooser::SmoothScalableFonts, @@ -891,8 +891,8 @@ void KWView::setupActions() m_actionFormatFontFamily = new TDEFontAction( i18n( "Font Family" ), 0, actionCollection(), "format_fontfamily" ); #endif - connect( m_actionFormatFontFamily, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( textFontSelected( const TQString & ) ) ); + connect( m_actionFormatFontFamily, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( textFontSelected( const TQString & ) ) ); m_actionFormatStyleMenu = new TDEActionMenu( i18n( "St&yle" ), 0, actionCollection(), "format_stylemenu" ); @@ -900,12 +900,12 @@ void KWView::setupActions() actionCollection(), "format_style" ); // In fact, binding a key to this action will simply re-apply the current style. Why not. //m_actionFormatStyle->setShortcutConfigurable( false ); - connect( m_actionFormatStyle, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( textStyleSelected( int ) ) ); + connect( m_actionFormatStyle, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( textStyleSelected( int ) ) ); updateStyleList(); m_actionFormatDefault=new TDEAction( i18n( "Default Format" ), 0, - this, TQT_SLOT( textDefaultFormat() ), + this, TQ_SLOT( textDefaultFormat() ), actionCollection(), "text_default" ); m_actionFormatDefault->setToolTip( i18n( "Change font and paragraph attributes to their default values." ) ); m_actionFormatDefault->setWhatsThis( i18n( "Change font and paragraph attributes to their default values." ) ); @@ -913,76 +913,76 @@ void KWView::setupActions() // ----------------------- More format actions, for the toolbar only m_actionFormatBold = new TDEToggleAction( i18n( "&Bold" ), "format-text-bold", TQt::CTRL + TQt::Key_B, - this, TQT_SLOT( textBold() ), + this, TQ_SLOT( textBold() ), actionCollection(), "format_bold" ); m_actionFormatItalic = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic", TQt::CTRL + TQt::Key_I, - this, TQT_SLOT( textItalic() ), + this, TQ_SLOT( textItalic() ), actionCollection(), "format_italic" ); m_actionFormatUnderline = new TDEToggleAction( i18n( "&Underline" ), "format-text-underline", TQt::CTRL + TQt::Key_U, - this, TQT_SLOT( textUnderline() ), + this, TQ_SLOT( textUnderline() ), actionCollection(), "format_underline" ); m_actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "format-text-strikethrough", 0 , - this, TQT_SLOT( textStrikeOut() ), + this, TQ_SLOT( textStrikeOut() ), actionCollection(), "format_strike" ); m_actionFormatAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", TQt::CTRL + TQt::Key_L, - this, TQT_SLOT( textAlignLeft() ), + this, TQ_SLOT( textAlignLeft() ), actionCollection(), "format_alignleft" ); m_actionFormatAlignLeft->setExclusiveGroup( "align" ); m_actionFormatAlignLeft->setChecked( TRUE ); m_actionFormatAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", TQt::CTRL + TQt::ALT + TQt::Key_C, - this, TQT_SLOT( textAlignCenter() ), + this, TQ_SLOT( textAlignCenter() ), actionCollection(), "format_aligncenter" ); m_actionFormatAlignCenter->setExclusiveGroup( "align" ); m_actionFormatAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", TQt::CTRL + TQt::ALT + TQt::Key_R, - this, TQT_SLOT( textAlignRight() ), + this, TQ_SLOT( textAlignRight() ), actionCollection(), "format_alignright" ); m_actionFormatAlignRight->setExclusiveGroup( "align" ); m_actionFormatAlignBlock = new TDEToggleAction( i18n( "Align &Block" ), "text_block", TQt::CTRL + TQt::Key_J, - this, TQT_SLOT( textAlignBlock() ), + this, TQ_SLOT( textAlignBlock() ), actionCollection(), "format_alignblock" ); m_actionFormatAlignBlock->setExclusiveGroup( "align" ); m_actionFormatSpacingSingle = new TDEToggleAction( i18n( "Line Spacing &1" ), "spacesimple", TQt::CTRL + TQt::Key_1, - this, TQT_SLOT( textSpacingSingle() ), + this, TQ_SLOT( textSpacingSingle() ), actionCollection(), "format_spacingsingle" ); m_actionFormatSpacingSingle->setExclusiveGroup( "spacing" ); m_actionFormatSpacingOneAndHalf = new TDEToggleAction( i18n( "Line Spacing 1.&5" ), "spacedouble", TQt::CTRL + TQt::Key_5, - this, TQT_SLOT( textSpacingOneAndHalf() ), + this, TQ_SLOT( textSpacingOneAndHalf() ), actionCollection(), "format_spacing15" ); m_actionFormatSpacingOneAndHalf->setExclusiveGroup( "spacing" ); m_actionFormatSpacingDouble = new TDEToggleAction( i18n( "Line Spacing &2" ), "spacetriple", TQt::CTRL + TQt::Key_2, - this, TQT_SLOT( textSpacingDouble() ), + this, TQ_SLOT( textSpacingDouble() ), actionCollection(), "format_spacingdouble" ); m_actionFormatSpacingDouble->setExclusiveGroup( "spacing" ); m_actionFormatSuper = new TDEToggleAction( i18n( "Superscript" ), "super", 0, - this, TQT_SLOT( textSuperScript() ), + this, TQ_SLOT( textSuperScript() ), actionCollection(), "format_super" ); //m_actionFormatSuper->setExclusiveGroup( "valign" ); m_actionFormatSub = new TDEToggleAction( i18n( "Subscript" ), "sub", 0, - this, TQT_SLOT( textSubScript() ), + this, TQ_SLOT( textSubScript() ), actionCollection(), "format_sub" ); //m_actionFormatSub->setExclusiveGroup( "valign" ); m_actionFormatIncreaseIndent= new TDEAction( i18n( "Increase Indent" ), TQApplication::reverseLayout() ? "format_decreaseindent" : "format_increaseindent", 0, - this, TQT_SLOT( textIncreaseIndent() ), + this, TQ_SLOT( textIncreaseIndent() ), actionCollection(), "format_increaseindent" ); m_actionFormatDecreaseIndent= new TDEAction( i18n( "Decrease Indent" ), TQApplication::reverseLayout() ? "format_increaseindent" :"format_decreaseindent", 0, - this, TQT_SLOT( textDecreaseIndent() ), + this, TQ_SLOT( textDecreaseIndent() ), actionCollection(), "format_decreaseindent" ); m_actionFormatColor = new TTDESelectColorAction( i18n( "Text Color..." ), TTDESelectColorAction::TextColor, - this, TQT_SLOT( textColor() ), + this, TQ_SLOT( textColor() ), actionCollection(), "format_color", true ); m_actionFormatColor->setDefaultColor(TQColor()); //actionFormatList = new TDEToggleAction( i18n( "List" ), "enumList", 0, - // this, TQT_SLOT( textList() ), + // this, TQ_SLOT( textList() ), // actionCollection(), "format_list" ); //actionFormatList->setExclusiveGroup( "style" ); @@ -999,7 +999,7 @@ void KWView::setupActions() // Dynamically create toggle-actions for each list style. // This approach allows to edit toolbars and extract separate actions from this menu TDEToggleAction* act = new TDEToggleAction( styleIt.current()->name(), /*TODO icon,*/ - 0, this, TQT_SLOT( slotCounterStyleSelected() ), + 0, this, TQ_SLOT( slotCounterStyleSelected() ), actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); act->setExclusiveGroup( "counterstyle" ); // Add to the right menu: both for "none", bullet for bullets, numbers otherwise @@ -1018,19 +1018,19 @@ void KWView::setupActions() actionCollection(), "frame_stylemenu" ); m_actionFrameStyle = new TDESelectAction( i18n( "Framest&yle" ), 0, actionCollection(), "frame_style" ); - connect( m_actionFrameStyle, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( frameStyleSelected( int ) ) ); + connect( m_actionFrameStyle, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( frameStyleSelected( int ) ) ); updateFrameStyleList(); m_actionBorderOutline = new TDEToggleAction( i18n( "Border Outline" ), "borderoutline", - 0, this, TQT_SLOT( borderOutline() ), actionCollection(), "border_outline" ); + 0, this, TQ_SLOT( borderOutline() ), actionCollection(), "border_outline" ); m_actionBorderLeft = new TDEToggleAction( i18n( "Border Left" ), "borderleft", - 0, this, TQT_SLOT( borderLeft() ), actionCollection(), "border_left" ); + 0, this, TQ_SLOT( borderLeft() ), actionCollection(), "border_left" ); m_actionBorderRight = new TDEToggleAction( i18n( "Border Right" ), "borderright", - 0, this, TQT_SLOT( borderRight() ), actionCollection(), "border_right" ); + 0, this, TQ_SLOT( borderRight() ), actionCollection(), "border_right" ); m_actionBorderTop = new TDEToggleAction( i18n( "Border Top" ), "bordertop", - 0, this, TQT_SLOT( borderTop() ), actionCollection(), "border_top" ); + 0, this, TQ_SLOT( borderTop() ), actionCollection(), "border_top" ); m_actionBorderBottom = new TDEToggleAction( i18n( "Border Bottom" ), "borderbottom", - 0, this, TQT_SLOT( borderBottom() ), actionCollection(), "border_bottom" ); + 0, this, TQ_SLOT( borderBottom() ), actionCollection(), "border_bottom" ); m_actionBorderStyle = new TDESelectAction( i18n( "Border Style" ), 0, actionCollection(), "border_style" ); @@ -1058,55 +1058,55 @@ void KWView::setupActions() m_actionBackgroundColor->setToolTip( i18n( "Change background color for currently selected text." ) ); m_actionBackgroundColor->setWhatsThis( i18n( "Change background color for currently selected text." ) ); - connect(m_actionBackgroundColor,TQT_SIGNAL(activated()),TQT_SLOT(backgroundColor() )); + connect(m_actionBackgroundColor,TQ_SIGNAL(activated()),TQ_SLOT(backgroundColor() )); m_actionBackgroundColor->setDefaultColor(TQColor()); // ---------------------- Table menu m_actionTablePropertiesMenu = new TDEAction( i18n( "&Properties" ), 0, - this, TQT_SLOT( tableProperties() ), + this, TQ_SLOT( tableProperties() ), actionCollection(), "table_propertiesmenu" ); m_actionTablePropertiesMenu->setToolTip( i18n( "Adjust properties of the current table." ) ); m_actionTablePropertiesMenu->setWhatsThis( i18n( "Adjust properties of the current table." ) ); m_actionTableInsertRow = new TDEAction( i18n( "&Insert Row..." ), "insert_table_row", 0, - this, TQT_SLOT( tableInsertRow() ), + this, TQ_SLOT( tableInsertRow() ), actionCollection(), "table_insrow" ); m_actionTableInsertRow->setToolTip( i18n( "Insert one or more rows at cursor location." ) ); m_actionTableInsertRow->setWhatsThis( i18n( "Insert one or more rows at current cursor location." ) ); m_actionTableInsertCol = new TDEAction( i18n( "I&nsert Column..." ), "insert_table_col", 0, - this, TQT_SLOT( tableInsertCol() ), + this, TQ_SLOT( tableInsertCol() ), actionCollection(), "table_inscol" ); m_actionTableInsertCol->setToolTip( i18n( "Insert one or more columns into the current table." ) ); m_actionTableInsertCol->setWhatsThis( i18n( "Insert one or more columns into the current table." ) ); m_actionTableDelRow = new TDEAction( 0, "delete_table_row", 0, - this, TQT_SLOT( tableDeleteRow() ), + this, TQ_SLOT( tableDeleteRow() ), actionCollection(), "table_delrow" ); m_actionTableDelRow->setToolTip( i18n( "Delete selected rows from the current table." ) ); m_actionTableDelRow->setWhatsThis( i18n( "Delete selected rows from the current table." ) ); m_actionTableDelCol = new TDEAction( 0, "delete_table_col", 0, - this, TQT_SLOT( tableDeleteCol() ), + this, TQ_SLOT( tableDeleteCol() ), actionCollection(), "table_delcol" ); m_actionTableDelCol->setToolTip( i18n( "Delete selected columns from the current table." ) ); m_actionTableDelCol->setWhatsThis( i18n( "Delete selected columns from the current table." ) ); m_actionTableResizeCol = new TDEAction( i18n( "Resize Column..." ), 0, - this, TQT_SLOT( tableResizeCol() ), + this, TQ_SLOT( tableResizeCol() ), actionCollection(), "table_resizecol" ); m_actionTableResizeCol->setToolTip( i18n( "Change the width of the currently selected column." ) ); m_actionTableResizeCol->setWhatsThis( i18n( "Change the width of the currently selected column." ) ); m_actionTableJoinCells = new TDEAction( i18n( "&Join Cells" ), 0, - this, TQT_SLOT( tableJoinCells() ), + this, TQ_SLOT( tableJoinCells() ), actionCollection(), "table_joincells" ); m_actionTableJoinCells->setToolTip( i18n( "Join two or more cells into one large cell." ) ); m_actionTableJoinCells->setWhatsThis( i18n( "Join two or more cells into one large cell.<p>This is a good way to create titles and labels within a table." ) ); m_actionTableSplitCells= new TDEAction( i18n( "&Split Cell..." ), 0, - this, TQT_SLOT( tableSplitCells() ), + this, TQ_SLOT( tableSplitCells() ), actionCollection(), "table_splitcells" ); m_actionTableSplitCells->setToolTip( i18n( "Split one cell into two or more cells." ) ); m_actionTableSplitCells->setWhatsThis( i18n( "Split one cell into two or more cells.<p>Cells can be split horizontally, vertically or both directions at once." ) ); @@ -1114,26 +1114,26 @@ void KWView::setupActions() m_actionTableProtectCells= new TDEToggleAction( i18n( "Protect Cells" ), 0, 0, 0, actionCollection(), "table_protectcells" ); m_actionTableProtectCells->setToolTip( i18n( "Prevent changes to content of selected cells." ) ); - connect (m_actionTableProtectCells, TQT_SIGNAL( toggled(bool) ), this, - TQT_SLOT( tableProtectCells(bool) )); + connect (m_actionTableProtectCells, TQ_SIGNAL( toggled(bool) ), this, + TQ_SLOT( tableProtectCells(bool) )); m_actionTableProtectCells->setWhatsThis( i18n( "Toggles cell protection on and off.<br><br>When cell protection is on, the user can not alter the content or formatting of the text within the cell." ) ); m_actionTableUngroup = new TDEAction( i18n( "&Ungroup Table" ), 0, - this, TQT_SLOT( tableUngroupTable() ), + this, TQ_SLOT( tableUngroupTable() ), actionCollection(), "table_ungroup" ); m_actionTableUngroup->setToolTip( i18n( "Break a table into individual frames." ) ); m_actionTableUngroup->setWhatsThis( i18n( "Break a table into individual frames<p>Each frame can be moved independently around the page." ) ); m_actionTableDelete = new TDEAction( i18n( "Delete &Table" ), 0, - this, TQT_SLOT( tableDelete() ), + this, TQ_SLOT( tableDelete() ), actionCollection(), "table_delete" ); m_actionTableDelete->setToolTip( i18n( "Delete the entire table." ) ); m_actionTableDelete->setWhatsThis( i18n( "Deletes all cells and the content within the cells of the currently selected table." ) ); m_actionTableStylist = new TDEAction( i18n( "T&able Style Manager" ), 0, - this, TQT_SLOT( tableStylist() ), + this, TQ_SLOT( tableStylist() ), actionCollection(), "table_stylist" ); m_actionTableStylist->setToolTip( i18n( "Change attributes of tablestyles." ) ); m_actionTableStylist->setWhatsThis( i18n( "Change textstyle and framestyle of the tablestyles.<p>Multiple tablestyles can be changed using the dialog box." ) ); @@ -1142,19 +1142,19 @@ void KWView::setupActions() actionCollection(), "table_stylemenu" ); m_actionTableStyle = new TDESelectAction( i18n( "Table&style" ), 0, actionCollection(), "table_style" ); - connect( m_actionTableStyle, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( tableStyleSelected( int ) ) ); + connect( m_actionTableStyle, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( tableStyleSelected( int ) ) ); updateTableStyleList(); m_actionConvertTableToText = new TDEAction( i18n( "Convert Table to Text" ), 0, - this, TQT_SLOT( convertTableToText() ), + this, TQ_SLOT( convertTableToText() ), actionCollection(), "convert_table_to_text" ); m_actionSortText= new TDEAction( i18n( "Sort Text..." ), 0, - this, TQT_SLOT( sortText() ), + this, TQ_SLOT( sortText() ), actionCollection(), "sort_text" ); m_actionAddPersonalExpression= new TDEAction( i18n( "Add Expression" ), 0, - this, TQT_SLOT( addPersonalExpression() ), + this, TQ_SLOT( addPersonalExpression() ), actionCollection(), "add_personal_expression" ); @@ -1162,89 +1162,89 @@ void KWView::setupActions() m_actionAllowAutoFormat = new TDEToggleAction( i18n( "Enable Autocorrection" ), 0, - this, TQT_SLOT( slotAllowAutoFormat() ), + this, TQ_SLOT( slotAllowAutoFormat() ), actionCollection(), "enable_autocorrection" ); m_actionAllowAutoFormat->setCheckedState(i18n("Disable Autocorrection")); m_actionAllowAutoFormat->setToolTip( i18n( "Toggle autocorrection on and off." ) ); m_actionAllowAutoFormat->setWhatsThis( i18n( "Toggle autocorrection on and off." ) ); m_actionAutoFormat = new TDEAction( i18n( "Configure &Autocorrection..." ), 0, - this, TQT_SLOT( extraAutoFormat() ), + this, TQ_SLOT( extraAutoFormat() ), actionCollection(), "configure_autocorrection" ); m_actionAutoFormat->setToolTip( i18n( "Change autocorrection options." ) ); m_actionAutoFormat->setWhatsThis( i18n( "Change autocorrection options including:<p> <UL><LI><P>exceptions to autocorrection</P> <LI><P>add/remove autocorrection replacement text</P> <LI><P>and basic autocorrection options</P>." ) ); m_actionEditCustomVarsEdit = new TDEAction( i18n( "Custom &Variables..." ), 0, - this, TQT_SLOT( editCustomVars() ), // TODO: new dialog w add etc. + this, TQ_SLOT( editCustomVars() ), // TODO: new dialog w add etc. actionCollection(), "custom_vars" ); m_actionEditPersonnalExpr=new TDEAction( i18n( "Edit &Personal Expressions..." ), 0, - this, TQT_SLOT( editPersonalExpr() ), + this, TQ_SLOT( editPersonalExpr() ), actionCollection(), "personal_expr" ); m_actionEditPersonnalExpr->setToolTip( i18n( "Add or change one or more personal expressions." ) ); m_actionEditPersonnalExpr->setWhatsThis( i18n( "Add or change one or more personal expressions.<p>Personal expressions are a way to quickly insert commonly used phrases or text into your document." ) ); m_actionChangeCase=new TDEAction( i18n( "Change Case..." ), 0, - this, TQT_SLOT( changeCaseOfText() ), + this, TQ_SLOT( changeCaseOfText() ), actionCollection(), "change_case" ); m_actionChangeCase->setToolTip( i18n( "Alter the capitalization of selected text." ) ); m_actionChangeCase->setWhatsThis( i18n( "Alter the capitalization of selected text to one of five pre-defined patterns.<p>You can also switch all letters from upper case to lower case and from lower case to upper case in one move." ) ); //------------------------ Settings menu - m_actionConfigure = KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection(), "configure" ); + m_actionConfigure = KStdAction::preferences(this, TQ_SLOT(configure()), actionCollection(), "configure" ); //------------------------ Menu frameSet TDEAction *actionChangePicture=new TDEAction( i18n( "Change Picture..." ),"frame_image",0, - this, TQT_SLOT( changePicture() ), + this, TQ_SLOT( changePicture() ), actionCollection(), "change_picture" ); actionChangePicture->setToolTip( i18n( "Change the picture in the currently selected frame." ) ); actionChangePicture->setWhatsThis( i18n( "You can specify a different picture in the current frame.<br><br>KWord automatically resizes the new picture to fit within the old frame." ) ); m_actionConfigureHeaderFooter=new TDEAction( i18n( "Configure Header/Footer..." ), 0, - this, TQT_SLOT( configureHeaderFooter() ), + this, TQ_SLOT( configureHeaderFooter() ), actionCollection(), "configure_headerfooter" ); m_actionConfigureHeaderFooter->setToolTip( i18n( "Configure the currently selected header or footer." ) ); m_actionConfigureHeaderFooter->setWhatsThis( i18n( "Configure the currently selected header or footer." ) ); m_actionInlineFrame = new TDEToggleAction( i18n( "Inline Frame" ), 0, - this, TQT_SLOT( inlineFrame() ), + this, TQ_SLOT( inlineFrame() ), actionCollection(), "inline_frame" ); m_actionInlineFrame->setToolTip( i18n( "Convert current frame to an inline frame." ) ); m_actionInlineFrame->setWhatsThis( i18n( "Convert the current frame to an inline frame.<br><br>Place the inline frame within the text at the point nearest to the frames current position." ) ); m_actionOpenLink = new TDEAction( i18n( "Open Link" ), 0, - this, TQT_SLOT( openLink() ), + this, TQ_SLOT( openLink() ), actionCollection(), "open_link" ); m_actionOpenLink->setToolTip( i18n( "Open the link with the appropriate application." ) ); m_actionOpenLink->setWhatsThis( i18n( "Open the link with the appropriate application.<br><br>Web addresses are opened in a browser.<br>Email addresses begin a new message addressed to the link.<br>File links are opened by the appropriate viewer or editor." ) ); m_actionChangeLink=new TDEAction( i18n("Change Link..."), 0, - this, TQT_SLOT(changeLink()), + this, TQ_SLOT(changeLink()), actionCollection(), "change_link"); m_actionChangeLink->setToolTip( i18n( "Change the content of the currently selected link." ) ); m_actionChangeLink->setWhatsThis( i18n( "Change the details of the currently selected link." ) ); m_actionCopyLink = new TDEAction( i18n( "Copy Link" ), 0, - this, TQT_SLOT( copyLink() ), + this, TQ_SLOT( copyLink() ), actionCollection(), "copy_link" ); m_actionAddLinkToBookmak = new TDEAction( i18n( "Add to Bookmark" ), 0, - this, TQT_SLOT( addToBookmark() ), + this, TQ_SLOT( addToBookmark() ), actionCollection(), "add_to_bookmark" ); m_actionRemoveLink = new TDEAction( i18n( "Remove Link" ), 0, - this, TQT_SLOT( removeLink() ), + this, TQ_SLOT( removeLink() ), actionCollection(), "remove_link" ); m_actionShowDocStruct = new TDEToggleAction( i18n( "Show Doc Structure" ), 0, - this, TQT_SLOT( showDocStructure() ), + this, TQ_SLOT( showDocStructure() ), actionCollection(), "show_docstruct" ); m_actionShowDocStruct->setCheckedState(i18n("Hide Doc Structure")); m_actionShowDocStruct->setToolTip( i18n( "Open document structure sidebar." ) ); m_actionShowDocStruct->setWhatsThis( i18n( "Open document structure sidebar.<p>This sidebar helps you organize your document and quickly find pictures, tables etc." ) ); m_actionShowRuler = new TDEToggleAction( i18n( "Show Rulers" ), 0, - this, TQT_SLOT( showRuler() ), + this, TQ_SLOT( showRuler() ), actionCollection(), "show_ruler" ); m_actionShowRuler->setCheckedState(i18n("Hide Rulers")); m_actionShowRuler->setToolTip( i18n( "Shows or hides rulers." ) ); @@ -1254,16 +1254,16 @@ void KWView::setupActions() "the rulers from being displayed." ) ); m_actionViewShowGrid = new TDEToggleAction( i18n( "Show Grid" ), 0, - this, TQT_SLOT( viewGrid() ), + this, TQ_SLOT( viewGrid() ), actionCollection(), "view_grid" ); m_actionViewShowGrid->setCheckedState(i18n("Hide Grid")); m_actionViewSnapToGrid= new TDEToggleAction( i18n( "Snap to Grid" ), 0, - this, TQT_SLOT(viewSnapToGrid() ), + this, TQ_SLOT(viewSnapToGrid() ), actionCollection(), "view_snaptogrid" ); m_actionConfigureCompletion = new TDEAction( i18n( "Configure C&ompletion..." ), 0, - this, TQT_SLOT( configureCompletion() ), + this, TQ_SLOT( configureCompletion() ), actionCollection(), "configure_completion" ); m_actionConfigureCompletion->setToolTip( i18n( "Change the words and options for autocompletion." ) ); m_actionConfigureCompletion->setWhatsThis( i18n( "Add words or change the options for autocompletion." ) ); @@ -1271,132 +1271,132 @@ void KWView::setupActions() // ------------------- Actions with a key binding and no GUI item new TDEAction( i18n( "Insert Non-Breaking Space" ), TQt::CTRL+TQt::Key_Space, - this, TQT_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); + this, TQ_SLOT( slotNonbreakingSpace() ), actionCollection(), "nonbreaking_space" ); new TDEAction( i18n( "Insert Non-Breaking Hyphen" ), TQt::CTRL+TQt::SHIFT+TQt::Key_Minus, - this, TQT_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); + this, TQ_SLOT( slotNonbreakingHyphen() ), actionCollection(), "nonbreaking_hyphen" ); new TDEAction( i18n( "Insert Soft Hyphen" ), TQt::CTRL+TQt::Key_Minus, - this, TQT_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); + this, TQ_SLOT( slotSoftHyphen() ), actionCollection(), "soft_hyphen" ); new TDEAction( i18n( "Line Break" ), TQt::SHIFT+TQt::Key_Return, - this, TQT_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); + this, TQ_SLOT( slotLineBreak() ), actionCollection(), "line_break" ); - new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), this, TQT_SLOT( slotCompletion() ), actionCollection(), "completion" ); + new TDEAction( i18n( "Completion" ), TDEStdAccel::shortcut(TDEStdAccel::TextCompletion), this, TQ_SLOT( slotCompletion() ), actionCollection(), "completion" ); new TDEAction( i18n( "Increase Numbering Level" ), TQt::ALT+TQt::Key_Right, - this, TQT_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); + this, TQ_SLOT( slotIncreaseNumberingLevel() ), actionCollection(), "increase_numbering_level" ); new TDEAction( i18n( "Decrease Numbering Level" ), TQt::ALT+TQt::Key_Left, - this, TQT_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); + this, TQ_SLOT( slotDecreaseNumberingLevel() ), actionCollection(), "decrease_numbering_level" ); // -------- m_actionEditCustomVars = new TDEAction( i18n( "Edit Variable..." ), 0, - this, TQT_SLOT( editCustomVariable() ), + this, TQ_SLOT( editCustomVariable() ), actionCollection(), "edit_customvars" ); m_actionApplyAutoFormat= new TDEAction( i18n( "Apply Autocorrection" ), 0, - this, TQT_SLOT( applyAutoFormat() ), + this, TQ_SLOT( applyAutoFormat() ), actionCollection(), "apply_autoformat" ); m_actionApplyAutoFormat->setToolTip( i18n( "Manually force KWord to scan the entire document and apply autocorrection." ) ); m_actionApplyAutoFormat->setWhatsThis( i18n( "Manually force KWord to scan the entire document and apply autocorrection." ) ); m_actionCreateStyleFromSelection = new TDEAction( i18n( "Create Style From Selection..." ), 0, - this, TQT_SLOT( createStyleFromSelection()), + this, TQ_SLOT( createStyleFromSelection()), actionCollection(), "create_style" ); m_actionCreateStyleFromSelection->setToolTip( i18n( "Create a new style based on the currently selected text." ) ); m_actionCreateStyleFromSelection->setWhatsThis( i18n( "Create a new style based on the currently selected text." ) ); // ## "on the current paragraph, taking the formatting from where the cursor is. Selecting text isn't even needed." m_actionConfigureFootEndNote = new TDEAction( i18n( "&Footnote..." ), 0, - this, TQT_SLOT( configureFootEndNote()), + this, TQ_SLOT( configureFootEndNote()), actionCollection(), "format_footendnote" ); m_actionConfigureFootEndNote->setToolTip( i18n( "Change the look of footnotes." ) ); m_actionConfigureFootEndNote->setWhatsThis( i18n( "Change the look of footnotes." ) ); m_actionEditFootEndNote= new TDEAction( i18n("Edit Footnote"), 0, - this, TQT_SLOT( editFootEndNote()), + this, TQ_SLOT( editFootEndNote()), actionCollection(), "edit_footendnote" ); m_actionEditFootEndNote->setToolTip( i18n( "Change the content of the currently selected footnote." ) ); m_actionEditFootEndNote->setWhatsThis( i18n( "Change the content of the currently selected footnote." ) ); m_actionChangeFootNoteType = new TDEAction( i18n("Change Footnote/Endnote Parameter"), 0, - this, TQT_SLOT( changeFootNoteType() ), + this, TQ_SLOT( changeFootNoteType() ), actionCollection(), "change_footendtype"); m_actionSavePicture= new TDEAction( i18n("Save Picture As..."), 0, - this, TQT_SLOT( savePicture() ), + this, TQ_SLOT( savePicture() ), actionCollection(), "save_picture"); m_actionSavePicture->setToolTip( i18n( "Save the picture in a separate file." ) ); m_actionSavePicture->setWhatsThis( i18n( "Save the picture in the currently selected frame in a separate file, outside the KWord document." ) ); m_actionAllowBgSpellCheck = new TDEToggleAction( i18n( "Autospellcheck" ), 0, - this, TQT_SLOT( autoSpellCheck() ), + this, TQ_SLOT( autoSpellCheck() ), actionCollection(), "tool_auto_spellcheck" ); m_actionGoToFootEndNote = new TDEAction( TQString() /*set dynamically*/, 0, - this, TQT_SLOT( goToFootEndNote() ), + this, TQ_SLOT( goToFootEndNote() ), actionCollection(), "goto_footendnote" ); // Document Structure Area popup menu. m_actionDocStructEdit = new TDEAction( i18n( "Edit Text" ), 0, - this, TQT_SLOT( docStructEdit() ), + this, TQ_SLOT( docStructEdit() ), actionCollection(), "docstruct_edit" ); m_actionDocStructSpeak = new TDEAction( i18n("Speak Text" ), 0, - this, TQT_SLOT( docStructSpeak() ), + this, TQ_SLOT( docStructSpeak() ), actionCollection(), "docstruct_speak" ); m_actionDocStructSelect = new TDEAction( i18n( "Show" ), 0, - this, TQT_SLOT( docStructSelect() ), + this, TQ_SLOT( docStructSelect() ), actionCollection(), "docstruct_select" ); m_actionDocStructDelete = new TDEAction( i18n( "Delete Frame" ), 0, - this, TQT_SLOT( docStructDelete() ), + this, TQ_SLOT( docStructDelete() ), actionCollection(), "docstruct_delete" ); m_actionDocStructProperties = new TDEAction( i18n( "Properties" ), 0, - this, TQT_SLOT( docStructProperties() ), + this, TQ_SLOT( docStructProperties() ), actionCollection(), "docstruct_properties" ); m_actionAddBookmark= new TDEAction( i18n( "&Bookmark..." ), 0, - this, TQT_SLOT( addBookmark() ), + this, TQ_SLOT( addBookmark() ), actionCollection(), "add_bookmark" ); m_actionSelectBookmark= new TDEAction( i18n( "Select &Bookmark..." ), 0, - this, TQT_SLOT( selectBookmark() ), + this, TQ_SLOT( selectBookmark() ), actionCollection(), "select_bookmark" ); m_actionImportStyle= new TDEAction( i18n( "Import Styles..." ), 0, - this, TQT_SLOT( importStyle() ), + this, TQ_SLOT( importStyle() ), actionCollection(), "import_style" ); m_actionCreateFrameStyle = new TDEAction( i18n( "&Create Framestyle From Frame..." ), 0, - this, TQT_SLOT( createFrameStyle()), + this, TQ_SLOT( createFrameStyle()), actionCollection(), "create_framestyle" ); m_actionCreateFrameStyle->setToolTip( i18n( "Create a new style based on the currently selected frame." ) ); m_actionCreateFrameStyle->setWhatsThis( i18n( "Create a new framestyle based on the currently selected frame." ) ); #if 0 // re-enable after fixing m_actionInsertDirectCursor = new TDEToggleAction( i18n( "Type Anywhere Cursor" ), 0, - this, TQT_SLOT( insertDirectCursor() ), + this, TQ_SLOT( insertDirectCursor() ), actionCollection(), "direct_cursor" ); #endif m_actionConvertToTextBox = new TDEAction( i18n( "Convert to Text Box" ), 0, - this, TQT_SLOT( convertToTextBox() ), + this, TQ_SLOT( convertToTextBox() ), actionCollection(), "convert_to_text_box" ); m_actionSpellIgnoreAll = new TDEAction( i18n( "Ignore All" ), 0, - this, TQT_SLOT( slotAddIgnoreAllWord() ), + this, TQ_SLOT( slotAddIgnoreAllWord() ), actionCollection(), "ignore_all" ); m_actionAddWordToPersonalDictionary=new TDEAction( i18n( "Add Word to Dictionary" ),0, - this, TQT_SLOT( addWordToDictionary() ), + this, TQ_SLOT( addWordToDictionary() ), actionCollection(), "add_word_to_dictionary" ); m_actionEmbeddedStoreInternal=new TDEToggleAction( i18n( "Store Document Internally" ),0, - this, TQT_SLOT( embeddedStoreInternal() ), + this, TQ_SLOT( embeddedStoreInternal() ), actionCollection(), "embedded_store_internal" ); m_actionGoToDocumentStructure=new TDEAction( i18n( "Go to Document Structure" ), TDEShortcut("Alt+1"), - this, TQT_SLOT( goToDocumentStructure() ), + this, TQ_SLOT( goToDocumentStructure() ), actionCollection(), "goto_document_structure" ); m_actionGoToDocument=new TDEAction( i18n( "Go to Document" ), TDEShortcut("Alt+2"), - this, TQT_SLOT( goToDocument() ), + this, TQ_SLOT( goToDocument() ), actionCollection(), "goto_document" ); // For RMB inside a cell, see KWFrameView::showPopup @@ -1489,7 +1489,7 @@ void KWView::createExpressionActions( TDEActionMenu * parentMenu,const TQString& if ( e2.tagName() == "Expression" ) { TQString text = i18n( e2.namedItem( "Text" ).toElement().text().utf8() ); - TDEAction * act = new TDEAction( text, 0, this, TQT_SLOT( insertExpression() ), + TDEAction * act = new TDEAction( text, 0, this, TQ_SLOT( insertExpression() ), actionCollection(), TQString("expression-action_%1").arg(i).latin1() ); if ( personalShortCut.contains(text) ) @@ -1539,7 +1539,7 @@ void KWView::addVariableActions( int type, const TQStringList & texts, v.subtype = i; TQCString actionName; actionName.sprintf( "var-action-%d-%d", type, i ); - TDEAction * act = new TDEAction( (*it), 0, this, TQT_SLOT( insertVariable() ), + TDEAction * act = new TDEAction( (*it), 0, this, TQ_SLOT( insertVariable() ), actionCollection(), actionName ); // Mainly for KEditToolbar act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).arg( *it ) ); @@ -1584,7 +1584,7 @@ void KWView::refreshCustomMenu() { lst.append( varName ); TQCString name = TQString("custom-action_%1").arg(i).latin1(); - act = new TDEAction( varName, shortCuts[varName], this, TQT_SLOT( insertCustomVariable() ),actionCollection(), name ); + act = new TDEAction( varName, shortCuts[varName], this, TQ_SLOT( insertCustomVariable() ),actionCollection(), name ); act->setGroup( "custom-variable-action" ); m_actionInsertCustom->insert( act ); i++; @@ -1595,7 +1595,7 @@ void KWView::refreshCustomMenu() if(state) m_actionInsertCustom->popupMenu()->insertSeparator(); - act = new TDEAction( i18n("New..."), 0, this, TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1()); + act = new TDEAction( i18n("New..."), 0, this, TQ_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1()); act->setGroup( "custom-variable-action" ); @@ -2228,7 +2228,7 @@ void KWView::updateStyleList() { TQString name = PARAGSTYLE_ACTION_PREFIX + style->name(); TDEToggleAction* act = new TDEToggleAction( (*it), - shortCuts[name], this, TQT_SLOT( slotStyleSelected() ), + shortCuts[name], this, TQ_SLOT( slotStyleSelected() ), actionCollection(), name.utf8() ); act->setGroup( "styleList" ); act->setExclusiveGroup( "styleListAction" ); @@ -2294,7 +2294,7 @@ void KWView::updateFrameStyleList() TQString name = FRAMESTYLE_ACTION_PREFIX + style->name(); TDEToggleAction* act = new TDEToggleAction( (*it), shortCuts[name], // KDE4: use value() - this, TQT_SLOT( slotFrameStyleSelected() ), + this, TQ_SLOT( slotFrameStyleSelected() ), actionCollection(), name.utf8() /*KDE4: remove conversion*/ ); act->setGroup( "frameStyleList" ); act->setExclusiveGroup( "frameStyleList" ); @@ -2344,7 +2344,7 @@ void KWView::updateTableStyleList() { TQString name = TABLESTYLE_ACTION_PREFIX + style->name(); TDEToggleAction* act = new TDEToggleAction( (*it), - shortCuts[name], this, TQT_SLOT( slotTableStyleSelected() ), + shortCuts[name], this, TQ_SLOT( slotTableStyleSelected() ), actionCollection(), name.utf8() ); act->setExclusiveGroup( "tableStyleList" ); act->setGroup( "tableStyleList" ); @@ -2941,7 +2941,7 @@ void KWView::viewTextMode() { case KoZoomMode::ZOOM_WIDTH: m_doc->setZoomMode(KoZoomMode::ZOOM_WIDTH); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_PAGE: // no break m_zoomViewModeNormal.m_zoomMode = KoZoomMode::ZOOM_CONSTANT; @@ -2977,11 +2977,11 @@ void KWView::viewPageMode() { case KoZoomMode::ZOOM_WIDTH: m_doc->setZoomMode(KoZoomMode::ZOOM_WIDTH); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_PAGE: m_doc->setZoomMode(KoZoomMode::ZOOM_PAGE); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_CONSTANT: m_doc->setZoomMode(KoZoomMode::ZOOM_CONSTANT); @@ -3005,11 +3005,11 @@ void KWView::viewPreviewMode() { case KoZoomMode::ZOOM_WIDTH: m_doc->setZoomMode(KoZoomMode::ZOOM_WIDTH); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_PAGE: m_doc->setZoomMode(KoZoomMode::ZOOM_PAGE); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); break; case KoZoomMode::ZOOM_CONSTANT: m_doc->setZoomMode(KoZoomMode::ZOOM_CONSTANT); @@ -3230,7 +3230,7 @@ void KWView::viewZoom( const TQString &s ) if(zoom != m_doc->zoom() && !canvas->verticalScrollBar() || !canvas->verticalScrollBar()->isVisible()) { // has no vertical scrollbar // we have to do this twice to take into account a possibly appearing vertical scrollbar - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); } ok = true; } @@ -3450,10 +3450,10 @@ void KWView::insertSpecialChar() if (m_specialCharDlg==0) { m_specialCharDlg = new KoCharSelectDia( this, "insert special char", f, c, false ); - connect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); - connect( m_specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + connect( m_specialCharDlg, TQ_SIGNAL(insertChar(TQChar,const TQString &)), + this, TQ_SLOT(slotSpecialChar(TQChar,const TQString &))); + connect( m_specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); } m_specialCharDlg->show(); } @@ -3462,10 +3462,10 @@ void KWView::slotSpecialCharDlgClosed() { if ( m_specialCharDlg ) { - disconnect( m_specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); - disconnect( m_specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + disconnect( m_specialCharDlg, TQ_SIGNAL(insertChar(TQChar,const TQString &)), + this, TQ_SLOT(slotSpecialChar(TQChar,const TQString &))); + disconnect( m_specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); m_specialCharDlg->deleteLater(); m_specialCharDlg = 0L; } @@ -3649,8 +3649,8 @@ void KWView::formatFont() , m_broker , this, "" ); - connect( m_fontDlg, TQT_SIGNAL( applyFont() ), - this, TQT_SLOT( slotApplyFont() ) ); + connect( m_fontDlg, TQ_SIGNAL( applyFont() ), + this, TQ_SLOT( slotApplyFont() ) ); m_fontDlg->exec(); delete m_fontDlg; @@ -3713,7 +3713,7 @@ void KWView::showParagraphDialog( int initialPage, double initialTabPos ) if ( initialPage == KoParagDia::PD_TABS ) m_paragDlg->tabulatorsWidget()->setCurrentTab( initialTabPos ); } - connect( m_paragDlg, TQT_SIGNAL( applyParagStyle() ), this, TQT_SLOT( slotApplyParag())); + connect( m_paragDlg, TQ_SIGNAL( applyParagStyle() ), this, TQ_SLOT( slotApplyParag())); m_paragDlg->exec(); delete m_paragDlg; @@ -5568,16 +5568,16 @@ void KWView::startKSpell() m_spell.dlg = new KSpell2::Dialog( m_spell.kospell, this ); m_spell.dlg->activeAutoCorrect( true ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)), - this, TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)), - this, TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ), - this, TQT_SLOT(spellCheckerDone(const TQString&)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(cancel() ), - this, TQT_SLOT( spellCheckerCancel() ) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), - this, TQT_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(misspelling(const TQString&, int)), + this, TQ_SLOT(spellCheckerMisspelling(const TQString&, int)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(replace(const TQString&, int, const TQString&)), + this, TQ_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(done(const TQString&) ), + this, TQ_SLOT(spellCheckerDone(const TQString&)) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(cancel() ), + this, TQ_SLOT( spellCheckerCancel() ) ); + TQObject::connect( m_spell.dlg, TQ_SIGNAL(autoCorrect(const TQString &, const TQString & ) ), + this, TQ_SLOT( spellAddAutoCorrect (const TQString &, const TQString &) ) ); m_spell.dlg->show(); //clearSpellChecker(); @@ -6052,8 +6052,8 @@ int KWView::canvasYOffset() const void KWView::canvasAddChild( KoViewChild * child ) { - connect( m_gui->canvasWidget(), TQT_SIGNAL( viewTransformationsChanged() ), - child, TQT_SLOT( reposition() ) ); + connect( m_gui->canvasWidget(), TQ_SIGNAL( viewTransformationsChanged() ), + child, TQ_SLOT( reposition() ) ); // Not necessary anymore //m_gui->canvasWidget()->addChild( child->frame() ); } @@ -6298,14 +6298,14 @@ void KWView::showDocStructure() { m_doc->setShowDocStruct(m_actionShowDocStruct->isChecked()); m_doc->reorganizeGUI(); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); } void KWView::showRuler() { m_doc->setShowRuler( m_actionShowRuler->isChecked()); m_doc->reorganizeGUI(); - TQTimer::singleShot( 0, this, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateZoom() ) ); } void KWView::viewGrid() @@ -7448,7 +7448,7 @@ TQPtrList<TDEAction> KWView::listOfResultOfCheckWord( const TQString &word ) if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { TDEAction * act = new TDEAction( *it ); - connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotCorrectWord()) ); + connect( act, TQ_SIGNAL(activated()), this, TQ_SLOT(slotCorrectWord()) ); listAction.append( act ); } } @@ -7578,7 +7578,7 @@ void KWViewWidget::resizeEvent( TQResizeEvent *e ) if ( ( e->size().width() != e->oldSize().width() ) && ( m_view->kWordDocument()->zoomMode() == KoZoomMode::ZOOM_WIDTH ) ) { - TQTimer::singleShot( 0, m_view, TQT_SLOT( updateZoom() ) ); + TQTimer::singleShot( 0, m_view, TQ_SLOT( updateZoom() ) ); } TQWidget::resizeEvent( e ); @@ -7638,17 +7638,17 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) m_horRuler->setGridSize(doc->gridX()); - connect( m_horRuler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), m_view, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); - connect( m_horRuler, TQT_SIGNAL( newLeftIndent( double ) ), m_view, TQT_SLOT( newLeftIndent( double ) ) ); - connect( m_horRuler, TQT_SIGNAL( newFirstIndent( double ) ), m_view, TQT_SLOT( newFirstIndent( double ) ) ); - connect( m_horRuler, TQT_SIGNAL( newRightIndent( double ) ), m_view, TQT_SLOT( newRightIndent( double ) ) ); + connect( m_horRuler, TQ_SIGNAL( newPageLayout( const KoPageLayout & ) ), m_view, TQ_SLOT( newPageLayout( const KoPageLayout & ) ) ); + connect( m_horRuler, TQ_SIGNAL( newLeftIndent( double ) ), m_view, TQ_SLOT( newLeftIndent( double ) ) ); + connect( m_horRuler, TQ_SIGNAL( newFirstIndent( double ) ), m_view, TQ_SLOT( newFirstIndent( double ) ) ); + connect( m_horRuler, TQ_SIGNAL( newRightIndent( double ) ), m_view, TQ_SLOT( newRightIndent( double ) ) ); - connect( m_horRuler, TQT_SIGNAL( doubleClicked() ), m_view, TQT_SLOT( slotHRulerDoubleClicked() ) ); - connect( m_horRuler, TQT_SIGNAL( doubleClicked(double) ), m_view, TQT_SLOT( slotHRulerDoubleClicked(double) ) ); - connect( m_horRuler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); - connect( m_vertRuler, TQT_SIGNAL( newPageLayout( const KoPageLayout & ) ), m_view, TQT_SLOT( newPageLayout( const KoPageLayout & ) ) ); - connect( m_vertRuler, TQT_SIGNAL( doubleClicked() ), m_view, TQT_SLOT( formatPage() ) ); - connect( m_vertRuler, TQT_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQT_SLOT( unitChanged( KoUnit::Unit ) ) ); + connect( m_horRuler, TQ_SIGNAL( doubleClicked() ), m_view, TQ_SLOT( slotHRulerDoubleClicked() ) ); + connect( m_horRuler, TQ_SIGNAL( doubleClicked(double) ), m_view, TQ_SLOT( slotHRulerDoubleClicked(double) ) ); + connect( m_horRuler, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQ_SLOT( unitChanged( KoUnit::Unit ) ) ); + connect( m_vertRuler, TQ_SIGNAL( newPageLayout( const KoPageLayout & ) ), m_view, TQ_SLOT( newPageLayout( const KoPageLayout & ) ) ); + connect( m_vertRuler, TQ_SIGNAL( doubleClicked() ), m_view, TQ_SLOT( formatPage() ) ); + connect( m_vertRuler, TQ_SIGNAL( unitChanged( KoUnit::Unit ) ), this, TQ_SLOT( unitChanged( KoUnit::Unit ) ) ); m_horRuler->hide(); m_vertRuler->hide(); @@ -7657,8 +7657,8 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) reorganize(); - connect( m_horRuler, TQT_SIGNAL( tabListChanged( const KoTabulatorList & ) ), m_view, - TQT_SLOT( tabListChanged( const KoTabulatorList & ) ) ); + connect( m_horRuler, TQ_SIGNAL( tabListChanged( const KoTabulatorList & ) ), m_view, + TQ_SLOT( tabListChanged( const KoTabulatorList & ) ) ); setKeyCompression( TRUE ); setAcceptDrops( TRUE ); diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp index 2588b06e4..c05ad1aec 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.cpp +++ b/kword/mailmerge/KWClassicSerialDataSource.cpp @@ -245,12 +245,12 @@ KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *parent, KW addColumn( i18n( "Name" ) ); addColumn( i18n( "Value" ) ); header()->setMovingEnabled( FALSE ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( columnSizeChange( int, int, int ) ) ); -// connect( header(), TQT_SIGNAL( sectionClicked( int ) ), -// this, TQT_SLOT( sectionClicked( int ) ) ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( columnSizeChange( int, int, int ) ) ); +// connect( header(), TQ_SIGNAL( sectionClicked( int ) ), +// this, TQ_SLOT( sectionClicked( int ) ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); currentRecord = -1; } @@ -343,27 +343,27 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS first = new TQToolButton( toolbar ); first->setIconSet( SmallIconSet( "go-first" ) ); first->setFixedSize( first->sizeHint() ); - connect(first, TQT_SIGNAL(clicked()), this, TQT_SLOT(firstRecord())); + connect(first, TQ_SIGNAL(clicked()), this, TQ_SLOT(firstRecord())); back_ = new TQToolButton( toolbar ); back_->setIconSet( SmallIconSet( "back" ) ); back_->setFixedSize( back_->sizeHint() ); - connect(back_, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevRecord())); + connect(back_, TQ_SIGNAL(clicked()), this, TQ_SLOT(prevRecord())); records = new TQSpinBox( 1, db->getNumRecords(), 1, toolbar ); records->setMaximumHeight( records->sizeHint().height() ); - connect( records, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( changeRecord( int ) ) ); + connect( records, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( changeRecord( int ) ) ); forward = new TQToolButton( toolbar ); forward->setIconSet( SmallIconSet( "forward" ) ); forward->setFixedSize( forward->sizeHint() ); - connect(forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextRecord())); + connect(forward, TQ_SIGNAL(clicked()), this, TQ_SLOT(nextRecord())); finish = new TQToolButton( toolbar ); finish->setIconSet( SmallIconSet( "go-last" ) ); finish->setFixedSize( finish->sizeHint() ); - connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(lastRecord())); + connect(finish, TQ_SIGNAL(clicked()), this, TQ_SLOT(lastRecord())); TQWidget *sep = new TQWidget( toolbar ); sep->setMaximumWidth( 10 ); @@ -371,29 +371,29 @@ KWClassicMailMergeEditor::KWClassicMailMergeEditor( TQWidget *parent, KWClassicS newRecord = new TQToolButton( toolbar ); newRecord->setIconSet( SmallIconSet( "sl_addrecord" ) ); newRecord->setFixedSize( newRecord->sizeHint() ); - connect( newRecord, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addRecord() ) ); + connect( newRecord, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addRecord() ) ); TQToolTip::add( newRecord, i18n( "Add record" ) ); newEntry = new TQToolButton( toolbar ); newEntry->setIconSet( SmallIconSet( "sl_addentry" ) ); newEntry->setFixedSize( newEntry->sizeHint() ); - connect( newEntry, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addEntry() ) ); + connect( newEntry, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addEntry() ) ); TQToolTip::add( newEntry, i18n( "Add entry" ) ); deleteRecord = new TQToolButton( toolbar ); deleteRecord->setIconSet( SmallIconSet( "sl_delrecord" ) ); deleteRecord->setFixedSize( deleteRecord->sizeHint() ); - connect( deleteRecord, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeRecord() ) ); + connect( deleteRecord, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeRecord() ) ); TQToolTip::add( deleteRecord, i18n( "Remove record" ) ); deleteEntry = new TQToolButton( toolbar ); deleteEntry->setIconSet( SmallIconSet( "sl_delentry" ) ); deleteEntry->setFixedSize( deleteEntry->sizeHint() ); - connect( deleteEntry, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeEntry() ) ); + connect( deleteEntry, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeEntry() ) ); TQToolTip::add( deleteEntry, i18n( "Remove entry" ) ); dbList = new KWClassicMailMergeEditorList( back, db ); diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp index 527d1e687..6b93e3d32 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp @@ -100,7 +100,7 @@ void KWMailMergeKSpread::initDocument() { _document = new Doc(); - connect( _document, TQT_SIGNAL( completed() ), TQT_SLOT( initSpreadSheets() ) ); + connect( _document, TQ_SIGNAL( completed() ), TQ_SLOT( initSpreadSheets() ) ); _document->openURL( _url ); } diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp index 441c3207e..005546251 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp @@ -46,8 +46,8 @@ KWMailMergeKSpreadConfig::KWMailMergeKSpreadConfig( TQWidget *parent, KWMailMerg _urlRequester->setURL( _object->url().url() ); _initialPage = _object->spreadSheetNumber(); - connect( _urlRequester, TQT_SIGNAL( urlSelected( const TQString& ) ), - TQT_SLOT( loadDocument() ) ); + connect( _urlRequester, TQ_SIGNAL( urlSelected( const TQString& ) ), + TQ_SLOT( loadDocument() ) ); loadDocument(); slotTextChanged( _urlRequester->lineEdit()->text() ); @@ -75,7 +75,7 @@ void KWMailMergeKSpreadConfig::loadDocument() if ( !_urlRequester->url().isEmpty() ) { _document = new Doc(); - connect( _document, TQT_SIGNAL( completed() ), TQT_SLOT( documentLoaded() ) ); + connect( _document, TQ_SIGNAL( completed() ), TQ_SLOT( documentLoaded() ) ); _document->openURL( _urlRequester->url() ); } @@ -114,7 +114,7 @@ void KWMailMergeKSpreadConfig::initGUI() _pageNumber = new KComboBox( page ); _pageNumber->setEnabled( false ); layout->addWidget( _pageNumber, 1, 1 ); - connect( _urlRequester->lineEdit() , TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( _urlRequester->lineEdit() , TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); } void KWMailMergeKSpreadConfig::slotTextChanged( const TQString & _text ) diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp index 08def7cd8..ad692ddcd 100644 --- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp +++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp @@ -40,7 +40,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *parent) for (int i=0;i<3;i++) w+=m_table->columnWidth(i); w+=m_table->verticalHeader()->headerWidth(); m_table->setMinimumWidth(w); - connect(m_table,TQT_SIGNAL(valueChanged ( int, int)),this,TQT_SLOT(slotValueChanged ( int, int))); + connect(m_table,TQ_SIGNAL(valueChanged ( int, int)),this,TQ_SLOT(slotValueChanged ( int, int))); } void KWQtSqlEasyFilter::createColumn(int i) diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp index 538e36a6d..951944b24 100644 --- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp +++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp @@ -47,11 +47,11 @@ KWQtSqlMailMergeOpen::KWQtSqlMailMergeOpen( TQWidget *parent, KWQtSqlSerialDataS widget->port->setText(db->port); widget->databasename->setText(db->databasename); fillSavedProperties(); - connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(handleOk())); - connect(widget->savedProperties,TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(savedPropertiesChanged(const TQString&))); - connect(widget->rememberButton,TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSave())); + connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(handleOk())); + connect(widget->savedProperties,TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(savedPropertiesChanged(const TQString&))); + connect(widget->rememberButton,TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSave())); } KWQtSqlMailMergeOpen::~KWQtSqlMailMergeOpen(){;} diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp index a30340ad5..afc464ed1 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp @@ -180,10 +180,10 @@ KWQtSqlPowerMailMergeEditor::KWQtSqlPowerMailMergeEditor( TQWidget *parent, KWQt { (new TQVBoxLayout(plainPage()))->setAutoAdd(true); setMainWidget(widget=new KWQtSqlPowerWidget(plainPage())); - connect(widget->setup,TQT_SIGNAL(clicked()),this,TQT_SLOT(openSetup())); - connect(widget->tables,TQT_SIGNAL(currentChanged(TQListBoxItem*)),this,TQT_SLOT(slotTableChanged(TQListBoxItem*))); - connect(widget->execute,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotExecute())); - connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotSetQuery())); + connect(widget->setup,TQ_SIGNAL(clicked()),this,TQ_SLOT(openSetup())); + connect(widget->tables,TQ_SIGNAL(currentChanged(TQListBoxItem*)),this,TQ_SLOT(slotTableChanged(TQListBoxItem*))); + connect(widget->execute,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotExecute())); + connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotSetQuery())); widget->query->setText(db->query); updateDBViews(); } diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 04bd18308..5549128f4 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -169,11 +169,11 @@ KWQtSqlDataSourceEditor::KWQtSqlDataSourceEditor( TQWidget *parent, KWQtSqlSeria filter=db->filter; (new TQVBoxLayout(plainPage()))->setAutoAdd(true); setMainWidget(widget=new QtSqlDataSourceEditor(plainPage())); - connect(widget->tableCombo,TQT_SIGNAL(activated(int)),this,TQT_SLOT(tableChanged(int))); - connect(widget->editFilter,TQT_SIGNAL(clicked()),this,TQT_SLOT(editFilter())); + connect(widget->tableCombo,TQ_SIGNAL(activated(int)),this,TQ_SLOT(tableChanged(int))); + connect(widget->editFilter,TQ_SIGNAL(clicked()),this,TQ_SLOT(editFilter())); updateTableCombo(); -// connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotSetQuery())); +// connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotSetQuery())); } void KWQtSqlDataSourceEditor::tableChanged(int item) diff --git a/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp index 440e208ab..bb183a74a 100644 --- a/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp +++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp @@ -267,19 +267,19 @@ void KWMailMergeTDEABCConfig::initSelectedLists() void KWMailMergeTDEABCConfig::initSlotSignalConnections() { - connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( acceptSelection() ) ); - connect( _ui->mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addSelectedContacts() ) ); - connect( _ui->mAddressBook, TQT_SIGNAL( clicked() ), TQT_SLOT( launchAddressbook() ) ); - - connect( _ui->mAvailableView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( addSelectedContacts() ) ); - - connect( _ui->mFilterEdit, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( filterChanged(const TQString &) ) ); - connect( _ui->mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSelectedContacts() ) ); - connect( _ui->mSaveList, TQT_SIGNAL( clicked() ), TQT_SLOT( saveDistributionList() ) ); - connect( _ui->mSelectedView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( removeSelectedContacts() ) ); + connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( acceptSelection() ) ); + connect( _ui->mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addSelectedContacts() ) ); + connect( _ui->mAddressBook, TQ_SIGNAL( clicked() ), TQ_SLOT( launchAddressbook() ) ); + + connect( _ui->mAvailableView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT( addSelectedContacts() ) ); + + connect( _ui->mFilterEdit, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( filterChanged(const TQString &) ) ); + connect( _ui->mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSelectedContacts() ) ); + connect( _ui->mSaveList, TQ_SIGNAL( clicked() ), TQ_SLOT( saveDistributionList() ) ); + connect( _ui->mSelectedView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT( removeSelectedContacts() ) ); } |