From 0813b39aed2cf4c84157a22c4c9594336d93d412 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/kdesdk@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kbugbuster/backend/bugcache.cpp | 2 +- kbugbuster/backend/bugdetails.cpp | 4 ++-- kbugbuster/backend/bugserver.cpp | 4 ++-- kbugbuster/backend/domprocessor.cpp | 4 ++-- kbugbuster/backend/htmlparser.cpp | 32 ++++++++++++++++---------------- kbugbuster/backend/person.cpp | 16 ++++++++-------- 6 files changed, 31 insertions(+), 31 deletions(-) (limited to 'kbugbuster/backend') diff --git a/kbugbuster/backend/bugcache.cpp b/kbugbuster/backend/bugcache.cpp index b2d13814..4650c9fe 100644 --- a/kbugbuster/backend/bugcache.cpp +++ b/kbugbuster/backend/bugcache.cpp @@ -59,7 +59,7 @@ Package::List BugCache::loadPackageList() TQStringList::ConstIterator it; for( it = packages.begin(); it != packages.end(); ++it ) { if ((*it) == "") continue; - if ((*it).tqcontains("/")) continue; + if ((*it).contains("/")) continue; m_cachePackages->setGroup(*it); diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp index 5dcfbcd4..cebcedd3 100644 --- a/kbugbuster/backend/bugdetails.cpp +++ b/kbugbuster/backend/bugdetails.cpp @@ -181,7 +181,7 @@ TQValueList BugDetails::extractAttachments( const TQStri kdDebug() << "BugDetails::extractAttachments found header " << *rit << endl; #endif // Taken from libkdenetwork/kmime_headers.cpp - int pos=header.tqfind("filename=", 0, false); + int pos=header.find("filename=", 0, false); TQString fn; if(pos>-1) { pos+=9; @@ -231,7 +231,7 @@ TQValueList BugDetails::extractAttachments( const TQStri } contents += line; // no newline, because of linebreaking between
} - contents = contents.tqreplace( TQRegExp("
"), TQString() ); + contents = contents.replace( TQRegExp("
"), TQString() ); #ifdef DEBUG_EXTRACT kdDebug() << "BugDetails::extractAttachments contents=***\n" << contents << "\n***" << endl; #endif diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp index 37089623..a1863f58 100644 --- a/kbugbuster/backend/bugserver.cpp +++ b/kbugbuster/backend/bugserver.cpp @@ -216,14 +216,14 @@ bool BugServer::queueCommand( BugCommand *cmd ) TQPtrList BugServer::queryCommands( const Bug &bug ) const { - CommandsMap::ConstIterator it = mCommands.tqfind( bug.number() ); + CommandsMap::ConstIterator it = mCommands.find( bug.number() ); if (it == mCommands.end()) return TQPtrList(); else return *it; } bool BugServer::hasCommandsFor( const Bug &bug ) const { - CommandsMap::ConstIterator it = mCommands.tqfind( bug.number() ); + CommandsMap::ConstIterator it = mCommands.find( bug.number() ); return it != mCommands.end(); } diff --git a/kbugbuster/backend/domprocessor.cpp b/kbugbuster/backend/domprocessor.cpp index 9b5c2944..e7b1e49c 100644 --- a/kbugbuster/backend/domprocessor.cpp +++ b/kbugbuster/backend/domprocessor.cpp @@ -273,7 +273,7 @@ KBB::Error DomProcessor::parseDomBugDetails( const TQDomElement &element, text += raw; } TQString bugBaseURL = server()->serverConfig().baseUrl().htmlURL(); - text = "
" + wrapLines( text ).tqreplace( TQRegExp( "(Created an attachment \\(id=([0-9]+)\\))" ),
+          text = "
" + wrapLines( text ).replace( TQRegExp( "(Created an attachment \\(id=([0-9]+)\\))" ),
               "\\1" ) + "\n
";
         }
       }
