summaryrefslogtreecommitdiffstats
path: root/vcs
diff options
context:
space:
mode:
Diffstat (limited to 'vcs')
-rw-r--r--vcs/cvsservice/bufferedstringreader.cpp2
-rw-r--r--vcs/cvsservice/cvsdir.cpp2
-rw-r--r--vcs/cvsservice/cvsentry.cpp4
-rw-r--r--vcs/cvsservice/cvsfileinfoprovider.cpp12
-rw-r--r--vcs/cvsservice/cvslogpage.cpp4
-rw-r--r--vcs/cvsservice/cvsprocesswidget.cpp6
-rw-r--r--vcs/perforce/commitdlg.cpp4
-rw-r--r--vcs/perforce/perforcepart.cpp2
-rw-r--r--vcs/subversion/commitdlg.cpp2
-rw-r--r--vcs/subversion/commitdlg.h2
-rw-r--r--vcs/subversion/svn_blamewidget.cpp2
-rw-r--r--vcs/subversion/svn_kio.cpp12
-rw-r--r--vcs/subversion/svn_logviewwidget.cpp2
13 files changed, 28 insertions, 28 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("<", "&lt;");
- lineNew.tqreplace(">", "&gt;");
- lineNew.tqreplace("&", "&amp;");
+ lineNew.replace("<", "&lt;");
+ lineNew.replace(">", "&gt;");
+ lineNew.replace("&", "&amp;");
if (line.startsWith( "C " ))
append( "<cvs_conflict>" + lineNew + "</cvs_conflict>" );
diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp
index 2f119ed2..6bb3c08d 100644
--- a/vcs/perforce/commitdlg.cpp
+++ b/vcs/perforce/commitdlg.cpp
@@ -112,7 +112,7 @@ void CommitDialog::getFilesFinished( const TQString& out, const TQString& /* err
{
TQStringList lst = TQStringList::split( TQChar('\n'), out );
for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
- int pos = (*it).tqfind( TQChar('#') );
+ int pos = (*it).find( TQChar('#') );
if ( pos > 1 && (*it).startsWith( "//" ) ) {
filesBox->insertItem( (*it).left( pos ) );
}
@@ -129,7 +129,7 @@ TQString CommitDialog::changeList() const
"tqStatus: new\n"
"Description:\n ";
- lst += logMessage().tqreplace(TQRegExp("\n"), "\n ") + "\n\n";
+ lst += logMessage().replace(TQRegExp("\n"), "\n ") + "\n\n";
lst += "Files:\n";
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index 406de1f8..2bd60c76 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -275,7 +275,7 @@ void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err )
static TQRegExp rx( "(^|\\n)==== ([^ ]+) -.*====\\n" );
rx.setMinimal( true );
TQString strippedDiff = diff;
- strippedDiff.tqreplace( rx, "--- \\2\n+++ \\2\n" );
+ strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" );
if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("KDevelop/DiffFrontend"))
diffFrontend->showDiff( strippedDiff );
diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp
index df519d02..54c6c4f2 100644
--- a/vcs/subversion/commitdlg.cpp
+++ b/vcs/subversion/commitdlg.cpp
@@ -44,4 +44,4 @@ bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev )
#include "commitdlg.moc"
-//kate: space-indent on; indent-width 4; tqreplace-tabs on; auto-insert-doxygen on; indent-mode cstyle;
+//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle;
diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h
index f940511c..a0070770 100644
--- a/vcs/subversion/commitdlg.h
+++ b/vcs/subversion/commitdlg.h
@@ -35,4 +35,4 @@ protected:
#endif
-//kate: space-indent on; indent-width 4; tqreplace-tabs on; auto-insert-doxygen on; indent-mode cstyle;
+//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle;
diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp
index 1060158b..5d80f997 100644
--- a/vcs/subversion/svn_blamewidget.cpp
+++ b/vcs/subversion/svn_blamewidget.cpp
@@ -64,7 +64,7 @@ void SvnBlameWidget::show()
SvnBlameHolder holder = *it;
SvnIntSortListItem *item = new SvnIntSortListItem(outView());
- TQString prettyDate = holder.date.left(16).tqreplace(10, 1, ' ');
+ TQString prettyDate = holder.date.left(16).replace(10, 1, ' ');
item->setText(0, TQString::number( holder.line+1 ) );
item->setText(1, TQString::number(holder.rev) );
diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp
index 416f32c0..9a70dd1b 100644
--- a/vcs/subversion/svn_kio.cpp
+++ b/vcs/subversion/svn_kio.cpp
@@ -261,7 +261,7 @@ void kio_svnProtocol::get(const KURL& url ){
//find the requested revision
svn_opt_revision_t rev;
svn_opt_revision_t endrev;
- int idx = target.tqfindRev( "?rev=" );
+ int idx = target.findRev( "?rev=" );
if ( idx != -1 ) {
TQString revstr = target.mid( idx+5 );
#if 0
@@ -323,7 +323,7 @@ void kio_svnProtocol::stat(const KURL & url){
//find the requested revision
svn_opt_revision_t rev;
svn_opt_revision_t endrev;
- int idx = target.tqfindRev( "?rev=" );
+ int idx = target.findRev( "?rev=" );
if ( idx != -1 ) {
TQString revstr = target.mid( idx+5 );
#if 0
@@ -428,7 +428,7 @@ void kio_svnProtocol::listDir(const KURL& url){
//find the requested revision
svn_opt_revision_t rev;
svn_opt_revision_t endrev;
- int idx = target.tqfindRev( "?rev=" );
+ int idx = target.findRev( "?rev=" );
if ( idx != -1 ) {
TQString revstr = target.mid( idx+5 );
svn_opt_parse_revision( &rev, &endrev, revstr.utf8(), subpool );
@@ -545,7 +545,7 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString&
//
// //find the requested revision
// svn_opt_revision_t rev;
-// int idx = srcsvn.tqfindRev( "?rev=" );
+// int idx = srcsvn.findRev( "?rev=" );
// if ( idx != -1 ) {
// TQString revstr = srcsvn.mid( idx+5 );
// kdDebug(9036) << "revision string found " << revstr << endl;
@@ -672,7 +672,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite
//find the requested revision
svn_opt_revision_t rev;
- int idx = srcsvn.tqfindRev( "?rev=" );
+ int idx = srcsvn.findRev( "?rev=" );
if ( idx != -1 ) {
TQString revstr = srcsvn.mid( idx+5 );
kdDebug(9036) << "revision string found " << revstr << endl;
@@ -1661,7 +1661,7 @@ TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const {
tpURL.setProtocol("file");
svnUrl = tpURL.url(-1);
//hack : add one more / after file:/
- int idx = svnUrl.tqfind("/");
+ int idx = svnUrl.find("/");
svnUrl.insert( idx, "//" );
return svnUrl;
}
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index 9eaa6aa9..c8f33e66 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -92,7 +92,7 @@ void SvnLogViewWidget::setLogResult( TQValueList<SvnLogHolder> *loglist )
SvnLogHolder holder = *it;
SvnLogViewItem *item = new SvnLogViewItem(this->listView1);
- TQString prettyDate = holder.date.left(16).tqreplace(10, 1, ' ');
+ TQString prettyDate = holder.date.left(16).replace(10, 1, ' ');
item->setText(0, holder.rev );
item->setText(1, prettyDate );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-01 15:24:19 +0000