rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

3 files changed, 13 insertions, 13 deletions

diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc
index 7de5582..8885bbf 100644
--- a/conduits/abbrowserconduit/abbrowser-conduit.cc
+++ b/conduits/abbrowserconduit/abbrowser-conduit.cc
@@ -171,7 +171,7 @@ void AbbrowserConduit::_mapContactsToPilot(TQMap < recordid_t, TQString > &idCon
 			// if we do (this can come from a copy/paste in kaddressbook, etc.), then we need
 			// to reset our Addressee so that we can assign him a new pilot Id later and sync
 			// him properly.  if we don't do this, we'll lose one of these on the pilot.
-			if (!idContactMap.tqcontains(id))
+			if (!idContactMap.contains(id))
 			{
 				idContactMap.insert(id, aContact.uid());
 			}
@@ -619,7 +619,7 @@ void AbbrowserConduit::slotPalmRecToPC()
 	}
 
 	// already synced, so skip:
-	if(syncedIds.tqcontains(palmRec->id()))
+	if(syncedIds.contains(palmRec->id()))
 	{
 		KPILOT_DELETE(palmRec);
 		TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC()));
@@ -696,7 +696,7 @@ void AbbrowserConduit::slotPCRecToPalm()
 	}
 
 	// look into the list of already synced record ids to see if the addressee hasn't already been synced
-	if (syncedIds.tqcontains(rid))
+	if (syncedIds.contains(rid))
 	{
 		DEBUGKPILOT << ": address with id " << rid << " already synced." << endl;
 		TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm()));
@@ -819,7 +819,7 @@ void AbbrowserConduit::slotDeleteUnsyncedPCRecords()
 		AddressBook::Iterator abit;
 		for (abit = aBook->begin(); abit != aBook->end(); ++abit)
 		{
-			if (!uids.tqcontains((*abit).uid()))
+			if (!uids.contains((*abit).uid()))
 			{
 				DEBUGKPILOT<<"Deleting addressee "<<(*abit).realName()<<" from PC (is not on HH, and syncing with HH->PC direction)"<<endl;
 				abChanged = true;
@@ -843,7 +843,7 @@ void AbbrowserConduit::slotDeleteUnsyncedHHRecords()
 		RecordIDList::iterator it;
 		for ( it = ids.begin(); it != ids.end(); ++it )
 		{
-			if (!syncedIds.tqcontains(*it))
+			if (!syncedIds.contains(*it))
 			{
 				DEBUGKPILOT<<"Deleting record with ID "<<*it<<" from handheld (is not on PC, and syncing with PC->HH direction)"<<endl;
 				fDatabase->deleteRecord(*it);
@@ -1150,7 +1150,7 @@ bool AbbrowserConduit::_deleteAddressee(Addressee &pcAddr, PilotAddress*backupAd
 
 	if (palmAddr)
 	{
-		if (!syncedIds.tqcontains(palmAddr->id())) {
+		if (!syncedIds.contains(palmAddr->id())) {
 		DEBUGKPILOT << fname << ": adding id:["<< palmAddr->id() << "] to syncedIds." << endl;
 			syncedIds.append(palmAddr->id());
 		}
@@ -1160,7 +1160,7 @@ bool AbbrowserConduit::_deleteAddressee(Addressee &pcAddr, PilotAddress*backupAd
 	}
 	else if (backupAddr)
 	{
-		if (!syncedIds.tqcontains(backupAddr->id())) {
+		if (!syncedIds.contains(backupAddr->id())) {
 		DEBUGKPILOT << fname << ": adding id:["<< backupAddr->id() << "] to syncedIds." << endl;
 			syncedIds.append(backupAddr->id());
 		}
@@ -1205,7 +1205,7 @@ bool AbbrowserConduit::_savePalmAddr(PilotAddress *palmAddr, Addressee &pcAddr)
 	if(pilotId != 0)
 	{
 		palmAddr->setID(pilotId);
-		if (!syncedIds.tqcontains(pilotId)) {
+		if (!syncedIds.contains(pilotId)) {
 		DEBUGKPILOT << fname << ": adding id:["<< pilotId << "] to syncedIds." << endl;
 			syncedIds.append(pilotId);
 		}
@@ -1339,14 +1339,14 @@ bool AbbrowserConduit::_equal(const PilotAddress *piAddress, const Addressee &ab
 			return false;
 		}
 		for (TQStringList::Iterator it = abEmails.begin(); it != abEmails.end(); it++) {
-			if (!piEmails.tqcontains(*it))
+			if (!piEmails.contains(*it))
 			{
 		DEBUGKPILOT << fname  << ": pilot e-mail missing" << endl;
 			return false;
 			}
 		}
 		for (TQStringList::Iterator it = piEmails.begin(); it != piEmails.end(); it++) {
-			if (!abEmails.tqcontains(*it))
+			if (!abEmails.contains(*it))
 			{
 		DEBUGKPILOT << fname  << ": kabc e-mail missing" << endl;
 			return false;
@@ -1861,7 +1861,7 @@ Addressee AbbrowserConduit::_findMatch(const PilotAddress & pilotAddress) const
 			{
 				if (rid==pilotAddress.id()) return abEntry;// yes, we found it
 				// skip this addressee, as it can an other corresponding address on the handheld
-				if (allIds.tqcontains(rid)) continue;
+				if (allIds.contains(rid)) continue;
 			}
 		}
 
diff --git a/conduits/abbrowserconduit/kabcRecord.cc b/conduits/abbrowserconduit/kabcRecord.cc
index b503031..91cbcb1 100644
--- a/conduits/abbrowserconduit/kabcRecord.cc
+++ b/conduits/abbrowserconduit/kabcRecord.cc
@@ -236,7 +236,7 @@ unsigned int KABCSync::bestMatchedCategory(const TQStringList &pccategories,
 	// See if the suggested hhcategory is in the list, and if
 	// so that is the best match.
 	if (Pilot::validCategory(hhcategory) &&
-		pccategories.tqcontains(info.categoryName(hhcategory)))
+		pccategories.contains(info.categoryName(hhcategory)))
 	{
 		return hhcategory;
 	}
diff --git a/conduits/abbrowserconduit/resolutionDialog.cc b/conduits/abbrowserconduit/resolutionDialog.cc
index 0064a68..ca61afe 100644
--- a/conduits/abbrowserconduit/resolutionDialog.cc
+++ b/conduits/abbrowserconduit/resolutionDialog.cc
@@ -160,7 +160,7 @@ void ResolutionCheckListItem::setCaption(TQString caption)
 void ResolutionCheckListItem::updateText()
 {
 	TQString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").tqarg(fCaption).tqarg(fText));
-	newText.tqreplace(TQRegExp(CSL1("\n")),
+	newText.replace(TQRegExp(CSL1("\n")),
 		i18n("Denoting newlines in Address entries. No need to translate", " | "));
 	setText(0, newText);
 }