rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

6 files changed, 71 insertions, 71 deletions

diff --git a/kverbos/kverbos/data/en/verbos.verbos b/kverbos/kverbos/data/en/verbos.verbos
index 4050476a..62bc04a6 100644
--- a/kverbos/kverbos/data/en/verbos.verbos
+++ b/kverbos/kverbos/data/en/verbos.verbos
@@ -715,7 +715,7 @@ ducharse
 to take a shower
 0
 encontrar
-to tqfind
+to find
 3
 encontrarse
 to encounter, to meet
diff --git a/kverbos/kverbos/kverbos.cpp b/kverbos/kverbos/kverbos.cpp
index 234e43a0..1cccb42d 100644
--- a/kverbos/kverbos/kverbos.cpp
+++ b/kverbos/kverbos/kverbos.cpp
@@ -258,10 +258,10 @@ void KVerbosApp::readOptions()
     key.setNum(i);
     TQString options = config->readEntry ( key, "true false false");
     int pos1 = 0;
-    int pos2 = options.tqfind (' ', pos1, false);
+    int pos2 = options.find (' ', pos1, false);
     timeOptions[i][0] = (options.left(pos2) == "true") ? true : false;
     pos1 =  pos2 + 1;
-    pos2 = options.tqfind (' ', pos1, false);
+    pos2 = options.find (' ', pos1, false);
     timeOptions[i][1] = (options.mid(pos1,pos2-pos1) == "true") ? true : false;
     timeOptions[i][2] = (options.right(options.length()-pos2-1) == "true") ? true : false;
   };
diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp
index 2fd68712..c3d97e1d 100644
--- a/kverbos/kverbos/kverbosdoc.cpp
+++ b/kverbos/kverbos/kverbosdoc.cpp
@@ -232,9 +232,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f)
 			s = t.readLine();
 			if (s.left(9) == "<td width")
 			{
-				int a = s.tqfind('>', 22, true);
+				int a = s.find('>', 22, true);
 				a++;
-				int e = s.tqfind('<', a, true);
+				int e = s.find('<', a, true);
 				v[count1] = s.mid(a, e-a);
 				count1++;
 			};
