diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | b6edfe41c9395f2e20784cbf0e630af6426950a3 (patch) | |
tree | 56ed9b871d4296e6c15949c24e16420be1b28697 /kword/KWDocument.cpp | |
parent | ef39e8e4178a8f98cf5f154916ba0f03e4855206 (diff) | |
download | koffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.tar.gz koffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kword/KWDocument.cpp')
-rw-r--r-- | kword/KWDocument.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
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; } |