1 files changed, 13 insertions, 13 deletions

diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 3292ccc9..fe312253 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -607,7 +607,7 @@ KDBSearchEngine::repeat ()
 	  if (tot >= min && !inlibs)
 	    {
 		id = item.key;
-		id = id.tqreplace ("\n", "\"\n\"");
+		id = id.replace ("\n", "\"\n\"");
 		mle->append (txt.arg (tot).arg (ntra).arg (id));
 
 	    }
@@ -667,7 +667,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
 
     bool allkey = (searchmode == MD_ALL_GOOD_KEYS);
 
-    bool equal, tqcontains, contained, regexp, intra;
+    bool equal, contains, contained, regexp, intra;
 
     intra = searchmode & MD_IN_TRANSLATION;
 
@@ -700,12 +700,12 @@ KDBSearchEngine::startSearchNow (int searchmode)
 		int pos;
 		for (i = 0; i < len; i++)
 		  {
-		      while ((pos = idMod->tqfind (remchar.at (i))) != -1)
+		      while ((pos = idMod->find (remchar.at (i))) != -1)
 			  idMod->remove (pos, 1);
 		  }
 
 		if (comm)
-		    idMod->tqreplace (TQRegExp ("\\_\\:.*\\\\n"), "");	//Read it from catalog !!! (NOT ONLY HERE)
+		    idMod->replace (TQRegExp ("\\_\\:.*\\\\n"), "");	//Read it from catalog !!! (NOT ONLY HERE)
 
 
 		if (norm)
@@ -802,12 +802,12 @@ KDBSearchEngine::startSearchNow (int searchmode)
 
 		//Remove character in list of character to be ignored
 		for (i = 0; i < len; i++)
-		    while ((pos = msgId.tqfind (remchar.at (i))) != -1)
+		    while ((pos = msgId.find (remchar.at (i))) != -1)
 			msgId.remove (pos, 1);
 
 		//Remove context information from id found
 		if (comm)
-		    msgId.tqreplace (TQRegExp ("\\_\\:.*\\\\n"), "");
+		    msgId.replace (TQRegExp ("\\_\\:.*\\\\n"), "");
 
 
 		if (norm)
@@ -838,14 +838,14 @@ KDBSearchEngine::startSearchNow (int searchmode)
 				  //Remove character in list of character to be ignored
 				  for (i = 0; i < len; i++)
 				      while ((pos =
-					      msgId.tqfind (remchar.at (i))) !=
+					      msgId.find (remchar.at (i))) !=
 					     -1)
 					  msgId.remove (pos, 1);
 
 				  //Remove context information from id found
 				  if (comm)
 				      msgId.
-					  tqreplace (TQRegExp ("\\_\\:.*\\\\n"),
+					  replace (TQRegExp ("\\_\\:.*\\\\n"),
 						   "");
 
 
@@ -867,12 +867,12 @@ KDBSearchEngine::startSearchNow (int searchmode)
 			  equal = false;
 
 		      if (rules & Contains)
-			  tqcontains = idMod->tqcontains (msgId);
+			  contains = idMod->contains (msgId);
 		      else
-			  tqcontains = false;
+			  contains = false;
 
 		      if (rules & Contained)
-			  contained = msgId.tqcontains (*idMod);
+			  contained = msgId.contains (*idMod);
 		      else
 			  contained = false;
 
@@ -887,7 +887,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
 		  }
 		while (intra && nn < item.numTra);
 
-		if (equal || tqcontains || contained || regexp || allkey)
+		if (equal || contains || contained || regexp || allkey)
 		  {
 
 		      if (equal)
@@ -1034,7 +1034,7 @@ KDBSearchEngine::startSingleSearch (TQString searchString,
 	      in = reg.search (searchString, in + len);
 	      len = reg.matchedLength ();
 	      TQString regToAdd = searchString;
-	      regToAdd.tqreplace (in, len, "[a-zA-Z0-9_%" + regaddchar + "]*");
+	      regToAdd.replace (in, len, "[a-zA-Z0-9_%" + regaddchar + "]*");
 	      regToAdd.append ("$");
 	      regToAdd.prepend ("^");
 //      fprintf(stderr,"%s",(const char *)regToAdd.local8Bit());