From 4c6f8d69e2d1501837affb472c4eb8fec4462240 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmail/snippetwidget.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kmail/snippetwidget.cpp') diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 442a36e15..4dba053ed 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -146,7 +146,7 @@ SnippetItem* SnippetWidget::makeItem( SnippetItem* tqparent, const TQString& nam { SnippetItem * item = new SnippetItem(tqparent, name, text); const TQString actionName = i18n("Snippet %1").tqarg(name); - const TQString normalizedName = TQString(actionName).tqreplace(" ", "_"); + const TQString normalizedName = TQString(actionName).replace(" ", "_"); if ( !mActionCollection->action(normalizedName.utf8().data() ) ) { KAction * action = new KAction( actionName, shortcut, item, TQT_SLOT( slotExecute() ), mActionCollection, @@ -578,9 +578,9 @@ TQString SnippetWidget::parseText(TQString text, TQString del) TQRect rMulti = _SnippetConfig.getMultiRect(); do { - iFound = text.tqfind(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this TQRegExp + iFound = text.find(TQRegExp("\\"+del+"[A-Za-z-_0-9\\s]*\\"+del), iEnd+1); //find the next variable by this TQRegExp if (iFound >= 0) { - iEnd = text.tqfind(del, iFound+1)+1; + iEnd = text.find(del, iFound+1)+1; strName = text.mid(iFound, iEnd-iFound); if ( strName != del+del ) { //if not doubel-delimiter @@ -601,7 +601,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del) } if (iInMeth == 0) { //if input-method "single" is selected - str.tqreplace(strName, strNew); + str.replace(strName, strNew); } mapVar[strName] = strNew; @@ -616,7 +616,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del) if (showMultiVarDialog( &mapVar, &_mapSaved, w, bh, oh )) { //generate and show the dialog TQMap::Iterator it; for ( it = mapVar.begin(); it != mapVar.end(); ++it ) { //walk through the map and do the replacement - str.tqreplace(it.key(), it.data()); + str.replace(it.key(), it.data()); } } else { return ""; -- cgit v1.2.1