rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 60 insertions, 60 deletions

diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp
index 10472d2..4d2d71d 100644
--- a/kmymoney2/converter/mymoneygncreader.cpp
+++ b/kmymoney2/converter/mymoneygncreader.cpp
@@ -114,8 +114,8 @@ GncObject::GncObject () {
 // Check that the current element is of a version we are coded for
 void GncObject::checkVersion (const TQString& elName, const TQXmlAttributes& elAttrs, const map_elementVersions& map) {
   TRY
-  if (map.tqcontains(elName)) { // if it's not in the map, there's nothing to check
-    if (!map[elName].tqcontains(elAttrs.value("version"))) {
+  if (map.contains(elName)) { // if it's not in the map, there's nothing to check
+    if (!map[elName].contains(elAttrs.value("version"))) {
       TQString em = i18n("%1: Sorry. This importer cannot handle version %2 of element %3")
                           .tqarg(__func__).tqarg(elAttrs.value("version")).tqarg(elName);
       throw new MYMONEYEXCEPTION (em);
@@ -192,7 +192,7 @@ TQString GncObject::hide (TQString data, unsigned int anonClass) {
   case SUPPRESS: result = ""; break; // this is personal and is not essential
   case NXTACC: result = i18n("Account%1").tqarg(++nextAccount, -6); break; // generate account name
   case NXTEQU:   // generate/return an equity name
-    it = anonStocks.tqfind (data);
+    it = anonStocks.find (data);
     if (it == anonStocks.end()) {
       result = i18n("Stock%1").tqarg(++nextEquity, -6);
       anonStocks.insert (data, result);
@@ -201,7 +201,7 @@ TQString GncObject::hide (TQString data, unsigned int anonClass) {
     }
     break;
   case NXTPAY:   // genearet/return a payee name
-    it = anonPayees.tqfind (data);
+    it = anonPayees.find (data);
     if (it == anonPayees.end()) {
       result = i18n("Payee%1").tqarg(++nextPayee, -6);
       anonPayees.insert (data, result);
@@ -340,7 +340,7 @@ void GncKvp::dataEl (const TQXmlAttributes& elAttrs) {
     m_kvpType = elAttrs.value("type");
   }
   m_dataPtr = m_v.at(m_state);
-  if (key().tqcontains ("formula")) {
+  if (key().contains ("formula")) {
     m_anonClass = MONEY2;
   } else {
     m_anonClass = ASIS;
@@ -988,9 +988,9 @@ bool XmlReader::characters (const TQString &data) {
     TQString anonData = m_co->getData ();
     if (anonData.isEmpty()) anonData = pData;
     // there must be a TQt standard way of doing the following but I can't ... find it
-    anonData.tqreplace ('<', "&lt;");
-    anonData.tqreplace ('>', "&gt;");
-    anonData.tqreplace ('&', "&amp;");
+    anonData.replace ('<', "&lt;");
+    anonData.replace ('>', "&gt;");
+    anonData.replace ('&', "&amp;");
     pMain->oStream << anonData; // write original data
     lastType = 1;
 #endif // _GNCFILEANON
@@ -1284,7 +1284,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
     TQPtrListIterator<GncObject> kvpi (gac->m_kvpList);
     GncKvp *k;
     while ((k = static_cast<GncKvp *>(kvpi.current())) != 0) {
-      if (k->key().tqcontains("price-source") && k->type() == "string") {
+      if (k->key().contains("price-source") && k->type() == "string") {
         getPriceSource (e, k->value());
         break;
       } else {
@@ -1297,7 +1297,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
   TQPtrListIterator<GncObject> kvpi (gac->m_kvpList);
   GncKvp *k;
   while ((k = static_cast<GncKvp *>(kvpi.current())) != 0) {
-    if (k->key().tqcontains("tax-related") && k->type() == "integer" && k->value() == "1") {
+    if (k->key().contains("tax-related") && k->type() == "integer" && k->value() == "1") {
       acc.setValue ("Tax", "Yes");
       break;
     } else {
@@ -1390,7 +1390,7 @@ void MyMoneyGncReader::convertSplit (const GncSplit *gsp) {
   MyMoneyAccount splitAccount;
   // find the kmm account id coresponding to the gnc id
   TQString kmmAccountId;
-  map_accountIds::Iterator id = m_mapIds.tqfind(gsp->acct().utf8());
+  map_accountIds::Iterator id = m_mapIds.find(gsp->acct().utf8());
   if (id != m_mapIds.end()) {
     kmmAccountId = id.data();
   } else { // for the case where the acs not found (which shouldn't happen?), create an account with gnc name
@@ -1679,7 +1679,7 @@ void MyMoneyGncReader::convertTemplateSplit (const TQString& schedName, const Gn
   }
   // find the kmm account id coresponding to the gnc id
   TQString kmmAccountId;
-  map_accountIds::Iterator id = m_mapIds.tqfind(gncAccountId.utf8());
+  map_accountIds::Iterator id = m_mapIds.find(gncAccountId.utf8());
   if (id != m_mapIds.end()) {
     kmmAccountId = id.data();
   } else { // for the case where the acs not found (which shouldn't happen?), create an account with gnc name
@@ -1940,7 +1940,7 @@ void MyMoneyGncReader::terminate () {
       TQString parentKey = (*acc).parentAccountId();
       if (gncdebug) qDebug ("acc %s, tqparent %s", (*acc).id().data(),
                               (*acc).parentAccountId().data());
-      map_accountIds::Iterator id = m_mapIds.tqfind(parentKey);
+      map_accountIds::Iterator id = m_mapIds.find(parentKey);
       if (id != m_mapIds.end()) {
         if (gncdebug) qDebug("Setting account id %s's tqparent account id to %s",
                                (*acc).id().data(), id.data().data());
@@ -2203,7 +2203,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
   MyMoneyAccount stockAcc = m_storage->account (m_mapIds[stockId.utf8()]);
   MyMoneyAccount tqparent;
   TQString parentKey = stockAcc.parentAccountId();
-  map_accountIds::Iterator id = m_mapIds.tqfind (parentKey);
+  map_accountIds::Iterator id = m_mapIds.find (parentKey);
   if (id != m_mapIds.end()) {
     tqparent = m_storage->account (id.data());
     if (tqparent.accountType() == MyMoneyAccount::Investment) return ;
@@ -2270,7 +2270,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
                              PACKAGE, i18n("Select tqparent investment account or enter new name. Stock %1").tqarg(stockAcc.name ()),
                              accList, lastSelected, true, &ok);
       if (ok) {
-        lastSelected = accList.tqfindIndex (invAccName); // preserve selection for next time
+        lastSelected = accList.findIndex (invAccName); // preserve selection for next time
         for (acc = list.begin(); acc != list.end(); ++acc) {
           if ((*acc).name() == invAccName) break;
         }
diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp
index d9ddd60..f9854f9 100644
--- a/kmymoney2/converter/mymoneyqifprofile.cpp
+++ b/kmymoney2/converter/mymoneyqifprofile.cpp
@@ -119,7 +119,7 @@ void MyMoneyQifProfile::Private::getThirdPosition(void)
     int missingIndex = -1;
     int value = 0;
     for(int i = 0; i < 3; ++i) {
-      if(!partsPresent.tqcontains(partsAvail[i][0])) {
+      if(!partsPresent.contains(partsAvail[i][0])) {
         missingIndex = i;
       } else {
         value += m_partPos[partsAvail[i][0]];
@@ -781,7 +781,7 @@ void MyMoneyQifProfile::possibleDateFormats(TQStringList& list) const
     TQStringList parts = TQStringList::split(",", *it_d);
     int i;
     for(i = 0; i < 3; ++i) {
-      if(d->m_partPos.tqcontains(parts[i][0])) {
+      if(d->m_partPos.contains(parts[i][0])) {
         if(d->m_partPos[parts[i][0]] != i)
           break;
       }
@@ -795,10 +795,10 @@ void MyMoneyQifProfile::possibleDateFormats(TQStringList& list) const
     // matches all tests
     if(i == 3) {
       TQString format = *it_d;
-      format.tqreplace('y', "%y");
-      format.tqreplace('m', "%m");
-      format.tqreplace('d', "%d");
-      format.tqreplace(',', " ");
+      format.replace('y', "%y");
+      format.replace('m', "%m");
+      format.replace('d', "%d");
+      format.replace(',', " ");
       list << format;
     }
   }
@@ -807,10 +807,10 @@ void MyMoneyQifProfile::possibleDateFormats(TQStringList& list) const
   if(list.count() == 0) {
     for(it_d = defaultList.begin(); it_d != defaultList.end(); ++it_d) {
       TQString format = *it_d;
-      format.tqreplace('y', "%y");
-      format.tqreplace('m', "%m");
-      format.tqreplace('d', "%d");
-      format.tqreplace(',', " ");
+      format.replace('y', "%y");
+      format.replace('m', "%m");
+      format.replace('d', "%d");
+      format.replace(',', " ");
       list << format;
     }
   }
@@ -863,7 +863,7 @@ void MyMoneyQifProfile::autoDetect(const TQStringList& lines)
         }
         break;
       case 2:
-        if(numericRecords.tqcontains(c)) {
+        if(numericRecords.contains(c)) {
           scanNumeric((*it).mid(1), m_decimal[c], m_thousands[c]);
         } else if((c == 'D') && (m_dateFormat.isEmpty())) {
           if(d->m_partPos.count() != 3) {
@@ -893,7 +893,7 @@ void MyMoneyQifProfile::autoDetect(const TQStringList& lines)
   if(d->m_partPos.count() != 3 && datesScanned > 20) {
     TQMap<int, int> sortedPos;
     // make sure to reset the known parts for the following algorithm
-    if(d->m_partPos.tqcontains('y')) {
+    if(d->m_partPos.contains('y')) {
       d->m_changeCount[d->m_partPos['y']] = -1;
       for(int i = 0; i < 3; ++i) {
         if(d->m_partPos['y'] == i)
@@ -904,9 +904,9 @@ void MyMoneyQifProfile::autoDetect(const TQStringList& lines)
         }
       }
     }
-    if(d->m_partPos.tqcontains('d'))
+    if(d->m_partPos.contains('d'))
       d->m_changeCount[d->m_partPos['d']] = -1;
-    if(d->m_partPos.tqcontains('m'))
+    if(d->m_partPos.contains('m'))
       d->m_changeCount[d->m_partPos['m']] = -1;
 
     for(int i = 0; i < 3; ++i) {
@@ -1003,7 +1003,7 @@ void MyMoneyQifProfile::scanDate(const TQString& txt) const
       }
       // and if it's in between 12 and 32 and we already identified the
       // position for the year it must be days
-      if((value > 12) && (value < 32) && d->m_partPos.tqcontains('y')) {
+      if((value > 12) && (value < 32) && d->m_partPos.contains('y')) {
         d->m_partPos['d'] = i;
       }
     }
diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
index 031ecd5..74513c7 100644
--- a/kmymoney2/converter/mymoneyqifreader.cpp
+++ b/kmymoney2/converter/mymoneyqifreader.cpp
@@ -121,7 +121,7 @@ class MyMoneyQifReader::Private {
 
 void MyMoneyQifReader::Private::fixMultiLineMemo(TQString& memo) const
 {
-  memo.tqreplace("\\n", "\n");
+  memo.replace("\\n", "\n");
 }
 
 void MyMoneyQifReader::Private::finishStatement(void)
@@ -551,22 +551,22 @@ void MyMoneyQifReader::processQifSpecial(const TQString& _line)
     line = line.mid(5);
 
     // exportable accounts
-    if(line.lower() == "ccard" || KMyMoneyGlobalSettings::qifCreditCard().lower().tqcontains(line.lower())) {
+    if(line.lower() == "ccard" || KMyMoneyGlobalSettings::qifCreditCard().lower().contains(line.lower())) {
       d->accountType = MyMoneyAccount::CreditCard;
       d->firstTransaction = true;
       d->transactionType = m_entryType = EntryTransaction;
 
-    } else if(line.lower() == "bank" || KMyMoneyGlobalSettings::qifBank().lower().tqcontains(line.lower())) {
+    } else if(line.lower() == "bank" || KMyMoneyGlobalSettings::qifBank().lower().contains(line.lower())) {
       d->accountType = MyMoneyAccount::Checkings;
       d->firstTransaction = true;
       d->transactionType = m_entryType = EntryTransaction;
 
-    } else if(line.lower() == "cash" || KMyMoneyGlobalSettings::qifCash().lower().tqcontains(line.lower())) {
+    } else if(line.lower() == "cash" || KMyMoneyGlobalSettings::qifCash().lower().contains(line.lower())) {
       d->accountType = MyMoneyAccount::Cash;
       d->firstTransaction = true;
       d->transactionType = m_entryType = EntryTransaction;
 
-    } else if(line.lower() == "oth a" || KMyMoneyGlobalSettings::qifAsset().lower().tqcontains(line.lower())) {
+    } else if(line.lower() == "oth a" || KMyMoneyGlobalSettings::qifAsset().lower().contains(line.lower())) {
       d->accountType = MyMoneyAccount::Asset;
       d->firstTransaction = true;
       d->transactionType = m_entryType = EntryTransaction;
@@ -579,7 +579,7 @@ void MyMoneyQifReader::processQifSpecial(const TQString& _line)
     } else if(line.lower() == "invst" || line.lower() == i18n("TQIF tag for investment account", "Invst").lower()) {
       d->transactionType = m_entryType = EntryInvestmentTransaction;
 
-    } else if(line.lower() == "invoice" || KMyMoneyGlobalSettings::qifInvoice().lower().tqcontains(line.lower())) {
+    } else if(line.lower() == "invoice" || KMyMoneyGlobalSettings::qifInvoice().lower().contains(line.lower())) {
       m_entryType = EntrySkip;
 
     } else if(line.lower() == "tax") {
@@ -1019,7 +1019,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
   for(;;) {
     hash = TQString("%1-%2").tqarg(hashBase).tqarg(idx);
     TQMap<TQString, bool>::const_iterator it;
-    it = d->m_hashMap.tqfind(hash);
+    it = d->m_hashMap.find(hash);
     if(it == d->m_hashMap.end()) {
       d->m_hashMap[hash] = true;
       break;
@@ -1030,7 +1030,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
 
   if(d->firstTransaction) {
     // check if this is an opening balance transaction and process it out of the statement
-    if(!payee.isEmpty() && ((payee.lower() == "opening balance") || KMyMoneyGlobalSettings::qifOpeningBalance().lower().tqcontains(payee.lower()))) {
+    if(!payee.isEmpty() && ((payee.lower() == "opening balance") || KMyMoneyGlobalSettings::qifOpeningBalance().lower().contains(payee.lower()))) {
       createOpeningBalance();
       d->firstTransaction = false;
       return;
@@ -1068,7 +1068,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
   }
 
   tmp = extractLine('L');
-  pos = tmp.tqfindRev("--");
+  pos = tmp.findRev("--");
   if(tmp.left(1) == m_qifProfile.accountDelimiter().left(1)) {
     // it's a transfer, so we wipe the memo
 //   tmp = "";         why??
@@ -1092,7 +1092,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
   // Collect data for the account's split
   s1.m_accountId = m_account.id();
   tmp = extractLine('S');
-  pos = tmp.tqfindRev("--");
+  pos = tmp.findRev("--");
   if(pos != -1) {
     tmp = tmp.left(pos);
   }
@@ -1140,7 +1140,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
       accountId = transferAccount(tmp, false);
 
     } else {
-/*      pos = tmp.tqfindRev("--");
+/*      pos = tmp.findRev("--");
       if(pos != -1) {
         t.setValue("Dialog", tmp.mid(pos+2));
         tmp = tmp.left(pos);
@@ -1200,7 +1200,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
         accountId = transferAccount(tmp, false);
 
       } else {
-        pos = tmp.tqfindRev("--");
+        pos = tmp.findRev("--");
         if(pos != -1) {
 ///          t.setValue("Dialog", tmp.mid(pos+2));
           tmp = tmp.left(pos);
@@ -1329,7 +1329,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void)
   for(;;) {
     hash = TQString("%1-%2").tqarg(hashBase).tqarg(idx);
     TQMap<TQString, bool>::const_iterator it;
-    it = d->m_hashMap.tqfind(hash);
+    it = d->m_hashMap.find(hash);
     if(it == d->m_hashMap.end()) {
       d->m_hashMap[hash] = true;
       break;
@@ -1543,7 +1543,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void)
   else if (action == "xin" || action == "xout")
   {
     TQString payee = extractLine('P');
-    if(!payee.isEmpty() && ((payee.lower() == "opening balance") || KMyMoneyGlobalSettings::qifOpeningBalance().lower().tqcontains(payee.lower()))) {
+    if(!payee.isEmpty() && ((payee.lower() == "opening balance") || KMyMoneyGlobalSettings::qifOpeningBalance().lower().contains(payee.lower()))) {
       createOpeningBalance(MyMoneyAccount::Investment);
       return;
     }
@@ -2123,7 +2123,7 @@ void MyMoneyQifReader::selectOrCreateAccount(const SelectCreateMode mode, MyMone
   if(!msg.isEmpty())
     accountSelect.setCaption(msg);
 
-  it = m_accountTranslation.tqfind((leadIn + MyMoneyFile::AccountSeperator + account.name()).lower());
+  it = m_accountTranslation.find((leadIn + MyMoneyFile::AccountSeperator + account.name()).lower());
   if(it != m_accountTranslation.end()) {
     try {
       account = file->account(*it);
diff --git a/kmymoney2/converter/mymoneyqifwriter.cpp b/kmymoney2/converter/mymoneyqifwriter.cpp
index 8ab5c0f..d84e325 100644
--- a/kmymoney2/converter/mymoneyqifwriter.cpp
+++ b/kmymoney2/converter/mymoneyqifwriter.cpp
@@ -188,7 +188,7 @@ void MyMoneyQifWriter::writeTransactionEntry(TQTextStream &s, const MyMoneyTrans
 
   if(split.memo().length() > 0) {
     TQString m = split.memo();
-    m.tqreplace('\n', "\\n");
+    m.replace('\n', "\\n");
     s << "M" << m << endl;
   }
 
@@ -244,7 +244,7 @@ void MyMoneyQifWriter::writeSplitEntry(TQTextStream& s, const MyMoneySplit& spli
 
   if(split.memo().length() > 0) {
     TQString m = split.memo();
-    m.tqreplace('\n', "\\n");
+    m.replace('\n', "\\n");
     s << "E" << m << endl;
   }
 
diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
index ad74be4..2a59ad8 100644
--- a/kmymoney2/converter/mymoneystatementreader.cpp
+++ b/kmymoney2/converter/mymoneystatementreader.cpp
@@ -166,7 +166,7 @@ void MyMoneyStatementReader::Private::assignUniqueBankID(MyMoneySplit& s, const
     int idx = 1;
     for(;;) {
       TQMap<TQString, bool>::const_iterator it;
-      it = uniqIds.tqfind(hash);
+      it = uniqIds.find(hash);
       if(it == uniqIds.end()) {
         uniqIds[hash] = true;
         break;
@@ -426,7 +426,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes
 
 void MyMoneyStatementReader::processPriceEntry(const MyMoneyStatement::Price& p_in)
 {
-  if(d->securitiesBySymbol.tqcontains(p_in.m_strSecurity)) {
+  if(d->securitiesBySymbol.contains(p_in.m_strSecurity)) {
 
     MyMoneyPrice price(d->securitiesBySymbol[p_in.m_strSecurity].id(),
                        MyMoneyFile::instance()->baseCurrency().id(),
@@ -434,7 +434,7 @@ void MyMoneyStatementReader::processPriceEntry(const MyMoneyStatement::Price& p_
                        p_in.m_amount, "TQIF");
     MyMoneyFile::instance()->addPrice(price);
 
-  } else if(d->securitiesByName.tqcontains(p_in.m_strSecurity)) {
+  } else if(d->securitiesByName.contains(p_in.m_strSecurity)) {
 
     MyMoneyPrice price(d->securitiesByName[p_in.m_strSecurity].id(),
                        MyMoneyFile::instance()->baseCurrency().id(),
@@ -891,7 +891,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
                     "referencing \"%1\" will be removed.").tqarg(payeename);
 
         TQString askKey = TQString("Statement-Import-Payee-")+payeename;
-        if(!m_dontAskAgain.tqcontains(askKey)) {
+        if(!m_dontAskAgain.contains(askKey)) {
           m_dontAskAgain += askKey;
         }
         rc = KMessageBox::questionYesNoCancel(0, msg, i18n("New payee/receiver"),
diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp
index 325560b..d1fd158 100644
--- a/kmymoney2/converter/webpricequote.cpp
+++ b/kmymoney2/converter/webpricequote.cpp
@@ -66,7 +66,7 @@ WebPriceQuote::~WebPriceQuote()
 
 bool WebPriceQuote::launch( const TQString& _symbol, const TQString& _id, const TQString& _sourcename )
 {
-  if (_sourcename.tqcontains("Finance::Quote"))
+  if (_sourcename.contains("Finance::Quote"))
     return (launchFinanceQuote (_symbol, _id, _sourcename));
   else
     return (launchNative (_symbol, _id, _sourcename));
@@ -87,7 +87,7 @@ bool WebPriceQuote::launchNative( const TQString& _symbol, const TQString& _id,
     if ( sourcename.isEmpty() )
       sourcename = "Yahoo";
 
-    if ( quoteSources().tqcontains(sourcename) )
+    if ( quoteSources().contains(sourcename) )
       m_source = WebPriceQuoteSource(sourcename);
     else
       emit error(TQString("Source <%1> does not exist.").tqarg(sourcename));
@@ -105,7 +105,7 @@ bool WebPriceQuote::launchNative( const TQString& _symbol, const TQString& _id,
   KURL url;
 
   // if the source has room for TWO symbols..
-  if ( m_source.m_url.tqcontains("%2") )
+  if ( m_source.m_url.contains("%2") )
   {
     // this is a two-symbol quote.  split the symbol into two.  valid symbol
     // characters are: 0-9, A-Z and the dot.  anything else is a separator
@@ -115,7 +115,7 @@ bool WebPriceQuote::launchNative( const TQString& _symbol, const TQString& _id,
     if ( splitrx.search(m_symbol) != -1 )
       url = KURL::fromPathOrURL(m_source.m_url.tqarg(splitrx.cap(1),splitrx.cap(2)));
     else
-      kdDebug(2) << "WebPriceQuote::launch() did not tqfind 2 symbols" << endl;
+      kdDebug(2) << "WebPriceQuote::launch() did not find 2 symbols" << endl;
   }
   else
     // a regular one-symbol quote
@@ -316,7 +316,7 @@ void WebPriceQuote::slotParseQuote(const TQString& _quotedata)
       quotedata.remove(TQRegExp("<[^>]*>"));
 
       // &...;'s
-      quotedata.tqreplace(TQRegExp("&\\w+;")," ");
+      quotedata.replace(TQRegExp("&\\w+;")," ");
 
       // Extra white space
       quotedata = quotedata.simplifyWhiteSpace();
@@ -352,16 +352,16 @@ void WebPriceQuote::slotParseQuote(const TQString& _quotedata)
       // set the last one to a period.
       TQString pricestr = priceRegExp.cap(1);
 
-      int pos = pricestr.tqfindRev(TQRegExp("\\D"));
+      int pos = pricestr.findRev(TQRegExp("\\D"));
       if ( pos > 0 )
       {
         pricestr[pos] = '.';
-        pos = pricestr.tqfindRev(TQRegExp("\\D"),pos-1);
+        pos = pricestr.findRev(TQRegExp("\\D"),pos-1);
       }
       while ( pos > 0 )
       {
         pricestr.remove(pos,1);
-        pos = pricestr.tqfindRev(TQRegExp("\\D"),pos);
+        pos = pricestr.findRev(TQRegExp("\\D"),pos);
       }
 
       m_price = pricestr.toDouble();
@@ -639,7 +639,7 @@ TQStringList WebPriceQuote::quoteSourcesNative()
   TQMap<TQString,WebPriceQuoteSource>::const_iterator it_source = defaults.begin();
   while ( it_source != defaults.end() )
   {
-    if ( ! groups.tqcontains( (*it_source).m_name ) )
+    if ( ! groups.contains( (*it_source).m_name ) )
     {
       groups += (*it_source).m_name;
       (*it_source).write();