rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

1 files changed, 19 insertions, 19 deletions

diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index 564fcf5fb..2d18cef7c 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -94,7 +94,7 @@ static TQString makeValidPhone( const TQString &number )
 	TQString num = number.simplifyWhiteSpace();
 	TQString allowed("0123456789*+#pw");
 	for (unsigned int i=num.length(); i>=1; i--)
-		if (allowed.tqfind(num[i-1])==-1)
+		if (allowed.find(num[i-1])==-1)
 			num.remove(i-1,1);
 	if (num.isEmpty())
 		num = "0";
@@ -242,7 +242,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		// try to split Name into FamilyName and GivenName
 		s = GN_FROM(name).simplifyWhiteSpace();
 		a->setFormattedName(s); // set formatted name as in Phone
-		if (s.tqfind(',') == -1) {
+		if (s.find(',') == -1) {
 		  // assumed format: "givenname [... familyname]"
 		  addrlist = TQStringList::split(' ', s);
 		  if (addrlist.count() == 1) {
@@ -482,13 +482,13 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		TQStringList a;
 		TQChar sem(';');
 		TQString sem_repl(TQString::tqfromLatin1(","));
-      		a.append( Addr->postOfficeBox().tqreplace( sem, sem_repl ) );
-		a.append( Addr->extended()     .tqreplace( sem, sem_repl ) );
-		a.append( Addr->street()       .tqreplace( sem, sem_repl ) );
-		a.append( Addr->locality()     .tqreplace( sem, sem_repl ) );
-		a.append( Addr->region()       .tqreplace( sem, sem_repl ) );
-		a.append( Addr->postalCode()   .tqreplace( sem, sem_repl ) );
-		a.append( Addr->country()      .tqreplace( sem, sem_repl ) );
+      		a.append( Addr->postOfficeBox().replace( sem, sem_repl ) );
+		a.append( Addr->extended()     .replace( sem, sem_repl ) );
+		a.append( Addr->street()       .replace( sem, sem_repl ) );
+		a.append( Addr->locality()     .replace( sem, sem_repl ) );
+		a.append( Addr->region()       .replace( sem, sem_repl ) );
+		a.append( Addr->postalCode()   .replace( sem, sem_repl ) );
+		a.append( Addr->country()      .replace( sem, sem_repl ) );
 		s = a.join(sem);
 		gn_lib_set_pb_subentry(state, -1 /* index to append entry */,
 			GN_PHONEBOOK_ENTRY_Postal, GN_PHONEBOOK_NUMBER_General, GN_TO(s));
@@ -639,7 +639,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	if (memstat.free >= (int) list.count()) {
 		if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(),
 			i18n("<qt>Do you want the selected contacts to be <b>appended</b> to "
-			     "the current mobile phonebook or should they <b>tqreplace</b> all "
+			     "the current mobile phonebook or should they <b>replace</b> all "
 			     "currently existing phonebook entries ?<br><br>"
 			     "Please note, that in case you choose to replace the phonebook "
 			     "entries, every contact in your phone will be deleted and only "
@@ -1015,7 +1015,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
 		// try to split Name into FamilyName and GivenName
 		s = GN_FROM(entry.name).simplifyWhiteSpace();
 		a->setFormattedName(s); // set formatted name as in Phone
-		if (s.tqfind(',') == -1) {
+		if (s.find(',') == -1) {
 		  // assumed format: "givenname [... familyname]"
 		  addrlist = TQStringList::split(' ', s);
 		  if (addrlist.count() == 1) {
@@ -1264,13 +1264,13 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
 		TQStringList a;
 		TQChar sem(';');
 		TQString sem_repl(TQString::tqfromLatin1(","));
-      		a.append( Addr->postOfficeBox().tqreplace( sem, sem_repl ) );
-		a.append( Addr->extended()     .tqreplace( sem, sem_repl ) );
-		a.append( Addr->street()       .tqreplace( sem, sem_repl ) );
-		a.append( Addr->locality()     .tqreplace( sem, sem_repl ) );
-		a.append( Addr->region()       .tqreplace( sem, sem_repl ) );
-		a.append( Addr->postalCode()   .tqreplace( sem, sem_repl ) );
-		a.append( Addr->country()      .tqreplace( sem, sem_repl ) );
+      		a.append( Addr->postOfficeBox().replace( sem, sem_repl ) );
+		a.append( Addr->extended()     .replace( sem, sem_repl ) );
+		a.append( Addr->street()       .replace( sem, sem_repl ) );
+		a.append( Addr->locality()     .replace( sem, sem_repl ) );
+		a.append( Addr->region()       .replace( sem, sem_repl ) );
+		a.append( Addr->postalCode()   .replace( sem, sem_repl ) );
+		a.append( Addr->country()      .replace( sem, sem_repl ) );
 		s = a.join(sem);
 		strncpy(subentry->data.number, GN_TO(s), sizeof(subentry->data.number)-1);
 		entry.subentries_count++;
@@ -1430,7 +1430,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
 	if (memstat.free >= (int) list.count()) {
 		if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(),
 			i18n("<qt>Do you want the selected contacts to be <b>appended</b> to "
-			     "the current mobile phonebook or should they <b>tqreplace</b> all "
+			     "the current mobile phonebook or should they <b>replace</b> all "
 			     "currently existing phonebook entries ?<br><br>"
 			     "Please note, that in case you choose to replace the phonebook "
 			     "entries, every contact in your phone will be deleted and only "