rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

235 files changed, 899 insertions, 899 deletions

diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index 50d7fc12..5ca35e81 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -184,7 +184,7 @@ void KKameraConfig::load(bool useDefaults )
 	for (it = groupList.begin(); it != groupList.end(); it++) {
 		if (*it != "<default>")	{
 			m_config->setGroup(*it);
-			if (m_config->readEntry("Path").tqcontains("usb:"))
+			if (m_config->readEntry("Path").contains("usb:"))
 				continue;
 
 			kcamera = new KCamera(*it,m_config->readEntry("Path"));
@@ -218,7 +218,7 @@ void KKameraConfig::load(bool useDefaults )
 		if (!strcmp(value,"usb:"))
 			names[model] = value;
 	}
-	if (ports.tqcontains("usb:") && names[ports["usb:"]]!="usb:")
+	if (ports.contains("usb:") && names[ports["usb:"]]!="usb:")
 		ports.remove("usb:");
 
 	TQMap<TQString,TQString>::iterator portit;
@@ -268,15 +268,15 @@ void KKameraConfig::afterCameraOperation(void)
 TQString KKameraConfig::suggestName(const TQString &name)
 {
 	TQString new_name = name;
-	new_name.tqreplace("/", ""); // we cannot have a slash in a URI's host
+	new_name.replace("/", ""); // we cannot have a slash in a URI's host
 
-	if (!m_devices.tqcontains(new_name)) return new_name;
+	if (!m_devices.contains(new_name)) return new_name;
 	
 	// try new names with a number appended until we find a free one
 	int i = 1;
 	while (i++ < 0xffff) {
 		new_name = name + " (" + TQString::number(i) + ")";
-		if (!m_devices.tqcontains(new_name)) return new_name;
+		if (!m_devices.contains(new_name)) return new_name;
 	}
 
 	return TQString();
@@ -302,7 +302,7 @@ void KKameraConfig::slot_addCamera()
 void KKameraConfig::slot_removeCamera()
 {
 	TQString name = m_deviceSel->currentItem()->text();
-	if (m_devices.tqcontains(name)) {
+	if (m_devices.contains(name)) {
 		KCamera *m_device = m_devices[name];
 		m_devices.remove(name);
 		delete m_device;
@@ -317,7 +317,7 @@ void KKameraConfig::slot_testCamera()
 	beforeCameraOperation();
 
 	TQString name = m_deviceSel->currentItem()->text();
-	if (m_devices.tqcontains(name)) {
+	if (m_devices.contains(name)) {
 		KCamera *m_device = m_devices[name];
 		if (m_device->test())
 			KMessageBox::information(this, i18n("Camera test was successful."));
@@ -329,7 +329,7 @@ void KKameraConfig::slot_testCamera()
 void KKameraConfig::slot_configureCamera()
 {
 	TQString name = m_deviceSel->currentItem()->text();
-	if (m_devices.tqcontains(name)) {
+	if (m_devices.contains(name)) {
 		KCamera *m_device = m_devices[name];
 		m_device->configure();
 	}
@@ -339,7 +339,7 @@ void KKameraConfig::slot_cameraSummary()
 {
 	TQString summary;
 	TQString name = m_deviceSel->currentItem()->text();
-	if (m_devices.tqcontains(name)) {
+	if (m_devices.contains(name)) {
 		KCamera *m_device = m_devices[name];
 		summary = m_device->summary();
 		if (!summary.isNull()) {
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index f786203a..a38ed0b7 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -209,7 +209,7 @@ void KCamera::save(KConfig *config)
 
 TQString KCamera::portName()
 {
-	TQString port = m_path.left(m_path.tqfind(":")).lower();
+	TQString port = m_path.left(m_path.find(":")).lower();
 	if (port == "serial") return i18n("Serial");
 	if (port == "usb") return i18n("USB");
 	return i18n("Unknown port");
@@ -403,7 +403,7 @@ void KameraDeviceSelectDialog::save()
 void KameraDeviceSelectDialog::load()
 {
 	TQString path = m_device->path();
-	TQString port = path.left(path.tqfind(":")).lower();
+	TQString port = path.left(path.find(":")).lower();
 
 	if (port == "serial") setPortType(INDEX_SERIAL);
 	if (port == "usb") setPortType(INDEX_USB);
diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp
index 05917e3c..4ef47238 100644
--- a/kamera/kioslave/kamera.cpp
+++ b/kamera/kioslave/kamera.cpp
@@ -574,7 +574,7 @@ void KameraProtocol::listDir(const KURL &url)
 		gp_list_free (list);
 
 		/* Avoid duplicated entry for usb: and usb:001,042 entries. */
-		if (ports.tqcontains("usb:") && names[ports["usb:"]]!="usb:")
+		if (ports.contains("usb:") && names[ports["usb:"]]!="usb:")
 			ports.remove("usb:");
 
 		for (it = groupList.begin(); it != groupList.end(); it++) {
@@ -606,7 +606,7 @@ void KameraProtocol::listDir(const KURL &url)
 			xurl.setProtocol("camera");
 			xurl.setUser(*it);
 			/* Avoid setting usb:xxx,yyy. */
-			if (m_cfgPath.tqcontains("usb:")>0) {
+			if (m_cfgPath.contains("usb:")>0) {
 				names[*it] = "usb:";
 				xurl.setHost("usb:");
 			} else {
diff --git a/kcoloredit/editablestreamhistory.h b/kcoloredit/editablestreamhistory.h
index 20233e33..9fe59d99 100644
--- a/kcoloredit/editablestreamhistory.h
+++ b/kcoloredit/editablestreamhistory.h
@@ -37,7 +37,7 @@ public:
 	/** Pastes a stream at index. Uses undo/redo history */
 	void paste(const int index, EDITABLE_STREAM& pasteStream);
 	/** Replaces a stream at index. Uses undo/redo history */
-	void tqreplace(const int index, EDITABLE_STREAM& replaceStream);
+	void replace(const int index, EDITABLE_STREAM& replaceStream);
 	/** @return Whether undo possible */
 	bool undoPossible();
 	/** @return Whether redo possible */
@@ -76,7 +76,7 @@ template <class EDITABLE_STREAM> void
 }
 
 template <class EDITABLE_STREAM> void
-	EditableStreamHistory<EDITABLE_STREAM>::tqreplace(const int index, EDITABLE_STREAM& replaceStream) {
+	EditableStreamHistory<EDITABLE_STREAM>::replace(const int index, EDITABLE_STREAM& replaceStream) {
 	m_editableStream->cut(index, replaceStream.length());
 	m_editableStream->paste(index, replaceStream);
 }
diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp
index ed9094e5..449c78f3 100644
--- a/kcoloredit/kcoloreditdoc.cpp
+++ b/kcoloredit/kcoloreditdoc.cpp
@@ -281,11 +281,11 @@ void KColorEditDoc::insert(int index, const Color& color) {
 	slotRedrawAllViews(0);
 }
 
-void KColorEditDoc::tqreplace(int index, const Color& color) {
+void KColorEditDoc::replace(int index, const Color& color) {
 	Palette paletteReplace;
 	Color* replaceColor = new Color(color);
 	paletteReplace.append(replaceColor);
-	m_paletteHistory.tqreplace(index, paletteReplace);
+	m_paletteHistory.replace(index, paletteReplace);
 	setPaletteSelection(0, 0);
 	setModified(true);
 	slotRedrawAllViews(0);
diff --git a/kcoloredit/kcoloreditdoc.h b/kcoloredit/kcoloreditdoc.h
index 108e05fe..9f65c25e 100644
--- a/kcoloredit/kcoloreditdoc.h
+++ b/kcoloredit/kcoloreditdoc.h
@@ -112,7 +112,7 @@ class KColorEditDoc : public TQObject
 		/** Inserts a color at index */
 		void insert(int index, const Color& color);
 		/** Replaces a color at index */
-		void tqreplace(int index, const Color& color);
+		void replace(int index, const Color& color);
 
 	protected:
 		/** Sets an error string if an IO operation was unsuccesfull */
diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp
index b82a92ca..e7251ec7 100644
--- a/kcoloredit/kcoloreditview.cpp
+++ b/kcoloredit/kcoloreditview.cpp
@@ -234,7 +234,7 @@ void KColorEditView::slotAddColor() {
 
         case REPLACE_COLOR:
             if(index < palette->length())
-                document()->tqreplace(index, color);
+                document()->replace(index, color);
             else
                 document()->insert(index, color);
             break;
@@ -274,7 +274,7 @@ void KColorEditView::slotSetColorName(const TQString& name) {
 				palette->color(cursorPos)->component(Color::BLUE_INDEX),
 				name);
 			doNotUpdateColorLabels = true;
-			document()->tqreplace(cursorPos, newColor);
+			document()->replace(cursorPos, newColor);
 			doNotUpdateColorLabels = false;
 		}
 	}
diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp
index a5e298ce..35fceb26 100644
--- a/kcoloredit/loadpalettedlg.cpp
+++ b/kcoloredit/loadpalettedlg.cpp
@@ -45,7 +45,7 @@ LoadPaletteDlg::LoadPaletteDlg(TQWidget *tqparent, const char *name)
 	TQStringList palettesList = Palette::kdePalettes();
 	for(TQStringList::Iterator palette = palettesList.begin();
 		palette != palettesList.end(); ++palette) {
-		bool prepend = (*palette).tqcontains( "colors/Custom_Colors" );
+		bool prepend = (*palette).contains( "colors/Custom_Colors" );
 		TQString fileName = locate("config", (*palette));
 		if(prepend) {
 			palettesFileNames.prepend(fileName);
diff --git a/kcoloredit/palette.cpp b/kcoloredit/palette.cpp
index 6f830278..42758b41 100644
--- a/kcoloredit/palette.cpp
+++ b/kcoloredit/palette.cpp
@@ -108,14 +108,14 @@ bool Palette::load(TQTextStream& stream, bool loadName /* = true */) {
 	int lineNum = 0;
 	while (!stream.atEnd()) {
 		TQString string = stream.readLine().append(' ');
-		if(string.tqfind( TQRegExp("[^\\s]") ) == -1 ||
+		if(string.find( TQRegExp("[^\\s]") ) == -1 ||
 			string.stripWhiteSpace().at( 0 ) == '#' ||
 			( loadName && lineNum == 0 )) {
 			if(loadName && lineNum == 0)
 				setName(string.stripWhiteSpace());
 		} else {
 			Color* newColor = new Color();
-			int position = string.tqfind(TQRegExp( "[^\\s]" ));
+			int position = string.find(TQRegExp( "[^\\s]" ));
 			for(int componentIndex = 0; componentIndex < Color::COMPONENTS_NUM;
 				++componentIndex) {
 				if(position == -1) {
@@ -123,7 +123,7 @@ bool Palette::load(TQTextStream& stream, bool loadName /* = true */) {
 					result = false;
 					break;
 				}
-				int endPosition = string.tqfind(TQRegExp( "\\s" ), position);
+				int endPosition = string.find(TQRegExp( "\\s" ), position);
 				if(endPosition == -1) {
 					m_errorString = i18n("Invalid format");
 					result = false;
@@ -139,7 +139,7 @@ bool Palette::load(TQTextStream& stream, bool loadName /* = true */) {
 					break;
 				}
 				newColor->setComponent(componentIndex, componentValue);
-				position = string.tqfind(TQRegExp( "[^\\s]" ), endPosition);
+				position = string.find(TQRegExp( "[^\\s]" ), endPosition);
 			}
 			if(!result) {
 				delete newColor;
diff --git a/kdvi/dviFile.cpp b/kdvi/dviFile.cpp
index db365482..33dc601d 100644
--- a/kdvi/dviFile.cpp
+++ b/kdvi/dviFile.cpp
@@ -362,7 +362,7 @@ void dvifile::renumber()
 TQString dvifile::convertPDFtoPS(const TQString &PDFFilename)
 {
   // Check if the PDFFile is known
-  TQMap<TQString, TQString>::Iterator it =  convertedFiles.tqfind(PDFFilename);
+  TQMap<TQString, TQString>::Iterator it =  convertedFiles.find(PDFFilename);
   if (it != convertedFiles.end()) {
     // PDF-File is known. Good.
     return it.data();
diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp
index 40463d36..7f21c65d 100644
--- a/kdvi/dviRenderer.cpp
+++ b/kdvi/dviRenderer.cpp
@@ -507,7 +507,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
   TQString includePath;
   if (!baseURL.isLocalFile()) {
     includePath = filename;
-    includePath.truncate(includePath.tqfindRev('/'));
+    includePath.truncate(includePath.findRev('/'));
   }
   PS_interface->setIncludePath(includePath);
   
@@ -629,7 +629,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
   // points to line number 1111 in the file "Filename". KDVI then
   // looks for source specials of the form "src:xxxxFilename", and
   // tries to find the special with the biggest xxxx
-  if (reference.tqfind("src:",0,false) == 0) {
+  if (reference.find("src:",0,false) == 0) {
   
     // Extract the file name and the numeral part from the reference string
     DVI_SourceFileSplitter splitter(reference, dviFile->filename);
@@ -651,7 +651,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
     // whose line number is the biggest among those that are smaller
     // than the refLineNumber. That way, the position in the DVI file
     // which is highlighted is always a little further up than the
-    // position in the editor, e.g. if the DVI file tqcontains
+    // position in the editor, e.g. if the DVI file contains
     // positional information at the beginning of every paragraph,
     // KDVI jumps to the beginning of the paragraph that the cursor is
     // in, and never to the next paragraph. If source file anchors for
@@ -756,7 +756,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
     else
       return;
   }
-  command = command.tqreplace( "%l", TQString::number(splitter.line()) ).tqreplace( "%f", KShellProcess::quote(TeXfile) );
+  command = command.replace( "%l", TQString::number(splitter.line()) ).replace( "%f", KShellProcess::quote(TeXfile) );
   
 #ifdef DEBUG_SPECIAL
   kdDebug(4300) << "Calling program: " << command << endl;
@@ -810,27 +810,27 @@ TQString dviRenderer::PDFencodingToTQString(const TQString& _pdfstring)
   // replaces them by UTF8. See Section 3.2.3 of the PDF reference
   // guide for information.
   TQString pdfstring = _pdfstring;
-  pdfstring = pdfstring.tqreplace("\\n", "\n");
-  pdfstring = pdfstring.tqreplace("\\r", "\n");
-  pdfstring = pdfstring.tqreplace("\\t", "\t");
-  pdfstring = pdfstring.tqreplace("\\f", "\f");
-  pdfstring = pdfstring.tqreplace("\\(", "(");
-  pdfstring = pdfstring.tqreplace("\\)", ")");
-  pdfstring = pdfstring.tqreplace("\\\\", "\\");
+  pdfstring = pdfstring.replace("\\n", "\n");
+  pdfstring = pdfstring.replace("\\r", "\n");
+  pdfstring = pdfstring.replace("\\t", "\t");
+  pdfstring = pdfstring.replace("\\f", "\f");
+  pdfstring = pdfstring.replace("\\(", "(");
+  pdfstring = pdfstring.replace("\\)", ")");
+  pdfstring = pdfstring.replace("\\\\", "\\");
   
   // Now replace octal character codes with the characters they encode
   int pos;
   TQRegExp rx( "(\\\\)(\\d\\d\\d)" );  // matches "\xyz" where x,y,z are numbers
   while((pos = rx.search( pdfstring )) != -1) {
-    pdfstring = pdfstring.tqreplace(pos, 4, TQChar(rx.cap(2).toInt(0,8)));
+    pdfstring = pdfstring.replace(pos, 4, TQChar(rx.cap(2).toInt(0,8)));
   }
   rx.setPattern( "(\\\\)(\\d\\d)" );  // matches "\xy" where x,y are numbers
   while((pos = rx.search( pdfstring )) != -1) {
-    pdfstring = pdfstring.tqreplace(pos, 3, TQChar(rx.cap(2).toInt(0,8)));
+    pdfstring = pdfstring.replace(pos, 3, TQChar(rx.cap(2).toInt(0,8)));
   }
   rx.setPattern( "(\\\\)(\\d)" );  // matches "\x" where x is a number
   while((pos = rx.search( pdfstring )) != -1) {
-    pdfstring = pdfstring.tqreplace(pos, 4, TQChar(rx.cap(2).toInt(0,8)));
+    pdfstring = pdfstring.replace(pos, 4, TQChar(rx.cap(2).toInt(0,8)));
   }
   return pdfstring;
 }
diff --git a/kdvi/dviRenderer_draw.cpp b/kdvi/dviRenderer_draw.cpp
index af79b09a..2031fcd7 100644
--- a/kdvi/dviRenderer_draw.cpp
+++ b/kdvi/dviRenderer_draw.cpp
@@ -290,7 +290,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
       (this->*currinf.set_char_p)(ch, ch);
     } else
       if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
-	currinf.fontp = currinf.fonttable->tqfind(ch - FNTNUM0);
+	currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
 	if (currinf.fontp == NULL) {
 	  errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
 	  return;
@@ -511,7 +511,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
 	case FNT1:
 	case FNT2:
 	case FNT3:
-	  currinf.fontp = currinf.fonttable->tqfind(readUINT(ch - FNT1 + 1));
+	  currinf.fontp = currinf.fonttable->find(readUINT(ch - FNT1 + 1));
 	  if (currinf.fontp == NULL) {
 	    errorMsg = i18n("The DVI code referred to a font which was not previously defined.");
 	    return;
@@ -520,7 +520,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
 	  break;
 
 	case FNT4:
-	  currinf.fontp = currinf.fonttable->tqfind(readINT(ch - FNT1 + 1));
+	  currinf.fontp = currinf.fonttable->find(readINT(ch - FNT1 + 1));
 	  if (currinf.fontp == NULL) {
 	    errorMsg = i18n("The DVI code referred to a font which was not previously defined.");
 	    return;
diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp
index d23a15ce..110aaacb 100644
--- a/kdvi/dviRenderer_export.cpp
+++ b/kdvi/dviRenderer_export.cpp
@@ -94,7 +94,7 @@ void dviRenderer::exportPDF()
 
   // Generate a suggestion for a reasonable file name
   TQString suggestedName = dviFile->filename;
-  suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".pdf";
+  suggestedName = suggestedName.left(suggestedName.find(".")) + ".pdf";
 
   TQString fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.pdf|Portable Document Format (*.pdf)"), parentWidget, i18n("Export File As"));
   if (fileName.isEmpty())
@@ -193,7 +193,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
   if (fname.isEmpty()) {
     // Generate a suggestion for a reasonable file name
     TQString suggestedName = dviFile->filename;
-    suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".ps";
+    suggestedName = suggestedName.left(suggestedName.find(".")) + ".ps";
 
     fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.ps|PostScript (*.ps)"), parentWidget, i18n("Export File As"));
     if (fileName.isEmpty())
diff --git a/kdvi/dviRenderer_prescan.cpp b/kdvi/dviRenderer_prescan.cpp
index 5ed49ebc..7cfd2415 100644
--- a/kdvi/dviRenderer_prescan.cpp
+++ b/kdvi/dviRenderer_prescan.cpp
@@ -60,7 +60,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
   // (already the simplifyWhiteSpace() above is wrong). If you have
   // files like this, go away.
   TQString EPSfilename = include_command;
-  EPSfilename.truncate(EPSfilename.tqfind(' '));
+  EPSfilename.truncate(EPSfilename.find(' '));
 
   // Strip enclosing quotation marks which are included by some LaTeX
   // macro packages (but not by others). This probably means that
@@ -118,7 +118,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
   int  angle   = 0;
 
   // just to avoid ambiguities; the filename could contain keywords
-  include_command = include_command.mid(include_command.tqfind(' '));
+  include_command = include_command.mid(include_command.find(' '));
   
   parse_special_argument(include_command, "llx=", &llx);
   parse_special_argument(include_command, "lly=", &lly);
@@ -128,7 +128,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
   parse_special_argument(include_command, "rhi=", &rhi);
   parse_special_argument(include_command, "angle=", &angle);
 
-  int clip=include_command.tqfind(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
+  int clip=include_command.find(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
 
   // Generate the PostScript commands to be included
   TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury);
@@ -271,7 +271,7 @@ void dviRenderer::prescan_ParseBackgroundSpecial(const TQString& cp)
 void dviRenderer::prescan_ParseHTMLAnchorSpecial(const TQString& _cp)
 {
   TQString cp = _cp;
-  cp.truncate(cp.tqfind('"'));
+  cp.truncate(cp.find('"'));
   Length l;
   l.setLength_in_inch(currinf.data.dvi_v/(resolutionInDPI*shrinkfactor));
   anchorList[cp] = Anchor(current_page+1, l);
@@ -355,14 +355,14 @@ void dviRenderer::prescan_ParsePSSpecial(const TQString& cp)
     if (cp.startsWith("ps:SDict begin /product where{pop product(Distiller)"))
       return; // hyperref tries to work around Distiller bug
     if (cp.startsWith("ps:SDict begin [") && cp.endsWith(" pdfmark end")) {  // hyperref definition of link/anchor/bookmark/etc
-      if (cp.tqcontains("/DEST")) { // The PostScript code defines an anchor
+      if (cp.contains("/DEST")) { // The PostScript code defines an anchor
 	TQString anchorName = cp.section('(', 1, 1).section(')', 0, 0);
 	Length l;
 	l.setLength_in_inch(currinf.data.dvi_v/(resolutionInDPI*shrinkfactor));
 	anchorList[anchorName] = Anchor(current_page+1, l);
       }
       // The PostScript code defines a bookmark
-      if (cp.tqcontains("/Dest") && cp.tqcontains("/Title"))
+      if (cp.contains("/Dest") && cp.contains("/Title"))
 	prebookmarks.append(PreBookmark(PDFencodingToTQString(cp.section('(', 2, 2).section(')', 0, 0)),
 					cp.section('(', 1, 1).section(')', 0, 0), 
 					cp.section('-', 1, 1).section(' ', 0, 0).toUInt()
@@ -374,14 +374,14 @@ void dviRenderer::prescan_ParsePSSpecial(const TQString& cp)
   double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
   double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
   
-  if (cp.tqfind("ps::[begin]", 0, false) == 0) {
+  if (cp.find("ps::[begin]", 0, false) == 0) {
     PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
     PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(11)) );
   } else {
-    if (cp.tqfind("ps::[end]", 0, false) == 0) {
+    if (cp.find("ps::[end]", 0, false) == 0) {
       PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(9)) );
     } else {
-      if (cp.tqfind("ps::", 0, false) == 0) {
+      if (cp.find("ps::", 0, false) == 0) {
 	PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(4)) );
       } else {
 	PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
@@ -406,7 +406,7 @@ void dviRenderer::prescan_ParsePSFileSpecial(const TQString& cp)
   // (already the simplifyWhiteSpace() above is wrong). If you have
   // files like this, go away.
   TQString EPSfilename = include_command;
-  EPSfilename.truncate(EPSfilename.tqfind(' '));
+  EPSfilename.truncate(EPSfilename.find(' '));
 
   // Strip enclosing quotation marks which are included by some LaTeX
   // macro packages (but not by others). This probably means that
@@ -444,7 +444,7 @@ void dviRenderer::prescan_ParsePSFileSpecial(const TQString& cp)
   int  angle   = 0;
   
   // just to avoid ambiguities; the filename could contain keywords
-  include_command = include_command.mid(include_command.tqfind(' '));
+  include_command = include_command.mid(include_command.find(' '));
   
   parse_special_argument(include_command, "llx=", &llx);
   parse_special_argument(include_command, "lly=", &lly);
@@ -454,7 +454,7 @@ void dviRenderer::prescan_ParsePSFileSpecial(const TQString& cp)
   parse_special_argument(include_command, "rhi=", &rhi);
   parse_special_argument(include_command, "angle=", &angle);
   
-  int clip=include_command.tqfind(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
+  int clip=include_command.find(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
   
   if (TQFile::exists(EPSfilename)) {
     double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
@@ -631,7 +631,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
     }
 
     if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
-      currinf.fontp = currinf.fonttable->tqfind(ch - FNTNUM0);
+      currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
       if (currinf.fontp == NULL) {
 	errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
 	return;
@@ -750,7 +750,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
     case FNT2:
     case FNT3:
     case FNT4:
-      currinf.fontp = currinf.fonttable->tqfind(readUINT(ch - FNT1 + 1));
+      currinf.fontp = currinf.fonttable->find(readUINT(ch - FNT1 + 1));
       if (currinf.fontp == NULL) 
 	return;
       currinf.set_char_p = currinf.fontp->set_char_p;
diff --git a/kdvi/dviWidget.cpp b/kdvi/dviWidget.cpp
index 321f0f57..68f4b124 100644
--- a/kdvi/dviWidget.cpp
+++ b/kdvi/dviWidget.cpp
@@ -53,7 +53,7 @@ void DVIWidget::mousePressEvent(TQMouseEvent* e)
 
     for(unsigned int i=0; i<pageData->sourceHyperLinkList.size(); i++)
     {
-      if (pageData->sourceHyperLinkList[i].box.tqcontains(e->pos()))
+      if (pageData->sourceHyperLinkList[i].box.contains(e->pos()))
       {
         emit(SRCLink(pageData->sourceHyperLinkList[i].linkText, e, this));
         e->accept();
@@ -99,7 +99,7 @@ void DVIWidget::mouseMoveEvent(TQMouseEvent* e)
     
     // Check if the cursor hovers over a sourceHyperlink.
     for(unsigned int i=0; i<pageData->sourceHyperLinkList.size(); i++) {
-      if (pageData->sourceHyperLinkList[i].box.tqcontains(e->pos())) {
+      if (pageData->sourceHyperLinkList[i].box.contains(e->pos())) {
 	clearStatusBarTimer.stop();
 	
 	// The macro-package srcltx gives a special like "src:99 test.tex"
diff --git a/kdvi/examples/dvistd0.dvi b/kdvi/examples/dvistd0.dvi
index 654b617b..ef73e604 100644
--- a/kdvi/examples/dvistd0.dvi
+++ b/kdvi/examples/dvistd0.dvi
diff --git a/kdvi/fontEncoding.h b/kdvi/fontEncoding.h
index b70cfdc5..95eb4dd0 100644
--- a/kdvi/fontEncoding.h
+++ b/kdvi/fontEncoding.h
@@ -48,7 +48,7 @@
  * a different name and with a different encoding ---the map file
  * (fontMap.h) can probably see to that.
  *
- * Summing up: this class tqcontains 256 glyph names read from an
+ * Summing up: this class contains 256 glyph names read from an
  * encoding file during the construction of this class.
  *
  * @author Stefan Kebekus   <[email protected]>
diff --git a/kdvi/fontEncodingPool.cpp b/kdvi/fontEncodingPool.cpp
index 4c00256f..59b38167 100644
--- a/kdvi/fontEncodingPool.cpp
+++ b/kdvi/fontEncodingPool.cpp
@@ -18,7 +18,7 @@ fontEncodingPool::fontEncodingPool()
 
 fontEncoding *fontEncodingPool::findByName(const TQString &name)
 {
-  fontEncoding *ptr = dictionary.tqfind( name );
+  fontEncoding *ptr = dictionary.find( name );
   
   if (ptr == 0) {
     ptr = new fontEncoding(name);
diff --git a/kdvi/fontMap.cpp b/kdvi/fontMap.cpp
index b285018b..7dec6f4f 100644
--- a/kdvi/fontMap.cpp
+++ b/kdvi/fontMap.cpp
@@ -78,7 +78,7 @@ fontMap::fontMap()
         encodingName = encodingName.mid(1);
 
       double slant = 0.0;
-      int i = line.tqfind("SlantFont");
+      int i = line.find("SlantFont");
       if (i >= 0) {
 	bool ok;
 	slant = line.left(i).section(' ', -1, -1 ,TQString::SectionSkipEmpty).toDouble(&ok);
@@ -115,7 +115,7 @@ fontMap::fontMap()
 
 const TQString &fontMap::findFileName(const TQString &TeXName)
 {
-  TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.tqfind(TeXName);
+  TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.find(TeXName);
   
   if (it != fontMapEntries.end())
     return it.data().fontFileName;
@@ -126,7 +126,7 @@ const TQString &fontMap::findFileName(const TQString &TeXName)
 
 const TQString &fontMap::findFontName(const TQString &TeXName)
 {
-  TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.tqfind(TeXName);
+  TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.find(TeXName);
   
   if (it != fontMapEntries.end())
     return it.data().fullFontName;
@@ -137,7 +137,7 @@ const TQString &fontMap::findFontName(const TQString &TeXName)
 
 const TQString &fontMap::findEncoding(const TQString &TeXName)
 {
-  TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.tqfind(TeXName);
+  TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.find(TeXName);
   
   if (it != fontMapEntries.end())
     return it.data().fontEncoding;
@@ -148,7 +148,7 @@ const TQString &fontMap::findEncoding(const TQString &TeXName)
 
 double fontMap::findSlant(const TQString &TeXName)
 {
-  TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.tqfind(TeXName);
+  TQMap<TQString, fontMapEntry>::Iterator it = fontMapEntries.find(TeXName);
   
   if (it != fontMapEntries.end())
     return it.data().slant;
diff --git a/kdvi/fontMap.h b/kdvi/fontMap.h
index 6a719ea6..da80b72a 100644
--- a/kdvi/fontMap.h
+++ b/kdvi/fontMap.h
@@ -13,7 +13,7 @@
 #include <tqstring.h>
 
 /**
- * This class represents one line of a font map file, and tqcontains
+ * This class represents one line of a font map file, and contains
  * three pieces of information about a font: its file name, the full
  * name of the font, and the encoding.
  *
diff --git a/kdvi/fontpool.cpp b/kdvi/fontpool.cpp
index 17bc4a3d..8cd35df7 100644
--- a/kdvi/fontpool.cpp
+++ b/kdvi/fontpool.cpp
@@ -46,7 +46,7 @@ fontPool::fontPool()
 	       i18n( "KDVI is currently generating bitmap fonts..." ),
 	       i18n( "Aborts the font generation. Don't do this." ),
 	       i18n( "KDVI is currently generating bitmap fonts which are needed to display your document. "
-		     "For this, KDVI uses a number of external programs, such as MetaFont. You can tqfind "
+		     "For this, KDVI uses a number of external programs, such as MetaFont. You can find "
 		     "the output of these programs later in the document info dialog." ),
 	       i18n( "KDVI is generating fonts. Please wait." ),
 	       0 )
@@ -558,32 +558,32 @@ void fontPool::mf_output_receiver(KProcess *, char *buffer, int buflen)
   // We'd like to print only full lines of text.
   int numleft;
   bool show_prog = false;
-  while( (numleft = MetafontOutput.tqfind('\n')) != -1) {
+  while( (numleft = MetafontOutput.find('\n')) != -1) {
     TQString line = MetafontOutput.left(numleft+1);
 #ifdef DEBUG_FONTPOOL
     kdDebug(4300) << "MF OUTPUT RECEIVED: " << line;
 #endif
     // Search for a line which marks the beginning of a MetaFont run
     // and show the progress dialog at the end of this method.
-    if (line.tqfind("kpathsea:") == 0)
+    if (line.find("kpathsea:") == 0)
       show_prog = true;
 
     // If the Output of the kpsewhich program contains a line starting
     // with "kpathsea:", this means that a new MetaFont-run has been
     // started. We filter these lines out and update the display
     // accordingly.
-    int startlineindex = line.tqfind("kpathsea:");
+    int startlineindex = line.find("kpathsea:");
     if (startlineindex != -1) {
-      int endstartline  = line.tqfind("\n",startlineindex);
+      int endstartline  = line.find("\n",startlineindex);
       TQString startLine = line.mid(startlineindex,endstartline-startlineindex);
 
       // The last word in the startline is the name of the font which we
       // are generating. The second-to-last word is the resolution in
       // dots per inch. Display this info in the text label below the
       // progress bar.
-      int lastblank     = startLine.tqfindRev(' ');
+      int lastblank     = startLine.findRev(' ');
       TQString fontName  = startLine.mid(lastblank+1);
-      int secondblank   = startLine.tqfindRev(' ',lastblank-1);
+      int secondblank   = startLine.findRev(' ',lastblank-1);
       TQString dpi       = startLine.mid(secondblank+1,lastblank-secondblank-1);
 
       progress.show();
diff --git a/kdvi/infodialog.cpp b/kdvi/infodialog.cpp
index b287a390..3e2bbf16 100644
--- a/kdvi/infodialog.cpp
+++ b/kdvi/infodialog.cpp
@@ -89,7 +89,7 @@ void infoDialog::setFontInfo(fontPool *fp)
 void infoDialog::outputReceiver(const TQString& _op)
 {
   TQString op = _op;
-  op = op.tqreplace( TQRegExp("<"), "&lt;" );
+  op = op.replace( TQRegExp("<"), "&lt;" );
 
   if (MFOutputReceived == false) {
     TextLabel3->setText("<b>"+headline+"</b><br>");
@@ -99,7 +99,7 @@ void infoDialog::outputReceiver(const TQString& _op)
   // It seems that the TQTextView wants that we append only full lines.
   // We see to that.
   pool = pool+op;
-  int idx = pool.tqfindRev("\n");
+  int idx = pool.findRev("\n");
 
   while(idx != -1) {
     TQString line = pool.left(idx);
@@ -108,9 +108,9 @@ void infoDialog::outputReceiver(const TQString& _op)
     // If the Output of the kpsewhich program contains a line starting
     // with "kpathsea:", this means that a new MetaFont-run has been
     // started. We filter these lines out and print them in boldface.
-    int startlineindex = line.tqfind("kpathsea:");
+    int startlineindex = line.find("kpathsea:");
     if (startlineindex != -1) {
-      int endstartline  = line.tqfind("\n",startlineindex);
+      int endstartline  = line.find("\n",startlineindex);
       TQString startLine = line.mid(startlineindex,endstartline-startlineindex);
       if (MFOutputReceived)
 	TextLabel3->append("<hr>\n<b>"+startLine+"</b>");
@@ -119,7 +119,7 @@ void infoDialog::outputReceiver(const TQString& _op)
     TextLabel3->append(line.mid(endstartline));
     } else
       TextLabel3->append(line);
-    idx = pool.tqfindRev("\n");
+    idx = pool.findRev("\n");
   }
 
   MFOutputReceived = true;
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index 9fc5703d..bceacddc 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -141,7 +141,7 @@ void KDVIMultiPage::slotSave()
   // Try to guess the proper ending...
   TQString formats;
   TQString ending;
-  int rindex = m_file.tqfindRev(".");
+  int rindex = m_file.findRev(".");
   if (rindex == -1) {
     ending = TQString();
     formats = TQString();
@@ -157,7 +157,7 @@ void KDVIMultiPage::slotSave()
 
   // Add the ending to the filename. I hope the user likes it that
   // way.
-  if (!ending.isEmpty() && fileName.tqfind(ending) == -1)
+  if (!ending.isEmpty() && fileName.find(ending) == -1)
     fileName = fileName+ending;
 
   if (TQFile(fileName).exists()) {
diff --git a/kdvi/main.cpp b/kdvi/main.cpp
index 50221ebe..f10501bd 100644
--- a/kdvi/main.cpp
+++ b/kdvi/main.cpp
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
       QCStringList apps = app.dcopClient()->registeredApplications();
       for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it ) 
       {
-        if ((*it).tqfind("kviewshell") == 0) 
+        if ((*it).find("kviewshell") == 0) 
         {
           TQByteArray data, replyData;
           TQCString replyType;
diff --git a/kdvi/psgs.cpp b/kdvi/psgs.cpp
index 31f9bfdc..9f1f925f 100644
--- a/kdvi/psgs.cpp
+++ b/kdvi/psgs.cpp
@@ -64,14 +64,14 @@ void ghostscript_interface::setPostScript(const PageNumber& page, const TQString
   kdDebug(4300) << "ghostscript_interface::setPostScript( " << page << ", ... )" << endl;
 #endif
 
-  if (pageList.tqfind(page) == 0) {
+  if (pageList.find(page) == 0) {
     pageInfo *info = new pageInfo(PostScript);
     // Check if dict is big enough
     if (pageList.count() > pageList.size() -2)
       pageList.resize(pageList.size()*2);
     pageList.insert(page, info);
   } else 
-    *(pageList.tqfind(page)->PostScriptString) = PostScript;
+    *(pageList.find(page)->PostScriptString) = PostScript;
 }
 
 
@@ -88,7 +88,7 @@ void ghostscript_interface::setBackgroundColor(const PageNumber& page, const TQC
   kdDebug(4300) << "ghostscript_interface::setBackgroundColor( " << page << ", " << background_color << " )" << endl;
 #endif
 
-  if (pageList.tqfind(page) == 0) {
+  if (pageList.find(page) == 0) {
     pageInfo *info = new pageInfo(TQString());
     info->background = background_color;
     if (permanent)
@@ -98,9 +98,9 @@ void ghostscript_interface::setBackgroundColor(const PageNumber& page, const TQC
       pageList.resize(pageList.size()*2);
     pageList.insert(page, info);
   } else {
-    pageList.tqfind(page)->background = background_color;
+    pageList.find(page)->background = background_color;
     if (permanent)
-      pageList.tqfind(page)->permanentBackground = background_color;
+      pageList.find(page)->permanentBackground = background_color;
   }
 }
 
@@ -109,10 +109,10 @@ void ghostscript_interface::restoreBackgroundColor(const PageNumber& page)
 #ifdef DEBUG_PSGS
   kdDebug(4300) << "ghostscript_interface::restoreBackgroundColor( " << page << " )" << endl;
 #endif
-  if (pageList.tqfind(page) == 0)
+  if (pageList.find(page) == 0)
     return;
 
-  pageInfo *info = pageList.tqfind(page);
+  pageInfo *info = pageList.find(page);
   info->background = info->permanentBackground;
 }
 
@@ -124,10 +124,10 @@ TQColor ghostscript_interface::getBackgroundColor(const PageNumber& page) const
   kdDebug(4300) << "ghostscript_interface::getBackgroundColor( " << page << " )" << endl;
 #endif
 
-  if (pageList.tqfind(page) == 0) 
+  if (pageList.find(page) == 0) 
     return TQt::white;
   else 
-    return pageList.tqfind(page)->background;
+    return pageList.find(page)->background;
 }
 
 
@@ -151,7 +151,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
 
   emit(setStatusBarText(i18n("Generating PostScript graphics...")));
   
-  pageInfo *info = pageList.tqfind(page);
+  pageInfo *info = pageList.find(page);
 
   // Generate a PNG-file
   // Step 1: Write the PostScriptString to a File
@@ -239,7 +239,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
     // ghostscript. If so, try again with another device.
     TQString GSoutput;
     while(proc.readln(GSoutput) != -1) {
-      if (GSoutput.tqcontains("Unknown device")) {
+      if (GSoutput.contains("Unknown device")) {
 	kdDebug(4300) << TQString("The version of ghostview installed on this computer does not support "
 				   "the '%1' ghostview device driver.").tqarg(*gsDevice) << endl;
 	knownDevices.remove(gsDevice);
@@ -293,7 +293,7 @@ void ghostscript_interface::graphics(const PageNumber& page, double dpi, long ma
   pixel_page_w = paint->viewport().width();
   pixel_page_h = paint->viewport().height();
 
-  pageInfo *info = pageList.tqfind(page);
+  pageInfo *info = pageList.find(page);
 
   // No PostScript? Then return immediately.
   if ((info == 0) || (info->PostScriptString->isEmpty())) {
@@ -317,7 +317,7 @@ void ghostscript_interface::graphics(const PageNumber& page, double dpi, long ma
 
 TQString ghostscript_interface::locateEPSfile(const TQString &filename, const KURL &base)
 {
-  // If the base URL indicates that the DVI file is local, try to tqfind
+  // If the base URL indicates that the DVI file is local, try to find
   // the graphics file in the directory where the DVI file resides
   if (base.isLocalFile()) {
     TQString path = base.path();       // -> "/bar/foo.dvi"
diff --git a/kdvi/special.cpp b/kdvi/special.cpp
index 5bd082cb..918b7352 100644
--- a/kdvi/special.cpp
+++ b/kdvi/special.cpp
@@ -120,7 +120,7 @@ TQColor dviRenderer::parseColorSpecification(const TQString& colorSpec)
   
   TQString specType = colorSpec.section(' ', 0, 0);
 
-  if (specType.tqfind("rgb", false) == 0) {
+  if (specType.find("rgb", false) == 0) {
     bool ok;
 
     double r = colorSpec.section(' ', 1, 1).toDouble(&ok);
@@ -138,7 +138,7 @@ TQColor dviRenderer::parseColorSpecification(const TQString& colorSpec)
     return TQColor((int)(r*255.0+0.5), (int)(g*255.0+0.5), (int)(b*255.0+0.5));
   }
 
-  if (specType.tqfind("hsb", false) == 0) {
+  if (specType.find("hsb", false) == 0) {
     bool ok;
 
     double h = colorSpec.section(' ', 1, 1).toDouble(&ok);
@@ -156,7 +156,7 @@ TQColor dviRenderer::parseColorSpecification(const TQString& colorSpec)
     return TQColor((int)(h*359.0+0.5), (int)(s*255.0+0.5), (int)(b*255.0+0.5), TQColor::Hsv);
   }
 
-  if (specType.tqfind("cmyk", false) == 0) {
+  if (specType.find("cmyk", false) == 0) {
     bool ok;
 
     double c = colorSpec.section(' ', 1, 1).toDouble(&ok);
@@ -189,7 +189,7 @@ TQColor dviRenderer::parseColorSpecification(const TQString& colorSpec)
     return TQColor((int)(r*255.0+0.5), (int)(g*255.0+0.5), (int)(b*255.0+0.5));
   }
 
-  if (specType.tqfind("gray", false) == 0) {
+  if (specType.find("gray", false) == 0) {
     bool ok;
 
     double g = colorSpec.section(' ', 1, 1).toDouble(&ok);
@@ -200,7 +200,7 @@ TQColor dviRenderer::parseColorSpecification(const TQString& colorSpec)
   }
 
   // Check if the color is one of the known named colors.
-  TQMap<TQString, TQColor>::Iterator f = namedColors.tqfind(specType);
+  TQMap<TQString, TQColor>::Iterator f = namedColors.find(specType);
   if (f != namedColors.end())
     return *f;
   
@@ -254,7 +254,7 @@ void dviRenderer::color_special(const TQString& _cp)
 void dviRenderer::html_href_special(const TQString& _cp)
 {
   TQString cp = _cp;
-  cp.truncate(cp.tqfind('"'));
+  cp.truncate(cp.find('"'));
   
 #ifdef DEBUG_SPECIAL
   kdDebug(4300) << "HTML-special, href " << cp.latin1() << endl;
@@ -292,10 +292,10 @@ void dviRenderer::source_special(const TQString& cp)
 
 void parse_special_argument(const TQString& strg, const char* argument_name, int* variable)
 {
-  int index = strg.tqfind(argument_name);
+  int index = strg.find(argument_name);
   if (index >= 0) {
     TQString tmp = strg.mid(index + strlen(argument_name));
-    index = tmp.tqfind(' ');
+    index = tmp.find(' ');
     if (index >= 0)
       tmp.truncate(index);
 
@@ -327,7 +327,7 @@ void dviRenderer::epsf_special(const TQString& cp)
   // (already the simplifyWhiteSpace() above is wrong). If you have
   // files like this, go away.
   TQString EPSfilename_orig = include_command;
-  EPSfilename_orig.truncate(EPSfilename_orig.tqfind(' '));
+  EPSfilename_orig.truncate(EPSfilename_orig.find(' '));
 
   // Strip enclosing quotation marks which are included by some LaTeX
   // macro packages (but not by others). This probably means that
@@ -348,7 +348,7 @@ void dviRenderer::epsf_special(const TQString& cp)
   int  angle   = 0;
 
   // just to avoid ambiguities; the filename could contain keywords
-  include_command = include_command.mid(include_command.tqfind(' '));
+  include_command = include_command.mid(include_command.find(' '));
   
   parse_special_argument(include_command, "llx=", &llx);
   parse_special_argument(include_command, "lly=", &lly);
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index 3a3e0b9f..1a97400c 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -735,7 +735,7 @@ void TopLevel::printIt( KPrinter &printer, TQPainter &painter )
 
     ++currentpage;
     // should this page be printed ?
-    if (printer.pageList().tqfindIndex(currentpage) < 0)
+    if (printer.pageList().findIndex(currentpage) < 0)
 	continue;
 
     XImage *Image = Pimage(pn);
diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp
index cacb24a0..9227d0a0 100644
--- a/kfaxview/main.cpp
+++ b/kfaxview/main.cpp
@@ -118,7 +118,7 @@ int main(int argc, char** argv)
       QCStringList apps = app.dcopClient()->registeredApplications();
       for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it ) 
       {
-        if ((*it).tqfind("kviewshell") == 0) 
+        if ((*it).find("kviewshell") == 0) 
         {
           TQByteArray data, replyData;
           TQCString replyType;
diff --git a/kfile-plugins/ps/gscreator.cpp b/kfile-plugins/ps/gscreator.cpp
index e9fb558b..cc4edcfc 100644
--- a/kfile-plugins/ps/gscreator.cpp
+++ b/kfile-plugins/ps/gscreator.cpp
@@ -234,7 +234,7 @@ bool GSCreator::create(const TQString &path, int width, int height, TQImage &img
   }
 
   const bool is_encapsulated = no_dvi &&
-    (path.tqfind(TQRegExp("\\.epsi?$", false, false)) > 0) &&
+    (path.find(TQRegExp("\\.epsi?$", false, false)) > 0) &&
     (dsc.bbox()->width() > 0) && (dsc.bbox()->height() > 0) && 
     (dsc.page_count() <= 1);
 
diff --git a/kfile-plugins/rgb/kfile_rgb.cpp b/kfile-plugins/rgb/kfile_rgb.cpp
index 3c8b416e..ff6dadde 100644
--- a/kfile-plugins/rgb/kfile_rgb.cpp
+++ b/kfile-plugins/rgb/kfile_rgb.cpp
@@ -143,8 +143,8 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
 		TQMap<TQ_UINT32, uint>::Iterator end = map.end();
 		for (k = 0; k < (ysize * zsize); k++) {
 			dstream >> offs;
-			if ((it = map.tqfind(offs)) != end)
-				map.tqreplace(offs, it.data() + 1);
+			if ((it = map.find(offs)) != end)
+				map.replace(offs, it.data() + 1);
 			else
 				map[offs] = 0;
 		}
diff --git a/kfile-plugins/tiff/kfile_tiff.cpp b/kfile-plugins/tiff/kfile_tiff.cpp
index 7e1e86be..1d8b08f1 100644
--- a/kfile-plugins/tiff/kfile_tiff.cpp
+++ b/kfile-plugins/tiff/kfile_tiff.cpp
@@ -248,7 +248,7 @@ bool KTiffPlugin::readInfo(KFileMetaInfo& info, uint)
 
     int imageBpp = bitsPerSample*samplesPerPixel;
     if (imageAlpha && colorMode==PHOTOMETRIC_RGB)
-        m_colorMode.tqreplace(PHOTOMETRIC_RGB, new TQString(I18N_NOOP("RGBA")));
+        m_colorMode.replace(PHOTOMETRIC_RGB, new TQString(I18N_NOOP("RGBA")));
 
     KFileMetaInfoGroup group = appendGroup(info, "General");
     if (description)
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index 9572b787..dc457516 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -85,13 +85,13 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     _isGuiInitialized( false ),
     _isFileDirty( false ),
     _stickyOptions( false ),
-    _embeddedInKGhostView( !args.tqcontains( "KParts::ReadOnlyPart" ) ),
+    _embeddedInKGhostView( !args.contains( "KParts::ReadOnlyPart" ) ),
     _customZoomIndex( -1 )
 {
     setInstance( KGVFactory::instance() );
 
     // Don't show the progress info dialog if we're embedded in Konqueror.
-    setProgressInfoEnabled( !args.tqcontains( "Browser/View") );
+    setProgressInfoEnabled( !args.contains( "Browser/View") );
 
     _document = new KGVDocument( this );
     connect( _document, TQT_SIGNAL( fileChangeFailed() ),
@@ -582,7 +582,7 @@ void KGVPart::updateZoomActions()
 	    first != last;
 	    ++first ) {
 	TQString cur = *first;
-	cur.remove(  cur.tqfind(  '%' ), 1 );
+	cur.remove(  cur.find(  '%' ), 1 );
 	cur = cur.simplifyWhiteSpace();
 	bool ok = false;
 	double z = cur.toDouble(&ok);
@@ -682,7 +682,7 @@ void KGVPart::openURLContinue()
 	// mimetype-determination (e.g. koffice)
 	TQString extension;
 	TQString fileName = m_url.fileName();
-	int extensionPos = fileName.tqfindRev( '.' );
+	int extensionPos = fileName.findRev( '.' );
 	if( extensionPos != -1 )
 	    extension = fileName.mid( extensionPos ); // keep the '.'
 	KTempFile tempFile( TQString(), extension );
@@ -901,7 +901,7 @@ void KGVPart::slotZoom( const TQString& nz )
 {
     TQString z = nz;
     double zoom;
-    z.remove(  z.tqfind(  '%' ), 1 );
+    z.remove(  z.find(  '%' ), 1 );
     zoom = KGlobal::locale()->readNumber(  z ) / 100;
     kdDebug( 4500 ) << "ZOOM = "  << nz << ", setting zoom = " << zoom << endl;
 
@@ -968,7 +968,7 @@ void KGVPart::setDisplayOptions( const DisplayOptions& options )
     _docManager->setDisplayOptions( options );
     _selectOrientation->setCurrentItem( options.overrideOrientation()  );
     TQStringList medias = document()->mediaNames();
-    TQStringList::Iterator now = medias.tqfind( options.overridePageMedia() );
+    TQStringList::Iterator now = medias.find( options.overridePageMedia() );
     if ( now != medias.end() ){
 	// The options are displayed in inverted order.
 	// Therefore, size() - index gets you the display index
diff --git a/kiconedit/kcolorgrid.cpp b/kiconedit/kcolorgrid.cpp
index e08529e1..837958b8 100644
--- a/kiconedit/kcolorgrid.cpp
+++ b/kiconedit/kcolorgrid.cpp
@@ -269,7 +269,7 @@ void KColorGrid::setColor( int colNum, uint col, bool update )
     return;
 
   //kdDebug(4640) << "KColorGrid::setColor - before adding" << endl;
-  if(!numcolors.tqcontains(col))
+  if(!numcolors.contains(col))
   {
     //kdDebug(4640) << "KColorGrid::setColor() - adding " << //  col << " - " << tqRed(col) << " " << tqGreen(col) << " " << tqBlue(col) << endl;
     numcolors.append(col);
@@ -279,9 +279,9 @@ void KColorGrid::setColor( int colNum, uint col, bool update )
   }  
 
   //kdDebug(4640) << "KColorGrid::setColor - before removing" << endl;
-  if(!gridcolors.tqcontains(oldcolor))
+  if(!gridcolors.contains(oldcolor))
   {
-    int idx = numcolors.tqfind(oldcolor);
+    int idx = numcolors.find(oldcolor);
     if(idx != -1)
     {
       //kdDebug(4640) << "KColorGrid::setColor() - removing " << //  oldcolor << " - " << tqRed(oldcolor) << " " << tqGreen(oldcolor) << " " << tqBlue(oldcolor) << endl;
@@ -317,7 +317,7 @@ void KColorGrid::updateColors()
   for(int i = 0; i < (int)gridcolors.size(); i++)
   {
     uint col = gridcolors.at(i);
-    if(!numcolors.tqcontains(col))
+    if(!numcolors.contains(col))
       numcolors.append(col);
   }
   emit colorschanged(numcolors.size(), numcolors.data());
diff --git a/kiconedit/kcolorgrid.h b/kiconedit/kcolorgrid.h
index 00a3d478..2be09f28 100644
--- a/kiconedit/kcolorgrid.h
+++ b/kiconedit/kcolorgrid.h
@@ -56,7 +56,7 @@ public:
   bool hasGrid() { return hasgrid; }
   uint numColors() { return numcolors.size(); }
   uint colors( uint *c ) { c = numcolors.data(); return numcolors.size(); }
-  bool tqcontains(uint c) { return numcolors.tqcontains(c); }
+  bool contains(uint c) { return numcolors.contains(c); }
   uint colorAt(int idx) { return gridcolors.at(idx); }
   uint *data() {return numcolors.data(); }
   void fill(uint color);
diff --git a/kiconedit/kiconcolors.cpp b/kiconedit/kiconcolors.cpp
index c2042432..3bfc872d 100644
--- a/kiconedit/kiconcolors.cpp
+++ b/kiconedit/kiconcolors.cpp
@@ -119,7 +119,7 @@ void KCustomColors::mouseDoubleClickEvent(TQMouseEvent *e)
 
 void KCustomColors::addColor(uint c)
 {
-  if(!tqcontains(c))
+  if(!contains(c))
   {
     int f = getFreeCell();
     if(f != -1)
diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp
index d794cbe5..b8ed29ab 100644
--- a/kiconedit/kicongrid.cpp
+++ b/kiconedit/kicongrid.cpp
@@ -1179,7 +1179,7 @@ TQImage KIconEditGrid::getSelection(bool cut)
     {
         int x = pntarray[i].x();
         int y = pntarray[i].y();
-        if(img->valid(x, y) && rect.tqcontains(TQPoint(x, y)))
+        if(img->valid(x, y) && rect.contains(TQPoint(x, y)))
         {
             *((uint*)tmp.scanLine(y-ny) + (x-nx)) = *((uint*)img->scanLine(y) + x);
             if(cut)
@@ -1909,7 +1909,7 @@ void KIconEditGrid::drawPointArray(TQPointArray a, DrawAction action)
         int x = a[i].x();
         int y = a[i].y();
 
-        if(img->valid(x, y) && TQT_TQRECT_OBJECT(a.boundingRect()).tqcontains(a[ i ]))
+        if(img->valid(x, y) && TQT_TQRECT_OBJECT(a.boundingRect()).contains(a[ i ]))
         {
             //kdDebug(4640) << "x: " << x << " - y: " << y << endl;
             switch( action )
@@ -2195,7 +2195,7 @@ void KIconEditGrid::mapToKDEPalette()
         {
             if(*l != TRANSPARENT)
             {
-                if(!iconcolors.tqcontains(*l))
+                if(!iconcolors.contains(*l))
                     *l = iconcolors.closestMatch(*l);
             }
         }
diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp
index bb9b1f1c..abd48737 100644
--- a/kiconedit/palettetoolbar.cpp
+++ b/kiconedit/palettetoolbar.cpp
@@ -112,7 +112,7 @@ void PaletteToolBar::addColors( uint n, uint *c )
 
 void PaletteToolBar::addColor( uint color )
 {
-    if( !m_sysColors->tqcontains( color ) )
+    if( !m_sysColors->contains( color ) )
         m_customColors->addColor( color );
 }
 
diff --git a/kmrml/kmrml.spec b/kmrml/kmrml.spec
index d278a7d0..79dbab29 100644
--- a/kmrml/kmrml.spec
+++ b/kmrml/kmrml.spec
@@ -48,11 +48,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 cd $RPM_BUILD_ROOT
  
-tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
+find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
  
-tqfind . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
+find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
  
-tqfind . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
+find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp
index b02d6343..18d5205e 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.cpp
+++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp
@@ -74,9 +74,9 @@ void IndexCleaner::startNext()
     TQString dir = m_dirs.first();
     m_dirs.pop_front();
 
-    int index = cmd.tqfind( "%d" );
+    int index = cmd.find( "%d" );
     if ( index != -1 )
-        cmd.tqreplace( index, 2, TQUOTE( dir ) );
+        cmd.replace( index, 2, TQUOTE( dir ) );
     else // no %d? What else can we do?
         cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) );
 
diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp
index 0308dd39..14c6a5c5 100644
--- a/kmrml/kmrml/kcontrol/indexer.cpp
+++ b/kmrml/kmrml/kcontrol/indexer.cpp
@@ -93,14 +93,14 @@ void Indexer::processNext()
 
     TQString cmd = m_config->addCollectionCommandLine().simplifyWhiteSpace().stripWhiteSpace();
 
-    // in the commandline, tqreplace %d with the directory to process and
+    // in the commandline, replace %d with the directory to process and
     // %t with the thumbnail dir
-    int index = cmd.tqfind( "%d" ); // ### TQFile::encodeName()?
+    int index = cmd.find( "%d" ); // ### TQFile::encodeName()?
     if ( index != -1 )
-        cmd.tqreplace( index, 2, TQUOTE( m_currentDir ) );
-    index = cmd.tqfind( "%t" );
+        cmd.replace( index, 2, TQUOTE( m_currentDir ) );
+    index = cmd.find( "%t" );
     if ( index != -1 )
-        cmd.tqreplace( index, 2, TQUOTE(m_currentDir + "_thumbnails") );
+        cmd.replace( index, 2, TQUOTE(m_currentDir + "_thumbnails") );
 
 //     qDebug("****** command: %s", cmd.latin1());
 #if KDE_VERSION >= 306
diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index ab6fc84b..90756bfb 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -341,7 +341,7 @@ void MainPage::slotRemoveClicked()
 void MainPage::enableWidgetsFor( const KMrml::ServerSettings& settings )
 {
     TQString host = settings.host;
-    bool enableWidgets = (m_config->hosts().tqfindIndex( host ) > -1);
+    bool enableWidgets = (m_config->hosts().findIndex( host ) > -1);
     m_serverWidget->m_addButton->setEnabled(!enableWidgets && !host.isEmpty());
     m_serverWidget->m_removeButton->setEnabled( enableWidgets &&
                                                 !host.isEmpty() &&
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 6d779860..2167448b 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -137,7 +137,7 @@ ServerSettings Config::settingsForHost( const TQString& host ) const
 void Config::addSettings( const ServerSettings& settings )
 {
     TQString host = settings.host;
-    if ( m_hostList.tqfind( host ) == m_hostList.end() )
+    if ( m_hostList.find( host ) == m_hostList.end() )
         m_hostList.append( host );
 
     m_config->setGroup( CONFIG_GROUP );
@@ -181,13 +181,13 @@ TQString Config::addCollectionCommandLine() const
     m_config->setGroup( CONFIG_GROUP );
     TQString cmd = m_config->readEntry( "AddCollection Commandline",
                                        DEFAULT_ADDCOLLECTION_CMD );
-    int index = cmd.tqfind( "%h" );
+    int index = cmd.find( "%h" );
     if ( index != -1 )
-        cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
+        cmd.replace( index, 2, TQUOTE( mrmldDataDir() ) );
 
-    index = cmd.tqfind( "%e" );
+    index = cmd.find( "%e" );
     if ( index != -1 )
-        cmd.tqreplace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
+        cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
 
     return cmd;
 }
@@ -203,13 +203,13 @@ TQString Config::removeCollectionCommandLine() const
     m_config->setGroup( CONFIG_GROUP );
     TQString cmd = m_config->readEntry( "RemoveCollection Commandline",
                                        DEFAULT_REMOVECOLLECTION_CMD );
-    int index = cmd.tqfind( "%h" );
+    int index = cmd.find( "%h" );
     if ( index != -1 )
-        cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
+        cmd.replace( index, 2, TQUOTE( mrmldDataDir() ) );
 
-    index = cmd.tqfind( "%e" );
+    index = cmd.find( "%e" );
     if ( index != -1 )
-        cmd.tqreplace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
+        cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
 
     return cmd;
 }
@@ -231,17 +231,17 @@ TQString Config::mrmldCommandline() const
                                        DEFAULT_MRMLD_CMD );
 
     // add data directory and port to the commandline
-    int index = cmd.tqfind( "%p" );
+    int index = cmd.find( "%p" );
     if ( index != -1 )
     {
         TQString port = settings.autoPort ?
                   TQString() : TQString::number( settings.configuredPort );
-        cmd.tqreplace( index, 2, port );
+        cmd.replace( index, 2, port );
     }
-    index = cmd.tqfind( "%d" );
+    index = cmd.find( "%d" );
     if ( index != -1 )
     {
-        cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
+        cmd.replace( index, 2, TQUOTE( mrmldDataDir() ) );
     }
 
     qDebug("***** commandline: %s", cmd.latin1());
diff --git a/kmrml/kmrml/loader.cpp b/kmrml/kmrml/loader.cpp
index f8cbecb3..ea8803e2 100644
--- a/kmrml/kmrml/loader.cpp
+++ b/kmrml/kmrml/loader.cpp
@@ -72,7 +72,7 @@ void Loader::requestDownload( const KURL& url )
 
 void Loader::slotData( KIO::Job *job, const TQByteArray& data )
 {
-    DownloadIterator it = m_downloads.tqfind( static_cast<KIO::TransferJob*>(job) );
+    DownloadIterator it = m_downloads.find( static_cast<KIO::TransferJob*>(job) );
     if ( it != m_downloads.end() ) {
         TQBuffer& buffer = it.data()->m_buffer;
         if ( !buffer.isOpen() )
@@ -90,7 +90,7 @@ void Loader::slotResult( KIO::Job *job )
 {
     KIO::TransferJob *tjob = static_cast<KIO::TransferJob*>( job );
 
-    DownloadIterator it = m_downloads.tqfind( tjob );
+    DownloadIterator it = m_downloads.find( tjob );
     if ( it != m_downloads.end() ) {
         Download *d = it.data();
 
diff --git a/kmrml/kmrml/mrml_elements.cpp b/kmrml/kmrml/mrml_elements.cpp
index a5a0ebb1..ae7ddeee 100644
--- a/kmrml/kmrml/mrml_elements.cpp
+++ b/kmrml/kmrml/mrml_elements.cpp
@@ -194,7 +194,7 @@ bool QueryParadigm::equalMaps( const TQMap<TQString,TQString> m1,
     TQMapConstIterator<TQString,TQString> it = m1.begin();
     for ( ; it != m1.end(); ++it )
     {
-        TQMapConstIterator<TQString,TQString> it2 = m2.tqfind( it.key() );
+        TQMapConstIterator<TQString,TQString> it2 = m2.find( it.key() );
         if ( it2 == m2.end() || it.data() != it2.data() )
             return false;
     }
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index 305cc684..032eafe6 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -325,7 +325,7 @@ void MrmlPart::downloadReferenceFiles( const KURL::List& downloadList )
     for ( ; it != downloadList.end(); it++ )
     {
         TQString extension;
-        int index = (*it).fileName().tqfindRev( '.' );
+        int index = (*it).fileName().findRev( '.' );
         if ( index != -1 )
             extension = (*it).fileName().mid( index );
 
diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp
index 254307e0..5874c996 100644
--- a/kmrml/kmrml/mrml_view.cpp
+++ b/kmrml/kmrml/mrml_view.cpp
@@ -120,7 +120,7 @@ void MrmlView::clear()
 TQPixmap * MrmlView::getPixmap( const KURL& url )
 {
     TQString u = url.url();
-    TQPixmap *pix = m_pixmapCache.tqfind( u );
+    TQPixmap *pix = m_pixmapCache.find( u );
     if ( pix )
         return pix;
 
@@ -130,7 +130,7 @@ TQPixmap * MrmlView::getPixmap( const KURL& url )
              p = m_unavailablePixmap;
 
         m_pixmapCache.insert( u, p );
-        return m_pixmapCache.tqfind( u );
+        return m_pixmapCache.find( u );
     }
     else { // remote url, download with KIO
         Loader::self()->requestDownload( url );
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index 7281a4ae..60b37c48 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -56,11 +56,11 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
                     << ": Client AppID is not registered with DCOP: "
                     << clientAppId << endl;
 
-    DaemonData *daemon = m_daemons.tqfind( daemonKey );
+    DaemonData *daemon = m_daemons.find( daemonKey );
 
     if ( daemon )
     {
-        if ( !daemon->apps.tqfind( clientAppId ) )
+        if ( !daemon->apps.find( clientAppId ) )
             daemon->apps.append( clientAppId );
 
         // timeout, commandline and restart values are: first come, first serve
@@ -93,7 +93,7 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
 void Watcher::unrequireDaemon( const TQCString& clientAppId,
                                const TQString& daemonKey )
 {
-    unrequireDaemon( m_daemons.tqfind( daemonKey ), clientAppId );
+    unrequireDaemon( m_daemons.find( daemonKey ), clientAppId );
 }
 
 void Watcher::unrequireDaemon( DaemonData *daemon,
@@ -243,7 +243,7 @@ void Watcher::slotAppUnregistered( const TQCString& appId )
     TQDictIterator<DaemonData> it( m_daemons );
     for ( ; (daemon = it.current()); ++it )
     {
-        if ( daemon->apps.tqfind( appId ) != -1 )
+        if ( daemon->apps.find( appId ) != -1 )
             unrequireDaemon( daemon, appId );
     }
 }
diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp
index a5b2988c..89eaf2d8 100644
--- a/kolourpaint/kpdocumentsaveoptions.cpp
+++ b/kolourpaint/kpdocumentsaveoptions.cpp
@@ -396,7 +396,7 @@ static bool mimeTypeSupportsProperty (const TQString &mimeType,
     const TQStringList mimeTypeList = mimeTypesSupportingProperty (
         property, defaultMimeTypesWithPropertyList);
 
-    return mimeTypeList.tqcontains (mimeType);
+    return mimeTypeList.contains (mimeType);
 }
 
 
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index c600d36b..34d9d998 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -939,7 +939,7 @@ void kpMainWindow::dropEvent (TQDropEvent *e)
             #endif
                 if (m_thumbnailView &&
                     kpWidgetMapper::toGlobal (m_thumbnailView, m_thumbnailView->rect ())
-                        .tqcontains (globalPos))
+                        .contains (globalPos))
                 {
                     // TODO: Code will never get executed.
                     //       Thumbnail doesn't accept drops.
@@ -947,13 +947,13 @@ void kpMainWindow::dropEvent (TQDropEvent *e)
                 }
                 else if (m_mainView &&
                          kpWidgetMapper::toGlobal (m_mainView, m_mainView->rect ())
-                             .tqcontains (globalPos) &&
+                             .contains (globalPos) &&
                          m_scrollView &&
                          kpWidgetMapper::toGlobal (m_scrollView,
                              TQRect (0, 0,
                                     m_scrollView->visibleWidth (),
                                     m_scrollView->visibleHeight ()))
-                             .tqcontains (globalPos))
+                             .contains (globalPos))
                 {
                     view = m_mainView;
                 }
@@ -967,7 +967,7 @@ void kpMainWindow::dropEvent (TQDropEvent *e)
 
             // viewUnderCursor() is hacky and can return a view when we aren't
             // over one thanks to drags.
-            if (m_document && m_document->rect ().tqcontains (docPoint))
+            if (m_document && m_document->rect ().contains (docPoint))
             {
                 selTopLeft = docPoint;
 
diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp
index caf7a75d..bcc1c1c4 100644
--- a/kolourpaint/kpmainwindow_file.cpp
+++ b/kolourpaint/kpmainwindow_file.cpp
@@ -548,7 +548,7 @@ bool kpMainWindow::save (bool localOnly)
 {
     if (m_document->url ().isEmpty () ||
         KImageIO::mimeTypes (KImageIO::Writing)
-            .tqfindIndex (m_document->saveOptions ()->mimeType ()) < 0 ||
+            .findIndex (m_document->saveOptions ()->mimeType ()) < 0 ||
         // SYNC: kpDocument::getPixmapFromFile() can't determine quality
         //       from file so it has been set initially to an invalid value.
         (m_document->saveOptions ()->mimeTypeHasConfigurableQuality () &&
@@ -639,7 +639,7 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption,
     }
 
 #define MIME_TYPE_IS_VALID() (!fdSaveOptions.mimeTypeIsInvalid () &&                 \
-                              mimeTypes.tqfindIndex (fdSaveOptions.mimeType ()) >= 0)
+                              mimeTypes.findIndex (fdSaveOptions.mimeType ()) >= 0)
     if (!MIME_TYPE_IS_VALID ())
     {
     #if DEBUG_KP_MAIN_WINDOW
@@ -658,9 +658,9 @@ KURL kpMainWindow::askForSaveURL (const TQString &caption,
             kdDebug () << "\tmimeType=" << fdSaveOptions.mimeType ()
                        << " not valid, get hardcoded" << endl;
         #endif
-            if (mimeTypes.tqfindIndex ("image/png") > -1)
+            if (mimeTypes.findIndex ("image/png") > -1)
                 fdSaveOptions.setMimeType ("image/png");
-            else if (mimeTypes.tqfindIndex ("image/x-bmp") > -1)
+            else if (mimeTypes.findIndex ("image/x-bmp") > -1)
                 fdSaveOptions.setMimeType ("image/x-bmp");
             else
                 fdSaveOptions.setMimeType (mimeTypes.first ());
@@ -964,7 +964,7 @@ void kpMainWindow::sendFilenameToPrinter (KPrinter *printer)
         int dot;
 
         TQString fileName = url.fileName ();
-        dot = fileName.tqfindRev ('.');
+        dot = fileName.findRev ('.');
 
         // file.ext but not .hidden-file?
         if (dot > 0)
diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp
index 78ec0265..d7b529dd 100644
--- a/kolourpaint/kpmainwindow_help.cpp
+++ b/kolourpaint/kpmainwindow_help.cpp
@@ -114,7 +114,7 @@ void kpMainWindow::slotHelpTakingScreenshots ()
 #if DEBUG_KP_MAIN_WINDOW
     kdDebug () << "\tdcopApps=" << dcopApps << endl;
 #endif
-    bool isRunningKDE = (dcopApps.tqfindIndex ("kwin") >= 0);
+    bool isRunningKDE = (dcopApps.findIndex ("kwin") >= 0);
 
 #if 0
 {
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index ee8a0aff..8be4beb8 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -404,7 +404,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor)
                        << endl; 
         #endif
         
-            if (vuc->clipRegion ().tqcontains (viewPoint))
+            if (vuc->clipRegion ().contains (viewPoint))
             {
                 const TQPoint globalPoint =
                     kpWidgetMapper::toGlobal (vuc, viewPoint);
diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp
index 97865852..65c2e0f3 100644
--- a/kolourpaint/kpselection.cpp
+++ b/kolourpaint/kpselection.cpp
@@ -490,18 +490,18 @@ int kpSelection::height () const
 }
 
 // public
-bool kpSelection::tqcontains (const TQPoint &point) const
+bool kpSelection::contains (const TQPoint &point) const
 {
     TQRect rect = boundingRect ();
 
 #if DEBUG_KP_SELECTION && 1
-    kdDebug () << "kpSelection::tqcontains(" << point
+    kdDebug () << "kpSelection::contains(" << point
                << ") rect==" << rect
                << " #points=" << m_points.size ()
                << endl;
 #endif
 
-    if (!rect.tqcontains (point))
+    if (!rect.contains (point))
         return false;
 
     // OPT: TQRegion is probably incredibly slow - cache
@@ -514,20 +514,20 @@ bool kpSelection::tqcontains (const TQPoint &point) const
     case kpSelection::Text:
         return true;
     case kpSelection::Ellipse:
-        return TQRegion (m_rect, TQRegion::Ellipse).tqcontains (point);
+        return TQRegion (m_rect, TQRegion::Ellipse).contains (point);
     case kpSelection::Points:
         // TODO: make this always include the border
         //       (draw up a rect sel in this mode to see what I mean)
-        return TQRegion (m_points, false/*even-odd algo*/).tqcontains (point);
+        return TQRegion (m_points, false/*even-odd algo*/).contains (point);
     default:
         return false;
     }
 }
 
 // public
-bool kpSelection::tqcontains (int x, int y)
+bool kpSelection::contains (int x, int y)
 {
-    return tqcontains (TQPoint (x, y));
+    return contains (TQPoint (x, y));
 }
 
 
@@ -1000,7 +1000,7 @@ bool kpSelection::pointIsInTextBorderArea (const TQPoint &globalPoint) const
         return false;
     }
 
-    return (m_rect.tqcontains (globalPoint) && !pointIsInTextArea (globalPoint));
+    return (m_rect.contains (globalPoint) && !pointIsInTextArea (globalPoint));
 }
 
 // public
@@ -1012,7 +1012,7 @@ bool kpSelection::pointIsInTextArea (const TQPoint &globalPoint) const
         return false;
     }
 
-    return textAreaRect ().tqcontains (globalPoint);
+    return textAreaRect ().contains (globalPoint);
 }
 
 
diff --git a/kolourpaint/kpselection.h b/kolourpaint/kpselection.h
index fc309771..24b1ba39 100644
--- a/kolourpaint/kpselection.h
+++ b/kolourpaint/kpselection.h
@@ -127,8 +127,8 @@ public:
 
     // (for non-rectangular selections, may return false even if
     //  kpView::onSelectionResizeHandle())
-    bool tqcontains (const TQPoint &point) const;
-    bool tqcontains (int x, int y);
+    bool contains (const TQPoint &point) const;
+    bool contains (int x, int y);
 
 
     // (Avoid using for text selections since text selection may
diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp
index 341a6790..12a39fb0 100644
--- a/kolourpaint/kpview.cpp
+++ b/kolourpaint/kpview.cpp
@@ -668,7 +668,7 @@ bool kpView::mouseOnSelection (const TQPoint &viewPoint) const
     if (!selViewRect.isValid ())
         return false;
 
-    return selViewRect.tqcontains (mouseViewPoint (viewPoint));
+    return selViewRect.contains (mouseViewPoint (viewPoint));
 }
 
 
@@ -874,7 +874,7 @@ int kpView::mouseOnSelectionResizeHandle (const TQPoint &viewPoint) const
 
 
 #define LOCAL_POINT_IN_BOX_AT(x,y)  \
-    TQRect ((x), (y), atomicLength, atomicLength).tqcontains (viewPointRelSel)
+    TQRect ((x), (y), atomicLength, atomicLength).contains (viewPointRelSel)
 
     // Favour the bottom & right and the corners.
     if (LOCAL_POINT_IN_BOX_AT (selViewRect.width () - atomicLength,
@@ -969,7 +969,7 @@ void kpView::mouseMoveEvent (TQMouseEvent *e)
     // TODO: This is wrong if you leaveEvent the mainView by mouseMoving on the
     //       mainView, landing on top of the thumbnailView cleverly put on top
     //       of the mainView.
-    setHasMouse (TQT_TQRECT_OBJECT(rect ()).tqcontains (e->pos ()));
+    setHasMouse (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ()));
 
     if (tool ())
         tool ()->mouseMoveEvent (e);
@@ -1003,7 +1003,7 @@ void kpView::mouseReleaseEvent (TQMouseEvent *e)
                << endl;
 #endif
 
-    setHasMouse (TQT_TQRECT_OBJECT(rect ()).tqcontains (e->pos ()));
+    setHasMouse (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ()));
 
     if (tool ())
         tool ()->mouseReleaseEvent (e);
diff --git a/kolourpaint/kpviewmanager.cpp b/kolourpaint/kpviewmanager.cpp
index 3a3bcdad..3586a173 100644
--- a/kolourpaint/kpviewmanager.cpp
+++ b/kolourpaint/kpviewmanager.cpp
@@ -78,7 +78,7 @@ void kpViewManager::registerView (kpView *view)
 #if DEBUG_KP_VIEW_MANAGER && 1
     kdDebug () << "kpViewManager::registerView (" << view << ")" << endl;
 #endif
-    if (view && m_views.tqfindRef (view) < 0)
+    if (view && m_views.findRef (view) < 0)
     {
     #if DEBUG_KP_VIEW_MANAGER && 1
         kdDebug () << "\tadded view" << endl;
@@ -469,7 +469,7 @@ kpView *kpViewManager::viewUnderCursor (bool usingTQt) const
     {
         kpViewManager *nonConstThis = const_cast <kpViewManager *> (this);
 
-        if (m_viewUnderCursor && nonConstThis->m_views.tqfindRef (m_viewUnderCursor) < 0)
+        if (m_viewUnderCursor && nonConstThis->m_views.findRef (m_viewUnderCursor) < 0)
         {
             kdError () << "kpViewManager::viewUnderCursor(): invalid view" << endl;
             nonConstThis->m_viewUnderCursor = 0;
diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp
index 7ffecf92..7cfddb1a 100644
--- a/kolourpaint/kpviewscrollablecontainer.cpp
+++ b/kolourpaint/kpviewscrollablecontainer.cpp
@@ -898,23 +898,23 @@ void kpViewScrollableContainer::recalculateStatusMessage ()
     //
     if (kpWidgetMapper::toGlobal (this,
                                   TQRect (0, 0, visibleWidth (), visibleHeight ()))
-            .tqcontains (TQCursor::pos ()))
+            .contains (TQCursor::pos ()))
     {
         if (m_bottomRightGrip->isShown () &&
             m_bottomRightGrip->hotRect (true/*to global*/)
-                .tqcontains (TQCursor::pos ()))
+                .contains (TQCursor::pos ()))
         {
             m_bottomRightGrip->setUserMessage (i18n ("Left drag the handle to resize the image."));
         }
         else if (m_bottomGrip->isShown () &&
                 m_bottomGrip->hotRect (true/*to global*/)
-                    .tqcontains (TQCursor::pos ()))
+                    .contains (TQCursor::pos ()))
         {
             m_bottomGrip->setUserMessage (i18n ("Left drag the handle to resize the image."));
         }
         else if (m_rightGrip->isShown () &&
                 m_rightGrip->hotRect (true/*to global*/)
-                    .tqcontains (TQCursor::pos ()))
+                    .contains (TQCursor::pos ()))
         {
             m_rightGrip->setUserMessage (i18n ("Left drag the handle to resize the image."));
         }
@@ -1119,7 +1119,7 @@ bool kpViewScrollableContainer::beginDragScroll (const TQPoint &/*docPoint*/,
     bool stopDragScroll = true;
     bool scrolled = false;
 
-    if (!noDragScrollRect ().tqcontains (p))
+    if (!noDragScrollRect ().contains (p))
     {
         if (m_dragScrollTimer->isActive ())
         {
diff --git a/kolourpaint/pixmapfx/kpfloodfill.cpp b/kolourpaint/pixmapfx/kpfloodfill.cpp
index eaf100ab..2b509cb1 100644
--- a/kolourpaint/pixmapfx/kpfloodfill.cpp
+++ b/kolourpaint/pixmapfx/kpfloodfill.cpp
@@ -196,7 +196,7 @@ bool kpFloodFill::prepare ()
     kdDebug () << "\tperforming NOP check" << endl;
 #endif
 
-    // get the color we need to tqreplace
+    // get the color we need to replace
     if (m_processedColorSimilarity == 0 && m_color == m_colorToChange)
     {
         // need to do absolutely nothing (this is a significant optimisation
diff --git a/kolourpaint/tools/kptoolautocrop.cpp b/kolourpaint/tools/kptoolautocrop.cpp
index d8c8100f..1f3bab0c 100644
--- a/kolourpaint/tools/kptoolautocrop.cpp
+++ b/kolourpaint/tools/kptoolautocrop.cpp
@@ -34,7 +34,7 @@
 //       at the other extreme would not be deemed similar enough.  The
 //       key is to find the median color as the reference but how do
 //       you do this if you don't know which pixels to sample in the first
-//       place (that's what you're trying to tqfind)?  Chicken and egg situation.
+//       place (that's what you're trying to find)?  Chicken and egg situation.
 //
 //       The other heuristic that is in doubt is the use of the average
 //       color in determining the similarity of sides (it is possible
diff --git a/kolourpaint/tools/kptoolpen.cpp b/kolourpaint/tools/kptoolpen.cpp
index 57e19527..d87e3e39 100644
--- a/kolourpaint/tools/kptoolpen.cpp
+++ b/kolourpaint/tools/kptoolpen.cpp
@@ -266,7 +266,7 @@ void kpToolPen::hover (const TQPoint &point)
     }
 
 #if DEBUG_KP_TOOL_PEN && 0
-    if (document ()->rect ().tqcontains (point))
+    if (document ()->rect ().contains (point))
     {
         TQImage image = kpPixmapFX::convertToImage (*document ()->pixmap ());
 
@@ -538,7 +538,7 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
 
             bool didSomething = wash (&painter, &maskPainter,
                                       image,
-                                      color (1 - m_mouseButton)/*color to tqreplace*/,
+                                      color (1 - m_mouseButton)/*color to replace*/,
                                       rect, rect);
 
             if (painter.isActive ())
diff --git a/kolourpaint/tools/kptoolselection.cpp b/kolourpaint/tools/kptoolselection.cpp
index dc689c4b..2d796ff0 100644
--- a/kolourpaint/tools/kptoolselection.cpp
+++ b/kolourpaint/tools/kptoolselection.cpp
@@ -141,7 +141,7 @@ TQString kpToolSelection::haventBegunDrawUserMessage () const
         else
             return i18n ("Left drag to scale selection.");
     }
-    else if (sel && sel->tqcontains (m_currentPoint))
+    else if (sel && sel->contains (m_currentPoint))
     {
         if (m_mode == Text)
         {
@@ -300,7 +300,7 @@ void kpToolSelection::beginDraw ()
             }
             viewManager ()->restoreQueueUpdates ();
         }
-        else if (sel->tqcontains (m_currentPoint))
+        else if (sel->contains (m_currentPoint))
         {
             if (m_mode == Text && onSelectionToSelectText () && !controlOrShiftPressed ())
             {
@@ -408,7 +408,7 @@ const TQCursor &kpToolSelection::cursor () const
 
         return TQt::arrowCursor;
     }
-    else if (sel && sel->tqcontains (m_currentPoint))
+    else if (sel && sel->contains (m_currentPoint))
     {
     #if DEBUG_KP_TOOL_SELECTION && 1
         kdDebug () << "\tsel contains currentPoint; selecting text? "
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index 89357d1c..7fd520f7 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -203,8 +203,8 @@ TQRect kpDualColorButton::backgroundRect () const
 // protected virtual [base TQWidget]
 void kpDualColorButton::dragMoveEvent (TQDragMoveEvent *e)
 {
-    e->accept ((foregroundRect ().tqcontains (e->pos ()) ||
-                backgroundRect ().tqcontains (e->pos ())) &&
+    e->accept ((foregroundRect ().contains (e->pos ()) ||
+                backgroundRect ().contains (e->pos ())) &&
                KColorDrag::canDecode (e));
 }
 
@@ -216,9 +216,9 @@ void kpDualColorButton::dropEvent (TQDropEvent *e)
 
     if (col.isValid ())
     {
-        if (foregroundRect ().tqcontains (e->pos ()))
+        if (foregroundRect ().contains (e->pos ()))
             setForegroundColor (kpColor (col.rgb ()));
-        else if (backgroundRect ().tqcontains (e->pos ()))
+        else if (backgroundRect ().contains (e->pos ()))
             setBackgroundColor (kpColor (col.rgb ()));
     }
 }
@@ -235,9 +235,9 @@ void kpDualColorButton::mouseDoubleClickEvent (TQMouseEvent *e)
 {
     int whichColor = -1;
 
-    if (foregroundRect ().tqcontains (e->pos ()))
+    if (foregroundRect ().contains (e->pos ()))
         whichColor = 0;
-    else if (backgroundRect ().tqcontains (e->pos ()))
+    else if (backgroundRect ().contains (e->pos ()))
         whichColor = 1;
 
     if (whichColor == 0 || whichColor == 1)
@@ -266,7 +266,7 @@ void kpDualColorButton::mouseDoubleClickEvent (TQMouseEvent *e)
 // protected virtual [base TQWidget]
 void kpDualColorButton::mouseReleaseEvent (TQMouseEvent *e)
 {
-    if (swapPixmapRect ().tqcontains (e->pos ()) &&
+    if (swapPixmapRect ().contains (e->pos ()) &&
         m_color [0] != m_color [1])
     {
     #if DEBUG_KP_COLOR_TOOL_BAR && 1
@@ -783,7 +783,7 @@ void kpTransparentColorCell::mousePressEvent (TQMouseEvent * /*e*/)
 // protected virtual [base TQWidget]
 void kpTransparentColorCell::mouseReleaseEvent (TQMouseEvent *e)
 {
-    if (TQT_TQRECT_OBJECT(rect ()).tqcontains (e->pos ()))
+    if (TQT_TQRECT_OBJECT(rect ()).contains (e->pos ()))
     {
         if (e->button () == Qt::LeftButton)
         {
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index a7532fc4..ef5f35c3 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -549,7 +549,7 @@ void kpToolWidgetBase::mousePressEvent (TQMouseEvent *e)
     {
         for (int j = 0; j < (int) m_pixmapRects [i].count (); j++)
         {
-            if (m_pixmapRects [i][j].tqcontains (e->pos ()))
+            if (m_pixmapRects [i][j].contains (e->pos ()))
             {
                 setSelected (i, j);
                 e->accept ();
diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp
index 01a19461..e0bf399d 100644
--- a/kooka/img_saver.cpp
+++ b/kooka/img_saver.cpp
@@ -176,7 +176,7 @@ void FormatDialog::check_subformat( const TQString & format )
 
 void FormatDialog::setSelectedFormat( TQString fo )
 {
-   TQListBoxItem *item = lb_format->tqfindItem( fo );
+   TQListBoxItem *item = lb_format->findItem( fo );
 
    if( item )
    {
@@ -728,7 +728,7 @@ TQString ImgSaver::extension( const KURL& url )
 {
    TQString extension = url.fileName();
 
-   int dotPos = extension.tqfindRev( '.' );
+   int dotPos = extension.findRev( '.' );
    if( dotPos > 0 )
    {
       int len = extension.length();
diff --git a/kooka/imgnamecombo.cpp b/kooka/imgnamecombo.cpp
index 94faa083..5205f1b1 100644
--- a/kooka/imgnamecombo.cpp
+++ b/kooka/imgnamecombo.cpp
@@ -56,7 +56,7 @@ void ImageNameCombo::slotPathRemove( KFileTreeBranch *branch, const TQString& re
    kdDebug(28000) << "ImageNameCombo: Removing " << path << endl;
    TQString select = currentText();
    
-   if( items.tqcontains( path ))
+   if( items.contains( path ))
    {
       kdDebug(28000) << "ImageNameCombo: Item exists-> deleting" << endl;
       items.remove( path );
@@ -74,7 +74,7 @@ void ImageNameCombo::rewriteList( KFileTreeBranch *branch, const TQString& selTe
       insertItem( branch->pixmap(), *it );
    }
 
-   int index = items.tqfindIndex( selText );
+   int index = items.findIndex( selText );
    setCurrentItem( index );
 }
 
diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp
index 97d8310f..99f86a4f 100644
--- a/kooka/kocrkadmos.cpp
+++ b/kooka/kocrkadmos.cpp
@@ -163,7 +163,7 @@ EngineError KadmosDialog::findClassifiers()
         if( name.startsWith( "ttf" ) )
         {
             TQString lang = name.mid(3,2);
-            if( allCountries.tqcontains(lang) )
+            if( allCountries.contains(lang) )
             {
                 TQString lngCountry = locale->twoAlphaToCountryName(lang);
                 if( lngCountry.isEmpty() )
@@ -188,7 +188,7 @@ EngineError KadmosDialog::findClassifiers()
         else if( name.startsWith( "hand" ) )
         {
             TQString lang = name.mid(4,2);
-            if( allCountries.tqcontains(lang) )
+            if( allCountries.contains(lang) )
             {
                 TQString lngCountry = locale->twoAlphaToCountryName(lang);
                 if( lngCountry.isEmpty() )
@@ -461,7 +461,7 @@ TQString KadmosDialog::getSelClassifierName() const
      /* Get the long text from the combo box */
      TQString selLang = m_cbLang->currentText();
      TQString trans;
-     if( fType != "norm" && m_longCountry2short.tqcontains( selLang ))
+     if( fType != "norm" && m_longCountry2short.contains( selLang ))
      {
          TQString langType = m_longCountry2short[selLang];
          trans = fType+langType+".rec";
diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp
index b453045a..49271414 100644
--- a/kooka/kookapref.cpp
+++ b/kooka/kookapref.cpp
@@ -207,7 +207,7 @@ TQString KookaPreferences::tryFindBinary( const TQString& bin, const TQString& c
     if( res != "notFound" )
     {
         TQFileInfo fi( res );
-        if( fi.exists() && fi.isExecutable() && !fi.isDir() && res.tqcontains(bin) )
+        if( fi.exists() && fi.isExecutable() && !fi.isDir() && res.contains(bin) )
         {
             return res;
         }
@@ -272,7 +272,7 @@ void KookaPreferences::checkOCRBinarySilent( const TQString& cmd )
 #endif
 bool KookaPreferences::checkOCRBinIntern( const TQString& cmd, const TQString& tool, bool show_msg )
 {
-   if( ! cmd.tqcontains( tool )) return false;
+   if( ! cmd.contains( tool )) return false;
 
    bool ret = true;
    TQFileInfo fi( cmd );
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index 54d37244..83ef30da 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -890,7 +890,7 @@ bool KSANEOCR::readORF( const TQString& fileName, TQString& errStr )
 			{
 			    /* Read one line per character */
 			    TQString charLine = stream.readLine();
-			    int semiPos = charLine.tqfind(';');
+			    int semiPos = charLine.find(';');
 			    if( semiPos == -1 )
 			    {
 				kdDebug(28000) << "invalid line: " << charLine << endl;
@@ -906,7 +906,7 @@ bool KSANEOCR::readORF( const TQString& fileName, TQString& errStr )
 
                                 // find the amount of alternatives.
                                 int altCount = 0;
-                                int h = results.tqfind(',');  // search the first comma
+                                int h = results.find(',');  // search the first comma
                                 if( h > -1 ) {
                                     // kdDebug(28000) << "Results of count search: " << results.left(h) << endl;
                                     altCount = results.left(h).toInt();
diff --git a/kooka/ocrresedit.cpp b/kooka/ocrresedit.cpp
index 8465d09c..26785b4c 100644
--- a/kooka/ocrresedit.cpp
+++ b/kooka/ocrresedit.cpp
@@ -75,11 +75,11 @@ void ocrResEdit::slSelectWord( int line, const ocrWord& word )
    if( line < paragraphs() )
    {
       TQString editLine = text(line);
-      int cnt = editLine.tqcontains( word);
+      int cnt = editLine.contains( word);
 
       if( cnt > 0 )
       {
-	 int pos = editLine.tqfind(word);
+	 int pos = editLine.find(word);
 	 setCursorPosition( line, pos );
 	 setSelection( line, pos, line, pos + word.length());
       }
@@ -96,11 +96,11 @@ void ocrResEdit::slReplaceWord( int line, const TQString& wordFrom,
     if( line < paragraphs() )
     {
         TQString editLine = text(line);
-        int cnt = editLine.tqcontains( wordFrom );
+        int cnt = editLine.contains( wordFrom );
 
         if( cnt > 0 )
         {
-            int pos = editLine.tqfind(wordFrom);
+            int pos = editLine.find(wordFrom);
             setSelection( line, pos, line, pos+wordFrom.length());
 
             TQColor saveCol = this->color();
diff --git a/kooka/ocrword.cpp b/kooka/ocrword.cpp
index 2260e770..92993bfd 100644
--- a/kooka/ocrword.cpp
+++ b/kooka/ocrword.cpp
@@ -76,7 +76,7 @@ TQStringList ocrWordList::stringList()
          * decided. Solution:  KSpell should treat dash-linked words correctly.
          * We live with the problem here that dashes bring confusion ;-)
          */
-        if( (*it).tqcontains( rx ) )
+        if( (*it).contains( rx ) )
             res += TQStringList::split( rx, (*it) );
         else
 #endif
@@ -95,9 +95,9 @@ bool ocrWordList::updateOCRWord( const TQString& from, const TQString& to )
     {
         TQString word = (*it);
         kdDebug(28000) <<  "updateOCRWord in list: Comparing word " << word << endl;
-        if( word.tqcontains( from, true ) ) // case sensitive search
+        if( word.contains( from, true ) ) // case sensitive search
         {
-            word.tqreplace( from, to );
+            word.replace( from, to );
             *it = ocrWord( word );
             res = true;
             break;
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index 230acae1..fbda481f 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -420,7 +420,7 @@ TQString ScanPackager::itemDirectory( const KFileTreeViewItem* item, bool relati
    if( ! item->isDir() )
    {
       // Cut off the filename in case it is not a dir
-      relativUrl.truncate( relativUrl.tqfindRev( '/' )+1);
+      relativUrl.truncate( relativUrl.findRev( '/' )+1);
    }
    else
    {
@@ -464,7 +464,7 @@ void ScanPackager::slotSelectDirectory( const TQString & dirString )
    kdDebug(28000) << "Trying to decode directory string " << dirString << endl;
 
    TQString searchFor = TQString::tqfromLatin1(" - ");
-   int pos = dirString.tqfind( searchFor );
+   int pos = dirString.find( searchFor );
 
    if( pos > -1 )
    {
diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp
index 6c918a4d..9062f976 100644
--- a/kpdf/core/document.cpp
+++ b/kpdf/core/document.cpp
@@ -145,7 +145,7 @@ bool KPDFDocument::openDocument( const TQString & docFile, const KURL & url, con
     // determine the related "xml document-info" filename
     d->url = url;
     d->docFileName = docFile;
-    TQString fn = docFile.tqcontains('/') ? docFile.section('/', -1, -1) : docFile;
+    TQString fn = docFile.contains('/') ? docFile.section('/', -1, -1) : docFile;
     fn = "kpdf/" + TQString::number(fileReadTest.size()) + "." + fn + ".xml";
     fileReadTest.close();
     d->xmlFileName = locateLocal( "data", fn );
@@ -298,7 +298,7 @@ void KPDFDocument::addObserver( DocumentObserver * pObserver )
 void KPDFDocument::removeObserver( DocumentObserver * pObserver )
 {
     // remove observer from the map. it won't receive notifications anymore
-    if ( d->observers.tqcontains( pObserver->observerId() ) )
+    if ( d->observers.contains( pObserver->observerId() ) )
     {
         // free observer's pixmap data
         int observerId = pObserver->observerId();
@@ -633,7 +633,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
         return false;
 
     // if searchID search not recorded, create new descriptor and init params
-    if ( !d->searches.tqcontains( searchID ) )
+    if ( !d->searches.contains( searchID ) )
     {
         RunningSearch * search = new RunningSearch();
         search->continueOnPage = -1;
@@ -707,7 +707,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
             {
                 foundAMatch = true;
                 s->highlightedPages.append( pageNumber );
-                if ( !pagesToNotify.tqcontains( pageNumber ) )
+                if ( !pagesToNotify.contains( pageNumber ) )
                     pagesToNotify.append( pageNumber );
             }
         }
@@ -779,7 +779,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
             pages_vector[ currentPage ]->setHighlight( searchID, match, color );
 
             // ..queue page for notifying changes..
-            if ( !pagesToNotify.tqcontains( currentPage ) )
+            if ( !pagesToNotify.contains( currentPage ) )
                 pagesToNotify.append( currentPage );
 
             // ..move the viewport to show the searched word centered
@@ -860,7 +860,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
             {
                 foundAMatch = true;
                 s->highlightedPages.append( pageNumber );
-                if ( !pagesToNotify.tqcontains( pageNumber ) )
+                if ( !pagesToNotify.contains( pageNumber ) )
                     pagesToNotify.append( pageNumber );
             }
         }
@@ -884,7 +884,7 @@ bool KPDFDocument::searchText( int searchID, const TQString & text, bool fromSta
 bool KPDFDocument::continueSearch( int searchID )
 {
     // check if searchID is present in runningSearches
-    if ( !d->searches.tqcontains( searchID ) )
+    if ( !d->searches.contains( searchID ) )
         return false;
 
     // start search with cached parameters from last search by searchID
@@ -897,7 +897,7 @@ bool KPDFDocument::continueSearch( int searchID )
 void KPDFDocument::resetSearch( int searchID )
 {
     // check if searchID is present in runningSearches
-    if ( !d->searches.tqcontains( searchID ) )
+    if ( !d->searches.contains( searchID ) )
         return;
 
     // get previous parameters for search
@@ -1074,7 +1074,7 @@ void KPDFDocument::processLink( const KPDFLink * link )
                 TQString url = browse->url();
 
                 // fix for #100366, documents with relative links that are the form of http:foo.pdf
-                if (url.tqfind("http:") == 0 && url.tqfind("http://") == -1 && url.right(4) == ".pdf")
+                if (url.find("http:") == 0 && url.find("http://") == -1 && url.right(4) == ".pdf")
                 {
                     openRelativeFile(url.mid(5));
                     return;
@@ -1117,7 +1117,7 @@ void KPDFDocument::requestDone( PixmapRequest * req )
             break;
         }
 
-    if ( d->observers.tqcontains( req->id ) )
+    if ( d->observers.contains( req->id ) )
     {
         // [MEM] 1.2 append memory allocation descriptor to the FIFO
         int memoryBytes = 4 * req->width * req->height;
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 8ad34900..0a445a37 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -423,12 +423,12 @@ bool PDFGenerator::print( KPrinter& printer )
     marginBottom = (int)printer.option("kde-margin-bottom").toDouble();
     bool forceRasterize = printer.option("kde-kpdf-forceRaster").toInt();
 
-    if (ps.tqfind(TQRegExp("w\\d+h\\d+")) == 0)
+    if (ps.find(TQRegExp("w\\d+h\\d+")) == 0)
     {
         // size not supported by TQt, CUPS gives us the size as wWIDTHhHEIGHT, at least on the printers i tester
         // remove the w
         ps = ps.mid(1);
-        int hPos = ps.tqfind("h");
+        int hPos = ps.find("h");
         paperWidth = ps.left(hPos).toInt();
         paperHeight = ps.mid(hPos+1).toInt();
     }
diff --git a/kpdf/core/page.cpp b/kpdf/core/page.cpp
index 630c9480..269cab2e 100644
--- a/kpdf/core/page.cpp
+++ b/kpdf/core/page.cpp
@@ -74,7 +74,7 @@ void KPDFPage::setRotation( int r )
 
 bool KPDFPage::hasPixmap( int id, int width, int height ) const
 {
-    if ( !m_pixmaps.tqcontains( id ) )
+    if ( !m_pixmaps.contains( id ) )
         return false;
     if ( width == -1 || height == -1 )
         return true;
@@ -98,7 +98,7 @@ bool KPDFPage::hasObjectRect( double x, double y ) const
         return false;
     TQValueList< ObjectRect * >::const_iterator it = m_rects.begin(), end = m_rects.end();
     for ( ; it != end; ++it )
-        if ( (*it)->tqcontains( x, y ) )
+        if ( (*it)->contains( x, y ) )
             return true;
     return false;
 }
@@ -190,7 +190,7 @@ const ObjectRect * KPDFPage::hasObject( ObjectRect::ObjectType type, double x, d
 {
     TQValueList< ObjectRect * >::const_iterator it = m_rects.begin(), end = m_rects.end();
     for ( ; it != end; ++it )
-        if ( (*it)->tqcontains( x, y ) )
+        if ( (*it)->contains( x, y ) )
             if ((*it)->objectType() == type) return *it;
     return 0;
 }
@@ -203,7 +203,7 @@ const KPDFPageTransition * KPDFPage::getTransition() const
 
 void KPDFPage::setPixmap( int id, TQPixmap * pixmap )
 {
-    if ( m_pixmaps.tqcontains( id ) )
+    if ( m_pixmaps.contains( id ) )
         delete m_pixmaps[id];
     m_pixmaps[id] = pixmap;
 }
@@ -252,7 +252,7 @@ void KPDFPage::setTransition( KPDFPageTransition * transition )
 
 void KPDFPage::deletePixmap( int id )
 {
-    if ( m_pixmaps.tqcontains( id ) )
+    if ( m_pixmaps.contains( id ) )
     {
         delete m_pixmaps[ id ];
         m_pixmaps.remove( id );
@@ -304,7 +304,7 @@ NormalizedRect::NormalizedRect( const TQRect & r, double xScale, double yScale )
     : left( (double)r.left() / xScale ), top( (double)r.top() / yScale ),
     right( (double)r.right() / xScale ), bottom( (double)r.bottom() / yScale ) {}
 
-bool NormalizedRect::tqcontains( double x, double y ) const
+bool NormalizedRect::contains( double x, double y ) const
 {
     return x >= left && x <= right && y >= top && y <= bottom;
 }
diff --git a/kpdf/core/page.h b/kpdf/core/page.h
index 51d7781c..1ec5add0 100644
--- a/kpdf/core/page.h
+++ b/kpdf/core/page.h
@@ -32,7 +32,7 @@ class NormalizedRect
         NormalizedRect( double l, double t, double r, double b );
         NormalizedRect( const TQRect & r, double xScale, double yScale );
 
-        bool tqcontains( double x, double y ) const;
+        bool contains( double x, double y ) const;
         bool intersects( const NormalizedRect & normRect ) const;
         bool intersects( double l, double t, double r, double b ) const;
 
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 76b1aa82..81756ff5 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -151,7 +151,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	connect( m_document, TQT_SIGNAL( openURL(const KURL &) ), this, TQT_SLOT( openURLFromDocument(const KURL &) ) );
 	connect( m_document, TQT_SIGNAL( close() ), this, TQT_SLOT( close() ) );
 	
-	if (tqparent && tqparent->tqmetaObject()->slotNames(true).tqcontains("slotQuit()"))
+	if (tqparent && tqparent->tqmetaObject()->slotNames(true).contains("slotQuit()"))
 		connect( m_document, TQT_SIGNAL( quit() ), tqparent, TQT_SLOT( slotQuit() ) );
 	else
 		connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) );
@@ -278,8 +278,8 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	m_historyNext->setWhatsThis( i18n( "Go to the place you were after" ) );
 
 	// Find and other actions
-	m_tqfind = KStdAction::find( this, TQT_SLOT( slotFind() ), ac, "tqfind" );
-	m_tqfind->setEnabled( false );
+	m_find = KStdAction::find( this, TQT_SLOT( slotFind() ), ac, "find" );
+	m_find->setEnabled( false );
 
 	m_findNext = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac, "find_next" );
 	m_findNext->setEnabled( false );
@@ -452,7 +452,7 @@ bool Part::openFile()
     bool ok = m_document->openDocument( m_file, url(), mime );
 
     // update one-time actions
-    m_tqfind->setEnabled( ok && m_document-> supportsSearching());
+    m_find->setEnabled( ok && m_document-> supportsSearching());
     m_findNext->setEnabled( ok && m_document-> supportsSearching());
     m_saveAs->setEnabled( ok );
     m_printPreview->setEnabled( ok );
@@ -552,7 +552,7 @@ bool Part::closeURL()
     }
 
     slotHidePresentation();
-    m_tqfind->setEnabled( false );
+    m_find->setEnabled( false );
     m_findNext->setEnabled( false );
     m_saveAs->setEnabled( false );
     m_printPreview->setEnabled( false );
diff --git a/kpdf/part.h b/kpdf/part.h
index 791c3d2d..48e11bb8 100644
--- a/kpdf/part.h
+++ b/kpdf/part.h
@@ -179,7 +179,7 @@ private:
 	KAction *m_lastPage;
 	KAction *m_historyBack;
 	KAction *m_historyNext;
-	KAction *m_tqfind;
+	KAction *m_find;
 	KAction *m_findNext;
 	KAction *m_saveAs;
 	KAction *m_printPreview;
diff --git a/kpdf/ui/pagepainter.cpp b/kpdf/ui/pagepainter.cpp
index 96fb1edf..21e9c37f 100644
--- a/kpdf/ui/pagepainter.cpp
+++ b/kpdf/ui/pagepainter.cpp
@@ -26,7 +26,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags,
     TQPixmap * pixmap = 0;
 
     // if a pixmap is present for given id, use it
-    if ( page->m_pixmaps.tqcontains( id ) )
+    if ( page->m_pixmaps.contains( id ) )
         pixmap = page->m_pixmaps[ id ];
 
     // else find the closest match using pixmaps of other IDs (great optim!)
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 27fe3fcb..42024f55 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -80,7 +80,7 @@ public:
     TQRect mouseSelectionRect;
     TQColor selectionRectColor;
 
-    // type ahead tqfind
+    // type ahead find
     bool typeAheadActive;
     TQString typeAheadString;
     TQTimer * findTimeoutTimer;
@@ -577,7 +577,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe )
             // 2) Layer 1: pixmap manipulated areas
             // 3) Layer 2: paint (blend) transparent selection
             if ( !selectionRect.isNull() && selectionRect.intersects( contentsRect ) &&
-                 !selectionRectInternal.tqcontains( contentsRect ) )
+                 !selectionRectInternal.contains( contentsRect ) )
             {
                 TQRect blendRect = selectionRectInternal.intersect( contentsRect );
                 // skip rectangles covered by the selection's border
@@ -616,7 +616,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe )
             // 2) Layer 1: opaque manipulated ares (filled / contours)
             // 3) Layer 2: paint opaque selection
             if ( !selectionRect.isNull() && selectionRect.intersects( contentsRect ) &&
-                 !selectionRectInternal.tqcontains( contentsRect ) )
+                 !selectionRectInternal.contains( contentsRect ) )
             {
                 screenPainter.setPen( tqpalette().active().highlight().dark(110) );
                 screenPainter.drawRect( selectionRect );
@@ -1338,7 +1338,7 @@ void PageView::paintItems( TQPainter * p, const TQRect & contentsRect )
         outlineGeometry.addCoords( -1, -1, 3, 3 );
 
         // draw the page outline (little black border and 2px shadow)
-        if ( !pixmapGeometry.tqcontains( contentsRect ) )
+        if ( !pixmapGeometry.contains( contentsRect ) )
         {
             int pixmapWidth = pixmapGeometry.width(),
                 pixmapHeight = pixmapGeometry.height();
@@ -1513,7 +1513,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
     {
         case ZoomFixed:{ //ZoomFixed case
             TQString z = d->aZoom->currentText();
-            newFactor = KGlobal::locale()->readNumber( z.remove( z.tqfind( '%' ), 1 ) ) / 100.0;
+            newFactor = KGlobal::locale()->readNumber( z.remove( z.find( '%' ), 1 ) ) / 100.0;
             }break;
         case ZoomIn:
             newFactor += (newFactor > 0.99) ? ( newFactor > 1.99 ? 0.5 : 0.2 ) : 0.1;
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 6767db2c..cc882f7a 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -242,7 +242,7 @@ void PresentationWidget::mousePressEvent( TQMouseEvent * e )
             return;
 
         // handle clicking on top-right overlay
-        if ( m_overlayGeometry.tqcontains( e->pos() ) )
+        if ( m_overlayGeometry.contains( e->pos() ) )
         {
             overlayClick( e->pos() );
             return;
@@ -290,7 +290,7 @@ void PresentationWidget::mouseMoveEvent( TQMouseEvent * e )
         if ( e->y() <= (tqgeometry().top() + 1) )
             m_topBar->show();
         // handle "dragging the wheel" if clicking on its tqgeometry
-        else if ( e->state() == Qt::LeftButton && m_overlayGeometry.tqcontains( e->pos() ) )
+        else if ( e->state() == Qt::LeftButton && m_overlayGeometry.contains( e->pos() ) )
             overlayClick( e->pos() );
     }
 }
@@ -963,7 +963,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
 /** ONLY the TRANSITIONS GENERATION function from here on **/
 void PresentationWidget::initTransition( const KPDFPageTransition *transition )
 {
-    // if it's just a 'tqreplace' transition, tqrepaint the screen
+    // if it's just a 'replace' transition, tqrepaint the screen
     if ( transition->type() == KPDFPageTransition::Replace )
     {
         update();
@@ -1175,7 +1175,7 @@ void PresentationWidget::initTransition( const KPDFPageTransition *transition )
             m_transitionDelay = (int)( (totalTime * 1000) / steps );
         } break;
 
-            // dissolve: tqreplace 'random' rects
+            // dissolve: replace 'random' rects
         case KPDFPageTransition::Dissolve:
         {
             const int gridXsteps = 50;
diff --git a/kpdf/ui/searchwidget.h b/kpdf/ui/searchwidget.h
index 45ecae99..a39e01ad 100644
--- a/kpdf/ui/searchwidget.h
+++ b/kpdf/ui/searchwidget.h
@@ -20,7 +20,7 @@ class m_inputDelayTimer;
 #define SW_SEARCH_ID 3
 
 /**
- * @short A widget for tqfind-as-you-type search. Outputs to the Document.
+ * @short A widget for find-as-you-type search. Outputs to the Document.
  *
  * This widget accepts keyboard input and performs a call to findTextAll(..)
  * in the KPDFDocument class when there are 3 or more chars to search for.
diff --git a/kpdf/xpdf/xpdf/GlobalParams.cc b/kpdf/xpdf/xpdf/GlobalParams.cc
index 24552664..519e81a4 100644
--- a/kpdf/xpdf/xpdf/GlobalParams.cc
+++ b/kpdf/xpdf/xpdf/GlobalParams.cc
@@ -2057,7 +2057,7 @@ FILE *GlobalParams::findToUnicodeFile(GString *name) {
 
 void parseStyle(TQString& name, int& weight, int& slant, int& width)
 {
-  if (name.tqfind("MS-") == 0) name = "MS " + name.remove(0,3);
+  if (name.find("MS-") == 0) name = "MS " + name.remove(0,3);
 
   if (!name.contains('-') && !name.contains(',')) return;
   TQString type = name.section(TQRegExp("[-,]"),-1);
diff --git a/kpovmodeler/baseinsertrules.xml b/kpovmodeler/baseinsertrules.xml
index 1d6547ce..ad1917d9 100644
--- a/kpovmodeler/baseinsertrules.xml
+++ b/kpovmodeler/baseinsertrules.xml
@@ -182,11 +182,11 @@
     </rule>
     <rule>
       <class name="Texture"/>
-      <tqcontains><class name="Texture"/></tqcontains>
+      <contains><class name="Texture"/></contains>
     </rule>
     <rule>
       <class name="InteriorTexture"/>
-      <tqcontains><class name="InteriorTexture"/></tqcontains>
+      <contains><class name="InteriorTexture"/></contains>
     </rule>
   </targetclass>
 
@@ -211,16 +211,16 @@
       <class name="SolidColor"/>
       <class name="ColorList"/>
       <class name="DensityList"/>
-      <not><tqcontains><group name="Sum"/></tqcontains></not>
+      <not><contains><group name="Sum"/></contains></not>
     </rule>
     <rule>
       <class name="Pattern"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <class name="Pattern"/>
             <group name="ListPattern"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><after><group name="Map"/></after></not>
         <not><after><class name="Warp"/></after></not>
@@ -236,11 +236,11 @@
       <group name="Map"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <group name="Map"/>
             <group name="ListPattern"/>
             <class name="SolidColor"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><before><class name="Pattern"/></before></not>
       </and>
@@ -297,15 +297,15 @@
     </rule>
     <rule>
       <class name="LooksLike"/>
-      <not><tqcontains><class name="LooksLike"/></tqcontains></not>
+      <not><contains><class name="LooksLike"/></contains></not>
     </rule>
     <rule>
       <class name="ProjectedThrough"/>
-      <not><tqcontains><class name="ProjectedThrough"/></tqcontains></not>
+      <not><contains><class name="ProjectedThrough"/></contains></not>
     </rule>
     <rule>
       <class name="Photons"/>
-      <not><tqcontains><class name="Photons"/></tqcontains></not>
+      <not><contains><class name="Photons"/></contains></not>
     </rule>
   </targetclass>
 
@@ -420,9 +420,9 @@
     <rule>
       <class name="GraphicalObject"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="GraphicalObject"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
   </targetclass>
@@ -435,9 +435,9 @@
     <rule>
       <class name="GraphicalObject"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="GraphicalObject"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
   </targetclass>
@@ -450,9 +450,9 @@
     <rule>
       <class name="GraphicalObject"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="GraphicalObject"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
   </targetclass>
@@ -485,7 +485,7 @@
     <rule>
       <class name="BumpMap"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="BumpMap"/>
           <class name="NormalList"/>
           <class name="Pattern"/>
@@ -493,31 +493,31 @@
           <class name="SlopeMap"/>
           <class name="Warp"/>
           <class name="BlendMapModifiers"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
       <class name="NormalList"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="BumpMap"/>
           <class name="NormalList"/>
           <class name="Pattern"/>
           <class name="NormalMap"/>
           <class name="SlopeMap"/>
           <class name="Warp"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
       <class name="Pattern"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <class name="BumpMap"/>
             <class name="NormalList"/>
             <class name="Pattern"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><after><class name="NormalMap"/></after></not>
         <not><after><class name="SlopeMap"/></after></not>
@@ -534,11 +534,11 @@
       <class name="NormalMap"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <class name="BumpMap"/>
             <class name="NormalMap"/>
             <class name="NormalList"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><after><class name="SlopeMap"/></after></not>
         <not><after><class name="BlendMapModifiers"/></after></not>
@@ -549,11 +549,11 @@
       <class name="SlopeMap"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <class name="BumpMap"/>
             <class name="SlopeMap"/>
             <class name="NormalList"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><after><class name="BlendMapModifiers"/></after></not>
         <not><after><group name="Transformations"/></after></not>
@@ -563,14 +563,14 @@
     <rule>
       <class name="BlendMapModifiers"/>
       <and>
-        <not><tqcontains><class name="BlendMapModifiers"/></tqcontains></not>
+        <not><contains><class name="BlendMapModifiers"/></contains></not>
         <or>
           <not>
-            <tqcontains>
+            <contains>
               <class name="BumpMap"/>
               <class name="NormalMap"/>
               <class name="SlopeMap"/>
-            </tqcontains>
+            </contains>
           </not>
           <after><class name="NormalMap"/></after>
           <after><class name="SlopeMap"/></after>
@@ -613,17 +613,17 @@
     <rule>
       <group name="Color"/>
       <group name="ListPattern"/>
-      <not><tqcontains><group name="Sum"/></tqcontains></not>
+      <not><contains><group name="Sum"/></contains></not>
     </rule>
     <rule>
       <class name="Pattern"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <group name="Color"/>
             <class name="Pattern"/>
             <group name="ListPattern"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><after><group name="Map"/></after></not>
         <not><after><class name="Warp"/></after></not>
@@ -639,11 +639,11 @@
       <group name="Map"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <group name="Map"/>
             <group name="ListPattern"/>
             <group name="Color"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><before><class name="Pattern"/></before></not>
       </and>
@@ -652,10 +652,10 @@
       <class name="BlendMapModifiers"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <class name="BlendMapModifiers"/>
             <group name="Color"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><before><group name="Map"/></before></not>
         <not><before><class name="Pattern"/></before></not>
@@ -695,18 +695,18 @@
     </rule>
     <rule>
       <class name="GlobalSettings"/>
-      <not><tqcontains><class name="GlobalSettings"/></tqcontains></not>
+      <not><contains><class name="GlobalSettings"/></contains></not>
     </rule>
   </targetclass>
 
   <targetclass name="GlobalSettings">
     <rule>
       <class name="Radiosity"/>
-      <not><tqcontains><class name="Radiosity"/></tqcontains></not>
+      <not><contains><class name="Radiosity"/></contains></not>
     </rule>
     <rule>
       <class name="GlobalPhotons"/>
-      <not><tqcontains><class name="GlobalPhotons"/></tqcontains></not>
+      <not><contains><class name="GlobalPhotons"/></contains></not>
     </rule>
   </targetclass>
 
@@ -734,56 +734,56 @@
     <rule>
       <class name="MaterialMap"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="TextureList"/>
           <group name="SumMap"/>
           <group name="SumPigment"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
       <class name="Pigment"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="TextureList"/>
           <group name="SumMap"/>
           <class name="Pigment"/>
           <class name="MaterialMap"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
       <class name="Normal"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="TextureList"/>
           <group name="SumMap"/>
           <class name="Normal"/>
           <class name="MaterialMap"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
       <class name="Finish"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="TextureList"/>
           <group name="SumMap"/>
           <class name="Finish"/>
           <class name="MaterialMap"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
       <class name="Pattern"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <class name="Pattern"/>
             <class name="TextureList"/>
             <group name="SumPigment"/>
             <class name="MaterialMap"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><after><class name="TextureMap"/></after></not>
         <not><after><class name="Warp"/></after></not>
@@ -795,12 +795,12 @@
       <class name="TextureMap"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <class name="TextureMap"/>
             <class name="TextureList"/>
             <group name="SumPigment"/>
             <class name="MaterialMap"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><before><class name="Pattern"/></before></not>
         <not><after><class name="BlendMapModifiers"/></after></not>
@@ -809,12 +809,12 @@
     <rule>
       <class name="TextureList"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="TextureList"/>
           <group name="SumMap"/>
           <group name="SumPigment"/>
           <class name="MaterialMap"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
@@ -829,10 +829,10 @@
       <class name="BlendMapModifiers"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <class name="MaterialMap"/>
             <class name="BlendMapModifiers"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><before><class name="TextureMap"/></before></not>
         <not><before><class name="Pattern"/></before></not>
@@ -860,56 +860,56 @@
     <rule>
       <class name="MaterialMap"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="TextureList"/>
           <group name="SumMap"/>
           <group name="SumPigment"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
       <class name="Pigment"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="TextureList"/>
           <group name="SumMap"/>
           <class name="Pigment"/>
           <class name="MaterialMap"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
       <class name="Normal"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="TextureList"/>
           <group name="SumMap"/>
           <class name="Normal"/>
           <class name="MaterialMap"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
       <class name="Finish"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="TextureList"/>
           <group name="SumMap"/>
           <class name="Finish"/>
           <class name="MaterialMap"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
       <class name="Pattern"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <class name="Pattern"/>
             <class name="TextureList"/>
             <group name="SumPigment"/>
             <class name="MaterialMap"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><after><class name="TextureMap"/></after></not>
         <not><after><class name="Warp"/></after></not>
@@ -921,12 +921,12 @@
       <class name="TextureMap"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <class name="TextureMap"/>
             <class name="TextureList"/>
             <group name="SumPigment"/>
             <class name="MaterialMap"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><before><class name="Pattern"/></before></not>
         <not><after><class name="BlendMapModifiers"/></after></not>
@@ -935,12 +935,12 @@
     <rule>
       <class name="TextureList"/>
       <not>
-        <tqcontains>
+        <contains>
           <class name="TextureList"/>
           <group name="SumMap"/>
           <group name="SumPigment"/>
           <class name="MaterialMap"/>
-        </tqcontains>
+        </contains>
       </not>
     </rule>
     <rule>
@@ -955,10 +955,10 @@
       <class name="BlendMapModifiers"/>
       <and>
         <not>
-          <tqcontains>
+          <contains>
             <class name="MaterialMap"/>
             <class name="BlendMapModifiers"/>
-          </tqcontains>
+          </contains>
         </not>
         <not><before><class name="TextureMap"/></before></not>
         <not><before><class name="Pattern"/></before></not>
diff --git a/kpovmodeler/pm2dcontrolpoint.cpp b/kpovmodeler/pm2dcontrolpoint.cpp
index 244b106f..f8450715 100644
--- a/kpovmodeler/pm2dcontrolpoint.cpp
+++ b/kpovmodeler/pm2dcontrolpoint.cpp
@@ -197,7 +197,7 @@ PMVector PM2DControlPoint::to3D( const PMVector& v ) const
 
 void PM2DControlPoint::addLinkedPoint( PM2DControlPoint* p )
 {
-   if( !m_linkedPoints.tqcontainsRef( p ) )
+   if( !m_linkedPoints.containsRef( p ) )
       m_linkedPoints.append( p );
 }
 
diff --git a/kpovmodeler/pmaddcommand.cpp b/kpovmodeler/pmaddcommand.cpp
index 1f34e82c..5b258312 100644
--- a/kpovmodeler/pmaddcommand.cpp
+++ b/kpovmodeler/pmaddcommand.cpp
@@ -186,7 +186,7 @@ void PMAddCommand::undo( PMCommandManager* theManager )
                if( decl )
                {
                   m_links.append( lit.current( ) );
-                  if( !m_linkedDeclares.tqcontainsRef( decl ) )
+                  if( !m_linkedDeclares.containsRef( decl ) )
                      m_linkedDeclares.append( decl );
                }
             }
diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp
index 49ee6366..3693bf6d 100644
--- a/kpovmodeler/pmdeclareedit.cpp
+++ b/kpovmodeler/pmdeclareedit.cpp
@@ -162,14 +162,14 @@ bool PMDeclareEdit::isDataValid( )
    // valid identifer!
 
    PMReservedWordDict* dict = PMScanner::reservedWords( );
-   if( dict->tqfind( text.latin1( ) ) != -1 )
+   if( dict->find( text.latin1( ) ) != -1 )
    {
       KMessageBox::error( this, i18n( "You can't use a povray reserved word"
                                       " as an identifier!" ), i18n( "Error" ) );
       return false;
    }
    dict = PMScanner::directives( );
-   if( dict->tqfind( text.latin1( ) ) != -1 )
+   if( dict->find( text.latin1( ) ) != -1 )
    {
       KMessageBox::error( this, i18n( "You can't use a povray directive"
                                       " as an identifier!" ), i18n( "Error" ) );
@@ -178,7 +178,7 @@ bool PMDeclareEdit::isDataValid( )
 
    // no reserved word
    PMSymbolTable* st = part( )->symbolTable( );
-   if( st->tqfind( text ) )
+   if( st->find( text ) )
    {
       KMessageBox::error( this, i18n( "Please enter a unique identifier!" ),
                           i18n( "Error" ) );
diff --git a/kpovmodeler/pmdeletecommand.cpp b/kpovmodeler/pmdeletecommand.cpp
index 663dae09..aa7497b2 100644
--- a/kpovmodeler/pmdeletecommand.cpp
+++ b/kpovmodeler/pmdeletecommand.cpp
@@ -105,7 +105,7 @@ void PMDeleteCommand::execute( PMCommandManager* theManager )
                if( decl )
                {
                   m_links.append( oit.current( ) );
-                  if( !m_linkedDeclares.tqcontainsRef( decl ) )
+                  if( !m_linkedDeclares.containsRef( decl ) )
                      m_linkedDeclares.append( decl );
                }
             }
@@ -232,7 +232,7 @@ int PMDeleteCommand::errorFlags( PMPart* )
             for( obj = links.current( ); obj && !insideSelection;
                  obj = obj->tqparent( ) )
             {
-               if( m_deletedObjects.tqfind( obj ) )
+               if( m_deletedObjects.find( obj ) )
                   insideSelection = true;
             }
 
@@ -241,7 +241,7 @@ int PMDeleteCommand::errorFlags( PMPart* )
                bool stop = false;
                for( obj = links.current( ); obj && !stop; obj = obj->tqparent( ) )
                {
-                  if( m_deletedObjects.tqfind( obj ) )
+                  if( m_deletedObjects.find( obj ) )
                      stop = true;
                   else
                      m_deletedObjects.insert( obj, new bool( true ) );
diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp
index 21430704..542d3e20 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -408,8 +408,8 @@ void PMDialogEditBase::slotTexturePreview( )
             {
                link = rit.current( )->linkedObject( );
                if( link )
-                  if( !neededDeclares.tqcontainsRef( link ) )
-                     if( !objectsToSerialize.tqfind( link ) )
+                  if( !neededDeclares.containsRef( link ) )
+                     if( !objectsToSerialize.find( link ) )
                         neededDeclares.append( link );
             }
             objectsToSerialize.insert( it.current( ), it.current( ) );
@@ -434,7 +434,7 @@ void PMDialogEditBase::slotTexturePreview( )
          {
             if( otr->type( ) == "Declare" )
             {
-               if( objectsToSerialize.tqfind( otr ) )
+               if( objectsToSerialize.find( otr ) )
                {
                   dev->serialize( otr );
                   numDeclares--;
@@ -542,7 +542,7 @@ void PMDialogEditBase::slotPreviewFinished( int exitStatus )
                                       "See the povray output for details." )
                           .tqarg( exitStatus ) );
    }
-   else if( m_pRenderWidget->povrayOutput( ).tqcontains( "ERROR" ) )
+   else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) )
    {
       KMessageBox::error( this, i18n( "There were errors while rendering.\n"
                                       "See the povray output for details." ) );
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index a9e10a2d..b964f671 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -1464,10 +1464,10 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
     }
     w = p;
   }
-  if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "PMDockSplitter", "_dock_split_" ) ) return 0L;
-  if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "PMDockTabGroup", "_dock_tab" ) ) return 0L;
+  if ( qt_find_obj_child( TQT_TQOBJECT(w), "PMDockSplitter", "_dock_split_" ) ) return 0L;
+  if ( qt_find_obj_child( TQT_TQOBJECT(w), "PMDockTabGroup", "_dock_tab" ) ) return 0L;
   if (!childDockWidgetList) return 0L;
-  if ( childDockWidgetList->tqfind(w) != -1 ) return 0L;
+  if ( childDockWidgetList->find(w) != -1 ) return 0L;
   if ( currentDragWidget->isGroup && ((PMDockWidget*)w)->parentDockTabGroup() ) return 0L;
 
   PMDockWidget* www = (PMDockWidget*)w;
@@ -1511,7 +1511,7 @@ void PMDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const
     while ( it.current() ) {
       if ( it.current()->isWidgetType() ) {
         w = (TQWidget*)it.current();
-        if ( w->isVisible() && w->tqgeometry().tqcontains(pos) ) {
+        if ( w->isVisible() && w->tqgeometry().contains(pos) ) {
           if ( w->inherits("PMDockWidget") ) ww = w;
           findChildDockWidget( ww, w, w->mapFromParent(pos) );
           return;
@@ -1809,8 +1809,8 @@ void PMDockManager::writeConfig(TQDomElement &base)
     nList.first();
     while ( nList.current() ) {
         PMDockWidget *obj = getDockWidgetFromName( nList.current() );
-        if (obj->isGroup && (nameList.tqfind( obj->firstName.latin1() ) == -1
-                             || nameList.tqfind(obj->lastName.latin1()) == -1)) {
+        if (obj->isGroup && (nameList.find( obj->firstName.latin1() ) == -1
+                             || nameList.find(obj->lastName.latin1()) == -1)) {
             // Skip until tqchildren are saved (why?)
             nList.next();
             if ( !nList.current() ) nList.first();
@@ -2034,7 +2034,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
     }
 /*************************************************************************************************/
     if ( obj->isGroup ){
-      if ( findList.tqfind( obj->firstName.latin1() ) != -1 && findList.tqfind( obj->lastName.latin1() ) != -1 ){
+      if ( findList.find( obj->firstName.latin1() ) != -1 && findList.find( obj->lastName.latin1() ) != -1 ){
 
         c->writeEntry( cname+":type", "GROUP");
         if ( !obj->tqparent() ){
@@ -2057,9 +2057,9 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
       } else {
 /*************************************************************************************************/
         //debug("  Skip %s", nList.current());
-        //if ( findList.tqfind( obj->firstName ) == -1 )
+        //if ( findList.find( obj->firstName ) == -1 )
         //  debug("  ? Not found %s", obj->firstName);
-        //if ( findList.tqfind( obj->lastName ) == -1 )
+        //if ( findList.find( obj->lastName ) == -1 )
         //  debug("  ? Not found %s", obj->lastName);
         nList.next();
         if ( !nList.current() ) nList.first();
diff --git a/kpovmodeler/pmdocumentationmap.cpp b/kpovmodeler/pmdocumentationmap.cpp
index 8fe29ce6..df2bf620 100644
--- a/kpovmodeler/pmdocumentationmap.cpp
+++ b/kpovmodeler/pmdocumentationmap.cpp
@@ -30,7 +30,7 @@ KStaticDeleter<PMDocumentationMap> PMDocumentationMap::s_staticDeleter;
 
 TQString PMDocumentationVersion::documentation( const TQString& className ) const
 {
-   if( m_map.tqcontains( className ) )
+   if( m_map.contains( className ) )
       return m_map[className];
    return m_index;
 }
diff --git a/kpovmodeler/pmenumproperty.cpp b/kpovmodeler/pmenumproperty.cpp
index 73a3446f..b300fafc 100644
--- a/kpovmodeler/pmenumproperty.cpp
+++ b/kpovmodeler/pmenumproperty.cpp
@@ -40,7 +40,7 @@ TQStringList PMEnumProperty::enumValues( ) const
 
 bool PMEnumProperty::setProtected( PMObject* obj, const PMVariant& v )
 {
-   PMEnumStringValueMap::iterator it = m_stringMap.tqfind( v.stringData( ) );
+   PMEnumStringValueMap::iterator it = m_stringMap.find( v.stringData( ) );
    if( it == m_stringMap.end( ) )
       return false;
    setEnum( obj, it.data( ) );
@@ -50,7 +50,7 @@ bool PMEnumProperty::setProtected( PMObject* obj, const PMVariant& v )
 PMVariant PMEnumProperty::getProtected( const PMObject* obj )
 {
    int v = getEnum( obj );
-   PMEnumValueStringMap::const_iterator it = m_valueMap.tqfind( v );
+   PMEnumValueStringMap::const_iterator it = m_valueMap.find( v );
    if( it == m_valueMap.end( ) )
       return PMVariant( TQString() );
    return it.data( );
diff --git a/kpovmodeler/pmerrordialog.cpp b/kpovmodeler/pmerrordialog.cpp
index b8a11630..2ff5994f 100644
--- a/kpovmodeler/pmerrordialog.cpp
+++ b/kpovmodeler/pmerrordialog.cpp
@@ -53,7 +53,7 @@ PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags,
       PMObject* obj = pit.current( )->linkedObject( );
       for( ; obj; obj = obj->tqparent( ) )
       {
-         TQPtrList<PMMessage>* pList = m_messageDict.tqfind( obj );
+         TQPtrList<PMMessage>* pList = m_messageDict.find( obj );
          if( !pList )
          {
             pList = new TQPtrList<PMMessage>;
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 91e6d797..9b7779ae 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -1064,7 +1064,7 @@ PMVector PMGLView::mousePosition( PMControlPoint* cp, int x, int y )
    result[1] = screenToInternalY( y );
    if( cp )
    {
-      index = m_controlPoints.tqfindRef( cp );
+      index = m_controlPoints.findRef( cp );
       if( index >= 0 )
       {
          p = m_controlPointsPosition.at( ( uint ) index );
diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp
index 5e322d95..3804d89d 100644
--- a/kpovmodeler/pmimagemapedit.cpp
+++ b/kpovmodeler/pmimagemapedit.cpp
@@ -535,7 +535,7 @@ void PMImageMapEdit::slotAddFilterEntry( )
 
    if( button )
    {
-      int index = m_filterAddButtons.tqfindRef( button );
+      int index = m_filterAddButtons.findRef( button );
       if( index >= 0 )
       {
          entriesFilters = filters( );
@@ -561,7 +561,7 @@ void PMImageMapEdit::slotRemoveFilterEntry( )
 
    if( button )
    {
-      int index = m_filterRemoveButtons.tqfindRef( button );
+      int index = m_filterRemoveButtons.findRef( button );
       if( index >= 0 )
       {
          entriesFilters = filters( );
@@ -583,7 +583,7 @@ void PMImageMapEdit::slotAddTransmitEntry( )
 
    if( button )
    {
-      int index = m_transmitAddButtons.tqfindRef( button );
+      int index = m_transmitAddButtons.findRef( button );
       if( index >= 0 )
       {
          entriesTransmits = transmits( );
@@ -609,7 +609,7 @@ void PMImageMapEdit::slotRemoveTransmitEntry( )
 
    if( button )
    {
-      int index = m_transmitRemoveButtons.tqfindRef( button );
+      int index = m_transmitRemoveButtons.findRef( button );
       if( index >= 0 )
       {
          entriesTransmits = transmits( );
diff --git a/kpovmodeler/pminsertrules.dtd b/kpovmodeler/pminsertrules.dtd
index 4b9a46d7..a3c2128c 100644
--- a/kpovmodeler/pminsertrules.dtd
+++ b/kpovmodeler/pminsertrules.dtd
@@ -39,23 +39,23 @@
  Insert a list of groups and classes (the object classes that can be inserted)
  and one condition. If the condition is omitted,
  the classes can allways be inserted. --> 
-<!ELEMENT rule ((group | class)+, (and | or | not | before | after | tqcontains
+<!ELEMENT rule ((group | class)+, (and | or | not | before | after | contains
                                    | greater | less | equal)?)>
 
 <!-- Simple negation. Insert one condition -->
-<!ELEMENT not (and | or | before | after | tqcontains | greater | less | equal)>
+<!ELEMENT not (and | or | before | after | contains | greater | less | equal)>
 
 <!-- Logical and. Insert any number of conditions -->
-<!ELEMENT and (and | or | not | before | after | tqcontains | greater | less | equal)+>
+<!ELEMENT and (and | or | not | before | after | contains | greater | less | equal)+>
 
 <!-- Logical or. Insert any number of conditions -->
-<!ELEMENT or (and | or | not | before | after | tqcontains | greater | less | equal)+>
+<!ELEMENT or (and | or | not | before | after | contains | greater | less | equal)+>
 
-<!-- Condition. Value is true if the object already tqcontains
+<!-- Condition. Value is true if the object already contains
  objects of the given class or group before the insert point. -->
 <!ELEMENT before (class | group)>
 
-<!-- Condition. Value is true if the object already tqcontains
+<!-- Condition. Value is true if the object already contains
  objects of the given class or group after the insert point. -->
 <!ELEMENT after (class | group)>
 
@@ -71,9 +71,9 @@
  is less than the second. -->
 <!ELEMENT less ((property | count | const), (property | count | const))>
 
-<!-- Condition. Value is true if the object tqcontains
+<!-- Condition. Value is true if the object contains
  objects of the given classes and groups. -->
-<!ELEMENT tqcontains (group | class)+>
+<!ELEMENT contains (group | class)+>
 
 
 <!-- Value. Value is the class property of the object, where the 
diff --git a/kpovmodeler/pminsertrulesystem.cpp b/kpovmodeler/pminsertrulesystem.cpp
index 1090837f..0cd2a4d0 100644
--- a/kpovmodeler/pminsertrulesystem.cpp
+++ b/kpovmodeler/pminsertrulesystem.cpp
@@ -136,7 +136,7 @@ bool isCondition( TQDomElement& e )
 {
    return( e.tagName( ) == "not" || e.tagName( ) == "and" ||
            e.tagName( ) == "or" || e.tagName( ) == "before" ||
-           e.tagName( ) == "after" || e.tagName( ) == "tqcontains" ||
+           e.tagName( ) == "after" || e.tagName( ) == "contains" ||
            e.tagName( ) == "greater" || e.tagName( ) == "less" ||
            e.tagName( ) == "equal" );
 }
@@ -168,7 +168,7 @@ PMRuleCondition* newCondition( TQDomElement& e,
       return new PMRuleBefore( e, globalGroups, localGroups );
    if( e.tagName( ) == "after" )
       return new PMRuleAfter( e, globalGroups, localGroups );
-   if( e.tagName( ) == "tqcontains" )
+   if( e.tagName( ) == "contains" )
       return new PMRuleContains( e, globalGroups, localGroups );
    if( e.tagName( ) == "greater" )
       return new PMRuleGreater( e, globalGroups, localGroups );
@@ -383,7 +383,7 @@ PMRuleBefore::PMRuleBefore( TQDomElement& e,
                             TQPtrList<PMRuleDefineGroup>& localGroups )
       : PMRuleCondition( )
 {
-   m_tqcontains = false;
+   m_contains = false;
    TQDomNode m = e.firstChild( );
    while( !m.isNull( ) )
    {
@@ -405,23 +405,23 @@ PMRuleBefore::~PMRuleBefore( )
 
 bool PMRuleBefore::evaluate( const PMObject* )
 {
-   return m_tqcontains;
+   return m_contains;
 }
 
 void PMRuleBefore::countChildProtected( const TQString& className,
                                         bool afterInsertPoint )
 {
-   if( afterInsertPoint && !m_tqcontains )
+   if( afterInsertPoint && !m_contains )
    {
       TQPtrListIterator<PMRuleCategory> it( m_categories );
-      for( ; it.current( ) && !m_tqcontains; ++it )
-         m_tqcontains = it.current( )->matches( className );
+      for( ; it.current( ) && !m_contains; ++it )
+         m_contains = it.current( )->matches( className );
    }
 }
 
 void PMRuleBefore::resetProtected( )
 {
-   m_tqcontains = false;
+   m_contains = false;
 }
 
 PMRuleAfter::PMRuleAfter( TQDomElement& e,
@@ -429,7 +429,7 @@ PMRuleAfter::PMRuleAfter( TQDomElement& e,
                           TQPtrList<PMRuleDefineGroup>& localGroups )
       : PMRuleCondition( )
 {
-   m_tqcontains = false;
+   m_contains = false;
    TQDomNode m = e.firstChild( );
    while( !m.isNull( ) )
    {
@@ -451,23 +451,23 @@ PMRuleAfter::~PMRuleAfter( )
 
 bool PMRuleAfter::evaluate( const PMObject* )
 {
-   return m_tqcontains;
+   return m_contains;
 }
 
 void PMRuleAfter::countChildProtected( const TQString& className,
                                        bool afterInsertPoint )
 {
-   if( !afterInsertPoint && !m_tqcontains )
+   if( !afterInsertPoint && !m_contains )
    {
       TQPtrListIterator<PMRuleCategory> it( m_categories );
-      for( ; it.current( ) && !m_tqcontains; ++it )
-         m_tqcontains = it.current( )->matches( className );
+      for( ; it.current( ) && !m_contains; ++it )
+         m_contains = it.current( )->matches( className );
    }
 }
 
 void PMRuleAfter::resetProtected( )
 {
-   m_tqcontains = false;
+   m_contains = false;
 }
 
 PMRuleContains::PMRuleContains( TQDomElement& e,
@@ -475,7 +475,7 @@ PMRuleContains::PMRuleContains( TQDomElement& e,
                                 TQPtrList<PMRuleDefineGroup>& localGroups )
       : PMRuleCondition( )
 {
-   m_tqcontains = false;
+   m_contains = false;
    TQDomNode m = e.firstChild( );
    while( !m.isNull( ) )
    {
@@ -497,22 +497,22 @@ PMRuleContains::~PMRuleContains( )
 
 bool PMRuleContains::evaluate( const PMObject* )
 {
-   return m_tqcontains;
+   return m_contains;
 }
 
 void PMRuleContains::countChildProtected( const TQString& className, bool )
 {
-   if( !m_tqcontains )
+   if( !m_contains )
    {
       TQPtrListIterator<PMRuleCategory> it( m_categories );
-      for( ; it.current( ) && !m_tqcontains; ++it )
-         m_tqcontains = it.current( )->matches( className );
+      for( ; it.current( ) && !m_contains; ++it )
+         m_contains = it.current( )->matches( className );
    }
 }
 
 void PMRuleContains::resetProtected( )
 {
-   m_tqcontains = false;
+   m_contains = false;
 }
 
 PMRuleCompare::PMRuleCompare( TQDomElement& e,
@@ -829,7 +829,7 @@ PMInsertRuleSystem::~PMInsertRuleSystem( )
 void PMInsertRuleSystem::loadRules( const TQString& fileName )
 {
    PMRuleClass::s_pPrototypeManager = m_pPart->prototypeManager( );
-   if( m_loadedFiles.tqfind( fileName ) != m_loadedFiles.end( ) )
+   if( m_loadedFiles.find( fileName ) != m_loadedFiles.end( ) )
       return;
    m_loadedFiles.push_back( fileName );
 
@@ -877,7 +877,7 @@ void PMInsertRuleSystem::loadRules( const TQString& fileName )
                PMRuleTargetClass* target = 0;
 
                if( !m_rulesDict.isEmpty( ) )
-                  target = m_rulesDict.tqfind( className );
+                  target = m_rulesDict.find( className );
 
                if( target )
                   target->appendRules( ce, m_groups );
@@ -908,7 +908,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
    PMMetaObject* meta = parentObject->tqmetaObject( );
    for( ; meta && !possible; meta = meta->superClass( ) )
    {
-      PMRuleTargetClass* tc = m_rulesDict.tqfind( meta->className( ) );
+      PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) );
       if( tc )
       {
          // check the exception list
@@ -999,7 +999,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
    PMMetaObject* meta = parentObject->tqmetaObject( );
    for( ; meta; meta = meta->superClass( ) )
    {
-      PMRuleTargetClass* tc = m_rulesDict.tqfind( meta->className( ) );
+      PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) );
       if( tc )
          targetClassList.append( tc );
    }
diff --git a/kpovmodeler/pminsertrulesystem.h b/kpovmodeler/pminsertrulesystem.h
index 0f13a099..2559fdba 100644
--- a/kpovmodeler/pminsertrulesystem.h
+++ b/kpovmodeler/pminsertrulesystem.h
@@ -344,7 +344,7 @@ private:
 };
 
 /**
- * Condition. Value is true if the object already tqcontains
+ * Condition. Value is true if the object already contains
  * objects of certaint classes before the insert point.
  */
 class PMRuleBefore : public PMRuleCondition
@@ -371,11 +371,11 @@ protected:
    virtual void resetProtected( );
 private:
    TQPtrList<PMRuleCategory> m_categories;
-   bool m_tqcontains;
+   bool m_contains;
 };
 
 /**
- * Condition. Value is true if the object already tqcontains
+ * Condition. Value is true if the object already contains
  * objects of certaint classes after the insert point.
  */
 class PMRuleAfter : public PMRuleCondition
@@ -402,11 +402,11 @@ protected:
    virtual void resetProtected( );
 private:
    TQPtrList<PMRuleCategory> m_categories;
-   bool m_tqcontains;
+   bool m_contains;
 };
 
 /**
- * Condition. Value is true if the object already tqcontains
+ * Condition. Value is true if the object already contains
  * objects of certaint classes.
  */
 class PMRuleContains : public PMRuleCondition
@@ -433,7 +433,7 @@ protected:
    virtual void resetProtected( );
 private:
    TQPtrList<PMRuleCategory> m_categories;
-   bool m_tqcontains;
+   bool m_contains;
 };
 
 /**
diff --git a/kpovmodeler/pmiomanager.cpp b/kpovmodeler/pmiomanager.cpp
index 14aab5f5..946f2bc5 100644
--- a/kpovmodeler/pmiomanager.cpp
+++ b/kpovmodeler/pmiomanager.cpp
@@ -47,9 +47,9 @@ void PMIOManager::addFormat( PMIOFormat* format )
 {
    if( !format )
       return;
-   if( !m_formats.tqcontainsRef( format ) )
+   if( !m_formats.containsRef( format ) )
    {
-      if( !m_dict.tqfind( format->name( ) ) )
+      if( !m_dict.find( format->name( ) ) )
       {
          m_formats.append( format );
          m_dict.insert( format->name( ), format );
@@ -73,7 +73,7 @@ void PMIOManager::removeFormat( const TQString& name )
 
 PMIOFormat* PMIOManager::format( const TQString& name ) const
 {
-   return m_dict.tqfind( name );
+   return m_dict.find( name );
 }
 
 PMIOFormat* PMIOManager::formatForMimeType( const TQString& mime ) const
diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp
index a1be809b..578391c8 100644
--- a/kpovmodeler/pmlayoutsettings.cpp
+++ b/kpovmodeler/pmlayoutsettings.cpp
@@ -262,7 +262,7 @@ void PMLayoutSettings::slotAddLayout( )
 
    new_name = i18n( "Unnamed" );
    str.setNum( i );
-   while( m_pViewLayouts->tqfindItem( new_name, TQt::ExactMatch ) )
+   while( m_pViewLayouts->findItem( new_name, TQt::ExactMatch ) )
    {
       new_name = i18n( "Unnamed" ) + str;
       i++;
@@ -275,7 +275,7 @@ void PMLayoutSettings::slotAddLayout( )
    m_currentViewLayout++;
    m_viewLayouts.insert( m_currentViewLayout, l );
    displayLayoutList( );
-   m_pViewLayouts->setCurrentItem( m_pViewLayouts->tqfindItem( new_name, TQt::ExactMatch ) );
+   m_pViewLayouts->setCurrentItem( m_pViewLayouts->findItem( new_name, TQt::ExactMatch ) );
    m_pRemoveLayout->setEnabled( true );
 }
 
diff --git a/kpovmodeler/pmlibraryhandle.cpp b/kpovmodeler/pmlibraryhandle.cpp
index 36ed2d2a..8ba0f387 100644
--- a/kpovmodeler/pmlibraryhandle.cpp
+++ b/kpovmodeler/pmlibraryhandle.cpp
@@ -302,7 +302,7 @@ PMLibraryHandle::PMResult PMLibraryHandle::createNewSubLibrary( const TQString /
    if( m_readOnly )
       return PMLibraryHandle::ReadOnlyLib;
 
-   if( m_libraries.tqfind( subLibName ) )
+   if( m_libraries.find( subLibName ) )
       return PMLibraryHandle::ExistingDir;
 
    s = s+ "/libXXXXXX";
@@ -364,14 +364,14 @@ PMLibraryHandle::PMResult PMLibraryHandle::changeParentLibrary( const TQString&
    {
       PMLibraryHandle lib = PMLibraryHandle( *itr.current( ) );
       lib.changeParentLibrary( newPath );
-      m_libraries.tqreplace( itr.currentKey( ), new TQString( newPath + "/" + lib.path( ) ) );
+      m_libraries.replace( itr.currentKey( ), new TQString( newPath + "/" + lib.path( ) ) );
    }
 
    PMLibraryHandle::EntryIterator objItr( m_objects );
    for( ; objItr.current( ); ++objItr )
    {
       TQString test = newPath + "/" + objItr.current( )->section( '/', -1 );
-      m_objects.tqreplace( objItr.currentKey( ), new TQString( newPath + "/" + objItr.current( )->section( '/', -1 ) ) );
+      m_objects.replace( objItr.currentKey( ), new TQString( newPath + "/" + objItr.current( )->section( '/', -1 ) ) );
    }
 
    saveLibraryInfo( );
diff --git a/kpovmodeler/pmmetaobject.h b/kpovmodeler/pmmetaobject.h
index a0b3ce90..95822fc9 100644
--- a/kpovmodeler/pmmetaobject.h
+++ b/kpovmodeler/pmmetaobject.h
@@ -402,7 +402,7 @@ public:
     */
    PMPropertyBase* property( const TQString& name ) const
    {
-      return m_propertiesDict.tqfind( name );
+      return m_propertiesDict.find( name );
    }
 
 private:
diff --git a/kpovmodeler/pmmovecommand.cpp b/kpovmodeler/pmmovecommand.cpp
index e45a8bf3..124de7a3 100644
--- a/kpovmodeler/pmmovecommand.cpp
+++ b/kpovmodeler/pmmovecommand.cpp
@@ -281,7 +281,7 @@ int PMMoveCommand::errorFlags( PMPart* )
                for( obj = links.current( ); obj && !insideSelection;
                     obj = obj->tqparent( ) )
                {
-                  if( deletedObjects.tqfind( obj ) )
+                  if( deletedObjects.find( obj ) )
                      insideSelection = true;
                }
 
@@ -290,7 +290,7 @@ int PMMoveCommand::errorFlags( PMPart* )
                   bool stop = false;
                   for( obj = links.current( ); obj && !stop; obj = obj->tqparent( ) )
                   {
-                     if( deletedObjects.tqfind( obj ) )
+                     if( deletedObjects.find( obj ) )
                         stop = true;
                      else
                         deletedObjects.insert( obj, new bool( true ) );
@@ -327,7 +327,7 @@ int PMMoveCommand::errorFlags( PMPart* )
                      // check if insert point is before the top level
                      // tqparent object
                      
-                     if( !objectsAfterInsertPosition.tqfind( obj ) )
+                     if( !objectsAfterInsertPosition.find( obj ) )
                      {
                         stop = false;
                         obj = obj->prevSibling( );
@@ -335,7 +335,7 @@ int PMMoveCommand::errorFlags( PMPart* )
                         {
                            if( obj == m_pAfter )
                               stop = true;
-                           else if( objectsAfterInsertPosition.tqfind( obj ) )
+                           else if( objectsAfterInsertPosition.find( obj ) )
                               stop = true;
                            else
                               obj = obj->prevSibling( );
@@ -419,13 +419,13 @@ int PMMoveCommand::errorFlags( PMPart* )
 
          if( linked )
          {
-            if( !deletedObjects.tqfind( linked ) )
+            if( !deletedObjects.find( linked ) )
             {
                // Object is linked to a declare and the declare
                // will not be moved.
                // Check, if the insert point is after the declare
 
-               if( !declaresBeforeInsertPosition.tqfind( linked ) )
+               if( !declaresBeforeInsertPosition.find( linked ) )
                   ok = false;
             }
          }
diff --git a/kpovmodeler/pmobjectselect.cpp b/kpovmodeler/pmobjectselect.cpp
index 5469c487..e234921a 100644
--- a/kpovmodeler/pmobjectselect.cpp
+++ b/kpovmodeler/pmobjectselect.cpp
@@ -202,7 +202,7 @@ int PMObjectSelect::selectObject( PMObject* link,
       
       while( o && !l && last )
       {
-         if( t.tqfindIndex( o->type( ) ) >= 0 )
+         if( t.findIndex( o->type( ) ) >= 0 )
             s.m_pListBox->insertItem( new PMListBoxObject( o ) );
          
          if( o == last )
@@ -325,7 +325,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy
          if( o->type( ) == "Declare" )
          {
             decl = ( PMDeclare* ) o;
-            if( declareTypes.tqfindIndex( decl->declareType( ) ) >= 0 )
+            if( declareTypes.findIndex( decl->declareType( ) ) >= 0 )
                s.m_pListBox->insertItem( new PMListBoxObject( o ) );
          }
          
diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp
index e2801943..99398ce7 100644
--- a/kpovmodeler/pmparser.cpp
+++ b/kpovmodeler/pmparser.cpp
@@ -304,9 +304,9 @@ bool PMParser::insertChild( PMObject* child, PMObject* tqparent )
 void PMParser::checkID( PMDeclare* decl )
 {
    PMSymbolTable* st = m_pPart->symbolTable( );
-   PMSymbol* s = m_pLocalST.tqfind( decl->id( ) );
+   PMSymbol* s = m_pLocalST.find( decl->id( ) );
    if( !s )
-      s = st->tqfind( decl->id( ) );
+      s = st->find( decl->id( ) );
    
    if( s )
    {
@@ -336,7 +336,7 @@ void PMParser::checkID( PMDeclare* decl )
 void PMParser::checkID( const TQString& id, const PMValue& v )
 {
    PMSymbolTable* st = m_pPart->symbolTable( );
-   PMSymbol* s = m_pLocalST.tqfind( id );
+   PMSymbol* s = m_pLocalST.find( id );
    
    if( s )
    {
@@ -374,9 +374,9 @@ PMDeclare* PMParser::checkLink( const TQString& id )
    bool ok = false;
 
    // is object declared?
-   PMSymbol* s = m_pLocalST.tqfind( id );
+   PMSymbol* s = m_pLocalST.find( id );
    if( !s )
-      s = t->tqfind( id );
+      s = t->find( id );
    
    if( !s )
       printError( i18n( "Undefined object \"%1\"." ).tqarg( id ) );
@@ -386,7 +386,7 @@ PMDeclare* PMParser::checkLink( const TQString& id )
    {
       // the object is declared
       // is the id already in m_okDeclares
-      bool* lok = m_okDeclares.tqfind( id );
+      bool* lok = m_okDeclares.find( id );
       if( lok )
          ok = true;
       else
@@ -425,9 +425,9 @@ PMDeclare* PMParser::checkLink( const TQString& id )
 
 PMSymbol* PMParser::getSymbol( const TQString& id ) const
 {
-   PMSymbol* s = m_pLocalST.tqfind( id );
+   PMSymbol* s = m_pLocalST.find( id );
    if( !s )
-      s = m_pPart->symbolTable( )->tqfind( id );
+      s = m_pPart->symbolTable( )->find( id );
    return s;
 }
 
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index 7dec1524..01b36deb 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -1023,7 +1023,7 @@ bool PMPart::setActiveObject( const TQString& name )
       tmpObj = activeObject( );
 
    // get the first element
-   pos = objPath.tqfind( '/' );
+   pos = objPath.find( '/' );
    if( pos != -1 )
    {
       pathElem = objPath.mid( 0, pos );
@@ -1040,10 +1040,10 @@ bool PMPart::setActiveObject( const TQString& name )
       if( !pathElem.isEmpty( ) )
       {
          // Special treatment for brackets
-         firstBracket = pathElem.tqfind( '[' );
+         firstBracket = pathElem.find( '[' );
          if( firstBracket != -1 )
          {
-            lastBracket = pathElem.tqfindRev( ']' );
+            lastBracket = pathElem.findRev( ']' );
             objIndex = pathElem.mid( firstBracket + 1, lastBracket - firstBracket - 1).toInt( );
             pathElem = pathElem.left( firstBracket );
          }
@@ -1070,7 +1070,7 @@ bool PMPart::setActiveObject( const TQString& name )
       }
 
       // Get the next element
-      pos = objPath.tqfind( '/' );
+      pos = objPath.find( '/' );
       if( pos != -1 )
       {
          pathElem = objPath.mid( 0, pos );
@@ -1864,7 +1864,7 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m,
          else
             m_pNewSelection = 0;
       }
-      if( m_selectedObjects.tqcontainsRef( obj ) )
+      if( m_selectedObjects.containsRef( obj ) )
       {
          m_selectedObjects.removeRef( obj );
          if( m_selectedObjects.isEmpty( ) )
@@ -1903,7 +1903,7 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m,
          if( obj->isA( "Declare" ) )
          {
             PMDeclare* decl = ( PMDeclare* ) obj;
-            PMSymbol* s = m_pSymbolTable->tqfind( decl->id( ) );
+            PMSymbol* s = m_pSymbolTable->find( decl->id( ) );
             if( !s )
                m_pSymbolTable->insert( decl->id( ),
                                        new PMSymbol( decl->id( ), decl ) );
@@ -1977,7 +1977,7 @@ void PMPart::slotIDChanged( PMObject* obj, const TQString& oldID )
    if( obj->isA( "Declare" ) )
    {
       PMDeclare* d = ( PMDeclare* ) obj;
-      PMSymbol* s = m_pSymbolTable->tqfind( oldID );
+      PMSymbol* s = m_pSymbolTable->find( oldID );
       if( s )
       {
          if( s->type( ) == PMSymbol::Object )
diff --git a/kpovmodeler/pmpluginmanager.cpp b/kpovmodeler/pmpluginmanager.cpp
index 1453f76d..7af50d5c 100644
--- a/kpovmodeler/pmpluginmanager.cpp
+++ b/kpovmodeler/pmpluginmanager.cpp
@@ -81,7 +81,7 @@ PMPluginManager* PMPluginManager::theManager( )
 
 void PMPluginManager::registerPart( PMPart* p )
 {
-   if( !m_parts.tqcontainsRef( p ) )
+   if( !m_parts.containsRef( p ) )
    {
       m_parts.append( p );
       Plugin::loadPlugins( p, p, PMFactory::instance( ), false );
diff --git a/kpovmodeler/pmpovrayformat.cpp b/kpovmodeler/pmpovrayformat.cpp
index 9824680a..35e0881a 100644
--- a/kpovmodeler/pmpovrayformat.cpp
+++ b/kpovmodeler/pmpovrayformat.cpp
@@ -32,7 +32,7 @@ PMPovrayFormat::~PMPovrayFormat( )
 void PMPovrayFormat::registerMethod( const TQString& className,
                                      PMPovraySerializeMethod method )
 {
-   PMPovraySerializeMethodInfo* info = m_methodDict.tqfind( className );
+   PMPovraySerializeMethodInfo* info = m_methodDict.find( className );
    if( info )
       kdWarning( PMArea ) << "Serialization method for " << className
                           << " shadows old implementation" << endl;
@@ -48,5 +48,5 @@ void PMPovrayFormat::removeMethod( const TQString& className )
 const PMPovraySerializeMethodInfo* PMPovrayFormat::serializationMethod(
    const TQString& className )
 {
-   return m_methodDict.tqfind( className );
+   return m_methodDict.find( className );
 }
diff --git a/kpovmodeler/pmpovrayparser.cpp b/kpovmodeler/pmpovrayparser.cpp
index 5889cd19..ad19c67f 100644
--- a/kpovmodeler/pmpovrayparser.cpp
+++ b/kpovmodeler/pmpovrayparser.cpp
@@ -4658,7 +4658,7 @@ bool PMPovrayParser::parseNormalMap( PMNormalMap* normalMap )
    {
       oldConsumed = m_consumedTokens;
 
-      //  If we tqfind '}' no need to search for an entry
+      //  If we find '}' no need to search for an entry
       if( m_token != '}' && parseToken( '[' ) )
       {
          if( !parseFloat( f_number1 ) )
@@ -4958,7 +4958,7 @@ bool PMPovrayParser::parseSlopeMap( PMSlopeMap* slopeMap )
    {
       oldConsumed = m_consumedTokens;
 
-      //  If we tqfind '}' no need to search for an entry
+      //  If we find '}' no need to search for an entry
       if( m_token != '}' && parseToken( '[' ) )
       {
          if( !parseFloat( f_number1 ) )
@@ -5014,7 +5014,7 @@ bool PMPovrayParser::parseDensityMap( PMDensityMap* densityMap )
    {
       oldConsumed = m_consumedTokens;
 
-      //  If we tqfind '}' no need to search for an entry
+      //  If we find '}' no need to search for an entry
       if( m_token != '}' && parseToken( '[' ) )
       {
          if( !parseFloat( f_number1 ) )
diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp
index 59ed9a71..4f6b8474 100644
--- a/kpovmodeler/pmpovraysettings.cpp
+++ b/kpovmodeler/pmpovraysettings.cpp
@@ -193,7 +193,7 @@ void PMPovraySettings::slotAddPath( )
       TQString path = KFileDialog::getExistingDirectory( TQString(), this );
       if( !path.isEmpty( ) )
       {
-         TQListBoxItem* item = m_pLibraryPaths->tqfindItem( path, ExactMatch );
+         TQListBoxItem* item = m_pLibraryPaths->findItem( path, ExactMatch );
          if( !item )
          {
             m_pLibraryPaths->insertItem( path, m_selectionIndex + 1 );
@@ -250,7 +250,7 @@ void PMPovraySettings::slotEditPath( )
       TQString path = KFileDialog::getExistingDirectory( text, this );
       if( !path.isEmpty( ) )
       {
-         TQListBoxItem* item = m_pLibraryPaths->tqfindItem( path, ExactMatch );
+         TQListBoxItem* item = m_pLibraryPaths->findItem( path, ExactMatch );
          if( !item )
             m_pLibraryPaths->changeItem( path, m_selectionIndex );
          else if( item != lbi )
diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp
index 6e462edd..c86eabe1 100644
--- a/kpovmodeler/pmpovraywidget.cpp
+++ b/kpovmodeler/pmpovraywidget.cpp
@@ -337,7 +337,7 @@ void PMPovrayWidget::slotRenderingFinished( int returntqStatus )
                                       "See the povray output for details." )
                           .tqarg( returntqStatus ) );
    }
-   else if( m_pRenderWidget->povrayOutput( ).tqcontains( "ERROR" ) )
+   else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) )
    {
       KMessageBox::error( this, i18n( "There were errors while rendering.\n"
                                       "See the povray output for details." ) );
diff --git a/kpovmodeler/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp
index db85654d..5ce7910d 100644
--- a/kpovmodeler/pmprismedit.cpp
+++ b/kpovmodeler/pmprismedit.cpp
@@ -452,7 +452,7 @@ void PMPrismEdit::slotAddPointAbove( )
    TQPushButton* bt = ( TQPushButton* ) sender( );
    if( bt )
    {
-      int subIndex = m_addAboveButtons.tqfindRef( bt );
+      int subIndex = m_addAboveButtons.findRef( bt );
       if( subIndex >= 0 )
       {
          PMVectorListEdit* ed = m_points.at( subIndex );
@@ -488,7 +488,7 @@ void PMPrismEdit::slotAddPointBelow( )
    TQPushButton* bt = ( TQPushButton* ) sender( );
    if( bt )
    {
-      int subIndex = m_addBelowButtons.tqfindRef( bt );
+      int subIndex = m_addBelowButtons.findRef( bt );
       if( subIndex >= 0 )
       {
          PMVectorListEdit* ed = m_points.at( subIndex );
@@ -524,7 +524,7 @@ void PMPrismEdit::slotRemovePoint( )
    TQPushButton* bt = ( TQPushButton* ) sender( );
    if( bt )
    {
-      int subIndex = m_removeButtons.tqfindRef( bt );
+      int subIndex = m_removeButtons.findRef( bt );
       if( subIndex >= 0 )
       {
          PMVectorListEdit* ed = m_points.at( subIndex );
@@ -560,7 +560,7 @@ void PMPrismEdit::slotAddSubPrism( )
    TQPushButton* button = ( TQPushButton* ) sender( );
    if( button )
    {
-      int index = m_subPrismAddButtons.tqfindRef( button );
+      int index = m_subPrismAddButtons.findRef( button );
       if( index >= 0 )
       {
          TQValueList< TQValueList<PMVector> > points = splinePoints( );
@@ -600,7 +600,7 @@ void PMPrismEdit::slotRemoveSubPrism( )
    TQPushButton* button = ( TQPushButton* ) sender( );
    if( button )
    {
-      int index = m_subPrismRemoveButtons.tqfindRef( button );
+      int index = m_subPrismRemoveButtons.findRef( button );
       if( index >= 0 )
       {
          TQValueList< TQValueList<PMVector> > points = splinePoints( );
diff --git a/kpovmodeler/pmprototypemanager.cpp b/kpovmodeler/pmprototypemanager.cpp
index 1df5540f..fd02e50b 100644
--- a/kpovmodeler/pmprototypemanager.cpp
+++ b/kpovmodeler/pmprototypemanager.cpp
@@ -148,7 +148,7 @@ void PMPrototypeManager::addPrototype( PMObject* obj )
       return;
 
    PMMetaObject* tqmetaObject = obj->tqmetaObject( );
-   PMMetaObject* m2 = m_metaDict.tqfind( tqmetaObject->className( ) );
+   PMMetaObject* m2 = m_metaDict.find( tqmetaObject->className( ) );
    if( m2 )
    {
       kdError( PMArea ) << "PMPrototypeManager: Class '"
@@ -168,7 +168,7 @@ void PMPrototypeManager::addPrototype( PMObject* obj )
       // insert the meta object and all super classes into the hash table
       while( tqmetaObject )
       {
-         if( m_metaDict.tqfind( tqmetaObject->className( ) ) )
+         if( m_metaDict.find( tqmetaObject->className( ) ) )
             tqmetaObject = 0;
          else
          {
@@ -206,7 +206,7 @@ PMObject* PMPrototypeManager::newObject( const TQString& name ) const
    if( name.isEmpty( ) )
       return 0;
 
-   PMMetaObject* meta = m_metaDict.tqfind( name );
+   PMMetaObject* meta = m_metaDict.find( name );
    if( !meta )
       return 0;
    return meta->newObject( m_pPart );
@@ -216,7 +216,7 @@ PMMetaObject* PMPrototypeManager::tqmetaObject( const TQString& name ) const
 {
    if( name.isNull( ) )
       return 0;
-   return m_metaDict.tqfind( name );
+   return m_metaDict.find( name );
 }
 
 bool PMPrototypeManager::isA( const TQString& className,
@@ -236,7 +236,7 @@ bool PMPrototypeManager::isA( PMMetaObject* c,
 
 TQString PMPrototypeManager::className( const TQString& lowercase ) const
 {
-   TQMap<TQString, TQString>::const_iterator it = m_lowerCaseDict.tqfind( lowercase );
+   TQMap<TQString, TQString>::const_iterator it = m_lowerCaseDict.find( lowercase );
    if( it != m_lowerCaseDict.end( ) )
       return *it;
    return TQString();
diff --git a/kpovmodeler/pmrendermanager.cpp b/kpovmodeler/pmrendermanager.cpp
index ff7d5987..5d6edbbb 100644
--- a/kpovmodeler/pmrendermanager.cpp
+++ b/kpovmodeler/pmrendermanager.cpp
@@ -146,7 +146,7 @@ void PMRenderManager::addView( PMGLView* view, PMObject* active, PMObject* top,
          restart = true;
       else if( graphicalChange )
       {
-         m_renderTasks.tqfindRef( task );
+         m_renderTasks.findRef( task );
          m_renderTasks.take( );
          m_renderTasks.prepend( task );
          restart = true;
@@ -205,12 +205,12 @@ void PMRenderManager::removeView( PMGLView* view )
 bool PMRenderManager::containsTask( PMGLView* view ) const
 {
    PMRenderTaskListIterator it( m_renderTasks );
-   bool tqcontains = false;
+   bool contains = false;
 
-   for( ; it.current( ) && !tqcontains; ++it )
+   for( ; it.current( ) && !contains; ++it )
       if( it.current( )->view( ) == view )
-         tqcontains = true;
-   return tqcontains;
+         contains = true;
+   return contains;
 }
 
 TQColor PMRenderManager::controlPointColor( int i ) const
@@ -1411,7 +1411,7 @@ void PMRenderManager::renderGrid( )
          glEnd( );
 
          TQString label = TQString( "%1" ).tqarg( x * signx, 0, 'g', 4 );
-         if( approxZero( x ) && label.tqfind( "e-" ) )
+         if( approxZero( x ) && label.find( "e-" ) )
             label = "0";
 
          renderString( label, screenx + 3, height / 2 - fontHeight - 2 );
@@ -1432,7 +1432,7 @@ void PMRenderManager::renderGrid( )
          glEnd( );
 
          TQString label = TQString( "%1" ).tqarg( y * signy, 0, 'g', 4 );
-         if( approxZero( y ) && label.tqfind( "e-" ) )
+         if( approxZero( y ) && label.find( "e-" ) )
             label = "0";
 
          renderString( label, -width / 2 + 3, screeny + 2 );
diff --git a/kpovmodeler/pmresourcelocator.cpp b/kpovmodeler/pmresourcelocator.cpp
index 46ab9502..e8fb9eb0 100644
--- a/kpovmodeler/pmresourcelocator.cpp
+++ b/kpovmodeler/pmresourcelocator.cpp
@@ -56,7 +56,7 @@ TQString PMResourceLocator::lookUp( const TQString& file )
 
    kdDebug( PMArea ) << "LookUp: " << file << endl;
    
-   TQString* ps = m_cache.tqfind( file );
+   TQString* ps = m_cache.find( file );
    if( ps )
       return *ps;
 
diff --git a/kpovmodeler/pmscanner.h b/kpovmodeler/pmscanner.h
index b18d1722..43c8aef3 100644
--- a/kpovmodeler/pmscanner.h
+++ b/kpovmodeler/pmscanner.h
@@ -49,13 +49,13 @@ public:
    /**
     * Returns the token constant for the key if found, otherwise -1
     */
-   int operator[] ( const char* key ) const { return tqfind( key ); }
+   int operator[] ( const char* key ) const { return find( key ); }
    /**
     * Returns the token constant for the key if found, otherwise -1
     */
-   int tqfind( const char* key ) const
+   int find( const char* key ) const
    {
-      int* result = TQAsciiDict<int>::tqfind( key );
+      int* result = TQAsciiDict<int>::find( key );
       if( result )
          return *result;
       return -1;
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 27249472..e03ce3b8 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -344,7 +344,7 @@ void PMShell::slotDockWidgetClosed( )
    const TQObject* o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender( )));
    if( o && o->inherits( "PMDockWidget" ) )
    {
-      if( m_objectsToDelete.tqcontainsRef( o ) == 0 )
+      if( m_objectsToDelete.containsRef( o ) == 0 )
       {
          m_objectsToDelete.append( o );
          TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotDeleteClosedObjects( ) ) );
@@ -602,7 +602,7 @@ void PMShell::setCaption( const TQString& caption )
    else
    {
       if( !m_pPathAction->isChecked( ) )
-         tmp = caption.right( caption.length( ) - caption.tqfindRev( '/' ) - 1 );
+         tmp = caption.right( caption.length( ) - caption.findRev( '/' ) - 1 );
       else
          tmp = caption;
    }
@@ -656,7 +656,7 @@ bool PMShell::overwriteURL( const KURL& u )
 
 void PMShell::slotSelectedLayout( int id )
 {
-   TQMenuItem* menu = m_pViewLayoutsAction->popupMenu( )->tqfindItem( id );
+   TQMenuItem* menu = m_pViewLayoutsAction->popupMenu( )->findItem( id );
    PMViewLayoutManager::theManager( )->displayLayout( menu->text( ), this );
 }
 
diff --git a/kpovmodeler/pmsymboltable.cpp b/kpovmodeler/pmsymboltable.cpp
index fa04d78e..5cb72b94 100644
--- a/kpovmodeler/pmsymboltable.cpp
+++ b/kpovmodeler/pmsymboltable.cpp
@@ -85,7 +85,7 @@ TQString PMSymbolTable::findNewID( const TQString& prefix )
    TQString testID;
    unsigned int number;
    
-   int* lastNumber = m_lastID.tqfind( prefix );
+   int* lastNumber = m_lastID.find( prefix );
    if( lastNumber )
       number = *lastNumber + 1;
    else
@@ -95,7 +95,7 @@ TQString PMSymbolTable::findNewID( const TQString& prefix )
    do
    {
       testID = prefix + TQString( "%1" ).tqarg( number );
-      symbol = tqfind( testID );
+      symbol = find( testID );
       if( symbol )
          number++;
    }
diff --git a/kpovmodeler/pmtruetypecache.cpp b/kpovmodeler/pmtruetypecache.cpp
index d3fcf8d5..41e4296a 100644
--- a/kpovmodeler/pmtruetypecache.cpp
+++ b/kpovmodeler/pmtruetypecache.cpp
@@ -57,7 +57,7 @@ PMTrueTypeFont* PMTrueTypeCache::lookUp( const TQString& file )
    if( file.isEmpty( ) )
       return 0;
    
-   PMTrueTypeFont* f = m_cache.tqfind( file );
+   PMTrueTypeFont* f = m_cache.find( file );
    if( !f )
    {
       FT_Face face;
@@ -151,7 +151,7 @@ PMTrueTypeOutline* PMTrueTypeFont::outline( TQChar c )
    if( isValid( ) )
    {
       TQString str( c );
-      ol = m_cache.tqfind( str );
+      ol = m_cache.find( str );
       if( !ol )
       {
          FT_UInt glyphIndex = findGlyphIndex( c );
diff --git a/kpovmodeler/pmvector.cpp b/kpovmodeler/pmvector.cpp
index e1b71d37..13ba6ba4 100644
--- a/kpovmodeler/pmvector.cpp
+++ b/kpovmodeler/pmvector.cpp
@@ -575,7 +575,7 @@ TQString PMVector::serializeXML( ) const
 bool PMVector::loadXML( const TQString& str )
 {
    int i;
-   int size = str.tqcontains( ' ' ) + 1;
+   int size = str.contains( ' ' ) + 1;
    TQString tmp( str );
    TQTextStream s( &tmp, IO_ReadOnly );
    TQString val;
diff --git a/kpovmodeler/pmviewfactory.cpp b/kpovmodeler/pmviewfactory.cpp
index f997d4eb..ac4704b6 100644
--- a/kpovmodeler/pmviewfactory.cpp
+++ b/kpovmodeler/pmviewfactory.cpp
@@ -64,7 +64,7 @@ void PMViewFactory::addViewType( PMViewTypeFactory* vt )
 PMViewBase* PMViewFactory::newViewInstance( const TQString& viewType,
                                             TQWidget* tqparent, PMPart* part ) const
 {
-   PMViewTypeFactory* f = m_dict.tqfind( viewType );
+   PMViewTypeFactory* f = m_dict.find( viewType );
    if( f )
       return f->newInstance( tqparent, part );
 
@@ -74,7 +74,7 @@ PMViewBase* PMViewFactory::newViewInstance( const TQString& viewType,
 
 PMViewOptions* PMViewFactory::newOptionsInstance( const TQString& viewType ) const
 {
-   PMViewTypeFactory* f = m_dict.tqfind( viewType );
+   PMViewTypeFactory* f = m_dict.find( viewType );
    if( f )
       return f->newOptionsInstance( );
 
@@ -84,7 +84,7 @@ PMViewOptions* PMViewFactory::newOptionsInstance( const TQString& viewType ) con
 
 PMViewTypeFactory* PMViewFactory::viewFactory( const TQString& viewType ) const
 {
-   return m_dict.tqfind( viewType );
+   return m_dict.find( viewType );
 }
 
 const TQPtrList<PMViewTypeFactory>& PMViewFactory::viewTypes( ) const
diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp
index 7c2f6fdc..426c6c24 100644
--- a/kruler/klineal.cpp
+++ b/kruler/klineal.cpp
@@ -451,7 +451,7 @@ void KLineal::enterEvent(TQEvent * /*inEvent*/) {
 * overwritten to switch the value label and line cursor off
 */
 void KLineal::leaveEvent(TQEvent * /*inEvent*/) {
-  if (!tqgeometry().tqcontains(TQCursor::pos())) {
+  if (!tqgeometry().contains(TQCursor::pos())) {
     hideLabel();
   }
 }
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index c32e983b..e24b8ded 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -400,11 +400,11 @@ void KSnapshot::autoincFilename()
 	TQString numAsStr= name.mid(start, len);
 	TQString number = TQString::number(numAsStr.toInt() + 1);
 	number = number.rightJustify( len, '0');
-	name.tqreplace(start, len, number );
+	name.replace(start, len, number );
     }
     else {
         // no number
-        start = name.tqfindRev('.');
+        start = name.findRev('.');
         if (start != -1) {
             // has a . somewhere, e.g. it has an extension
             name.insert(start, '1');
diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp
index ede99aee..c14eb9b3 100644
--- a/ksnapshot/regiongrabber.cpp
+++ b/ksnapshot/regiongrabber.cpp
@@ -60,7 +60,7 @@ void SizeTip::positionTip( const TQRect &rect )
     TQRect deskR = KGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) );
 
     tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) );
-    if ( !rect.tqcontains( tipRect, true ) && rect.intersects( tipRect ) )
+    if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) )
       tipRect.moveBottomRight( tqgeometry().bottomRight() );
   }
 
diff --git a/ksnapshot/windowgrabber.cpp b/ksnapshot/windowgrabber.cpp
index 0f646a22..a468d7c5 100644
--- a/ksnapshot/windowgrabber.cpp
+++ b/ksnapshot/windowgrabber.cpp
@@ -303,7 +303,7 @@ void WindowGrabber::wheelEvent( TQWheelEvent *e )
 void WindowGrabber::increaseScope( const TQPoint &pos )
 {
     for ( uint i = current + 1; i < windows.size(); i++ ) {
-	if ( windows[ i ].tqcontains( pos ) ) {
+	if ( windows[ i ].contains( pos ) ) {
 	    current = i;
 	    break;
 	}
@@ -317,7 +317,7 @@ void WindowGrabber::increaseScope( const TQPoint &pos )
 void WindowGrabber::decreaseScope( const TQPoint &pos )
 {
     for ( int i = current - 1; i >= 0; i-- ) {
-	if ( windows[ i ].tqcontains( pos ) ) {
+	if ( windows[ i ].contains( pos ) ) {
 	    current = i;
 	    break;
 	}
@@ -330,7 +330,7 @@ void WindowGrabber::decreaseScope( const TQPoint &pos )
 int WindowGrabber::windowIndex( const TQPoint &pos ) const
 {
     for ( uint i = 0; i < windows.size(); i++ ) {
-	if ( windows[ i ].tqcontains( pos ) )
+	if ( windows[ i ].contains( pos ) )
 	    return i;
     }
     return -1;
diff --git a/ksvg/core/KSVGCanvas.cpp b/ksvg/core/KSVGCanvas.cpp
index d20264bf..d16676ab 100644
--- a/ksvg/core/KSVGCanvas.cpp
+++ b/ksvg/core/KSVGCanvas.cpp
@@ -181,7 +181,7 @@ void KSVGCanvas::resize(unsigned int w, unsigned int h)
 						{
 							for(CanvasItemList::ConstIterator it = chunk->list().begin(); it != chunk->list().end(); ++it)
 							{
-								if(!drawables.tqcontains(*it))
+								if(!drawables.contains(*it))
 									drawables.append(*it);
 							}
 						}
@@ -203,7 +203,7 @@ void KSVGCanvas::resize(unsigned int w, unsigned int h)
 						{
 							for(CanvasItemList::ConstIterator it = chunk->list().begin(); it != chunk->list().end(); ++it)
 							{
-								if(!drawables.tqcontains(*it))
+								if(!drawables.contains(*it))
 									drawables.append(*it);
 							}
 						}
@@ -324,11 +324,11 @@ T2P::FontVisualParams *KSVGCanvas::fontVisualParams(SVGStylableImpl *style) cons
 	EFontStyle fontStyle = style->getFontStyle();
 	TQString fontWeight = style->getFontWeight();
 
-	if(fontWeight.tqcontains("bold"))
+	if(fontWeight.contains("bold"))
 		weight |= FC_WEIGHT_DEMIBOLD;
-	if(fontWeight.tqcontains("bolder"))
+	if(fontWeight.contains("bolder"))
 		weight |= FC_WEIGHT_BOLD;
-	if(fontWeight.tqcontains("lighter"))
+	if(fontWeight.contains("lighter"))
 		weight |= FC_WEIGHT_LIGHT;
 
 	bool ok = true;
@@ -364,7 +364,7 @@ T2P::FontVisualParams *KSVGCanvas::fontVisualParams(SVGStylableImpl *style) cons
 
 void KSVGCanvas::tqinvalidate(CanvasItem *item, bool recalc)
 {
-	if(m_chunksByItem.tqfind(item) != m_chunksByItem.end())
+	if(m_chunksByItem.find(item) != m_chunksByItem.end())
 	{
 		if(recalc)
 		{
@@ -376,7 +376,7 @@ void KSVGCanvas::tqinvalidate(CanvasItem *item, bool recalc)
 		for(it.toFirst(); it.current(); ++it)
 		{
 			(*it)->setDirty();
-			if(!m_dirtyChunks.tqcontains(*it))
+			if(!m_dirtyChunks.contains(*it))
 				m_dirtyChunks.append(*it);
 		}
 	}
@@ -429,7 +429,7 @@ void KSVGCanvas::removeFromChunks(CanvasItem *item)
 	for(it.toFirst(); it.current(); ++it)
 	{
 		(*it)->remove(item);
-		if(!m_dirtyChunks.tqcontains(*it))
+		if(!m_dirtyChunks.contains(*it))
 			m_dirtyChunks.append(*it);
 	}
 	m_chunksByItem.remove(item);
@@ -540,7 +540,7 @@ void KSVGCanvas::update(const TQPoint &panPoint, bool erase)
 			{
 				for(CanvasItemList::ConstIterator it = chunk->list().begin(); it != chunk->list().end(); ++it)
 				{
-					if(!drawables.tqcontains(*it))
+					if(!drawables.contains(*it))
 						drawables.append(*it);
 				}
 			}
@@ -607,7 +607,7 @@ void KSVGCanvas::update(float zoomFactor)
 			{
 				for(CanvasItemList::ConstIterator it = chunk->list().begin(); it != chunk->list().end(); ++it)
 				{
-					if(!drawables.tqcontains(*it))
+					if(!drawables.contains(*it))
 						drawables.append(*it);
 				}
 			}
@@ -666,7 +666,7 @@ void KSVGCanvas::update()
 		for(CanvasItemList::ConstIterator it = chunk->list().begin(); it != chunk->list().end(); ++it)
 		{
 //			kdDebug(26005) << k_funcinfo << " Checking: " << *it << endl;
-			if(!drawables.tqcontains(*it))
+			if(!drawables.contains(*it))
 			{
 //				kdDebug(26005) << k_funcinfo << " Yes, appending to update list!" << endl;
 				drawables.append(*it);
@@ -724,7 +724,7 @@ CanvasItemList KSVGCanvas::collisions(const TQPoint &p, bool exact) const
 	{
 		for(CanvasItemList::Iterator it = list.begin(); it != list.end(); ++it)
 		{
-			if((*it)->fillContains(p) || (*it)->strokeContains(p) || (*it)->bbox().tqcontains(p))
+			if((*it)->fillContains(p) || (*it)->strokeContains(p) || (*it)->bbox().contains(p))
 				result.append(*it);
 		}
 
diff --git a/ksvg/core/KSVGLoader.cpp b/ksvg/core/KSVGLoader.cpp
index 9e8c5c54..54f569b1 100644
--- a/ksvg/core/KSVGLoader.cpp
+++ b/ksvg/core/KSVGLoader.cpp
@@ -125,7 +125,7 @@ void KSVGLoader::slotResult(KIO::Job *job)
 		if(m_job->error() == 0)
 		{
 			TQString check = static_cast<KIO::TransferJob *>(job)->url().prettyURL();
-			if(check.tqcontains(".svgz") || check.tqcontains(".svg.gz"))
+			if(check.contains(".svgz") || check.contains(".svg.gz"))
 			{
 				// decode the gzipped svg and emit it
 				TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(new TQBuffer(m_data)), "application/x-gzip");
@@ -348,7 +348,7 @@ public:
 						// Convert the id to its mangled version.
 						TQString id = "@fragment@" + m_url.prettyURL() + "@" + value;
 
-						if(m_idMap.tqcontains(id))
+						if(m_idMap.contains(id))
 						{
 							// This is a local reference to an element within the fragment.
 							// Just convert the href.
diff --git a/ksvg/data/SVGEcma.lut.h b/ksvg/data/SVGEcma.lut.h
index b2a4d2e3..54909bab 100644
--- a/ksvg/data/SVGEcma.lut.h
+++ b/ksvg/data/SVGEcma.lut.h
@@ -84,7 +84,7 @@ static const char SVGDOMNodeBridgeProto__s_hashTableStrings[] = {
     "cloneNode\0"
     "getPrefix\0"
     "normalize\0"
-    "tqcontains\0"
+    "contains\0"
 };
 
 
diff --git a/ksvg/dom/SVGPolygonElement.h b/ksvg/dom/SVGPolygonElement.h
index 4ad16863..7347c53f 100644
--- a/ksvg/dom/SVGPolygonElement.h
+++ b/ksvg/dom/SVGPolygonElement.h
@@ -81,7 +81,7 @@ public:
 	/**
 	 * Provides access to the current animated contents of the points
 	 * attribute.
-	 * If the given attribute or property is being animated, tqcontains
+	 * If the given attribute or property is being animated, contains
 	 * the current animated value of the attribute or property.
 	 * If the given attribute or property is not currently being
 	 * animated, contains the same value as <code>points</code>'.
diff --git a/ksvg/dom/SVGPolylineElement.h b/ksvg/dom/SVGPolylineElement.h
index 2ab617fc..78afaf2f 100644
--- a/ksvg/dom/SVGPolylineElement.h
+++ b/ksvg/dom/SVGPolylineElement.h
@@ -81,7 +81,7 @@ public:
 	/**
 	 * Provides access to the current animated contents of the points
 	 * attribute.
-	 * If the given attribute or property is being animated, tqcontains
+	 * If the given attribute or property is being animated, contains
 	 * the current animated value of the attribute or property.
 	 * If the given attribute or property is not currently being
 	 * animated, contains the same value as <code>points</code>'.
diff --git a/ksvg/dom/SVGSVGElement.h b/ksvg/dom/SVGSVGElement.h
index 9380f992..62196710 100644
--- a/ksvg/dom/SVGSVGElement.h
+++ b/ksvg/dom/SVGSVGElement.h
@@ -56,7 +56,7 @@ class SVGSVGElementImpl;
 
 /**
  * A key interface definition is the SVGSVGElement interface, which is the
- * interface that corresponds to the 'svg' element. This interface tqcontains
+ * interface that corresponds to the 'svg' element. This interface contains
  * various miscellaneous commonly-used utility methods, such as matrix
  * operations and the ability to control the time of redraw on visual
  * rendering devices. SVGSVGElement extends ViewCSS and DocumentCSS to provide
diff --git a/ksvg/ecma/ksvg_ecma.cpp b/ksvg/ecma/ksvg_ecma.cpp
index 2cb17dcd..32bf2993 100644
--- a/ksvg/ecma/ksvg_ecma.cpp
+++ b/ksvg/ecma/ksvg_ecma.cpp
@@ -175,7 +175,7 @@ void KSVGEcma::addEventListener(KSVGEcmaEventListener *listener)
 
 void KSVGEcma::removeEventListener(KSVGEcmaEventListener *listener)
 {
-	m_ecmaEventListeners.take(m_ecmaEventListeners.tqfind(listener));
+	m_ecmaEventListeners.take(m_ecmaEventListeners.find(listener));
 
 	if(m_ecmaEventListeners.count() == 0)
 		m_hasListeners = false;
diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp
index 85c05074..ae6024b3 100644
--- a/ksvg/ecma/ksvg_window.cpp
+++ b/ksvg/ecma/ksvg_window.cpp
@@ -535,7 +535,7 @@ void WindowQObject::clearTimeout(int timerId, bool delAction)
 	
 	if(delAction)
 	{
-		TQMapIterator<int, ScheduledAction *> it = scheduledActions.tqfind(timerId);
+		TQMapIterator<int, ScheduledAction *> it = scheduledActions.find(timerId);
 		if(it != scheduledActions.end())
 		{
 			ScheduledAction *action = *it;
@@ -547,7 +547,7 @@ void WindowQObject::clearTimeout(int timerId, bool delAction)
 
 void WindowQObject::timerEvent(TQTimerEvent *e)
 {
-	TQMapIterator<int, ScheduledAction *> it = scheduledActions.tqfind(e->timerId());
+	TQMapIterator<int, ScheduledAction *> it = scheduledActions.find(e->timerId());
 	if(it != scheduledActions.end())
 	{
 		ScheduledAction *action = *it;
diff --git a/ksvg/impl/LRUCache.h b/ksvg/impl/LRUCache.h
index ef51e1d8..f9045262 100644
--- a/ksvg/impl/LRUCache.h
+++ b/ksvg/impl/LRUCache.h
@@ -36,7 +36,7 @@ public:
 	virtual ~MinOneLRUCache() {}
 
 	void insert(const keyType& key, const valueType& value, int cost);
-	bool tqfind(const keyType& key, valueType& result);
+	bool find(const keyType& key, valueType& result);
 
 	void setMaxTotalCost(int maxTotalCost);
 	int maxTotalCost() const { return m_maxTotalCost; }
@@ -63,7 +63,7 @@ protected:
 
 	typedef TQValueList<CacheItem> CacheItemList;
 
-	typename CacheItemList::iterator tqfind(const keyType& key);
+	typename CacheItemList::iterator find(const keyType& key);
 	void enforceCostConstraint();
 
 	CacheItemList m_items;
@@ -74,7 +74,7 @@ protected:
 template<class keyType, class valueType>
 void MinOneLRUCache<keyType, valueType>::insert(const keyType& key, const valueType& value, int cost)
 {
-	typename CacheItemList::iterator it = tqfind(key);
+	typename CacheItemList::iterator it = find(key);
 
 	if(it != m_items.end())
 	{
@@ -91,10 +91,10 @@ void MinOneLRUCache<keyType, valueType>::insert(const keyType& key, const valueT
 }
 
 template<class keyType, class valueType>
-bool MinOneLRUCache<keyType, valueType>::tqfind(const keyType& key, valueType& result)
+bool MinOneLRUCache<keyType, valueType>::find(const keyType& key, valueType& result)
 {
 	bool foundKey = false;
-	typename CacheItemList::iterator it = tqfind(key);
+	typename CacheItemList::iterator it = find(key);
 
 	if(it != m_items.end())
 	{
@@ -115,7 +115,7 @@ bool MinOneLRUCache<keyType, valueType>::tqfind(const keyType& key, valueType& r
 }
 
 template<class keyType, class valueType>
-typename MinOneLRUCache<keyType, valueType>::CacheItemList::iterator MinOneLRUCache<keyType, valueType>::tqfind(const keyType& key)
+typename MinOneLRUCache<keyType, valueType>::CacheItemList::iterator MinOneLRUCache<keyType, valueType>::find(const keyType& key)
 {
 	typename CacheItemList::iterator it;
 
diff --git a/ksvg/impl/SVGAnimateElementImpl.cc b/ksvg/impl/SVGAnimateElementImpl.cc
index 471d27bb..ccf8565d 100644
--- a/ksvg/impl/SVGAnimateElementImpl.cc
+++ b/ksvg/impl/SVGAnimateElementImpl.cc
@@ -127,7 +127,7 @@ void SVGAnimateElementImpl::handleTimerEvent()
 	{
 /*		m_from += m_addStep;
 
-		if(m_additive == "tqreplace" && needCombine)
+		if(m_additive == "replace" && needCombine)
 			needCombine = false;
 		
 		applyAttribute(m_attributeName, TQString::number(m_from), needCombine);
diff --git a/ksvg/impl/SVGAnimateTransformElementImpl.cc b/ksvg/impl/SVGAnimateTransformElementImpl.cc
index a3384c9d..cf3922f8 100644
--- a/ksvg/impl/SVGAnimateTransformElementImpl.cc
+++ b/ksvg/impl/SVGAnimateTransformElementImpl.cc
@@ -129,7 +129,7 @@ void SVGAnimateTransformElementImpl::setAttributes()
 	{
 		TQString test = _values.string();
 
-		if(test.tqcontains(";"))
+		if(test.contains(";"))
 		{
 			SVGLengthImpl *temp = SVGSVGElementImpl::createSVGLength();
 			
@@ -201,7 +201,7 @@ void SVGAnimateTransformElementImpl::handleTimerEvent(bool)
 
 			if(!m_lastTransform.isEmpty())
 			{
-				int pos = trans.tqfind(m_lastTransform);
+				int pos = trans.find(m_lastTransform);
 				
 				TQString extract;
 				extract += trans.mid(0, pos);
diff --git a/ksvg/impl/SVGAnimatedPointsImpl.cc b/ksvg/impl/SVGAnimatedPointsImpl.cc
index d3eb426d..852d90e0 100644
--- a/ksvg/impl/SVGAnimatedPointsImpl.cc
+++ b/ksvg/impl/SVGAnimatedPointsImpl.cc
@@ -69,12 +69,12 @@ void SVGAnimatedPointsImpl::parsePoints(TQString _points, SVGPointListImpl *poin
 
 	_points = _points.simplifyWhiteSpace();
 
-	if(_points.tqcontains(",,") || _points.tqcontains(", ,"))
+	if(_points.contains(",,") || _points.contains(", ,"))
 		return;
 
-	_points.tqreplace(',', ' ');
-	_points.tqreplace('\r', TQString());
-	_points.tqreplace('\n', TQString());
+	_points.replace(',', ' ');
+	_points.replace('\r', TQString());
+	_points.replace('\n', TQString());
 
 	_points = _points.simplifyWhiteSpace();
 
diff --git a/ksvg/impl/SVGAnimationElementImpl.cc b/ksvg/impl/SVGAnimationElementImpl.cc
index 3fd29d1e..9fbab696 100644
--- a/ksvg/impl/SVGAnimationElementImpl.cc
+++ b/ksvg/impl/SVGAnimationElementImpl.cc
@@ -84,8 +84,8 @@ double SVGAnimationElementImpl::parseClockValue(const TQString &data) const
 
 	double result;
 
-	int doublePointOne = parse.tqfind(':');
-	int doublePointTwo = parse.tqfind(':', doublePointOne + 1);
+	int doublePointOne = parse.find(':');
+	int doublePointTwo = parse.find(':', doublePointOne + 1);
 
 	if(doublePointOne != -1 && doublePointTwo != -1) // Spec: "Full clock values"
 	{
@@ -96,7 +96,7 @@ double SVGAnimationElementImpl::parseClockValue(const TQString &data) const
 
 		result = (3600 * hours) + (60 * minutes) + seconds;
 
-		if(parse.tqfind('.') != -1)
+		if(parse.find('.') != -1)
 		{
 			TQString temp = parse.mid(9, 2);
 			milliseconds = temp.toUInt();
@@ -111,7 +111,7 @@ double SVGAnimationElementImpl::parseClockValue(const TQString &data) const
 
 		result = (60 * minutes) + seconds;
 
-		if(parse.tqfind('.') != -1)
+		if(parse.find('.') != -1)
 		{
 			TQString temp = parse.mid(6, 2);
 			milliseconds = temp.toUInt();
@@ -120,7 +120,7 @@ double SVGAnimationElementImpl::parseClockValue(const TQString &data) const
 	}
 	else // Spec: "Timecount values"
 	{
-		int dotPosition = parse.tqfind('.');
+		int dotPosition = parse.find('.');
 
 		if(parse.endsWith("h"))
 		{
@@ -304,34 +304,34 @@ void SVGAnimationElementImpl::putValueProperty(ExecState *exec, int token, const
 				}
 				else if(current.startsWith("wallclock"))
 				{
-					int firstBrace = current.tqfind("(");
-					int secondBrace = current.tqfind(")");
+					int firstBrace = current.find("(");
+					int secondBrace = current.find(")");
 					
 					TQString wallclockValue = current.mid(firstBrace + 1, secondBrace - firstBrace - 2);
 
 					kdDebug() << "WALLCLOCK VALUE " << wallclockValue << endl;
 				}	
-				else if(current.tqcontains("."))
+				else if(current.contains("."))
 				{
-					int dotPosition = current.tqfind(".");
+					int dotPosition = current.find(".");
 					
 					TQString element = current.mid(0, dotPosition);
 					TQString clockValue;
 
-					if(current.tqcontains("begin"))
+					if(current.contains("begin"))
 						clockValue = current.mid(dotPosition + 6);
-					else if(current.tqcontains("end"))
+					else if(current.contains("end"))
 						clockValue = current.mid(dotPosition + 4);
-					else if(current.tqcontains("repeat"))
+					else if(current.contains("repeat"))
 						clockValue = current.mid(dotPosition + 7);
 					else // DOM2 Event Reference
 					{
 						int plusMinusPosition = -1;
 						
-						if(current.tqcontains("+"))
-							plusMinusPosition = current.tqfind("+");
-						else if(current.tqcontains("-"))
-							plusMinusPosition = current.tqfind("-");
+						if(current.contains("+"))
+							plusMinusPosition = current.find("+");
+						else if(current.contains("-"))
+							plusMinusPosition = current.find("-");
 
 						TQString event = current.mid(dotPosition + 1, plusMinusPosition - dotPosition - 1);
 
@@ -405,9 +405,9 @@ void SVGAnimationElementImpl::setAttributes()
 {
 	SVGElementImpl::setAttributes();
 
-	// Spec: Default value is "tqreplace"
+	// Spec: Default value is "replace"
 	if(KSVG_TOKEN_NOT_PARSED(Additive))
-		KSVG_SET_ALT_ATTRIBUTE(Additive, "tqreplace")
+		KSVG_SET_ALT_ATTRIBUTE(Additive, "replace")
 	
 	// Spec: Default value is "none"
 	if(KSVG_TOKEN_NOT_PARSED(Accumulate))
diff --git a/ksvg/impl/SVGColorImpl.cc b/ksvg/impl/SVGColorImpl.cc
index 3808fe90..6520e9d7 100644
--- a/ksvg/impl/SVGColorImpl.cc
+++ b/ksvg/impl/SVGColorImpl.cc
@@ -398,7 +398,7 @@ void SVGColorImpl::setRGBColorICCColor(const DOM::DOMString &rgbColor, const DOM
 	TQColor color;
 
 	TQString content = iccColor.string().right(iccColor.string().length() - 10);
-	TQString iccTarget = content.mid(0, content.tqfind(','));
+	TQString iccTarget = content.mid(0, content.find(','));
 
 	TQStringList colors = TQStringList::split(',', content);
 	TQString r = colors[1];
diff --git a/ksvg/impl/SVGDocumentImpl.cc b/ksvg/impl/SVGDocumentImpl.cc
index 2b0383ec..4e541847 100644
--- a/ksvg/impl/SVGDocumentImpl.cc
+++ b/ksvg/impl/SVGDocumentImpl.cc
@@ -252,7 +252,7 @@ void SVGDocumentImpl::slotSVGContent(TQIODevice *dev)
 	args.getURLMode = false;
 
 	TQString url = m_baseURL.prettyURL();
-	int pos = url.tqfind('#'); // url can become like this.svg#svgView(viewBox(63,226,74,74)), get part after '#'
+	int pos = url.find('#'); // url can become like this.svg#svgView(viewBox(63,226,74,74)), get part after '#'
 	if(pos > -1)
 		args.SVGFragmentId = url.mid(pos + 1);
 		
@@ -358,7 +358,7 @@ void SVGDocumentImpl::checkFinishedLoading()
 
 void SVGDocumentImpl::addForwardReferencingUseElement(SVGUseElementImpl *use)
 {
-	if(!m_forwardReferencingUseElements.tqcontains(use))
+	if(!m_forwardReferencingUseElements.contains(use))
 		m_forwardReferencingUseElements.append(use);
 }
 
diff --git a/ksvg/impl/SVGEcma.cc b/ksvg/impl/SVGEcma.cc
index c7105d41..0ab19f3a 100644
--- a/ksvg/impl/SVGEcma.cc
+++ b/ksvg/impl/SVGEcma.cc
@@ -74,7 +74,7 @@ using namespace KSVG;
  isSupported			SVGDOMNodeBridge::IsSupported			DontDelete|Function 2
  addEventListener		SVGDOMNodeBridge::AddEventListener		DontDelete|Function 3
  removeEventListener	SVGDOMNodeBridge::RemoveEventListener	DontDelete|Function 3
- tqcontains				SVGDOMNodeBridge::Contains				DontDelete|Function 1
+ contains				SVGDOMNodeBridge::Contains				DontDelete|Function 1
  getNodeName			SVGDOMNodeBridge::GetNodeName			DontDelete|Function 0
  getNodeValue			SVGDOMNodeBridge::GetNodeValue			DontDelete|Function 0
  getNodeType			SVGDOMNodeBridge::GetNodeType			DontDelete|Function 0
@@ -178,10 +178,10 @@ void removeItem(ExecState *exec, DOM::Node &node)
 void correctHandles(SVGElementImpl *main, DOM::Node &node)
 {
 	DOM::Element old(node.handle());
-	DOM::Element *tqreplace = static_cast<DOM::Element *>(main->ownerDoc()->getElementFromHandle(node.handle()));
+	DOM::Element *replace = static_cast<DOM::Element *>(main->ownerDoc()->getElementFromHandle(node.handle()));
 
-	if(tqreplace && node.nodeType() == DOM::Node::ELEMENT_NODE)
-		*tqreplace = old;
+	if(replace && node.nodeType() == DOM::Node::ELEMENT_NODE)
+		*replace = old;
 
 	if(node.hasChildNodes())
 	{
@@ -556,7 +556,7 @@ Value SVGDOMElementBridgeProtoFunc::call(ExecState *exec, Object &thisObj, const
 		{
 			// For now, we strip the NS part (Rob)
 			DOM::DOMString attr = args[1].toString(exec).string();
-			int pos = attr.string().tqfind(':');
+			int pos = attr.string().find(':');
 			if(pos > -1)
 				attr = attr.string().mid(pos + 1);
 
diff --git a/ksvg/impl/SVGElementImpl.cc b/ksvg/impl/SVGElementImpl.cc
index 099918f5..13fc9e46 100644
--- a/ksvg/impl/SVGElementImpl.cc
+++ b/ksvg/impl/SVGElementImpl.cc
@@ -328,7 +328,7 @@ TQDict<DOM::DOMString> &SVGElementImpl::attributes()
 // khtml overrides
 void SVGElementImpl::setAttribute(const DOM::DOMString &name, const DOM::DOMString &value)
 {
-	m_attributes.tqreplace(name.string(), new DOM::DOMString(value));
+	m_attributes.replace(name.string(), new DOM::DOMString(value));
 }
 
 // Changes internal value. This will have no effect on getAttribute().
@@ -368,7 +368,7 @@ DOM::DOMString SVGElementImpl::getAttributeInternal(const DOM::DOMString &name)
 
 bool SVGElementImpl::hasAttribute(const DOM::DOMString &name)
 {
-	return m_attributes.tqfind(name.string()) != 0;
+	return m_attributes.find(name.string()) != 0;
 }
 
 bool SVGElementImpl::hasAttributes()
diff --git a/ksvg/impl/SVGFitToViewBoxImpl.cc b/ksvg/impl/SVGFitToViewBoxImpl.cc
index 7fc3856b..aaee3045 100644
--- a/ksvg/impl/SVGFitToViewBoxImpl.cc
+++ b/ksvg/impl/SVGFitToViewBoxImpl.cc
@@ -75,7 +75,7 @@ void SVGFitToViewBoxImpl::parseViewBox(const TQString &s)
 
 	// allow for viewbox def with ',' or whitespace
 	TQString viewbox(s);
-	TQStringList points = TQStringList::split(' ', viewbox.tqreplace(',', ' ').simplifyWhiteSpace());
+	TQStringList points = TQStringList::split(' ', viewbox.replace(',', ' ').simplifyWhiteSpace());
 
 	viewBox()->baseVal()->setX(points[0].toFloat());
 	viewBox()->baseVal()->setY(points[1].toFloat());
diff --git a/ksvg/impl/SVGImageElementImpl.cc b/ksvg/impl/SVGImageElementImpl.cc
index 4a60d622..258ce95e 100644
--- a/ksvg/impl/SVGImageElementImpl.cc
+++ b/ksvg/impl/SVGImageElementImpl.cc
@@ -380,7 +380,7 @@ bool SVGImageElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &, S
 
 	if(test && m_item)
 	{
-		if(m_item->bbox().tqcontains(p))
+		if(m_item->bbox().contains(p))
 		{
 			mev->setTarget(dynamic_cast<SVGElementImpl *>(this));
 			return true;
diff --git a/ksvg/impl/SVGLangSpaceImpl.cc b/ksvg/impl/SVGLangSpaceImpl.cc
index 5a55ef15..edc35a4d 100644
--- a/ksvg/impl/SVGLangSpaceImpl.cc
+++ b/ksvg/impl/SVGLangSpaceImpl.cc
@@ -67,19 +67,19 @@ TQString SVGLangSpaceImpl::handleText(const TQString &data) const
 	{
 		// Spec: What to do here?
 		//		 It will convert all newline and tab characters into space characters
-		result.tqreplace("\n\r", TQString(" "));
-		result.tqreplace("\r\n", TQString(" "));
-		result.tqreplace('\t', ' ');
+		result.replace("\n\r", TQString(" "));
+		result.replace("\r\n", TQString(" "));
+		result.replace('\t', ' ');
 	}
 	else if(xmlspace() == "default")
 	{
 		// Spec: What to do here?
-		//		 First, it will remove all newline characters (tqreplace)
+		//		 First, it will remove all newline characters (replace)
 		//       Then it will convert all tab characters into space characters  (simplifyWhiteSpace)
 		//       Then, it will strip off all leading and trailing space characters (stripWhiteSpace)
 		//       Then, all contiguous space characters will be consolidated. (simplifyWhiteSpace)
-		result.tqreplace('\n', TQString());
-		result.tqreplace('\r', TQString());
+		result.replace('\n', TQString());
+		result.replace('\r', TQString());
 		result = result.stripWhiteSpace().simplifyWhiteSpace();
 	}
 
diff --git a/ksvg/impl/SVGMaskElementImpl.cc b/ksvg/impl/SVGMaskElementImpl.cc
index 8096c26d..afbc1e74 100644
--- a/ksvg/impl/SVGMaskElementImpl.cc
+++ b/ksvg/impl/SVGMaskElementImpl.cc
@@ -420,7 +420,7 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 	{
 		CacheKey key(referencingElement, imageWidth, imageHeight);
 
-		if(!m_maskCache.tqfind(key, tqmask))
+		if(!m_maskCache.find(key, tqmask))
 		{
 			tqmask = createMask(referencingElement, imageWidth, imageHeight);
 			m_maskCache.insert(key, tqmask, imageWidth * imageHeight);
diff --git a/ksvg/impl/SVGPatternElementImpl.cc b/ksvg/impl/SVGPatternElementImpl.cc
index 99c79ff6..672e62d3 100644
--- a/ksvg/impl/SVGPatternElementImpl.cc
+++ b/ksvg/impl/SVGPatternElementImpl.cc
@@ -486,7 +486,7 @@ SVGPatternElementImpl::Tile SVGPatternElementImpl::createTile(SVGShapeImpl *refe
 		TQSize size(imageWidth, imageHeight);
 		TQImage image;
 
-		if(!m_tileCache.tqfind(size, image))
+		if(!m_tileCache.find(size, image))
 		{
 			image = createTile(referencingElement, imageWidth, imageHeight);
 			m_tileCache.insert(size, image, image.width() * image.height() * 4);
diff --git a/ksvg/impl/SVGSVGElementImpl.cc b/ksvg/impl/SVGSVGElementImpl.cc
index 68bb7dd1..d72b488f 100644
--- a/ksvg/impl/SVGSVGElementImpl.cc
+++ b/ksvg/impl/SVGSVGElementImpl.cc
@@ -382,7 +382,7 @@ DOM::NodeList SVGSVGElementImpl::getEnclosureList(SVGRectImpl *rect, SVGElementI
 			{
 				// TODO : add the tqshape to list if the test succeeds
 				SVGRectImpl *current = tqshape->getBBox();
-				if(rect->qrect().tqcontains(current->qrect(), true))
+				if(rect->qrect().contains(current->qrect(), true))
 					kdDebug() << "tqshape : " << element->nodeName().string() << " is fully enclosed" << endl;
 
 				current->deref();
@@ -412,7 +412,7 @@ bool SVGSVGElementImpl::checkEnclosure(SVGElementImpl *element, SVGRectImpl *rec
 		return false;
 
 	SVGRectImpl *current = tqshape->getBBox();
-	bool result = rect->qrect().tqcontains(current->qrect());
+	bool result = rect->qrect().contains(current->qrect());
 	current->deref();
 	return result;
 }
diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc
index 2bc64df7..32db8575 100644
--- a/ksvg/impl/SVGStylableImpl.cc
+++ b/ksvg/impl/SVGStylableImpl.cc
@@ -532,7 +532,7 @@ TQString SVGStylableImpl::extractUrlId(const TQString &url)
 
 	if(url.startsWith("url(#"))
 	{
-		int idstart = url.tqfind("#") + 1;
+		int idstart = url.find("#") + 1;
 		id = url.mid(idstart, url.length() - idstart - 1);
 	}
 	else
@@ -552,7 +552,7 @@ void SVGStylableImpl::setStartMarker(const TQString &startMarker)
 {
 	if(startMarker.startsWith("url(#"))
 	{
-		int idstart = startMarker.tqfind("#") + 1;
+		int idstart = startMarker.find("#") + 1;
 		m_startMarker = startMarker.mid(idstart, startMarker.length() - idstart - 1);
 	}
 	else if(startMarker == "none")
@@ -563,7 +563,7 @@ void SVGStylableImpl::setMidMarker(const TQString &midMarker)
 {
 	if(midMarker.startsWith("url(#"))
 	{
-		int idstart = midMarker.tqfind("#") + 1;
+		int idstart = midMarker.find("#") + 1;
 		m_midMarker = midMarker.mid(idstart, midMarker.length() - idstart - 1);
 	}
 	else if(midMarker == "none")
@@ -574,7 +574,7 @@ void SVGStylableImpl::setEndMarker(const TQString &endMarker)
 {
 	if(endMarker.startsWith("url(#"))
 	{
-		int idstart = endMarker.tqfind("#") + 1;
+		int idstart = endMarker.find("#") + 1;
 		m_endMarker = endMarker.mid(idstart, endMarker.length() - idstart - 1);
 	}
 	else if(endMarker == "none")
@@ -600,7 +600,7 @@ void SVGStylableImpl::setColor(const TQString &param, SVGColorImpl *svgColor)
 {
 	if(param.stripWhiteSpace().startsWith("#"))
 	{
-		if(param.tqcontains("icc-color"))
+		if(param.contains("icc-color"))
 		{
 			TQString first = param.left(7);
 			TQString last = param.right(param.length() - 8);
@@ -622,19 +622,19 @@ void SVGStylableImpl::setColor(const TQString &param, SVGColorImpl *svgColor)
 		TQString g = colors[1];
 		TQString b = colors[2].left((colors[2].length() - 1));
 
-		if(r.tqcontains("%"))
+		if(r.contains("%"))
 		{
 			r = r.left(r.length() - 1);
 			r = TQString::number(int((double(255 * r.toDouble()) / 100.0)));
 		}
 		
-		if(g.tqcontains("%"))
+		if(g.contains("%"))
 		{
 			g = g.left(g.length() - 1);
 			g = TQString::number(int((double(255 * g.toDouble()) / 100.0)));
 		}
 
-		if(b.tqcontains("%"))
+		if(b.contains("%"))
 		{
 			b = b.left(b.length() - 1);
 			b = TQString::number(int((double(255 * b.toDouble()) / 100.0)));
@@ -946,12 +946,12 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value &
 
 			// Hacks
 			// #1 Replace "'" characters by ""
-			param = param.tqreplace('\'', TQString());
+			param = param.replace('\'', TQString());
 			// #2 Replace "MS-Gothic" by "MS Gothic"
-			param = param.tqreplace("MS-Gothic", "MS Gothic");
+			param = param.replace("MS-Gothic", "MS Gothic");
 			// #3 Replace "Helvetica" by "Arial"
-			param = param.tqreplace("Helvetica", "Arial");
-			param = param.tqreplace("helvetica", "Arial");
+			param = param.replace("Helvetica", "Arial");
+			param = param.replace("helvetica", "Arial");
 
 			if(!m_fontFamily)
 			{
diff --git a/ksvg/impl/SVGTextElementImpl.cc b/ksvg/impl/SVGTextElementImpl.cc
index 7603c622..82a53ea9 100644
--- a/ksvg/impl/SVGTextElementImpl.cc
+++ b/ksvg/impl/SVGTextElementImpl.cc
@@ -111,7 +111,7 @@ bool SVGTextElementImpl::prepareMouseEvent(const TQPoint &p, const TQPoint &, SV
 
 	if(test)
 	{
-		if(m_item->bbox().tqcontains(p))
+		if(m_item->bbox().contains(p))
 		{
 			mev->setTarget(dynamic_cast<SVGElementImpl *>(this));
 			return true;
diff --git a/ksvg/impl/SVGTimeScheduler.cc b/ksvg/impl/SVGTimeScheduler.cc
index d2a10e5a..29862959 100644
--- a/ksvg/impl/SVGTimeScheduler.cc
+++ b/ksvg/impl/SVGTimeScheduler.cc
@@ -92,7 +92,7 @@ void SVGTimer::notifyAll()
 			animation->handleTimerEvent();
 
 			SVGElementImpl *target = animation->targetElement();
-			if(!elements.tqcontains(target))
+			if(!elements.contains(target))
 				elements.append(target);
 		}
 	}
diff --git a/ksvg/impl/SVGURIReferenceImpl.cc b/ksvg/impl/SVGURIReferenceImpl.cc
index 52db7a86..8a6fda76 100644
--- a/ksvg/impl/SVGURIReferenceImpl.cc
+++ b/ksvg/impl/SVGURIReferenceImpl.cc
@@ -50,7 +50,7 @@ SVGAnimatedStringImpl *SVGURIReferenceImpl::href() const
 
 bool SVGURIReferenceImpl::parseURIReference(const TQString &urireference, TQString &uri, TQString &elementreference)
 {
-	int seperator = urireference.tqfind("#");
+	int seperator = urireference.find("#");
 
 	if(seperator == -1)
 		return false;
@@ -71,14 +71,14 @@ TQString SVGURIReferenceImpl::getTarget(const TQString &url)
 {
 	if(url.startsWith("url(")) // URI References, ie. fill:url(#target)
 	{
-		unsigned int start = url.tqfind("#") + 1;
-		unsigned int end = url.tqfindRev(")");
+		unsigned int start = url.find("#") + 1;
+		unsigned int end = url.findRev(")");
 
 		return url.mid(start, end - start);
 	}
-	else if(url.tqfind("#") > -1)	// format is #target
+	else if(url.find("#") > -1)	// format is #target
 	{
-		unsigned int start = url.tqfind("#") + 1;
+		unsigned int start = url.find("#") + 1;
 
 		return url.mid(start, url.length() - start);
 	}
diff --git a/ksvg/impl/SVGUnitConverter.h b/ksvg/impl/SVGUnitConverter.h
index db85c42d..cb8bac04 100644
--- a/ksvg/impl/SVGUnitConverter.h
+++ b/ksvg/impl/SVGUnitConverter.h
@@ -48,7 +48,7 @@ public:
 
 	void modify(SVGAnimatedLengthImpl *obj, const TQString &value)
 	{
-		UnitData *data = m_dict.tqfind(obj);
+		UnitData *data = m_dict.find(obj);
 
 		if(data)
 			data->valueAsString = value;
diff --git a/ksvg/impl/libs/libtext2path/libtext2path.spec b/ksvg/impl/libs/libtext2path/libtext2path.spec
index 208de711..e0c217bd 100644
--- a/ksvg/impl/libs/libtext2path/libtext2path.spec
+++ b/ksvg/impl/libs/libtext2path/libtext2path.spec
@@ -31,8 +31,8 @@ make -j
 make install-strip DESTDIR=$RPM_BUILD_ROOT
 
 cd 
-tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > /%{name}-master.list
-tqfind . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list
+find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > /%{name}-master.list
+find . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list
 
 %clean
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
diff --git a/ksvg/impl/libs/libtext2path/src/Cache.h b/ksvg/impl/libs/libtext2path/src/Cache.h
index 51d09f45..a85fdf92 100644
--- a/ksvg/impl/libs/libtext2path/src/Cache.h
+++ b/ksvg/impl/libs/libtext2path/src/Cache.h
@@ -118,7 +118,7 @@ namespace T2P
 		}
 		
 		// Lookup entry
-		SharedT tqfind(const std::string &key)
+		SharedT find(const std::string &key)
 		{
 			for(typename std::vector<SharedT>::const_iterator it = m_entries.begin(); it != m_entries.end(); ++it)
 			{
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp
index 2085e003..11de3177 100644
--- a/ksvg/impl/libs/libtext2path/src/Converter.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp
@@ -90,7 +90,7 @@ void Converter::setKerning(bool mode)
 SharedFont Converter::requestFont(const FontVisualParams *params)
 {
 	std::string cacheKey = cacheFontKey(params);
-	SharedFont cached = m_fontCache.tqfind(cacheKey);
+	SharedFont cached = m_fontCache.find(cacheKey);
 
 	// If not available in cache, create new one and cache it :)
 	if(cached)
@@ -122,7 +122,7 @@ GlyphAffinePair *Converter::requestGlyph(GlyphRenderParams *params, Rectangle &b
 	// 	  needed to generate the cache lookup key
 	selectGlyph(params);
 
-	SharedGlyph cached = m_glyphCache.tqfind(cacheGlyphKey(params));
+	SharedGlyph cached = m_glyphCache.find(cacheGlyphKey(params));
 
 	// If not available in cache, render new one and cache it :)
 	// If we're mixing ie. japanese and latin characters (TTB tqlayout),
diff --git a/ksvg/impl/svgpathparser.cc b/ksvg/impl/svgpathparser.cc
index e072b715..590ac2ba 100644
--- a/ksvg/impl/svgpathparser.cc
+++ b/ksvg/impl/svgpathparser.cc
@@ -100,7 +100,7 @@ SVGPathParser::parseSVG( const TQString &s, bool process )
 	if(!s.isEmpty())
 	{
 		TQString d = s;
-		d = d.tqreplace(',', ' ');
+		d = d.replace(',', ' ');
 		d = d.simplifyWhiteSpace();
 		const char *ptr = d.latin1();
 		const char *end = d.latin1() + d.length() + 1;
diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
index 83b62fb4..c9042b56 100644
--- a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
+++ b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
@@ -1064,29 +1064,29 @@ void LibartPath::init(const SVGMatrixImpl *screenCTM)
 		double cury = m_array[index - 1].y3;
 
 		// Find last subpath
-		int tqfind = -1;
+		int find = -1;
 		for(int i = index - 1; i >= 0; i--)
 		{
 			if(m_array[i].code == ART_MOVETO_OPEN || m_array[i].code == ART_MOVETO)
 			{
-				tqfind = i;
+				find = i;
 				break;
 			}
 		}
 
 		// Fix a problem where the .svg file used floats as values... (sofico.svg)
-		if(curx != m_array[tqfind].x3 && cury != m_array[tqfind].y3)
+		if(curx != m_array[find].x3 && cury != m_array[find].y3)
 		{
-			if((int) curx == (int) m_array[tqfind].x3 && (int) cury == (int) m_array[tqfind].y3)
+			if((int) curx == (int) m_array[find].x3 && (int) cury == (int) m_array[find].y3)
 			{
 				ensureSpace(m_array, index)
 
 				m_array[index].code = ART_LINETO;
-				m_array[index].x3 = m_array[tqfind].x3;
-				m_array[index].y3 = m_array[tqfind].y3;
+				m_array[index].x3 = m_array[find].x3;
+				m_array[index].y3 = m_array[find].y3;
 
-				curx = m_array[tqfind].x3;
-				cury = m_array[tqfind].y3;
+				curx = m_array[find].x3;
+				cury = m_array[find].y3;
 
 				index++;
 			}
@@ -1095,16 +1095,16 @@ void LibartPath::init(const SVGMatrixImpl *screenCTM)
 		// handle filled paths that are not closed explicitly
 		if(m_path->getFillColor()->paintType() != SVG_PAINTTYPE_NONE)
 		{
-			if((int) curx != (int) m_array[tqfind].x3 || (int) cury != (int) m_array[tqfind].y3)
+			if((int) curx != (int) m_array[find].x3 || (int) cury != (int) m_array[find].y3)
 			{
 				ensureSpace(m_array, index)
 
 				m_array[index].code = (ArtPathcode)ART_END2;
-				m_array[index].x3 = m_array[tqfind].x3;
-				m_array[index].y3 = m_array[tqfind].y3;
+				m_array[index].x3 = m_array[find].x3;
+				m_array[index].y3 = m_array[find].y3;
 
-				curx = m_array[tqfind].x3;
-				cury = m_array[tqfind].y3;
+				curx = m_array[find].x3;
+				cury = m_array[find].y3;
 
 				index++;
 			}
@@ -1147,12 +1147,12 @@ void LibartPath::svgMoveTo(double x1, double y1, bool closed, bool)
 	if(index > 0 && !closed)
 	{
 		// Find last subpath
-		int tqfind = -1;
+		int find = -1;
 		for(int i = index - 1; i >= 0; i--)
 		{
 			if(m_array[i].code == ART_MOVETO_OPEN || m_array[i].code == ART_MOVETO)
 			{
-				tqfind = i;
+				find = i;
 				break;
 			}
 		}
@@ -1160,8 +1160,8 @@ void LibartPath::svgMoveTo(double x1, double y1, bool closed, bool)
 		ensureSpace(m_array, index)
 
 		m_array[index].code = (ArtPathcode) ART_END2;
-		m_array[index].x3 = m_array[tqfind].x3;
-		m_array[index].y3 = m_array[tqfind].y3;
+		m_array[index].x3 = m_array[find].x3;
+		m_array[index].y3 = m_array[find].y3;
 
 		index++;
 	}
@@ -1205,25 +1205,25 @@ void LibartPath::svgClosePath()
 	double curx = m_array[index - 1].x3;
 	double cury = m_array[index - 1].y3;
 
-	int tqfind = -1;
+	int find = -1;
 	for(int i = index - 1; i >= 0; i--)
 	{
 		if(m_array[i].code == ART_MOVETO_OPEN || m_array[i].code == ART_MOVETO)
 		{
-			tqfind = i;
+			find = i;
 			break;
 		}
 	}
 
-	if(tqfind != -1)
+	if(find != -1)
 	{
-		if(m_array[tqfind].x3 != curx || m_array[tqfind].y3 != cury)
+		if(m_array[find].x3 != curx || m_array[find].y3 != cury)
 		{
 			ensureSpace(m_array, index)
 
 			m_array[index].code = ART_LINETO;
-			m_array[index].x3 = m_array[tqfind].x3;
-			m_array[index].y3 = m_array[tqfind].y3;
+			m_array[index].x3 = m_array[find].x3;
+			m_array[index].y3 = m_array[find].y3;
 		}
 	}
 }
@@ -1505,10 +1505,10 @@ void LibartText::update(CanvasItemUpdate reason, int param1, int param2)
 			bool strokeOk = stroke && stroke->svp && text->isStroked() && text->getStrokeWidth()->baseVal()->value() > 0; // Spec: A zero value causes no stroke to be painted.
 			if(fillOk || strokeOk)
 			{
-				if(m_fillPainters.tqfind(text))
+				if(m_fillPainters.find(text))
 					m_fillPainters[text]->update(text);
 
-				if(m_strokePainters.tqfind(text))
+				if(m_strokePainters.find(text))
 					m_strokePainters[text]->update(text);
 			}
 			fill = ++it1;
@@ -1574,10 +1574,10 @@ void LibartText::draw()
 
 		if(fillOk || strokeOk)
 		{
-			if(fillOk && m_fillPainters.tqfind(text))
+			if(fillOk && m_fillPainters.find(text))
 				m_fillPainters[text]->draw(m_canvas, fill->svp, text, text);
 
-			if(strokeOk && m_strokePainters.tqfind(text))
+			if(strokeOk && m_strokePainters.find(text))
 				m_strokePainters[text]->draw(m_canvas, stroke->svp, text, text);
 		}
 		fill = ++it1;
@@ -1655,11 +1655,11 @@ void LibartText::renderCallback(SVGTextContentElementImpl *element, const SVGMat
 		m_drawFillItems.append(fillElement);
 		m_drawStrokeItems.append(strokeElement);
 
-		if(!m_fillPainters.tqfind(element) && element->isFilled())
+		if(!m_fillPainters.find(element) && element->isFilled())
 			m_fillPainters.insert(element, new LibartFillPainter(element));
 
 		// Spec: A zero value causes no stroke to be painted.
-		if(!m_strokePainters.tqfind(element) && element->isStroked() && element->getStrokeWidth()->baseVal()->value() > 0)
+		if(!m_strokePainters.find(element) && element->isStroked() && element->getStrokeWidth()->baseVal()->value() > 0)
 			m_strokePainters.insert(element, new LibartStrokePainter(element));
 	}
 }
@@ -1734,7 +1734,7 @@ void LibartText::addTextDecoration(SVGTextContentElementImpl *element, double x,
 
 			m_drawFillItems.append(fillElement);
 
-			if(!m_fillPainters.tqfind(element) && element->isFilled())
+			if(!m_fillPainters.find(element) && element->isFilled())
 				m_fillPainters.insert(element, new LibartFillPainter(element));
 
 			art_svp_free(temp);
@@ -1752,7 +1752,7 @@ void LibartText::addTextDecoration(SVGTextContentElementImpl *element, double x,
 			m_drawStrokeItems.append(strokeElement);
 
 			// Spec: A zero value causes no stroke to be painted.
-			if(!m_strokePainters.tqfind(element) && element->isStroked() && element->getStrokeWidth()->baseVal()->value() > 0)
+			if(!m_strokePainters.find(element) && element->isStroked() && element->getStrokeWidth()->baseVal()->value() > 0)
 				m_strokePainters.insert(element, new LibartStrokePainter(element));
 		}
 		art_free(vec);
diff --git a/ksvg/scripts/check_hashtablesize.pl b/ksvg/scripts/check_hashtablesize.pl
index b1fd103a..d22e3f30 100755
--- a/ksvg/scripts/check_hashtablesize.pl
+++ b/ksvg/scripts/check_hashtablesize.pl
@@ -88,9 +88,9 @@ my %counter2;
 my %counter3;
 
 # Read hashtable size
-my $readSize1 = `tqfind -type f | xargs grep -I DontDelete | grep -v KSVG:: | grep Function`;
-my $readSize2 = `tqfind -type f | xargs grep -I DontDelete | grep -v KSVG:: | grep -v Function`;
-my $readSize3 = `tqfind -type f | xargs grep -I DontDelete | grep KSVG::`;
+my $readSize1 = `find -type f | xargs grep -I DontDelete | grep -v KSVG:: | grep Function`;
+my $readSize2 = `find -type f | xargs grep -I DontDelete | grep -v KSVG:: | grep -v Function`;
+my $readSize3 = `find -type f | xargs grep -I DontDelete | grep KSVG::`;
 
 my @result1 = split(/.\//, $readSize1);
 my @result2 = split(/.\//, $readSize2);
@@ -100,9 +100,9 @@ my @result3 = split(/.\//, $readSize3);
 # calcSize1 = print out all prototype hashtables
 # calcSize2 = print out all non-prototype hashtables
 # calcSize3 = print out all svg*constructors hashtables
-my $calcSize1 = `tqfind -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep -v Constructor | grep -v Impl:: | grep -v Bridge::`;
-my $calcSize2 = `tqfind -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep -v Constructor | grep -v Proto::`;
-my $calcSize3 = `tqfind -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep Constructor`;
+my $calcSize1 = `find -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep -v Constructor | grep -v Impl:: | grep -v Bridge::`;
+my $calcSize2 = `find -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep -v Constructor | grep -v Proto::`;
+my $calcSize3 = `find -type f | xargs grep -I s_hashTable | grep \@begin | grep -v generateddata | grep Constructor`;
 
 # Bring in suitable form
 calcSize($calcSize1, \%counter1, 5);
diff --git a/ksvg/scripts/generate.pl b/ksvg/scripts/generate.pl
index 0ef0ddc6..a9419dcc 100755
--- a/ksvg/scripts/generate.pl
+++ b/ksvg/scripts/generate.pl
@@ -26,7 +26,7 @@ my %excludes = (
 # List headers, and exclude the ones listed above
 my @headers = ();
 my $incdir=$here;
-opendir (INCS, $incdir) or die "Couldn't tqfind $incdir";
+opendir (INCS, $incdir) or die "Couldn't find $incdir";
 foreach $filename (readdir(INCS)) {
     $entry = $incdir."/".$filename;
     if ( ( -e $entry or -l $entry )         # A real file or a symlink
diff --git a/kuickshow/kuickshow.spec b/kuickshow/kuickshow.spec
index ca157837..0fcba9ea 100644
--- a/kuickshow/kuickshow.spec
+++ b/kuickshow/kuickshow.spec
@@ -55,11 +55,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 cd $RPM_BUILD_ROOT
  
-tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
+find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
  
-tqfind . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
+find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
  
-tqfind . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
+find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
index f65b522b..94431005 100644
--- a/kuickshow/src/aboutwidget.cpp
+++ b/kuickshow/src/aboutwidget.cpp
@@ -84,7 +84,7 @@ bool AboutWidget::eventFilter( TQObject *o, TQEvent *e )
 {
     if ( e->type() == TQEvent::MouseButtonPress ) {
         TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
-        if ( !m_homepage->tqgeometry().tqcontains( ev->pos() ) ) {
+        if ( !m_homepage->tqgeometry().contains( ev->pos() ) ) {
             deleteLater();
             return true;
         }
diff --git a/kuickshow/src/filecache.cpp b/kuickshow/src/filecache.cpp
index 54403639..d68bc897 100644
--- a/kuickshow/src/filecache.cpp
+++ b/kuickshow/src/filecache.cpp
@@ -42,7 +42,7 @@ FileCache * FileCache::self()
 KuickFile * FileCache::getFile( const KURL& url )
 {
     TQString urlString = url.prettyURL();
-    KuickFile *file = m_files.tqfind( urlString );
+    KuickFile *file = m_files.find( urlString );
     if ( !file ) {
         file = new KuickFile( url );
         m_files.insert( urlString, file );
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
index 18284891..0f1068fd 100644
--- a/kuickshow/src/filewidget.cpp
+++ b/kuickshow/src/filewidget.cpp
@@ -99,7 +99,7 @@ void FileWidget::initActions()
 
     TQPopupMenu *pMenu = menu->popupMenu();
     int lastItemId = pMenu->idAt( pMenu->count() - 1 );
-    TQMenuItem *mItem = pMenu->tqfindItem( lastItemId );
+    TQMenuItem *mItem = pMenu->findItem( lastItemId );
     if ( mItem && !mItem->isSeparator() )
         menu->insert( sep );
 
@@ -152,7 +152,7 @@ void FileWidget::activatedMenu( const KFileItem *item, const TQPoint& pos )
 void FileWidget::findCompletion( const TQString& text )
 {
     if ( text.at(0) == '/' || text.at(0) == '~' ||
-	 text.tqfind('/') != -1 ) {
+	 text.find('/') != -1 ) {
 	TQString t = m_fileFinder->completion()->makeCompletion( text );
 
 	if (m_fileFinder->completionMode() == KGlobalSettings::CompletionPopup ||
@@ -399,7 +399,7 @@ void FileWidget::slotReturnPressed( const TQString& t )
 	setURL( url, true );
     }
 
-    else if ( text.tqfind('/') != (int) text.length() -1 ) { // relative path
+    else if ( text.find('/') != (int) text.length() -1 ) { // relative path
 	TQString dir = m_fileFinder->completion()->replacedPath( text );
 	KURL u( url(), dir );
 	setURL( u, true );
diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp
index 24d6fe4f..14964b36 100644
--- a/kuickshow/src/imlibwidget.cpp
+++ b/kuickshow/src/imlibwidget.cpp
@@ -602,7 +602,7 @@ KuickImage * ImageCache::getKuimage( KuickFile * file,
     	return 0L;
 
     KuickImage *kuim = 0L;
-    int index = fileList.tqfindIndex( file );
+    int index = fileList.findIndex( file );
     if ( index != -1 ) {
         if ( index == 0 )
             kuim = kuickList.at( 0 );
diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
index 648cf6a6..9aead634 100644
--- a/kuickshow/src/kuickfile.cpp
+++ b/kuickshow/src/kuickfile.cpp
@@ -67,7 +67,7 @@ bool KuickFile::download()
 
     TQString ext;
     TQString fileName = m_url.fileName();
-    int extIndex = fileName.tqfindRev('.');
+    int extIndex = fileName.findRev('.');
     if ( extIndex > 0 )
         ext = fileName.mid( extIndex + 1 );
 
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 7186db09..f1548119 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -319,7 +319,7 @@ void KuickShow::initGUI( const KURL& startDir )
     TQPopupMenu *mainPopup = mainActionMenu->popupMenu();
     int sortingIndex = mainPopup->indexOf( sortingMenu->itemId( 0 ) );
     int separatorId = mainPopup->idAt( sortingIndex + 1 );
-    TQMenuItem *separatorItem = mainPopup->tqfindItem( separatorId );
+    TQMenuItem *separatorItem = mainPopup->findItem( separatorId );
     if ( separatorItem && separatorItem->isSeparator() )
         mainPopup->removeItem( separatorId );
     mainActionMenu->remove( sortingMenu );
diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp
index b2a4de64..b77696d8 100644
--- a/kuickshow/src/printing.cpp
+++ b/kuickshow/src/printing.cpp
@@ -183,7 +183,7 @@ TQString Printing::minimizeString( TQString text, const TQFontMetrics&
         if ( mid <= 5 ) // sanity check
             return TQString();
 
-        text.tqreplace( mid - 1, 3, "..." );
+        text.replace( mid - 1, 3, "..." );
     }
 
     return text;
diff --git a/kview/kview.cpp b/kview/kview.cpp
index f30d5c3c..aca76bd4 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -499,9 +499,9 @@ void KView::setupActions( TQObject * partobject )
 	if( extension )
 	{
 		TQStrList slotNames = extension->tqmetaObject()->slotNames();
-		if( slotNames.tqcontains( "print()" ) )
+		if( slotNames.contains( "print()" ) )
 			KStdAction::print( extension, TQT_SLOT( print() ), actionCollection(), "print" );
-		if( slotNames.tqcontains( "del()" ) )
+		if( slotNames.contains( "del()" ) )
 			( void )new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete,
 								 extension, TQT_SLOT( del() ), actionCollection(), "del" );
 		connect( extension, TQT_SIGNAL( enableAction( const char *, bool ) ), TQT_SLOT( enableAction( const char *, bool ) ) );
diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp
index a26a061f..1bf3df98 100644
--- a/kview/kviewcanvas/kimageholder.cpp
+++ b/kview/kviewcanvas/kimageholder.cpp
@@ -83,7 +83,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev )
 void KImageHolder::mouseMoveEvent( TQMouseEvent *ev )
 {
 	//FIXME: when scrolling the cursorpos shouldn't change
-	if( TQT_TQRECT_OBJECT(this->rect()).tqcontains( ev->pos(), false ) )
+	if( TQT_TQRECT_OBJECT(this->rect()).contains( ev->pos(), false ) )
 		emit cursorPos( ev->pos() );
 	//kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl;
 	if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton )
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index eb4adb13..d4d2cda6 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -259,7 +259,7 @@ bool KViewViewer::openURL( const KURL & url )
 		// Use same extension as remote file. This is important for mimetype-determination (e.g. koffice)
 		TQString extension;
 		TQString fileName = url.fileName();
-		int extensionPos = fileName.tqfindRev( '.' );
+		int extensionPos = fileName.findRev( '.' );
 		if ( extensionPos != -1 )
 			extension = fileName.mid( extensionPos ); // keep the '.'
 		delete m_pTempFile;
@@ -645,7 +645,7 @@ void KViewViewer::setZoom( const TQString & newZoom )
 	kdDebug( 4610 ) << k_funcinfo << newZoom << endl;
 	double zoom;
 	TQString z = newZoom;
-	z.remove( z.tqfind( '%' ), 1 );
+	z.remove( z.find( '%' ), 1 );
 	if( newZoom == "33%" )
 		zoom = 1.0 / 3.0;
 	else
@@ -667,14 +667,14 @@ void KViewViewer::updateZoomMenu( double zoom )
 		TQStringList itemsList = m_paZoom->items();
 		for( TQStringList::Iterator it = itemsList.begin(); it != itemsList.end(); ++it )
 		{
-			z = ( *it ).tqreplace( TQRegExp( "%" ), "" );
+			z = ( *it ).replace( TQRegExp( "%" ), "" );
 			z = z.simplifyWhiteSpace();
 			val = z.toInt( &ok );
-			if( ok && val > 0 && list.tqcontains( val ) == 0 )
+			if( ok && val > 0 && list.contains( val ) == 0 )
 				list << val;
 		}
 		val = TQString::number( zoom * 100, 'f', 0 ).toInt(); // round/lround from math.h doesn't work - dunno
-		if( list.tqcontains( val ) == 0 )
+		if( list.contains( val ) == 0 )
 			list.append( val );
 
 		qHeapSort( list );
@@ -687,7 +687,7 @@ void KViewViewer::updateZoomMenu( double zoom )
 	// first look if it's a new value (not in the list yet)
 	TQString z = TQString( "%1%" ).tqarg( zoom * 100, 0, 'f', 0 );
 	TQStringList items = m_paZoom->items();
-	int idx = items.tqfindIndex( z );
+	int idx = items.findIndex( z );
 	if( -1 == idx )
 	{
 		// not found XXX: remove when done
diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp
index ef4d091a..7e52732b 100644
--- a/kview/modules/browser/kviewbrowser.cpp
+++ b/kview/modules/browser/kviewbrowser.cpp
@@ -163,7 +163,7 @@ void KViewBrowser::setupDirLister()
 	{
 		TQApplication::setOverrideCursor( WaitCursor );
 		TQString url = m_pViewer->url().prettyURL();
-		int pos = url.tqfindRev( "/" );
+		int pos = url.findRev( "/" );
 		url = url.left( (unsigned int)pos );
 		kdDebug( 4630 ) << "open KDirLister for " << url << endl;
 		m_pDirLister->openURL( KURL( url ));
diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp
index b31c65b2..870987be 100644
--- a/kview/modules/presenter/imagelistitem.cpp
+++ b/kview/modules/presenter/imagelistitem.cpp
@@ -41,7 +41,7 @@ ImageListItem::ImageListItem( KListView * tqparent, const KURL & url )
 		/*
 		TQString extension;
 		TQString fileName = m_url.fileName();
-		int extensionPos = fileName.tqfindRev( '.' );
+		int extensionPos = fileName.findRev( '.' );
 		if ( extensionPos != -1 )
 			extension = fileName.mid( extensionPos ); // keep the '.'
 		delete m_pTempFile;
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index 6b08593c..4f5eeb10 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -191,7 +191,7 @@ bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev )
 					for( TQStringList::const_iterator it = l.begin(); it != l.end(); ++it )
 					{
 						ImageInfo * info = new ImageInfo( KURL( *it ) );
-						if( ! m_imagelist.tqcontains( info ) )
+						if( ! m_imagelist.contains( info ) )
 						{
 							m_imagelist.inSort( info );
 							( void )new ImageListItem( m_pImageList->m_pListView, KURL( *it ) );
@@ -218,7 +218,7 @@ void KViewPresenter::slotImageOpened( const KURL & url )
 	{
 		kdDebug( 4630 ) << k_funcinfo << "imagelist:" << endl;
 		ImageInfo * info = new ImageInfo( url );
-		if( ! m_imagelist.tqcontains( info ) )
+		if( ! m_imagelist.contains( info ) )
 		{
 			m_imagelist.inSort( info );
 			TQListViewItem * item = new ImageListItem( m_pImageList->m_pListView, url );
@@ -248,7 +248,7 @@ void KViewPresenter::slotOpenFiles()
 	for( ++it; it != urls.end(); ++it )
 	{
 		ImageInfo * info = new ImageInfo( *it );
-		if( ! m_imagelist.tqcontains( info ) )
+		if( ! m_imagelist.contains( info ) )
 		{
 			m_imagelist.inSort( info );
 			( void )new ImageListItem( m_pImageList->m_pListView, *it );
@@ -431,7 +431,7 @@ void KViewPresenter::loadList()
 			{
 				KURL url ( t.readLine() );
 				ImageInfo * info = new ImageInfo( url );
-				if( ! m_imagelist.tqcontains( info ) )
+				if( ! m_imagelist.contains( info ) )
 				{
 					m_imagelist.inSort( info );
 					( void )new ImageListItem( m_pImageList->m_pListView, url );
diff --git a/kviewshell/anchor.h b/kviewshell/anchor.h
index cee42b31..f3faf13e 100644
--- a/kviewshell/anchor.h
+++ b/kviewshell/anchor.h
@@ -20,7 +20,7 @@
 This very simple class contains a page number and a vertical position
 in physical coordiantes. The vertical position is given by the
 distance from the top of the page. Anchors are completely independent
-of documents, there is no need for a document to exists that tqcontains
+of documents, there is no need for a document to exists that contains
 the given page, nor does the page number need to be valid.
 
 @author Stefan Kebekus <[email protected]>
diff --git a/kviewshell/documentPageCache.cpp b/kviewshell/documentPageCache.cpp
index 9fd55d59..addaa706 100644
--- a/kviewshell/documentPageCache.cpp
+++ b/kviewshell/documentPageCache.cpp
@@ -119,7 +119,7 @@ bool DocumentPageCache::isPageCached(const PageNumber& pageNumber, const TQSize&
 
   // Check if the page that we are looking for is in the cache.
   // We are not accessing the page, so we don't want it to be moved into the front.
-  RenderedDocumentPagePixmap* page = LRUCache.tqfind(key, false);
+  RenderedDocumentPagePixmap* page = LRUCache.find(key, false);
 
   if (page)
     return true;
@@ -191,7 +191,7 @@ RenderedDocumentPagePixmap* DocumentPageCache::getPage(const PageNumber& pageNr)
 
   // First check if the page that we are looking for is in the cache
   RenderedDocumentPagePixmap* page;
-  page = LRUCache.tqfind(createKey(pageNr));
+  page = LRUCache.find(createKey(pageNr));
 
   if (page)
     return page;
diff --git a/kviewshell/documentRenderer.cpp b/kviewshell/documentRenderer.cpp
index c02c3e09..34bf59ac 100644
--- a/kviewshell/documentRenderer.cpp
+++ b/kviewshell/documentRenderer.cpp
@@ -122,7 +122,7 @@ Anchor DocumentRenderer::findAnchor(const TQString &locallink)
   // Wait for all access to this DocumentRenderer to finish
   TQMutexLocker locker(&mutex);
 
-  TQMap<TQString,Anchor>::Iterator it = anchorList.tqfind(locallink);
+  TQMap<TQString,Anchor>::Iterator it = anchorList.find(locallink);
   if (it != anchorList.end()) 
     return *it;
   else 
diff --git a/kviewshell/documentRenderer.h b/kviewshell/documentRenderer.h
index a49b1ba7..69ec87cb 100644
--- a/kviewshell/documentRenderer.h
+++ b/kviewshell/documentRenderer.h
@@ -152,7 +152,7 @@ public:
   virtual void clear();
 
 
-  /* Returns true if the current document tqcontains 0 pages. */
+  /* Returns true if the current document contains 0 pages. */
   bool isEmpty() const {return numPages == 0;}
 
   /* Tells if the document was modified after is was loaded. */
@@ -262,7 +262,7 @@ public:
   display device. In principle. In fact, kviewshell implements zooming
   by using values that are not exactly the resolution of the display,
   but multiplied with the zoom factor. Bottom line: the
-  DocumentRenderer should act as if this field indeed tqcontains
+  DocumentRenderer should act as if this field indeed contains
   resolution of the display device.
 
   @param page pointer to a documentPage structure that this method
diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp
index 07897488..875a70dc 100644
--- a/kviewshell/documentWidget.cpp
+++ b/kviewshell/documentWidget.cpp
@@ -452,7 +452,7 @@ void DocumentWidget::mousePressEvent ( TQMouseEvent * e )
   if (e->button() == Qt::LeftButton) {
     if (pageData->hyperLinkList.size() > 0)
       for(unsigned int i = 0; i < pageData->hyperLinkList.size(); i++) {
-        if (pageData->hyperLinkList[i].box.tqcontains(e->pos())) {
+        if (pageData->hyperLinkList[i].box.contains(e->pos())) {
           emit(localLink(pageData->hyperLinkList[i].linkText));
           return;
         }
@@ -537,7 +537,7 @@ void DocumentWidget::mouseMoveEvent ( TQMouseEvent * e )
     int lastUnderlinedLink = indexOfUnderlinedLink;
     // go through hyperlinks
     for(unsigned int i = 0; i < pageData->hyperLinkList.size(); i++) {
-      if (pageData->hyperLinkList[i].box.tqcontains(e->pos())) {
+      if (pageData->hyperLinkList[i].box.contains(e->pos())) {
         clearStatusBarTimer.stop();
         setCursor(pointingHandCursor);
         TQString link = pageData->hyperLinkList[i].linkText;
diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp
index 36be452c..3ba3fa84 100644
--- a/kviewshell/kmultipage.cpp
+++ b/kviewshell/kmultipage.cpp
@@ -146,7 +146,7 @@ void KMultiPage::slotSave()
   // Try to guess the proper ending...
   TQString formats;
   TQString ending;
-  int rindex = m_file.tqfindRev(".");
+  int rindex = m_file.findRev(".");
   if (rindex == -1) {
     ending = TQString();
     formats = TQString();
@@ -162,7 +162,7 @@ void KMultiPage::slotSave()
 
   // Add the ending to the filename. I hope the user likes it that
   // way.
-  if (!ending.isEmpty() && fileName.tqfind(ending) == -1)
+  if (!ending.isEmpty() && fileName.find(ending) == -1)
     fileName = fileName+ending;
 
   if (TQFile(fileName).exists()) {
@@ -1461,7 +1461,7 @@ void KMultiPage::findNextText()
     if (searchPage->textBoxList.size() == 0)
       continue;
 
-    foundSelection = searchPage->tqfind(searchText, startingTextItem, case_sensitive);
+    foundSelection = searchPage->find(searchText, startingTextItem, case_sensitive);
 
     if (foundSelection.isEmpty())
     {
@@ -1603,7 +1603,7 @@ void KMultiPage::findPrevText()
     if (searchPage->textBoxList.size() == 0)
       continue;
 
-    foundSelection = searchPage->tqfindRev(searchText, startingTextItem, case_sensitive);
+    foundSelection = searchPage->findRev(searchText, startingTextItem, case_sensitive);
 
     if (foundSelection.isEmpty())
     {
@@ -1901,7 +1901,7 @@ void KMultiPage::doExportText()
 {
   // Generate a suggestion for a reasonable file name
   TQString suggestedName = url().filename();
-  suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".txt";
+  suggestedName = suggestedName.left(suggestedName.find(".")) + ".txt";
 
   TQString fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.txt|Plain Text (Latin 1) (*.txt)"), scrollView(), i18n("Export File As"));
 
diff --git a/kviewshell/kmultipage.h b/kviewshell/kmultipage.h
index 3414d10c..a470ab9d 100644
--- a/kviewshell/kmultipage.h
+++ b/kviewshell/kmultipage.h
@@ -92,7 +92,7 @@ public:
   should) therefore be re-implemented if you have good code to convert
   your document to PostScript.
 
-  Example: If your document consists of a single A4 page that tqcontains
+  Example: If your document consists of a single A4 page that contains
   a DJVU image of 30KB, then the default implementation would render
   the image in 600dpi, i.e. in about 7000x5000 pixel, and then send
   this huge graphics uncompressed to the printer. A smart
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index 115c0a50..a5766c42 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -173,7 +173,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *t
   exportTextAction = new KAction(i18n("Text..."), 0, this, TQT_SLOT(mp_exportText()), actionCollection(), "export_text");
 
   // edit menu
-  findTextAction = KStdAction::find(this, TQT_SLOT(mp_showFindTextDialog()), actionCollection(), "tqfind");
+  findTextAction = KStdAction::find(this, TQT_SLOT(mp_showFindTextDialog()), actionCollection(), "find");
   findNextAction = KStdAction::findNext(this, TQT_SLOT(mp_findNextText()), actionCollection(), "findnext");
   findNextAction->setEnabled(false);
   findPrevAction = KStdAction::findPrev(this, TQT_SLOT(mp_findPrevText()), actionCollection(), "findprev");
@@ -553,10 +553,10 @@ TQStringList KViewPart::fileFormats() const
 
   for(TQStringList::Iterator it = supportedPattern.begin(); it != supportedPattern.end(); ++it )
   {
-    if ((*it).tqfind(".gz", -3) == -1) // Paranoia safety check
+    if ((*it).find(".gz", -3) == -1) // Paranoia safety check
       compressedPattern.append(*it + ".gz");
 
-    if ((bzip2Available) && ((*it).tqfind(".bz2", -4) == -1)) // Paranoia safety check
+    if ((bzip2Available) && ((*it).find(".bz2", -4) == -1)) // Paranoia safety check
       compressedPattern.append(*it + ".bz2");
   }
 
@@ -613,7 +613,7 @@ bool KViewPart::openFile()
     for (TQStringList::Iterator it = supportedPatterns.begin(); it != supportedPatterns.end(); ++it)
     {
       // Only consider patterns starting with "*."
-      if ((*it).tqfind("*.") == 0)
+      if ((*it).find("*.") == 0)
       {
         // Remove first Letter from string
         endings.append((*it).mid(2).stripWhiteSpace());
@@ -1382,7 +1382,7 @@ void KViewPart::writeSettings()
 
 void KViewPart::connectNotify ( const char *sig )
 {
-  if (TQString(sig).tqcontains("pageChanged"))
+  if (TQString(sig).contains("pageChanged"))
     pageChangeIsConnected = true;
 }
 
diff --git a/kviewshell/main.cpp b/kviewshell/main.cpp
index 8c62efdd..ba7a72f1 100644
--- a/kviewshell/main.cpp
+++ b/kviewshell/main.cpp
@@ -107,7 +107,7 @@ int main(int argc, char **argv)
       QCStringList apps = app.dcopClient()->registeredApplications();
       for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it )
       {
-        if ((*it).tqfind("kviewshell") == 0) 
+        if ((*it).find("kviewshell") == 0) 
         {
           TQByteArray data, replyData;
           TQCString replyType;
diff --git a/kviewshell/pageSize.cpp b/kviewshell/pageSize.cpp
index a3e65459..f3419217 100644
--- a/kviewshell/pageSize.cpp
+++ b/kviewshell/pageSize.cpp
@@ -77,10 +77,10 @@ bool pageSize::setPageSize(const TQString& name)
     }
   }
 
-  // Check if the string tqcontains 'x'. If yes, we assume it is of type
+  // Check if the string contains 'x'. If yes, we assume it is of type
   // "<number>x<number>". If yes, the first number is interpreted as
   // the width in mm, the second as the height in mm
-  if (name.tqfind('x') >= 0) {
+  if (name.find('x') >= 0) {
     bool wok, hok;
     float pageWidth_tmp  = name.section('x',0,0).toFloat(&wok);
     float pageHeight_tmp = name.section('x',1,1).toFloat(&hok);
@@ -95,10 +95,10 @@ bool pageSize::setPageSize(const TQString& name)
     }
   }
   
-  // Check if the string tqcontains ','. If yes, we assume it is of type
+  // Check if the string contains ','. If yes, we assume it is of type
   // "<number><unit>,<number><uni>". The first number is supposed to
   // be the width, the second the height.
-  if (name.tqfind(',') >= 0) {
+  if (name.find(',') >= 0) {
     bool wok, hok;
     float pageWidth_tmp  = distance::convertToMM(name.section(',',0,0), &wok);
     float pageHeight_tmp = distance::convertToMM(name.section(',',1,1), &hok);
diff --git a/kviewshell/pageSize.h b/kviewshell/pageSize.h
index fe0f8c62..a1448225 100644
--- a/kviewshell/pageSize.h
+++ b/kviewshell/pageSize.h
@@ -65,7 +65,7 @@ public:
   call pageSizeNames() more than once, it is guaranteed that the
   same list of strings will be returned.
 
-  @returns TQStringList that tqcontains 
+  @returns TQStringList that contains 
   */
   TQStringList pageSizeNames();
   
diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index 90ec1969..eca33115 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -314,7 +314,7 @@ void DjVuMultiPage::slotSave()
   // Try to guess the proper ending...
   TQString formats;
   TQString ending;
-  int rindex = m_file.tqfindRev(".");
+  int rindex = m_file.findRev(".");
   if (rindex == -1) {
     ending = TQString();
     formats = TQString();
@@ -330,7 +330,7 @@ void DjVuMultiPage::slotSave()
 
   // Add the ending to the filename. I hope the user likes it that
   // way.
-  if (!ending.isEmpty() && fileName.tqfind(ending) == -1)
+  if (!ending.isEmpty() && fileName.find(ending) == -1)
     fileName = fileName+ending;
 
   if (TQFile(fileName).exists()) {
diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp
index 8084e327..a7af2ebf 100644
--- a/kviewshell/plugins/djvu/djvurenderer.cpp
+++ b/kviewshell/plugins/djvu/djvurenderer.cpp
@@ -361,7 +361,7 @@ void DjVuRenderer::getAnnotations(RenderedDocumentPage* page, GP<DjVuImage> djvu
       TQString comment((const char*)map[pos]->comment);
 
       // Create an anchor for this link.
-      if (!anchorList.tqcontains(url))
+      if (!anchorList.contains(url))
 	{
 	  // For now we only accept links to pages in the same document.
 	  if(url[0] == '#' && target == "_self")
diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.cpp b/kviewshell/plugins/djvu/libdjvu/Arrays.cpp
index 30038734..5cb7b04c 100644
--- a/kviewshell/plugins/djvu/libdjvu/Arrays.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/Arrays.cpp
@@ -190,7 +190,7 @@ ArrayRep::resize(int lo, int hi)
   init1(ndata, hibound+1-nminlo, hi-nminlo);
   destroy(data, lobound-minlo, hibound-minlo);
 
-  // free and tqreplace
+  // free and replace
   void *tmp=data;
   data = ndata;
   ndata=tmp;
diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.h b/kviewshell/plugins/djvu/libdjvu/Arrays.h
index c0bc75a3..b2676d5a 100644
--- a/kviewshell/plugins/djvu/libdjvu/Arrays.h
+++ b/kviewshell/plugins/djvu/libdjvu/Arrays.h
@@ -319,7 +319,7 @@ public:
    /** Erases the array contents. All elements in the array are destroyed.  
        The valid subscript range is set to the empty range. */
    void empty();
-   /** Extends the subscript range so that is tqcontains #n#.
+   /** Extends the subscript range so that is contains #n#.
        This function does nothing if #n# is already int the valid subscript range.
        If the valid range was empty, both the lower bound and the upper bound
        are set to #n#.  Otherwise the valid subscript range is extended
diff --git a/kviewshell/plugins/djvu/libdjvu/DataPool.cpp b/kviewshell/plugins/djvu/libdjvu/DataPool.cpp
index 176d3915..1190292e 100644
--- a/kviewshell/plugins/djvu/libdjvu/DataPool.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DataPool.cpp
@@ -187,7 +187,7 @@ DataPool::OpenFiles_File::add_pool(GP<DataPool> &pool)
    DEBUG_MSG("DataPool::OpenFiles_File::add_pool: pool=" << (void *) pool << "\n");
    DEBUG_MAKE_INDENT(3);
    GCriticalSectionLock lock(&pools_lock);
-   if (!pools_list.tqcontains(pool))
+   if (!pools_list.contains(pool))
      pools_list.append(pool);
    return pools_list.size();
 }
@@ -381,14 +381,14 @@ FCPools::add_pool(const GURL &url, GP<DataPool> pool)
    if (url.is_local_file_url())
    {
       GPList<DataPool> list;
-      GPosition pos(map.tqcontains(url));
+      GPosition pos(map.contains(url));
       if (! pos)
       {
         map[url]=list;
-        pos=map.tqcontains(url);
+        pos=map.contains(url);
       }
       GPList<DataPool> &plist=map[pos];
-      if (!plist.tqcontains(pool))
+      if (!plist.contains(pool))
         plist.append(pool);
    }
   clean();
@@ -403,7 +403,7 @@ FCPools::get_pool(const GURL &url, int start, int length)
   if (url.is_local_file_url())
   {
     GCriticalSectionLock lock(&map_lock);
-    GPosition pos(map.tqcontains(url));
+    GPosition pos(map.contains(url));
     if (pos)
     {
       GPList<DataPool> &plist=map[pos];
@@ -433,7 +433,7 @@ FCPools::del_pool(const GURL &url, GP<DataPool> pool)
    if (url.is_local_file_url())
    {
       GPosition pos;
-      if (map.tqcontains(url, pos))
+      if (map.contains(url, pos))
       {
 	 GPList<DataPool> &list=map[pos];
 	 GPosition list_pos;
@@ -458,7 +458,7 @@ FCPools::load_file(const GURL &url)
    if (url.is_local_file_url())
    {
       GPosition pos;
-      if (map.tqcontains(url, pos))
+      if (map.contains(url, pos))
       {
 	    // We make here a copy of the list because DataPool::load_file()
 	    // will call FCPools::del_pool(), which will modify the list
diff --git a/kviewshell/plugins/djvu/libdjvu/DataPool.h b/kviewshell/plugins/djvu/libdjvu/DataPool.h
index 4202ef7d..fb4bea4e 100644
--- a/kviewshell/plugins/djvu/libdjvu/DataPool.h
+++ b/kviewshell/plugins/djvu/libdjvu/DataPool.h
@@ -116,7 +116,7 @@ class ByteStream;
     Access to data in a #DataPool# may be direct (Using \Ref{get_data}()
     function) or sequential (See \Ref{get_stream}() function).
 
-    If the #DataPool# is not connected to anything, that is it tqcontains
+    If the #DataPool# is not connected to anything, that is it contains
     some real data, this data can be added to it by means of two
     \Ref{add_data}() functions. One of them adds data sequentially maintaining
     the offset of the last block of data added by it. The other can store
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp
index 2d8d2467..83f9df78 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir.cpp
@@ -363,7 +363,7 @@ DjVmDir::decode(const GP<ByteStream> &gstr)
       for(pos=files_list;pos;++pos)
       {
 	       GP<File> file=files_list[pos];
-	       if (name2file.tqcontains(file->name))
+	       if (name2file.contains(file->name))
 	          G_THROW( ERR_MSG("DjVmDir.dupl_name") "\t" + file->name );
 	       name2file[file->name]=file;
       }
@@ -372,7 +372,7 @@ DjVmDir::decode(const GP<ByteStream> &gstr)
       for(pos=files_list;pos;++pos)
       {
 	       GP<File> file=files_list[pos];
-	       if (id2file.tqcontains(file->id))
+	       if (id2file.contains(file->id))
 	          G_THROW( ERR_MSG("DjVmDir.dupl_id") "\t" + file->id);
 	       id2file[file->id]=file;
       }
@@ -383,7 +383,7 @@ DjVmDir::decode(const GP<ByteStream> &gstr)
 	       GP<File> file=files_list[pos];
 	       if (file->title.length())
 	       {
-	          if (title2file.tqcontains(file->title))
+	          if (title2file.contains(file->title))
 	             G_THROW( ERR_MSG("DjVmDir.dupl_title") "\t" + file->title);
 	          title2file[file->title]=file;
 	       }
@@ -542,7 +542,7 @@ DjVmDir::name_to_file(const GUTF8String & name) const
    GCriticalSectionLock lock((GCriticalSection *) &class_lock);
 
    GPosition pos;
-   return (name2file.tqcontains(name, pos))?name2file[pos]:(GP<DjVmDir::File>(0));
+   return (name2file.contains(name, pos))?name2file[pos]:(GP<DjVmDir::File>(0));
 }
 
 GP<DjVmDir::File>
@@ -551,7 +551,7 @@ DjVmDir::id_to_file(const GUTF8String &id) const
    GCriticalSectionLock lock((GCriticalSection *) &class_lock);
 
    GPosition pos;
-   return (id2file.tqcontains(id, pos))?id2file[pos]:(GP<DjVmDir::File>(0));
+   return (id2file.contains(id, pos))?id2file[pos]:(GP<DjVmDir::File>(0));
 }
 
 GP<DjVmDir::File>
@@ -560,7 +560,7 @@ DjVmDir::title_to_file(const GUTF8String &title) const
    GCriticalSectionLock lock((GCriticalSection *) &class_lock);
 
    GPosition pos;
-   return (title2file.tqcontains(title, pos))?title2file[pos]:(GP<DjVmDir::File>(0));
+   return (title2file.contains(title, pos))?title2file[pos]:(GP<DjVmDir::File>(0));
 }
 
 GPList<DjVmDir::File>
@@ -636,15 +636,15 @@ DjVmDir::insert_file(const GP<File> & file, int pos_num)
       // Modify maps
 //   if (! File::is_legal_id(file->id))
 //     G_THROW( ERR_MSG("DjVmDir.bad_file") "\t" + file->id);
-   if (id2file.tqcontains(file->id))
+   if (id2file.contains(file->id))
      G_THROW( ERR_MSG("DjVmDir.dupl_id2") "\t" + file->id);
-   if (name2file.tqcontains(file->name))
+   if (name2file.contains(file->name))
      G_THROW( ERR_MSG("DjVmDir.dupl_name2") "\t" + file->name);
    name2file[file->name]=file;
    id2file[file->id]=file;
    if (file->title.length())
      {
-       if (title2file.tqcontains(file->title))  // duplicate titles may become ok some day
+       if (title2file.contains(file->title))  // duplicate titles may become ok some day
          G_THROW( ERR_MSG("DjVmDir.dupl_title2") "\t" + file->title);
        title2file[file->title]=file;
      }
@@ -749,7 +749,7 @@ DjVmDir::set_file_name(const GUTF8String &id, const GUTF8String &name)
    }
 
       // Check if ID is valid
-   if (!id2file.tqcontains(id, pos))
+   if (!id2file.contains(id, pos))
       G_THROW( ERR_MSG("DjVmDir.no_info") "\t" + GUTF8String(id));
    GP<File> file=id2file[pos];
    name2file.del(file->name);
@@ -776,7 +776,7 @@ DjVmDir::set_file_title(const GUTF8String &id, const GUTF8String &title)
    }
 
       // Check if ID is valid
-   if (!id2file.tqcontains(id, pos))
+   if (!id2file.contains(id, pos))
       G_THROW( ERR_MSG("DjVmDir.no_info") "\t" + GUTF8String(id));
    GP<File> file=id2file[pos];
    title2file.del(file->title);
@@ -795,7 +795,7 @@ DjVmDir::resolve_duplicates(const bool save_as_bundled)
   for(pos=files_list;pos;++pos)
   {
     const GUTF8String save_name=files_list[pos]->check_save_name(save_as_bundled).downcase();
-    if(save_map.tqcontains(save_name))
+    if(save_map.contains(save_name))
     {
       conflicts[save_name].append(files_list[pos]);
     }else
@@ -813,7 +813,7 @@ DjVmDir::resolve_duplicates(const bool save_as_bundled)
     {
       GUTF8String new_name=cfiles[qpos]->get_load_name();
       if((new_name != GUTF8String(GNativeString(new_name)))
-        ||conflicts.tqcontains(new_name))
+        ||conflicts.contains(new_name))
       {
         do
         {
@@ -821,7 +821,7 @@ DjVmDir::resolve_duplicates(const bool save_as_bundled)
             ?(save_name+"-"+GUTF8String(count++))
             :(save_name.substr(0,dot)+"-"+GUTF8String(count++)+
               save_name.substr(dot,(unsigned int)(-1)));
-        } while(save_map.tqcontains(new_name.downcase()));
+        } while(save_map.contains(new_name.downcase()));
       }
       cfiles[qpos]->set_save_name(new_name);
       save_map[new_name]=0;
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp
index ca255ea5..62694098 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVmDir0.cpp
@@ -132,7 +132,7 @@ DjVmDir0::decode(ByteStream & bs)
 GP<DjVmDir0::FileRec>
 DjVmDir0::get_file(const GUTF8String &name)
 {
-   if (name2file.tqcontains(name))
+   if (name2file.contains(name))
      return name2file[name];
    return 0;
 }
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp
index b24b43b1..5b851d6e 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVmDoc.cpp
@@ -109,7 +109,7 @@ save_file(
           {
             incl_str.setat(incl_str.length()-1, 0);
           }
-          GPosition pos=incl.tqcontains(incl_str);
+          GPosition pos=incl.contains(incl_str);
           if(pos)
           { 
             iff_out.get_bytestream()->writestring(incl[pos]);
@@ -174,7 +174,7 @@ DjVmDoc::insert_file(const GP<DjVmDir::File> & f,
 
    if (!f)
      G_THROW( ERR_MSG("DjVmDoc.no_zero_file") );
-   if (data.tqcontains(f->get_load_name()))
+   if (data.contains(f->get_load_name()))
      G_THROW( ERR_MSG("DjVmDoc.no_duplicate") );
 
    char buffer[4];
@@ -224,7 +224,7 @@ DjVmDoc::delete_file(const GUTF8String &id)
    DEBUG_MSG("DjVmDoc::delete_file(): deleting file '" << id << "'\n");
    DEBUG_MAKE_INDENT(3);
    
-   if (!data.tqcontains(id))
+   if (!data.contains(id))
       G_THROW(GUTF8String( ERR_MSG("DjVmDoc.cant_delete") "\t") + id);
    
    data.del(id);
@@ -243,8 +243,8 @@ GP<DataPool>
 DjVmDoc::get_data(const GUTF8String &id) const
 {
   GPosition pos;
-  if (!data.tqcontains(id, pos))
-    G_THROW(GUTF8String( ERR_MSG("DjVmDoc.cant_tqfind") "\t") + id);
+  if (!data.contains(id, pos))
+    G_THROW(GUTF8String( ERR_MSG("DjVmDoc.cant_find") "\t") + id);
   const GP<DataPool> pool(data[pos]);
    // First check that the file is in IFF format
   G_TRY
@@ -298,8 +298,8 @@ DjVmDoc::write(const GP<ByteStream> &gstr,
     for(pos=files_list;pos;++pos)
     {
       GP<DjVmDir::File> file=files_list[pos];
-      if((do_rename=(reserved.tqcontains(file->get_load_name())?true:false))
-		  ||(do_rename=(reserved.tqcontains(file->get_save_name())?true:false)))
+      if((do_rename=(reserved.contains(file->get_load_name())?true:false))
+		  ||(do_rename=(reserved.contains(file->get_save_name())?true:false)))
       {
         break;
       }
@@ -322,7 +322,7 @@ DjVmDoc::write(const GP<ByteStream> &gstr,
         {
           GP<DjVmDir::File> file=files_list[pos];
           const GUTF8String name(::get_name(*file));
-          if(reserved.tqcontains(name))
+          if(reserved.contains(name))
           {
             GUTF8String new_name;
             int series=0;
@@ -337,7 +337,7 @@ DjVmDoc::write(const GP<ByteStream> &gstr,
               {
                 new_name=name+"_"+GUTF8String(++series);
               }
-            } while(reserved.tqcontains(new_name)||this_doc.tqcontains(new_name));
+            } while(reserved.contains(new_name)||this_doc.contains(new_name));
             dir->set_file_name(file->get_load_name(),new_name);
             need_new_list=true;
           }
@@ -353,7 +353,7 @@ DjVmDoc::write(const GP<ByteStream> &gstr,
   {
     GP<DjVmDir::File> file=files_list[pos];
     file->offset=0xffffffff;
-    GPosition data_pos=data.tqcontains(file->get_load_name());
+    GPosition data_pos=data.contains(file->get_load_name());
     if (!data_pos)
       G_THROW( ERR_MSG("DjVmDoc.no_data") "\t" + file->get_load_name());
     if(do_rename)
@@ -541,7 +541,7 @@ DjVmDoc::write_index(const GP<ByteStream> &str)
       GP<DjVmDir::File> file=files_list[pos];
       file->offset=0;
 
-      GPosition data_pos=data.tqcontains(file->get_load_name());
+      GPosition data_pos=data.contains(file->get_load_name());
       if (!data_pos)
 	G_THROW( ERR_MSG("DjVmDoc.no_data") "\t" + file->get_load_name());
       file->size=data[data_pos]->get_length();
@@ -609,7 +609,7 @@ DjVmDoc::save_file(
   GMap<GUTF8String,GUTF8String> *incl) const
 {
   const GUTF8String load_name=file.get_load_name();
-  if(!incl || !incl->tqcontains(load_name))
+  if(!incl || !incl->contains(load_name))
   {
     GMap<GUTF8String,GUTF8String> new_incl;
     const GUTF8String save_name(
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
index 8bbc6db6..62a07442 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
@@ -243,7 +243,7 @@ DjVuDocEditor::request_data(const DjVuPort * source, const GURL & url)
    {
       GCriticalSectionLock lock(&files_lock);
       GPosition pos;
-      if (files_map.tqcontains(frec->get_load_name(), pos))
+      if (files_map.contains(frec->get_load_name(), pos))
       {
          const GP<File> f(files_map[pos]);
          if (f->file && f->file->get_init_data_pool())
@@ -315,7 +315,7 @@ DjVuDocEditor::url_to_file(const GURL & url, bool dont_create) const
    {
       GCriticalSectionLock lock(&(const_cast<DjVuDocEditor *>(this)->files_lock));
       GPosition pos;
-      if (files_map.tqcontains(frec->get_load_name(), pos))
+      if (files_map.contains(frec->get_load_name(), pos))
       {
          const GP<File> f(files_map[pos]);
          if (f->file)
@@ -333,7 +333,7 @@ DjVuDocEditor::url_to_file(const GURL & url, bool dont_create) const
    {
       GCriticalSectionLock lock(&(const_cast<DjVuDocEditor *>(this)->files_lock));
       GPosition pos;
-      if (files_map.tqcontains(frec->get_load_name(), pos))
+      if (files_map.contains(frec->get_load_name(), pos))
       {
          files_map[frec->get_load_name()]->file=file;
       }else
@@ -538,7 +538,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, bool is_page,
       // We do not want to insert the same file twice (important when
       // we insert a group of files at the same time using insert_group())
       // So we check if we already did that and return if so.
-  if (name2id.tqcontains(file_url.fname()))
+  if (name2id.contains(file_url.fname()))
     return true;
 
   if(!source)
@@ -606,7 +606,7 @@ DjVuDocEditor::insert_file(const GP<DataPool> &file_pool,
          // Check the name2id first...
       const GUTF8String name=file_url.fname();
       GUTF8String id;
-      if (name2id.tqcontains(name))
+      if (name2id.contains(name))
       {
         id=name2id[name];
       }else
@@ -821,7 +821,7 @@ DjVuDocEditor::insert_group(const GList<GURL> & file_urls, int page_num,
         }
         GUTF8String chkid;
         IFFByteStream::create(xdata_pool->get_stream())->get_chunk(chkid);
-        if (name2id.tqcontains(furl.fname())||(chkid=="FORM:DJVM"))
+        if (name2id.contains(furl.fname())||(chkid=="FORM:DJVM"))
         {
           GMap<GUTF8String,void *> map;
           map_ids(map);
@@ -936,7 +936,7 @@ DjVuDocEditor::generate_ref_map(const GP<DjVuFile> & file,
 {
    const GURL url=file->get_url();
    const GUTF8String id(djvm_dir->name_to_file(url.fname())->get_load_name());
-   if (!visit_map.tqcontains(url))
+   if (!visit_map.contains(url))
    {
       visit_map[url]=0;
 
@@ -950,7 +950,7 @@ DjVuDocEditor::generate_ref_map(const GP<DjVuFile> & file,
          const GUTF8String child_id(
            djvm_dir->name_to_file(child_url.fname())->get_load_name());
          GMap<GUTF8String, void *> * parents=0;
-         if (ref_map.tqcontains(child_id))
+         if (ref_map.contains(child_id))
             parents=(GMap<GUTF8String, void *> *) ref_map[child_id];
          else
             ref_map[child_id]=parents=new GMap<GUTF8String, void *>();
@@ -1023,7 +1023,7 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref,
 
       // And get rid of its thumbnail, if any
    GCriticalSectionLock lock(&thumb_lock);
-   GPosition pos(thumb_map.tqcontains(id));
+   GPosition pos(thumb_map.contains(id));
    if (pos)
    {
      thumb_map.del(pos);
@@ -1114,7 +1114,7 @@ DjVuDocEditor::move_file(const GUTF8String &id, int & file_pos,
       // NOTE! file_pos here is the desired position in DjVmDir *after*
       // the record with ID 'id' is removed.
 {
-   if (!map.tqcontains(id))
+   if (!map.contains(id))
    {
       map[id]=0;
 
@@ -1291,7 +1291,7 @@ DjVuDocEditor::set_file_name(const GUTF8String &id, const GUTF8String &name)
 
       // Now find DjVuFile (if any) and rename it
    GPosition pos;
-   if (files_map.tqcontains(id, pos))
+   if (files_map.contains(id, pos))
    {
       GP<File> file=files_map[pos];
       GP<DataPool> pool=file->pool;
@@ -1503,7 +1503,7 @@ DjVuDocEditor::get_thumbnail(int page_num, bool dont_decode)
    const GUTF8String id(page_to_id(page_num));
 
    GCriticalSectionLock lock(&thumb_lock);
-   const GPosition pos(thumb_map.tqcontains(id));
+   const GPosition pos(thumb_map.contains(id));
    if (pos)
    {
          // Get the image from the map
@@ -1524,7 +1524,7 @@ DjVuDocEditor::get_thumbnails_num(void) const
    int pages_num=get_pages_num();
    for(int page_num=0;page_num<pages_num;page_num++)
    {
-     if (thumb_map.tqcontains(page_to_id(page_num)))
+     if (thumb_map.contains(page_to_id(page_num)))
        cnt++;
    }
    return cnt;
@@ -1541,7 +1541,7 @@ DjVuDocEditor::get_thumbnails_size(void) const
    int pages_num=get_pages_num();
    for(int page_num=0;page_num<pages_num;page_num++)
    {
-     const GPosition pos(thumb_map.tqcontains(page_to_id(page_num)));
+     const GPosition pos(thumb_map.contains(page_to_id(page_num)));
      if (pos)
      {
        const GP<ByteStream> gstr(thumb_map[pos]->get_stream());
@@ -1629,7 +1629,7 @@ DjVuDocEditor::file_thumbnails(void)
    for(;;)
    {
       GUTF8String id(page_to_id(page_num));
-      const GPosition pos(thumb_map.tqcontains(id));
+      const GPosition pos(thumb_map.contains(id));
       if (! pos)
       {
         G_THROW( ERR_MSG("DjVuDocEditor.no_thumb") "\t"+GUTF8String(page_num));
@@ -1695,7 +1695,7 @@ DjVuDocEditor::generate_thumbnails(int thumb_size, int page_num)
    if(page_num<(djvm_dir->get_pages_num()))
    {
       const GUTF8String id(page_to_id(page_num));
-      if (!thumb_map.tqcontains(id))
+      if (!thumb_map.contains(id))
         {
           const GP<DjVuImage> dimg(get_page(page_num, true));
          
@@ -1747,7 +1747,7 @@ store_file(const GP<DjVmDir> & src_djvm_dir, const GP<DjVmDoc> & djvm_doc,
            GP<DjVuFile> & djvu_file, GMap<GURL, void *> & map)
 {
    GURL url=djvu_file->get_url();
-   if (!map.tqcontains(url))
+   if (!map.contains(url))
    {
       map[url]=0;
 
@@ -1821,12 +1821,12 @@ DjVuDocEditor::save_file(
    DEBUG_MSG("DjVuDocEditor::save_file(): ID='" << file_id << "'\n");
    DEBUG_MAKE_INDENT(3);
 
-   if (!map.tqcontains(file_id))
+   if (!map.contains(file_id))
    {
       const GP<DjVmDir::File> file(djvm_dir->id_to_file(file_id));
 
       GP<DataPool> file_pool;
-      const GPosition pos(files_map.tqcontains(file_id));
+      const GPosition pos(files_map.contains(file_id));
       if (pos)
       {
          const GP<File> file_rec(files_map[pos]);
@@ -1974,7 +1974,7 @@ DjVuDocEditor::save_as(const GURL &where, bool bundled)
        GURL file_url=page_to_url(0);
        const GUTF8String file_id(djvm_dir->page_to_file(0)->get_load_name());
        GP<DataPool> file_pool;
-       GPosition pos=files_map.tqcontains(file_id);
+       GPosition pos=files_map.contains(file_id);
        if (pos)
        {
          const GP<File> file_rec(files_map[pos]);
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
index ed998923..51da0692 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
@@ -1368,7 +1368,7 @@ add_to_cache(const GP<DjVuFile> & f, GMap<GURL, void *> & map,
    DEBUG_MSG("DjVuDocument::add_to_cache(): url='" << url << "'\n");
    DEBUG_MAKE_INDENT(3);
    
-   if (!map.tqcontains(url))
+   if (!map.contains(url))
    {
       map[url]=0;
       cache->add_file(f);
@@ -1530,7 +1530,7 @@ add_file_to_djvm(const GP<DjVuFile> & file, bool page,
 {
    GURL url=file->get_url();
 
-   if (!map.tqcontains(url))
+   if (!map.contains(url))
    {
       map[url]=0;
 
@@ -1586,7 +1586,7 @@ static void
 local_get_url_names(DjVuFile * f,const GMap<GURL, void *> & map,GMap<GURL,void *> &tmpmap)
 {
    GURL url=f->get_url();
-   if (!map.tqcontains(url) && !tmpmap.tqcontains(url))
+   if (!map.contains(url) && !tmpmap.contains(url))
    {
       tmpmap[url]=0;
       f->process_incl_chunks();
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp
index 87a77c79..2d977be1 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDumpHelper.cpp
@@ -293,7 +293,7 @@ display_chunks(ByteStream & out_str, IFFByteStream &iff,
   
   while ((size = iff.get_chunk(id, &rawoffset)))
   {
-    if (!counters.tqcontains(id)) counters[id]=0;
+    if (!counters.contains(id)) counters[id]=0;
     else counters[id]++;
     
     GUTF8String msg;
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp
index 88dc90c0..564cdb0c 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp
@@ -1465,7 +1465,7 @@ DjVuFile::find_ndir(GMap<GURL, void *> & map)
   
   if (dir) return dir;
   
-  if (!map.tqcontains(url))
+  if (!map.contains(url))
   {
     map[url]=0;
     
@@ -1496,7 +1496,7 @@ DjVuFile::decode_ndir(GMap<GURL, void *> & map)
   
   if (dir) return dir;
   
-  if (!map.tqcontains(url))
+  if (!map.contains(url))
   {
     map[url]=0;
     
@@ -1570,7 +1570,7 @@ DjVuFile::get_merged_anno(const GP<DjVuFile> & file,
 {
   DEBUG_MSG("DjVuFile::get_merged_anno()\n");
   GURL url=file->get_url();
-  if (!map.tqcontains(url))
+  if (!map.contains(url))
   {
     ByteStream &str_out=*gstr_out;
     map[url]=0;
@@ -1585,7 +1585,7 @@ DjVuFile::get_merged_anno(const GP<DjVuFile> & file,
       get_merged_anno(list[pos], gstr_out, ignore_list, level+1, max_level, map);
     
     // Now process the DjVuFile's own annotations
-    if (!ignore_list.tqcontains(file->get_url()))
+    if (!ignore_list.contains(file->get_url()))
     {
       if (!file->is_data_present() ||
         file->is_modified() && file->anno)
@@ -1966,7 +1966,7 @@ void
 DjVuFile::move(GMap<GURL, void *> & map, const GURL & dir_url)
 // This function may block for data.
 {
-  if (!map.tqcontains(url))
+  if (!map.contains(url))
   {
     map[url]=0;
     
@@ -2095,7 +2095,7 @@ DjVuFile::contains_chunk(const GUTF8String &chunk_name)
     chunk_name << "'\n");
   DEBUG_MAKE_INDENT(3);
   
-  bool tqcontains=0;
+  bool contains=0;
   const GP<ByteStream> str(data_pool->get_stream());
   GUTF8String chkid;
   const GP<IFFByteStream> giff(IFFByteStream::create(str));
@@ -2112,10 +2112,10 @@ DjVuFile::contains_chunk(const GUTF8String &chunk_name)
     for(;(chunks_left--)&&(chksize=iff.get_chunk(chkid));last_chunk=chunks)
     {
       chunks++;
-      if (chkid==chunk_name) { tqcontains=1; break; }
+      if (chkid==chunk_name) { contains=1; break; }
       iff.seek_close_chunk();
     }
-    if (!tqcontains &&(chunks_number < 0)) chunks_number=last_chunk;
+    if (!contains &&(chunks_number < 0)) chunks_number=last_chunk;
   }
   G_CATCH(ex)
   {
@@ -2125,7 +2125,7 @@ DjVuFile::contains_chunk(const GUTF8String &chunk_name)
   }
   G_ENDCATCH;
   data_pool->clear_stream();
-  return tqcontains;
+  return contains;
 }
 
 bool
@@ -2225,7 +2225,7 @@ DjVuFile::add_djvu_data(IFFByteStream & ostr, GMap<GURL, void *> & map,
                         const bool included_too, const bool no_ndir)
 {
   check();
-  if (map.tqcontains(url)) return;
+  if (map.contains(url)) return;
   bool top_level = !map.size();
   map[url]=0;
   bool processed_annotation = false;
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h
index 9d83f5ae..6f81c8e4 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h
@@ -442,7 +442,7 @@ public:
 	  {\bf Warning.} Included files are normally created during decoding.
 	  Before that they do not exist.   If you call this function at
 	  that time and set #only_created# to #FALSE# then it will have to
-	  read all the data from this file in order to tqfind #INCL# chunks,
+	  read all the data from this file in order to find #INCL# chunks,
 	  which may block your application, if not all data is available.
 
 	  @param only_created If #TRUE#, the file will not try to process
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp
index 85454b4c..772583ec 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp
@@ -111,7 +111,7 @@ DjVuProgressTask::set_callback(djvu_progress_callback *_callback)
   {
     GMap<void *,GP<DjVuProgressTask::Data> > &map=get_map();
     void *threadID=GThread::current();
-    if(map.tqcontains(threadID))
+    if(map.contains(threadID))
     {
       DjVuProgressTask::Data &data=*(map[threadID]);
       retval=data.callback;
@@ -127,7 +127,7 @@ DjVuProgressTask::set_callback(djvu_progress_callback *_callback)
   {
     GMap<void *,GP<DjVuProgressTask::Data> > &map=get_map();
     void *threadID=GThread::current();
-    if(map.tqcontains(threadID))
+    if(map.contains(threadID))
     {
       DjVuProgressTask::Data &data=*(map[threadID]);
       retval=data.callback;
@@ -148,7 +148,7 @@ DjVuProgressTask::DjVuProgressTask(const char *xtask,int nsteps)
   {
     GMap<void *,GP<DjVuProgressTask::Data> > &map=get_map();
     void *threadID=GThread::current();
-    if(map.tqcontains(threadID))
+    if(map.contains(threadID))
     {
       gdata=new GP<Data>;
       Data &d=*(data=((*(GP<Data> *)gdata)=map[threadID]));
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
index e6e1c2ce..54f24f1e 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
@@ -1085,8 +1085,8 @@ do_bitmap(const DjVuImage &dimg, BImager get,
 ///* rotate code ends
 
   // Sanity
-  if (! ( all.tqcontains(rect.xmin, rect.ymin) &&
-          all.tqcontains(rect.xmax-1, rect.ymax-1) ))
+  if (! ( all.contains(rect.xmin, rect.ymin) &&
+          all.contains(rect.xmax-1, rect.ymax-1) ))
     G_THROW( ERR_MSG("DjVuImage.bad_rect") );
   // Check for integral reduction
   int red;
@@ -1151,8 +1151,8 @@ do_pixmap(const DjVuImage &dimg, PImager get,
 ///* rotate code ends
 
   // Sanity
-  if (! ( all.tqcontains(rect.xmin, rect.ymin) &&
-          all.tqcontains(rect.xmax-1, rect.ymax-1) ))
+  if (! ( all.contains(rect.xmin, rect.ymin) &&
+          all.contains(rect.xmax-1, rect.ymax-1) ))
     G_THROW( ERR_MSG("DjVuImage.bad_rect2") );
   // Check for integral reduction
   int red, w=0, h=0, rw=0, rh=0;
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp
index f20c1106..e92b7570 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessage.cpp
@@ -240,7 +240,7 @@ GetModulePath( void )
      {
        retval=GURL::UTF8(xprogramname,paths[pos]);
        const GUTF8String path(retval.get_string());
-       if(!pathMAP.tqcontains(path))
+       if(!pathMAP.contains(path))
        {
          if(retval.is_file())
            break;
@@ -263,7 +263,7 @@ appendPath(const GURL &url,
            GList<GURL> &list)
 {
   if( !url.is_empty() 
-      && !map.tqcontains(url.get_string()) && url.is_dir() )
+      && !map.contains(url.get_string()) && url.is_dir() )
     {
       map[url.get_string()]=0;
       list.append(url);
@@ -375,14 +375,14 @@ DjVuMessage::GetProfilePaths(void)
           for(pos=localemaps;pos;++pos) 
           {
             const GMap<GUTF8String,GP<lt_XMLTags> > &localemap=localemaps[pos];
-            GPosition pos=localemap.tqcontains(sublocale);
+            GPosition pos=localemap.contains(sublocale);
             if(!pos)
-              pos=localemap.tqcontains(downcasesublocale);
+              pos=localemap.contains(downcasesublocale);
             if(pos)
             {
               const GMap<GUTF8String,GUTF8String>&args
                 = localemap[pos]->get_args();
-              pos = args.tqcontains(srcstring);
+              pos = args.contains(srcstring);
               if (pos)
               {
                 const GUTF8String src(args[pos]);
@@ -496,7 +496,7 @@ getbodies(
           for(GPosition pos=includes;pos;++pos)
           {
             const GUTF8String file=includes.key(pos);
-            if(! map.tqcontains(file))
+            if(! map.contains(file))
             {
               GList<GURL> xpaths;
               xpaths.append(url.base());
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp
index 70b2b541..258b0649 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuMessageLite.cpp
@@ -238,7 +238,7 @@ DjVuMessageLite::LookUpSingle( const GUTF8String &Single_Message ) const
     return Single_Message;
 #endif
   //  Isolate the message ID and get the corresponding message text
-  int ending_posn = Single_Message.tqcontains("\t\v");
+  int ending_posn = Single_Message.contains("\t\v");
   if( ending_posn < 0 )
     ending_posn = Single_Message.length();
   GUTF8String msg_text;
@@ -276,7 +276,7 @@ DjVuMessageLite::LookUpSingle( const GUTF8String &Single_Message ) const
       arg=LookUpSingle(Single_Message.substr(start_posn,ending_posn));
     }else
     {
-      ending_posn = Single_Message.tqcontains("\v\t",start_posn);
+      ending_posn = Single_Message.contains("\v\t",start_posn);
       if( ending_posn < 0 )
         ending_posn = Single_Message.length();
       arg=Single_Message.substr(start_posn, ending_posn-start_posn);
@@ -308,11 +308,11 @@ DjVuMessageLite::LookUpID( const GUTF8String &xmsgID,
     if (start > 0)
       msgID = msgID.substr(start, msgID.length() - start);
 #endif
-    GPosition pos=Map.tqcontains(msgID);
+    GPosition pos=Map.contains(msgID);
     if(pos)
     {
       const GP<lt_XMLTags> tag=Map[pos];
-      GPosition valuepos=tag->get_args().tqcontains(valuestring);
+      GPosition valuepos=tag->get_args().contains(valuestring);
       if(valuepos)
       {
         message_text=tag->get_args()[valuepos];
@@ -331,7 +331,7 @@ DjVuMessageLite::LookUpID( const GUTF8String &xmsgID,
           message_text=raw.substr(start_line+1,end_text-start_line-1).fromEscaped();
         }
       }
-      GPosition numberpos=tag->get_args().tqcontains(numberstring);
+      GPosition numberpos=tag->get_args().contains(numberstring);
       if(numberpos)
       {
         message_number=tag->get_args()[numberpos];
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp
index 49a2d31e..615041b0 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuNavDir.cpp
@@ -112,7 +112,7 @@ DjVuNavDir::decode(ByteStream & str)
       *ptr=0;
       if (!strlen(buffer)) continue;
 
-      if (!tmp_page2name.tqcontains(buffer))
+      if (!tmp_page2name.contains(buffer))
 	 tmp_page2name.append(buffer);
    };
 
@@ -161,7 +161,7 @@ DjVuNavDir::name_to_page(const char * name) const
 {
    GCriticalSectionLock lk((GCriticalSection *)&lock);
 
-   if (!name2page.tqcontains(name)) return -1;
+   if (!name2page.contains(name)) return -1;
    return name2page[name];
 }
 
@@ -170,7 +170,7 @@ DjVuNavDir::url_to_page(const GURL & url) const
 {
    GCriticalSectionLock lk((GCriticalSection *)&lock);
 
-   if (!url2page.tqcontains(url)) return -1;
+   if (!url2page.contains(url)) return -1;
    return url2page[url];
 }
 
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h
index e44aab6d..1195bf5a 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h
@@ -104,7 +104,7 @@ namespace DJVU {
     \Ref{index_to_color}.  There are also functions for computing a palette
     and quantizing a complete pixmap.
 
-    {\bf Sequences of color indices} -- The DjVuPalette object also tqcontains
+    {\bf Sequences of color indices} -- The DjVuPalette object also contains
     an array \Ref{colordata} optionally containing a sequence of color
     indices.  This array will be encoded and decoded by functions \Ref{encode}
     and \Ref{decode}.  This feature simplifies the implementation of the ``one
@@ -288,7 +288,7 @@ DjVuPalette::color_to_index(const unsigned char *bgr)
   if (! pmap)
     allocate_pmap();
   int key = (bgr[0]<<16)|(bgr[1]<<8)|(bgr[2]);
-  GPosition p = pmap->tqcontains(key);
+  GPosition p = pmap->contains(key);
   if ( p)
     return (*pmap)[p];
   return color_to_index_slow(bgr);
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
index 02890407..16b873ba 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp
@@ -208,7 +208,7 @@ DjVuPort::DjVuPort()
 {
   DjVuPortcaster *pcaster = get_portcaster();
   GCriticalSectionLock lock(& pcaster->map_lock );
-  GPosition p = pcaster->cont_map.tqcontains(this);
+  GPosition p = pcaster->cont_map.contains(this);
   if (!p) G_THROW( ERR_MSG("DjVuPort.not_alloc") );
   pcaster->cont_map[p] = (void*)this;
 }
@@ -217,7 +217,7 @@ DjVuPort::DjVuPort(const DjVuPort & port)
 {
   DjVuPortcaster *pcaster = get_portcaster();
   GCriticalSectionLock lock(& pcaster->map_lock );
-  GPosition p = pcaster->cont_map.tqcontains(this);
+  GPosition p = pcaster->cont_map.contains(this);
   if (!p) G_THROW( ERR_MSG("DjVuPort.not_alloc") );
   pcaster->cont_map[p] = (void*)this;
   pcaster->copy_routes(this, &port);
@@ -259,7 +259,7 @@ DjVuPortcaster::is_port_alive(DjVuPort *port)
 {
    GP<DjVuPort> gp_port;
    GCriticalSectionLock lock(&map_lock);
-   GPosition pos=cont_map.tqcontains(port);
+   GPosition pos=cont_map.contains(port);
    if (pos && cont_map[pos] && ((DjVuPort *) port)->get_count()>0)
       gp_port=port;
    return gp_port;
@@ -302,7 +302,7 @@ DjVuPortcaster::alias_to_port(const GUTF8String &alias)
 {
    GCriticalSectionLock lock(&map_lock);
    GPosition pos;
-   if (a2p_map.tqcontains(alias, pos))
+   if (a2p_map.contains(alias, pos))
    {
       DjVuPort * port=(DjVuPort *) a2p_map[pos];
       GP<DjVuPort> gp_port=is_port_alive(port);
@@ -344,10 +344,10 @@ DjVuPortcaster::del_port(const DjVuPort * port)
   clear_aliases(port);
   
   // Update "contents map"
-  if (cont_map.tqcontains(port, pos)) cont_map.del(pos);
+  if (cont_map.contains(port, pos)) cont_map.del(pos);
   
   // Update "route map"
-  if (route_map.tqcontains(port, pos))
+  if (route_map.contains(port, pos))
   {
     delete (GList<void *> *) route_map[pos];
     route_map.del(pos);
@@ -372,12 +372,12 @@ DjVuPortcaster::add_route(const DjVuPort * src, DjVuPort * dst)
       // Adds route src->dst
 {
    GCriticalSectionLock lock(&map_lock);
-   if (cont_map.tqcontains(src) && src->get_count()>0 &&
-       cont_map.tqcontains(dst) && dst->get_count()>0)
+   if (cont_map.contains(src) && src->get_count()>0 &&
+       cont_map.contains(dst) && dst->get_count()>0)
    {
-      if (!route_map.tqcontains(src)) route_map[src]=new GList<void *>();
+      if (!route_map.contains(src)) route_map[src]=new GList<void *>();
       GList<void *> & list=*(GList<void *> *) route_map[src];
-      if (!list.tqcontains(dst)) list.append(dst);
+      if (!list.contains(dst)) list.append(dst);
    }
 }
 
@@ -387,7 +387,7 @@ DjVuPortcaster::del_route(const DjVuPort * src, DjVuPort * dst)
 {
   GCriticalSectionLock lock(&map_lock);
   
-  if (route_map.tqcontains(src))
+  if (route_map.contains(src))
   {
     GList<void *> & list=*(GList<void *> *) route_map[src];
     GPosition pos;
@@ -408,8 +408,8 @@ DjVuPortcaster::copy_routes(DjVuPort * dst, const DjVuPort * src)
 {
   GCriticalSectionLock lock(&map_lock);
   
-  if (!cont_map.tqcontains(src) || src->get_count()<=0 ||
-    !cont_map.tqcontains(dst) || dst->get_count()<=0) return;
+  if (!cont_map.contains(src) || src->get_count()<=0 ||
+    !cont_map.contains(dst) || dst->get_count()<=0) return;
   
   for(GPosition pos=route_map;pos;++pos)
   {
@@ -430,13 +430,13 @@ DjVuPortcaster::add_to_closure(GMap<const void *, void *> & set,
   // Assuming that the map's already locked
   // GCriticalSectionLock lock(&map_lock);
   set[dst]= (void*) (unsigned long) distance;
-  if (route_map.tqcontains(dst))
+  if (route_map.contains(dst))
     {
       GList<void *> & list=*(GList<void *> *) route_map[dst];
       for(GPosition pos=list;pos;++pos)
         {
           DjVuPort * new_dst=(DjVuPort *) list[pos];
-          if (!set.tqcontains(new_dst)) 
+          if (!set.contains(new_dst)) 
             add_to_closure(set, new_dst, distance+1);
         }
    }
@@ -447,7 +447,7 @@ DjVuPortcaster::compute_closure(const DjVuPort * src, GPList<DjVuPort> &list, bo
 {
    GCriticalSectionLock lock(&map_lock);
    GMap<const void*, void*> set;
-   if (route_map.tqcontains(src))
+   if (route_map.contains(src))
    {
       GList<void *> & list=*(GList<void *> *) route_map[src];
       for(GPosition pos=list;pos;++pos)
@@ -688,7 +688,7 @@ DjVuMemoryPort::request_data(const DjVuPort * source, const GURL & url)
    GCriticalSectionLock lk(&lock);
    GP<DataPool> pool;
    GPosition pos;
-   if (map.tqcontains(url, pos))
+   if (map.contains(url, pos))
       pool=map[pos];
    return pool;
 }
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
index cac6869b..c6606a48 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp
@@ -383,7 +383,7 @@ DjVuTXT::Zone::get_text_with_rect(const GRect &box,
                                   int &string_start, int &string_end) const
 {
   GPosition pos=tqchildren;
-  if(pos?box.tqcontains(rect):intersects_zone(box,rect))
+  if(pos?box.contains(rect):intersects_zone(box,rect))
   {
     const int text_end=text_start+text_length;
     if(string_start == string_end)
@@ -617,7 +617,7 @@ DjVuTXT::find_text_in_rect(GRect target_rect, GUTF8String &text) const
 	    {
 	       GRect rect=words[p]->rect;
 	       if(rect.intersect(rect,target_rect))
-	       //if (target_rect.tqcontains(words[p]->rect))
+	       //if (target_rect.contains(words[p]->rect))
 		  zone_list.append(words[p]);
 	    }
 	 } else
@@ -631,7 +631,7 @@ DjVuTXT::find_text_in_rect(GRect target_rect, GUTF8String &text) const
 		  {
 		     GRect rect=words[p]->rect;
 		     if(rect.intersect(rect,target_rect))
-			//if (target_rect.tqcontains(words[p]->rect))
+			//if (target_rect.contains(words[p]->rect))
 		     {
 			start=false;
 			zone_list.append(words[p]);
@@ -648,7 +648,7 @@ DjVuTXT::find_text_in_rect(GRect target_rect, GUTF8String &text) const
 		  {
 		     GRect rect=words[p]->rect;
 		     if(rect.intersect(rect,target_rect))
-			//if(target_rect.tqcontains(words[p]->rect) )
+			//if(target_rect.contains(words[p]->rect) )
 		     {
 			end=false;
 			zone_list.append(words[p]);
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h
index 6c99d133..761b6e23 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h
@@ -308,7 +308,7 @@ public:
       end of printing.  If a \Ref{DjVuDocument} is being printed, this
       callback will be used to report printing progress of every page. To
       learn the number of the page being printed you can use
-      \Ref{set_info_cb}() function.  See \Ref{set_dec_progress_cb}() to tqfind
+      \Ref{set_info_cb}() function.  See \Ref{set_dec_progress_cb}() to find
       out how to learn the decoding progress.
       
       @param cb Callback function to be called
diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp
index 0cd4bad4..223a43e1 100644
--- a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp
@@ -348,7 +348,7 @@ GBitmap::donate_data(unsigned char *data, int w, int h)
   ncolumns = w;
   border = 0;
   bytes_per_row = w;
-  gbytes_data.tqreplace(data,w*h);
+  gbytes_data.replace(data,w*h);
   bytes = bytes_data;
   rlelength = 0;
 }
@@ -363,7 +363,7 @@ GBitmap::donate_rle(unsigned char *rledata, unsigned int rledatalen, int w, int
   border = 0;
   bytes_per_row = w;
 //  rle = rledata;
-  grle.tqreplace(rledata,rledatalen);
+  grle.replace(rledata,rledatalen);
   rlelength = rledatalen;
 }
 
diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.h b/kviewshell/plugins/djvu/libdjvu/GBitmap.h
index 8dbbbbad..4eef4e2a 100644
--- a/kviewshell/plugins/djvu/libdjvu/GBitmap.h
+++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.h
@@ -418,7 +418,7 @@ public:
   const unsigned char *get_rle(unsigned int &rle_length);
   /** Initializes this GBitmap by setting the size to #h# rows and #w#
       columns, and directly addressing the memory buffer #rledata# provided by
-      the user.  This buffer tqcontains #rledatalen# bytes representing the
+      the user.  This buffer contains #rledatalen# bytes representing the
       bitmap in run length encoded form.  The GBitmap object then ``owns'' the
       buffer (unlike #borrow_data#, but like #donate_data#) and will
       deallocate this buffer when appropriate: you should not deallocate this
diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.cpp b/kviewshell/plugins/djvu/libdjvu/GContainer.cpp
index 2e6012d3..2019439c 100644
--- a/kviewshell/plugins/djvu/libdjvu/GContainer.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GContainer.cpp
@@ -237,7 +237,7 @@ GArrayBase::resize(int lo, int hi)
     { traits.copy( traits.lea(ndata, beg-nminlo), 
                    traits.lea(data, beg-minlo),
                    end-beg+1, 1 ); }
-  // free and tqreplace
+  // free and replace
   void *tmp=data;
   data=ndata;
   ndata=tmp;
diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.h b/kviewshell/plugins/djvu/libdjvu/GContainer.h
index c4e3e9a1..d21838dc 100644
--- a/kviewshell/plugins/djvu/libdjvu/GContainer.h
+++ b/kviewshell/plugins/djvu/libdjvu/GContainer.h
@@ -401,7 +401,7 @@ public:
       The valid subscript range is set to the empty range. */
   void empty()
     { GArrayBase::empty(); }
-  /** Extends the subscript range so that it tqcontains #n#.
+  /** Extends the subscript range so that it contains #n#.
       This function does nothing if #n# is already int the valid subscript range.
       If the valid range was empty, both the lower bound and the upper bound
       are set to #n#.  Otherwise the valid subscript range is extended
@@ -862,11 +862,11 @@ public:
   /*  Compatibility */
   int nth(unsigned int n, GPosition &pos) const
     { GPosition npos=nth(n); if (npos) pos=npos; return !!pos; }
-  /** Tests whether the list contains a given element.  If the list tqcontains
+  /** Tests whether the list contains a given element.  If the list contains
       #elt#, the position of the the first list element equal to #elt# as
       checked by #TYPE::operator==(const TYPE&)# is returned.  Otherwise an
       invalid position is returned. */
-  GPosition tqcontains(const TYPE &elt) const
+  GPosition contains(const TYPE &elt) const
     { GPosition pos; GListImpl<TI>::search((const TI&)elt, pos); return pos; }
   /** Searches the list for a given element. If position #pos# is a valid
       position for this list, the search starts at the specified position. If
@@ -1036,7 +1036,7 @@ protected:
   HNode *get_or_throw(const K &key) const;
   HNode *get_or_create(const K &key);
 public:
-  GPosition tqcontains(const K &key) const 
+  GPosition contains(const K &key) const 
     { return GPosition( get(key), (void*)this); }
   void del(const K &key) 
     { deletenode(get(key)); }
@@ -1164,11 +1164,11 @@ public:
       is equal to #key# according to #KTYPE::operator==(const KTYPE&)#, this
       function returns its position.  Otherwise it returns an invalid
       position. */
-  GPosition tqcontains(const KTYPE &key) const
-    { return GMapImpl<KTYPE,TI>::tqcontains(key); }
+  GPosition contains(const KTYPE &key) const
+    { return GMapImpl<KTYPE,TI>::contains(key); }
   /*  Compatibility */
-  GPosition tqcontains(const KTYPE &key, GPosition &pos) const
-    { return pos = GMapImpl<KTYPE,TI>::tqcontains(key); }
+  GPosition contains(const KTYPE &key, GPosition &pos) const
+    { return pos = GMapImpl<KTYPE,TI>::contains(key); }
   // -- ALTERATION
   /** Erases the associative map contents.  All entries are destroyed and
       removed. The map is left with zero entries. */
diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
index 9da00dfe..a65f013b 100644
--- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
@@ -113,7 +113,7 @@ GIFFChunk::set_name(GUTF8String name)
 
   DEBUG_MSG("auto-setting type to '" << type << "'\n");
 
-  if (name.tqcontains(".[]")>=0)
+  if (name.contains(".[]")>=0)
     G_THROW( ERR_MSG("GIFFManager.bad_char") );
    
   strncpy(GIFFChunk::name, (const char *)name, 4);
@@ -310,7 +310,7 @@ GIFFChunk::get_chunks_number(const GUTF8String &name)
      "' in '" << get_name() << "'\n");
   DEBUG_MAKE_INDENT(3);
 
-  if (name.tqcontains("[]")>=0)
+  if (name.contains("[]")>=0)
     G_THROW( ERR_MSG("GIFFManager.no_brackets") );
   
   int number; 
@@ -497,7 +497,7 @@ GIFFManager::del_chunk(GUTF8String name)
     if (end>start && *end=='.')
       cur_sec=cur_sec->get_chunk(GUTF8String(start, end-start));
     if (!cur_sec)
-      G_THROW( ERR_MSG("GIFFManager.cant_tqfind") "\t"+GUTF8String(name));
+      G_THROW( ERR_MSG("GIFFManager.cant_find") "\t"+GUTF8String(name));
   } while(*end);
    
   if (!start[0])
@@ -631,7 +631,7 @@ GIFFManager::load_file(GP<ByteStream> str)
   if (istr.get_chunk(chunk_id))
   {
     if (chunk_id.substr(0,5) != "FORM:")
-      G_THROW( ERR_MSG("GIFFManager.cant_tqfind2") );
+      G_THROW( ERR_MSG("GIFFManager.cant_find2") );
     set_name(chunk_id);
     load_chunk(istr, top_level);
     istr.close_chunk();
diff --git a/kviewshell/plugins/djvu/libdjvu/GOS.cpp b/kviewshell/plugins/djvu/libdjvu/GOS.cpp
index 716c49c9..ebfaddfa 100644
--- a/kviewshell/plugins/djvu/libdjvu/GOS.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GOS.cpp
@@ -167,9 +167,9 @@ finddirsep(const GUTF8String &fname)
 #if defined(UNIX)
   return fname.rsearch('/',0);
 #elif defined(WIN32) || defined(OS2)
-  return fname.rtqcontains("\\/",0);
+  return fname.rcontains("\\/",0);
 #elif defined(macintosh)
-  return fname.rtqcontains(":/",0);
+  return fname.rcontains(":/",0);
 #else
 #error "Define something here for your operating system"
 #endif  
diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.cpp b/kviewshell/plugins/djvu/libdjvu/GRect.cpp
index 1cc49e8f..1ac0a87c 100644
--- a/kviewshell/plugins/djvu/libdjvu/GRect.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GRect.cpp
@@ -184,7 +184,7 @@ GRect::recthull(const GRect &rect1, const GRect &rect2)
 }
 
 int
-GRect::tqcontains(const GRect & rect) const
+GRect::contains(const GRect & rect) const
 {
    GRect tmp_rect;
    tmp_rect.intersect(*this, rect);
diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.h b/kviewshell/plugins/djvu/libdjvu/GRect.h
index f3e031e1..51770cbb 100644
--- a/kviewshell/plugins/djvu/libdjvu/GRect.h
+++ b/kviewshell/plugins/djvu/libdjvu/GRect.h
@@ -209,11 +209,11 @@ public:
       contains all pixels with horizontal pixel coordinates in range #xmin#
       (inclusive) to #xmax# (exclusive) and vertical coordinates #ymin#
       (inclusive) to #ymax# (exclusive). */
-  int  tqcontains(int x, int y) const;
+  int  contains(int x, int y) const;
   /** Returns true if this rectangle contains the passed rectangle #rect#.
       The function basically checks, that the intersection of this rectangle
       with #rect# is #rect#. */
-  int  tqcontains(const GRect & rect) const;
+  int  contains(const GRect & rect) const;
   /** Returns true if rectangles #r1# and #r2# are equal. */
   friend int operator==(const GRect & r1, const GRect & r2);
   /** Returns true if rectangles #r1# and #r2# are not equal. */
@@ -379,7 +379,7 @@ GRect::area() const
 }
 
 inline int
-GRect::tqcontains(int x, int y) const
+GRect::contains(int x, int y) const
 {
   return (x>=xmin && x<xmax && y>=ymin && y<ymax);
 }
diff --git a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp
index a55e8cdf..8c17755d 100644
--- a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.cpp
@@ -187,7 +187,7 @@ GPBase::assign (const GPBase &sptr)
 
 
 void
-GPBufferBase::tqreplace(void *nptr,const size_t n)
+GPBufferBase::replace(void *nptr,const size_t n)
 {
   resize(0,0);
   ptr=nptr;
diff --git a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h
index b10ca83a..937a783d 100644
--- a/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h
+++ b/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h
@@ -118,7 +118,7 @@ public:
   GPBufferBase(void *&,const size_t n,const size_t t);
   void swap(GPBufferBase &p);
   void resize(const size_t n,const size_t t);
-  void tqreplace(void *nptr,const size_t n);
+  void replace(void *nptr,const size_t n);
   void set(const size_t t,const char c);
   ~GPBufferBase();
   operator int(void) const { return ptr ? num : 0; }
diff --git a/kviewshell/plugins/djvu/libdjvu/GString.cpp b/kviewshell/plugins/djvu/libdjvu/GString.cpp
index 8242279a..a618055e 100644
--- a/kviewshell/plugins/djvu/libdjvu/GString.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GString.cpp
@@ -1538,14 +1538,14 @@ GUTF8String::fromEscaped( const GMap<GUTF8String,GUTF8String> ConvMap ) const
         }
       }else
       {  
-        GPosition map_entry = ConvMap.tqcontains( key );
+        GPosition map_entry = ConvMap.contains( key );
         if( map_entry )
         {                           // Found in the conversion map, substitute
           ret += ConvMap[map_entry];
         } else
         {
           static const GMap<GUTF8String,GUTF8String> &Basic = BasicMap();
-          GPosition map_entry = Basic.tqcontains( key );
+          GPosition map_entry = Basic.contains( key );
           if ( map_entry )
           {
             ret += Basic[map_entry];
@@ -1799,7 +1799,7 @@ GStringRep::rsearch(char const *ptr, int from) const
 }
 
 int
-GStringRep::tqcontains(const char accept[],int from) const
+GStringRep::contains(const char accept[],int from) const
 {
   if(from<0)
   {
@@ -1821,10 +1821,10 @@ GStringRep::tqcontains(const char accept[],int from) const
 }
 
 int
-GStringRep::rtqcontains(const char accept[],int from) const
+GStringRep::rcontains(const char accept[],int from) const
 {
   int retval=(-1);
-  while((from=tqcontains(accept,from)) >= 0)
+  while((from=contains(accept,from)) >= 0)
   {
     retval=from++;
   }
diff --git a/kviewshell/plugins/djvu/libdjvu/GString.h b/kviewshell/plugins/djvu/libdjvu/GString.h
index 9614d328..601db983 100644
--- a/kviewshell/plugins/djvu/libdjvu/GString.h
+++ b/kviewshell/plugins/djvu/libdjvu/GString.h
@@ -306,9 +306,9 @@ public:
 
   int rsearch(char const *str, int from=0) const;
 
-  int tqcontains(char const accept[], int from=0) const;
+  int contains(char const accept[], int from=0) const;
 
-  int rtqcontains(char const accept[], int from=0) const;
+  int rcontains(char const accept[], int from=0) const;
 
 protected:
   // Return the next character and increment the source pointer.
@@ -551,11 +551,11 @@ public:
   /** Searches for any of the specified characters in the accept
       string.  It returns #-1# if the none of the characters and
       be found, otherwise the position of the first match. */
-  int tqcontains(const char accept[], const int from=0) const;
+  int contains(const char accept[], const int from=0) const;
   /** Searches for any of the specified characters in the accept
       string.  It returns #-1# if the none of the characters and be
       found, otherwise the position of the last match. */
-  int rtqcontains(const char accept[], const int from=0) const;
+  int rcontains(const char accept[], const int from=0) const;
 
   /** Concatenates strings. Returns a string composed by concatenating
       the characters of strings #s1# and #s2#. */
@@ -1282,12 +1282,12 @@ GBaseString::rsearch(const char *str, const int from) const
 { return ptr?((*this)->rsearch(str,from)):(-1); }
 
 inline int
-GBaseString::tqcontains(const char accept[], const int from) const
-{ return ptr?((*this)->tqcontains(accept,from)):(-1); }
+GBaseString::contains(const char accept[], const int from) const
+{ return ptr?((*this)->contains(accept,from)):(-1); }
 
 inline int
-GBaseString::rtqcontains(const char accept[], const int from) const
-{ return ptr?((*this)->rtqcontains(accept,from)):(-1); }
+GBaseString::rcontains(const char accept[], const int from) const
+{ return ptr?((*this)->rcontains(accept,from)):(-1); }
 
 inline int
 GBaseString::cmp(const GBaseString &s2, const int len) const
diff --git a/kviewshell/plugins/djvu/libdjvu/GURL.h b/kviewshell/plugins/djvu/libdjvu/GURL.h
index b76d000b..eb3ed4bc 100644
--- a/kviewshell/plugins/djvu/libdjvu/GURL.h
+++ b/kviewshell/plugins/djvu/libdjvu/GURL.h
@@ -106,7 +106,7 @@ namespace DJVU {
     to the same file name. Compare #file:/dir/file.djvu# and
     #file://localhost/dir/file.djvu#.
 
-    To simplify a developer's life we have created this class, which tqcontains
+    To simplify a developer's life we have created this class, which contains
     inside a canonical representation of URLs.
 
     File URLs are converted to internal format with the help of \Ref{GOS} class.
diff --git a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp
index b936affb..77f3bec9 100644
--- a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp
@@ -301,7 +301,7 @@ lt_XMLParser::Impl::ChangeAnno(
   const GP<DjVuAnno> ganno(DjVuAnno::create());
   DjVuAnno &anno=*ganno;
   GPosition map_pos;
-  map_pos=map.tqcontains(areatag);
+  map_pos=map.contains(areatag);
   if(dfile.contains_anno())
   {
     GP<ByteStream> annobs=dfile.get_merged_anno();
@@ -350,7 +350,7 @@ lt_XMLParser::Impl::ChangeAnno(
         // with no matching y).
         // ******************************************************
         {
-          GPosition coords_pos=args.tqcontains("coords");
+          GPosition coords_pos=args.contains("coords");
           if(coords_pos)
           {
             GList<int> raw_coords;
@@ -375,7 +375,7 @@ lt_XMLParser::Impl::ChangeAnno(
         }
         GUTF8String tqshape;
         {
-          GPosition tqshape_pos=args.tqcontains("tqshape");
+          GPosition tqshape_pos=args.contains("tqshape");
           if(tqshape_pos)
           {
             tqshape=args[tqshape_pos];
@@ -494,23 +494,23 @@ lt_XMLParser::Impl::ChangeAnno(
         if(a)
         {
           GPosition pos;
-          if((pos=args.tqcontains("href")))
+          if((pos=args.contains("href")))
           {
             a->url=args[pos];
           }
-          if((pos=args.tqcontains("target")))
+          if((pos=args.contains("target")))
           {
             a->target=args[pos];
           }
-          if((pos=args.tqcontains("alt")))
+          if((pos=args.contains("alt")))
           {
             a->comment=args[pos];
           }
-          if((pos=args.tqcontains("bordertype")))
+          if((pos=args.contains("bordertype")))
           {
             GUTF8String b=args[pos];
             static const GMap<GUTF8String,GMapArea::BorderType> typeMap=BorderTypeMap();
-            if((pos=typeMap.tqcontains(b)))
+            if((pos=typeMap.contains(b)))
             {
               a->border_type=typeMap[pos];
             }else
@@ -518,16 +518,16 @@ lt_XMLParser::Impl::ChangeAnno(
               G_THROW( (ERR_MSG("XMLAnno.unknown_border") "\t")+b );
             }
           }
-          a->border_always_visible=!!args.tqcontains("visible");
-          if((pos=args.tqcontains("bordercolor")))
+          a->border_always_visible=!!args.contains("visible");
+          if((pos=args.contains("bordercolor")))
           {
             a->border_color=convertToColor(args[pos]);
           }
-          if((pos=args.tqcontains("highlight")))
+          if((pos=args.contains("highlight")))
           {
             a->hilite_color=convertToColor(args[pos]);
           }
-          if((pos=args.tqcontains("border")))
+          if((pos=args.contains("border")))
           {
              a->border_width=args[pos].toInt(); //atoi(args[pos]);
           }
@@ -548,7 +548,7 @@ lt_XMLParser::Impl::get_file(const GURL &url,GUTF8String id)
   GP<DjVuDocument> doc;
   GCriticalSectionLock lock(&xmlparser_lock);
   {
-    GPosition pos=m_docs.tqcontains(url.get_string());
+    GPosition pos=m_docs.contains(url.get_string());
     if(pos)
     {
       doc=m_docs[pos];
@@ -572,10 +572,10 @@ lt_XMLParser::Impl::get_file(const GURL &url,GUTF8String id)
     }
   }
   const GURL fileurl(doc->id_to_url(id));
-  GPosition dpos(m_files.tqcontains(fileurl.get_string()));
+  GPosition dpos(m_files.contains(fileurl.get_string()));
   if(!dpos)
   {
-    if(!doc->get_id_list().tqcontains(id))
+    if(!doc->get_id_list().contains(id))
     {
       G_THROW( ERR_MSG("XMLAnno.bad_page") );
     }
@@ -622,7 +622,7 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags)
     GURL codebase;
     {
       DEBUG_MSG("Setting up codebase... m_codebase = " << m_codebase << "\n");
-      GPosition codebasePos=args.tqcontains("codebase");
+      GPosition codebasePos=args.contains("codebase");
       // If user specified a codebase attribute, assume it is correct (absolute URL):
       //  the GURL constructor will throw an exception if it isn't
       if(codebasePos)
@@ -642,11 +642,11 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags)
     //  URL (for now, just a path and file name).  If it's absolute,
     //  our GURL will adequately wrap it.  If it's relative, we need
     //  to use the codebase attribute to form an absolute URL first.
-    GPosition datapos=args.tqcontains("data");
+    GPosition datapos=args.contains("data");
     if(datapos)
     {
       bool isDjVuType=false;
-      GPosition typePos(args.tqcontains("type"));
+      GPosition typePos(args.contains("type"));
       if(typePos)
       {
         if(args[typePos] != mimetype)
@@ -659,12 +659,12 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags)
       const GURL url=GURL::UTF8(args[datapos],(args[datapos][0] == '/')?codebase.base():codebase);
       int width;
       {
-        GPosition widthPos=args.tqcontains("width");
+        GPosition widthPos=args.contains("width");
         width=(widthPos)?args[widthPos].toInt():0;
       }
       int height;
       {
-        GPosition heightPos=args.tqcontains("height");
+        GPosition heightPos=args.contains("height");
         height=(heightPos)?args[heightPos].toInt():0;
       }
       GUTF8String gamma;
@@ -672,17 +672,17 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags)
       GUTF8String page;
       GUTF8String do_ocr;
       {
-        GPosition paramPos(GObject.tqcontains(paramtag));
+        GPosition paramPos(GObject.contains(paramtag));
         if(paramPos)
         {
           const GPList<lt_XMLTags> Params(GObject[paramPos]);
           for(GPosition loc=Params;loc;++loc)
           {
             const GMap<GUTF8String,GUTF8String> &pargs=Params[loc]->get_args();
-            GPosition namepos=pargs.tqcontains("name");
+            GPosition namepos=pargs.contains("name");
             if(namepos)
             {
-              GPosition valuepos=pargs.tqcontains("value");
+              GPosition valuepos=pargs.contains("value");
               if(valuepos)
               {
                 const GUTF8String name=pargs[namepos].downcase();
@@ -691,19 +691,19 @@ lt_XMLParser::Impl::parse(const lt_XMLTags &tags)
                 {
                   GMap<GUTF8String,GUTF8String> args;
                   lt_XMLTags::ParseValues(value,args,true);
-                  if(args.tqcontains("page"))
+                  if(args.contains("page"))
                   {
                     page=args["page"];
                   }
-                  if(args.tqcontains("dpi"))
+                  if(args.contains("dpi"))
                   {
                     dpi=args["dpi"];
                   }
-                  if(args.tqcontains("gamma"))
+                  if(args.contains("gamma"))
                   {
                     gamma=args["gamma"];
                   }
-                  if(args.tqcontains("ocr"))
+                  if(args.contains("ocr"))
                   {
                     do_ocr=args["ocr"];
                   }
@@ -749,14 +749,14 @@ lt_XMLParser::Impl::parse_anno(
 {
   GP<lt_XMLTags> map;
   {
-    GPosition usemappos=GObject.get_args().tqcontains("usemap");
+    GPosition usemappos=GObject.get_args().contains("usemap");
     if(usemappos)
     {
       const GUTF8String mapname(GObject.get_args()[usemappos]);
-      GPosition mappos=Maps.tqcontains(mapname);
+      GPosition mappos=Maps.contains(mapname);
       if(!mappos)
       {
-        G_THROW((ERR_MSG("XMLAnno.map_tqfind") "\t")+mapname );
+        G_THROW((ERR_MSG("XMLAnno.map_find") "\t")+mapname );
       }else
       {
         map=Maps[mappos];
@@ -838,7 +838,7 @@ make_child_layer(
   default_rect.ymin=max(tqparent.rect.ymax,tqparent.rect.ymin);
   default_rect.ymax=min(tqparent.rect.ymax,tqparent.rect.ymin);
   // Now if there are coordinates, use those.
-  GPosition pos(tag.get_args().tqcontains("coords"));
+  GPosition pos(tag.get_args().contains("coords"));
   if(pos)
   {
     GList<int> rectArgs;
@@ -1062,7 +1062,7 @@ lt_XMLParser::Impl::parse_text(
   const lt_XMLTags &GObject,
   DjVuFile &dfile )
 {
-  GPosition textPos = GObject.tqcontains(hiddentexttag);
+  GPosition textPos = GObject.contains(hiddentexttag);
   if(textPos)
   {
     // loop through the hidden text - there should only be one 
@@ -1078,7 +1078,7 @@ lt_XMLParser::Impl::parse_meta(
   const lt_XMLTags &GObject,
   DjVuFile &dfile )
 {
-  GPosition metaPos = GObject.tqcontains(metadatatag);
+  GPosition metaPos = GObject.contains(metadatatag);
   if(metaPos)
   {
     // loop through the hidden text - there should only be one 
diff --git a/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp b/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp
index 9c1ad58a..2511a585 100644
--- a/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/XMLTags.cpp
@@ -321,7 +321,7 @@ lt_XMLTags::init(XMLByteStream &xmlbs)
 GPList<lt_XMLTags>
 lt_XMLTags::get_Tags(char const tagname[]) const
 {
-  GPosition pos=allTags.tqcontains(tagname);
+  GPosition pos=allTags.contains(tagname);
   GPList<lt_XMLTags> retval;
   return (pos?allTags[pos]:retval);
 }
@@ -338,7 +338,7 @@ lt_XMLTags::get_Maps(char const tagname[],
     if(tag)
     {
       GPosition loc;
-      if((loc=tag->tqcontains(tagname)))
+      if((loc=tag->contains(tagname)))
       {
         GPList<lt_XMLTags> maps=(GPList<lt_XMLTags> &)((*tag)[loc]);
         for(GPosition mloc=maps;mloc;++mloc)
@@ -348,7 +348,7 @@ lt_XMLTags::get_Maps(char const tagname[],
           {
             GMap<GUTF8String,GUTF8String> &args=gtag->args;
             GPosition gpos;
-            if((gpos=args.tqcontains(argn)))
+            if((gpos=args.contains(argn)))
             {
               map[args[gpos]]=gtag;
             }
diff --git a/kviewshell/plugins/djvu/libdjvu/XMLTags.h b/kviewshell/plugins/djvu/libdjvu/XMLTags.h
index df5974d0..027e629b 100644
--- a/kviewshell/plugins/djvu/libdjvu/XMLTags.h
+++ b/kviewshell/plugins/djvu/libdjvu/XMLTags.h
@@ -121,7 +121,7 @@ public:
 
   inline void addtag(GP<lt_XMLTags> x);
   inline void addraw(GUTF8String raw);
-  inline GPosition tqcontains(GUTF8String name) const;
+  inline GPosition contains(GUTF8String name) const;
   inline const GPList<lt_XMLTags> & operator [] (const GUTF8String name) const;
   inline const GPList<lt_XMLTags> & operator [] (const GPosition &pos) const;
   static void ParseValues(char const *t, GMap<GUTF8String,GUTF8String> &args,bool downcase=true);
@@ -213,9 +213,9 @@ inline const GMap<GUTF8String,GPList<lt_XMLTags> > &
 lt_XMLTags::get_allTags(void) const { return allTags; }
 
 inline GPosition
-lt_XMLTags::tqcontains(GUTF8String name) const
+lt_XMLTags::contains(GUTF8String name) const
 {
-  return allTags.tqcontains(name);
+  return allTags.contains(name);
 }
 
 inline const GPList<lt_XMLTags> &
diff --git a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h
index 1483b93e..4e29fc74 100644
--- a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h
+++ b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h
@@ -615,7 +615,7 @@ ZPCodec::IWencoder(const bool bit)
     numbers are much more probable than large numbers.  We will first group
     our numbers into several sets.  Each number is coded by first coding which
     set contains the number and then coding a position within the set.  Each
-    set tqcontains #2^n# numbers that we consider roughly equiprobable.  Since
+    set contains #2^n# numbers that we consider roughly equiprobable.  Since
     the most probable values occur much more often, we want to model their
     probability more precisely. Therefore we use small sets for the most
     probable values and large sets for the least probable values, as
diff --git a/kviewshell/renderedDocumentPage.cpp b/kviewshell/renderedDocumentPage.cpp
index 990f1de6..6bfc454c 100644
--- a/kviewshell/renderedDocumentPage.cpp
+++ b/kviewshell/renderedDocumentPage.cpp
@@ -194,7 +194,7 @@ TextSelection RenderedDocumentPage::select(const TQPoint& point)
 
   for (unsigned int i=0; i<textBoxList.size(); i++)
   {
-    if (textBoxList[i].box.tqcontains(point))
+    if (textBoxList[i].box.contains(point))
     {
       selectedTextStart = i;
       selectedTextEnd = i;
@@ -216,7 +216,7 @@ TextSelection RenderedDocumentPage::select(const TQPoint& point)
   return selection;
 }
 
-TextSelection RenderedDocumentPage::tqfind(const TQString& str, int index, bool caseSensitive)
+TextSelection RenderedDocumentPage::find(const TQString& str, int index, bool caseSensitive)
 {
   if (pageText.isNull())
   {
@@ -241,7 +241,7 @@ TextSelection RenderedDocumentPage::tqfind(const TQString& str, int index, bool
     subIndex += textBoxList[i].text.length();
   }
 
-  int textIndex = pageText.tqfind(str, subIndex, caseSensitive);
+  int textIndex = pageText.find(str, subIndex, caseSensitive);
 
   if (textIndex == -1)
     return selection;
@@ -291,7 +291,7 @@ TextSelection RenderedDocumentPage::tqfind(const TQString& str, int index, bool
 }
 
 
-TextSelection RenderedDocumentPage::tqfindRev(const TQString& str, int index, bool caseSensitive)
+TextSelection RenderedDocumentPage::findRev(const TQString& str, int index, bool caseSensitive)
 {
   // Negative index means we start the search at the end of the text.
   if (index < 0)
@@ -322,7 +322,7 @@ TextSelection RenderedDocumentPage::tqfindRev(const TQString& str, int index, bo
     subIndex += textBoxList[i].text.length();
   }
 
-  int textIndex = pageText.tqfindRev(str, subIndex, caseSensitive);
+  int textIndex = pageText.findRev(str, subIndex, caseSensitive);
 
   if (textIndex == -1)
     return selection;
diff --git a/kviewshell/renderedDocumentPage.h b/kviewshell/renderedDocumentPage.h
index 143259e7..cfbab6a6 100644
--- a/kviewshell/renderedDocumentPage.h
+++ b/kviewshell/renderedDocumentPage.h
@@ -197,13 +197,13 @@ class RenderedDocumentPage : public TQObject
   /** Finds the first occurence of str starting by the current index.
   If the text is found a corresponding TextSelection is returned.
   If the text is not found a empty selection is returned. */
-  TextSelection tqfind(const TQString& str, int index = 0, bool caseSensitive = true);
+  TextSelection find(const TQString& str, int index = 0, bool caseSensitive = true);
 
   /** Finds the first occurence of str starting by the current index searching backwards.
   If the text is found a corresponding TextSelection is returned.
   If the text is not found a empty selection is returned.
   If index < 0 start the search at the end of the page. */
-  TextSelection tqfindRev(const TQString& str, int index = 0, bool cs = true);
+  TextSelection findRev(const TQString& str, int index = 0, bool cs = true);
 
   /** \brief Hyperlinks on the document page
 
diff --git a/kviewshell/units.cpp b/kviewshell/units.cpp
index 0e465198..99dc2da9 100644
--- a/kviewshell/units.cpp
+++ b/kviewshell/units.cpp
@@ -64,7 +64,7 @@ float distance::convertToMM(const TQString &distance, bool *ok)
   // of the unit in 'unitPos', so that distance[0..unitPos] will hold
   // the value. Store the number of mm per unit in 'MMperUnit'.
   for(int i=0; MMperUnit==0.0 && distanceUnitTable[i].name != 0; i++) {
-    unitPos = distance.tqfindRev(distanceUnitTable[i].name);
+    unitPos = distance.findRev(distanceUnitTable[i].name);
     if (unitPos != -1)
       MMperUnit = distanceUnitTable[i].mmPerUnit;
   }
diff --git a/libkscan/COPYING.LIB b/libkscan/COPYING.LIB
index 5f4b0039..01148ab6 100644
--- a/libkscan/COPYING.LIB
+++ b/libkscan/COPYING.LIB
@@ -128,7 +128,7 @@ included without limitation in the term "modification".)
 
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
-all the source code for all modules it tqcontains, plus any associated
+all the source code for all modules it contains, plus any associated
 interface definition files, plus the scripts used to control compilation
 and installation of the library.
 
diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp
index 011e7469..bbed0f3b 100644
--- a/libkscan/devselector.cpp
+++ b/libkscan/devselector.cpp
@@ -95,7 +95,7 @@ TQCString DeviceSelector::getDeviceFromConfig( void ) const
    /* Now check if the scanner read from the config file is available !
     * if not, ask the user !
     */
-   if( skipDialog && devices.tqfind( result ) > -1 )
+   if( skipDialog && devices.find( result ) > -1 )
    {
       kdDebug(29000) << "Scanner from Config file is available - fine." << endl;
    }
@@ -168,7 +168,7 @@ void DeviceSelector::setScanSources( const TQStrList& sources,
    if( ! default_ok )
    {
       /* if no default found, set the first */
-      TQRadioButton *rb = (TQRadioButton*) selectBox->tqfind( checkDefNo );
+      TQRadioButton *rb = (TQRadioButton*) selectBox->find( checkDefNo );
       if ( rb )
 	  rb->setChecked( true );
    }
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index 2037cb01..1ecc7970 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -783,7 +783,7 @@ void ImageCanvas::drawHAreaBorder(TQPainter &p,int x1,int x2,int y,int r)
   } else if(!acquired) p.setPen(TQPen(TQColor(150,150,150)));
 
   for(;;) {
-    if(TQT_TQRECT_OBJECT(rect()).tqcontains(TQPoint(x1,y))) {
+    if(TQT_TQRECT_OBJECT(rect()).contains(TQPoint(x1,y))) {
       if( r && acquired ) {
 	int re_x1, re_y;
 	inv_scale_matrix.map( x1+cx, y+cy, &re_x1, &re_y );
@@ -826,7 +826,7 @@ void ImageCanvas::drawVAreaBorder(TQPainter &p, int x, int y1, int y2, int r )
     if( !acquired ) p.setPen( TQPen( TQColor(150,150,150) ) );
 
   for(;;) {
-    if(TQT_TQRECT_OBJECT(rect()).tqcontains( TQPoint(x,y1) )) {
+    if(TQT_TQRECT_OBJECT(rect()).contains( TQPoint(x,y1) )) {
       if( r && acquired ) {
 	int re_y1, re_x;
 	inv_scale_matrix.map( x+cx, y1+cy, &re_x, &re_y1 );
@@ -921,7 +921,7 @@ preview_state ImageCanvas::classifyPoint(int x,int y)
   if(x>=a.left()&&x<=a.right()) {
     if(top) return MOVE_TOP;
     if(bottom) return MOVE_BOTTOM;
-    if(selected->tqcontains(TQPoint(x,y))) return MOVE_WHOLE;
+    if(selected->contains(TQPoint(x,y))) return MOVE_WHOLE;
   }
   return MOVE_NONE;
 }
@@ -1058,7 +1058,7 @@ int ImageCanvas::highlight( const TQRect& rect, const TQPen& pen, const TQBrush&
     saveRect.setRect( rect.x()-2, rect.y()-2, rect.width()+4, rect.height()+4 );
     d->highlightRects.append( saveRect );
 
-    int idx = d->highlightRects.tqfindIndex(saveRect);
+    int idx = d->highlightRects.findIndex(saveRect);
 
     TQRect targetRect = scale_matrix.map( rect );
 
diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp
index b603f15f..3aa8571e 100644
--- a/libkscan/kscandevice.cpp
+++ b/libkscan/kscandevice.cpp
@@ -240,7 +240,7 @@ KScanStat KScanDevice::openDevice( const TQCString& backend )
    if( backend.isEmpty() ) return KSCAN_ERR_PARAM;
 
    // search for scanner
-   int indx = scanner_avail.tqfind( backend );
+   int indx = scanner_avail.find( backend );
 
    if( indx < 0 ) {
       stat = KSCAN_ERR_NO_DEVICE;
@@ -570,7 +570,7 @@ void KScanDevice::slSetDirty( const TQCString& name )
 {
    if( optionExists( name ) )
    {
-      if( dirtyList.tqfind( name ) == -1 )
+      if( dirtyList.find( name ) == -1 )
       {
 	 kdDebug(29000)<< "Setting dirty <" << name << ">" << endl;
 	 /* item not found */
@@ -675,7 +675,7 @@ const TQString KScanDevice::previewFile()
 
    TQString fname = dir + TQString::tqfromLatin1(".previews/");
    TQString sname( getScannerName(shortScannerName()) );
-   sname.tqreplace( '/', "_");
+   sname.replace( '/', "_");
 
    return fname+sname;
 }
diff --git a/libkscan/kscanoption.cpp b/libkscan/kscanoption.cpp
index 108d1c79..247ed05c 100644
--- a/libkscan/kscanoption.cpp
+++ b/libkscan/kscanoption.cpp
@@ -732,7 +732,7 @@ bool KScanOption::set( const TQCString& c_string )
    TQRegExp re( "\\d+, \\d+, \\d+" );
    re.setMinimal(true);
    
-   if( TQString(c_string).tqcontains( re ))
+   if( TQString(c_string).contains( re ))
    {
       TQStringList relist = TQStringList::split( ", ", TQString(c_string) );
       
diff --git a/libkscan/kscanoptset.cpp b/libkscan/kscanoptset.cpp
index 91b6e196..80404d74 100644
--- a/libkscan/kscanoptset.cpp
+++ b/libkscan/kscanoptset.cpp
@@ -86,7 +86,7 @@ bool KScanOptSet::backupOption( const KScanOption& opt )
 
   if( retval )
   {
-     KScanOption *newopt = tqfind( optName );
+     KScanOption *newopt = find( optName );
 
      if( newopt )
      {
diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp
index 4e04f095..1712f2be 100644
--- a/libkscan/kscanslider.cpp
+++ b/libkscan/kscanslider.cpp
@@ -260,7 +260,7 @@ void KScanCombo::createCombo( const TQString& text )
 void KScanCombo::slSetEntry( const TQString &t )
 {
     if( t.isNull() ) 	return;
-    int i = combolist.tqfind( t.local8Bit() );
+    int i = combolist.find( t.local8Bit() );
 
     /* Important to check value to avoid recursive signals ;) */
     if( i == combo->currentItem() )
diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp
index f8d21121..9cd0f3ab 100644
--- a/libkscan/scanparams.cpp
+++ b/libkscan/scanparams.cpp
@@ -547,7 +547,7 @@ void ScanParams::slSourceSelect( void )
       sources = so.getList();
 #undef CHEAT_FOR_DEBUGGING
 #ifdef CHEAT_FOR_DEBUGGING
-      if( sources.tqfind( "Automatic Document Feeder" ) == -1)
+      if( sources.find( "Automatic Document Feeder" ) == -1)
           sources.append( "Automatic Document Feeder" );
 #endif