diff options
Diffstat (limited to 'kword')
38 files changed, 169 insertions, 169 deletions
diff --git a/kword/DESIGN b/kword/DESIGN index d0a4e64d..a920c8db 100644 --- a/kword/DESIGN +++ b/kword/DESIGN @@ -16,7 +16,7 @@ text, and the frames define where on the pages this text is displayed. * About text framesets: they hold a text document (KWTextDocument, which is a QTextDocument from the KoText classes - more on KoText later). -* About Tables; one table is a KWTableFrameset. This tableframeset tqcontains +* About Tables; one table is a KWTableFrameset. This tableframeset contains all the cells as its frames. But because the cells have a different text per cell, we contain the cells in their own KWTextFrameset. diff --git a/kword/HACKING b/kword/HACKING index 0cf5be76..85363e4c 100644 --- a/kword/HACKING +++ b/kword/HACKING @@ -184,7 +184,7 @@ FILES: contents: contents.h/cc - table of contents search: - searchdia.h/cc - text find and tqreplace + searchdia.h/cc - text find and replace other features: bookmarks: diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 1551026c..04575514 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -398,7 +398,7 @@ void KWCanvas::mpCreatePixmap( const TQPoint& normalPoint, bool noGrid ) TQPoint vPoint = m_viewMode->normalToView( nPoint ); vPoint = contentsToViewport( vPoint ); TQRect viewportRect( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); - if ( viewportRect.tqcontains( vPoint ) ) // Don't move the mouse out of the viewport + if ( viewportRect.contains( vPoint ) ) // Don't move the mouse out of the viewport TQCursor::setPos( viewport()->mapToGlobal( vPoint ) ); } emit docStructChanged(Pictures); @@ -743,7 +743,7 @@ void KWCanvas::mmCreate( const TQPoint& normalPoint, bool noGrid ) // Mouse move // But not out of the page KoRect r = m_insRect.normalize(); - if ( !m_doc->pageManager()->page(page)->rect().tqcontains(r) ) + if ( !m_doc->pageManager()->page(page)->rect().contains(r) ) { // Even better would be to go to the limit of the page boundary, so that the result, // when moving the mouse of the page, doesn't depend on how fast we're moving it... @@ -865,7 +865,7 @@ void KWCanvas::contentsMouseMoveEvent( TQMouseEvent *e ) //show the link target in the status bar TQString link = frameset->linkVariableUnderMouse(docPoint)->url(); if ( link.startsWith("bkm://") ) - link.tqreplace( 0, 6, i18n("Bookmark target: ") ); + link.replace( 0, 6, i18n("Bookmark target: ") ); gui()->getView()->setTemporaryStatusBarText( link ); m_temporaryStatusBarTextShown = true; } @@ -1533,7 +1533,7 @@ void KWCanvas::contentsDropEvent( TQDropEvent *e ) if ( res && res->isValid() ) { TQString mimetype = res->name(); - if ( mimetype.tqcontains( "image" ) ) { + if ( mimetype.contains( "image" ) ) { KoPictureKey key; key.setKeyFromFile( filename ); KoPicture newKoPicture; @@ -2382,7 +2382,7 @@ void FrameMovePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint & KWFrameSet *fs = frame->frameSet(); if ( fs->type() == FT_TABLE ) { - if ( tablesMoved.tqfindRef( static_cast<KWTableFrameSet *> (fs) ) == -1 ) + if ( tablesMoved.findRef( static_cast<KWTableFrameSet *> (fs) ) == -1 ) tablesMoved.append( static_cast<KWTableFrameSet *> (fs)); } else { diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp index e68e1c99..47fda3e6 100644 --- a/kword/KWCommand.cpp +++ b/kword/KWCommand.cpp @@ -405,7 +405,7 @@ void KWFrameBorderCommand::execute() doc = frameSet->kWordDocument(); KWFrame *frame=frameSet->frame(tmp->m_iFrameIndex); KWTableFrameSet::Cell *cell = dynamic_cast<KWTableFrameSet::Cell *>(frame->frameSet()); - FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.tqfind(tmp)); + FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.find(tmp)); switch( tmpFrameStruct->m_EFrameType) { @@ -460,7 +460,7 @@ void KWFrameBorderCommand::unexecute() doc = frameSet->kWordDocument(); KWFrame *frame=frameSet->frame(tmp->m_iFrameIndex); KWTableFrameSet::Cell *cell = dynamic_cast<KWTableFrameSet::Cell *>(frame->frameSet()); - FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.tqfind(tmp)); + FrameBorderTypeStruct *tmpFrameStruct=m_oldBorderFrameType.at(m_indexFrame.find(tmp)); switch(tmpFrameStruct->m_EFrameType) { case KoBorder::LeftBorder: @@ -550,7 +550,7 @@ void KWFrameBackGroundColorCommand::unexecute() { doc = frameSet->kWordDocument(); KWFrame *frame=frameSet->frame(tmp->m_iFrameIndex); - TQBrush *tmpFrameStruct=m_oldBackGroundColor.at(m_indexFrame.tqfind(tmp)); + TQBrush *tmpFrameStruct=m_oldBackGroundColor.at(m_indexFrame.find(tmp)); frame->setBackgroundColor(*tmpFrameStruct); } } diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 7decd25d..a8a3f6c7 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -992,17 +992,17 @@ void ConfigurePathPage::slotModifyPath() void ConfigurePathPage::slotDefault() { - TQListViewItem * item = m_pPathView->tqfindItem(i18n("Personal Expression"), 0); + TQListViewItem * item = m_pPathView->findItem(i18n("Personal Expression"), 0); if ( item ) item->setText(1, KWFactory::instance()->dirs()->resourceDirs("expression").join(";")); - item = m_pPathView->tqfindItem(i18n("Backup Path"), 0); + item = m_pPathView->findItem(i18n("Backup Path"), 0); if ( item ) item->setText(1, TQString() ); } void ConfigurePathPage::apply() { - TQListViewItem * item = m_pPathView->tqfindItem(i18n("Personal Expression"), 0); + TQListViewItem * item = m_pPathView->findItem(i18n("Personal Expression"), 0); if ( item ) { TQStringList lst = TQStringList::split(TQString(";"), item->text(1)); @@ -1013,7 +1013,7 @@ void ConfigurePathPage::apply() config->writePathEntry( "expression path", lst); } } - item = m_pPathView->tqfindItem(i18n("Backup Path"), 0); + item = m_pPathView->findItem(i18n("Backup Path"), 0); if ( item ) { TQString res = item->text(1 ); diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp index 19089366..6c124b6a 100644 --- a/kword/KWCreateBookmarkDia.cpp +++ b/kword/KWCreateBookmarkDia.cpp @@ -60,7 +60,7 @@ void KWCreateBookmarkDia::init() void KWCreateBookmarkDia::slotOk() { - if ( listBookMark.tqfindIndex(m_bookmarkName->text() ) != -1 ) + if ( listBookMark.findIndex(m_bookmarkName->text() ) != -1 ) { KMessageBox::error(this, i18n("That name already exists, please choose another name.")); } diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp index 62925918..1aa56d5e 100644 --- a/kword/KWDocStruct.cpp +++ b/kword/KWDocStruct.cpp @@ -235,7 +235,7 @@ void KWDocStructTextFrameItem::setupTextParags() while (item) { delItem = item; item = dynamic_cast<KWDocStructParagItem *>(item->nextSibling()); - if (paragPtrs.tqcontainsRef(delItem->parag()) == 0) delete delItem; + if (paragPtrs.containsRef(delItem->parag()) == 0) delete delItem; } // Add new paragraphs to the list or update existing ones. @@ -372,7 +372,7 @@ void KWDocStructTextFrameSetItem::setupTextFrames() while (item) { delItem = item; item = dynamic_cast<KWDocStructTextFrameItem *>(item->nextSibling()); - if (framePtrs.tqcontainsRef(delItem->frame()) == 0) delete delItem; + if (framePtrs.containsRef(delItem->frame()) == 0) delete delItem; } // Add new frames to the list or update existing ones. @@ -494,7 +494,7 @@ void KWDocStructTableItem::setupCells() while (item) { delItem = item; item = dynamic_cast<KWDocStructTextFrameItem *>(item->nextSibling()); - if (cellPtrs.tqcontainsRef(delItem->frameSet()) == 0) delete delItem; + if (cellPtrs.containsRef(delItem->frameSet()) == 0) delete delItem; } // Add new cells to the list or update existing ones. @@ -803,18 +803,18 @@ void KWDocStructRootItem::setupArrangement() if ( _depth == 0 ) { if ( item->childCount() == 0 ) - parags.tqreplace( _depth, new KWDocStructParagItem( item,TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ),parag) ); + parags.replace( _depth, new KWDocStructParagItem( item,TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ),parag) ); else - parags.tqreplace( _depth, new KWDocStructParagItem( item, parags[ _depth ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ),parag) ); + parags.replace( _depth, new KWDocStructParagItem( item, parags[ _depth ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ),parag) ); } else { if (parags[ _depth - 1 ]==0) - parags.tqreplace( _depth, new KWDocStructParagItem( item,TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); + parags.replace( _depth, new KWDocStructParagItem( item,TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); else if ( parags[ _depth - 1 ]->childCount() == 0 ) - parags.tqreplace( _depth, new KWDocStructParagItem( parags[ _depth - 1 ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); + parags.replace( _depth, new KWDocStructParagItem( parags[ _depth - 1 ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); else - parags.tqreplace( _depth, new KWDocStructParagItem( parags[ _depth - 1 ], parags[ _depth ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); + parags.replace( _depth, new KWDocStructParagItem( parags[ _depth - 1 ], parags[ _depth ],TQString( tmpCounter->text(parag) + " " +parag->string()->toString().mid( 0, parag->string()->length() ) ), parag) ); } } parag = static_cast<KWTextParag *>(parag->next()); @@ -858,7 +858,7 @@ void KWDocStructRootItem::setupTextFrameSets() while (item) { delItem = item; item = dynamic_cast<KWDocStructTextFrameSetItem *>(item->nextSibling()); - if (frameSetPtrs.tqcontainsRef(delItem->frameSet()) == 0) delete delItem; + if (frameSetPtrs.containsRef(delItem->frameSet()) == 0) delete delItem; } // Add new framesets to the list or update existing ones. @@ -936,7 +936,7 @@ void KWDocStructRootItem::setupTables() while (item) { delItem = item; item = dynamic_cast<KWDocStructTableItem *>(item->nextSibling()); - if (frameSetPtrs.tqcontainsRef(delItem->table()) == 0) delete delItem; + if (frameSetPtrs.containsRef(delItem->table()) == 0) delete delItem; } // Add new framesets to the list or update existing ones. @@ -1104,7 +1104,7 @@ void KWDocStructTree::refreshTree(int type) if(((int)Embedded) & type) embedded->setupEmbedded(); if (!curItemText.isEmpty()) { - TQListViewItem* item = tqfindItem(curItemText, 0); + TQListViewItem* item = findItem(curItemText, 0); if (item) setCurrentItem(item); } } diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index 72fd0555..5942c28b 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -2493,7 +2493,7 @@ void KWDocument::processAnchorRequests() for ( ; itanch != m_anchorRequests.end(); ++itanch ) { TQString fsname = itanch.key(); - if ( m_pasteFramesetsMap && m_pasteFramesetsMap->tqcontains( fsname ) ) + if ( m_pasteFramesetsMap && m_pasteFramesetsMap->contains( fsname ) ) fsname = (*m_pasteFramesetsMap)[ fsname ]; kdDebug(32001) << "KWDocument::processAnchorRequests anchoring frameset " << fsname << endl; KWFrameSet * fs = frameSetByName( fsname ); @@ -2511,7 +2511,7 @@ bool KWDocument::processFootNoteRequests() for ( ; itvar != m_footnoteVarRequests.end(); ++itvar ) { TQString fsname = itvar.key(); - if ( m_pasteFramesetsMap && m_pasteFramesetsMap->tqcontains( fsname ) ) + if ( m_pasteFramesetsMap && m_pasteFramesetsMap->contains( fsname ) ) fsname = (*m_pasteFramesetsMap)[ fsname ]; //kdDebug(32001) << "KWDocument::processFootNoteRequests binding footnote var " << itvar.data() << " and frameset " << fsname << endl; KWFrameSet * fs = frameSetByName( fsname ); @@ -2546,12 +2546,12 @@ 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}") ); - searchString = searchString.tqreplace(TQRegExp("\\-"), "\\-"); // escape the '-' + searchString = searchString.replace(TQRegExp("\\-"), "\\-"); // escape the '-' TQRegExp searcher(searchString); int count=0; do { newName=oldName; - newName.tqreplace(searcher,i18n("Copy%1-%2").tqarg(count > 0? TQString("%1").tqarg(count):"").tqarg("")); + newName.replace(searcher,i18n("Copy%1-%2").tqarg(count > 0? TQString("%1").tqarg(count):"").tqarg("")); count++; } while ( frameSetByName( newName ) ); } @@ -2635,7 +2635,7 @@ void KWDocument::pasteFrames( TQDomElement topElem, KMacroCommand * macroCmd, bo if ( fs ) { - //if ( frameSetsToFinalize.tqfindRef( fs ) == -1 ) + //if ( frameSetsToFinalize.findRef( fs ) == -1 ) // frameSetsToFinalize.append( fs ); // Load the frame @@ -2867,7 +2867,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S << KWFrameSet::FI_FIRST_FOOTER << KWFrameSet::FI_ODD_FOOTER << KWFrameSet::FI_EVEN_FOOTER; for (uint i=0; i<order.count(); ++i) { KWFrameSet::Info info = order[i]; - if (tempmap.tqcontains(info)) { + if (tempmap.contains(info)) { const KWFrameSet* fs = tempmap[info]; // Save content @@ -2916,7 +2916,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S case FT_PICTURE: { const KoPictureKey key = static_cast<KWPictureFrameSet *>( *it )->key(); - if ( !pictureList.tqcontains( key ) ) + if ( !pictureList.contains( key ) ) pictureList.append( key ); } break; @@ -3087,7 +3087,7 @@ void KWDocument::saveSelectedFrames( KoXmlWriter& bodyWriter, KoSavingContext& s kdDebug(32001) << "found non-inline picture framesets" << endl; const KoPictureKey key = static_cast<KWPictureFrameSet *>( fs )->key(); - if ( !pictureList.tqcontains( key ) ) + if ( !pictureList.contains( key ) ) pictureList.append( key ); } if ( isTable ) // Copy tables only once, even if they have many cells selected @@ -3530,7 +3530,7 @@ TQDomDocument KWDocument::saveXML() if ( !frameSet->isDeleted() && ( frameSet->type() == FT_PICTURE ) ) { KoPictureKey key = static_cast<KWPictureFrameSet *>( frameSet )->key(); - if ( !savePictures.tqcontains( key ) ) + if ( !savePictures.contains( key ) ) savePictures.append( key ); } } @@ -3541,7 +3541,7 @@ TQDomDocument KWDocument::saveXML() { KoPictureKey key = textIt.current()->getKey(); kdDebug(32001) << "KWDocument::saveXML registering text image " << key.toString() << endl; - if ( !savePictures.tqcontains( key ) ) + if ( !savePictures.contains( key ) ) savePictures.append( key ); } @@ -3674,7 +3674,7 @@ TQValueList<KoPictureKey> KWDocument::savePictureList() { KoPictureKey key = textIt.current()->getKey(); kdDebug(32001) << "KWDocument::saveXML registering text image " << key.toString() << endl; - if ( !savePictures.tqcontains( key ) ) + if ( !savePictures.contains( key ) ) savePictures.append( key ); } m_textImageRequests.clear(); // Save some memory! @@ -3688,7 +3688,7 @@ TQValueList<KoPictureKey> KWDocument::savePictureList() if ( !frameSet->isDeleted() && ( frameSet->type() == FT_PICTURE ) ) { KoPictureKey key = static_cast<KWPictureFrameSet *>( frameSet )->key(); - if ( !savePictures.tqcontains( key ) ) + if ( !savePictures.contains( key ) ) savePictures.append( key ); } } @@ -4438,7 +4438,7 @@ void KWDocument::recalcVariables( int type ) TQMap<KoTextDocument *, bool> modifiedTextDocuments; // TQt4: TQSet for ( TQValueList<KoVariable *>::const_iterator it = modifiedVariables.begin(), end = modifiedVariables.end() ; it != end ; ++it ) { KoTextDocument* textdoc = (*it)->textDocument(); - if ( modifiedTextDocuments.tqfind( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !tqcontains + if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !contains { modifiedTextDocuments.insert( textdoc, true ); KWTextFrameSet * textfs = static_cast<KWTextDocument *>(textdoc)->textFrameSet(); @@ -4466,7 +4466,7 @@ void KWDocument::getPageLayout( KoPageLayout& tqlayout, KoColumns& cl, KoKWHeade void KWDocument::addFrameSet( KWFrameSet *f, bool finalize /*= true*/ ) { - if(m_lstFrameSet.tqcontains(f) > 0) { + if(m_lstFrameSet.contains(f) > 0) { kdWarning(32001) << "Frameset " << f << " " << f->name() << " already in list!" << endl; return; } @@ -4483,7 +4483,7 @@ void KWDocument::addFrameSet( KWFrameSet *f, bool finalize /*= true*/ ) void KWDocument::removeFrameSet( KWFrameSet *f ) { emit sig_terminateEditing( f ); - m_lstFrameSet.take( m_lstFrameSet.tqfind(f) ); + m_lstFrameSet.take( m_lstFrameSet.find(f) ); setModified( true ); emit sigFrameSetRemoved(f); } @@ -4957,7 +4957,7 @@ void KWDocument::setSpellCheckIgnoreList( const TQStringList& lst ) void KWDocument::addSpellCheckIgnoreWord( const TQString & word ) { // ### missing: undo/redo support - if( m_spellCheckIgnoreList.tqfindIndex( word ) == -1 ) + if( m_spellCheckIgnoreList.findIndex( word ) == -1 ) m_spellCheckIgnoreList.append( word ); setSpellCheckIgnoreList( m_spellCheckIgnoreList ); if ( backgroundSpellCheckEnabled() ) @@ -5005,7 +5005,7 @@ TQValueList<KoTextDocument *> KWDocument::allTextDocuments() const int KWDocument::numberOfTextFrameSet( KWFrameSet* fs, bool onlyReadWrite ) { TQPtrList<KWTextFrameSet> textFramesets = allTextFramesets( onlyReadWrite ); - return textFramesets.tqfindRef( static_cast<KWTextFrameSet*>(fs) ); + return textFramesets.findRef( static_cast<KWTextFrameSet*>(fs) ); } KWFrameSet * KWDocument::textFrameSetFromIndex( unsigned int num, bool onlyReadWrite ) @@ -5062,7 +5062,7 @@ void KWDocument::changeFootNoteConfig() parag->setChanged( true ); } KoTextDocument* textdoc = parag->textDocument(); - if ( modifiedTextDocuments.tqfind( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !tqcontains + if ( modifiedTextDocuments.find( textdoc ) != modifiedTextDocuments.end() ) // TQt4: !contains modifiedTextDocuments.insert( textdoc, true ); } } @@ -5382,7 +5382,7 @@ void KWDocument::addWordToDictionary( const TQString& word ) { if ( m_bgSpellCheck ) { - if( m_spellCheckPersonalDict.tqfindIndex( word ) == -1 ) + if( m_spellCheckPersonalDict.findIndex( word ) == -1 ) m_spellCheckPersonalDict.append( word ); m_bgSpellCheck->settings()->setCurrentIgnoreList( m_spellCheckIgnoreList + m_spellCheckPersonalDict ); if ( backgroundSpellCheckEnabled() ) @@ -5445,14 +5445,14 @@ KWDocument::FramesChangedHandler::FramesChangedHandler(KWDocument *tqparent) { void KWDocument::FramesChangedHandler::addFrame(KWFrame *frame) { if(frame == 0) return; - if(m_frameSets.tqcontains(frame->frameSet())) return; + if(m_frameSets.contains(frame->frameSet())) return; m_frameSets.append(frame->frameSet()); if( frame->runAround() != KWFrame::RA_NO ) m_needLayout = true; } void KWDocument::FramesChangedHandler::addFrameSet(KWFrameSet *fs) { - if(m_frameSets.tqcontains(fs)) return; + if(m_frameSets.contains(fs)) return; m_frameSets.append(fs); m_needLayout = true; } diff --git a/kword/KWDocument.h b/kword/KWDocument.h index cab789f8..983b3add 100644 --- a/kword/KWDocument.h +++ b/kword/KWDocument.h @@ -385,7 +385,7 @@ public: bool tryRemovingPages(); ProcessingType processingType()const { return m_processingType; } - int frameSetNum( KWFrameSet* fs ) { return m_lstFrameSet.tqfindRef( fs ); } + int frameSetNum( KWFrameSet* fs ) { return m_lstFrameSet.findRef( fs ); } void lowerMainFrames( int pageNum ); void lowerMainFrames( int pageNum, int lowestZOrder ); diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp index 59b79f97..3af07a3e 100644 --- a/kword/KWEditPersonnalExpression.cpp +++ b/kword/KWEditPersonnalExpression.cpp @@ -129,7 +129,7 @@ void KWEditPersonnalExpression::slotGroupSelected() m_groupLineEdit->blockSignals(true); m_delExpression->setEnabled(m_groupList->currentItem()!=-1); m_groupLineEdit->setText(m_groupList->currentText()); - list::Iterator it= listExpression.tqfind(m_groupList->currentText()); + list::Iterator it= listExpression.find(m_groupList->currentText()); TQStringList lst(it.data()); m_ExpressionsList->blockSignals(true); m_ExpressionsList->clear(); @@ -147,7 +147,7 @@ void KWEditPersonnalExpression::slotUpdateGroupName(const TQString &newGroupName return; m_addGroup->setEnabled( true ); - list::Iterator it= listExpression.tqfind(m_groupList->currentText()); + list::Iterator it= listExpression.find(m_groupList->currentText()); TQStringList lst(it.data()); listExpression.insert(newGroupName,lst); listExpression.remove(m_groupList->currentText()); @@ -162,12 +162,12 @@ void KWEditPersonnalExpression::slotUpdateExpression(const TQString &newExpressi if(newExpression.isEmpty() || m_groupList->currentItem()==-1 || m_ExpressionsList->currentText().isEmpty()) return; - list::Iterator it= listExpression.tqfind(m_groupList->currentText()); + list::Iterator it= listExpression.find(m_groupList->currentText()); TQStringList lst = it.data(); - TQStringList::Iterator it2=lst.tqfind(m_ExpressionsList->currentText()); + TQStringList::Iterator it2=lst.find(m_ExpressionsList->currentText()); lst.insert(it2,TQString(newExpression)); lst.remove(it2); - listExpression.tqreplace(m_groupList->currentText(),lst); + listExpression.replace(m_groupList->currentText(),lst); lst.remove(m_ExpressionsList->currentText()); m_ExpressionsList->blockSignals(true); @@ -246,13 +246,13 @@ void KWEditPersonnalExpression::slotOk() } void KWEditPersonnalExpression::slotAddExpression() { - list::Iterator it= listExpression.tqfind(m_groupList->currentText()); + list::Iterator it= listExpression.find(m_groupList->currentText()); TQStringList lst(it.data()); TQString newWord = i18n("empty"); - if ( lst.tqcontains( newWord )) + if ( lst.contains( newWord )) return; lst<< newWord; - listExpression.tqreplace(m_groupList->currentText(),lst); + listExpression.replace(m_groupList->currentText(),lst); m_ExpressionsList->blockSignals(true); m_ExpressionsList->insertItem(newWord); @@ -272,10 +272,10 @@ void KWEditPersonnalExpression::slotRemoveExpression() { TQString text=m_ExpressionsList->currentText (); if(!text.isEmpty()) { - list::Iterator it= listExpression.tqfind(m_groupList->currentText()); + list::Iterator it= listExpression.find(m_groupList->currentText()); TQStringList lst(it.data()); lst.remove(text); - listExpression.tqreplace(m_groupList->currentText(),lst); + listExpression.replace(m_groupList->currentText(),lst); m_ExpressionsList->blockSignals(true); m_ExpressionsList->clear(); diff --git a/kword/KWFindReplace.h b/kword/KWFindReplace.h index 270bc10b..c7bdf795 100644 --- a/kword/KWFindReplace.h +++ b/kword/KWFindReplace.h @@ -34,8 +34,8 @@ class KWTextFrameSet; class KMacroCommand; class KWTextFrameSetEdit; /** - * This class implements the 'tqfind' functionality ( the "search next, prompt" loop ) - * and the 'tqreplace' functionality. Same class, to allow centralizing the code that + * This class implements the 'find' functionality ( the "search next, prompt" loop ) + * and the 'replace' functionality. Same class, to allow centralizing the code that * finds the framesets and paragraphs to look into. */ class KWFindReplace : public KoFindReplace diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp index 254260c8..76076ff8 100644 --- a/kword/KWFootNoteDia.cpp +++ b/kword/KWFootNoteDia.cpp @@ -129,7 +129,7 @@ void KWFootNoteDia::slotConfigurate() bool KWFootNoteDia::footNoteAlreadyExists( const TQString & text ) { - return manualFootNotes.tqcontains( text ); + return manualFootNotes.contains( text ); } void KWFootNoteDia::appendManualFootNote( const TQString & text ) diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index 2130e235..0d722d15 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -1325,7 +1325,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) { TQRect r = m_prev3->contentsRect(); TQRect rect(r.x()+OFFSETX,r.y()+OFFSETY,r.width()-OFFSETX,r.y()+OFFSETY+Ko_SPACE); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_topBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_topBorder.color != m_bColor->color() ) ||(m_topBorder.getStyle()!=KoBorder::getStyle(m_cStyle->currentText()) )) && m_bTop->isOn() ) @@ -1339,7 +1339,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) m_bTop->setOn(!m_bTop->isOn()); } rect.setCoords(r.x()+OFFSETX,r.height()-OFFSETY-Ko_SPACE,r.width()-OFFSETX,r.height()-OFFSETY); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_bottomBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_bottomBorder.color != m_bColor->color() ) ||(m_bottomBorder.getStyle()!=KoBorder::getStyle(m_cStyle->currentText()) )) && m_bBottom->isOn() ) @@ -1354,7 +1354,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) } rect.setCoords(r.x()+OFFSETX,r.y()+OFFSETY,r.x()+Ko_SPACE+OFFSETX,r.height()-OFFSETY); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_leftBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_leftBorder.color != m_bColor->color() ) @@ -1369,7 +1369,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) m_bLeft->setOn(!m_bLeft->isOn()); } rect.setCoords(r.width()-OFFSETX-Ko_SPACE,r.y()+OFFSETY,r.width()-OFFSETX,r.height()-OFFSETY); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_rightBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_rightBorder.color != m_bColor->color() ) @@ -2099,7 +2099,7 @@ bool KWFrameDia::applyChanges() KWTextFrameSet *frameSet = new KWTextFrameSet( m_doc, name ); frameSet->addFrame( m_frame ); KWPage *page = m_doc->pageManager()->page(m_frame); - if( page->rect().tqcontains(rect) ) { + if( page->rect().contains(rect) ) { m_frame->setRect( px, py, pw, ph ); //don't change margins when frame is protected. if ( m_paddingConfigWidget && ( !m_tab1 || (m_tab1 && m_cbProtectContent && !m_cbProtectContent->isChecked())) ) @@ -2198,7 +2198,7 @@ bool KWFrameDia::applyChanges() //kdDebug() << "New geom: " << m_sx->text().toDouble() << ", " << m_sy->text().toDouble() // << " " << m_sw->text().toDouble() << "x" << m_sh->text().toDouble() << endl; - if( m_doc->pageManager()->page(f)->rect().tqcontains(rect) ) + if( m_doc->pageManager()->page(f)->rect().contains(rect) ) { FrameIndex index( f ); KoRect initialRect = f->normalize(); diff --git a/kword/KWFrameList.cpp b/kword/KWFrameList.cpp index 3628df05..d0f5682e 100644 --- a/kword/KWFrameList.cpp +++ b/kword/KWFrameList.cpp @@ -96,7 +96,7 @@ void KWFrameList::setFrames(const TQPtrList<KWFrame> &frames) { // ## might need a for loop for the case of inline-inside-inline, // or maybe calling isPaintedBy instead [depending on what should happen for tables] if ( daFrame->frameSet()->isFloating() && - (parentFramesets.tqcontains(daFrame->frameSet()->anchorFrameset()) || + (parentFramesets.contains(daFrame->frameSet()->anchorFrameset()) || daFrame->frameSet()->isPaintedBy(m_frame->frameSet())) ) continue; // Floating frames are not "on top", they are "inside". diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp index b8b9f8d0..d1129b1f 100644 --- a/kword/KWFrameSet.cpp +++ b/kword/KWFrameSet.cpp @@ -76,7 +76,7 @@ KWFrameSet::~KWFrameSet() void KWFrameSet::addFrame( KWFrame *frame, bool recalc ) { - if ( m_frames.tqfindRef( frame ) != -1 ) + if ( m_frames.findRef( frame ) != -1 ) return; //kdDebug(32001) << k_funcinfo << name() << " adding frame" << frame << " recalc=" << recalc << endl; @@ -96,7 +96,7 @@ void KWFrameSet::deleteFrame( unsigned int num, bool remove, bool recalc ) KWFrame *frm = m_frames.at( num ); Q_ASSERT( frm ); m_frames.take( num ); - Q_ASSERT( !m_frames.tqcontains(frm) ); + Q_ASSERT( !m_frames.contains(frm) ); unsigned int index = frm->pageNumber() - m_firstPage; if(m_framesInPage.count() >= index) { @@ -127,7 +127,7 @@ void KWFrameSet::deleteFrame( unsigned int num, bool remove, bool recalc ) void KWFrameSet::deleteFrame( KWFrame *frm, bool remove, bool recalc ) { //kdDebug(32001) << "KWFrameSet::deleteFrame " << frm << " remove=" << remove << endl; - int num = m_frames.tqfindRef( frm ); + int num = m_frames.findRef( frm ); Q_ASSERT( num != -1 ); if ( num == -1 ) return; @@ -505,7 +505,7 @@ KWFrame * KWFrameSet::frameAtPos( double x, double y ) const KoPoint docPoint( x, y ); TQPtrListIterator<KWFrame> frameIt = frameIterator(); for ( ; frameIt.current(); ++frameIt ) - if ( frameIt.current()->tqcontains( docPoint ) ) + if ( frameIt.current()->contains( docPoint ) ) return frameIt.current(); return 0L; } @@ -518,7 +518,7 @@ KWFrame *KWFrameSet::frame( unsigned int num ) const int KWFrameSet::frameFromPtr( KWFrame *frame ) { - return m_frames.tqfindRef( frame ); + return m_frames.findRef( frame ); } KWFrame * KWFrameSet::settingsFrame( const KWFrame* frame ) @@ -971,9 +971,9 @@ KWFrame* KWFrameSet::loadOasisFrame( const TQDomElement& tag, KoOasisContext& co // A frame with protected size means that the frameset is size-protected (hmm, kword did it that way) // TODO implement position protection TQString protectList = context.styleStack().attributeNS( KoXmlNS::style, "protect" ); - if ( protectList.tqcontains( "content" ) ) + if ( protectList.contains( "content" ) ) setProtectContent( true ); - if ( protectList.tqcontains( "size" ) ) + if ( protectList.contains( "size" ) ) m_protectSize = true; // TODO m_visible ? User-toggeable or internal? @@ -1164,14 +1164,14 @@ bool KWFrameSet::isFrameAtPos( const KWFrame* frame, const TQPoint& point, bool outerRect.rTop() -= margin; outerRect.rRight() += margin; outerRect.rBottom() += margin; - if ( outerRect.tqcontains( point ) ) { + if ( outerRect.contains( point ) ) { if(borderOfFrameOnly) { TQRect innerRect( m_doc->zoomRect( *frame ) ); innerRect.rLeft() += margin; innerRect.rTop() += margin; innerRect.rRight() -= margin; innerRect.rBottom() -= margin; - return (!innerRect.tqcontains(point) ); + return (!innerRect.contains(point) ); } return true; } diff --git a/kword/KWFrameStyle.cpp b/kword/KWFrameStyle.cpp index fd6fd26a..816afa9b 100644 --- a/kword/KWFrameStyle.cpp +++ b/kword/KWFrameStyle.cpp @@ -249,7 +249,7 @@ void KWFrameStyle::saveOasis( KoGenStyles& mainStyles, KoSavingContext& savingCo // try to preserve existing internal name, if it looks adequate (no spaces) // ## TODO: check XML-Schemacs NCName conformity - const bool nameIsConform = !m_name.isEmpty() && m_name.tqfind( ' ' ) == -1; + const bool nameIsConform = !m_name.isEmpty() && m_name.find( ' ' ) == -1; TQString newName = m_name; if ( nameIsConform ) newName = mainStyles.lookup( frameStyle, m_name, KoGenStyles::DontForceNumbering ); diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp index b0395d24..0a770770 100644 --- a/kword/KWFrameStyleManager.cpp +++ b/kword/KWFrameStyleManager.cpp @@ -151,7 +151,7 @@ KWFrameStyleManager::KWFrameStyleManager( TQWidget *_parent, KWDocument *_doc, KWFrameStyleBackgroundTab *bgTab = new KWFrameStyleBackgroundTab( m_tabs ); addTab( bgTab ); - TQListBoxItem * item = m_stylesList->tqfindItem( activeStyleName ); + TQListBoxItem * item = m_stylesList->findItem( activeStyleName ); m_stylesList->setCurrentItem( item ? m_stylesList->index(item) : 0 ); noSignals=false; @@ -428,7 +428,7 @@ void KWFrameStyleManager::moveUpStyle() TQString currentStyleName = m_stylesList->currentText(); if ( currentStyleName.isEmpty() ) return; - int pos2 = m_styleOrder.tqfindIndex( currentStyleName ); + int pos2 = m_styleOrder.findIndex( currentStyleName ); if ( pos2 > 0 ) // neither -1 nor 0 { m_styleOrder.remove( m_styleOrder.at(pos2)); @@ -457,7 +457,7 @@ void KWFrameStyleManager::moveDownStyle() if ( currentStyleName.isEmpty() ) return; - int pos2 = m_styleOrder.tqfindIndex( currentStyleName ); + int pos2 = m_styleOrder.findIndex( currentStyleName ); if ( pos2 != -1 ) { m_styleOrder.remove( m_styleOrder.at(pos2)); diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp index 7506e02a..4904ec98 100644 --- a/kword/KWFrameView.cpp +++ b/kword/KWFrameView.cpp @@ -67,7 +67,7 @@ bool KWFrameView::isBorderHit(const KoPoint &point) const { return hit(point, true, true); } -bool KWFrameView::tqcontains(const KoPoint &point, bool fuzzy) const { +bool KWFrameView::contains(const KoPoint &point, bool fuzzy) const { return hit(point, fuzzy, false); } diff --git a/kword/KWFrameView.h b/kword/KWFrameView.h index d4dcabde..d7b63aba 100644 --- a/kword/KWFrameView.h +++ b/kword/KWFrameView.h @@ -105,7 +105,7 @@ public: /// returns if the @p point is on the border bool isBorderHit(const KoPoint &point) const; /// returns if the @p point is anywhere in te frame, if fuzzy is true; also a little outside - bool tqcontains(const KoPoint &point, bool fuzzy = true) const; + bool contains(const KoPoint &point, bool fuzzy = true) const; /** * Return the MouseMeaning enum value for the tqparent view. @@ -138,7 +138,7 @@ public: private: /** - * Helper method for isBorderHit() and tqcontains() + * Helper method for isBorderHit() and contains() * @param point the point * @param borderOnly if true; exclude the range inside the frame * @param fuzzy don't take all the coordinates too strict, allow for some margin diff --git a/kword/KWFrameViewManager.cpp b/kword/KWFrameViewManager.cpp index 168a5d7c..c4349ae8 100644 --- a/kword/KWFrameViewManager.cpp +++ b/kword/KWFrameViewManager.cpp @@ -245,7 +245,7 @@ TQValueVector<KWFrameView*> KWFrameViewManager::framesAt(const KoPoint &point, b if(! (*frames)->frame()->frameSet()->isVisible()) continue; if(borderOnly && (*frames)->isBorderHit(point) || - !borderOnly && (*frames)->tqcontains(point)) + !borderOnly && (*frames)->contains(point)) framesThatAreHit.append(*frames); } // sort on z-ordering; top on first diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp index b8341d20..c7660993 100644 --- a/kword/KWImportStyleDia.cpp +++ b/kword/KWImportStyleDia.cpp @@ -134,7 +134,7 @@ void KWImportStyleDia::loadFile() unsigned int i=0; for( TQValueList<TQString>::Iterator it = followingStyles.begin(); it != followingStyles.end(); ++it ) { TQString newName =*it; - if ( insertStyle.tqcontains( *it ) ) + if ( insertStyle.contains( *it ) ) newName = (insertStyle)[ *it ]; KoParagStyle * style = m_styleList.findStyle(newName); @@ -197,7 +197,7 @@ TQString KWImportFrameTableStyleDia::generateStyleName( const TQString & templat bool exists; do { name = templateName.tqarg( num ); - exists = (m_list.tqfindIndex( name )!=-1); + exists = (m_list.findIndex( name )!=-1); ++num; } while ( exists ); return name; @@ -240,7 +240,7 @@ void KWImportFrameTableStyleDia::loadFile() KWFrameStyle *sty = new KWFrameStyle( styleElem ); TQString name =sty->name(); - if ( m_list.tqfindIndex( name )!=-1 ) + if ( m_list.findIndex( name )!=-1 ) sty->setDisplayName(generateStyleName( sty->displayName() + TQString( "-%1"))); m_frameStyleList.append( sty); } @@ -252,7 +252,7 @@ void KWImportFrameTableStyleDia::loadFile() TQDomElement styleElem = listStyles.item( item ).toElement(); KWTableStyle *sty = new KWTableStyle( styleElem,m_doc,2 ); TQString name =sty->name(); - if ( m_list.tqfindIndex( name )!=-1 ) + if ( m_list.findIndex( name )!=-1 ) sty->setName(generateStyleName( sty->displayName() + TQString( "-%1"))); m_tableStyleList.append( sty); } diff --git a/kword/KWOasisLoader.cpp b/kword/KWOasisLoader.cpp index 99f5ee62..42d72b5e 100644 --- a/kword/KWOasisLoader.cpp +++ b/kword/KWOasisLoader.cpp @@ -257,7 +257,7 @@ KWFrame* KWOasisLoader::loadFrame( const TQDomElement& frameTag, KoOasisContext& break; } else if ( localName == "object" ) { - TQDomElement mathElem; // will be set if we tqfind <math:math> + TQDomElement mathElem; // will be set if we find <math:math> TQDomElement childElem; forEachElement( childElem, elem ) { diff --git a/kword/KWPageManager.cpp b/kword/KWPageManager.cpp index 7058e5ac..9dc797a6 100644 --- a/kword/KWPageManager.cpp +++ b/kword/KWPageManager.cpp @@ -224,7 +224,7 @@ KoPoint KWPageManager::clipToDocument(const KoPoint &point) { } page = TQMIN(page, lastPageNumber()); KoRect rect = this->page(page)->rect(); - if(rect.tqcontains(point)) + if(rect.contains(point)) return point; KoPoint rc(point); diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp index 7ea4e955..3d04fda0 100644 --- a/kword/KWPictureFrameSet.cpp +++ b/kword/KWPictureFrameSet.cpp @@ -193,7 +193,7 @@ void KWPictureFrameSet::loadOasis( const TQDomElement& frame, const TQDomElement if ( !href.isEmpty() /*&& href[0] == '#'*/ ) { TQString strExtension; - const int result=href.tqfindRev("."); + const int result=href.findRev("."); if (result>=0) { strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp index 9d6aa58e..892bc822 100644 --- a/kword/KWTableFrameSet.cpp +++ b/kword/KWTableFrameSet.cpp @@ -981,7 +981,7 @@ void KWTableFrameSet::reInsertRow(RemovedRow &rr) // put back m_frames that were removed for(uint i = 0; i < rlen; i++){ - if( m_frames.tqfindRef((*r)[i]->frame(0)) == -1 ) + if( m_frames.findRef((*r)[i]->frame(0)) == -1 ) m_frames.append( (*r)[i]->frame(0) ); } diff --git a/kword/KWTableFrameSet.h b/kword/KWTableFrameSet.h index f572a1ba..d3f0ad31 100644 --- a/kword/KWTableFrameSet.h +++ b/kword/KWTableFrameSet.h @@ -393,7 +393,7 @@ public: /** returns the number of columns */ unsigned int getColumns() const { return m_cols; } - /** returns the number of cells the table tqcontains, this includes + /** returns the number of cells the table contains, this includes * temporary headers. */ unsigned int getNumCells()const { return m_nr_cells; } diff --git a/kword/KWTableStyle.cpp b/kword/KWTableStyle.cpp index 99ecfacb..47f9029b 100644 --- a/kword/KWTableStyle.cpp +++ b/kword/KWTableStyle.cpp @@ -181,7 +181,7 @@ void KWTableStyle::saveOasis( KoGenStyles& mainStyles, KoSavingContext& /*saving // try to preserve existing internal name, if it looks adequate (no spaces) // ## TODO: check XML-Schemacs NCName conformity - const bool nameIsConform = !m_name.isEmpty() && m_name.tqfind( ' ' ) == -1; + const bool nameIsConform = !m_name.isEmpty() && m_name.find( ' ' ) == -1; TQString newName; if ( nameIsConform ) newName = mainStyles.lookup( tableCellStyle, m_name, KoGenStyles::DontForceNumbering ); diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp index d2a0c1ea..7bd70eb6 100644 --- a/kword/KWTableStyleManager.cpp +++ b/kword/KWTableStyleManager.cpp @@ -501,7 +501,7 @@ void KWTableStyleManager::moveUpStyle() const TQString currentStyleName = m_currentTableStyle->name(); const TQString currentStyleDisplayName = m_stylesList->currentText(); - int pos2 = m_styleOrder.tqfindIndex( currentStyleName ); + int pos2 = m_styleOrder.findIndex( currentStyleName ); if ( pos2 != -1 ) { m_styleOrder.remove( m_styleOrder.at(pos2) ); @@ -529,7 +529,7 @@ void KWTableStyleManager::moveDownStyle() const TQString currentStyleName = m_currentTableStyle->name(); const TQString currentStyleDisplayName = m_stylesList->currentText(); - int pos2 = m_styleOrder.tqfindIndex( currentStyleName ); + int pos2 = m_styleOrder.findIndex( currentStyleName ); if ( pos2 != -1 ) { m_styleOrder.remove( m_styleOrder.at(pos2) ); @@ -677,12 +677,12 @@ void KWTableStyleManager::updateAllStyleCombos() // - 1. Count is the same, but the user has delete the same number as he added // - 2. Old name is not in new list, old index is wrong index in new list if ( ( static_cast<unsigned int>(m_style->count())!=m_doc->styleCollection()->styleList().count() ) && - ( m_style->listBox()->tqfindItem( oldS ) ) ) { - oldSindex = m_style->listBox()->index( m_style->listBox()->tqfindItem( oldS ) ); + ( m_style->listBox()->findItem( oldS ) ) ) { + oldSindex = m_style->listBox()->index( m_style->listBox()->findItem( oldS ) ); } if ( ( m_frameStyle->count() != m_doc->frameStyleCollection()->count() ) && - ( m_frameStyle->listBox()->tqfindItem( oldFS ) ) ) { - oldFSindex = m_frameStyle->listBox()->index( m_frameStyle->listBox()->tqfindItem( oldFS ) ); + ( m_frameStyle->listBox()->findItem( oldFS ) ) ) { + oldFSindex = m_frameStyle->listBox()->index( m_frameStyle->listBox()->findItem( oldFS ) ); } // Update the comboboxes diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp index fe4cb1c5..7fd642e2 100644 --- a/kword/KWTableTemplateSelector.cpp +++ b/kword/KWTableTemplateSelector.cpp @@ -596,7 +596,7 @@ KWTableTemplateSelector::KWTableTemplateSelector( KWDocument *_doc, TQWidget *_p connect( cbBody, TQT_SIGNAL( toggled( bool ) ), preview, TQT_SLOT( cbBodyChanged( bool ) ) ); connect( lbTemplates, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( changeTableTemplate() ) ); - TQListBoxItem * item = lbTemplates->tqfindItem( _tableTemplate ); + TQListBoxItem * item = lbTemplates->findItem( _tableTemplate ); int index = 0; if ( item ) index = lbTemplates->index ( item ); diff --git a/kword/KWTextDocument.cpp b/kword/KWTextDocument.cpp index 580e378d..a1b0a57a 100644 --- a/kword/KWTextDocument.cpp +++ b/kword/KWTextDocument.cpp @@ -241,7 +241,7 @@ bool KWTextDocument::loadSpanTag( const TQDomElement& tag, KoOasisContext& conte else if ( localName == "bookmark-end" ) { KWLoadingInfo* loadingInfo = m_textfs->kWordDocument()->loadingInfo(); TQString bkName = tag.attributeNS( KoXmlNS::text, "name", TQString() ); - KWLoadingInfo::BookmarkStartsMap::iterator it = loadingInfo->m_bookmarkStarts.tqfind( bkName ); + KWLoadingInfo::BookmarkStartsMap::iterator it = loadingInfo->m_bookmarkStarts.find( bkName ); if ( it == loadingInfo->m_bookmarkStarts.end() ) { // bookmark end without start. This seems to happen.. // insert simple bookmark then appendBookmark( parag, pos, parag, pos, tag.attributeNS( KoXmlNS::text, "name", TQString() ) ); diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index 58d5af9a..c19da8f0 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -238,7 +238,7 @@ KWFrame * KWTextFrameSet::documentToInternal( const KoPoint &dPoint, TQPoint &iP for ( ; frameIt.current(); ++frameIt ) { KWFrame *theFrame = frameIt.current(); - if ( theFrame->tqcontains( dPoint ) ) + if ( theFrame->contains( dPoint ) ) { iPoint.setX( m_doc->ptToLayoutUnitPixX( dPoint.x() - theFrame->innerRect().x() ) ); iPoint.setY( m_doc->ptToLayoutUnitPixY( dPoint.y() - theFrame->innerRect().y() + theFrame->internalY() ) ); @@ -278,7 +278,7 @@ KWFrame * KWTextFrameSet::documentToInternalMouseSelection( const KoPoint &dPoin for ( ; frameIt.current(); ++frameIt ) { KWFrame *theFrame = frameIt.current(); - if ( theFrame->tqcontains( dPoint ) ) + if ( theFrame->contains( dPoint ) ) { iPoint.setX( m_doc->ptToLayoutUnitPixX( dPoint.x() - theFrame->innerRect().x() ) ); iPoint.setY( m_doc->ptToLayoutUnitPixY( dPoint.y() - theFrame->innerRect().y() + theFrame->internalY() ) ); @@ -300,7 +300,7 @@ KWFrame * KWTextFrameSet::documentToInternalMouseSelection( const KoPoint &dPoin #ifdef DEBUG_DTI kdDebug() << "documentToInternal: openLeftRect=" << openLeftRect << endl; #endif - if ( openLeftRect.tqcontains( dPoint ) ) + if ( openLeftRect.contains( dPoint ) ) { // We are at the left of this frame (and not in any other frame of this frameset) iPoint.setX( m_doc->ptToLayoutUnitPixX(theFrame->innerRect().left() )); @@ -317,7 +317,7 @@ KWFrame * KWTextFrameSet::documentToInternalMouseSelection( const KoPoint &dPoin #ifdef DEBUG_DTI kdDebug() << "documentToInternal: openTopRect=" << openTopRect << endl; #endif - if ( openTopRect.tqcontains( dPoint ) ) + if ( openTopRect.contains( dPoint ) ) { // We are at the top of this frame (...) iPoint.setX( m_doc->ptToLayoutUnitPixX( dPoint.x() - theFrame->innerRect().left() ) ); @@ -355,7 +355,7 @@ KWFrame * KWTextFrameSet::documentToInternalMouseSelection( const KoPoint &dPoin KWFrame *theFrame = frameIt.current(); KoRect openTopRect( theFrame->innerRect() ); openTopRect.setTop( 0 ); - if ( openTopRect.tqcontains( dPoint ) ) // We are at the top of this frame + if ( openTopRect.contains( dPoint ) ) // We are at the top of this frame iPoint.setX( m_doc->ptToLayoutUnitPixX( dPoint.x() - theFrame->left() ) ); else iPoint.setX( 0 ); // We are, hmm, on the left or right of the frames @@ -396,7 +396,7 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP kdDebug() << "ITD: r=" << r << " iPoint=" << iPoint.x() << "," << iPoint.y() << endl; #endif // r is the frame in qrt coords - if ( r.tqcontains( iPoint ) ) // both r and p are in tqlayout units (aka internal) + if ( r.contains( iPoint ) ) // both r and p are in tqlayout units (aka internal) { dPoint = internalToDocumentKnowingFrame( iPoint, theFrame ); #ifdef DEBUG_ITD @@ -881,7 +881,7 @@ TQValueList<KWFrame*> KWTextFrameSet::framesFromTo( int y1, int y2 ) const if ( !firstFrame ) return framesList; framesList.append( firstFrame ); - uint frameIndex = const_cast<KWTextFrameSet *>(this)->m_frames.tqfindRef( firstFrame ); + uint frameIndex = const_cast<KWTextFrameSet *>(this)->m_frames.findRef( firstFrame ); while ( ++frameIndex < m_frames.count() ) { KWFrame* f = frame( frameIndex ); if ( f->internalY() > y2 ) // too far down, we're done @@ -1636,7 +1636,7 @@ KWFrame * KWTextFrameSet::internalToDocument( const KoPoint &relPoint, KoPoint & #ifdef DEBUG_ITD kdDebug() << "KWTextFrameSet::internalToDocument frame's relative rect:" << relRect << endl; #endif - if ( relRect.tqcontains( relPoint ) ) // both relRect and relPoint are in "relative coordinates" + if ( relRect.contains( relPoint ) ) // both relRect and relPoint are in "relative coordinates" { dPoint = internalToDocumentKnowingFrame( relPoint, theFrame ); return theFrame; @@ -1797,7 +1797,7 @@ void KWTextFrameSet::saveOasisContent( KoXmlWriter& writer, KoSavingContext& con // I want TQt4's TQMap/TQHash::value()! KoSavingContext::BookmarkPositions bookmarkStarts, bookmarkEnds; - TQMap<const KoTextParag*, KoTextBookmarkList>::const_iterator bkit = bookmarksPerParagraph.tqfind( parag ); + TQMap<const KoTextParag*, KoTextBookmarkList>::const_iterator bkit = bookmarksPerParagraph.find( parag ); if ( bkit != bookmarksPerParagraph.end() ) { // Massage a bit the bookmarks data; KoTextParag wants it ordered by position, for speed. const KoTextBookmarkList& bookmarks = *bkit; @@ -2966,7 +2966,7 @@ void KWTextFrameSet::renumberFootNotes( bool tqrepaint ) } if ( var->numberingType()==KWFootNoteVariable::Auto ) { - if ( addedNums.tqcontains( numDisplay ) != 0 ) // the automatic generated number should not be equal to a manual one + if ( addedNums.contains( numDisplay ) != 0 ) // the automatic generated number should not be equal to a manual one { numDisplay++; continue; //try with the next number diff --git a/kword/KWTextFrameSet.h b/kword/KWTextFrameSet.h index b8cdd3f9..58b7730e 100644 --- a/kword/KWTextFrameSet.h +++ b/kword/KWTextFrameSet.h @@ -214,7 +214,7 @@ public: KCommand *deleteAnchoredFrame( KWAnchor * anchor ); void findPosition( const KoPoint &dPoint, KoTextParag * & parag, int & index ); - /** Highlighting support (for search/tqreplace, spellchecking etc.) */ + /** 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 ); diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 03f6ba6d..f23e634a 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -161,7 +161,7 @@ class TableInfo { if(cell->protectContent()) m_protectContent=true; - if(! tableRows.tqcontains(fs->groupmanager())) { // create empty lists. + if(! tableRows.contains(fs->groupmanager())) { // create empty lists. TQValueList<unsigned int> rows; for(unsigned int i=fs->groupmanager()->getRows(); i != 0; i--) rows.append(0); @@ -421,7 +421,7 @@ KWView::~KWView() if ( m_specialCharDlg ) m_specialCharDlg->closeDialog(); // will call slotSpecialCharDlgClosed - // Abort any tqfind/tqreplace + // Abort any find/replace delete m_findReplace; // Delete gui while we still exist ( it needs documentDeleted() ) delete m_gui; @@ -575,10 +575,10 @@ void KWView::setupActions() m_actionEditCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( editCut() ), actionCollection(), "edit_cut" ); m_actionEditCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( editCopy() ), actionCollection(), "edit_copy" ); m_actionEditPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( editPaste() ), actionCollection(), "edit_paste" ); - m_actionEditFind = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_tqfind" ); + m_actionEditFind = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( editFind() ), actionCollection(), "edit_find" ); m_actionEditFindNext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( editFindNext() ), actionCollection(), "edit_findnext" ); m_actionEditFindPrevious = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT( editFindPrevious() ), actionCollection(), "edit_findprevious" ); - m_actionEditReplace = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_tqreplace" ); + m_actionEditReplace = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( editReplace() ), actionCollection(), "edit_replace" ); m_actionEditSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ), actionCollection(), "edit_selectall" ); new KAction( i18n( "Select All Frames" ), 0, TQT_TQOBJECT(this), TQT_SLOT( editSelectAllFrames() ), actionCollection(), "edit_selectallframes" ); m_actionEditSelectCurrentFrame = new KAction( i18n( "Select Frame" ), 0, @@ -1492,7 +1492,7 @@ void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& f KAction * act = new KAction( text, 0, TQT_TQOBJECT(this), TQT_SLOT( insertExpression() ), actionCollection(), TQString("expression-action_%1").tqarg(i).latin1() ); - if ( personalShortCut.tqcontains(text) ) + if ( personalShortCut.contains(text) ) act->setShortcut( personalShortCut[text] ); i++; act->setGroup("expression-action"); @@ -1580,7 +1580,7 @@ void KWView::refreshCustomMenu() if ( var->type() == VT_CUSTOM ) { varName=( (KoCustomVariable*) var )->name(); - if ( !lst.tqcontains( varName) ) + if ( !lst.contains( varName) ) { lst.append( varName ); TQCString name = TQString("custom-action_%1").tqarg(i).latin1(); @@ -1744,9 +1744,9 @@ int KWView::checkClipboard( TQMimeSource *data ) if ( TQImageDrag::canDecode( data ) ) provides |= ProvidesImage; - if ( formats.tqfindIndex( KFormula::MimeSource::selectionMimeType() ) != -1 ) + if ( formats.findIndex( KFormula::MimeSource::selectionMimeType() ) != -1 ) provides |= ProvidesFormula; - if ( formats.tqfindIndex( "text/plain" ) != -1 ) + if ( formats.findIndex( "text/plain" ) != -1 ) provides |= ProvidesPlainText; TQCString returnedTypeMime = KoTextObject::providesOasis( data ); if ( !returnedTypeMime.isEmpty() ) @@ -2122,7 +2122,7 @@ void KWView::updateReadWrite( bool readwrite ) act->setEnabled( true ); // In fact the new view could be readwrite, so this is too dangerous - // (e.g. during spellchecking or during search-n-tqreplace) + // (e.g. during spellchecking or during search-n-replace) //act = actionCollection()->action("view_newview"); //if (act) // act->setEnabled( true ); @@ -2198,7 +2198,7 @@ void KWView::updateStyleList() TQString currentStyle = m_actionFormatStyle->currentText(); // Generate list of styles const TQStringList lst = m_doc->styleCollection()->displayNameList(); - const int pos = lst.tqfindIndex( currentStyle ); + const int pos = lst.findIndex( currentStyle ); // Fill the combo - using a KSelectAction m_actionFormatStyle->setItems( lst ); if ( pos > -1 ) @@ -2261,7 +2261,7 @@ void KWView::updateFrameStyleList() const TQString currentStyle = m_actionFrameStyle->currentText(); // Generate list of styles const TQStringList lst = m_doc->frameStyleCollection()->displayNameList(); - const int pos = lst.tqfindIndex( currentStyle ); + const int pos = lst.findIndex( currentStyle ); // Fill the combo m_actionFrameStyle->setItems( lst ); if ( pos > -1 ) @@ -2314,7 +2314,7 @@ void KWView::updateTableStyleList() const TQString currentStyle = m_actionTableStyle->currentText(); // Generate list of styles const TQStringList lst = m_doc->tableStyleCollection()->displayNameList(); - const int pos = lst.tqfindIndex( currentStyle ); + const int pos = lst.findIndex( currentStyle ); // Fill the combo m_actionTableStyle->setItems( lst ); if ( pos > -1 ) @@ -2503,7 +2503,7 @@ void KWView::editFind() bool hasSelection = edit && edit->textFrameSet()->hasSelection(); bool hasCursor = edit != 0L; - KoSearchDia dialog( m_gui->canvasWidget(), "tqfind", m_searchEntry, hasSelection, hasCursor ); + KoSearchDia dialog( m_gui->canvasWidget(), "find", m_searchEntry, hasSelection, hasCursor ); if ( dialog.exec() == TQDialog::Accepted ) { delete m_findReplace; @@ -2523,7 +2523,7 @@ void KWView::editReplace() bool hasSelection = edit && edit->textFrameSet()->hasSelection(); bool hasCursor = edit != 0L; - KoReplaceDia dialog( m_gui->canvasWidget(), "tqreplace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor ); + KoReplaceDia dialog( m_gui->canvasWidget(), "replace", m_searchEntry, m_replaceEntry, hasSelection, hasCursor ); if ( dialog.exec() == TQDialog::Accepted ) { delete m_findReplace; @@ -2568,7 +2568,7 @@ void KWView::adjustZOrderOfSelectedFrames(MoveFrameType moveType) { if(table) { for (TQPtrListIterator<KWFrame> cellIt(table->frameIterator() ); cellIt.current() ; ++cellIt ) { KWFrame *frame = cellIt.current(); - if(page->rect().tqcontains(*frame) && !frames.tqcontains(frame)) + if(page->rect().contains(*frame) && !frames.contains(frame)) frames.append(frame); } } @@ -2642,7 +2642,7 @@ void KWView::adjustZOrderOfSelectedFrames(MoveFrameType moveType) { void KWView::increaseAllZOrdersAbove(int refZOrder, int pageNum, const TQPtrList<KWFrame>& frameSelection) { TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( pageNum, false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore frames we selected. if(frameIt.current()->zOrder() >= refZOrder) { frameIt.current()->setZOrder( frameIt.current()->zOrder() + 1 ); } @@ -2653,7 +2653,7 @@ void KWView::increaseAllZOrdersAbove(int refZOrder, int pageNum, const TQPtrList void KWView::decreaseAllZOrdersUnder(int refZOrder, int pageNum, const TQPtrList<KWFrame>& frameSelection) { TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( pageNum, false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore frames we selected. if(frameIt.current()->zOrder() <= refZOrder) { frameIt.current()->setZOrder( frameIt.current()->zOrder() - 1 ); } @@ -2665,7 +2665,7 @@ int KWView::raiseFrame(const TQPtrList<KWFrame>& frameSelection, const KWFrame * TQValueList<int> zorders; TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( frame->pageNumber(), false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore other frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore other frames we selected. if(! frameIt.current()->intersects(*frame)) continue; // only frames that I intersect with. int z = frameIt.current()->zOrder(); if(z > frame->zOrder()) { @@ -2675,7 +2675,7 @@ int KWView::raiseFrame(const TQPtrList<KWFrame>& frameSelection, const KWFrame * } if(newZOrder==10000) return frame->zOrder(); // Ensure that newZOrder is "free" - if ( zorders.tqfind( newZOrder ) != zorders.end() ) + if ( zorders.find( newZOrder ) != zorders.end() ) increaseAllZOrdersAbove( newZOrder, frame->pageNumber(), frameSelection ); return newZOrder; } @@ -2685,7 +2685,7 @@ int KWView::lowerFrame(const TQPtrList<KWFrame>& frameSelection, const KWFrame * TQValueList<int> zorders; TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( frame->pageNumber(), false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore other frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore other frames we selected. if(frameIt.current()->frameSet()->isMainFrameset()) continue; // ignore main frameset. if(! frameIt.current()->intersects(*frame)) continue; // only frames that I intersect with. int z = frameIt.current()->zOrder(); @@ -2696,7 +2696,7 @@ int KWView::lowerFrame(const TQPtrList<KWFrame>& frameSelection, const KWFrame * } if(newZOrder==-10000) return frame->zOrder(); // Ensure that newZOrder is "free" - if ( zorders.tqfind( newZOrder ) != zorders.end() ) + if ( zorders.find( newZOrder ) != zorders.end() ) decreaseAllZOrdersUnder( newZOrder, frame->pageNumber(), frameSelection ); return newZOrder; } @@ -2705,7 +2705,7 @@ int KWView::bringToFront(const TQPtrList<KWFrame>& frameSelection, const KWFrame int newZOrder = frame->zOrder(); TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( frame->pageNumber(), false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore other frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore other frames we selected. if(! frameIt.current()->intersects(*frame)) continue; // only frames that I intersect with. newZOrder=TQMAX(newZOrder, frameIt.current()->zOrder()+1); } @@ -2716,7 +2716,7 @@ int KWView::sendToBack(const TQPtrList<KWFrame>& frameSelection, const KWFrame * int newZOrder = frame->zOrder(); TQPtrList<KWFrame> framesInPage = m_doc->framesInPage( frame->pageNumber(), false ); for ( TQPtrListIterator<KWFrame> frameIt( framesInPage ); frameIt.current(); ++frameIt ) { - if(frameSelection.tqcontains(frameIt.current()) > 0) continue; // ignore other frames we selected. + if(frameSelection.contains(frameIt.current()) > 0) continue; // ignore other frames we selected. if(frameIt.current()->frameSet()->isMainFrameset()) continue; // ignore main frameset. if(! frameIt.current()->intersects(*frame)) continue; // only frames that I intersect with. newZOrder=TQMIN(newZOrder, frameIt.current()->zOrder()-1); @@ -3063,12 +3063,12 @@ void KWView::changeZoomMenu( int zoom ) regexp.search(*it); const int val=regexp.cap(1).toInt(&ok); //zoom : limit inferior=10 - if(ok && val>9 && list.tqcontains(val)==0) + if(ok && val>9 && list.contains(val)==0) list.append( val ); } //necessary at the beginning when we read config //this value is not in combo list - if(list.tqcontains(zoom)==0) + if(list.contains(zoom)==0) list.append( zoom ); qHeapSort( list ); @@ -3098,13 +3098,13 @@ void KWView::showZoom( int zoom ) { TQStringList list = m_actionViewZoom->items(); TQString zoomStr( i18n("%1%").tqarg( zoom ) ); - m_actionViewZoom->setCurrentItem( list.tqfindIndex(zoomStr) ); + m_actionViewZoom->setCurrentItem( list.findIndex(zoomStr) ); } void KWView::showZoom( const TQString& zoom ) { TQStringList list = m_actionViewZoom->items(); - m_actionViewZoom->setCurrentItem( list.tqfindIndex( zoom ) ); + m_actionViewZoom->setCurrentItem( list.findIndex( zoom ) ); } void KWView::slotViewFormattingChars() @@ -3530,7 +3530,7 @@ void KWView::insertLink() if ( edit->textFrameSet()->hasSelection() ) { TQString selectedText = edit->textFrameSet()->textObject()->selectedText(); - if ( edit->textFrameSet()->textObject()->selectionHasCustomItems() || selectedText.tqcontains('\n') ) + if ( edit->textFrameSet()->textObject()->selectionHasCustomItems() || selectedText.contains('\n') ) return; if ( selectedText.startsWith( "mailto:/" ) || selectedText.startsWith( "ftp:/" ) || @@ -3581,7 +3581,7 @@ void KWView::insertVariable() if ( edit ) { KAction * act = (KAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); - VariableDefMap::Iterator it = m_variableDefMap.tqfind( act ); + VariableDefMap::Iterator it = m_variableDefMap.find( act ); if ( it == m_variableDefMap.end() ) kdWarning() << "Action not found in m_variableDefMap." << endl; else @@ -4763,7 +4763,7 @@ TQPtrList<KoTextFormatInterface> KWView::applicableTextInterfaces() const TQValueListIterator<KWFrameView*> framesIterator = selectedFrames.begin(); while(framesIterator != selectedFrames.end()) { KWTextFrameSet* fs = dynamic_cast<KWTextFrameSet *>( (*framesIterator)->frame()->frameSet() ); - if ( fs && !lst.tqcontains( fs )&& !fs->protectContent() ) + if ( fs && !lst.contains( fs )&& !fs->protectContent() ) lst.append( fs ); ++framesIterator; } @@ -5572,7 +5572,7 @@ void KWView::startKSpell() TQObject::connect( m_spell.dlg, TQT_SIGNAL(misspelling(const TQString&, int)), TQT_TQOBJECT(this), TQT_SLOT(spellCheckerMisspelling(const TQString&, int)) ); - TQObject::connect( m_spell.dlg, TQT_SIGNAL(tqreplace(const TQString&, int, const TQString&)), + TQObject::connect( m_spell.dlg, TQT_SIGNAL(replace(const TQString&, int, const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(spellCheckerCorrected(const TQString&, int, const TQString&)) ); TQObject::connect( m_spell.dlg, TQT_SIGNAL(done(const TQString&) ), TQT_TQOBJECT(this), TQT_SLOT(spellCheckerDone(const TQString&)) ); @@ -6934,7 +6934,7 @@ void KWView::insertFile(const KURL& url) TQString name = framesetElem.attribute( "name" ); TQString grpMgr = framesetElem.attribute( "grpMgr" ); - if ( !inlineFsNames.tqcontains(name) && !inlineFsNames.tqcontains(grpMgr) ) + if ( !inlineFsNames.contains(name) && !inlineFsNames.contains(grpMgr) ) { // fixed frameset if ( !grpMgr.isEmpty() ) { // Table cell @@ -6973,7 +6973,7 @@ void KWView::insertFile(const KURL& url) TQString name = framesetElem.attribute("name"); TQString grpMgr = framesetElem.attribute( "grpMgr" ); // We skip headers, footers and framsets/tables inside theese - if ( !fsInHeader.tqcontains(name) && !fsInHeader.tqcontains(grpMgr) && + if ( !fsInHeader.contains(name) && !fsInHeader.contains(grpMgr) && !( frameSetType == FT_TEXT && (info == KWFrameSet::FI_FIRST_HEADER || info == KWFrameSet::FI_EVEN_HEADER || @@ -7347,12 +7347,12 @@ void KWView::addPersonalExpression() doc = TQDomDocument( "KWordExpression" ); TQDomElement begin = doc.createElement( "KWordExpression" ); doc.appendChild( begin ); - TQMapIterator<TQString, TQStringList> itPersonalExp = lstOfPersonalExp.tqfind(i18n("Normal")); + TQMapIterator<TQString, TQStringList> itPersonalExp = lstOfPersonalExp.find(i18n("Normal")); if ( itPersonalExp != lstOfPersonalExp.end()) { list = itPersonalExp.data(); list<<newExpression; - lstOfPersonalExp.tqreplace( i18n("Normal"), list); + lstOfPersonalExp.replace( i18n("Normal"), list); } else { @@ -7441,7 +7441,7 @@ TQPtrList<KAction> KWView::listOfResultOfCheckWord( const TQString &word ) TQPtrList<KAction> listAction; DefaultDictionary *dict = m_broker->defaultDictionary(); const TQStringList lst = dict->suggest( word ); - if ( !lst.tqcontains( word ) ) + if ( !lst.contains( word ) ) { TQStringList::ConstIterator it = lst.begin(); const TQStringList::ConstIterator end = lst.end(); diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp index 1e54d0b9..508eb74f 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp @@ -98,9 +98,9 @@ void KWMailMergeKABCConfig::acceptSelection() void KWMailMergeKABCConfig::addSelectedContacts() { TQListViewItemIterator it( _ui->mAvailableView, TQListViewItemIterator::Selected ); - TQListViewItem* selected = _ui->mSelectedView->tqfindItem( + TQListViewItem* selected = _ui->mSelectedView->findItem( i18n("Single Entries"), 0, TQt::ExactMatch ); - TQListViewItem* selectedLists = _ui->mSelectedView->tqfindItem( + TQListViewItem* selectedLists = _ui->mSelectedView->findItem( i18n("Distribution Lists"), 0, TQt::ExactMatch ); while ( it.current() ) { @@ -175,7 +175,7 @@ void KWMailMergeKABCConfig::filterChanged( const TQString& txt ) } else { - item->setVisible( item->text(0).tqcontains( txt, false ) ); + item->setVisible( item->text(0).contains( txt, false ) ); } item = item->nextSibling(); } @@ -195,7 +195,7 @@ void KWMailMergeKABCConfig::initSelectedAddressees() TQStringList records = _db->singleRecords(); TQListViewItem* category = _ui->mAvailableView->firstChild(); - TQListViewItem* selected = _ui->mSelectedView->tqfindItem( + TQListViewItem* selected = _ui->mSelectedView->findItem( i18n("Single Entries"), 0, TQt::ExactMatch ); while ( category && (records.count()>0) ) { @@ -239,9 +239,9 @@ void KWMailMergeKABCConfig::initSelectedLists() kdDebug() << "::initSelectedLists()" << lists.join(",") << endl; - TQListViewItem* l = _ui->mAvailableView->tqfindItem( + TQListViewItem* l = _ui->mAvailableView->findItem( i18n("Distribution Lists"), 0, TQt::ExactMatch ); - TQListViewItem* selected = _ui->mSelectedView->tqfindItem( + TQListViewItem* selected = _ui->mSelectedView->findItem( i18n("Distribution Lists"), 0, TQt::ExactMatch ); TQListViewItem* item = ( l->firstChild() ); @@ -293,7 +293,7 @@ void KWMailMergeKABCConfig::launchAddressbook() const void KWMailMergeKABCConfig::removeContact( TQListViewItem* item ) { TQStringList& categories = _usedCategories; - TQListViewItem* availableLists = _ui->mAvailableView->tqfindItem( + TQListViewItem* availableLists = _ui->mAvailableView->findItem( i18n("Distribution Lists"), 0, TQt::ExactMatch ); if( item->depth() > 0 ) { @@ -306,7 +306,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item ) for ( TQStringList::Iterator itEntryCat = entryCategories.begin(); itEntryCat != entryCategories.end(); ++itEntryCat ) { - int i = categories.tqfindIndex(*itEntryCat); + int i = categories.findIndex(*itEntryCat); if( i == -1 ) { TQListViewItem* category = new TQListViewItem( _ui->mAvailableView, @@ -320,7 +320,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item ) { KWMailMergeKABCConfigListItem* leftItem = new KWMailMergeKABCConfigListItem( - _ui->mAvailableView->tqfindItem( + _ui->mAvailableView->findItem( *itEntryCat, 0, TQt::ExactMatch), rightItem->addressee() ); @@ -330,7 +330,7 @@ void KWMailMergeKABCConfig::removeContact( TQListViewItem* item ) { TQString noCat = i18n("no category"); KWMailMergeKABCConfigListItem* leftItem = new KWMailMergeKABCConfigListItem( - _ui->mAvailableView->tqfindItem( + _ui->mAvailableView->findItem( noCat, 0, TQt::ExactMatch), rightItem->addressee() ); } @@ -381,7 +381,7 @@ void KWMailMergeKABCConfig::saveDistributionList() } KABC::DistributionList *distList = new KABC::DistributionList( &dlm, listName ); - TQListViewItem* newListItem = new TQListViewItem( _ui->mSelectedView->tqfindItem( + TQListViewItem* newListItem = new TQListViewItem( _ui->mSelectedView->findItem( i18n("Distribution Lists"),0 , TQt::ExactMatch), listName ); TQListViewItem* category = _ui->mSelectedView->firstChild(); @@ -443,7 +443,7 @@ void KWMailMergeKABCConfig::updateAvailable() for ( TQStringList::Iterator itCat = entryCategories.begin(); itCat != entryCategories.end(); ++itCat ) { - int i = categories.tqfindIndex(*itCat); + int i = categories.findIndex(*itCat); // Create category, if not yet in listview and append item to it. if( i == -1 ) @@ -458,7 +458,7 @@ void KWMailMergeKABCConfig::updateAvailable() else { KWMailMergeKABCConfigListItem* item = new KWMailMergeKABCConfigListItem( - _ui->mAvailableView->tqfindItem( + _ui->mAvailableView->findItem( *itCat, 0, TQt::ExactMatch), *itAddr ); } diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp index 8444b65c..aec361a3 100644 --- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp +++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp @@ -11,7 +11,7 @@ KWQtSqlEasyFilter::KWQtSqlEasyFilter( TQWidget *tqparent) { m_fieldList << "" <<"one" << "two" << "three" << "four"; m_sortingList << ""<<i18n("ascending")<<i18n("descending"); - m_operationList <<"="<<i18n("tqcontains")<< "<" << ">"; + m_operationList <<"="<<i18n("contains")<< "<" << ">"; m_table=new TQTable(6,3,this); setMainWidget(m_table); diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp index f3129420..c091184e 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp @@ -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->tqcontains(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<<<").tqarg(name); return (myquery->value(name)).toString(); } diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 47ce94cf..45ff85bc 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->tqcontains(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<<<").tqarg(name); return (myquery->value(name)).toString(); } diff --git a/kword/tests/FrameViewTester.cpp b/kword/tests/FrameViewTester.cpp index f486e11c..e3444bd5 100644 --- a/kword/tests/FrameViewTester.cpp +++ b/kword/tests/FrameViewTester.cpp @@ -271,11 +271,11 @@ void KWFrameViewTester::testMouseMeaning() { for(int y = 50; y <= 100; y += 25) { for(int offset2=-6; offset2 <= 6; offset2+=6) { point.setY(y + offset2); - CHECK(fv->tqcontains(point, true), true); + CHECK(fv->contains(point, true), true); if(x < 50 || x > 100 || y < 50 || y > 100) - CHECK(fv->tqcontains(point), false); + CHECK(fv->contains(point), false); else - CHECK(fv->tqcontains(point), true); + CHECK(fv->contains(point), true); if(x > 60 && x < 90 && y > 60 && y < 90) CHECK(fv->isBorderHit(point), false); else |