@@ -361,7 +361,7 @@ TQString DomProcessor::wrapLines( const TQString &text )
       TQString wrappedLine;
       while ( line.length() > uint( wrap ) )
       {
-          int breakPoint = line.tqfindRev( ' ', wrap );
+          int breakPoint = line.findRev( ' ', wrap );
           //kdDebug() << "Breaking at " << breakPoint << endl;
           if( breakPoint == -1 ) {
               wrappedLine += line.left( wrap ) + '\n';
diff --git a/kbugbuster/backend/htmlparser.cpp b/kbugbuster/backend/htmlparser.cpp
index e9840e6b..4daa3d1d 100644
--- a/kbugbuster/backend/htmlparser.cpp
+++ b/kbugbuster/backend/htmlparser.cpp
@@ -100,10 +100,10 @@ void HtmlParser::processResult( Package::List & )
 
 TQString HtmlParser::getAttribute( const TQString &line, const TQString &name )
 {
-  int pos1 = line.tqfind( name + "=\"" );
+  int pos1 = line.find( name + "=\"" );
   if ( pos1 < 1 ) return TQString();
   pos1 += name.length() + 2;
-  int pos2 = line.tqfind( "\"", pos1 );
+  int pos2 = line.find( "\"", pos1 );
   if ( pos2 < 1 ) return TQString();
   return line.mid( pos1, pos2 - pos1 );
 }
@@ -111,24 +111,24 @@ TQString HtmlParser::getAttribute( const TQString &line, const TQString &name )
 bool HtmlParser::getCpts( const TQString &line, TQString &key,
                           TQStringList &values )
 {
-  if ( !line.tqcontains( TQRegExp( "\\s*cpts" ) ) ) return false;
+  if ( !line.contains( TQRegExp( "\\s*cpts" ) ) ) return false;
 
 //  kdDebug() << "LINE: " << line << endl;
-  int pos1 = line.tqfind( "[" );
+  int pos1 = line.find( "[" );
   if ( pos1 < 0 ) return false;
-  int pos2 = line.tqfind( "]", ++pos1 );
+  int pos2 = line.find( "]", ++pos1 );
   if ( pos2 < 0 ) return false;
 
   key = line.mid( pos1, pos2 - pos1 );
-  int pos3 = key.tqfind( "'" );
+  int pos3 = key.find( "'" );
   if ( pos3 >= 0 ) {
-    int pos4 = key.tqfind( "'", ++pos3 );
+    int pos4 = key.find( "'", ++pos3 );
     if ( pos4 >= 0 ) key = key.mid( pos3, pos4 - pos3 );
   }
 //  kdDebug() << " KEY: " << key << endl;
 
-  pos1 = line.tqfind( "'", ++pos2 );
-  if ( pos1 >= 0 ) pos2 = line.tqfind( "'", ++pos1 );
+  pos1 = line.find( "'", ++pos2 );
+  if ( pos1 >= 0 ) pos2 = line.find( "'", ++pos1 );
 
   while ( pos1 >= 0 && pos2 >= 0 ) {
     TQString value = line.mid( pos1, pos2 - pos1 );
@@ -136,8 +136,8 @@ bool HtmlParser::getCpts( const TQString &line, TQString &key,
 
     values.append( value );
 
-    pos1 = line.tqfind( "'", ++pos2 );
-    if ( pos1 >= 0 ) pos2 = line.tqfind( "'", ++pos1 );
+    pos1 = line.find( "'", ++pos2 );
+    if ( pos1 >= 0 ) pos2 = line.find( "'", ++pos1 );
   }
 
   return true;
@@ -153,7 +153,7 @@ KBB::Error HtmlParser_2_10::parseLine( const TQString &line, Bug::List &bugs )
 //  kdDebug() << " NUMBER: " << number << endl;
 
     TQString summary;
-    int pos = line.tqfindRev( "summary>" );
+    int pos = line.findRev( "summary>" );
     if ( pos >= 0 ) summary = line.mid( pos + 8 );
 
     Bug bug( new BugImpl( summary, Person(), number, 0xFFFFFFFF, Bug::SeverityUndefined,
@@ -248,13 +248,13 @@ KBB::Error HtmlParser_2_17_1::parseLine( const TQString &line, Package::List & )
   switch ( mState ) {
     case Idle:
     case SearchComponents:
-      if ( line.tqcontains( "var cpts" ) ) mState = Components;
+      if ( line.contains( "var cpts" ) ) mState = Components;
       break;
     case SearchProducts:
-      if ( line.tqcontains( "onchange=\"selectProduct" ) ) mState = Products;
+      if ( line.contains( "onchange=\"selectProduct" ) ) mState = Products;
       break;
     case Components: {
-      if ( line.tqcontains( TQRegExp( "\\s*function" ) ) ) {
+      if ( line.contains( TQRegExp( "\\s*function" ) ) ) {
         mState = SearchProducts;
       }
       TQString key;
@@ -264,7 +264,7 @@ KBB::Error HtmlParser_2_17_1::parseLine( const TQString &line, Package::List & )
       }
     }
     case Products: {
-      if ( line.tqcontains( "" ) ) mState = Finished;
+      if ( line.contains( "" ) ) mState = Finished;
       TQString product = getAttribute( line, "value" );
       if ( !product.isEmpty() ) {
         kdDebug() << "PRODUCT: " << product << endl;
diff --git a/kbugbuster/backend/person.cpp b/kbugbuster/backend/person.cpp
index 368ea07c..8f73c512 100644
--- a/kbugbuster/backend/person.cpp
+++ b/kbugbuster/backend/person.cpp
@@ -4,7 +4,7 @@
 
 Person::Person( const TQString &fullName )
 {
-    int emailPos = fullName.tqfind( '<' );
+    int emailPos = fullName.find( '<' );
     if ( emailPos < 0 ) {
         email = fullName;
     } else {
@@ -41,10 +41,10 @@ Person Person::parseFromString( const TQString &_str )
 
     TQString str = _str;
 
-    int ltPos = str.tqfind( '<' );
+    int ltPos = str.find( '<' );
     if ( ltPos != -1 )
     {
-        int gtPos = str.tqfind( '>', ltPos );
+        int gtPos = str.find( '>', ltPos );
         if ( gtPos != -1 )
         {
             res.name = str.left( ltPos - 1 );
@@ -52,16 +52,16 @@ Person Person::parseFromString( const TQString &_str )
         }
     }
    
-    int atPos = str.tqfind( '@' );
-    int spacedAtPos = str.tqfind( TQString::tqfromLatin1( " at " ) );
+    int atPos = str.find( '@' );
+    int spacedAtPos = str.find( TQString::tqfromLatin1( " at " ) );
     if ( atPos == -1 && spacedAtPos != -1 )
-        str.tqreplace( spacedAtPos, 4, TQString::tqfromLatin1( "@" ) );
+        str.replace( spacedAtPos, 4, TQString::tqfromLatin1( "@" ) );
 
-    int spacePos = str.tqfind( ' ' );
+    int spacePos = str.find( ' ' );
     while ( spacePos != -1 )
     {
         str[ spacePos ] = '.'; 
-        spacePos = str.tqfind( ' ', spacePos );
+        spacePos = str.find( ' ', spacePos );
     }
   
     res.email = str;
-- 
cgit v1.2.1