diff options
Diffstat (limited to 'vcs/cvsservice')
-rw-r--r-- | vcs/cvsservice/bufferedstringreader.cpp | 2 | ||||
-rw-r--r-- | vcs/cvsservice/cvsdir.cpp | 2 | ||||
-rw-r--r-- | vcs/cvsservice/cvsentry.cpp | 4 | ||||
-rw-r--r-- | vcs/cvsservice/cvsfileinfoprovider.cpp | 12 | ||||
-rw-r--r-- | vcs/cvsservice/cvslogpage.cpp | 4 | ||||
-rw-r--r-- | vcs/cvsservice/cvsprocesswidget.cpp | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/vcs/cvsservice/bufferedstringreader.cpp b/vcs/cvsservice/bufferedstringreader.cpp index f9d1ecb2..bdaa26f3 100644 --- a/vcs/cvsservice/bufferedstringreader.cpp +++ b/vcs/cvsservice/bufferedstringreader.cpp @@ -34,7 +34,7 @@ TQStringList BufferedStringReader::process( const TQString &otherChars ) TQStringList strings; // Now find all the basic strings in the buffer int pos; - while ( (pos = m_stringBuffer.tqfind('\n')) != -1) + while ( (pos = m_stringBuffer.find('\n')) != -1) { TQString line = m_stringBuffer.left( pos ); if (!line.isEmpty()) diff --git a/vcs/cvsservice/cvsdir.cpp b/vcs/cvsservice/cvsdir.cpp index 80dabbe5..bd06767b 100644 --- a/vcs/cvsservice/cvsdir.cpp +++ b/vcs/cvsservice/cvsdir.cpp @@ -202,7 +202,7 @@ CVSEntry CVSDir::filetqStatus( const TQString &fileName, bool refreshCache ) con if (refreshCache) refreshEntriesCache(); - if (m_cachedEntries.tqcontains( fileName )) + if (m_cachedEntries.contains( fileName )) { return m_cachedEntries[ fileName ]; } diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp index eb8ca704..bf478f7c 100644 --- a/vcs/cvsservice/cvsentry.cpp +++ b/vcs/cvsservice/cvsentry.cpp @@ -91,7 +91,7 @@ void CVSEntry::parse( const TQString &aLine, const CVSDir& dir ) m_state = Added; else if ( revision().length() > 3 && revision()[0] == '-' ) m_state = Removed; - else if ( timeStamp().tqfind('+') >= 0 ) + else if ( timeStamp().find('+') >= 0 ) m_state = Conflict; else { @@ -184,4 +184,4 @@ VCSFileInfo CVSEntry::toVCSFileInfo() const return VCSFileInfo( fileName(), revision(), revision(), fileState ); } -//kate: space-indent on; indent-width 4; tqreplace-tabs on; +//kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 9eb57fcf..7830f643 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -137,7 +137,7 @@ void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir) /* FileTree will call requesttqStatus() everytime the user expands a directory * Unfortunatly requesttqStatus() will be called before the * VCSFileTreeViewItem of the directory will be filled with the files - * it tqcontains. Meaning, m_savedCallerData contains no childs at that + * it contains. Meaning, m_savedCallerData contains no childs at that * time. When a dcop call is made to run "cvs status" this is no problem. * The dcop call takes quit long, and so FileTree has enough time the fill * in the childs before we report the status back. @@ -226,14 +226,14 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream ) state = 1; else if (state == 1 && rx_fileName.search( s ) >= 0 && rx_filetqStatus.search( s ) >= 0) // FileName { - fileName = rx_fileName.cap().tqreplace( "File:", "" ).stripWhiteSpace(); - filetqStatus = rx_filetqStatus.cap().tqreplace( "tqStatus:", "" ).stripWhiteSpace(); + fileName = rx_fileName.cap().replace( "File:", "" ).stripWhiteSpace(); + filetqStatus = rx_filetqStatus.cap().replace( "tqStatus:", "" ).stripWhiteSpace(); ++state; // Next state kdDebug(9006) << ">> " << fileName << ", " << filetqStatus << endl; } else if (state == 2 && rx_fileWorkRev.search( s ) >= 0) { - workingRevision = s.tqreplace( "Working revision:", "" ).stripWhiteSpace(); + workingRevision = s.replace( "Working revision:", "" ).stripWhiteSpace(); TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|New file!)" ); if (rx_revision.search( workingRevision ) >= 0) @@ -245,7 +245,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream ) } else if (state == 3 && rx_fileRepoRev.search( s ) >= 0) { - repositoryRevision = s.tqreplace( "Repository revision:", "" ).stripWhiteSpace(); + repositoryRevision = s.replace( "Repository revision:", "" ).stripWhiteSpace(); TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|No revision control file)" ); if (rx_revision.search( s ) >= 0) @@ -311,4 +311,4 @@ void CVSFileInfoProvider::printOutFileInfoMap( const VCSFileInfoMap &map ) } #include "cvsfileinfoprovider.moc" -// kate: space-indent on; indent-width 4; tqreplace-tabs on; +// kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index 1f4b925e..07e59ce7 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -133,7 +133,7 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus ) TQString dstr = "<b>" + s + "</b> "; int lastVer = ver.section( '.', -1 ).toInt() - 1; if ( lastVer > 0 ) { - TQString lv = ver.left( ver.tqfindRev( "." ) + 1 ) + TQString::number( lastVer ); + TQString lv = ver.left( ver.findRev( "." ) + 1 ) + TQString::number( lastVer ); dstr += " [<a href=\"diff:/" + m_pathName + "/" + lv + "_" + ver + "\">diff to " + lv + "</a>]"; } m_textBrowser->setTextFormat( TQTextBrowser::RichText ); @@ -172,7 +172,7 @@ void CVSLogPage::slotLinkClicked( const TQString &link ) /// \FIXME in this way I lose the source m_textBrowser->setSource( m_logTextBackup ); - TQString ver = link.mid( link.tqfindRev( "/" ) + 1 ); + TQString ver = link.mid( link.findRev( "/" ) + 1 ); TQString v1 = ver.section( '_', 0, 0 ); TQString v2 = ver.section( '_', 1, 1 ); if ( v1.isEmpty() || v2.isEmpty() ) diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index 550b76b5..319fcfe6 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -264,9 +264,9 @@ void CvsProcessWidget::showOutput( const TQStringList &msg ) //This will prevent TQTextEdit from crashing on trying to parse the tags. //This should fix BUG:99590 TQString lineNew(line); - lineNew.tqreplace("<", "<"); - lineNew.tqreplace(">", ">"); - lineNew.tqreplace("&", "&"); + lineNew.replace("<", "<"); + lineNew.replace(">", ">"); + lineNew.replace("&", "&"); if (line.startsWith( "C " )) append( "<cvs_conflict>" + lineNew + "</cvs_conflict>" ); |