diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp index a0ed07a9..8af207a5 100644 --- a/cervisia/addremovedlg.cpp +++ b/cervisia/addremovedlg.cpp @@ -85,10 +85,10 @@ void AddRemoveDialog::setFileList(const TQStringList& files) { // the dot for the root directory is hard to see, so // we convert it to the absolut path - if( files.tqfind(".") != files.end() ) + if( files.find(".") != files.end() ) { TQStringList copy(files); - int idx = copy.tqfindIndex("."); + int idx = copy.findIndex("."); copy[idx] = TQFileInfo(".").absFilePath(); m_listBox->insertStringList(copy); @@ -98,4 +98,4 @@ void AddRemoveDialog::setFileList(const TQStringList& files) } -// kate: space-indent on; indent-width 4; tqreplace-tabs on; +// kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/cervisia/addremovedlg.h b/cervisia/addremovedlg.h index e151e097..b40452e6 100644 --- a/cervisia/addremovedlg.h +++ b/cervisia/addremovedlg.h @@ -46,4 +46,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tqreplace-tabs on; +// kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp index 8a4d05fd..0da05021 100644 --- a/cervisia/addrepositorydlg.cpp +++ b/cervisia/addrepositorydlg.cpp @@ -180,9 +180,9 @@ void AddRepositoryDialog::repoChanged() { TQString repo = repository(); rsh_edit->setEnabled((!repo.startsWith(":pserver:")) - && repo.tqcontains(":")); - m_useDifferentCompression->setEnabled(repo.tqcontains(":")); - if( !repo.tqcontains(":") ) + && repo.contains(":")); + m_useDifferentCompression->setEnabled(repo.contains(":")); + if( !repo.contains(":") ) m_compressionLevel->setEnabled(false); else compressionToggled(m_useDifferentCompression->isChecked()); diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp index 6fccdae6..108a4fda 100644 --- a/cervisia/cervisiapart.cpp +++ b/cervisia/cervisiapart.cpp @@ -649,7 +649,7 @@ void CervisiaPart::popupRequested(KListView*, TQListViewItem* item, const TQPoin if( isFileItem(item) ) { // remove old 'Edit with...' menu - if( m_editWithId && popup->tqfindItem(m_editWithId) != 0 ) + if( m_editWithId && popup->findItem(m_editWithId) != 0 ) { popup->removeItem(m_editWithId); delete m_currentEditMenu; @@ -969,7 +969,7 @@ void CervisiaPart::slotCommit() return; TQString msg = dlg.logMessage(); - if( !recentCommits.tqcontains( msg ) ) + if( !recentCommits.contains( msg ) ) { recentCommits.prepend( msg ); while (recentCommits.count() > 50) @@ -1504,7 +1504,7 @@ void CervisiaPart::slotLastChange() int pos, lastnumber; bool ok; - if ( (pos = revA.tqfindRev('.')) == -1 + if ( (pos = revA.findRev('.')) == -1 || (lastnumber=revA.right(revA.length()-pos-1).toUInt(&ok), !ok) ) { KMessageBox::sorry(widget(), @@ -1757,7 +1757,7 @@ bool CervisiaPart::openSandbox(const TQString &dirname) KConfig *conf = config(); conf->setGroup("General"); - bool dostatus = conf->readBoolEntry(repository.tqcontains(":")? + bool dostatus = conf->readBoolEntry(repository.contains(":")? "StatusForRemoteRepos" : "StatusForLocalRepos", false); diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp index e2b09697..f6ed66e8 100644 --- a/cervisia/checkoutdlg.cpp +++ b/cervisia/checkoutdlg.cpp @@ -198,7 +198,7 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service, TQStringList list2 = Repositories::readConfigFile(); TQStringList::ConstIterator it2; for (it2 = list2.begin(); it2 != list2.end(); ++it2) - if (!list1.tqcontains(*it2)) + if (!list1.contains(*it2)) repo_combo->insertItem(*it2); setHelp((act == Import) ? "importing" : "checkingout"); @@ -353,9 +353,9 @@ void CheckoutDialog::moduleButtonClicked() if (str.left(12) == "Unknown host") continue; - int pos = str.tqfind(' '); + int pos = str.find(' '); if (pos == -1) - pos = str.tqfind('\t'); + pos = str.find('\t'); if (pos == -1) pos = str.length(); TQString module( str.left(pos).stripWhiteSpace() ); @@ -398,11 +398,11 @@ void CheckoutDialog::branchButtonClicked() if( line.isEmpty() || line[0] != '\t' ) continue; - if( (colonPos = line.tqfind(':', 1)) < 0 ) + if( (colonPos = line.find(':', 1)) < 0 ) continue; const TQString tag = line.mid(1, colonPos - 1); - if( !branchTagList.tqcontains(tag) ) + if( !branchTagList.contains(tag) ) branchTagList.push_back(tag); } diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp index 5077e5d8..ff9fb144 100644 --- a/cervisia/commitdlg.cpp +++ b/cervisia/commitdlg.cpp @@ -185,7 +185,7 @@ void CommitDialog::setLogHistory(const TQStringList &list) continue; TQString txt = *it; - int index = txt.tqfind('\n', 0); + int index = txt.find('\n', 0); if ( index != -1 ) // Fetch first line { txt = txt.mid(0, index); diff --git a/cervisia/cvsservice/cvsloginjob.cpp b/cervisia/cvsservice/cvsloginjob.cpp index 0288df0e..ad6f9176 100644 --- a/cervisia/cvsservice/cvsloginjob.cpp +++ b/cervisia/cvsservice/cvsloginjob.cpp @@ -97,15 +97,15 @@ bool CvsLoginJob::execute() kdDebug(8051) << "process output = " << line << endl; // retrieve repository from 'Logging in to'-line - if( line.tqcontains(LOGIN_PHRASE) ) + if( line.contains(LOGIN_PHRASE) ) { - repository = line.remove(0, line.tqfind(":pserver:")); + repository = line.remove(0, line.find(":pserver:")); continue; } // process asks for the password // search case insensitive as cvs and cvsnt use different capitalization - if( line.tqcontains(PASS_PHRASE, false) ) + if( line.contains(PASS_PHRASE, false) ) { kdDebug(8051) << "process waits for the password." << endl; @@ -123,7 +123,7 @@ bool CvsLoginJob::execute() m_Proc->writeLine(password); // wait for the result - while( !line.tqcontains(FAILURE_PHRASE) ) + while( !line.contains(FAILURE_PHRASE) ) { line = m_Proc->readLine(); if( line.isNull() ) diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp index 2ac4c241..822a77ae 100644 --- a/cervisia/cvsservice/repository.cpp +++ b/cervisia/cvsservice/repository.cpp @@ -157,7 +157,7 @@ bool Repository::setWorkingCopy(const TQString& dirName) // add identities (ssh-add) to ssh-agent // TODO CL make sure this is called only once - if( d->location.tqcontains(":ext:", false) > 0 ) + if( d->location.contains(":ext:", false) > 0 ) { SshAgent ssh; ssh.addSshIdentities(); @@ -227,7 +227,7 @@ void Repository::Private::readConfig() if( !config->hasGroup(repositoryGroup) ) { // find the position of the first path separator - const int insertPos = repositoryGroup.tqfind('/'); + const int insertPos = repositoryGroup.find('/'); if( insertPos > 0 ) { // add port to location diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp index 43cf0b1b..7c77ec6e 100644 --- a/cervisia/diffview.cpp +++ b/cervisia/diffview.cpp @@ -173,8 +173,8 @@ void DiffView::addLine(const TQString &line, DiffType type, int no) // For some fonts, e.g. "Clean", is fm.maxWidth() greater than // fmbold.maxWidth(). TQString copy(line); - const int numTabs = copy.tqcontains('\t', false); - copy.tqreplace( TQRegExp("\t"), ""); + const int numTabs = copy.contains('\t', false); + copy.replace( TQRegExp("\t"), ""); const int tabSize = m_tabWidth * TQMAX(fm.maxWidth(), fmbold.maxWidth()); const int copyWidth = TQMAX(fm.width(copy), fmbold.width(copy)); @@ -211,7 +211,7 @@ int DiffView::findLine(int lineno) int offset; DiffViewItem tmp; tmp.no = lineno; - if ( (offset = items.tqfind(&tmp)) == -1) + if ( (offset = items.find(&tmp)) == -1) { kdDebug(8050) << "Internal Error: Line " << lineno << " not found" << endl; return -1; diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp index cb519b0b..b200002d 100644 --- a/cervisia/historydlg.cpp +++ b/cervisia/historydlg.cpp @@ -40,7 +40,7 @@ static TQDateTime parseDate(const TQString& date, const TQString& _time, const T { // cvs history only prints hh:mm but parseDateISO8601 needs hh:mm:ss TQString time(_time); - if( time.tqcontains(':') == 1 ) + if( time.contains(':') == 1 ) time += ":00"; TQDateTime dateTime; diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp index 9b5df78f..b357493b 100644 --- a/cervisia/logdlg.cpp +++ b/cervisia/logdlg.cpp @@ -62,7 +62,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *tqparent, const char *name) Ok | Apply | Close | Help | User1 | User2 | User3, Close, true, KGuiItem(i18n("&Annotate")), KGuiItem(i18n("&Diff"), "vcs_diff"), - KGuiItem(i18n("&Find..."), "tqfind")) + KGuiItem(i18n("&Find..."), "find")) , cvsService(0) , partConfig(cfg) { @@ -262,8 +262,8 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName) const TQString tag(strlist[0].simplifyWhiteSpace()); TQString branchpoint; int pos1, pos2; - if( (pos2 = rev.tqfindRev('.')) > 0 && - (pos1 = rev.tqfindRev('.', pos2-1)) > 0 && + if( (pos2 = rev.findRev('.')) > 0 && + (pos1 = rev.findRev('.', pos2-1)) > 0 && rev.mid(pos1+1, pos2-pos1-1) == "0" ) { // For a branch tag 2.10.0.6, we want: @@ -303,7 +303,7 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName) // convert date into ISO format (YYYY-MM-DDTHH:MM:SS) int len = strList[0].length(); TQString dateTimeStr = strList[0].right(len-6); // remove 'date: ' - dateTimeStr.tqreplace('/', '-'); + dateTimeStr.replace('/', '-'); TQString date = dateTimeStr.section(' ', 0, 0); TQString time = dateTimeStr.section(' ', 1, 1); @@ -338,8 +338,8 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName) TQString branchrev; int pos1, pos2; // 1.60.x.y => revision belongs to branch 1.60.0.x - if( (pos2 = rev.tqfindRev('.')) > 0 && - (pos1 = rev.tqfindRev('.', pos2-1)) > 0 ) + if( (pos2 = rev.findRev('.')) > 0 && + (pos1 = rev.findRev('.', pos2-1)) > 0 ) branchrev = rev.left(pos2); // Build Cervisia::TagInfo for logInfo diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp index 5b7bec74..39254ebc 100644 --- a/cervisia/loglist.cpp +++ b/cervisia/loglist.cpp @@ -78,7 +78,7 @@ TQString LogListViewItem::truncateLine(const TQString &s) int pos; TQString res = s.simplifyWhiteSpace(); - if ( (pos = res.tqfind('\n')) != -1 ) + if ( (pos = res.find('\n')) != -1 ) res = res.left(pos) + "..."; return res; diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp index e97a5d68..633981d6 100644 --- a/cervisia/logmessageedit.cpp +++ b/cervisia/logmessageedit.cpp @@ -159,7 +159,7 @@ void LogMessageEdit::tryCompletion() if( paragraphText.at(index).isSpace() ) { if( !m_completing ) - m_completionStartPos = paragraphText.tqfindRev(' ', index-1) + 1; + m_completionStartPos = paragraphText.findRev(' ', index-1) + 1; int length = index - m_completionStartPos; TQString word = paragraphText.mid(m_completionStartPos, length); diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp index 2f965baf..ad541f90 100644 --- a/cervisia/logplainview.cpp +++ b/cervisia/logplainview.cpp @@ -33,7 +33,7 @@ using namespace Cervisia; LogPlainView::LogPlainView(TQWidget* tqparent, const char* name) : KTextBrowser(tqparent, name) - , m_tqfind(0) + , m_find(0) , m_findPos(0) { setNotifyClick(false); @@ -42,7 +42,7 @@ LogPlainView::LogPlainView(TQWidget* tqparent, const char* name) LogPlainView::~LogPlainView() { - delete m_tqfind; m_tqfind = 0; + delete m_find; m_find = 0; } @@ -107,11 +107,11 @@ void LogPlainView::addRevision(const LogInfo& logInfo) void LogPlainView::searchText(int options, const TQString& pattern) { - m_tqfind = new KFind(pattern, options, this); + m_find = new KFind(pattern, options, this); - connect(m_tqfind, TQT_SIGNAL(highlight(const TQString&, int, int)), + connect(m_find, TQT_SIGNAL(highlight(const TQString&, int, int)), this, TQT_SLOT(searchHighlight(const TQString&, int, int))); - connect(m_tqfind, TQT_SIGNAL(findNext()), + connect(m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(findNext())); m_findPos = 0; @@ -140,24 +140,24 @@ void LogPlainView::findNext() while( res == KFind::NoMatch && m_findPos < paragraphs() && m_findPos >= 0 ) { - if( m_tqfind->needData() ) + if( m_find->needData() ) { TQString richText = text(m_findPos); - // tqreplace
with '\n' - richText.tqreplace(breakLineTag, "\n"); + // replace
with '\n' + richText.replace(breakLineTag, "\n"); // remove html tags from text - richText.tqreplace(htmlTags, ""); + richText.replace(htmlTags, ""); - m_tqfind->setData(richText); + m_find->setData(richText); } - res = m_tqfind->find(); + res = m_find->find(); if( res == KFind::NoMatch ) { - if( m_tqfind->options() & KFindDialog::FindBackwards ) + if( m_find->options() & KFindDialog::FindBackwards ) --m_findPos; else ++m_findPos; @@ -167,15 +167,15 @@ void LogPlainView::findNext() // reached the end? if( res == KFind::NoMatch ) { - if( m_tqfind->shouldRestart() ) + if( m_find->shouldRestart() ) { m_findPos = 0; findNext(); } else { - delete m_tqfind; - m_tqfind = 0; + delete m_find; + m_find = 0; } } } diff --git a/cervisia/logplainview.h b/cervisia/logplainview.h index 90e60c69..606ccf08 100644 --- a/cervisia/logplainview.h +++ b/cervisia/logplainview.h @@ -56,7 +56,7 @@ protected: virtual void setSource(const TQString& name); private: - KFind* m_tqfind; + KFind* m_find; int m_findPos; }; diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp index 9ae65930..bda58b89 100644 --- a/cervisia/logtree.cpp +++ b/cervisia/logtree.cpp @@ -105,8 +105,8 @@ void LogTreeView::addRevision(const Cervisia::LogInfo& logInfo) // find branch int pos1, pos2; - if ((pos2 = rev.tqfindRev('.')) > 0 && - (pos1 = rev.tqfindRev('.', pos2-1)) > 0) + if ((pos2 = rev.findRev('.')) > 0 && + (pos1 = rev.findRev('.', pos2-1)) > 0) { // e. g. for rev = 1.1.2.3 we have // branchrev = 1.1.2, branchpoint = 1.1 diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp index a0eb35be..779fbe98 100644 --- a/cervisia/misc.cpp +++ b/cervisia/misc.cpp @@ -95,14 +95,14 @@ static const TQStringList FetchBranchesAndTags(const TQString& searchedType, continue; if( (wsPos = FindWhiteSpace(line, 2)) < 0 ) continue; - if( (bracketPos = line.tqfind('(', wsPos + 1)) < 0 ) + if( (bracketPos = line.find('(', wsPos + 1)) < 0 ) continue; - if( (colonPos = line.tqfind(':', bracketPos + 1)) < 0 ) + if( (colonPos = line.find(':', bracketPos + 1)) < 0 ) continue; const TQString tag = line.mid(1, wsPos - 1); const TQString type = line.mid(bracketPos + 1, colonPos - bracketPos - 1); - if( type == searchedType && !branchOrTagList.tqcontains(tag) ) + if( type == searchedType && !branchOrTagList.contains(tag) ) branchOrTagList.push_back(tag); } @@ -122,7 +122,7 @@ bool Cervisia::IsValidTag(const TQString& tag) for( uint i = 1; i < tag.length(); ++i ) { - if( !isgraph(tag[i].latin1()) || prohibitedChars.tqcontains(tag[i]) ) + if( !isgraph(tag[i].latin1()) || prohibitedChars.contains(tag[i]) ) return false; } @@ -248,7 +248,7 @@ TQStringList splitLine(TQString line, char delim) TQStringList list; line = line.simplifyWhiteSpace(); - while ((pos = line.tqfind(delim)) != -1) + while ((pos = line.find(delim)) != -1) { list.append(line.left(pos)); line = line.mid(pos+1, line.length()-pos-1); @@ -309,12 +309,12 @@ int compareRevisions(const TQString& rev1, const TQString& rev2) int startPos2(0); while (startPos1 < length1 && startPos2 < length2) { - int pos1(rev1.tqfind('.', startPos1)); + int pos1(rev1.find('.', startPos1)); if (pos1 < 0) pos1 = length1; const int partLength1(pos1 - startPos1); - int pos2(rev2.tqfind('.', startPos2)); + int pos2(rev2.find('.', startPos2)); if (pos2 < 0) pos2 = length2; const int partLength2(pos2 - startPos2); diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp index d77c25f2..ca3c975c 100644 --- a/cervisia/progressdlg.cpp +++ b/cervisia/progressdlg.cpp @@ -252,7 +252,7 @@ void ProgressDialog::startGuiPart() void ProgressDialog::processOutput() { int pos; - while( (pos = d->buffer.tqfind('\n')) != -1 ) + while( (pos = d->buffer.find('\n')) != -1 ) { TQString item = d->buffer.left(pos); if( item.startsWith(d->errorId1) || diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp index b4456331..f091ba80 100644 --- a/cervisia/protocolview.cpp +++ b/cervisia/protocolview.cpp @@ -142,7 +142,7 @@ void ProtocolView::slotJobExited(bool normalExit, int exitStatus) void ProtocolView::processOutput() { int pos; - while ( (pos = buf.tqfind('\n')) != -1) + while ( (pos = buf.find('\n')) != -1) { TQString line = buf.left(pos); if (!line.isEmpty()) diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp index 9e555d50..f50005df 100644 --- a/cervisia/qttableview.cpp +++ b/cervisia/qttableview.cpp @@ -1279,7 +1279,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) TQPainter paint( this ); - if ( !contentsRect().tqcontains( updateR, TRUE ) ) {// update frame ? + if ( !contentsRect().contains( updateR, TRUE ) ) {// update frame ? drawFrame( &paint ); if ( updateR.left() < frameWidth() ) //### updateR.setLeft( frameWidth() ); @@ -1342,7 +1342,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) matrix.translate( xPos, yPos ); paint.setWorldMatrix( matrix ); if ( testTableFlags(Tbl_clipCellPainting) || - frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt + frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); paint.setClipping( FALSE ); @@ -1354,7 +1354,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) #else paint.translate( xPos, yPos ); if ( testTableFlags(Tbl_clipCellPainting) || - frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt + frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); paint.setClipping( FALSE ); diff --git a/cervisia/repositories.cpp b/cervisia/repositories.cpp index c8da2857..7f52a39d 100644 --- a/cervisia/repositories.cpp +++ b/cervisia/repositories.cpp @@ -59,7 +59,7 @@ static TQStringList readCvsPassFile() { int pos; TQString line = stream.readLine(); - if ( (pos = line.tqfind(' ')) != -1) + if ( (pos = line.find(' ')) != -1) { if (line[0] != '/') // old format list.append(line.left(pos)); @@ -88,7 +88,7 @@ static TQStringList readCvsntPassFile() { const TQString line(stream.readLine()); - const int pos(line.tqfind("=A")); + const int pos(line.find("=A")); if (pos >= 0) list.append(line.left(pos)); } @@ -117,7 +117,7 @@ TQStringList Repositories::readConfigFile() // Some people actually use CVSROOT, so we add it here char *env; - if ( (env = ::getenv("CVSROOT")) != 0 && !list.tqcontains(env)) + if ( (env = ::getenv("CVSROOT")) != 0 && !list.contains(env)) list.append(env); return list; diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp index d152b1b0..b5d50e1b 100644 --- a/cervisia/repositorydlg.cpp +++ b/cervisia/repositorydlg.cpp @@ -105,7 +105,7 @@ void RepositoryListItem::setRsh(const TQString& rsh) method = "pserver"; else if( repo.startsWith(":sspi:") ) method = "sspi"; - else if( repo.tqcontains(':') ) + else if( repo.contains(':') ) { method = "ext"; if( !rsh.isEmpty() ) @@ -501,4 +501,4 @@ void RepositoryDialog::writeRepositoryData(RepositoryListItem* item) #include "repositorydlg.moc" -// kate: space-indent on; indent-width 4; tqreplace-tabs on; +// kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/cervisia/repositorydlg.h b/cervisia/repositorydlg.h index 3dc7d2f5..dde4fee6 100644 --- a/cervisia/repositorydlg.h +++ b/cervisia/repositorydlg.h @@ -75,4 +75,4 @@ private: #endif -// kate: space-indent on; indent-width 4; tqreplace-tabs on; +// kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp index 5bf34db3..3665c9ba 100644 --- a/cervisia/resolvedlg.cpp +++ b/cervisia/resolvedlg.cpp @@ -72,7 +72,7 @@ public: return m_currentLine; } - m_endPos = m_text.tqfind('\n', m_startPos); + m_endPos = m_text.find('\n', m_startPos); int length = m_endPos - m_startPos + 1; m_currentLine = m_text.mid(m_startPos, length); diff --git a/cervisia/stringmatcher.cpp b/cervisia/stringmatcher.cpp index 189ee925..0c7e833c 100644 --- a/cervisia/stringmatcher.cpp +++ b/cervisia/stringmatcher.cpp @@ -43,7 +43,7 @@ namespace bool StringMatcher::match(const TQString& text) const { - if (m_exactPatterns.tqfind(text) != m_exactPatterns.end()) + if (m_exactPatterns.find(text) != m_exactPatterns.end()) { return true; } diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp index d898e80c..df3c4977 100644 --- a/cervisia/tooltip.cpp +++ b/cervisia/tooltip.cpp @@ -66,7 +66,7 @@ TQString truncateLines(const TQString& text, const TQChar newLine('\n'); const int lineSpacing(fm.lineSpacing()); - const int numberOfLines(text.tqcontains(newLine) + 1); + const int numberOfLines(text.contains(newLine) + 1); const int maxNumberOfLines(size.height() / lineSpacing); if (numberOfLines <= maxNumberOfLines) diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp index a60e0cd9..50f7825a 100644 --- a/cervisia/updateview.cpp +++ b/cervisia/updateview.cpp @@ -191,9 +191,9 @@ bool UpdateView::isUnfoldingTree() const void UpdateView::replaceItem(TQListViewItem* oldItem, TQListViewItem* newItem) { - const int index(relevantSelection.tqfind(oldItem)); + const int index(relevantSelection.find(oldItem)); if (index >= 0) - relevantSelection.tqreplace(index, newItem); + relevantSelection.replace(index, newItem); } @@ -208,8 +208,8 @@ void UpdateView::unfoldSelectedFolders() // setup name of selected folder TQString selectedItem = selection.first(); - if( selectedItem.tqcontains('/') ) - selectedItem.remove(0, selectedItem.tqfindRev('/')+1); + if( selectedItem.contains('/') ) + selectedItem.remove(0, selectedItem.findRev('/')+1); // avoid flicker const bool updatesEnabled = isUpdatesEnabled(); diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp index 44f81853..a29ca153 100644 --- a/cervisia/updateview_items.cpp +++ b/cervisia/updateview_items.cpp @@ -245,7 +245,7 @@ UpdateItem* UpdateDirItem::insertItem(UpdateItem* item) UpdateItem* UpdateDirItem::findItem(const TQString& name) const { - const TMapItemsByName::const_iterator it = m_itemsByName.tqfind(name); + const TMapItemsByName::const_iterator it = m_itemsByName.find(name); return (it != m_itemsByName.end()) ? *it : 0; } @@ -288,7 +288,7 @@ TQDateTime parseDateTime(const TQString &s) TQDate date( year, month, day ); TQTime time; int hour, minute, second; - int pivot = s.tqfind( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) ); + int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) ); if ( pivot != -1 ) { hour = s.mid( pivot, 2 ).toInt(); minute = s.mid( pivot+3, 2 ).toInt(); @@ -337,7 +337,7 @@ void UpdateDirItem::syncWithEntries() const TQString options(line.section('/', 4, 4)); entry.m_tag = line.section('/', 5, 5); - const bool isBinary(options.tqfind("-kb") >= 0); + const bool isBinary(options.find("-kb") >= 0); // file date in local time entry.m_dateTime = TQFileInfo(path + entry.m_name).lastModified(); @@ -349,7 +349,7 @@ void UpdateDirItem::syncWithEntries() entry.m_status = Cervisia::LocallyRemoved; rev.remove(0, 1); } - else if (timestamp.tqfind('+') >= 0) + else if (timestamp.find('+') >= 0) { entry.m_status = Cervisia::Conflict; } diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp index ea42f053..73165762 100644 --- a/cervisia/watchersdlg.cpp +++ b/cervisia/watchersdlg.cpp @@ -103,15 +103,15 @@ bool WatchersDialog::parseWatchers(CvsService_stub* cvsService, table->setText(numRows, 1, list[1]); TQCheckTableItem* item = new TQCheckTableItem(table, ""); - item->setChecked(list.tqcontains("edit")); + item->setChecked(list.contains("edit")); table->setItem(numRows, 2, item); item = new TQCheckTableItem(table, ""); - item->setChecked(list.tqcontains("unedit")); + item->setChecked(list.contains("unedit")); table->setItem(numRows, 3, item); item = new TQCheckTableItem(table, ""); - item->setChecked(list.tqcontains("commit")); + item->setChecked(list.contains("commit")); table->setItem(numRows, 4, item); ++numRows; diff --git a/kapptemplate/appframework/app.spec b/kapptemplate/appframework/app.spec index 8cd1be53..b0f3fd48 100644 --- a/kapptemplate/appframework/app.spec +++ b/kapptemplate/appframework/app.spec @@ -34,8 +34,8 @@ make -j$numprocs make install-strip DESTDIR=\$RPM_BUILD_ROOT cd $RPM_BUILD_ROOT -tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/%{name}-master.list -tqfind . -type f -o -type l | sed 's|^\.||' >> \$RPM_BUILD_DIR/%{name}-master.list +find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/%{name}-master.list +find . -type f -o -type l | sed 's|^\.||' >> \$RPM_BUILD_DIR/%{name}-master.list %clean rm -rf \$RPM_BUILD_DIR/%{name}-%{version} diff --git a/kapptemplate/kapptemplate.common b/kapptemplate/kapptemplate.common index a5a63a16..8cff2d60 100644 --- a/kapptemplate/kapptemplate.common +++ b/kapptemplate/kapptemplate.common @@ -299,7 +299,7 @@ function GetFileList if [ -d "$DIRECTORY" ]; then # FILES=`/bin/ls -1 -I "no-exe" -I*~ $DIRECTORY`; - FILES=`cd $DIRECTORY; tqfind . ! -name "*~" -maxdepth 1 -type f -print | sed 's,^\./,,' | sort`; + FILES=`cd $DIRECTORY; find . ! -name "*~" -maxdepth 1 -type f -print | sed 's,^\./,,' | sort`; if [ ! "$FILES" ]; then diff --git a/kapptemplate/kapptemplate.in b/kapptemplate/kapptemplate.in index 7490f94e..dde86d04 100644 --- a/kapptemplate/kapptemplate.in +++ b/kapptemplate/kapptemplate.in @@ -13,7 +13,7 @@ function LoadDefaults { # horrid hack to try and figure out what shell we are using - # basically, if we can tqfind /usr/ucb/echo, then we are almost for sure + # basically, if we can find /usr/ucb/echo, then we are almost for sure # NOT on a Linux system and probably 'echo "\c" works. if we don't # find it, we'll assume that the shell is really bash. if [ -f "/usr/ucb/echo" ]; diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp index 87eb5dbf..22f6fb5e 100644 --- a/kbabel/addons/preview/pothumbcreator.cpp +++ b/kbabel/addons/preview/pothumbcreator.cpp @@ -207,7 +207,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage if(!poInfo.encoding.isEmpty()) text += poInfo.encoding+'\n'; - int lines = text.tqcontains('\n')+1; + int lines = text.contains('\n')+1; if(lines < numLines) { text = poInfo.headerComment+'\n'+text; @@ -286,7 +286,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage // physical newline in the file if we don't come from one if ( !newLine ) { - int pos = text.tqfind( '\n', i ); + int pos = text.find( '\n', i ); if ( pos > (int) i ) i = pos +1; } diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp index d8b5168c..906437c6 100644 --- a/kbabel/catalogmanager/catalogmanager.cpp +++ b/kbabel/catalogmanager/catalogmanager.cpp @@ -235,10 +235,10 @@ void CatalogManager::setupActions() // the edit menu action = new KAction( i18n("Fi&nd in Files..."), CTRL+Key_F, TQT_TQOBJECT(this), - TQT_SLOT(tqfind()), actionCollection(), "find_in_files"); + TQT_SLOT(find()), actionCollection(), "find_in_files"); action->setEnabled(false); action = new KAction( i18n("Re&place in Files..."), CTRL+Key_R, TQT_TQOBJECT(this), - TQT_SLOT(tqreplace()), actionCollection(), "replace_in_files"); + TQT_SLOT(replace()), actionCollection(), "replace_in_files"); action->setEnabled(false); action = new KAction( i18n("&Stop Searching"), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(stopSearching()), actionCollection(), "stop_search"); @@ -928,7 +928,7 @@ void CatalogManager::slotHelp() kapp->invokeHelp("CATALOGMANAGER","kbabel"); } -void CatalogManager::tqfind() +void CatalogManager::find() { if( !_findDialog ) _findDialog = new FindInFilesDialog(false,this); @@ -950,8 +950,8 @@ void CatalogManager::tqfind() _findOptions.accelMarker = _project->miscSettings().accelMarker; _foundFilesList.clear(); - kdDebug(KBABEL_CATMAN) << "Calling catalogmanagerview::tqfind" << endl; - TQString url = _catalogManager->tqfind(_findOptions, _toBeSearched ); + kdDebug(KBABEL_CATMAN) << "Calling catalogmanagerview::find" << endl; + TQString url = _catalogManager->find(_findOptions, _toBeSearched ); if( _catalogManager->isStopped() ) return; if( !url.isEmpty() ) @@ -1011,7 +1011,7 @@ void CatalogManager::tqfind() } } -void CatalogManager::tqreplace() +void CatalogManager::replace() { if( !_replaceDialog ) _replaceDialog = new FindInFilesDialog(true,this); @@ -1036,7 +1036,7 @@ void CatalogManager::tqreplace() options.accelMarker = _project->miscSettings().accelMarker; _foundFilesList.clear(); - TQString url = _catalogManager->tqfind(options, _toBeSearched ); + TQString url = _catalogManager->find(options, _toBeSearched ); if( _catalogManager->isStopped() ) return; if( !url.isEmpty() ) diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h index 89fdef13..bb4e2e58 100644 --- a/kbabel/catalogmanager/catalogmanager.h +++ b/kbabel/catalogmanager/catalogmanager.h @@ -100,8 +100,8 @@ public slots: void selectedChanged(uint actionValue); virtual void slotHelp(); - virtual void tqfind(); - virtual void tqreplace(); + virtual void find(); + virtual void replace(); virtual void stopSearching(); virtual void optionsPreferences(); virtual void optionsShowStatusbar(bool on); diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp index 54d177b4..63f2a077 100644 --- a/kbabel/catalogmanager/catalogmanagerview.cpp +++ b/kbabel/catalogmanager/catalogmanagerview.cpp @@ -1270,7 +1270,7 @@ void CatalogManagerView::showLog() _logWindow->show(); } -TQString CatalogManagerView::tqfind( FindOptions &options, TQStringList &rest ) +TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) { CatManListItem* i=(CatManListItem*) currentItem(); @@ -1391,8 +1391,8 @@ bool CatalogManagerView::hasMatchingWords( TQStringList &itemWords, TQStringList for( TQStringList::const_iterator it1 = searchWords.constBegin() ; it1 != searchWords.constEnd() ; ++it1 ) for( TQStringList::const_iterator it2 = itemWords.constBegin() ; it2 != itemWords.constEnd() ; ++it2 ) if( *it1 == *it2 - || (*it1).tqcontains(*it2) - || (*it2).tqcontains(*it1) ) return true; + || (*it1).contains(*it2) + || (*it2).contains(*it1) ) return true; return false; } @@ -1609,11 +1609,11 @@ void CatalogManagerView::slotDirCommand(int index) if(index>=0 && item && item->isDir()) { TQString cmd=*(_settings.dirCommands).at(index); - cmd.tqreplace("@PACKAGE@",item->name()); - cmd.tqreplace("@PODIR@",item->poFile()); - cmd.tqreplace("@POTDIR@",item->potFile()); - cmd.tqreplace("@POFILES@",current().join(" ")); - cmd.tqreplace("@MARKEDPOFILES@",marked().join(" ")); + cmd.replace("@PACKAGE@",item->name()); + cmd.replace("@PODIR@",item->poFile()); + cmd.replace("@POTDIR@",item->potFile()); + cmd.replace("@POFILES@",current().join(" ")); + cmd.replace("@MARKEDPOFILES@",marked().join(" ")); kdDebug(KBABEL_CATMAN) << cmd << endl; @@ -1641,12 +1641,12 @@ void CatalogManagerView::slotFileCommand(int index) CatManListItem* tqparent = (CatManListItem*)item->tqparent(); TQString cmd=*(_settings.fileCommands).at(index); - cmd.tqreplace("@PACKAGE@",item->name()); - cmd.tqreplace("@POFILE@",item->poFile()); - cmd.tqreplace("@POTFILE@",item->potFile()); - cmd.tqreplace("@PODIR@",tqparent->poFile()); - cmd.tqreplace("@POTDIR@",tqparent->potFile()); - cmd.tqreplace("@POEMAIL@",item->text(COL_TRANSLATOR)); + cmd.replace("@PACKAGE@",item->name()); + cmd.replace("@POFILE@",item->poFile()); + cmd.replace("@POTFILE@",item->potFile()); + cmd.replace("@PODIR@",tqparent->poFile()); + cmd.replace("@POTDIR@",tqparent->potFile()); + cmd.replace("@POEMAIL@",item->text(COL_TRANSLATOR)); kdDebug(KBABEL_CATMAN) << cmd << endl; @@ -1929,7 +1929,7 @@ bool CatalogManagerView::buildDir(const TQString& baseDir,const TQString& relDir _fileList.insert(file,item); _readInfoFileList.prepend(file); - if(_markerList.tqcontains(file)) + if(_markerList.contains(file)) { item->setMarked(true); } @@ -2027,7 +2027,7 @@ void CatalogManagerView::updateDir(TQString relDir) item = new CatManListItem(this, thisItem,poBaseDir+file+".po",potBaseDir+file+".pot",file); _fileList.insert(file,item); - if(_markerList.tqcontains(file)) + if(_markerList.contains(file)) { item->setMarked(true); } @@ -2109,7 +2109,7 @@ void CatalogManagerView::updateDir(TQString relDir) item = new CatManListItem(this, thisItem,poBaseDir+file+".po",potBaseDir+file+".pot",file); _fileList.insert(file,item); - if(_markerList.tqcontains(file)) + if(_markerList.contains(file)) { item->setMarked(true); } @@ -2207,7 +2207,7 @@ void CatalogManagerView::updateDir(TQString relDir) // if this directory has to be removed, check, if // the tqparent directory has to be removed too - const int index=relDir.tqfindRev("/",relDir.length()-2); + const int index=relDir.findRev("/",relDir.length()-2); if(index<0) { relDir="/"; @@ -2271,7 +2271,7 @@ void CatalogManagerView::directoryChanged(const TQString& dir) do { prevRelDir=relDir; - const int index=relDir.tqfindRev("/",relDir.length()-2); + const int index=relDir.findRev("/",relDir.length()-2); if(index<0) { relDir="/"; @@ -2417,7 +2417,7 @@ void CatalogManagerView::directoryDeleted(const TQString& dir) void CatalogManagerView::fileInfoRead( TQString filename ) { - if( _readInfoFileList.tqfind( filename ) != _readInfoFileList.end() ) { + if( _readInfoFileList.find( filename ) != _readInfoFileList.end() ) { emit progress( ++_readInfoCount); _readInfoFileList.remove( filename ); } @@ -3129,4 +3129,4 @@ void CatalogManagerView::toggleColumn( uint column, bool show ) } #include "catalogmanagerview.moc" -// kate: space-indent on; indent-width 4; tqreplace-tabs on; +// kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h index 26a05d9f..8a405430 100644 --- a/kbabel/catalogmanager/catalogmanagerview.h +++ b/kbabel/catalogmanager/catalogmanagerview.h @@ -185,7 +185,7 @@ public slots: void svnInfo(); void svnInfoMarked(); - TQString tqfind(KBabel::FindOptions &options, TQStringList &rest); + TQString find(KBabel::FindOptions &options, TQStringList &rest); void showLog(); diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp index 8d1496d4..aa52237f 100644 --- a/kbabel/catalogmanager/catmanlistitem.cpp +++ b/kbabel/catalogmanager/catmanlistitem.cpp @@ -804,7 +804,7 @@ TQString CatManListItem::packageDir( ) const TQString CatManListItem::name() const { - int index = _package.tqfindRev("/"); + int index = _package.findRev("/"); return _package.right(_package.length()-index-1); } diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp index 587d7f75..5f10678b 100644 --- a/kbabel/catalogmanager/findinfilesdialog.cpp +++ b/kbabel/catalogmanager/findinfilesdialog.cpp @@ -57,7 +57,7 @@ FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* tqparent) _askForSave = new TQCheckBox(i18n("Save &without asking"),box); TQWhatsThis::add(box,i18n("

File Options

" - "

Here you can finetune where to tqfind:" + "

Here you can finetune where to find:" "