@@ -294,9 +294,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f)
 					s = t.readLine();
 					if ((s.left(4) == "<td>") && (s != "<td></td><td></td><td></td><td></td><td></td></tr><tr>"))
 					{
-						int a = s.tqfind('>', 2, true);
+						int a = s.find('>', 2, true);
 						a++;
-						int e = s.tqfind('<', a, true);
+						int e = s.find('<', a, true);
 						forms[count2] = s.mid(a, e-a);
 						count2++;
 						if (14 == count2)
@@ -324,9 +324,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f)
 					{
 						// kommt ein Leerzeichen vor, muss man die Form aufteilen: In das
 						// Reflexivpronomen und das eigentliche Verb
-						if (forms[i].tqfind(' ') >= 0)
+						if (forms[i].find(' ') >= 0)
 						{
-							NewVerb.setForm(a, b, forms[i].right(forms[i].length()-forms[i].tqfind(' ')-1));
+							NewVerb.setForm(a, b, forms[i].right(forms[i].length()-forms[i].find(' ')-1));
 						}
 						else
 						{
@@ -344,9 +344,9 @@ bool KVerbosDoc::openDocHTML(TQFile &f)
 					int offs = 30;
 					// kommt ein Leerzeichen vor, muss man die Form aufteilen: In das
 					// Reflexivpronomen und das eigentliche Verb      	
-					if (forms[i+offs].tqfind(' ') >= 0)
+					if (forms[i+offs].find(' ') >= 0)
 					{
-						NewVerb.setForm(a, b, forms[i+offs].right(forms[i+offs].length()-forms[i+offs].tqfind(' ')-1));
+						NewVerb.setForm(a, b, forms[i+offs].right(forms[i+offs].length()-forms[i+offs].find(' ')-1));
 					}
 					else
 					{
diff --git a/kverbos/kverbos/kverbosuser.cpp b/kverbos/kverbos/kverbosuser.cpp
index 4c485431..d3337e7c 100644
--- a/kverbos/kverbos/kverbosuser.cpp
+++ b/kverbos/kverbos/kverbosuser.cpp
@@ -34,8 +34,8 @@ KVerbosUser::KVerbosUser(spanishVerbList* pL, TQString n/*=DEFAULTUSER*/)
 {
 	// try to read the user-information if there is one.
 	int pos;
-	while ((pos = n.tqfind(' ')) != -1)
-		n.tqreplace(pos, 1, "_");
+	while ((pos = n.find(' ')) != -1)
+		n.replace(pos, 1, "_");
 	TQFile file(locateLocal("data", "/kverbos/data/"+name+".kverbos"));
 	if ( file.open(IO_ReadOnly) )
 	{
@@ -61,7 +61,7 @@ KVerbosUser::KVerbosUser(spanishVerbList* pL, TQString n/*=DEFAULTUSER*/)
 			else
 				e.counter = 0;
 			e.used = false;
-			it = liste.tqfind(e);
+			it = liste.find(e);
 			if (liste.end() == it)
 				liste.append(e);
 		};
@@ -97,7 +97,7 @@ void KVerbosUser::fillList(spanishVerbList* pL)
 		elem.verb = (*it2).getSpanish();
 		elem.right = elem.wrong = elem.counter = elem.status = 0;
 		elem.used = true;
-		it = liste.tqfind(elem);
+		it = liste.find(elem);
 		if (liste.end() == it)
 			liste.append(elem);
 		else
@@ -209,8 +209,8 @@ bool KVerbosUser::saveUser(const int& res, const int& num)
 	if (name != DEFAULTUSER)
 	{
 		int pos;
-		while ((pos = name.tqfind(' ')) != -1)
-			name.tqreplace(pos, 1, "_");		
+		while ((pos = name.find(' ')) != -1)
+			name.replace(pos, 1, "_");		
 		TQFile file(locateLocal("data", "/kverbos/data/"+name+".kverbos"));
 		if ( file.open(IO_WriteOnly) )
 		{
diff --git a/kverbos/kverbos/kverbosview.cpp b/kverbos/kverbos/kverbosview.cpp
index ba277ead..ddbc82a0 100644
--- a/kverbos/kverbos/kverbosview.cpp
+++ b/kverbos/kverbos/kverbosview.cpp
@@ -102,12 +102,12 @@ TQString KVerbosView::deleteAccents(const TQString& s) const
     for (unsigned int i=0; i<s2.length(); i++)
     {
       TQString t = s2.mid(i, 1);
-      if (t == "�") s2.tqreplace(i, 1, "a");
-      if (t == "�") s2.tqreplace(i, 1, "e");
-      if (t == "�") s2.tqreplace(i, 1, "i");
-      if (t == "�") s2.tqreplace(i, 1, "o");
-      if (t == "�") s2.tqreplace(i, 1, "u");
-      if (t == "�") s2.tqreplace(i, 1, "n");
+      if (t == "�") s2.replace(i, 1, "a");
+      if (t == "�") s2.replace(i, 1, "e");
+      if (t == "�") s2.replace(i, 1, "i");
+      if (t == "�") s2.replace(i, 1, "o");
+      if (t == "�") s2.replace(i, 1, "u");
+      if (t == "�") s2.replace(i, 1, "n");
     };
   };
   return s2;
@@ -251,7 +251,7 @@ void KVerbosView::slotCorregir()
 	TQPalette palette = EditVerbo->palette();
 	palette.setColor(TQColorGroup::Text, red);
 	palette.setColor(TQColorGroup::Base, white);
-	if ( 0 > formen[6][1].tqfind(EditAleman->text().simplifyWhiteSpace(), 0))
+	if ( 0 > formen[6][1].find(EditAleman->text().simplifyWhiteSpace(), 0))
 	{
 		EditAleman->setFont(fontBold);
 		EditAleman->setPalette(palette);
diff --git a/kverbos/kverbos/verbspanish.cpp b/kverbos/kverbos/verbspanish.cpp
index b787d36e..9db1e466 100644
--- a/kverbos/kverbos/verbspanish.cpp
+++ b/kverbos/kverbos/verbspanish.cpp
@@ -582,10 +582,10 @@ bool verbSpanish::conjugateAll()
 				// Bei Verben der Gruppe 5 �ndert sich der Stamm f�r den Gerund
 				if (getGroup() == 5)
 				{          	  	
-					int pos = gerund.tqfindRev("e");
+					int pos = gerund.findRev("e");
 					if (pos>=0)
 					{
-						gerund.tqreplace(pos, 1, "i");	
+						gerund.replace(pos, 1, "i");	
 					};
 				}
 				gerund += "iendo#";
@@ -606,19 +606,19 @@ bool verbSpanish::vergleich(const TQString& s1, const TQString& s2) const
 {
 	bool gleich=false;
 	unsigned int l=0;
-	int r=s1.tqfind(",", l);
+	int r=s1.find(",", l);
 	while ((l<s1.length()) && (false==gleich))
 	{
 		if (-1 == r)
 		  r = s1.length();
-		if (s2.tqfind(s1.mid(l, r-l).simplifyWhiteSpace(), 0) != -1)
+		if (s2.find(s1.mid(l, r-l).simplifyWhiteSpace(), 0) != -1)
 		{
 		  gleich = true;
 		}
 		else
 		{
 			l = r+1;
-			r=s1.tqfind(",", l);
+			r=s1.find(",", l);
 		};
 	};
 	return gleich;
@@ -675,9 +675,9 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 		{
 			if ((nosotros != person) && (vosotros != person))
 			{
-				pos = s.tqfindRev("e");
+				pos = s.findRev("e");
 				if (pos>=0)
-					s.tqreplace(pos, 1, "ie");
+					s.replace(pos, 1, "ie");
 			};
 		};
 		break;
@@ -690,9 +690,9 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 		{
 			if ((nosotros != person) && (vosotros != person))
 			{
-				pos = s.tqfindRev("o", -3);
+				pos = s.findRev("o", -3);
 				if (pos>=0)
-					s.tqreplace(pos, 1, "ue");
+					s.replace(pos, 1, "ue");
 			};
 		};	
 		break;
@@ -705,9 +705,9 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 		{
 			if ((nosotros != person) && (vosotros != person))
 			{
-				pos = s.tqfindRev("u");
+				pos = s.findRev("u");
 				if (pos>=0)
-					s.tqreplace(pos, 1, "ue");
+					s.replace(pos, 1, "ue");
 			};
 		};	
 		break;
@@ -719,10 +719,10 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 		if ((presente == time) && (person != nosotros) && (person != vosotros))
 		{
 			TQString st = getStem();
-			pos = st.tqfindRev("e");
+			pos = st.findRev("e");
 			if (pos>=0)
 			{
-				st.tqreplace(pos, 1, "i");	
+				st.replace(pos, 1, "i");	
 				s = st + verbEndings[time][getEnding(good)][person];
 			};
 		}
@@ -730,10 +730,10 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 		if ((indefinido == time) && ((el == person)||(ellos == person)))
 		{
 			TQString st = getStem();
-			pos = st.tqfindRev("e");
+			pos = st.findRev("e");
 			if (pos>=0)
 			{
-				st.tqreplace(pos, 1, "i");	
+				st.replace(pos, 1, "i");	
 				s = st + verbEndings[time][getEnding(good)][person];
 			};	
 		}
@@ -745,91 +745,91 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/)
 			};	
 		break;
 	case 6: // <c -> qu> (vor e wird c zu qu)
-		pos = s.tqfindRev("ce");
+		pos = s.findRev("ce");
 		if (pos>=0)
-			s.tqreplace(pos, 2, "que");			
+			s.replace(pos, 2, "que");			
 		else
 		{
-			pos = s.tqfindRev("c�");
+			pos = s.findRev("c�");
 			if (pos>=0)
-				s.tqreplace(pos, 2, "qu�");
+				s.replace(pos, 2, "qu�");
 		}
 		break;
 	case 7: // <g -> gu> (vor e wird g zu gu)
-		pos = s.tqfindRev("ge");
+		pos = s.findRev("ge");
 		if (pos>=0)
-			s.tqreplace(pos, 2, "gue");		
+			s.replace(pos, 2, "gue");		
 		else
 		{
-			pos = s.tqfindRev("g�");
+			pos = s.findRev("g�");
 			if (pos>=0)
-				s.tqreplace(pos, 2, "gu�");
+				s.replace(pos, 2, "gu�");
 		}
 		break;
 	case 8: // <z -> c> (vor e wird z zu c)
-		pos = s.tqfindRev("ze");
+		pos = s.findRev("ze");
 		if (pos>=0)
-			s.tqreplace(pos, 2, "ce");	
+			s.replace(pos, 2, "ce");	
 		else
 		{
-			pos = s.tqfindRev("z�");
+			pos = s.findRev("z�");
 			if (pos>=0)
-				s.tqreplace(pos, 2, "c�");
+				s.replace(pos, 2, "c�");
 		}
 		break;
 	case 9: // <gu -> g�> (vor e wird gu zu g�)
-		pos = s.tqfindRev("gue");
+		pos = s.findRev("gue");
 		if (pos>=0)
-			s.tqreplace(pos, 3, "g�e");
+			s.replace(pos, 3, "g�e");
 		else
 		{
-			pos = s.tqfindRev("gu�");
+			pos = s.findRev("gu�");
 			if (pos>=0)
-				s.tqreplace(pos, 3, "g��");
+				s.replace(pos, 3, "g��");
 		}
 	break;
 	case 10: // <c -> z> (vor o und a wird c zu z)
-		pos = s.tqfindRev("co");
+		pos = s.findRev("co");
 		if (pos>=0)
-			s.tqreplace(pos, 2, "zo");
+			s.replace(pos, 2, "zo");
 		else
 		{
-			pos = s.tqfindRev("ca");
+			pos = s.findRev("ca");
 			if (pos>=0)
-				s.tqreplace(pos, 2, "za");
+				s.replace(pos, 2, "za");
 		};
 		break;
 	case 11: // <g -> j> (vor o und a wird g zu j)
-		pos = s.tqfindRev("ga");
+		pos = s.findRev("ga");
 		if (pos>=0)
-			s.tqreplace(pos, 2, "ja");
+			s.replace(pos, 2, "ja");
 		else
 		{
-			pos = s.tqfindRev("go");
+			pos = s.findRev("go");
 			if (pos>=0)
-				s.tqreplace(pos, 2, "jo");
+				s.replace(pos, 2, "jo");
 		};
 		break;
 	case 12: // <gu -> g> (vor o und a wird gu zu g)
-		pos = s.tqfindRev("guo");
+		pos = s.findRev("guo");
 		if (pos>=0)
-			s.tqreplace(pos, 3, "go");
+			s.replace(pos, 3, "go");
 		else
 		{
-			pos = s.tqfindRev("gua");
+			pos = s.findRev("gua");
 			if (pos>=0)
-				s.tqreplace(pos, 3, "ga");
+				s.replace(pos, 3, "ga");
 		};
 		break;
 	case 13: // <qu -> c> (vor o und a wird qu zu c)
-		pos = s.tqfindRev("quo");
+		pos = s.findRev("quo");
 		if (pos>=0)
-			s.tqreplace(pos, 3, "co");
+			s.replace(pos, 3, "co");
 		else
 		{
-			pos = s.tqfindRev("qua");
+			pos = s.findRev("qua");
 			if (pos>=0)
-				s.tqreplace(pos, 3, "ca");
+				s.replace(pos, 3, "ca");
 		};
 		break;
 	case 14: // <accent like 'enviar'>