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 | 9a3f0aacd44fb866833ebcb852df3cd31475cb33 (patch) | |
tree | 9f699684624f4e78e13e7dd2393a103cc6fa8274 /kfind | |
parent | 341ad02235b9c85cd31782225181ed475b74eaa3 (diff) | |
download | tdebase-9a3f0aacd44fb866833ebcb852df3cd31475cb33.tar.gz tdebase-9a3f0aacd44fb866833ebcb852df3cd31475cb33.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kfind')
-rw-r--r-- | kfind/kdatecombo.cpp | 4 | ||||
-rw-r--r-- | kfind/kfinddlg.cpp | 2 | ||||
-rw-r--r-- | kfind/kftabdlg.cpp | 4 | ||||
-rw-r--r-- | kfind/kfwin.cpp | 2 | ||||
-rw-r--r-- | kfind/kquery.cpp | 18 |
5 files changed, 15 insertions, 15 deletions
diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index b012cef6b..8f3758344 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -86,7 +86,7 @@ void KDateCombo::mousePressEvent (TQMouseEvent * e) { if (e->button() & Qt::LeftButton) { - if (TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos())) + if (TQT_TQRECT_OBJECT(rect()).contains( e->pos())) { TQDate tempDate; getDate(& tempDate); @@ -103,7 +103,7 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e) { TQMouseEvent *me = (TQMouseEvent *)e; TQPoint p = mapFromGlobal( me->globalPos() ); - if (TQT_TQRECT_OBJECT(rect()).tqcontains( p ) ) + if (TQT_TQRECT_OBJECT(rect()).contains( p ) ) { TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent())); return true; diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp index 557d4b04e..747f69811 100644 --- a/kfind/kfinddlg.cpp +++ b/kfind/kfinddlg.cpp @@ -260,7 +260,7 @@ void KfindDlg::slotNewItems( const TQString& file ) TQListViewItem *checkiter; TQString checkiterwithpath; - if(file.tqfind(query->url().path(+1))==0) + if(file.find(query->url().path(+1))==0) { kdDebug()<<TQString("Can be added, path OK")<<endl; checkiter=win->firstChild(); diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index 990cd9fec..1dbe6b58a 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -390,7 +390,7 @@ void KfindTabWidget::setURL( const KURL & url ) dirBox->insertStringList(sl); // If the _searchPath already exists in the list we do not // want to add it again - int indx = sl.tqfindIndex(m_url.prettyURL()); + int indx = sl.findIndex(m_url.prettyURL()); if(indx == -1) dirBox->insertItem(m_url.prettyURL(), 0); // make it the first one else @@ -472,7 +472,7 @@ void KfindTabWidget::loadHistory() dirBox->insertStringList(sl); // If the _searchPath already exists in the list we do not // want to add it again - int indx = sl.tqfindIndex(m_url.prettyURL()); + int indx = sl.findIndex(m_url.prettyURL()); if(indx == -1) dirBox->insertItem(m_url.prettyURL(), 0); // make it the first one else diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index 27fe22b87..c5c375c22 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -146,7 +146,7 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name ) TQString KfindWindow::reducedDir(const TQString& fullDir) { - if (fullDir.tqfind(m_baseDir)==0) + if (fullDir.find(m_baseDir)==0) { TQString tmp=fullDir.mid(m_baseDir.length()); return tmp; diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp index 4fd874c96..4231f1aab 100644 --- a/kfind/kquery.cpp +++ b/kfind/kquery.cpp @@ -242,7 +242,7 @@ void KQuery::processQuery( KFileItem* file) return; break; default: - if (!m_mimetype.isEmpty() && !m_mimetype.tqcontains(file->mimetype())) + if (!m_mimetype.isEmpty() && !m_mimetype.contains(file->mimetype())) return; } @@ -270,7 +270,7 @@ void KQuery::processQuery( KFileItem* file) continue; metaitem=metadatas.item(*it); strmetakeycontent=metaitem.string(); - if(strmetakeycontent.tqfind(m_metainfo)!=-1) + if(strmetakeycontent.find(m_metainfo)!=-1) { foundmeta=true; break; @@ -285,7 +285,7 @@ void KQuery::processQuery( KFileItem* file) if (!m_context.isEmpty()) { - if( !m_search_binary && ignore_mimetypes.tqfindIndex(file->mimetype()) != -1 ) { + if( !m_search_binary && ignore_mimetypes.findIndex(file->mimetype()) != -1 ) { kdDebug() << "ignoring, mime type is in exclusion list: " << file->url() << endl; return; } @@ -303,8 +303,8 @@ void KQuery::processQuery( KFileItem* file) TQByteArray zippedXmlFileContent; // KWord's and OpenOffice.org's files are zipped... - if( ooo_mimetypes.tqfindIndex(file->mimetype()) != -1 || - koffice_mimetypes.tqfindIndex(file->mimetype()) != -1 ) + if( ooo_mimetypes.findIndex(file->mimetype()) != -1 || + koffice_mimetypes.findIndex(file->mimetype()) != -1 ) { KZip zipfile(file->url().path()); KZipFileEntry *zipfileEntry; @@ -313,7 +313,7 @@ void KQuery::processQuery( KFileItem* file) { const KArchiveDirectory *zipfileContent = zipfile.directory(); - if( koffice_mimetypes.tqfindIndex(file->mimetype()) != -1 ) + if( koffice_mimetypes.findIndex(file->mimetype()) != -1 ) zipfileEntry = (KZipFileEntry*)zipfileContent->entry("maindoc.xml"); else zipfileEntry = (KZipFileEntry*)zipfileContent->entry("content.xml"); //for OpenOffice.org @@ -359,7 +359,7 @@ void KQuery::processQuery( KFileItem* file) if (str.isNull()) break; if(isZippedOfficeDocument) - str.tqreplace(xmlTags, ""); + str.replace(xmlTags, ""); if (m_regexpForContent) { @@ -373,7 +373,7 @@ void KQuery::processQuery( KFileItem* file) else { if ((!str.isNull()) && (!m_context.isNull())) { - if (str.tqfind(m_context, 0, m_casesensitive) != -1) + if (str.find(m_context, 0, m_casesensitive) != -1) { matchingLine=TQString::number(matchingLineNumber)+": "+str; found = true; @@ -458,7 +458,7 @@ void KQuery::setRegExp(const TQString ®exp, bool caseSensitive) // m_regexpsContainsGlobs.clear(); for ( TQStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) { regExp = new TQRegExp((*it),caseSensitive,true); -// m_regexpsContainsGlobs.append(regExp->pattern().tqcontains(globChars)); +// m_regexpsContainsGlobs.append(regExp->pattern().contains(globChars)); m_regexps.append(regExp); } } |