diff options
Diffstat (limited to 'kword')
45 files changed, 220 insertions, 220 deletions
diff --git a/kword/KWAnchor.cpp b/kword/KWAnchor.cpp index 11136e3d..6e99f0c9 100644 --- a/kword/KWAnchor.cpp +++ b/kword/KWAnchor.cpp @@ -234,7 +234,7 @@ void KWAnchor::resize() if ( parag ) { kdDebug(32001) << "KWAnchor::resize invalidating parag " << parag->paragId() << endl; - parag->tqinvalidate( 0 ); + parag->invalidate( 0 ); } } } diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 00fe2a85..58baa44b 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -201,7 +201,7 @@ void KWCanvas::repaintChanged( KWFrameSet * fs, bool resetChanged ) void KWCanvas::repaintAll( bool erase /* = false */ ) { //kdDebug(32002) << "KWCanvas::repaintAll erase=" << erase << endl; - viewport()->tqrepaint( erase ); + viewport()->repaint( erase ); } void KWCanvas::viewportResizeEvent( TQResizeEvent * ) @@ -2231,7 +2231,7 @@ void FrameResizePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint sizeRect.setX( TQMAX(0, sizeRect.x()) ); // otherwise it would get wider than the page } - // each frame in m_frames should be retqshaped from the original size stored in the + // each frame in m_frames should be reshaped from the original size stored in the // m_frameResize data to a size that equals the reshaping of m_boundingrect to sizeRect class Converter { public: diff --git a/kword/KWCanvas.h b/kword/KWCanvas.h index 955ea605..c2020697 100644 --- a/kword/KWCanvas.h +++ b/kword/KWCanvas.h @@ -76,13 +76,13 @@ public: void repaintAll( bool erase = false ); /** - * Only tqrepaint the frameset @p fs. + * Only repaint the frameset @p fs. * @p resetChanged should only be true for the last view * (see KWFrameSet::drawContents) */ void repaintChanged( KWFrameSet * fs, bool resetChanged ); - /** We need to tqrepaint if the window is resized. */ + /** We need to repaint if the window is resized. */ void viewportResizeEvent( TQResizeEvent * ); void print( TQPainter *painter, KPrinter *printer ); diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp index 47fda3e6..8c1d0e69 100644 --- a/kword/KWCommand.cpp +++ b/kword/KWCommand.cpp @@ -179,7 +179,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) parag->setFormat( 0, len, parag->paragFormat(), TRUE ); parag->loadFormatting( paragElem, 0, (textFs->isMainFrameset()) ); } - parag->tqinvalidate(0); // the formatting will be done by caller (either KWTextFrameSet::pasteOasis or KoTextObject::undo/redo) + parag->invalidate(0); // the formatting will be done by caller (either KWTextFrameSet::pasteOasis or KoTextObject::undo/redo) parag->setChanged( TRUE ); parag = static_cast<KWTextParag *>(parag->next()); //kdDebug() << "KWPasteTextCommand::execute going to next parag: " << parag << endl; @@ -1746,7 +1746,7 @@ KWInsertRemovePageCommand::~KWInsertRemovePageCommand() { TQString KWInsertRemovePageCommand::name() const { return m_cmd == Insert ? i18n("Insert Page") // problem with after/before page - : i18n("Delete Page %1").tqarg(m_pgNum); + : i18n("Delete Page %1").arg(m_pgNum); } void KWInsertRemovePageCommand::execute() { @@ -1977,7 +1977,7 @@ void KWChangeFootNoteParametersCommand::changeVariableParameter( FootNoteParamet if ( m_var->numberingType()== KWFootNoteVariable::Manual) { m_var->resize(); - m_var->paragraph()->tqinvalidate(0); + m_var->paragraph()->invalidate(0); m_var->paragraph()->setChanged( true ); } diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index d0a45a01..b368af2e 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -803,7 +803,7 @@ ConfigureDefaultDocPage::ConfigureDefaultDocPage( KWView *view, TQVBox *box, cha labelStartingPage->setBuddy( m_variableNumberOffset ); TQHBox* hbTabStop = new TQHBox( gbDocumentSettings ); - tabStop = new TQLabel(i18n("Tab stop (%1):").tqarg(doc->unitName()), hbTabStop); + tabStop = new TQLabel(i18n("Tab stop (%1):").arg(doc->unitName()), hbTabStop); m_tabStopWidth = new KoUnitDoubleSpinBox( hbTabStop, MM_TO_POINT(2), doc->pageManager()->page(doc->startPage())->width(), diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp index f710e12d..2577e0f5 100644 --- a/kword/KWDeleteDia.cpp +++ b/kword/KWDeleteDia.cpp @@ -58,7 +58,7 @@ void KWDeleteDia::setupTab1() { message = m_type == deleteRow ? i18n("Delete all selected rows?") : i18n("Delete all selected cells?"); else if ( count == 1 ) { message = m_type == deleteRow ? i18n( "Delete row number %1?" ) : i18n( "Delete column number %1?" ); - message = message.tqarg( m_toRemove.first() + 1 ); // +1 because humans count from 1 + message = message.arg( m_toRemove.first() + 1 ); // +1 because humans count from 1 } else { message = m_type == deleteRow ? i18n( "Delete rows: %1 ?" ) : i18n( "Delete columns: %1 ?" ); @@ -70,7 +70,7 @@ void KWDeleteDia::setupTab1() { rows += ", "; rows += TQString().setNum((*items) +1); } - message = message.tqarg( rows ); + message = message.arg( rows ); } TQLabel *rc = new TQLabel( message , tab1 ); diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp index 5fe52cf6..26d99146 100644 --- a/kword/KWDocStruct.cpp +++ b/kword/KWDocStruct.cpp @@ -385,12 +385,12 @@ void KWDocStructTextFrameSetItem::setupTextFrames() if ( KListViewItem::parent()->firstChild() == this && dok->processingType() == KWDocument::WP ) { if ( dok->numColumns() == 1 ) - name=i18n( "Page %1" ).tqarg(TQString::number(j + 1)); + name=i18n( "Page %1" ).arg(TQString::number(j + 1)); else - name=i18n( "Column %1" ).tqarg(TQString::number(j + 1)); + name=i18n( "Column %1" ).arg(TQString::number(j + 1)); } else - name=i18n( "Text Frame %1" ).tqarg(TQString::number(j + 1)); + name=i18n( "Text Frame %1" ).arg(TQString::number(j + 1)); KWDocStructTextFrameItem* child = findTextFrameItem(frame); if (child) child->setText(0, name); @@ -899,7 +899,7 @@ void KWDocStructRootItem::setupFormulaFrames() if ( frameset->type() == FT_FORMULA && frameset->frameCount()>0 ) { - _name=i18n("Formula Frame %1").tqarg(TQString::number(i+1)); + _name=i18n("Formula Frame %1").arg(TQString::number(i+1)); child = new KWDocStructFormulaItem(this, _name, dynamic_cast<KWFormulaFrameSet*>( frameset )); } } @@ -977,7 +977,7 @@ void KWDocStructRootItem::setupPictures() frameset = dok->frameSet( i ); if ( frameset->type() == FT_PICTURE && frameset->frameCount()>0) { - _name=i18n("Picture (%1) %2").tqarg(dynamic_cast<KWPictureFrameSet*>( frameset )->key().filename()).tqarg(++j); + _name=i18n("Picture (%1) %2").arg(dynamic_cast<KWPictureFrameSet*>( frameset )->key().filename()).arg(++j); child = new KWDocStructPictureItem(this, _name, dynamic_cast<KWPictureFrameSet*>( frameset )); } } diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 5a60f326..271359ba 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -643,7 +643,7 @@ void KWDocument::setPageLayout( const KoPageLayout& tqlayout, const KoColumns& c if ( updateViews ) { - // Invalidate document tqlayout, for proper tqrepaint + // Invalidate document tqlayout, for proper repaint this->tqlayout(); emit pageLayoutChanged( m_pageLayout ); updateContentsSize(); @@ -996,7 +996,7 @@ void KWDocument::recalcFrames( int fromPage, int toPage /*-1 for all*/, uint fla bool KWDocument::loadChildren( KoStore *store ) { //kdDebug(32001) << "KWDocument::loadChildren" << endl; - TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( children() ); for( ; it.current(); ++it ) { if ( !it.current()->loadDocument( store ) ) return FALSE; @@ -1060,7 +1060,7 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles if ( localName.isEmpty() ) setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) ); else - setErrorMessage( i18n( "This is not a word processing document, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) ); + setErrorMessage( i18n( "This is not a word processing document, but %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) ); return false; } @@ -1141,7 +1141,7 @@ bool KWDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles styleStack.setTypeProperties( "page-tqlayout" ); frame->loadBorderProperties( styleStack ); } - fs->renumberFootNotes( false /*no tqrepaint*/ ); + fs->renumberFootNotes( false /*no repaint*/ ); } else { // DTP mode: the items in the body are page-sequence and then frames @@ -1309,7 +1309,7 @@ bool KWDocument::loadMasterPageStyle( const TQString& masterPageName, KoOasisCon if ( properties.hasAttributeNS( "http://www.w3.org/1999/XSL/Format", "page-width" ) ) setErrorMessage( i18n( "Invalid document. 'fo' has the wrong namespace. The application which produced this document is not OASIS-compliant." ) ); else - setErrorMessage( i18n( "Invalid document. Paper size: %1x%2" ).tqarg( m_pageLayout.ptWidth ).tqarg( m_pageLayout.ptHeight ) ); + setErrorMessage( i18n( "Invalid document. Paper size: %1x%2" ).arg( m_pageLayout.ptWidth ).arg( m_pageLayout.ptHeight ) ); return false; } @@ -1484,7 +1484,7 @@ bool KWDocument::loadXML( TQIODevice *, const TQDomDocument & doc ) else if ( value != "application/x-kword" && value != "application/vnd.kde.kword" ) { kdError(32001) << "Unknown mime type " << value << endl; - setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kword or application/vnd.kde.kword, got %1" ).tqarg( value ) ); + setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kword or application/vnd.kde.kword, got %1" ).arg( value ) ); return false; } m_syntaxVersion = KWDocument::getAttribute( word, "syntaxVersion", 0 ); @@ -1492,7 +1492,7 @@ bool KWDocument::loadXML( TQIODevice *, const TQDomDocument & doc ) { int ret = KMessageBox::warningContinueCancel( 0, i18n("This document was created with a newer version of KWord (syntax version: %1)\n" - "Opening it in this version of KWord will lose some information.").tqarg(m_syntaxVersion), + "Opening it in this version of KWord will lose some information.").arg(m_syntaxVersion), i18n("File Format Mismatch"), KStdGuiItem::cont() ); if ( ret == KMessageBox::Cancel ) { @@ -1535,7 +1535,7 @@ bool KWDocument::loadXML( TQIODevice *, const TQDomDocument & doc ) if ( pgLayout.ptWidth <= 0 || pgLayout.ptHeight <= 0 ) { setErrorMessage( i18n( "Invalid document. Paper size: %1x%2" ) - .tqarg( pgLayout.ptWidth ).tqarg( pgLayout.ptHeight ) ); + .arg( pgLayout.ptWidth ).arg( pgLayout.ptHeight ) ); return false; } } @@ -1928,7 +1928,7 @@ void KWDocument::endOfLoading() // called by both oasis and oldxml // Renumber footnotes KWTextFrameSet *frameset = dynamic_cast<KWTextFrameSet *>( m_lstFrameSet.getFirst() ); if ( frameset ) - frameset->renumberFootNotes( false /*no tqrepaint*/ ); + frameset->renumberFootNotes( false /*no repaint*/ ); emit sigProgress(-1); @@ -2499,7 +2499,7 @@ void KWDocument::processAnchorRequests() KWFrameSet * fs = frameSetByName( fsname ); Q_ASSERT( fs ); if ( fs ) - fs->setAnchored( itanch.data().textfs, itanch.data().paragId, itanch.data().index, true, false /*don't tqrepaint yet*/ ); + fs->setAnchored( itanch.data().textfs, itanch.data().paragId, itanch.data().index, true, false /*don't repaint yet*/ ); } m_anchorRequests.clear(); } @@ -2533,7 +2533,7 @@ bool KWDocument::processFootNoteRequests() if ( ret ) { KWFrameSet *frameset = m_lstFrameSet.getFirst(); if ( frameset && frameset->type() == FT_TEXT ) - static_cast<KWTextFrameSet *>(frameset)->renumberFootNotes( false /*no tqrepaint*/ ); + static_cast<KWTextFrameSet *>(frameset)->renumberFootNotes( false /*no repaint*/ ); } return ret; } @@ -2545,13 +2545,13 @@ TQString KWDocument::uniqueFramesetName( const TQString& oldName ) { // make up a new name for the frameset, use Copy[digits]-[oldname] as template. // Fully translatable naturally :) - TQString searchString( "^(" + i18n("Copy%1-%2").tqarg("\\d*").tqarg("){0,1}") ); + TQString searchString( "^(" + i18n("Copy%1-%2").arg("\\d*").arg("){0,1}") ); searchString = searchString.replace(TQRegExp("\\-"), "\\-"); // escape the '-' TQRegExp searcher(searchString); int count=0; do { newName=oldName; - newName.replace(searcher,i18n("Copy%1-%2").tqarg(count > 0? TQString("%1").tqarg(count):"").tqarg("")); + newName.replace(searcher,i18n("Copy%1-%2").arg(count > 0? TQString("%1").arg(count):"").arg("")); count++; } while ( frameSetByName( newName ) ); } @@ -2762,7 +2762,7 @@ void KWDocument::insertEmbedded( KoStore *store, TQDomElement topElem, KMacroCom kdDebug() << "KWDocument::insertEmbedded loading embedded object" << endl; part->load( settings ); if ( offset != 0 ) { - TQRect r = ch->tqgeometry(); + TQRect r = ch->geometry(); r.moveBy( (int)offset, (int)offset ); ch->setGeometry( r ); } @@ -3601,7 +3601,7 @@ TQDomDocument KWDocument::saveXML() } // Save embedded objects - saveEmbeddedObjects( kwdoc, tqchildren() ); + saveEmbeddedObjects( kwdoc, children() ); return doc; } @@ -3811,7 +3811,7 @@ TQPixmap KWDocument::generatePreview( const TQSize& size ) double oldZoomY = zoomedResolutionY(); // Sometimes (due to the different resolution?) the tqlayout creates a new page - // while saving the preview. If this happens, we don't want to tqrepaint the real views + // while saving the preview. If this happens, we don't want to repaint the real views // (due to KWCanvas::slotNewContentsSize) // ##### One day when we have real doc/view separation in kotextparag, we shouldn't mess with // the real view's resolution, we should instead create a fake view for the preview itself. @@ -3887,7 +3887,7 @@ KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e KWCreateFrameCommand *cmd = new KWCreateFrameCommand( i18n("Create Part Frame"), frame); addCommand(cmd); - frameChanged( frame ); // tqrepaint etc. + frameChanged( frame ); // repaint etc. return frameset; } @@ -4210,7 +4210,7 @@ TQString KWDocument::generateFramesetName( const TQString & templateName ) int num = 1; bool exists; do { - name = templateName.tqarg( num ); + name = templateName.arg( num ); exists = frameSetByName( name ); ++num; } while ( exists ); @@ -4568,12 +4568,12 @@ void KWDocument::tqlayout() it.current()->tqlayout(); } -void KWDocument::tqinvalidate(const KWFrameSet *skipThisFrameSet) +void KWDocument::invalidate(const KWFrameSet *skipThisFrameSet) { TQPtrListIterator<KWFrameSet> it = framesetsIterator(); for (; it.current(); ++it ) if(it.current()!=skipThisFrameSet) - it.current()->tqinvalidate(); + it.current()->invalidate(); } KFormula::Document* KWDocument::formulaDocument( bool init ) @@ -4835,7 +4835,7 @@ void KWDocument::slotChapterParagraphFormatted( KoTextParag* /*parag*/ ) { // Attempt at invalidating from the parag's page only // But that's not good enough - if a header gets moved down, - // we also need to tqinvalidate the previous page, from where the paragraph disappeared. + // we also need to invalidate the previous page, from where the paragraph disappeared. /* KoPoint p; KWFrame* frame = internalToDocument( parag->rect().topLeft(), p ); @@ -5033,7 +5033,7 @@ void KWDocument::displayFootNoteFieldCode() KoTextParag * parag = it.current()->paragraph(); if ( parag ) { - parag->tqinvalidate( 0 ); + parag->invalidate( 0 ); parag->setChanged( true ); } } @@ -5058,7 +5058,7 @@ void KWDocument::changeFootNoteConfig() KoTextParag * parag = footNoteVar->paragraph(); if ( parag ) { - parag->tqinvalidate( 0 ); + parag->invalidate( 0 ); parag->setChanged( true ); } KoTextDocument* textdoc = parag->textDocument(); diff --git a/kword/KWDocument.h b/kword/KWDocument.h index fcda863f..26cfe37a 100644 --- a/kword/KWDocument.h +++ b/kword/KWDocument.h @@ -268,7 +268,7 @@ public: /** - * schedule a tqrepaint of all views but don't execute immediately + * schedule a repaint of all views but don't execute immediately */ void delayedRepaintAllViews(); @@ -796,8 +796,8 @@ public slots: void slotRepaintChanged( KWFrameSet * frameset ); void framesChanged( const TQValueList<KWFrame*> &frames); - /** calls tqinvalidate() on all framesets */ - void tqinvalidate(const KWFrameSet *skipThisFrameSet=0); + /** calls invalidate() on all framesets */ + void invalidate(const KWFrameSet *skipThisFrameSet=0); virtual void initEmpty(); diff --git a/kword/KWFindReplace.cpp b/kword/KWFindReplace.cpp index f1168ba3..6b9ce223 100644 --- a/kword/KWFindReplace.cpp +++ b/kword/KWFindReplace.cpp @@ -55,8 +55,8 @@ void KWFindReplace::emitNewCommand(KCommand *cmd) void KWFindReplace::highlightPortion(KoTextParag * parag, int index, int length, KoTextDocument *textdocument, KDialogBase* dialog) { KWTextDocument *textdoc=static_cast<KWTextDocument *>(textdocument); - bool tqrepaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true; - textdoc->textFrameSet()->highlightPortion( parag, index, length, m_canvas, tqrepaint, dialog ); + bool repaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true; + textdoc->textFrameSet()->highlightPortion( parag, index, length, m_canvas, repaint, dialog ); } #include "KWFindReplace.moc" diff --git a/kword/KWFrame.cpp b/kword/KWFrame.cpp index a559b892..e1cdb9d8 100644 --- a/kword/KWFrame.cpp +++ b/kword/KWFrame.cpp @@ -166,7 +166,7 @@ void KWFrame::copySettings(KWFrame *frm) void KWFrame::frameBordersChanged() { if (frameSet()->isFloating()) - frameSet()->anchorFrameset()->tqinvalidate(); + frameSet()->anchorFrameset()->invalidate(); } diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index ab0bea65..ba6f6276 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -102,7 +102,7 @@ KWFrameDia::KWFrameDia( TQWidget* parent, KWFrame *frame) kdDebug() << "ERROR: KWFrameDia::constructor no frame.."<<endl; return; } - setCaption( i18n( "Frame Properties for %1" ).tqarg( m_frame->frameSet()->name() ) ); + setCaption( i18n( "Frame Properties for %1" ).arg( m_frame->frameSet()->name() ) ); KWFrameSet *fs = m_frame->frameSet()->groupmanager(); if(fs==0L) fs=m_frame->frameSet(); m_frameType = fs->type(); @@ -149,7 +149,7 @@ KWFrameDia::KWFrameDia( TQWidget *parent, TQPtrList<KWFrame> listOfFrames) : KDi return; } if ( listOfFrames.count() == 1 ) - setCaption( i18n( "Frame Settings for %1" ).tqarg( f->frameSet()->name() ) ); + setCaption( i18n( "Frame Settings for %1" ).arg( f->frameSet()->name() ) ); KWFrameSet *fs = f->frameSet()->groupmanager(); if(fs==0L) fs=f->frameSet(); @@ -518,13 +518,13 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options m_grid1->addWidget(m_sideHeads, row, 0); m_sideGrid = new TQGridLayout( m_sideHeads, 4, 2, KDialog::marginHint(), KDialog::spacingHint() ); - sideTitle1 = new TQLabel ( i18n("Size (%1):").tqarg(m_doc->unitName()),m_sideHeads); + sideTitle1 = new TQLabel ( i18n("Size (%1):").arg(m_doc->unitName()),m_sideHeads); sideTitle1->resize(sideTitle1->sizeHint()); m_sideGrid->addWidget(sideTitle1,1,0); m_sideWidth= new TQLineEdit(m_sideHeads,""); m_sideWidth->setMaxLength(6); m_sideGrid->addWidget(m_sideWidth,1,1); - sideTitle2 = new TQLabel( i18n("Gap size (%1):").tqarg(m_doc->unitName()),m_sideHeads); + sideTitle2 = new TQLabel( i18n("Gap size (%1):").arg(m_doc->unitName()),m_sideHeads); sideTitle2->resize(sideTitle2->sizeHint()); m_sideGrid->addWidget(sideTitle2,2,0); m_sideGap = new TQLineEdit(m_sideHeads,""); @@ -853,7 +853,7 @@ void KWFrameDia::setupTab3(){ // TAB Frameset if ( fs->isDeleted() ) continue; TQListViewItem *item = new TQListViewItem( m_lFrameSList ); - item->setText( 0, TQString( "%1" ).tqarg( i + 1 ) ); + item->setText( 0, TQString( "%1" ).arg( i + 1 ) ); item->setText( 1, fs->name() ); amount++; if( m_frame && m_frame->frameSet() == fs ) { @@ -1627,7 +1627,7 @@ void KWFrameDia::updateBrushPreview() } else { brushPreview->show(); brushPreview->setBrush(frameBrushStyle()); - brushPreview->tqrepaint(true); + brushPreview->repaint(true); } } #endif @@ -1857,11 +1857,11 @@ bool KWFrameDia::applyChanges() i18n( "A new frameset with the name '%1' " "can not be made because a frameset with that name " "already exists. Please enter another name or select " - "an existing frameset from the list.").tqarg(name)); + "an existing frameset from the list.").arg(name)); else KMessageBox::sorry( this, i18n( "A frameset with the name '%1' " - "already exists. Please enter another name." ).tqarg(name) ); + "already exists. Please enter another name." ).arg(name) ); m_eFrameSetName->setText(m_oldFrameSetName); return false; } @@ -2374,7 +2374,7 @@ bool KWFrameDia::mayDeleteFrameSet(KWTextFrameSet *fs) { i18n( "You are about to reconnect the last frame of the " "frameset '%1'. " "The contents of this frameset will be deleted.\n" - "Are you sure you want to do that?").tqarg(fs->name()), + "Are you sure you want to do that?").arg(fs->name()), i18n("Reconnect Frame"), i18n("&Reconnect")); if (result != KMessageBox::Continue) return false; diff --git a/kword/KWFrameLayout.cpp b/kword/KWFrameLayout.cpp index 5a484198..685f81e6 100644 --- a/kword/KWFrameLayout.cpp +++ b/kword/KWFrameLayout.cpp @@ -492,10 +492,10 @@ void KWFrameLayout::tqlayout( KWFrameSet* mainTextFrameSet, int numColumns, KWTextFrameSet* fs = static_cast<KWTextFrameSet *>(mainTextFrameSet); // Not right now, this could be called during formatting... - //m_doc->tqinvalidate(); + //m_doc->invalidate(); // ### This means the tqlayout will be done during painting. Not good. - // What about mainTextFrameSet->tqinvalidate() or even tqlayout()? - //TQTimer::singleShot( 0, m_doc, TQT_SLOT( tqinvalidate() ) ); + // What about mainTextFrameSet->invalidate() or even tqlayout()? + //TQTimer::singleShot( 0, m_doc, TQT_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 d1129b1f..9a1d43ba 100644 --- a/kword/KWFrameSet.cpp +++ b/kword/KWFrameSet.cpp @@ -303,15 +303,15 @@ void KWFrameSet::setProtectSize( bool b) m_protectSize = b; } -void KWFrameSet::setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists /* = false */, bool tqrepaint ) +void KWFrameSet::setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists /* = false */, bool repaint ) { KWTextParag * parag = static_cast<KWTextParag *>( textfs->textDocument()->paragAt( paragId ) ); Q_ASSERT( parag ); if ( parag ) - setAnchored( textfs, parag, index, placeHolderExists, tqrepaint ); + setAnchored( textfs, parag, index, placeHolderExists, repaint ); } -void KWFrameSet::setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists /* = false */, bool tqrepaint ) +void KWFrameSet::setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists /* = false */, bool repaint ) { kdDebug(32001) << "KWFrameSet::setAnchored " << textfs << " " << parag->paragId() << " " << index << " " << placeHolderExists << endl; Q_ASSERT( textfs ); @@ -321,7 +321,7 @@ void KWFrameSet::setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int in m_anchorTextFs = textfs; KWFrameList::createFrameList(textfs, m_doc); // remove ourselves from others list now we are inline if ( parag ) - createAnchors( parag, index, placeHolderExists, tqrepaint ); + createAnchors( parag, index, placeHolderExists, repaint ); if ( !placeHolderExists ) // i.e. not while loading { @@ -381,7 +381,7 @@ KWAnchor * KWFrameSet::createAnchor( KoTextDocument *txt, int frameNum ) } void KWFrameSet::createAnchors( KoTextParag * parag, int index, bool placeHolderExists /*= false */ /*only used when loading*/, - bool tqrepaint ) + bool repaint ) { kdDebug(32001) << "KWFrameSet::createAnchors" << endl; Q_ASSERT( m_anchorTextFs ); @@ -398,7 +398,7 @@ void KWFrameSet::createAnchors( KoTextParag * parag, int index, bool placeHolder } } parag->setChanged( true ); - if ( tqrepaint ) + if ( repaint ) emit repaintChanged( m_anchorTextFs ); } @@ -460,7 +460,7 @@ void KWFrameSet::moveFloatingFrame( int frameNum, const KoPoint &position ) if( frame->frameStack() ) frame->frameStack()->updateAfterMove( oldPageNum ); } - tqinvalidate(); + invalidate(); } KoRect KWFrameSet::floatingFrameRect( int frameNum ) @@ -828,7 +828,7 @@ void KWFrameSet::drawFrame( KWFrame *frame, TQPainter *painter, const TQRect &fc kdDebug(32001) << " translating by " << translationOffset.x() << ", " << translationOffset.y() << " before drawFrameContents" << endl; #endif doubleBufPainter->translate( translationOffset.x(), translationOffset.y() ); // This assume that viewToNormal() is only a translation - // We can't "tqrepaint changed parags only" if we just drew the underlying frames, hence the "false" + // We can't "repaint changed parags only" if we just drew the underlying frames, hence the "false" drawFrameContents( frame, doubleBufPainter, fcrect, frameColorGroup, false, resetChanged, edit, viewMode ); doubleBufPainter->restore(); diff --git a/kword/KWFrameSet.h b/kword/KWFrameSet.h index 7218abe7..50294045 100644 --- a/kword/KWFrameSet.h +++ b/kword/KWFrameSet.h @@ -199,7 +199,7 @@ public: * The way this "onlyChanged/resetChanged" works is: when something changes, * all views are asked to redraw themselves with onlyChanged=true. * But all views except the last one shouldn't reset the changed flag to false, - * otherwise the other views wouldn't tqrepaint anything. + * otherwise the other views wouldn't repaint anything. * So resetChanged is called with "false" for all views except the last one, * and with "true" for the last one, so that it resets the flag. * @@ -312,7 +312,7 @@ public: /** retqlayout text in frames, so that it flows correctly around other frames */ virtual void tqlayout() {} - virtual void tqinvalidate() {} + virtual void invalidate() {} /// save to XML - when saving virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true ) = 0; @@ -359,11 +359,11 @@ public: * Make this frameset anchored, with the anchor at @p paragId,@p index in the text frameset @p textfs. * Also used during OASIS loading (placeHolderExists=true) */ - void setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists = false, bool tqrepaint = true ); + void setAnchored( KWTextFrameSet* textfs, KoTextParag* parag, int index, bool placeHolderExists = false, bool repaint = true ); /** Make this frameset floating, with the anchor at @p paragId,@p index in the text frameset @p textfs. * \deprecated */ - void setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists = false, bool tqrepaint = true ); + void setAnchored( KWTextFrameSet* textfs, int paragId, int index, bool placeHolderExists = false, bool repaint = true ); /** Note that this frameset has been made floating already, and store anchor position */ void setAnchored( KWTextFrameSet* textfs ); /// Make this frameset fixed, i.e. not anchored @@ -455,7 +455,7 @@ public: signals: /// Emitted when something has changed in this frameset, - /// so that all views tqrepaint it. KWDocument connects to it, + /// so that all views repaint it. KWDocument connects to it, /// and KWCanvas connects to KWDocument. void repaintChanged( KWFrameSet * frameset ); @@ -478,7 +478,7 @@ protected: void deleteAnchor( KWAnchor * anchor ); virtual void deleteAnchors(); - virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool tqrepaint = true ); + virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool repaint = true ); KWDocument *m_doc; // Document diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index 70930860..19ad2b00 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -90,7 +90,7 @@ void KWFrameStylePreview::setFrameStyle( KWFrameStyle *_frameStyle ) frameStyle = _frameStyle; - tqrepaint( true ); + repaint( true ); } /******************************************************************/ @@ -383,7 +383,7 @@ void KWFrameStyleManager::addStyle() { save(); - TQString str = i18n( "New Framestyle Template (%1)" ).tqarg(numFrameStyles++); + TQString str = i18n( "New Framestyle Template (%1)" ).arg(numFrameStyles++); if ( m_currentFrameStyle ) { m_currentFrameStyle = new KWFrameStyle( *m_currentFrameStyle ); // Create a new style, initializing from the current one @@ -598,7 +598,7 @@ void KWFrameStyleBackgroundTab::updateBrushConfiguration( const TQColor & _color m_backgroundColor.setColor( _color ); brushPreview->show(); brushPreview->setBrush( m_backgroundColor ); - brushPreview->tqrepaint(true); + brushPreview->repaint(true); } TQString KWFrameStyleBackgroundTab::tabName() diff --git a/kword/KWFrameStyleManager.h b/kword/KWFrameStyleManager.h index f261b2cd..32420f31 100644 --- a/kword/KWFrameStyleManager.h +++ b/kword/KWFrameStyleManager.h @@ -60,11 +60,11 @@ public: protected: void paintEvent( TQPaintEvent *e ); - void setTopBorder(KoBorder _bTop) { frameStyle->setTopBorder( _bTop ); tqrepaint( true ); } - void setBottomBorder(KoBorder _bBottom) { frameStyle->setBottomBorder( _bBottom ); tqrepaint( true ); } - void setRightBorder(KoBorder _bRight) { frameStyle->setRightBorder( _bRight ); tqrepaint( true ); } - void setLeftBorder(KoBorder _bLeft) { frameStyle->setLeftBorder( _bLeft ); tqrepaint( true ); } - void setBackground( const TQColor & col ) { frameStyle->setBackgroundColor( col ); tqrepaint( true ); } + void setTopBorder(KoBorder _bTop) { frameStyle->setTopBorder( _bTop ); repaint( true ); } + void setBottomBorder(KoBorder _bBottom) { frameStyle->setBottomBorder( _bBottom ); repaint( true ); } + void setRightBorder(KoBorder _bRight) { frameStyle->setRightBorder( _bRight ); repaint( true ); } + void setLeftBorder(KoBorder _bLeft) { frameStyle->setLeftBorder( _bLeft ); repaint( true ); } + void setBackground( const TQColor & col ) { frameStyle->setBackgroundColor( col ); repaint( true ); } KWFrameStyle *frameStyle; }; diff --git a/kword/KWFrameViewManager.cpp b/kword/KWFrameViewManager.cpp index c4349ae8..a0070584 100644 --- a/kword/KWFrameViewManager.cpp +++ b/kword/KWFrameViewManager.cpp @@ -283,14 +283,14 @@ TQCursor KWFrameViewManager::mouseCursor( const KoPoint &point, int keyState ) c } if(view == 0) - return TQCursor(); // default arrow tqshape + return TQCursor(); // default arrow shape KWFrameSet*frameSet = view->frame()->frameSet(); switch ( meaning ) { case MEANING_NONE: return TQt::ibeamCursor; // default cursor in margins case MEANING_MOUSE_INSIDE: - return TQCursor(); // default arrow tqshape + return TQCursor(); // default arrow shape case MEANING_MOUSE_INSIDE_TEXT: return TQt::ibeamCursor; case MEANING_MOUSE_OVER_LINK: @@ -327,7 +327,7 @@ TQCursor KWFrameViewManager::mouseCursor( const KoPoint &point, int keyState ) c case MEANING_FORBIDDEN: return KCursor::handCursor(); } - return TQCursor(); // default arrow tqshape + return TQCursor(); // default arrow shape } MouseMeaning KWFrameViewManager::mouseMeaning( const KoPoint &point, int keyState) const { diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp index 725c932e..1b2666df 100644 --- a/kword/KWImportStyleDia.cpp +++ b/kword/KWImportStyleDia.cpp @@ -196,7 +196,7 @@ TQString KWImportFrameTableStyleDia::generateStyleName( const TQString & templat int num = 1; bool exists; do { - name = templateName.tqarg( num ); + name = templateName.arg( num ); exists = (m_list.findIndex( name )!=-1); ++num; } while ( exists ); diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp index 4b5f3daa..1194b052 100644 --- a/kword/KWInsertPicDia.cpp +++ b/kword/KWInsertPicDia.cpp @@ -62,7 +62,7 @@ public: m_size = picture.getOriginalSize(); m_picture = picture; resizeContents( m_size.width(), m_size.height() ); - tqrepaint( false ); + repaint( false ); return true; } else diff --git a/kword/KWInsertTOCCommand.cpp b/kword/KWInsertTOCCommand.cpp index 6c9851fe..33cb2399 100644 --- a/kword/KWInsertTOCCommand.cpp +++ b/kword/KWInsertTOCCommand.cpp @@ -199,7 +199,7 @@ KoTextCursor * KWInsertTOCCommand::removeTOC( KWTextFrameSet *fs, KoTextCursor * } p = p->prev(); } - textdoc->tqinvalidate(); + textdoc->invalidate(); if(posOfToc) { posOfTable=new KoTextCursor( textdoc ); @@ -217,8 +217,8 @@ KoParagStyle * KWInsertTOCCommand::findOrCreateTOCStyle( KWTextFrameSet *fs, int TQString displayName; if ( depth >= 0 ) { // Don't add i18n to this one, those are internal names and must have no spaces. - name = TQString( "Contents_Head_%1" ).tqarg( depth+1 ); - displayName = i18n( "Contents Head %1" ).tqarg( depth+1 ); + name = TQString( "Contents_Head_%1" ).arg( depth+1 ); + displayName = i18n( "Contents Head %1" ).arg( depth+1 ); } else { name = "Contents_Title"; displayName = i18n( "Contents Title" ); @@ -238,7 +238,7 @@ KoParagStyle * KWInsertTOCCommand::findOrCreateTOCStyle( KWTextFrameSet *fs, int // (not the whole line anymore), so we need the 4 borders. style->paragLayout().leftBorder = KoBorder( TQt::black, KoBorder::SOLID, 1 ); style->paragLayout().rightBorder = KoBorder( TQt::black, KoBorder::SOLID, 1 ); - style->paragLayout().tqalignment = TQt::AlignHCenter; + style->paragLayout().alignment = TQt::AlignHCenter; } else { diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index ee4b919f..9ee21416 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -116,7 +116,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::openPluginFor(int type,int &version) { version=0; KWMailMergeDataSource *ret=0; - TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").tqarg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text)); + TQString constrain=TQString("'%1' in [X-KDE-Capabilities]").arg(((type==KWSLCreate)?KWSLCreate_text:KWSLOpen_text)); kdDebug()<<constrain<<endl; KTrader::OfferList pluginOffers=KTrader::self()->query(TQString::fromLatin1("KWord/MailMergePlugin"),constrain); @@ -162,7 +162,7 @@ KWMailMergeDataSource *KWMailMergeDataBase::loadPlugin(const TQString& name) KLibrary *lib = loader->library(TQFile::encodeName(libname)); if (lib) { // get the create_ function - TQString factory=TQString("create_%1").tqarg(name); + TQString factory=TQString("create_%1").arg(name); void *create = lib->symbol(TQFile::encodeName(factory)); if (create) diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp index fc257709..33203d0b 100644 --- a/kword/KWPartFrameSet.cpp +++ b/kword/KWPartFrameSet.cpp @@ -137,9 +137,9 @@ void KWPartFrameSet::slotChildChanged() KWFrame *frame = listFrame.current(); if ( frame ) { - frame->setRect( KoRect::fromTQRect( getChild()->tqgeometry() ) ); + frame->setRect( KoRect::fromTQRect( getChild()->geometry() ) ); - //kdDebug(32001) << "KWPartFrameSet::slotChildChanged child's tqgeometry " << getChild()->tqgeometry() + //kdDebug(32001) << "KWPartFrameSet::slotChildChanged child's geometry " << getChild()->geometry() // << " frame set to " << *frame << endl; m_doc->frameChanged( frame ); //there is just a frame @@ -237,7 +237,7 @@ void KWPartFrameSet::printDebug() kdDebug() << " Url : " << getChild()->document()->url().url()<<endl; else kdWarning() << "NO DOCUMENT" << endl; - kdDebug() << " Rectangle : " << getChild()->tqgeometry().x() << "," << getChild()->tqgeometry().y() << " " << getChild()->tqgeometry().width() << "x" << getChild()->tqgeometry().height() << endl; + kdDebug() << " Rectangle : " << getChild()->geometry().x() << "," << getChild()->geometry().y() << " " << getChild()->geometry().width() << "x" << getChild()->geometry().height() << endl; } else kdWarning() << "NO CHILD" << endl; } @@ -335,12 +335,12 @@ KWDocumentChild::~KWDocumentChild() { } -void KWDocumentChild::setDocument( KoDocument *doc, const TQRect &tqgeometry ) +void KWDocumentChild::setDocument( KoDocument *doc, const TQRect &geometry ) { // When hitTest returns true, we want to activate the part right away. // PartManager supports selecting parts, but not in a doc/view separated way. doc->setSelectable( false ); - KoDocumentChild::setDocument( doc, tqgeometry ); + KoDocumentChild::setDocument( doc, geometry ); } KoDocument* KWDocumentChild::hitTest( const TQPoint& p, const TQWMatrix& _matrix ) diff --git a/kword/KWPartFrameSet.h b/kword/KWPartFrameSet.h index 25609c1a..d486b298 100644 --- a/kword/KWPartFrameSet.h +++ b/kword/KWPartFrameSet.h @@ -53,7 +53,7 @@ public: void setChild( KWDocumentChild* child ); /** - * Update the tqgeometry of m_child based on the tqgeometry of the frame. + * Update the geometry of m_child based on the geometry of the frame. */ void updateChildGeometry(); @@ -157,7 +157,7 @@ public: KWDocument* parent()const { return m_pKWordDoc; } - virtual void setDocument( KoDocument *doc, const TQRect &tqgeometry ); + virtual void setDocument( KoDocument *doc, const TQRect &geometry ); void setPartFrameSet( KWPartFrameSet* fs ) { m_partFrameSet = fs; } KWPartFrameSet * partFrameSet() const { return m_partFrameSet; } diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp index e8cd0e92..cc1bdf0d 100644 --- a/kword/KWStatisticsDialog.cpp +++ b/kword/KWStatisticsDialog.cpp @@ -206,7 +206,7 @@ bool KWStatisticsDialog::calcStats( TQLabel **resultLabel, bool selection, bool TQString flesch = locale->formatNumber( f , 1 ); if( words < 200 ) { // a kind of warning if too few words: - flesch = i18n("approximately %1").tqarg( flesch ); + flesch = i18n("approximately %1").arg( flesch ); } resultLabel[6]->setText( flesch ); return true; @@ -295,7 +295,7 @@ void KWStatisticsDialog::addBox( TQFrame *page, TQLabel **resultLabel, bool calc grid->addRowSpacing( 0, fHeight ); //maximum size for result column (don't know how to do this better..) - TQString init = i18n("approximately %1").tqarg( "00000000" ); + TQString init = i18n("approximately %1").arg( "00000000" ); // insert labels TQLabel *label1 = new TQLabel( i18n( "Characters including spaces:" ), box ); diff --git a/kword/KWTableDia.h b/kword/KWTableDia.h index 09dff25a..bf0f835f 100644 --- a/kword/KWTableDia.h +++ b/kword/KWTableDia.h @@ -52,8 +52,8 @@ public: KWTablePreview( TQWidget *_parent, int _rows, int _cols ) : TQWidget( _parent ), rows( _rows ), cols( _cols ) {} - void setRows( int _rows ) { rows = _rows; tqrepaint( true ); } - void setCols( int _cols ) { cols = _cols; tqrepaint( true ); } + void setRows( int _rows ) { rows = _rows; repaint( true ); } + void setCols( int _cols ) { cols = _cols; repaint( true ); } protected: void paintEvent( TQPaintEvent *e ); diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp index f108573b..2c27dc04 100644 --- a/kword/KWTableFrameSet.cpp +++ b/kword/KWTableFrameSet.cpp @@ -143,7 +143,7 @@ KWAnchor * KWTableFrameSet::createAnchor( KoTextDocument *txt, int frameNum ) } void KWTableFrameSet::createAnchors( KoTextParag * parag, int index, bool placeHolderExists /*= false */ /*only used when loading*/, - bool tqrepaint ) + bool repaint ) { //kdDebug(32004) << "KWTableFrameSet::createAnchors" << endl; // TODO make one rect per page, and create one anchor per page @@ -154,7 +154,7 @@ void KWTableFrameSet::createAnchors( KoTextParag * parag, int index, bool placeH parag->setCustomItem( index, anchor, 0 ); kdDebug(32004) << "KWTableFrameSet::createAnchors setting anchor" << endl; parag->setChanged( true ); - if ( tqrepaint ) + if ( repaint ) emit repaintChanged( m_anchorTextFs ); } @@ -1454,7 +1454,7 @@ void KWTableFrameSet::validate() for(uint j = cells->firstColumn(); j < cells->columnAfter(); ++j) { if( cell(i,j) != cells.current() ) { - TQString str = TQString("| 0x%1 ").tqarg( (unsigned long)cells.current(), 0, 16 ); + TQString str = TQString("| 0x%1 ").arg( (unsigned long)cells.current(), 0, 16 ); kdDebug(32004) << " KWTableFrameSet::validate() failed " << endl; kdDebug(32004) << "at row: "<< i << " col: "<< j << " cell: "<< str << endl; kdDebug(32004) << cells->firstRow() << " " << cells->firstColumn() << " " << cells->rowSpan() @@ -2189,10 +2189,10 @@ void KWTableFrameSet::tqlayout() cells->tqlayout(); } -void KWTableFrameSet::tqinvalidate() +void KWTableFrameSet::invalidate() { for (TableIter cells(this) ; cells ; ++cells) - cells->tqinvalidate(); + cells->invalidate(); } void KWTableFrameSet::setVisible( bool v ) @@ -2291,9 +2291,9 @@ void KWTableFrameSet::printArrayDebug() { kdDebug(32004) << " | Row/Cell arrays" << endl; Q_ASSERT( m_rows == m_rowArray.size() ); for ( unsigned int row = 0; row < m_rows; ++row ) { - TQString str = TQString( " | Row %1: " ).tqarg( row ); + TQString str = TQString( " | Row %1: " ).arg( row ); for ( unsigned int col = 0; col < getColumns(); ++col ) - str += TQString("| 0x%1 ").tqarg( (unsigned long)(*m_rowArray[row])[col], 0, 16 ); + str += TQString("| 0x%1 ").arg( (unsigned long)(*m_rowArray[row])[col], 0, 16 ); kdDebug(32004) << str<< " |" << endl; } } @@ -2319,7 +2319,7 @@ KWTableFrameSet::Cell::Cell( KWTableFrameSet *table, unsigned int row, unsigned KWTextFrameSet( table->m_doc, // Generate frameset name from table_name+row+col i18n("Hello dear translator :), 1 is the table name, 2 and 3 are row and column", "%1 Cell %2,%3") - .tqarg( table->name() ).tqarg(row).tqarg(col) ) + .arg( table->name() ).arg(row).arg(col) ) { m_row = row; m_col = col; @@ -2829,7 +2829,7 @@ KWTableFrameSet::MarkedIterator::MarkedIterator(KWTableFrameSet *table) : if ( current() ) { // kdDebug() << "MarkedIterator: visit: " -// << TQString("| 0x%1 ").tqarg((unsigned long)current(), 0, 16) << endl; +// << TQString("| 0x%1 ").arg((unsigned long)current(), 0, 16) << endl; current()->setMark(); } } @@ -2844,7 +2844,7 @@ KWTableFrameSet::MarkedIterator::operator++() } if ( current() ) { // kdDebug() << "MarkedIterator: visit: " -// << TQString("| 0x%1 ").tqarg((unsigned long)current(), 0, 16) << endl; +// << TQString("| 0x%1 ").arg((unsigned long)current(), 0, 16) << endl; current()->setMark(); } return ret; diff --git a/kword/KWTableFrameSet.h b/kword/KWTableFrameSet.h index e379f3b6..f2a5803c 100644 --- a/kword/KWTableFrameSet.h +++ b/kword/KWTableFrameSet.h @@ -472,7 +472,7 @@ public: ulong & sentences, ulong & syllables,ulong & lines, bool selected ); virtual void finalize(); - virtual void tqinvalidate(); + virtual void invalidate(); virtual void tqlayout(); virtual void updateFrames( int flags = 0xff ); @@ -520,7 +520,7 @@ protected: /// \overload KWFrameSet::deleteAnchors virtual void deleteAnchors(); /// \overload KWFrameSet::createAnchors - virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool tqrepaint = true ); + virtual void createAnchors( KoTextParag * parag, int index, bool placeHolderExists = false, bool repaint = true ); private: void addCellToArray( Cell* cell ); diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index 0a939087..a08a6bc7 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -118,13 +118,13 @@ void KWTableStylePreview::drawContents( TQPainter *p ) { // For centering to work, and to even get word wrapping when the thing is too big :) m_textdoc->setWidth( widthLU ); - parag->tqinvalidate(0); + parag->invalidate(0); } parag->format(); TQRect textRect = parag->pixelRect( m_zoomHandler ); - // Center vertically, but not horizontally, to keep the parag tqalignment working, + // Center vertically, but not horizontally, to keep the parag alignment working, textRect.moveTopLeft( TQPoint( fr.x(), fr.y() + ( fr.height() - textRect.height() ) / 2 ) ); p->setClipRect( textRect.intersect( fr ) ); @@ -145,7 +145,7 @@ void KWTableStylePreview::setTableStyle( KWTableStyle *_tableStyle ) KoTextParag * parag = m_textdoc->firstParag(); parag->applyStyle( tableStyle->paragraphStyle() ); - tqrepaint(true); + repaint(true); } /******************************************************************/ @@ -412,7 +412,7 @@ void KWTableStyleManager::addStyle() save(); KWTableStyleCollection* collection = m_doc->tableStyleCollection(); - TQString str = i18n( "New Tablestyle Template (%1)" ).tqarg(numTableStyles++); + TQString str = i18n( "New Tablestyle Template (%1)" ).arg(numTableStyles++); if ( m_currentTableStyle ) { m_currentTableStyle = new KWTableStyle( *m_currentTableStyle ); diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index c36743df..e99083c4 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -190,7 +190,7 @@ void KWTableTemplatePreview::drawCell( TQPainter *p, const KWTableStyle *ts, con { // For centering to work, and to even get word wrapping when the thing is too big :) m_textdoc->setWidth( widthLU ); - parag->tqinvalidate(0); + parag->invalidate(0); } double x_add = ( (rb < ts->frameStyle()->rightBorder().width()) ? ts->frameStyle()->rightBorder().width() : rb ) +1; @@ -403,7 +403,7 @@ void KWTableTemplatePreview::setTableTemplate( KWTableTemplate *_tableTemplate ) setSpecialCells(_tableTemplate); - tqrepaint( true ); + repaint( true ); } void KWTableTemplatePreview::fillContents() @@ -447,7 +447,7 @@ void KWTableTemplatePreview::cbFirstRowChanged( bool enable ) if ( (!enable) && ( origTableTemplate->pTopRightCorner()==origTableTemplate->pFirstRow() ) ) tableTemplate->setTopRightCorner( tableTemplate->pBodyCell() ); if ( !m_disableRepaint ) - tqrepaint( true ); + repaint( true ); } void KWTableTemplatePreview::cbFirstColChanged( bool enable ) @@ -470,7 +470,7 @@ void KWTableTemplatePreview::cbFirstColChanged( bool enable ) tableTemplate->setBottomLeftCorner( tableTemplate->pBodyCell() ); if ( !m_disableRepaint ) - tqrepaint( true ); + repaint( true ); } void KWTableTemplatePreview::cbLastRowChanged( bool enable ) @@ -493,7 +493,7 @@ void KWTableTemplatePreview::cbLastRowChanged( bool enable ) tableTemplate->setBottomLeftCorner( tableTemplate->pBodyCell() ); if ( !m_disableRepaint ) - tqrepaint( true ); + repaint( true ); } void KWTableTemplatePreview::cbLastColChanged( bool enable ) @@ -516,7 +516,7 @@ void KWTableTemplatePreview::cbLastColChanged( bool enable ) tableTemplate->setBottomRightCorner( tableTemplate->pBodyCell() ); if ( !m_disableRepaint ) - tqrepaint( true ); + repaint( true ); } void KWTableTemplatePreview::cbBodyChanged( bool enable ) @@ -533,7 +533,7 @@ void KWTableTemplatePreview::cbBodyChanged( bool enable ) delete oldTemplate; if ( !m_disableRepaint ) - tqrepaint( true ); + repaint( true ); } @@ -648,7 +648,7 @@ void KWTableTemplateSelector::initPreview() preview->cbLastColChanged( cbLastCol->isChecked() ); preview->cbBodyChanged( cbBody->isChecked() ); preview->disableRepaint(false); - preview->tqrepaint(); + preview->repaint(); } int KWTableTemplateSelector::getFormatType() const diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index 7f7a78a3..54f9f97d 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -615,7 +615,7 @@ void KWTextFrameSet::drawFrameContents( KWFrame *theFrame, TQPainter *painter, c var->resize(); TQSize newSize( var->width, var->height ); if ( oldSize != newSize ) - var->paragraph()->tqinvalidate( 0 ); // size has changed -> need reformatting ! + var->paragraph()->invalidate( 0 ); // size has changed -> need reformatting ! var->paragraph()->setChanged( true ); } } @@ -826,16 +826,16 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor void KWTextFrameSet::tqlayout() { - tqinvalidate(); + invalidate(); // Get the thing going though, repainting doesn't call formatMore m_textobj->formatMore( 2 ); } -void KWTextFrameSet::tqinvalidate() +void KWTextFrameSet::invalidate() { - //kdDebug() << "KWTextFrameSet::tqinvalidate " << name() << endl; + //kdDebug() << "KWTextFrameSet::invalidate " << name() << endl; m_textobj->setLastFormattedParag( textDocument()->firstParag() ); - textDocument()->tqinvalidate(); // lazy tqlayout, real update follows upon next tqrepaint + textDocument()->invalidate(); // lazy tqlayout, real update follows upon next repaint } void KWTextFrameSet::slotRepaintChanged() @@ -2388,7 +2388,7 @@ bool KWTextFrameSet::createNewPageAndNewFrame( KoTextParag* lastFormatted, int / Q_ASSERT(frame(0) && frame(0)->frameStack()); frame(0)->frameStack()->update(); /// We don't want to start from the beginning every time ! - ////m_doc->tqinvalidate(); + ////m_doc->invalidate(); // Reformat the last paragraph. If it's over the two pages, it will need // the new page (e.g. for inline frames that need internalToDocument to work) @@ -2400,7 +2400,7 @@ bool KWTextFrameSet::createNewPageAndNewFrame( KoTextParag* lastFormatted, int / if ( lastFormatted ) { m_textobj->setLastFormattedParag( lastFormatted ); - lastFormatted->tqinvalidate( 0 ); + lastFormatted->invalidate( 0 ); //This was a way to format the rest from here (recursively), but it didn't help much ensureCursorVisible() //So instead I fixed formatMore to return formatMore(2) itself. //m_textobj->formatMore( 2 ); @@ -2487,9 +2487,9 @@ void KWTextFrameSet::frameResized( KWFrame *theFrame, bool invalidateLayout ) // Warning, can't call tqlayout() (frameChanged calls it) // from here, since it calls formatMore() ! if ( invalidateLayout ) - m_doc->tqinvalidate(this); + m_doc->invalidate(this); - // Can't tqrepaint directly, we might be in a paint event already + // Can't repaint directly, we might be in a paint event already m_doc->delayedRepaintAllViews(); } @@ -2819,13 +2819,13 @@ TQString KWTextFrameSet::toPlainText() const return m_textobj->textDocument()->plainText(); } -void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool tqrepaint, KDialogBase* dialog ) +void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool repaint, KDialogBase* dialog ) { Q_ASSERT( isVisible() ); Q_ASSERT( m_textobj->isVisible() ); - //kdDebug() << "highlighting in " << name() << " parag=" << parag->paragId() << " index=" << index << " tqrepaint=" << tqrepaint << endl; - m_textobj->highlightPortion( parag, index, length, tqrepaint ); - if ( tqrepaint ) { + //kdDebug() << "highlighting in " << name() << " parag=" << parag->paragId() << " index=" << index << " repaint=" << repaint << endl; + m_textobj->highlightPortion( parag, index, length, repaint ); + if ( repaint ) { // Position the cursor canvas->editTextFrameSet( this, parag, index ); // Ensure text is fully visible @@ -2843,9 +2843,9 @@ void KWTextFrameSet::highlightPortion( KoTextParag * parag, int index, int lengt } } -void KWTextFrameSet::removeHighlight( bool tqrepaint ) +void KWTextFrameSet::removeHighlight( bool repaint ) { - m_textobj->removeHighlight( tqrepaint ); + m_textobj->removeHighlight( repaint ); } void KWTextFrameSet::clearUndoRedoInfo() @@ -2920,7 +2920,7 @@ protected: } }; -void KWTextFrameSet::renumberFootNotes( bool tqrepaint ) +void KWTextFrameSet::renumberFootNotes( bool repaint ) { KWFootNoteVarList lst; TQPtrListIterator<KoTextCustomItem> cit( textDocument()->allCustomItems() ); @@ -2986,17 +2986,17 @@ void KWTextFrameSet::renumberFootNotes( bool tqrepaint ) if ( var->numberingType()== KWFootNoteVariable::Manual) var->frameSet()->setName( m_doc->generateFramesetName(fsName)); else - var->frameSet()->setName( fsName.tqarg( var->text() ) ); + var->frameSet()->setName( fsName.arg( var->text() ) ); var->frameSet()->setCounterText( var->text() ); } var->resize(); - var->paragraph()->tqinvalidate(0); + var->paragraph()->invalidate(0); var->paragraph()->setChanged( true ); needRepaint = true; } ++vit; } - if ( needRepaint && tqrepaint ) + if ( needRepaint && repaint ) m_doc->slotRepaintChanged( this ); } @@ -3048,7 +3048,7 @@ TQByteArray KWTextFrameSet::sortText(SortType type) const // This is used when loading (KWTextDocument::loadOasisFootnote) // and when inserting from the GUI (KWTextFrameSetEdit::insertFootNote), -// so don't add any 'tqrepaint' or 'recalc' code here +// so don't add any 'repaint' or 'recalc' code here KWFootNoteFrameSet * KWTextFrameSet::insertFootNote( NoteType noteType, KWFootNoteVariable::Numbering numType, const TQString &manualString ) { kdDebug() << "KWTextFrameSetEdit::insertFootNote " << endl; @@ -3984,9 +3984,9 @@ void KWTextFrameSetEdit::updateUI( bool updateFormat, bool force ) // Paragraph settings KWTextParag * parag = static_cast<KWTextParag *>(cursor()->parag()); - if ( m_paragLayout.tqalignment != parag->resolveAlignment() || force ) { - m_paragLayout.tqalignment = parag->resolveAlignment(); - m_canvas->gui()->getView()->showAlign( m_paragLayout.tqalignment ); + if ( m_paragLayout.alignment != parag->resolveAlignment() || force ) { + m_paragLayout.alignment = parag->resolveAlignment(); + m_canvas->gui()->getView()->showAlign( m_paragLayout.alignment ); } // Counter @@ -4034,8 +4034,8 @@ void KWTextFrameSetEdit::updateUI( bool updateFormat, bool force ) m_paragLayout.margins[TQStyleSheetItem::MarginRight] = parag->margin(TQStyleSheetItem::MarginRight); if ( m_rtl != parag->string()->isRightToLeft() && parag->counter() ) { - parag->counter()->tqinvalidate(); - parag->setChanged( true ); // tqrepaint + parag->counter()->invalidate(); + parag->setChanged( true ); // repaint } m_rtl = parag->string()->isRightToLeft(); m_canvas->gui()->getView()->showRulerIndent( m_paragLayout.margins[TQStyleSheetItem::MarginLeft], m_paragLayout.margins[TQStyleSheetItem::MarginFirstLine], m_paragLayout.margins[TQStyleSheetItem::MarginRight], m_rtl ); diff --git a/kword/KWTextFrameSet.h b/kword/KWTextFrameSet.h index ef83a3c8..7cc4efb5 100644 --- a/kword/KWTextFrameSet.h +++ b/kword/KWTextFrameSet.h @@ -215,8 +215,8 @@ public: void findPosition( const KoPoint &dPoint, KoTextParag * & parag, int & index ); /** Highlighting support (for search/replace, spellchecking etc.) */ - void highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool tqrepaint = true, KDialogBase* dialog = 0 ); - void removeHighlight( bool tqrepaint = true ); + void highlightPortion( KoTextParag * parag, int index, int length, KWCanvas * canvas, bool repaint = true, KDialogBase* dialog = 0 ); + void removeHighlight( bool repaint = true ); virtual void addTextFrameSets( TQPtrList<KWTextFrameSet> &lst, bool onlyReadWrite=false ); @@ -239,7 +239,7 @@ public: /** Invalidate all paragraphs and start re-formatting */ virtual void tqlayout(); /** Invalidate all paragraphs (causes a re-flow of the text upon next redraw) */ - virtual void tqinvalidate(); + virtual void invalidate(); virtual int paragraphs(); virtual int paragraphsSelected(); @@ -287,7 +287,7 @@ public: virtual KCommand *setChangeCaseOfTextCommand(KoChangeCaseDia::TypeOfCase _type); /** (Assuming this==main frameset), recalc the foot note numbers */ - void renumberFootNotes( bool tqrepaint = true ); + void renumberFootNotes( bool repaint = true ); /** * Iteration over text objects - used by KWBgSpellCheck diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp index d50e98a0..0b1aaa9b 100644 --- a/kword/KWTextParag.cpp +++ b/kword/KWTextParag.cpp @@ -109,9 +109,9 @@ void KWTextParag::drawFormattingChars( TQPainter &painter, int start, int len, void KWTextParag::setPageBreaking( int pb ) { m_layout.pageBreaking = pb; - tqinvalidate(0); + invalidate(0); if ( next() && ( pb & KoParagLayout::HardFrameBreakAfter ) ) - next()->tqinvalidate(0); + next()->invalidate(0); } KWTextDocument * KWTextParag::kwTextDocument() const @@ -385,7 +385,7 @@ void KWTextParag::save( TQDomElement &parentElem, int from /* default 0 */, TQDomElement layoutElem = doc.createElement( "LAYOUT" ); paragElem.appendChild( layoutElem ); - // save with the real tqalignment (left or right, not auto) + // save with the real alignment (left or right, not auto) m_layout.saveParagLayout( layoutElem, resolveAlignment() ); // Paragraph's format @@ -601,7 +601,7 @@ void KWTextParag::load( TQDomElement &attributes ) loadFormatting( attributes ); setChanged( true ); - tqinvalidate( 0 ); + invalidate( 0 ); } void KWTextParag::loadFormatting( TQDomElement &attributes, int offset, bool loadFootNote ) diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp index 5b82b220..304d5191 100644 --- a/kword/KWVariable.cpp +++ b/kword/KWVariable.cpp @@ -351,7 +351,7 @@ void KWFootNoteVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& contex writer.startElement( "text:note-citation" ); if ( m_numberingType == Auto ) - writer.addTextNode( TQString( "%1" ).tqarg( m_numDisplay ) ); + writer.addTextNode( TQString( "%1" ).arg( m_numDisplay ) ); else { writer.addAttribute( "text:label", m_varValue.toString() ); @@ -478,7 +478,7 @@ TQString KWFootNoteVariable::text(bool realValue) void KWFootNoteVariable::setNumDisplay( int val ) { m_numDisplay = val; - if ( val != -1 ) // -1 is used to 'tqinvalidate so that renumberFootNotes recalcs' + if ( val != -1 ) // -1 is used to 'invalidate so that renumberFootNotes recalcs' formatedNote(); } diff --git a/kword/KWView.cpp b/kword/KWView.cpp index d8d36c66..b39cac7f 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -404,7 +404,7 @@ 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 tqrepaint). + // (and e.g. the statusbar can repaint). TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetInitialPosition() ) ); TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateZoom() ) ); } @@ -1000,7 +1000,7 @@ void KWView::setupActions() // This approach allows to edit toolbars and extract separate actions from this menu KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ), - actionCollection(), TQString("counterstyle_%1").tqarg( styleIt.current()->style() ).latin1() ); + 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 if ( styleIt.current()->style() == KoParagCounter::STYLE_NONE ) { @@ -1491,7 +1491,7 @@ void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& f TQString text = i18n( e2.namedItem( "Text" ).toElement().text().utf8() ); KAction * act = new KAction( text, 0, TQT_TQOBJECT(this), TQT_SLOT( insertExpression() ), actionCollection(), - TQString("expression-action_%1").tqarg(i).latin1() ); + TQString("expression-action_%1").arg(i).latin1() ); if ( personalShortCut.contains(text) ) act->setShortcut( personalShortCut[text] ); i++; @@ -1542,7 +1542,7 @@ void KWView::addVariableActions( int type, const TQStringList & texts, KAction * act = new KAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ), actionCollection(), actionName ); // Mainly for KEditToolbar - act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).tqarg( *it ) ); + act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).arg( *it ) ); m_variableDefMap.insert( act, v ); parentMenu->insert( act ); } @@ -1583,7 +1583,7 @@ void KWView::refreshCustomMenu() if ( !lst.contains( varName) ) { lst.append( varName ); - TQCString name = TQString("custom-action_%1").tqarg(i).latin1(); + TQCString name = TQString("custom-action_%1").arg(i).latin1(); act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this), TQT_SLOT( insertCustomVariable() ),actionCollection(), name ); act->setGroup( "custom-variable-action" ); m_actionInsertCustom->insert( act ); @@ -1595,7 +1595,7 @@ void KWView::refreshCustomMenu() if(state) m_actionInsertCustom->popupMenu()->insertSeparator(); - act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").tqarg(i).latin1()); + act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),TQString("custom-action_%1").arg(i).latin1()); act->setGroup( "custom-variable-action" ); @@ -1653,15 +1653,15 @@ void KWView::updatePageInfo() TQString oldText = m_sbPageLabel->text(); TQString newText; if ( viewMode()->hasPages() ) - newText = ' ' + i18n( "Page %1 of %2" ).tqarg(m_currentPage->pageNumber()) - .tqarg(m_doc->pageCount()) + ' '; + newText = ' ' + i18n( "Page %1 of %2" ).arg(m_currentPage->pageNumber()) + .arg(m_doc->pageCount()) + ' '; if ( newText != oldText ) { m_sbPageLabel->setText( newText ); - // Need to tqrepaint immediately. Otherwise when deleting 100 pages + // Need to repaint immediately. Otherwise when deleting 100 pages // at once, there's no feedback. - m_sbPageLabel->tqrepaint(); + m_sbPageLabel->repaint(); } } slotUpdateRuler(); @@ -1688,16 +1688,16 @@ void KWView::updateFrameStatusBarItem() TQString unitName = m_doc->unitName(); KWFrame * frame = frameViewManager()->selectedFrames()[0]->frame(); m_sbFramesLabel->setText( ' ' + i18n( "Statusbar info", "%1: %2, %3 - %4, %5 (width: %6, height: %7)" ) - .tqarg( frame->frameSet()->name() ) - .tqarg( KoUnit::toUserStringValue( frame->left(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage( + .arg( frame->frameSet()->name() ) + .arg( KoUnit::toUserStringValue( frame->left(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->top() - m_doc->pageManager()->topOfPage( m_doc->pageManager()->pageNumber(frame->rect()) ), unit) ) - .tqarg( KoUnit::toUserStringValue( frame->right(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->bottom(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->width(), unit ) ) - .tqarg( KoUnit::toUserStringValue( frame->height(), unit ) ) ); + .arg( KoUnit::toUserStringValue( frame->right(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->bottom(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->width(), unit ) ) + .arg( KoUnit::toUserStringValue( frame->height(), unit ) ) ); } else - m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).tqarg( nbFrame ) ); + m_sbFramesLabel->setText( ' ' + i18n( "%1 frames selected" ).arg( nbFrame ) ); } else if ( sb && m_sbFramesLabel ) m_sbFramesLabel->setText( TQString() ); @@ -1789,7 +1789,7 @@ void KWView::print( KPrinter &prt ) m_doc->recalcVariables( VT_ALL ); } -// Don't tqrepaint behind the print dialog until we're done zooming/unzooming the doc +// Don't repaint behind the print dialog until we're done zooming/unzooming the doc m_gui->canvasWidget()->setUpdatesEnabled(false); m_gui->canvasWidget()->viewport()->setCursor( waitCursor ); @@ -2784,7 +2784,7 @@ void KWView::deleteFrame( bool warning ) "Frameset '%1'. " "The contents of this Frameset will not appear " "anymore!\n" - "Are you sure you want to do that?").tqarg(fs->name()), + "Are you sure you want to do that?").arg(fs->name()), i18n("Delete Frame"), KStdGuiItem::del()); if (result != KMessageBox::Continue) @@ -3074,22 +3074,22 @@ void KWView::changeZoomMenu( int zoom ) qHeapSort( list ); for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it) - lst.append( i18n("%1%").tqarg(*it) ); + lst.append( i18n("%1%").arg(*it) ); } else { - lst << i18n("%1%").tqarg("33"); - lst << i18n("%1%").tqarg("50"); - lst << i18n("%1%").tqarg("75"); - lst << i18n("%1%").tqarg("100"); - lst << i18n("%1%").tqarg("125"); - lst << i18n("%1%").tqarg("150"); - lst << i18n("%1%").tqarg("200"); - lst << i18n("%1%").tqarg("250"); - lst << i18n("%1%").tqarg("350"); - lst << i18n("%1%").tqarg("400"); - lst << i18n("%1%").tqarg("450"); - lst << i18n("%1%").tqarg("500"); + lst << i18n("%1%").arg("33"); + lst << i18n("%1%").arg("50"); + lst << i18n("%1%").arg("75"); + lst << i18n("%1%").arg("100"); + lst << i18n("%1%").arg("125"); + lst << i18n("%1%").arg("150"); + lst << i18n("%1%").arg("200"); + lst << i18n("%1%").arg("250"); + lst << i18n("%1%").arg("350"); + lst << i18n("%1%").arg("400"); + lst << i18n("%1%").arg("450"); + lst << i18n("%1%").arg("500"); } m_actionViewZoom->setItems( lst ); } @@ -3097,7 +3097,7 @@ void KWView::changeZoomMenu( int zoom ) void KWView::showZoom( int zoom ) { TQStringList list = m_actionViewZoom->items(); - TQString zoomStr( i18n("%1%").tqarg( zoom ) ); + TQString zoomStr( i18n("%1%").arg( zoom ) ); m_actionViewZoom->setCurrentItem( list.findIndex(zoomStr) ); } @@ -5947,7 +5947,7 @@ void KWView::frameSelectedChanged() if(paragLayout->counter) counter = *(paragLayout->counter); showCounter( counter ); - int align = paragLayout->tqalignment; + int align = paragLayout->alignment; if ( align == TQt::AlignAuto ) align = TQt::AlignLeft; // ## seems hard to detect RTL here showAlign( align ); @@ -6038,7 +6038,7 @@ TQWidget* KWView::canvas() const { // used to be ->viewport(), but this makes no sense. // active embedded objects must be positioned relative to the real view, - // to scroll around with it, instead of being tqchildren of the fixed viewport. + // to scroll around with it, instead of being children of the fixed viewport. return m_gui->canvasWidget(); } @@ -6144,7 +6144,7 @@ void KWView::savePicture() if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) ) { KMessageBox::sorry( this, i18n( - "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( KIO::NetAccess::lastErrorString() ), + "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ), i18n("Save Failed") ); } } @@ -6155,12 +6155,12 @@ void KWView::savePicture() } else KMessageBox::sorry( this, i18n( - "Error during saving. Could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ), + "Error during saving. Could not create temporary file: %1.").arg( strerror( tempFile.status() ) ), i18n("Save Picture") ); } } else - KMessageBox::sorry( this, i18n("URL %1 is invalid.").tqarg( url.prettyURL() ), i18n("Save Picture") ); + KMessageBox::sorry( this, i18n("URL %1 is invalid.").arg( url.prettyURL() ), i18n("Save Picture") ); } } } @@ -7167,7 +7167,7 @@ void KWView::updateRulerInProtectContentMode() hRuler->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS); else hRuler->changeFlags(0); - hRuler->tqrepaint(); + hRuler->repaint(); } } diff --git a/kword/demos/framestest.kwd b/kword/demos/framestest.kwd index f673d49c..c9e7fb03 100644 --- a/kword/demos/framestest.kwd +++ b/kword/demos/framestest.kwd @@ -262,7 +262,7 @@ </LAYOUT> </PARAGRAPH> <PARAGRAPH> - <TEXT>acbdefghijklmnopqrstuvwxyz. 1234567890. kofficyet sdfgsdfgsdfgsdfg(libty koffitcecore): KoMainWindow::setRootDocument this = [KoMainWindow pointer (0x813ff28) to widget kword-mainwindow#1, tqgeometry=894x723+0+0] doc = 0x8133470</TEXT> + <TEXT>acbdefghijklmnopqrstuvwxyz. 1234567890. kofficyet sdfgsdfgsdfgsdfg(libty koffitcecore): KoMainWindow::setRootDocument this = [KoMainWindow pointer (0x813ff28) to widget kword-mainwindow#1, geometry=894x723+0+0] doc = 0x8133470</TEXT> <LAYOUT> <NAME value="Standard" /> <FLOW align="left" /> diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp index 1af6b0ad..f54e529c 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.cpp +++ b/kword/mailmerge/KWClassicSerialDataSource.cpp @@ -107,7 +107,7 @@ void KWClassicSerialDataSource::removeRecord( int i ) if ( (i < 0) || (i > (int)db.count() - 1) ) return; - kdDebug()<<TQString("Removing record %1").tqarg(i)<<endl; + kdDebug()<<TQString("Removing record %1").arg(i)<<endl; Db::Iterator it = db.at( i); db.remove( it ); diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp index 7b8feb70..1886207c 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp @@ -168,7 +168,7 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const if( !uidAvailable ) { - return ( i18n ( "KAddressbook entry '%1' not available." ).tqarg( *_UIDIterator ) ); + return ( i18n ( "KAddressbook entry '%1' not available." ).arg( *_UIDIterator ) ); } @@ -350,16 +350,16 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const TQString lat; TQString longi; if( geo.latitude()<0 ) - lat = TQString( i18n("%1 South") ).tqarg( -geo.latitude() ); + lat = TQString( i18n("%1 South") ).arg( -geo.latitude() ); else - lat = TQString( i18n("%1 North") ).tqarg( geo.latitude() ); + lat = TQString( i18n("%1 North") ).arg( geo.latitude() ); if( geo.longitude()<0 ) // There is something going wrong, because "W" is replaced by "q ". // Needs fix. - longi = TQString( i18n("%1 West") ).tqarg( -geo.longitude() ); + longi = TQString( i18n("%1 West") ).arg( -geo.longitude() ); else - longi = TQString( i18n("%1 East") ).tqarg( geo.longitude() ); + longi = TQString( i18n("%1 East") ).arg( geo.longitude() ); return i18n( "Geographic coordinates", "%1, %2" ).arg ( lat, longi ); } diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp index d1c03809..24daac3f 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp @@ -376,7 +376,7 @@ void KWMailMergeKABCConfig::saveDistributionList() KMessageBox::information( 0, i18n( "<qt>Distribution list with the given name <b>%1</b> " "already exists. Please select a different name.</qt>" ) - .tqarg( listName ) ); + .arg( listName ) ); return; } KABC::DistributionList *distList = new KABC::DistributionList( &dlm, listName ); diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui index e9d389ad..46ced301 100644 --- a/kword/mailmerge/kabc/addresspicker.ui +++ b/kword/mailmerge/kabc/addresspicker.ui @@ -217,7 +217,7 @@ <property name="text"> <string>&Address Book</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> @@ -236,7 +236,7 @@ <property name="text"> <string>&Selected Addresses</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="buddy" stdset="0"> diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp index 1a477737..025e9a4e 100644 --- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp +++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp @@ -53,7 +53,7 @@ TQString KWMailMergeKSpread::getValue( const TQString &name, int record ) const if ( cell ) return cellText( cell ); else - return i18n( "Unkown mail merge variable: %1" ).tqarg( name ); + return i18n( "Unkown mail merge variable: %1" ).arg( name ); } void KWMailMergeKSpread::load( TQDomElement& parentElem ) diff --git a/kword/mailmerge/sql/KWMySqlCursor.h b/kword/mailmerge/sql/KWMySqlCursor.h index 4a25323b..8919cc9a 100644 --- a/kword/mailmerge/sql/KWMySqlCursor.h +++ b/kword/mailmerge/sql/KWMySqlCursor.h @@ -59,9 +59,9 @@ TQSqlCursor( TQString(), autopopulate ) TQSqlIndex() ) { return exec( lastQuery() ); } TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const { return TQSqlIndex(); } - int insert( bool /*tqinvalidate*/ = TRUE ) { return FALSE; } - int update( bool /*tqinvalidate*/ = TRUE ) { return FALSE; } - int del( bool /*tqinvalidate*/ = TRUE ) { return FALSE; } + int insert( bool /*invalidate*/ = TRUE ) { return FALSE; } + int update( bool /*invalidate*/ = TRUE ) { return FALSE; } + int del( bool /*invalidate*/ = TRUE ) { return FALSE; } void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {} }; diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp index d5e9b4ac..466ac182 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp @@ -68,7 +68,7 @@ void KWQtSqlPowerSerialDataSource::refresh(bool force) myquery=new KWMySqlCursor(query,true,database); myquery->setMode(TQSqlCursor::ReadOnly); } - kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl; + kdDebug()<<TQString("There were %1 rows in the query").arg(myquery->size())<<endl; } TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int record ) const @@ -79,7 +79,7 @@ TQString KWQtSqlPowerSerialDataSource::getValue( const TQString &name, int recor if ( num < 0 || num > (int)myquery->size() ) return name; if (!myquery->seek(num,false)) return i18n(">>>Illegal position within datasource<<<"); - if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name); + if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").arg(name); return (myquery->value(name)).toString(); } @@ -203,7 +203,7 @@ void KWQtSqlPowerMailMergeEditor::slotExecute() cur->setMode(TQSqlCursor::ReadOnly); db->clearSampleRecord(); - kdDebug()<<TQString("Fieldname count %1").tqarg(cur->count())<<endl; + kdDebug()<<TQString("Fieldname count %1").arg(cur->count())<<endl; for (uint i=0;i<cur->count();i++) db->addSampleRecordEntry(cur->fieldName(i)); diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 2181c172..14c3640e 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -59,7 +59,7 @@ TQString KWQtSqlSerialDataSource::getValue( const TQString &name, int record ) c if ( num < 0 || num > (int)myquery->size() ) return name; if (!myquery->seek(num,false)) return i18n(">>>Illegal position within datasource<<<"); - if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").tqarg(name); + if (!myquery->contains(name)) return i18n(">>>Field %1 is unknown in the current database query<<<").arg(name); return (myquery->value(name)).toString(); } @@ -146,7 +146,7 @@ void KWQtSqlSerialDataSource::refresh(bool force) myquery->setMode(TQSqlCursor::ReadOnly); myquery->select(filter); } - kdDebug()<<TQString("There were %1 rows in the query").tqarg(myquery->size())<<endl; + kdDebug()<<TQString("There were %1 rows in the query").arg(myquery->size())<<endl; } diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp index f31a431a..9a333a8d 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp @@ -49,7 +49,7 @@ int KWQtSqlSerialDataSourceBase::connectionId=0; KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent) : KWMailMergeDataSource(inst,parent) { - DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").tqarg(connectionId++); + DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").arg(connectionId++); port=i18n("default"); } |