Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

190 files changed, 1012 insertions, 1012 deletions

diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 2e8e45e2..f786203a 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -197,7 +197,7 @@ void KCamera::load(KConfig *config)
 		m_model = config->readEntry("Model");
 	if (m_path.isNull())
 		m_path = config->readEntry("Path");
-	tqinvalidateCamera();
+	invalidateCamera();
 }
 
 void KCamera::save(KConfig *config)
@@ -223,17 +223,17 @@ void KCamera::setName(const TQString &name)
 void KCamera::setModel(const TQString &model)
 {
 	m_model = model;
-	tqinvalidateCamera();
+	invalidateCamera();
 	initInformation();
 }
 
 void KCamera::setPath(const TQString &path)
 {
 	m_path = path;
-	tqinvalidateCamera();
+	invalidateCamera();
 }
 
-void KCamera::tqinvalidateCamera()
+void KCamera::invalidateCamera()
 {
 	if (m_camera) {
 		gp_camera_free(m_camera);
diff --git a/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h
index 4b8205b7..698622df 100644
--- a/kamera/kcontrol/kameradevice.h
+++ b/kamera/kcontrol/kameradevice.h
@@ -44,7 +44,7 @@ class KCamera : public TQObject {
 public:
 	KCamera(const TQString &name, const TQString &path);
 	~KCamera();
-	void tqinvalidateCamera();
+	void invalidateCamera();
 	bool configure();
 	void load(KConfig *m_config);
 	void save(KConfig *m_config);
diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp
index 1abfd861..b82a92ca 100644
--- a/kcoloredit/kcoloreditview.cpp
+++ b/kcoloredit/kcoloreditview.cpp
@@ -145,7 +145,7 @@ void KColorEditView::setColorAtCursorComponentValueLabelSizes(TQLabel* const lab
 }
 
 KColorEditDoc *KColorEditView::document() const {
-  KColorEditApp *theApp=(KColorEditApp *) tqparentWidget();
+  KColorEditApp *theApp=(KColorEditApp *) parentWidget();
 
   return theApp->document();
 }
diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp
index 562c40f9..496e8ff9 100644
--- a/kdvi/TeXFont_PK.cpp
+++ b/kdvi/TeXFont_PK.cpp
@@ -347,7 +347,7 @@ static const uchar bitflip[256] = {
   15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255
 };                                                                              
 
-static TQ_UINT32	bit_tqmasks[33] = {
+static TQ_UINT32	bit_masks[33] = {
 	0x0,		0x1,		0x3,		0x7,
 	0xf,		0x1f,		0x3f,		0x7f,
 	0xff,		0x1ff,		0x3ff,		0x7ff,
@@ -595,12 +595,12 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	    h_bit -= count;
 	    word_weight -= count;
 	    if (paint_switch)
-	      word |= bit_tqmasks[count] << word_weight;
+	      word |= bit_masks[count] << word_weight;
 	    count = 0;
 	  } else 
 	    if (count >= h_bit && h_bit <= word_weight) {
 	      if (paint_switch)
-		word |= bit_tqmasks[h_bit] << (word_weight - h_bit);
+		word |= bit_masks[h_bit] << (word_weight - h_bit);
 	      *cp++ = word;
 	      /* "output" row(s) */
 	      for (i = PK_repeat_count * bytes_wide / 4; i > 0; --i) {
@@ -615,7 +615,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	      h_bit = characterBitmaps[ch]->w;
 	    } else {
 	      if (paint_switch)
-		word |= bit_tqmasks[word_weight];
+		word |= bit_masks[word_weight];
 	      *cp++ = word;
 	      word = 0;
 	      count -= word_weight;
@@ -679,14 +679,14 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	while (count > 0) {
 	  if (count < word_weight && count < h_bit) {
 	    if (paint_switch)
-	      word |= bit_tqmasks[count] << (32 - word_weight);
+	      word |= bit_masks[count] << (32 - word_weight);
 	    h_bit -= count;
 	    word_weight -= count;
 	    count = 0;
 	  } else 
 	    if (count >= h_bit && h_bit <= word_weight) {
 	      if (paint_switch)
-		word |= bit_tqmasks[h_bit] << (32 - word_weight);
+		word |= bit_masks[h_bit] << (32 - word_weight);
 	      *cp++ = word;
 	      /* "output" row(s) */
 	      for (i = PK_repeat_count * bytes_wide / 4; i > 0; --i) {
@@ -701,7 +701,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	      h_bit = characterBitmaps[ch]->w;
 	    } else {
 	      if (paint_switch)
-		word |= bit_tqmasks[word_weight] << (32 - word_weight);
+		word |= bit_masks[word_weight] << (32 - word_weight);
 	      *cp++ = word;
 	      word = 0;
 	      count -= word_weight;
diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp
index 5133b2ab..40463d36 100644
--- a/kdvi/dviRenderer.cpp
+++ b/kdvi/dviRenderer.cpp
@@ -79,7 +79,7 @@ dviRenderer::dviRenderer(TQWidget *par)
 
   connect(&font_pool, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) );
 
-  tqparentWidget = par;
+  parentWidget = par;
   shrinkfactor = 3;
   current_page = 0;
   resolutionInDPI = 0.0;
@@ -206,7 +206,7 @@ void dviRenderer::drawPage(double resolution, RenderedDocumentPage *page)
   
   page->isEmpty = false;
   if (errorMsg.isEmpty() != true) {
-    KMessageBox::detailedError(tqparentWidget,
+    KMessageBox::detailedError(parentWidget,
 			       i18n("<qt><strong>File corruption!</strong> KDVI had trouble interpreting your DVI file. Most "
 				    "likely this means that the DVI file is broken.</qt>"),
 			       errorMsg, i18n("DVI File Error"));
@@ -260,7 +260,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
   
   if (showMsg) {
     KDialogBase *dialog= new KDialogBase(i18n("KDVI: Information"), KDialogBase::Yes, KDialogBase::Yes, KDialogBase::Yes,
-					 tqparentWidget, "information", true, true,KStdGuiItem::ok() );
+					 parentWidget, "information", true, true,KStdGuiItem::ok() );
     
     TQVBox *topcontents = new TQVBox (dialog);
     topcontents->setSpacing(KDialog::spacingHint()*2);
@@ -311,7 +311,7 @@ void dviRenderer::embedPostScript()
   if (!dviFile)
     return;
 
-  embedPS_progress = new KProgressDialog(tqparentWidget, "embedPSProgressDialog",
+  embedPS_progress = new KProgressDialog(parentWidget, "embedPSProgressDialog",
 					 i18n("Embedding PostScript Files"), TQString(), true);
   if (!embedPS_progress)
     return;
@@ -342,10 +342,10 @@ void dviRenderer::embedPostScript()
 
   if (!errorMsg.isEmpty()) {
     errorMsg = "<qt>" + errorMsg + "</qt>";
-    KMessageBox::detailedError(tqparentWidget, "<qt>" + i18n("Not all PostScript files could be embedded into your document.") + "</qt>", errorMsg);
+    KMessageBox::detailedError(parentWidget, "<qt>" + i18n("Not all PostScript files could be embedded into your document.") + "</qt>", errorMsg);
     errorMsg = TQString();
   } else
-    KMessageBox::information(tqparentWidget, "<qt>" + i18n("All external PostScript files were embedded into your document. You "
+    KMessageBox::information(parentWidget, "<qt>" + i18n("All external PostScript files were embedded into your document. You "
 						 "will probably want to save the DVI file now.") + "</qt>",
 			     TQString(), "embeddingDone");
 
@@ -435,7 +435,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
   
   // Make sure the file actually exists.
   if (!fi.exists() || fi.isDir()) {
-    KMessageBox::error( tqparentWidget,
+    KMessageBox::error( parentWidget,
 			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist. "
 			     "KDVI already tried to add the ending '.dvi'.</qt>").tqarg(filename),
 			i18n("File Error!"));
@@ -448,7 +448,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
   // the multipage.
   TQString mimetype( KMimeMagic::self()->findFileType( fname )->mimeType() );
   if (mimetype != "application/x-dvi") {
-    KMessageBox::sorry( tqparentWidget,
+    KMessageBox::sorry( parentWidget,
 			i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr> which has "
 			      "type <strong>%2</strong>. KDVI can only load DVI (.dvi) files.</qt>" )
 			.tqarg( fname )
@@ -459,7 +459,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
   // Check if the file is a valid DVI file.
   if (!isValidFile(filename))
   {
-    KMessageBox::sorry( tqparentWidget,
+    KMessageBox::sorry( parentWidget,
                         i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
                              "likely this means that the DVI file is broken.</qt>")
                         .tqarg( fname ) );
@@ -477,7 +477,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
   if ((dviFile_new->dvi_Data() == NULL)||(dviFile_new->errorMsg.isEmpty() != true)) {
     TQApplication::restoreOverrideCursor();
     if (dviFile_new->errorMsg.isEmpty() != true)
-      KMessageBox::detailedError(tqparentWidget,
+      KMessageBox::detailedError(parentWidget,
 				 i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
 				      "likely this means that the DVI file is broken.</qt>"),
 				 dviFile_new->errorMsg, i18n("DVI File Error"));
@@ -637,7 +637,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
     TQString  refFileName   = splitter.filePath();
     
     if (sourceHyperLinkAnchors.isEmpty()) {
-      KMessageBox::sorry(tqparentWidget, i18n("<qt>You have asked KDVI to locate the place in the DVI file which corresponds to "
+      KMessageBox::sorry(parentWidget, i18n("<qt>You have asked KDVI to locate the place in the DVI file which corresponds to "
 				    "line %1 in the TeX-file <strong>%2</strong>. It seems, however, that the DVI file "
 				    "does not contain the necessary source file information. "
 				    "We refer to the manual of KDVI for a detailed explanation on how to include this "
@@ -680,7 +680,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
       return Anchor(bestMatch->page, bestMatch->distance_from_top);
     } else
       if (anchorForRefFileFound == false)
-	KMessageBox::sorry(tqparentWidget, i18n("<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
+	KMessageBox::sorry(parentWidget, i18n("<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
 					      "line %1 in the TeX-file <strong>%2</strong>.</qt>").tqarg(refLineNumber).tqarg(refFileName),
 			   i18n( "Could Not Find Reference" ));
       else {
@@ -733,7 +733,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
   TQString TeXfile = splitter.filePath();
   if ( ! splitter.fileExists() )
   {
-      KMessageBox::sorry(tqparentWidget, TQString("<qt>") +
+      KMessageBox::sorry(parentWidget, TQString("<qt>") +
 			 i18n("The DVI-file refers to the TeX-file "
 			      "<strong>%1</strong> which could not be found.").tqarg(KShellProcess::quote(TeXfile)) +
 			 TQString("</qt>"),
@@ -743,7 +743,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
   
   TQString command = editorCommand;
   if (command.isEmpty() == true) {
-    int r = KMessageBox::warningContinueCancel(tqparentWidget, TQString("<qt>") +
+    int r = KMessageBox::warningContinueCancel(parentWidget, TQString("<qt>") +
 					       i18n("You have not yet specified an editor for inverse search. "
 						    "Please choose your favorite editor in the "
 						    "<strong>DVI options dialog</strong> "
diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp
index 2e862803..d23a15ce 100644
--- a/kdvi/dviRenderer_export.cpp
+++ b/kdvi/dviRenderer_export.cpp
@@ -96,12 +96,12 @@ void dviRenderer::exportPDF()
   TQString suggestedName = dviFile->filename;
   suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".pdf";
 
-  TQString fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.pdf|Portable Document Format (*.pdf)"), tqparentWidget, i18n("Export File As"));
+  TQString fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.pdf|Portable Document Format (*.pdf)"), parentWidget, i18n("Export File As"));
   if (fileName.isEmpty())
     return;
   TQFileInfo finfo(fileName);
   if (finfo.exists()) {
-    int r = KMessageBox::warningContinueCancel (tqparentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
+    int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
 				       i18n("Overwrite File"), i18n("Overwrite"));
     if (r == KMessageBox::Cancel)
       return;
@@ -116,7 +116,7 @@ void dviRenderer::exportPDF()
 					  "a while because dvipdfm needs to generate its own bitmap fonts "
 					  "Please be patient."),
 				     i18n("Waiting for dvipdfm to finish..."),
-				     tqparentWidget, i18n("dvipdfm progress dialog"), false );
+				     parentWidget, i18n("dvipdfm progress dialog"), false );
   if (progress != 0) {
     progress->TextLabel2->setText( i18n("Please be patient") );
     progress->setTotalSteps( dviFile->total_pages );
@@ -177,7 +177,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
     return;
 
   if (dviFile->numberOfExternalNONPSFiles != 0) {
-    KMessageBox::sorry( tqparentWidget, 
+    KMessageBox::sorry( parentWidget, 
 			i18n("<qt><P>This DVI file refers to external graphic files which are not in PostScript format, and cannot be handled by the "
 			     "<strong>dvips</strong> program that KDVI uses interally to print or to export to PostScript. The functionality that "
 			     "you require is therefore unavailable in this version of KDVI.</p>"
@@ -195,12 +195,12 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
     TQString suggestedName = dviFile->filename;
     suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".ps";
 
-    fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.ps|PostScript (*.ps)"), tqparentWidget, i18n("Export File As"));
+    fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.ps|PostScript (*.ps)"), parentWidget, i18n("Export File As"));
     if (fileName.isEmpty())
       return;
     TQFileInfo finfo(fileName);
     if (finfo.exists()) {
-      int r = KMessageBox::warningYesNo (tqparentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
+      int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
 					 i18n("Overwrite File"));
       if (r == KMessageBox::No)
 	return;
@@ -219,7 +219,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
 					  "a while because dvips needs to generate its own bitmap fonts "
 					  "Please be patient."),
 				     i18n("Waiting for dvips to finish..."),
-				     tqparentWidget, i18n("dvips progress dialog"), false );
+				     parentWidget, i18n("dvips progress dialog"), false );
   if (progress != 0) {
     progress->TextLabel2->setText( i18n("Please be patient") );
     progress->setTotalSteps( dviFile->total_pages );
@@ -341,7 +341,7 @@ void dviRenderer::dvips_terminated(KProcess *sproc)
   // export_errorString, does not correspond to sproc. In that case,
   // we ingore the return status silently.
   if ((proc == sproc) && (sproc->normalExit() == true) && (sproc->exitStatus() != 0))
-    KMessageBox::error( tqparentWidget, export_errorString );
+    KMessageBox::error( parentWidget, export_errorString );
 
   if (export_printer != 0)
     export_printer->printFiles( TQStringList(export_fileName), true );
@@ -359,7 +359,7 @@ void dviRenderer::editorCommand_terminated(KProcess *sproc)
   // export_errorString, does not correspond to sproc. In that case,
   // we ingore the return status silently.
   if ((proc == sproc) && (sproc->normalExit() == true) && (sproc->exitStatus() != 0))
-    KMessageBox::error( tqparentWidget, export_errorString );
+    KMessageBox::error( parentWidget, export_errorString );
 
   // Let's hope that this is not all too nasty... killing a
   // KShellProcess from a slot that was called from the KShellProcess
diff --git a/kdvi/fontpool.cpp b/kdvi/fontpool.cpp
index 32b75afd..17bc4a3d 100644
--- a/kdvi/fontpool.cpp
+++ b/kdvi/fontpool.cpp
@@ -77,7 +77,7 @@ fontPool::fontPool()
   // pixmaps. Experiments show that --depending of the configuration
   // of QT at compile and runtime or the availability of the XFt
   // extension, alpha channels are either supported, or silently
-  // converted to 1-bit tqmasks.
+  // converted to 1-bit masks.
   TQImage start(1, 1, 32); // Generate a 1x1 image, black with alpha=0x10
   start.setAlphaBuffer(true);
   TQ_UINT32 *destScanLine = (TQ_UINT32 *)start.scanLine(0);
diff --git a/kdvi/fontpool.h b/kdvi/fontpool.h
index 753f95e1..e39dc690 100644
--- a/kdvi/fontpool.h
+++ b/kdvi/fontpool.h
@@ -125,7 +125,7 @@ public:
       channel of pixmaps. Experiments show that --depending of the
       configuration of QT at compile and runtime or the availability
       of the XFt extension, alpha channels are either supported, or
-      silently converted to 1-bit tqmasks. The redering routines in the
+      silently converted to 1-bit masks. The redering routines in the
       TeXFont implementation use this flag to choose the apropriate
       drawing routines for the different setups. */
   bool TQPixmapSupportsAlpha;
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index b1995b88..9fc5703d 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -49,9 +49,9 @@ K_EXPORT_COMPONENT_FACTORY(kdvipart, KDVIMultiPageFactory)
 
 
 
-KDVIMultiPage::KDVIMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
                              const char *name, const TQStringList& args)
-  : KMultiPage(tqparentWidget, widgetName, tqparent, name), DVIRenderer(tqparentWidget)
+  : KMultiPage(parentWidget, widgetName, tqparent, name), DVIRenderer(parentWidget)
 {
   Q_UNUSED(args);
 #ifdef PERFORMANCE_MEASUREMENT
@@ -239,7 +239,7 @@ void KDVIMultiPage::print()
 
   // Show the printer options dialog. Return immediately if the user
   // aborts.
-  if (!printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) ))
+  if (!printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) ))
     return;
 
   // This funny method call is necessary for the KPrinter to return
diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h
index cbc7d125..ee50e218 100644
--- a/kdvi/kdvi_multipage.h
+++ b/kdvi/kdvi_multipage.h
@@ -15,7 +15,7 @@ class KDVIMultiPage : public KMultiPage
   TQ_OBJECT
 
 public:
-  KDVIMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+  KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
                 const char *name, const TQStringList& args = TQStringList());
   virtual ~KDVIMultiPage();
 
diff --git a/kdvi/optionDialogFontsWidget_base.ui b/kdvi/optionDialogFontsWidget_base.ui
index 22f7a119..766f6b98 100644
--- a/kdvi/optionDialogFontsWidget_base.ui
+++ b/kdvi/optionDialogFontsWidget_base.ui
@@ -59,6 +59,6 @@
 <Q_SLOTS>
     <slot>buttonGroup1_clicked(int)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kdvi/optionDialogSpecialWidget_base.ui b/kdvi/optionDialogSpecialWidget_base.ui
index 62cb4f6d..e821d761 100644
--- a/kdvi/optionDialogSpecialWidget_base.ui
+++ b/kdvi/optionDialogSpecialWidget_base.ui
@@ -199,7 +199,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kdvi/special.cpp b/kdvi/special.cpp
index 94a7a5ca..5bd082cb 100644
--- a/kdvi/special.cpp
+++ b/kdvi/special.cpp
@@ -650,11 +650,11 @@ void dviRenderer::applicationDoSpecial(char *cp)
     // line break is encountered) 
     if (special_command.startsWith("ps:SDict begin [") && special_command.endsWith(" pdfmark end")) {
       if (!currentlyDrawnPage->hyperLinkList.isEmpty()) {
-        // Parse the PostScript literal text string inside tqparentheses
+        // Parse the PostScript literal text string inside parentheses
         // and store it into 'targetName'.  The scanner works
         // according to "PostScript language reference, third edition"
         // - Sec. 3.2.2. The specification is implemented completely:
-        // balanced tqparentheses and all escape sequences are
+        // balanced parentheses and all escape sequences are
         // considered.
         TQString tmpTargetName = special_command.section('(', 1);
         TQString targetName;
diff --git a/kfaxview/faxmultipage.cpp b/kfaxview/faxmultipage.cpp
index 2362d281..2f3fc5b4 100644
--- a/kfaxview/faxmultipage.cpp
+++ b/kfaxview/faxmultipage.cpp
@@ -31,9 +31,9 @@ typedef KParts::GenericFactory<FaxMultiPage> FaxMultiPageFactory;
 K_EXPORT_COMPONENT_FACTORY(kfaxviewpart, FaxMultiPageFactory)
 
 
-FaxMultiPage::FaxMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+FaxMultiPage::FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
                              const char *name, const TQStringList&)
-  : KMultiPage(tqparentWidget, widgetName, tqparent, name), faxRenderer(tqparentWidget)
+  : KMultiPage(parentWidget, widgetName, tqparent, name), faxRenderer(parentWidget)
 {
   /* This is kparts wizardry that cannot be understood by man. Simply
      change the names to match your implementation.  */
diff --git a/kfaxview/faxmultipage.h b/kfaxview/faxmultipage.h
index 71e24b72..b9e3219d 100644
--- a/kfaxview/faxmultipage.h
+++ b/kfaxview/faxmultipage.h
@@ -90,7 +90,7 @@ public:
   kmultipage. Please have a look at the constructor's source code to
   see how to adjust this for your implementation.
   */
-  FaxMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+  FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
 		   const char *name, const TQStringList& args = TQStringList());
   
   /** Destructor
diff --git a/kfaxview/faxrenderer.cpp b/kfaxview/faxrenderer.cpp
index ec21ca06..ee4c84a0 100644
--- a/kfaxview/faxrenderer.cpp
+++ b/kfaxview/faxrenderer.cpp
@@ -135,7 +135,7 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
   TQFileInfo fi(fname);
   TQString   filename = fi.absFilePath();
   if (!fi.exists() || fi.isDir()) {
-    KMessageBox::error( tqparentWidget,
+    KMessageBox::error( parentWidget,
 			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
 			i18n("File Error"));
     // the return value 'false' indicates that this operation was not successful.
@@ -156,11 +156,11 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
     // leaving an error message in fax.errorString(). We try to handle
     // this case gracefully.
     if (fax.errorString().isEmpty())
-      KMessageBox::error( tqparentWidget,
+      KMessageBox::error( parentWidget,
 			  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
 			  i18n("File Error"));
     else
-      KMessageBox::detailedError( tqparentWidget,
+      KMessageBox::detailedError( parentWidget,
 				  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
 				  fax.errorString(),
 				  i18n("File Error"));
diff --git a/kfile-plugins/ps/gscreator.cpp b/kfile-plugins/ps/gscreator.cpp
index 9a9bafd7..e9fb558b 100644
--- a/kfile-plugins/ps/gscreator.cpp
+++ b/kfile-plugins/ps/gscreator.cpp
@@ -176,7 +176,7 @@ bool GSCreator::create(const TQString &path, int width, int height, TQImage &img
 {
 // The code in the loop (when testing whether got_sig_term got set)
 // should read some variation of:
-// 		tqparentJob()->wasKilled()
+// 		parentJob()->wasKilled()
 //
 // Unfortunatelly, that's currently impossible without breaking BIC.
 // So we need to catch the signal ourselves.
diff --git a/kghostview/generalsettingswidget.ui b/kghostview/generalsettingswidget.ui
index 09ab2764..5664e8d8 100644
--- a/kghostview/generalsettingswidget.ui
+++ b/kghostview/generalsettingswidget.ui
@@ -106,6 +106,6 @@ In case of problems you might want to see its error messages</string>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">generalsettingswidget.ui.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kghostview/gssettingswidget.ui b/kghostview/gssettingswidget.ui
index a92ecc39..756f8b50 100644
--- a/kghostview/gssettingswidget.ui
+++ b/kghostview/gssettingswidget.ui
@@ -145,8 +145,8 @@
 <Q_SLOTS>
     <slot specifier="non virtual">setDetectedVersion( TQString v )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index 1056d22b..35d82a7b 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -74,7 +74,7 @@ namespace KGV {
     }
 }
 
-KGVPart::KGVPart( TQWidget* tqparentWidget, const char*,
+KGVPart::KGVPart( TQWidget* parentWidget, const char*,
                   TQObject* tqparent, const char* name,
                   const TQStringList &args ) :
     KParts::ReadOnlyPart( tqparent, name ),
@@ -108,7 +108,7 @@ KGVPart::KGVPart( TQWidget* tqparentWidget, const char*,
 	     this, TQT_SLOT( slotDoFileDirty() ) );
 
     // Setup main widget
-    _mainWidget = new KGVMainWidget( tqparentWidget );
+    _mainWidget = new KGVMainWidget( parentWidget );
     _mainWidget->setFocusPolicy( TQ_StrongFocus );
     _mainWidget->installEventFilter( this );
     _mainWidget->setAcceptDrops( true );
diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h
index 4576a0d0..a752353c 100644
--- a/kghostview/kgv_view.h
+++ b/kghostview/kgv_view.h
@@ -57,7 +57,7 @@ class KGVPart: public KParts::ReadOnlyPart
   Q_OBJECT
   TQ_OBJECT
 public:
-    KGVPart( TQWidget* tqparentWidget, const char* widgetName,
+    KGVPart( TQWidget* parentWidget, const char* widgetName,
              TQObject* tqparent, const char* name,
              const TQStringList& args = TQStringList() );
 
diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp
index 7a41aa57..6bf3e213 100644
--- a/kghostview/kgvfactory.cpp
+++ b/kghostview/kgvfactory.cpp
@@ -52,7 +52,7 @@ KGVFactory *KGVFactory::s_self;
 KInstance *KGVFactory::s_instance;
 KAboutData *KGVFactory::s_aboutData;
 
-KParts::Part *KGVFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
         TQObject *tqparent, const char *name,
         const char *className,
         const TQStringList &args_ )
@@ -68,7 +68,7 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *tqparentWidget, const char
     if ( !strcmp( className, "Browser/View" ) ) {
 	    className = "KParts::ReadOnlyPart";
     }
-    KGVPart *part = KDEPrivate::ConcreteFactory<KGVPart>::create( tqparentWidget,
+    KGVPart *part = KDEPrivate::ConcreteFactory<KGVPart>::create( parentWidget,
             widgetName,
             tqparent,
             name,
diff --git a/kghostview/kgvfactory.h b/kghostview/kgvfactory.h
index 67829b91..664a2656 100644
--- a/kghostview/kgvfactory.h
+++ b/kghostview/kgvfactory.h
@@ -33,7 +33,7 @@ class KDE_EXPORT KGVFactory : public KParts::Factory
         static KInstance *instance();
         static KAboutData *aboutData();
 
-        virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+        virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
                 TQObject *tqparent, const char *name,
                 const char *className,
                 const TQStringList &args );
diff --git a/kmrml/kmrml/kcontrol/serverconfigwidget.ui b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
index c78a5046..e577b221 100644
--- a/kmrml/kmrml/kcontrol/serverconfigwidget.ui
+++ b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
@@ -268,5 +268,5 @@
     <tabstop>m_userEdit</tabstop>
     <tabstop>m_passEdit</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index 8fdcce29..13f2fb66 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -214,7 +214,7 @@ bool Mrml::startSession( const KURL& url )
     // desired collection-id
 
     // Wolfgang says, we shouldn't create an own session-id here, as gcc 2.95
-    // aptqparently makes problems in exception handling somehow. So we simply
+    // apparently makes problems in exception handling somehow. So we simply
     // accept the server's session-id.
     TQString msg = mrmlString( TQString() ).tqarg(
         "<open-session user-name=\"%1\" session-name=\"kio_mrml session\" /> \
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index 2ec0af90..305cc684 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -90,14 +90,14 @@ KInstance * PartFactory::instance()
     return s_instance;
 }
 
-KParts::Part * PartFactory::createPartObject( TQWidget *tqparentWidget,
+KParts::Part * PartFactory::createPartObject( TQWidget *parentWidget,
                                               const char *widgetName,
                                               TQObject *tqparent,
                                               const char *name,
                                               const char *,
                                               const TQStringList& args )
 {
-    return new MrmlPart( tqparentWidget, widgetName, tqparent, name, args );
+    return new MrmlPart( parentWidget, widgetName, tqparent, name, args );
 }
 
 
@@ -111,7 +111,7 @@ KParts::Part * PartFactory::createPartObject( TQWidget *tqparentWidget,
 
 uint MrmlPart::s_sessionId = 0;
 
-MrmlPart::MrmlPart( TQWidget *tqparentWidget, const char * /* widgetName */,
+MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
                     TQObject *tqparent, const char *name,
                     const TQStringList& /* args */ )
     : KParts::ReadOnlyPart( tqparent, name ),
@@ -126,7 +126,7 @@ MrmlPart::MrmlPart( TQWidget *tqparentWidget, const char * /* widgetName */,
     KConfig *config = PartFactory::instance()->config();
     config->setGroup("MRML Settings");
 
-    TQVBox *box = new TQVBox( tqparentWidget, "main mrml box" );
+    TQVBox *box = new TQVBox( parentWidget, "main mrml box" );
     m_view = new MrmlView( box, "MrmlView" );
     connect( m_view, TQT_SIGNAL( activated( const KURL&, ButtonState )),
              this, TQT_SLOT( slotActivated( const KURL&, ButtonState )));
@@ -677,7 +677,7 @@ void MrmlPart::performQuery( TQDomDocument& doc )
             queryStep.setAttribute("query-type", "at-random");
 
             // remove user-relevance-element-list element for random search
-            relevanceList.tqparentNode().removeChild( relevanceList );
+            relevanceList.parentNode().removeChild( relevanceList );
         }
     }
     else
diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h
index fbe82d25..8b2d4cdd 100644
--- a/kmrml/kmrml/mrml_part.h
+++ b/kmrml/kmrml/mrml_part.h
@@ -59,7 +59,7 @@ class MrmlPart : public KParts::ReadOnlyPart
 public:
     enum tqStatus { NeedCollection, CanSearch, InProgress };
 
-    MrmlPart( TQWidget *tqparentWidget, const char *widgetName,
+    MrmlPart( TQWidget *parentWidget, const char *widgetName,
               TQObject *tqparent, const char *name, const TQStringList& args );
     ~MrmlPart();
 
@@ -160,7 +160,7 @@ public:
     static KInstance * instance();
 
 protected:
-    virtual KParts::Part * createPartObject( TQWidget *tqparentWidget = 0,
+    virtual KParts::Part * createPartObject( TQWidget *parentWidget = 0,
                                         const char *widgetName = 0,
                                         TQObject *tqparent = 0,
                                         const char *name = 0,
diff --git a/kolourpaint/cursors/kpcursorlightcross.cpp b/kolourpaint/cursors/kpcursorlightcross.cpp
index dc52f9bd..34051dbf 100644
--- a/kolourpaint/cursors/kpcursorlightcross.cpp
+++ b/kolourpaint/cursors/kpcursorlightcross.cpp
@@ -42,7 +42,7 @@ enum PixelValue
 };
 
 static void setPixel (unsigned char *colorBitmap,
-                      unsigned char *tqmaskBitmap,
+                      unsigned char *maskBitmap,
                       int width,
                       int y, int x, enum PixelValue pv)
 {
@@ -52,32 +52,32 @@ static void setPixel (unsigned char *colorBitmap,
     const int MaskOpaque = 1;
     const int MaskTransparent = 0;
 
-    int colorValue, tqmaskValue;
+    int colorValue, maskValue;
 
     switch (pv)
     {
     case White:
         colorValue = ColorWhite;
-        tqmaskValue = MaskOpaque;
+        maskValue = MaskOpaque;
         break;
 
     case Black:
         colorValue = ColorBlack;
-        tqmaskValue = MaskOpaque;
+        maskValue = MaskOpaque;
         break;
 
     case Transparent:
     default:
         colorValue = ColorWhite;
-        tqmaskValue = MaskTransparent;
+        maskValue = MaskTransparent;
         break;
     }
 
     if (colorValue)
         colorBitmap [y * (width / 8) + (x / 8)] |= (1 << (x % 8));
 
-    if (tqmaskValue)
-        tqmaskBitmap [y * (width / 8) + (x / 8)] |= (1 << (x % 8));
+    if (maskValue)
+        maskBitmap [y * (width / 8) + (x / 8)] |= (1 << (x % 8));
 }
 
 
@@ -90,10 +90,10 @@ const TQCursor *kpMakeCursorLightCross ()
     const int side = 24;
     const int byteSize = (side * side) / 8;
     unsigned char *colorBitmap = new unsigned char [byteSize];
-    unsigned char *tqmaskBitmap = new unsigned char [byteSize];
+    unsigned char *maskBitmap = new unsigned char [byteSize];
 
     memset (colorBitmap, 0, byteSize);
-    memset (tqmaskBitmap, 0, byteSize);
+    memset (maskBitmap, 0, byteSize);
 
     const int oddSide = side - 1;
     const int strokeLen = oddSide * 3 / 8;
@@ -104,7 +104,7 @@ const TQCursor *kpMakeCursorLightCross ()
 
     #define X_(val) (val)
     #define Y_(val) (val)
-    #define DRAW(y,x) setPixel (colorBitmap, tqmaskBitmap, side, (y), (x), pv)
+    #define DRAW(y,x) setPixel (colorBitmap, maskBitmap, side, (y), (x), pv)
         // horizontal
         DRAW (Y_(side / 2), X_(1 + i));
         DRAW (Y_(side / 2), X_(side - 1 - i));
@@ -118,9 +118,9 @@ const TQCursor *kpMakeCursorLightCross ()
     }
 
     TQCursor *cursor = new TQCursor (TQBitmap (side, side, colorBitmap, true/*little endian bit order*/),
-                                   TQBitmap (side, side, tqmaskBitmap, true/*little endian bit order*/));
+                                   TQBitmap (side, side, maskBitmap, true/*little endian bit order*/));
 
-    delete [] tqmaskBitmap;
+    delete [] maskBitmap;
     delete [] colorBitmap;
 
     return cursor;
diff --git a/kolourpaint/kpcolor.cpp b/kolourpaint/kpcolor.cpp
index 2efa3c9e..48eb3e8e 100644
--- a/kolourpaint/kpcolor.cpp
+++ b/kolourpaint/kpcolor.cpp
@@ -354,7 +354,7 @@ const TQColor &kpColor::toTQColor () const
 }
 
 // public
-TQColor kpColor::tqmaskColor () const
+TQColor kpColor::maskColor () const
 {
     return isTransparent () ? TQt::color0 : TQt::color1;
 }
diff --git a/kolourpaint/kpcolor.h b/kolourpaint/kpcolor.h
index ece77e57..74f5a910 100644
--- a/kolourpaint/kpcolor.h
+++ b/kolourpaint/kpcolor.h
@@ -87,7 +87,7 @@ public:
     // (const TQColor & return results in fewer color reallocations)
     const TQColor &toTQColor () const;
 
-    TQColor tqmaskColor () const;
+    TQColor maskColor () const;
 
 private:
     bool m_rgbaIsValid;
diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp
index 2886d077..9b7d5936 100644
--- a/kolourpaint/kpdocument.cpp
+++ b/kolourpaint/kpdocument.cpp
@@ -1235,7 +1235,7 @@ void kpDocument::setSelection (const kpSelection &selection)
 }
 
 // public
-TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &tqmaskBitmap_) const
+TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &maskBitmap_) const
 {
     kpSelection *sel = selection ();
 
@@ -1259,13 +1259,13 @@ TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &tqmaskBitmap_) const
     }
 
 
-    TQBitmap tqmaskBitmap = tqmaskBitmap_;
-    if (tqmaskBitmap.isNull () &&
+    TQBitmap maskBitmap = maskBitmap_;
+    if (maskBitmap.isNull () &&
         !sel->isRectangular ())
     {
-        tqmaskBitmap = sel->tqmaskForOwnType ();
+        maskBitmap = sel->maskForOwnType ();
 
-        if (tqmaskBitmap.isNull ())
+        if (maskBitmap.isNull ())
         {
             kdError () << "kpDocument::getSelectedPixmap() could not get tqmask" << endl;
             return TQPixmap ();
@@ -1275,7 +1275,7 @@ TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &tqmaskBitmap_) const
 
     TQPixmap selPixmap = getPixmapAt (boundingRect);
 
-    if (!tqmaskBitmap.isNull ())
+    if (!maskBitmap.isNull ())
     {
         // Src Dest = Result
         // -----------------
@@ -1286,8 +1286,8 @@ TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &tqmaskBitmap_) const
         TQBitmap selMaskBitmap = kpPixmapFX::getNonNullMask (selPixmap);
         bitBlt (&selMaskBitmap,
                 TQPoint (0, 0),
-                &tqmaskBitmap,
-                TQRect (0, 0, tqmaskBitmap.width (), tqmaskBitmap.height ()),
+                &maskBitmap,
+                TQRect (0, 0, maskBitmap.width (), maskBitmap.height ()),
                 TQt::AndROP);
         selPixmap.setMask (selMaskBitmap);
     }
@@ -1328,14 +1328,14 @@ bool kpDocument::selectionPullFromDocument (const kpColor &backgroundColor)
     // Figure out tqmask for non-rectangular selections
     //
 
-    TQBitmap tqmaskBitmap = sel->tqmaskForOwnType (true/*return null bitmap for rectangular*/);
+    TQBitmap maskBitmap = sel->maskForOwnType (true/*return null bitmap for rectangular*/);
 
 
     //
     // Get selection pixmap from document
     //
 
-    TQPixmap selPixmap = getSelectedPixmap (tqmaskBitmap);
+    TQPixmap selPixmap = getSelectedPixmap (maskBitmap);
 
     if (vm)
         vm->setQueueUpdates ();
diff --git a/kolourpaint/kpdocument.h b/kolourpaint/kpdocument.h
index bc11990b..67ce32f3 100644
--- a/kolourpaint/kpdocument.h
+++ b/kolourpaint/kpdocument.h
@@ -189,7 +189,7 @@ public:
     void setSelection (const kpSelection &selection);
 
     // TODO: this always returns opaque pixmap - need transparent ver
-    TQPixmap getSelectedPixmap (const TQBitmap &tqmaskBitmap = TQBitmap ()) const;
+    TQPixmap getSelectedPixmap (const TQBitmap &maskBitmap = TQBitmap ()) const;
 
     bool selectionPullFromDocument (const kpColor &backgroundColor);
     bool selectionDelete ();
diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp
index 8947f8d0..97865852 100644
--- a/kolourpaint/kpselection.cpp
+++ b/kolourpaint/kpselection.cpp
@@ -337,11 +337,11 @@ int kpSelection::size () const
 
 
 // public
-TQBitmap kpSelection::tqmaskForOwnType (bool nullForRectangular) const
+TQBitmap kpSelection::maskForOwnType (bool nullForRectangular) const
 {
     if (!m_rect.isValid ())
     {
-        kdError () << "kpSelection::tqmaskForOwnType() boundingRect invalid" << endl;
+        kdError () << "kpSelection::maskForOwnType() boundingRect invalid" << endl;
         return TQBitmap ();
     }
 
@@ -351,17 +351,17 @@ TQBitmap kpSelection::tqmaskForOwnType (bool nullForRectangular) const
         if (nullForRectangular)
             return TQBitmap ();
 
-        TQBitmap tqmaskBitmap (m_rect.width (), m_rect.height ());
-        tqmaskBitmap.fill (TQt::color1/*opaque*/);
-        return tqmaskBitmap;
+        TQBitmap maskBitmap (m_rect.width (), m_rect.height ());
+        maskBitmap.fill (TQt::color1/*opaque*/);
+        return maskBitmap;
     }
 
 
-    TQBitmap tqmaskBitmap (m_rect.width (), m_rect.height ());
-    tqmaskBitmap.fill (TQt::color0/*transparent*/);
+    TQBitmap maskBitmap (m_rect.width (), m_rect.height ());
+    maskBitmap.fill (TQt::color0/*transparent*/);
 
     TQPainter painter;
-    painter.begin (&tqmaskBitmap);
+    painter.begin (&maskBitmap);
     painter.setPen (TQt::color1)/*opaque*/;
     painter.setBrush (TQt::color1/*opaque*/);
 
@@ -379,7 +379,7 @@ TQBitmap kpSelection::tqmaskForOwnType (bool nullForRectangular) const
     painter.end ();
 
 
-    return tqmaskBitmap;
+    return maskBitmap;
 }
 
 
@@ -615,11 +615,11 @@ static TQRgb mostContrastingRGB (TQRgb val)
 }
 
 // private
-static void drawTextLines (TQPainter *painter, TQPainter *tqmaskPainter,
+static void drawTextLines (TQPainter *painter, TQPainter *maskPainter,
                            const TQRect &rect,
                            const TQValueVector <TQString> &textLines)
 {
-    if (!painter->clipRegion ().isEmpty () || !tqmaskPainter->clipRegion ().isEmpty ())
+    if (!painter->clipRegion ().isEmpty () || !maskPainter->clipRegion ().isEmpty ())
     {
         // TODO: fix esp. before making method public
         kdError () << "kpselection.cpp:drawTextLines() can't deal with existing painter clip regions" << endl;
@@ -632,8 +632,8 @@ static void drawTextLines (TQPainter *painter, TQPainter *tqmaskPainter,
     if (painter->isActive ())      \
         painter->cmd;              \
                                    \
-    if (tqmaskPainter->isActive ())  \
-        tqmaskPainter->cmd;          \
+    if (maskPainter->isActive ())  \
+        maskPainter->cmd;          \
 }
 
 
diff --git a/kolourpaint/kpselection.h b/kolourpaint/kpselection.h
index e7e54d54..fc309771 100644
--- a/kolourpaint/kpselection.h
+++ b/kolourpaint/kpselection.h
@@ -103,7 +103,7 @@ public:
 
     int size () const;
 
-    TQBitmap tqmaskForOwnType (bool nullForRectangular = false) const;
+    TQBitmap maskForOwnType (bool nullForRectangular = false) const;
 
     // synonyms
     TQPoint topLeft () const;
diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp
index 08a2331e..58b0b48f 100644
--- a/kolourpaint/kpthumbnail.cpp
+++ b/kolourpaint/kpthumbnail.cpp
@@ -63,7 +63,7 @@ kpThumbnail::kpThumbnail (kpMainWindow *tqparent, const char *name)
     }
 
 
-    TQSize tqlayoutMinimumSize = tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ();
+    TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ();
 #if DEBUG_KP_THUMBNAIL
     kdDebug () << "\ttqlayout=" << tqlayout ()
                << " minSize=" << (tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ()) << endl;
@@ -73,8 +73,8 @@ kpThumbnail::kpThumbnail (kpMainWindow *tqparent, const char *name)
 #endif
     if (tqlayout ())
         tqlayout ()->setResizeMode (TQLayout::FreeResize);
-    setMinimumSize (TQMAX (tqlayoutMinimumSize.width (), 64),
-                    TQMAX (tqlayoutMinimumSize.height (), 64));
+    setMinimumSize (TQMAX (layoutMinimumSize.width (), 64),
+                    TQMAX (layoutMinimumSize.height (), 64));
 
 
     // Enable "X" Close Button
diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp
index 3f64bbb9..341a6790 100644
--- a/kolourpaint/kpview.cpp
+++ b/kolourpaint/kpview.cpp
@@ -590,10 +590,10 @@ void kpView::addToQueuedArea (const TQRect &rect)
 }
 
 // public
-void kpView::tqinvalidateQueuedArea ()
+void kpView::invalidateQueuedArea ()
 {
 #if DEBUG_KP_VIEW && 0
-    kdDebug () << "kpView::tqinvalidateQueuedArea()" << endl;
+    kdDebug () << "kpView::invalidateQueuedArea()" << endl;
 #endif
 
     d->m_queuedUpdateArea = TQRegion ();
@@ -621,7 +621,7 @@ void kpView::updateQueuedArea ()
     if (!d->m_queuedUpdateArea.isNull ())
         vm->updateView (this, d->m_queuedUpdateArea);
 
-    tqinvalidateQueuedArea ();
+    invalidateQueuedArea ();
 }
 
 // public
@@ -1346,21 +1346,21 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
         destPixmapPainter.setBackgroundMode (Qt::OpaqueMode);
         destPixmapPainter.setBackgroundColor (TQt::blue);
 
-        TQBitmap tqmaskBitmap;
-        TQPainter tqmaskBitmapPainter;
+        TQBitmap maskBitmap;
+        TQPainter maskBitmapPainter;
         if (destPixmap->tqmask ())
         {
-            tqmaskBitmap = *destPixmap->tqmask ();
-            tqmaskBitmapPainter.begin (&tqmaskBitmap);
-            tqmaskBitmapPainter.setPen (TQt::color1/*opaque*/);
+            maskBitmap = *destPixmap->tqmask ();
+            maskBitmapPainter.begin (&maskBitmap);
+            maskBitmapPainter.setPen (TQt::color1/*opaque*/);
         }
 
 
     #define PAINTER_CMD(cmd)                 \
     {                                        \
         destPixmapPainter . cmd;             \
-        if (tqmaskBitmapPainter.isActive ())   \
-            tqmaskBitmapPainter . cmd;         \
+        if (maskBitmapPainter.isActive ())   \
+            maskBitmapPainter . cmd;         \
     }
 
         TQRect boundingRect = sel->boundingRect ();
@@ -1450,10 +1450,10 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
     #undef PAINTER_CMD
 
         destPixmapPainter.end ();
-        if (tqmaskBitmapPainter.isActive ())
-            tqmaskBitmapPainter.end ();
+        if (maskBitmapPainter.isActive ())
+            maskBitmapPainter.end ();
 
-        destPixmap->setMask (tqmaskBitmap);
+        destPixmap->setMask (maskBitmap);
     }
 
 
@@ -1480,15 +1480,15 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
             {
                 rect.moveBy (-docRect.x (), -docRect.y ());
 
-                TQBitmap tqmaskBitmap;
-                TQPainter destPixmapPainter, tqmaskBitmapPainter;
+                TQBitmap maskBitmap;
+                TQPainter destPixmapPainter, maskBitmapPainter;
 
                 if (destPixmap->tqmask ())
                 {
-                    tqmaskBitmap = *destPixmap->tqmask ();
-                    tqmaskBitmapPainter.begin (&tqmaskBitmap);
-                    tqmaskBitmapPainter.fillRect (rect, TQt::color1/*opaque*/);
-                    tqmaskBitmapPainter.end ();
+                    maskBitmap = *destPixmap->tqmask ();
+                    maskBitmapPainter.begin (&maskBitmap);
+                    maskBitmapPainter.fillRect (rect, TQt::color1/*opaque*/);
+                    maskBitmapPainter.end ();
                 }
 
                 destPixmapPainter.begin (destPixmap);
@@ -1496,8 +1496,8 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
                 destPixmapPainter.fillRect (rect, TQt::white);
                 destPixmapPainter.end ();
 
-                if (!tqmaskBitmap.isNull ())
-                    destPixmap->setMask (tqmaskBitmap);
+                if (!maskBitmap.isNull ())
+                    destPixmap->setMask (maskBitmap);
             }
         }
     }
diff --git a/kolourpaint/kpview.h b/kolourpaint/kpview.h
index 44674123..613cafd2 100644
--- a/kolourpaint/kpview.h
+++ b/kolourpaint/kpview.h
@@ -366,11 +366,11 @@ public:
      * Removes the dirty region that has been queued for updating.
      * Does not update the view.
      */
-    void tqinvalidateQueuedArea ();
+    void invalidateQueuedArea ();
 
     /**
      * Updates the part of the view described by dirty region and then
-     * calls tqinvalidateQueuedArea().  Does nothing if @ref kpViewManager
+     * calls invalidateQueuedArea().  Does nothing if @ref kpViewManager
      * is set to queue updates.
      */
     void updateQueuedArea ();
diff --git a/kolourpaint/kpviewmanager.cpp b/kolourpaint/kpviewmanager.cpp
index e7a095fd..3a3bcdad 100644
--- a/kolourpaint/kpviewmanager.cpp
+++ b/kolourpaint/kpviewmanager.cpp
@@ -152,7 +152,7 @@ void kpViewManager::setTempPixmap (const kpTempPixmap &tempPixmap)
 }
 
 // public
-void kpViewManager::tqinvalidateTempPixmap ()
+void kpViewManager::invalidateTempPixmap ()
 {
     if (!m_tempPixmap)
         return;
diff --git a/kolourpaint/kpviewmanager.h b/kolourpaint/kpviewmanager.h
index be3e3065..6e48be3d 100644
--- a/kolourpaint/kpviewmanager.h
+++ b/kolourpaint/kpviewmanager.h
@@ -69,7 +69,7 @@ public:
 
     const kpTempPixmap *tempPixmap () const;
     void setTempPixmap (const kpTempPixmap &tempPixmap);
-    void tqinvalidateTempPixmap ();
+    void invalidateTempPixmap ();
 
 
     //
diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
index 80fadd8d..c89685da 100644
--- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
+++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
@@ -240,7 +240,7 @@ void kpEffectReduceColorsCommand::apply (TQPixmap *destPixmapPtr, int depth, boo
 
     // HACK: The above "image.convertDepth()" erases the Alpha Channel
     //       (at least for monochrome).
-    //       tqpixmap.html says "alpha tqmasks on monochrome images are ignored."
+    //       tqpixmap.html says "alpha masks on monochrome images are ignored."
     //
     //       Put the tqmask back.
     //
diff --git a/kolourpaint/pixmapfx/kpfloodfill.cpp b/kolourpaint/pixmapfx/kpfloodfill.cpp
index 76731d23..eaf100ab 100644
--- a/kolourpaint/pixmapfx/kpfloodfill.cpp
+++ b/kolourpaint/pixmapfx/kpfloodfill.cpp
@@ -97,14 +97,14 @@ bool kpFloodFill::fill ()
     {
         TQApplication::setOverrideCursor (TQt::waitCursor);
 
-        TQPainter painter, tqmaskPainter;
-        TQBitmap tqmaskBitmap;
+        TQPainter painter, maskPainter;
+        TQBitmap maskBitmap;
 
         if (m_pixmapPtr->tqmask () || m_color.isTransparent ())
         {
-            tqmaskBitmap = kpPixmapFX::getNonNullMask (*m_pixmapPtr);
-            tqmaskPainter.begin (&tqmaskBitmap);
-            tqmaskPainter.setPen (m_color.tqmaskColor ());
+            maskBitmap = kpPixmapFX::getNonNullMask (*m_pixmapPtr);
+            maskPainter.begin (&maskBitmap);
+            maskPainter.setPen (m_color.maskColor ());
         }
 
         if (m_color.isOpaque ())
@@ -124,18 +124,18 @@ bool kpFloodFill::fill ()
             if (painter.isActive ())
                 painter.drawLine (p1, p2);
 
-            if (tqmaskPainter.isActive ())
-                tqmaskPainter.drawLine (p1, p2);
+            if (maskPainter.isActive ())
+                maskPainter.drawLine (p1, p2);
         }
 
         if (painter.isActive ())
             painter.end ();
 
-        if (tqmaskPainter.isActive ())
-            tqmaskPainter.end ();
+        if (maskPainter.isActive ())
+            maskPainter.end ();
 
-        if (!tqmaskBitmap.isNull ())
-            m_pixmapPtr->setMask (tqmaskBitmap);
+        if (!maskBitmap.isNull ())
+            m_pixmapPtr->setMask (maskBitmap);
 
         TQApplication::restoreOverrideCursor ();
     }
diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp
index 1837a22e..e46f91cb 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.cpp
+++ b/kolourpaint/pixmapfx/kppixmapfx.cpp
@@ -772,7 +772,7 @@ void kpPixmapFX::paintPixmapAt (TQPixmap *destPixmapPtr, const TQPoint &destAt,
     if (!destPixmapPtr)
         return;
 
-    // Copy src (tqmasked by src's tqmask) on top of dest.
+    // Copy src (masked by src's tqmask) on top of dest.
     bitBlt (destPixmapPtr, /* dest */
             destAt.x (), destAt.y (), /* dest pt */
             &srcPixmap, /* src */
@@ -856,10 +856,10 @@ TQBitmap kpPixmapFX::getNonNullMask (const TQPixmap &pm)
         return *pm.tqmask ();
     else
     {
-        TQBitmap tqmaskBitmap (pm.width (), pm.height ());
-        tqmaskBitmap.fill (TQt::color1/*opaque*/);
+        TQBitmap maskBitmap (pm.width (), pm.height ());
+        maskBitmap.fill (TQt::color1/*opaque*/);
 
-        return tqmaskBitmap;
+        return maskBitmap;
     }
 }
 
@@ -870,9 +870,9 @@ void kpPixmapFX::ensureTransparentAt (TQPixmap *destPixmapPtr, const TQRect &des
     if (!destPixmapPtr)
         return;
 
-    TQBitmap tqmaskBitmap = getNonNullMask (*destPixmapPtr);
+    TQBitmap maskBitmap = getNonNullMask (*destPixmapPtr);
 
-    TQPainter p (&tqmaskBitmap);
+    TQPainter p (&maskBitmap);
 
     p.setPen (TQt::color0/*transparent*/);
     p.setBrush (TQt::color0/*transparent*/);
@@ -881,7 +881,7 @@ void kpPixmapFX::ensureTransparentAt (TQPixmap *destPixmapPtr, const TQRect &des
 
     p.end ();
 
-    destPixmapPtr->setMask (tqmaskBitmap);
+    destPixmapPtr->setMask (maskBitmap);
 }
 
 
@@ -937,9 +937,9 @@ void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect
     if (!destPixmapPtr || !destPixmapPtr->tqmask ()/*already opaque*/)
         return;
 
-    TQBitmap tqmaskBitmap = *destPixmapPtr->tqmask ();
+    TQBitmap maskBitmap = *destPixmapPtr->tqmask ();
 
-    TQPainter p (&tqmaskBitmap);
+    TQPainter p (&maskBitmap);
 
     p.setPen (TQt::color1/*opaque*/);
     p.setBrush (TQt::color1/*opaque*/);
@@ -948,7 +948,7 @@ void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect
 
     p.end ();
 
-    destPixmapPtr->setMask (tqmaskBitmap);
+    destPixmapPtr->setMask (maskBitmap);
 }
 
 // public static
@@ -1107,8 +1107,8 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h,
     #if DEBUG_KP_PIXMAP_FX && 1
         kdDebug () << "\tfilling in new areas" << endl;
     #endif
-        TQBitmap tqmaskBitmap;
-        TQPainter painter, tqmaskPainter;
+        TQBitmap maskBitmap;
+        TQPainter painter, maskPainter;
 
         if (backgroundColor.isOpaque ())
         {
@@ -1119,10 +1119,10 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h,
 
         if (backgroundColor.isTransparent () || destPixmapPtr->tqmask ())
         {
-            tqmaskBitmap = kpPixmapFX::getNonNullMask (*destPixmapPtr);
-            tqmaskPainter.begin (&tqmaskBitmap);
-            tqmaskPainter.setPen (backgroundColor.tqmaskColor ());
-            tqmaskPainter.setBrush (backgroundColor.tqmaskColor ());
+            maskBitmap = kpPixmapFX::getNonNullMask (*destPixmapPtr);
+            maskPainter.begin (&maskBitmap);
+            maskPainter.setPen (backgroundColor.maskColor ());
+            maskPainter.setBrush (backgroundColor.maskColor ());
         }
 
     #define PAINTER_CALL(cmd)         \
@@ -1130,8 +1130,8 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h,
         if (painter.isActive ())      \
             painter . cmd ;           \
                                       \
-        if (tqmaskPainter.isActive ())  \
-            tqmaskPainter . cmd ;       \
+        if (maskPainter.isActive ())  \
+            maskPainter . cmd ;       \
     }
         if (w > oldWidth)
             PAINTER_CALL (drawRect (oldWidth, 0, w - oldWidth, oldHeight));
@@ -1140,14 +1140,14 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h,
             PAINTER_CALL (drawRect (0, oldHeight, w, h - oldHeight));
     #undef PAINTER_CALL
 
-        if (tqmaskPainter.isActive ())
-            tqmaskPainter.end ();
+        if (maskPainter.isActive ())
+            maskPainter.end ();
 
         if (painter.isActive ())
             painter.end ();
 
-        if (!tqmaskBitmap.isNull ())
-            destPixmapPtr->setMask (tqmaskBitmap);
+        if (!maskBitmap.isNull ())
+            destPixmapPtr->setMask (maskBitmap);
     }
 }
 
@@ -1378,7 +1378,7 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_,
     if (backgroundColor.isTransparent () || pm.tqmask ())
     {
         newBitmapMask.resize (newPixmap.width (), newPixmap.height ());
-        newBitmapMask.fill (backgroundColor.tqmaskColor ());
+        newBitmapMask.fill (backgroundColor.maskColor ());
     }
 
     TQPainter painter (&newPixmap);
@@ -1416,10 +1416,10 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_,
 
     if (!newBitmapMask.isNull ())
     {
-        TQPainter tqmaskPainter (&newBitmapMask);
-        tqmaskPainter.setWorldMatrix (transformMatrix);
-        tqmaskPainter.drawPixmap (TQPoint (0, 0), kpPixmapFX::getNonNullMask (pm));
-        tqmaskPainter.end ();
+        TQPainter maskPainter (&newBitmapMask);
+        maskPainter.setWorldMatrix (transformMatrix);
+        maskPainter.drawPixmap (TQPoint (0, 0), kpPixmapFX::getNonNullMask (pm));
+        maskPainter.end ();
         newPixmap.setMask (newBitmapMask);
     }
 
diff --git a/kolourpaint/pixmapfx/kppixmapfx.h b/kolourpaint/pixmapfx/kppixmapfx.h
index 738d82fa..72882839 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.h
+++ b/kolourpaint/pixmapfx/kppixmapfx.h
@@ -294,7 +294,7 @@ public:
     //
     // Removes <*destPixmapPtr>'s Alpha Channel and attempts to convert it
     // to a tqmask.  KolourPaint - and TQPixmap to a great extent - does not
-    // support Alpha Channels - only tqmasks.  Call this whenever you get
+    // support Alpha Channels - only masks.  Call this whenever you get
     // a pixmap from a foreign source; else all KolourPaint code will
     // exhibit "undefined behaviour".
     //
diff --git a/kolourpaint/tools/kptoolairspray.cpp b/kolourpaint/tools/kptoolairspray.cpp
index 022c534d..f8aabce1 100644
--- a/kolourpaint/tools/kptoolairspray.cpp
+++ b/kolourpaint/tools/kptoolairspray.cpp
@@ -314,7 +314,7 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points)
     TQPixmap pixmap = document ()->getPixmapAt (docRect);
     TQBitmap tqmask;
 
-    TQPainter painter, tqmaskPainter;
+    TQPainter painter, maskPainter;
 
     if (m_color.isOpaque ())
     {
@@ -325,8 +325,8 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points)
     if (pixmap.tqmask () || m_color.isTransparent ())
     {
         tqmask = kpPixmapFX::getNonNullMask (pixmap);
-        tqmaskPainter.begin (&tqmask);
-        tqmaskPainter.setPen (m_color.tqmaskColor ());
+        maskPainter.begin (&tqmask);
+        maskPainter.setPen (m_color.maskColor ());
     }
 
     for (int i = 0; i < (int) points.count (); i++)
@@ -337,12 +337,12 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points)
         if (painter.isActive ())
             painter.drawPoint (pt);
 
-        if (tqmaskPainter.isActive ())
-            tqmaskPainter.drawPoint (pt);
+        if (maskPainter.isActive ())
+            maskPainter.drawPoint (pt);
     }
 
-    if (tqmaskPainter.isActive ())
-        tqmaskPainter.end ();
+    if (maskPainter.isActive ())
+        maskPainter.end ();
 
     if (painter.isActive ())
         painter.end ();
diff --git a/kolourpaint/tools/kptoolautocrop.cpp b/kolourpaint/tools/kptoolautocrop.cpp
index 0d103af7..d8c8100f 100644
--- a/kolourpaint/tools/kptoolautocrop.cpp
+++ b/kolourpaint/tools/kptoolautocrop.cpp
@@ -654,7 +654,7 @@ void kpToolAutoCropCommand::unexecute ()
         return;
 
     TQPixmap pixmap (m_oldWidth, m_oldHeight);
-    TQBitmap tqmaskBitmap;
+    TQBitmap maskBitmap;
 
     // restore the position of the centre image
     kpPixmapFX::setPixmapAt (&pixmap, m_contentsRect,
@@ -663,7 +663,7 @@ void kpToolAutoCropCommand::unexecute ()
     // draw the borders
 
     TQPainter painter (&pixmap);
-    TQPainter tqmaskPainter;
+    TQPainter maskPainter;
 
     const kpToolAutoCropBorder *borders [] =
     {
@@ -699,14 +699,14 @@ void kpToolAutoCropCommand::unexecute ()
             }
             else
             {
-                if (tqmaskBitmap.isNull ())
+                if (maskBitmap.isNull ())
                 {
                     // TODO: dangerous when a painter is active on pixmap?
-                    tqmaskBitmap = kpPixmapFX::getNonNullMask (pixmap);
-                    tqmaskPainter.begin (&tqmaskBitmap);
+                    maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
+                    maskPainter.begin (&maskBitmap);
                 }
 
-                tqmaskPainter.fillRect ((*b)->rect (), TQt::color0/*transparent*/);
+                maskPainter.fillRect ((*b)->rect (), TQt::color0/*transparent*/);
             }
         }
         else
@@ -721,7 +721,7 @@ void kpToolAutoCropCommand::unexecute ()
             if (*p)
             {
                 // TODO: We should really edit the tqmask here.  Due to good
-                //       luck (if "tqmaskBitmap" is initialized above, this region
+                //       luck (if "maskBitmap" is initialized above, this region
                 //       will be marked as opaque in the tqmask; if it's not
                 //       initialized, we will be opaque by default), we
                 //       don't actually have to edit the tqmask but this is
@@ -731,13 +731,13 @@ void kpToolAutoCropCommand::unexecute ()
         }
     }
 
-    if (tqmaskPainter.isActive ())
-        tqmaskPainter.end ();
+    if (maskPainter.isActive ())
+        maskPainter.end ();
 
     painter.end ();
 
-    if (!tqmaskBitmap.isNull ())
-        pixmap.setMask (tqmaskBitmap);
+    if (!maskBitmap.isNull ())
+        pixmap.setMask (maskBitmap);
 
 
     if (!m_actOnSelection)
diff --git a/kolourpaint/tools/kptoolclear.cpp b/kolourpaint/tools/kptoolclear.cpp
index b6fa2eab..7b1a775b 100644
--- a/kolourpaint/tools/kptoolclear.cpp
+++ b/kolourpaint/tools/kptoolclear.cpp
@@ -108,7 +108,7 @@ void kpToolClearCommand::execute ()
         kpPixmapFX::fill (&newPixmap, m_newColor);
         // TODO: maybe disable Image/Clear if transparent colour
         if (m_newColor.isOpaque ())
-            newPixmap.setMask (sel->tqmaskForOwnType ());
+            newPixmap.setMask (sel->maskForOwnType ());
 
         sel->setPixmap (newPixmap);
     }
diff --git a/kolourpaint/tools/kptoolcrop.cpp b/kolourpaint/tools/kptoolcrop.cpp
index e5483a90..e3916121 100644
--- a/kolourpaint/tools/kptoolcrop.cpp
+++ b/kolourpaint/tools/kptoolcrop.cpp
@@ -167,7 +167,7 @@ void kpToolCropSetImageCommand::execute ()
 
         kpPixmapFX::paintMaskTransparentWithBrush (&newDocPixmap,
             TQPoint (0, 0),
-            m_fromSelection.tqmaskForOwnType ());
+            m_fromSelection.maskForOwnType ());
 
         kpPixmapFX::paintPixmapAt (&newDocPixmap,
             TQPoint (0, 0),
diff --git a/kolourpaint/tools/kptoolpen.cpp b/kolourpaint/tools/kptoolpen.cpp
index 5c7ff6ea..57e19527 100644
--- a/kolourpaint/tools/kptoolpen.cpp
+++ b/kolourpaint/tools/kptoolpen.cpp
@@ -179,7 +179,7 @@ void kpToolPen::end ()
     if (vm)
     {
         if (vm->tempPixmap () && vm->tempPixmap ()->isBrush ())
-            vm->tqinvalidateTempPixmap ();
+            vm->invalidateTempPixmap ();
 
         if (m_mode & (SquareBrushes | DiverseBrushes))
             vm->unsetCursor ();
@@ -218,7 +218,7 @@ void kpToolPen::beginDraw ()
     // user starts drawing in the background color, we don't want to leave
     // the cursor in the foreground colour -- just hide it in all cases
     // to avoid confusion
-    viewManager ()->tqinvalidateTempPixmap ();
+    viewManager ()->invalidateTempPixmap ();
 
     setUserMessage (cancelUserMessage ());
 }
@@ -282,15 +282,15 @@ void kpToolPen::hover (const TQPoint &point)
     setUserShapePoints (point);
 }
 
-bool kpToolPen::wash (TQPainter *painter, TQPainter *tqmaskPainter,
+bool kpToolPen::wash (TQPainter *painter, TQPainter *maskPainter,
                       const TQImage &image,
                       const kpColor &colorToReplace,
                       const TQRect &imageRect, int plotx, int ploty)
 {
-    return wash (painter, tqmaskPainter, image, colorToReplace, imageRect, hotRect (plotx, ploty));
+    return wash (painter, maskPainter, image, colorToReplace, imageRect, hotRect (plotx, ploty));
 }
 
-bool kpToolPen::wash (TQPainter *painter, TQPainter *tqmaskPainter,
+bool kpToolPen::wash (TQPainter *painter, TQPainter *maskPainter,
                       const TQImage &image,
                       const kpColor &colorToReplace,
                       const TQRect &imageRect, const TQRect &drawRect)
@@ -308,8 +308,8 @@ bool kpToolPen::wash (TQPainter *painter, TQPainter *tqmaskPainter,
 {                                                        \
     if (painter && painter->isActive ())                 \
         painter->drawLine (startDrawX, y, x - 1, y);     \
-    if (tqmaskPainter && tqmaskPainter->isActive ())         \
-        tqmaskPainter->drawLine (startDrawX, y, x - 1, y); \
+    if (maskPainter && maskPainter->isActive ())         \
+        maskPainter->drawLine (startDrawX, y, x - 1, y); \
     didSomething = true;                                 \
     startDrawX = -1;                                     \
 }
@@ -388,8 +388,8 @@ void kpToolPen::globalDraw ()
         kpToolPenCommand *cmd = new kpToolPenCommand (
             i18n ("Color Eraser"), mainWindow ());
 
-        TQPainter painter, tqmaskPainter;
-        TQBitmap tqmaskBitmap;
+        TQPainter painter, maskPainter;
+        TQBitmap maskBitmap;
 
         if (backgroundColor ().isOpaque ())
         {
@@ -400,16 +400,16 @@ void kpToolPen::globalDraw ()
         if (backgroundColor ().isTransparent () ||
             document ()->pixmap ()->tqmask ())
         {
-            tqmaskBitmap = kpPixmapFX::getNonNullMask (*document ()->pixmap ());
-            tqmaskPainter.begin (&tqmaskBitmap);
+            maskBitmap = kpPixmapFX::getNonNullMask (*document ()->pixmap ());
+            maskPainter.begin (&maskBitmap);
 
-            tqmaskPainter.setPen (backgroundColor ().tqmaskColor ());
+            maskPainter.setPen (backgroundColor ().maskColor ());
         }
 
         const TQImage image = kpPixmapFX::convertToImage (*document ()->pixmap ());
         TQRect rect = document ()->rect ();
 
-        const bool didSomething = wash (&painter, &tqmaskPainter, image,
+        const bool didSomething = wash (&painter, &maskPainter, image,
                                         foregroundColor ()/*replace foreground*/,
                                         rect, rect);
 
@@ -417,13 +417,13 @@ void kpToolPen::globalDraw ()
         if (painter.isActive ())
             painter.end ();
 
-        if (tqmaskPainter.isActive ())
-            tqmaskPainter.end ();
+        if (maskPainter.isActive ())
+            maskPainter.end ();
 
         if (didSomething)
         {
-            if (!tqmaskBitmap.isNull ())
-                document ()->pixmap ()->setMask (tqmaskBitmap);
+            if (!maskBitmap.isNull ())
+                document ()->pixmap ()->setMask (maskBitmap);
 
 
             document ()->slotContentsChanged (rect);
@@ -519,8 +519,8 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
         #if DEBUG_KP_TOOL_PEN
             kdDebug () << "\tconvert to image: " << timer.restart () << "ms" << endl;
         #endif
-            TQPainter painter, tqmaskPainter;
-            TQBitmap tqmaskBitmap;
+            TQPainter painter, maskPainter;
+            TQBitmap maskBitmap;
 
             if (color (m_mouseButton).isOpaque ())
             {
@@ -531,12 +531,12 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
             if (color (m_mouseButton).isTransparent () ||
                 pixmap.tqmask ())
             {
-                tqmaskBitmap = kpPixmapFX::getNonNullMask (pixmap);
-                tqmaskPainter.begin (&tqmaskBitmap);
-                tqmaskPainter.setPen (color (m_mouseButton).tqmaskColor ());
+                maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
+                maskPainter.begin (&maskBitmap);
+                maskPainter.setPen (color (m_mouseButton).maskColor ());
             }
 
-            bool didSomething = wash (&painter, &tqmaskPainter,
+            bool didSomething = wash (&painter, &maskPainter,
                                       image,
                                       color (1 - m_mouseButton)/*color to tqreplace*/,
                                       rect, rect);
@@ -544,13 +544,13 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
             if (painter.isActive ())
                 painter.end ();
 
-            if (tqmaskPainter.isActive ())
-                tqmaskPainter.end ();
+            if (maskPainter.isActive ())
+                maskPainter.end ();
 
             if (didSomething)
             {
-                if (!tqmaskBitmap.isNull ())
-                    pixmap.setMask (tqmaskBitmap);
+                if (!maskBitmap.isNull ())
+                    pixmap.setMask (maskBitmap);
 
             #if DEBUG_KP_TOOL_PEN
                 kdDebug () << "\twashed: " << timer.restart () << "ms" << endl;
@@ -594,9 +594,9 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
         bool transparent = c.isTransparent ();
 
         TQPixmap pixmap = document ()->getPixmapAt (rect);
-        TQBitmap tqmaskBitmap;
+        TQBitmap maskBitmap;
 
-        TQPainter painter, tqmaskPainter;
+        TQPainter painter, maskPainter;
 
         if (m_mode & (DrawsPixels | WashesPixmaps))
         {
@@ -608,9 +608,9 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
 
             if (transparent || pixmap.tqmask ())
             {
-                tqmaskBitmap = kpPixmapFX::getNonNullMask (pixmap);
-                tqmaskPainter.begin (&tqmaskBitmap);
-                tqmaskPainter.setPen (c.tqmaskColor ());
+                maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
+                maskPainter.begin (&maskBitmap);
+                maskPainter.setPen (c.maskColor ());
             }
         }
 
@@ -635,8 +635,8 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
             if (painter.isActive ())
                 painter.drawLine (sp, ep);
 
-            if (tqmaskPainter.isActive ())
-                tqmaskPainter.drawLine (sp, ep);
+            if (maskPainter.isActive ())
+                maskPainter.drawLine (sp, ep);
 
             didSomething = true;
         }
@@ -678,7 +678,7 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
 
             if (m_mode & WashesPixmaps)
             {
-                if (wash (&painter, &tqmaskPainter, image,
+                if (wash (&painter, &maskPainter, image,
                           colorToReplace,
                           rect, plotx + rect.left (), ploty + rect.top ()))
                 {
@@ -746,7 +746,7 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
 
                         if (m_mode & WashesPixmaps)
                         {
-                            if (wash (&painter, &tqmaskPainter, image,
+                            if (wash (&painter, &maskPainter, image,
                                       colorToReplace,
                                       rect, plotx + rect.left (), oldploty + rect.top ()))
                             {
@@ -774,7 +774,7 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
 
                     if (m_mode & WashesPixmaps)
                     {
-                        if (wash (&painter, &tqmaskPainter, image,
+                        if (wash (&painter, &maskPainter, image,
                                   colorToReplace,
                                   rect, plotx + rect.left (), ploty + rect.top ()))
                         {
@@ -806,8 +806,8 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
         if (painter.isActive ())
             painter.end ();
 
-        if (tqmaskPainter.isActive ())
-            tqmaskPainter.end ();
+        if (maskPainter.isActive ())
+            maskPainter.end ();
 
     #if DEBUG_KP_TOOL_PEN
         if (m_mode & WashesPixmaps)
@@ -824,8 +824,8 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
 
         if (didSomething)
         {
-            if (!tqmaskBitmap.isNull ())
-                pixmap.setMask (tqmaskBitmap);
+            if (!maskBitmap.isNull ())
+                pixmap.setMask (maskBitmap);
 
             // draw onto doc
             document ()->setPixmapAt (pixmap, rect.topLeft ());
diff --git a/kolourpaint/tools/kptoolpen.h b/kolourpaint/tools/kptoolpen.h
index 77d7c33c..acee1265 100644
--- a/kolourpaint/tools/kptoolpen.h
+++ b/kolourpaint/tools/kptoolpen.h
@@ -103,11 +103,11 @@ private slots:
     void slotEraserSizeChanged (int size);
 
 private:
-    bool wash (TQPainter *painter, TQPainter *tqmaskPainter,
+    bool wash (TQPainter *painter, TQPainter *maskPainter,
                const TQImage &image,
                const kpColor &colorToReplace,
                const TQRect &imageRect, int plotx, int ploty);
-    bool wash (TQPainter *painter, TQPainter *tqmaskPainter,
+    bool wash (TQPainter *painter, TQPainter *maskPainter,
                const TQImage &image,
                const kpColor &colorToReplace,
                const TQRect &imageRect, const TQRect &drawRect);
diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp
index 0e298759..5a074bb6 100644
--- a/kolourpaint/tools/kptoolpolygon.cpp
+++ b/kolourpaint/tools/kptoolpolygon.cpp
@@ -81,7 +81,7 @@ static const char *pointArrayToString (const TQPointArray &pointArray)
 
 static TQPen makeMaskPen (const kpColor &color, int lineWidth, Qt::PenStyle lineStyle)
 {
-    return TQPen (color.tqmaskColor (),
+    return TQPen (color.maskColor (),
                  lineWidth == 1 ? 0/*closer to looking width 1*/ : lineWidth, lineStyle,
                  Qt::RoundCap, Qt::RoundJoin);
 }
@@ -103,7 +103,7 @@ static TQBrush makeMaskBrush (const kpColor &foregroundColor,
                              kpToolWidgetFillStyle *toolWidgetFillStyle)
 {
     if (toolWidgetFillStyle)
-        return toolWidgetFillStyle->tqmaskBrush (foregroundColor, backgroundColor);
+        return toolWidgetFillStyle->maskBrush (foregroundColor, backgroundColor);
     else
         return Qt::NoBrush;
 }
@@ -155,33 +155,33 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
     // draw
 
     TQPen pen = makePen (foregroundColor, lineWidth, lineStyle),
-         tqmaskPen = makeMaskPen (foregroundColor, lineWidth, lineStyle);
+         maskPen = makeMaskPen (foregroundColor, lineWidth, lineStyle);
     TQBrush brush = makeBrush (foregroundColor, backgroundColor, toolWidgetFillStyle),
-           tqmaskBrush = makeMaskBrush (foregroundColor, backgroundColor, toolWidgetFillStyle);
+           maskBrush = makeMaskBrush (foregroundColor, backgroundColor, toolWidgetFillStyle);
 
     TQPixmap pixmap = oldPixmap;
-    TQBitmap tqmaskBitmap;
+    TQBitmap maskBitmap;
 
-    TQPainter painter, tqmaskPainter;
+    TQPainter painter, maskPainter;
 
     if (pixmap.tqmask () ||
-        (tqmaskPen.style () != TQt::NoPen &&
-         tqmaskPen.color () == TQt::color0/*transparent*/) ||
-        (tqmaskBrush.style () != TQt::NoBrush &&
-         tqmaskBrush.color () == TQt::color0/*transparent*/))
+        (maskPen.style () != TQt::NoPen &&
+         maskPen.color () == TQt::color0/*transparent*/) ||
+        (maskBrush.style () != TQt::NoBrush &&
+         maskBrush.color () == TQt::color0/*transparent*/))
     {
-        tqmaskBitmap = kpPixmapFX::getNonNullMask (pixmap);
-        tqmaskPainter.begin (&tqmaskBitmap);
-        tqmaskPainter.setPen (tqmaskPen);
-        tqmaskPainter.setBrush (tqmaskBrush);
+        maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
+        maskPainter.begin (&maskBitmap);
+        maskPainter.setPen (maskPen);
+        maskPainter.setBrush (maskBrush);
 
     #if DEBUG_KP_TOOL_POLYGON && 0
-        kdDebug () << "\ttqmaskPainter begin because:" << endl
+        kdDebug () << "\tmaskPainter begin because:" << endl
                    << "\t\tpixmap.tqmask=" << pixmap.tqmask () << endl
-                   << "\t\t(tqmaskPenStyle!=NoPen)=" << (tqmaskPen.style () != TQt::NoPen) << endl
-                   << "\t\t(tqmaskPenColor==trans)=" << (tqmaskPen.color () == TQt::color0) << endl
-                   << "\t\t(tqmaskBrushStyle!=NoBrush)=" << (tqmaskBrush.style () != TQt::NoBrush) << endl
-                   << "\t\t(tqmaskBrushColor==trans)=" << (tqmaskBrush.color () == TQt::color0) << endl;
+                   << "\t\t(maskPenStyle!=NoPen)=" << (maskPen.style () != TQt::NoPen) << endl
+                   << "\t\t(maskPenColor==trans)=" << (maskPen.color () == TQt::color0) << endl
+                   << "\t\t(maskBrushStyle!=NoBrush)=" << (maskBrush.style () != TQt::NoBrush) << endl
+                   << "\t\t(maskBrushColor==trans)=" << (maskBrush.color () == TQt::color0) << endl;
     #endif
     }
 
@@ -204,8 +204,8 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
     if (painter.isActive ())      \
         painter . cmd ;           \
                                   \
-    if (tqmaskPainter.isActive ())  \
-        tqmaskPainter . cmd ;       \
+    if (maskPainter.isActive ())  \
+        maskPainter . cmd ;       \
 }
 
     // SYNC: TQt bug
@@ -240,9 +240,9 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
                         painter.setRasterOp (TQt::XorROP);
                     }
 
-                    if (tqmaskPainter.isActive ())
+                    if (maskPainter.isActive ())
                     {
-                        TQPen XORpen = tqmaskPainter.pen ();
+                        TQPen XORpen = maskPainter.pen ();
 
                         // TODO???
                         #if 0
@@ -252,7 +252,7 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
                             XORpen.setColor (TQt::color0/*transparent*/);
                         #endif
 
-                        tqmaskPainter.setPen (XORpen);
+                        maskPainter.setPen (XORpen);
                     }
 
                     PAINTER_CALL (drawLine (pointsInRect [0], pointsInRect [count - 1]));
@@ -288,11 +288,11 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
     if (painter.isActive ())
         painter.end ();
 
-    if (tqmaskPainter.isActive ())
-        tqmaskPainter.end ();
+    if (maskPainter.isActive ())
+        maskPainter.end ();
 
-    if (!tqmaskBitmap.isNull ())
-        pixmap.setMask (tqmaskBitmap);
+    if (!maskBitmap.isNull ())
+        pixmap.setMask (maskBitmap);
 
     return pixmap;
 }
@@ -671,7 +671,7 @@ void kpToolPolygon::cancelShape ()
     endDraw (TQPoint (), TQRect ());
     commandHistory ()->undo ();
 #else
-    viewManager ()->tqinvalidateTempPixmap ();
+    viewManager ()->invalidateTempPixmap ();
 #endif
     m_points.resize (0);
 
@@ -781,7 +781,7 @@ void kpToolPolygon::endShape (const TQPoint &, const TQRect &)
     if (!hasBegunShape ())
         return;
 
-    viewManager ()->tqinvalidateTempPixmap ();
+    viewManager ()->invalidateTempPixmap ();
 
     TQRect boundingRect = kpTool::neededRect (m_points.boundingRect (), m_lineWidth);
 
diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp
index ea749da6..491e0fae 100644
--- a/kolourpaint/tools/kptoolrectangle.cpp
+++ b/kolourpaint/tools/kptoolrectangle.cpp
@@ -53,39 +53,39 @@
 static TQPixmap pixmap (const kpToolRectangle::Mode mode,
                        kpDocument *document, const TQRect &rect,
                        const TQPoint &startPoint, const TQPoint &endPoint,
-                       const TQPen &pen, const TQPen &tqmaskPen,
-                       const TQBrush &brush, const TQBrush &tqmaskBrush)
+                       const TQPen &pen, const TQPen &maskPen,
+                       const TQBrush &brush, const TQBrush &maskBrush)
 {
     TQPixmap pixmap = document->getPixmapAt (rect);
-    TQBitmap tqmaskBitmap;
+    TQBitmap maskBitmap;
 
-    TQPainter painter, tqmaskPainter;
+    TQPainter painter, maskPainter;
 
 #if DEBUG_KP_TOOL_RECTANGLE && 1
     kdDebug () << "pixmap: rect=" << rect
                << " startPoint=" << startPoint
                << " endPoint=" << endPoint
                << endl;
-    kdDebug () << "\tm: p=" << (tqmaskPen.style () != TQt::NoPen)
-               << " b=" << (tqmaskBrush.style () != TQt::NoBrush)
+    kdDebug () << "\tm: p=" << (maskPen.style () != TQt::NoPen)
+               << " b=" << (maskBrush.style () != TQt::NoBrush)
                << " o: p=" << (pen.style () != TQt::NoPen)
                << " b=" << (brush.style () != TQt::NoBrush)
                << endl;
-    kdDebug () << "\ttqmaskPen.color()=" << (int *) tqmaskPen.color ().rgb ()
+    kdDebug () << "\tmaskPen.color()=" << (int *) maskPen.color ().rgb ()
                << " transparent=" << (int *) TQt::color0.rgb ()/*transparent*/
                << endl;
 #endif
 
     if (pixmap.tqmask () ||
-        (tqmaskPen.style () != TQt::NoPen &&
-         tqmaskPen.color () ==  TQt::color0/*transparent*/) ||
-        (tqmaskBrush.style () != TQt::NoBrush &&
-         tqmaskBrush.color () == TQt::color0/*transparent*/))
+        (maskPen.style () != TQt::NoPen &&
+         maskPen.color () ==  TQt::color0/*transparent*/) ||
+        (maskBrush.style () != TQt::NoBrush &&
+         maskBrush.color () == TQt::color0/*transparent*/))
     {
-        tqmaskBitmap = kpPixmapFX::getNonNullMask (pixmap);
-        tqmaskPainter.begin (&tqmaskBitmap);
-        tqmaskPainter.setPen (tqmaskPen);
-        tqmaskPainter.setBrush (tqmaskBrush);
+        maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
+        maskPainter.begin (&maskBitmap);
+        maskPainter.setPen (maskPen);
+        maskPainter.setBrush (maskBrush);
     }
 
     if (pen.style () != TQt::NoPen ||
@@ -101,8 +101,8 @@ static TQPixmap pixmap (const kpToolRectangle::Mode mode,
     if (painter.isActive ())      \
         painter . cmd ;           \
                                   \
-    if (tqmaskPainter.isActive ())  \
-        tqmaskPainter . cmd ;       \
+    if (maskPainter.isActive ())  \
+        maskPainter . cmd ;       \
 }
 
     if (startPoint != endPoint)
@@ -144,11 +144,11 @@ static TQPixmap pixmap (const kpToolRectangle::Mode mode,
     if (painter.isActive ())
         painter.end ();
 
-    if (tqmaskPainter.isActive ())
-        tqmaskPainter.end ();
+    if (maskPainter.isActive ())
+        maskPainter.end ();
 
-    if (!tqmaskBitmap.isNull ())
-        pixmap.setMask (tqmaskBitmap);
+    if (!maskBitmap.isNull ())
+        pixmap.setMask (maskBitmap);
 
     return pixmap;
 }
@@ -231,7 +231,7 @@ void kpToolRectangle::slotBackgroundColorChanged (const kpColor &)
 // private
 void kpToolRectangle::updatePen (int mouseButton)
 {
-    TQColor tqmaskPenColor = color (mouseButton).tqmaskColor ();
+    TQColor maskPenColor = color (mouseButton).maskColor ();
 
     if (!m_toolWidgetLineWidth)
     {
@@ -239,7 +239,7 @@ void kpToolRectangle::updatePen (int mouseButton)
             m_pen [mouseButton] = TQPen (color (mouseButton).toTQColor ());
         else
             m_pen [mouseButton] = TQPen(Qt::NoPen);
-        m_tqmaskPen [mouseButton] = TQPen (tqmaskPenColor);
+        m_maskPen [mouseButton] = TQPen (maskPenColor);
     }
     else
     {
@@ -251,7 +251,7 @@ void kpToolRectangle::updatePen (int mouseButton)
         }
         else
             m_pen [mouseButton] = TQPen(Qt::NoPen);
-        m_tqmaskPen [mouseButton] = TQPen (tqmaskPenColor,
+        m_maskPen [mouseButton] = TQPen (maskPenColor,
                                         m_toolWidgetLineWidth->lineWidth (),
                                         TQt::SolidLine);
     }
@@ -270,14 +270,14 @@ void kpToolRectangle::updateBrush (int mouseButton)
             color (mouseButton)/*foreground colour*/,
             color (1 - mouseButton)/*background colour*/);
 
-        m_tqmaskBrush [mouseButton] = m_toolWidgetFillStyle->tqmaskBrush (
+        m_maskBrush [mouseButton] = m_toolWidgetFillStyle->maskBrush (
             color (mouseButton)/*foreground colour*/,
             color (1 - mouseButton)/*background colour*/);
     }
     else
     {
         m_brush [mouseButton] = TQBrush(Qt::NoBrush);
-        m_tqmaskBrush [mouseButton] = TQBrush(Qt::NoBrush);
+        m_maskBrush [mouseButton] = TQBrush(Qt::NoBrush);
     }
 }
 
@@ -437,7 +437,7 @@ void kpToolRectangle::applyModifiers ()
 
     m_toolRectangleRectWithoutLineWidth = rect;
     m_toolRectangleRect = kpTool::neededRect (rect, TQMAX (m_pen [m_mouseButton].width (),
-                                                          m_tqmaskPen [m_mouseButton].width ()));
+                                                          m_maskPen [m_mouseButton].width ()));
 }
 
 void kpToolRectangle::beginDraw ()
@@ -451,8 +451,8 @@ void kpToolRectangle::updateShape ()
 
     TQPixmap newPixmap = pixmap (m_mode, document (), m_toolRectangleRect,
                                 m_toolRectangleStartPoint, m_toolRectangleEndPoint,
-                                m_pen [m_mouseButton], m_tqmaskPen [m_mouseButton],
-                                m_brush [m_mouseButton], m_tqmaskBrush [m_mouseButton]);
+                                m_pen [m_mouseButton], m_maskPen [m_mouseButton],
+                                m_brush [m_mouseButton], m_maskBrush [m_mouseButton]);
     kpTempPixmap newTempPixmap (false/*always display*/,
                                 kpTempPixmap::SetPixmap/*render mode*/,
                                 m_toolRectangleRect.topLeft (),
@@ -511,7 +511,7 @@ void kpToolRectangle::cancelShape ()
     endDraw (m_currentPoint, TQRect (m_startPoint, m_currentPoint).normalize ());
     mainWindow ()->commandHistory ()->undo ();
 #else
-    viewManager ()->tqinvalidateTempPixmap ();
+    viewManager ()->invalidateTempPixmap ();
 #endif
 
     setUserMessage (i18n ("Let go of all the mouse buttons."));
@@ -527,13 +527,13 @@ void kpToolRectangle::endDraw (const TQPoint &, const TQRect &)
     applyModifiers ();
 
     // TODO: flicker
-    viewManager ()->tqinvalidateTempPixmap ();
+    viewManager ()->invalidateTempPixmap ();
 
     mainWindow ()->commandHistory ()->addCommand (
         new kpToolRectangleCommand
             (m_mode,
-             m_pen [m_mouseButton], m_tqmaskPen [m_mouseButton],
-             m_brush [m_mouseButton], m_tqmaskBrush [m_mouseButton],
+             m_pen [m_mouseButton], m_maskPen [m_mouseButton],
+             m_brush [m_mouseButton], m_maskBrush [m_mouseButton],
              m_toolRectangleRect, m_toolRectangleStartPoint, m_toolRectangleEndPoint,
              mainWindow ()));
 
@@ -546,15 +546,15 @@ void kpToolRectangle::endDraw (const TQPoint &, const TQRect &)
  */
 
 kpToolRectangleCommand::kpToolRectangleCommand (kpToolRectangle::Mode mode,
-                                                const TQPen &pen, const TQPen &tqmaskPen,
-                                                const TQBrush &brush, const TQBrush &tqmaskBrush,
+                                                const TQPen &pen, const TQPen &maskPen,
+                                                const TQBrush &brush, const TQBrush &maskBrush,
                                                 const TQRect &rect,
                                                 const TQPoint &startPoint, const TQPoint &endPoint,
                                                 kpMainWindow *mainWindow)
     : kpCommand (mainWindow),
       m_mode (mode),
-      m_pen (pen), m_tqmaskPen (tqmaskPen),
-      m_brush (brush), m_tqmaskBrush (tqmaskBrush),
+      m_pen (pen), m_maskPen (maskPen),
+      m_brush (brush), m_maskBrush (maskBrush),
       m_rect (rect),
       m_startPoint (startPoint),
       m_endPoint (endPoint),
@@ -612,8 +612,8 @@ void kpToolRectangleCommand::execute ()
 
     doc->setPixmapAt (pixmap (m_mode, doc,
                               m_rect, m_startPoint, m_endPoint,
-                              m_pen, m_tqmaskPen,
-                              m_brush, m_tqmaskBrush),
+                              m_pen, m_maskPen,
+                              m_brush, m_maskBrush),
                       m_rect.topLeft ());
 }
 
diff --git a/kolourpaint/tools/kptoolrectangle.h b/kolourpaint/tools/kptoolrectangle.h
index 03ade5a7..e41b5d47 100644
--- a/kolourpaint/tools/kptoolrectangle.h
+++ b/kolourpaint/tools/kptoolrectangle.h
@@ -103,10 +103,10 @@ private:
     kpToolWidgetFillStyle *m_toolWidgetFillStyle;
 
     void updatePen (int mouseButton);
-    TQPen m_pen [2], m_tqmaskPen [2];
+    TQPen m_pen [2], m_maskPen [2];
 
     void updateBrush (int mouseButton);
-    TQBrush m_brush [2], m_tqmaskBrush [2];
+    TQBrush m_brush [2], m_maskBrush [2];
 
     void applyModifiers ();
     TQPoint m_toolRectangleStartPoint, m_toolRectangleEndPoint;
@@ -117,8 +117,8 @@ class kpToolRectangleCommand : public kpCommand
 {
 public:
     kpToolRectangleCommand (kpToolRectangle::Mode mode,
-                            const TQPen &pen, const TQPen &tqmaskPen,
-                            const TQBrush &brush, const TQBrush &tqmaskBrush,
+                            const TQPen &pen, const TQPen &maskPen,
+                            const TQBrush &brush, const TQBrush &maskBrush,
                             const TQRect &rect,
                             const TQPoint &startPoint, const TQPoint &endPoint,
                             kpMainWindow *mainWindow);
@@ -133,8 +133,8 @@ public:
 
 private:
     kpToolRectangle::Mode m_mode;
-    TQPen m_pen, m_tqmaskPen;
-    TQBrush m_brush, m_tqmaskBrush;
+    TQPen m_pen, m_maskPen;
+    TQBrush m_brush, m_maskBrush;
     TQRect m_rect;
     TQPoint m_startPoint, m_endPoint;
     TQPixmap *m_oldPixmapPtr;
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index c230c1ee..a7532fc4 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -92,7 +92,7 @@ void kpToolWidgetBase::finishConstruction (int fallBackRow, int fallBackCol)
                << endl;
 #endif
 
-    retqlayoutOptions ();
+    relayoutOptions ();
 
     const TQPair <int, int> rowColPair = defaultSelectedRowAndCol ();
     if (!setSelected (rowColPair.first, rowColPair.second, false/*don't save*/))
@@ -226,10 +226,10 @@ void kpToolWidgetBase::saveSelectedAsDefault () const
 
 
 // public
-void kpToolWidgetBase::retqlayoutOptions ()
+void kpToolWidgetBase::relayoutOptions ()
 {
 #if DEBUG_KP_TOOL_WIDGET_BASE
-    kdDebug () << "kpToolWidgetBase::retqlayoutOptions()" << endl;
+    kdDebug () << "kpToolWidgetBase::relayoutOptions()" << endl;
 #endif
 
     while (!m_pixmaps.isEmpty () && m_pixmaps.last ().count () == 0)
diff --git a/kolourpaint/widgets/kptoolwidgetbase.h b/kolourpaint/widgets/kptoolwidgetbase.h
index 033f4946..8bef2a67 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.h
+++ b/kolourpaint/widgets/kptoolwidgetbase.h
@@ -70,7 +70,7 @@ public:  // (only have to use these if you don't use finishConstruction())
 
     void saveSelectedAsDefault () const;
 
-    void retqlayoutOptions ();
+    void relayoutOptions ();
 
 public:
     int selectedRow () const;
diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
index effd631f..c4354dea 100644
--- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp
+++ b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
@@ -78,9 +78,9 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *tqparent, const char *
         TQBitmap tqmask (previewPixmap.width (), previewPixmap.height ());
         tqmask.fill (TQt::color0/*transparent*/);
 
-        TQPainter tqmaskPainter (&tqmask);
-        tqmaskPainter.fillRect (rect, TQt::color1/*opaque*/);
-        tqmaskPainter.end ();
+        TQPainter maskPainter (&tqmask);
+        maskPainter.fillRect (rect, TQt::color1/*opaque*/);
+        maskPainter.end ();
 
         previewPixmap.setMask (tqmask);
 
@@ -130,19 +130,19 @@ TQPixmap kpToolWidgetEraserSize::cursorPixmap (const kpColor &color) const
 
     if (color.isTransparent ())
     {
-        TQBitmap tqmaskBitmap (pixmap.width (), pixmap.height ());
-        tqmaskBitmap.fill (TQt::color0/*transparent*/);
+        TQBitmap maskBitmap (pixmap.width (), pixmap.height ());
+        maskBitmap.fill (TQt::color0/*transparent*/);
 
 
         if (showBorder)
         {
-            TQPainter tqmaskBitmapPainter (&tqmaskBitmap);
-            tqmaskBitmapPainter.setPen (TQt::color1/*opaque*/);
-            tqmaskBitmapPainter.drawRect (tqmaskBitmap.rect ());
+            TQPainter maskBitmapPainter (&maskBitmap);
+            maskBitmapPainter.setPen (TQt::color1/*opaque*/);
+            maskBitmapPainter.drawRect (maskBitmap.rect ());
         }
 
 
-        pixmap.setMask (tqmaskBitmap);
+        pixmap.setMask (maskBitmap);
     }
 
 
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
index c59b730e..e2a1afce 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
@@ -139,7 +139,7 @@ kpToolWidgetFillStyle::FillStyle kpToolWidgetFillStyle::fillStyle () const
 }
 
 // public static
-TQBrush kpToolWidgetFillStyle::tqmaskBrushForFillStyle (FillStyle fs,
+TQBrush kpToolWidgetFillStyle::maskBrushForFillStyle (FillStyle fs,
                                                      const kpColor &foregroundColor,
                                                      const kpColor &backgroundColor)
 {
@@ -152,10 +152,10 @@ TQBrush kpToolWidgetFillStyle::tqmaskBrushForFillStyle (FillStyle fs,
         return Qt::NoBrush;
         break;
     case FillWithBackground:
-        return TQBrush (backgroundColor.tqmaskColor ());
+        return TQBrush (backgroundColor.maskColor ());
         break;
     case FillWithForeground:
-        return TQBrush (foregroundColor.tqmaskColor ());
+        return TQBrush (foregroundColor.maskColor ());
         break;
     default:
         return Qt::NoBrush;
@@ -163,10 +163,10 @@ TQBrush kpToolWidgetFillStyle::tqmaskBrushForFillStyle (FillStyle fs,
     }
 }
 
-TQBrush kpToolWidgetFillStyle::tqmaskBrush (const kpColor &foregroundColor,
+TQBrush kpToolWidgetFillStyle::maskBrush (const kpColor &foregroundColor,
                                          const kpColor &backgroundColor)
 {
-    return tqmaskBrushForFillStyle (fillStyle (), foregroundColor, backgroundColor);
+    return maskBrushForFillStyle (fillStyle (), foregroundColor, backgroundColor);
 }
 
 // public static
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.h b/kolourpaint/widgets/kptoolwidgetfillstyle.h
index 221d0245..82ee1357 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.h
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.h
@@ -59,10 +59,10 @@ private:
 public:
     FillStyle fillStyle () const;
 
-    static TQBrush tqmaskBrushForFillStyle (FillStyle fs,
+    static TQBrush maskBrushForFillStyle (FillStyle fs,
                                          const kpColor &foregroundColor,
                                          const kpColor &backgroundColor);
-    TQBrush tqmaskBrush (const kpColor &foregroundColor,
+    TQBrush maskBrush (const kpColor &foregroundColor,
                       const kpColor &backgroundColor);
 
     static TQBrush brushForFillStyle (FillStyle fs,
diff --git a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
index e7804149..0d419333 100644
--- a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
+++ b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
@@ -52,22 +52,22 @@ kpToolWidgetLineWidth::kpToolWidgetLineWidth (TQWidget *tqparent, const char *na
                         (h <= 0 ? height () : h));
         pixmap.fill (TQt::white);
 
-        TQBitmap tqmaskBitmap (pixmap.width (), pixmap.height ());
-        tqmaskBitmap.fill (TQt::color0/*transparent*/);
+        TQBitmap maskBitmap (pixmap.width (), pixmap.height ());
+        maskBitmap.fill (TQt::color0/*transparent*/);
         
         
-        TQPainter painter (&pixmap), tqmaskPainter (&tqmaskBitmap);
-        painter.setPen (TQt::black), tqmaskPainter.setPen (TQt::color1/*opaque*/);
-        painter.setBrush (TQt::black), tqmaskPainter.setBrush (TQt::color1/*opaque*/);
+        TQPainter painter (&pixmap), maskPainter (&maskBitmap);
+        painter.setPen (TQt::black), maskPainter.setPen (TQt::color1/*opaque*/);
+        painter.setBrush (TQt::black), maskPainter.setBrush (TQt::color1/*opaque*/);
 
         TQRect rect = TQRect (0, (pixmap.height () - lineWidths [i]) / 2,
                             pixmap.width (), lineWidths [i]);
-        painter.drawRect (rect), tqmaskPainter.drawRect (rect);
+        painter.drawRect (rect), maskPainter.drawRect (rect);
 
-        painter.end (), tqmaskPainter.end ();
+        painter.end (), maskPainter.end ();
         
         
-        pixmap.setMask (tqmaskBitmap);
+        pixmap.setMask (maskBitmap);
 
         addOption (pixmap, TQString::number (lineWidths [i]));
         startNewOptionRow ();
diff --git a/kooka/kocrbase.h b/kooka/kocrbase.h
index 5f7e55a9..3597908f 100644
--- a/kooka/kocrbase.h
+++ b/kooka/kocrbase.h
@@ -107,7 +107,7 @@ protected:
      * ocr engine used.
      * It calls the virtual subs ocrEngineName, ocrEngineLogo and ocrEngineDesc which
      * must return the approbiate values for the engines.
-     * @return a pointer to a VBox in which further elements can be tqlayouted
+     * @return a pointer to a VBox in which further elements can be layouted
      */
     virtual void ocrIntro();
 
diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp
index 31c3bc40..ff675231 100644
--- a/kooka/kocrocrad.cpp
+++ b/kooka/kocrocrad.cpp
@@ -92,7 +92,7 @@ TQString ocradDialog::ocrEngineDesc() const
 }
 
 
-int ocradDialog::tqlayoutDetectionMode() const
+int ocradDialog::layoutDetectionMode() const
 {
     return m_layoutMode->currentItem();
 }
@@ -131,8 +131,8 @@ EngineError ocradDialog::setupGui()
 
     /** tqlayout detection button **/
     conf->setGroup( CFG_GROUP_OCRAD );
-    int tqlayoutDetect = conf->readNumEntry( CFG_OCRAD_LAYOUT_DETECTION, 0 );
-    kdDebug(28000) << "Layout detection from config: " << tqlayoutDetect << endl;
+    int layoutDetect = conf->readNumEntry( CFG_OCRAD_LAYOUT_DETECTION, 0 );
+    kdDebug(28000) << "Layout detection from config: " << layoutDetect << endl;
 
     (void) new KSeparator( KSeparator::HLine, page);
     TQHBox *hb1 = new TQHBox(page);
@@ -142,7 +142,7 @@ EngineError ocradDialog::setupGui()
     m_layoutMode->insertItem(i18n("No Layout Detection"), 0 );
     m_layoutMode->insertItem(i18n("Column Detection"), 1 );
     m_layoutMode->insertItem(i18n("Full Layout Detection"), 2);
-    m_layoutMode->setCurrentItem(tqlayoutDetect);
+    m_layoutMode->setCurrentItem(layoutDetect);
 
     /** stating the ocrad binary **/
     (void) new KSeparator( KSeparator::HLine, page);
diff --git a/kooka/kocrocrad.h b/kooka/kocrocrad.h
index d33f03a3..dc6000ca 100644
--- a/kooka/kocrocrad.h
+++ b/kooka/kocrocrad.h
@@ -38,7 +38,7 @@
 #include "kocrbase.h"
 
 #define CFG_GROUP_OCRAD "ocrad"
-#define CFG_OCRAD_LAYOUT_DETECTION "tqlayoutDetection"
+#define CFG_OCRAD_LAYOUT_DETECTION "layoutDetection"
 #define CFG_OCRAD_EXTRA_ARGUMENTS  "extraArguments"
 #define CFG_OCRAD_FORMAT "format"
 #define CFG_OCRAD_CHARSET "charset"
@@ -71,7 +71,7 @@ public:
 
     TQString orfUrl() const;
 
-    int tqlayoutDetectionMode() const;
+    int layoutDetectionMode() const;
 
     /**
      * returns the numeric version of the ocrad program.
diff --git a/kooka/kookaimage.cpp b/kooka/kookaimage.cpp
index a89a97cb..4bf7976c 100644
--- a/kooka/kookaimage.cpp
+++ b/kooka/kookaimage.cpp
@@ -205,7 +205,7 @@ void KookaImage::extractNow()
 {
    kdDebug(28000) << "extracting a subimage number " << m_subNo << endl;
 
-   KookaImage *tqparent = tqparentImage();
+   KookaImage *tqparent = parentImage();
 
    if( tqparent )
    {
@@ -328,7 +328,7 @@ KookaImage::~KookaImage()
 
 }
 
-KookaImage* KookaImage::tqparentImage() const
+KookaImage* KookaImage::parentImage() const
 {
    return( m_parent );
 }
diff --git a/kooka/kookaimage.h b/kooka/kookaimage.h
index 53ae5eaf..559f1469 100644
--- a/kooka/kookaimage.h
+++ b/kooka/kookaimage.h
@@ -78,7 +78,7 @@ public:
     /**
      * the tqparent image.
      */
-    KookaImage*  tqparentImage() const;
+    KookaImage*  parentImage() const;
 
     /**
      * returns true if this is a subimage.
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index 9e687ff5..54d37244 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -401,7 +401,7 @@ void KSANEOCR::startOCRAD( )
     *daemon <<  m_tmpOrfName;                   // the orf result file
     *daemon << TQFile::encodeName( m_ocrImagePBM ).data();      // The name of the image
     *daemon << TQString("-l");
-    *daemon << TQString::number( ocrDia->tqlayoutDetectionMode());
+    *daemon << TQString::number( ocrDia->layoutDetectionMode());
 
     KConfig *konf = KGlobal::config ();
     KConfigGroupSaver( konf, CFG_GROUP_OCRAD );
diff --git a/kpdf/conf/dlgaccessibility.ui b/kpdf/conf/dlgaccessibility.ui
index 3aa7eb2f..9d7b9da2 100644
--- a/kpdf/conf/dlgaccessibility.ui
+++ b/kpdf/conf/dlgaccessibility.ui
@@ -567,7 +567,7 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="5" margin="11"/>
+<layoutdefaults spacing="5" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kpdf/conf/dlggeneral.ui b/kpdf/conf/dlggeneral.ui
index e577b81b..b042d261 100644
--- a/kpdf/conf/dlggeneral.ui
+++ b/kpdf/conf/dlggeneral.ui
@@ -167,5 +167,5 @@
     <function access="protected" specifier="non virtual">showEvent( TQShowEvent * )</function>
 </functions>
 <pixmapfunction>DesktopIcon</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpdf/conf/dlgperformance.ui b/kpdf/conf/dlgperformance.ui
index 408075b0..dab4ffcc 100644
--- a/kpdf/conf/dlgperformance.ui
+++ b/kpdf/conf/dlgperformance.ui
@@ -274,5 +274,5 @@
     <function access="private">init()</function>
 </functions>
 <pixmapfunction>DesktopIcon</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpdf/conf/dlgpresentation.ui b/kpdf/conf/dlgpresentation.ui
index 9df30f3d..8d3a6c8c 100644
--- a/kpdf/conf/dlgpresentation.ui
+++ b/kpdf/conf/dlgpresentation.ui
@@ -275,7 +275,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/kpdf/core/generator_pdf/gp_outputdev.cpp b/kpdf/core/generator_pdf/gp_outputdev.cpp
index b6c40520..d8aad33a 100644
--- a/kpdf/core/generator_pdf/gp_outputdev.cpp
+++ b/kpdf/core/generator_pdf/gp_outputdev.cpp
@@ -172,7 +172,7 @@ void KPDFOutputDev::processLink( Link * link, Catalog * catalog )
 }
 
 void KPDFOutputDev::drawImage( GfxState *state, Object *ref, Stream *str,
-    int _width, int _height, GfxImageColorMap *colorMap, int *tqmaskColors, GBool inlineImg )
+    int _width, int _height, GfxImageColorMap *colorMap, int *maskColors, GBool inlineImg )
 {
     if ( m_generateImages )
     {
@@ -207,7 +207,7 @@ void KPDFOutputDev::drawImage( GfxState *state, Object *ref, Stream *str,
             m_rects.push_back( rect );
         }
     }
-    SplashOutputDev::drawImage( state, ref, str, _width, _height, colorMap, tqmaskColors, inlineImg );
+    SplashOutputDev::drawImage( state, ref, str, _width, _height, colorMap, maskColors, inlineImg );
 }
 //END - OutputDev hooked calls
 
diff --git a/kpdf/core/generator_pdf/gp_outputdev.h b/kpdf/core/generator_pdf/gp_outputdev.h
index a4d33b04..7eea425f 100644
--- a/kpdf/core/generator_pdf/gp_outputdev.h
+++ b/kpdf/core/generator_pdf/gp_outputdev.h
@@ -63,7 +63,7 @@ class KPDFOutputDev : public SplashOutputDev
         virtual void processLink(Link *link, Catalog *catalog);
         //----- image drawing
         virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height,
-                             GfxImageColorMap *colorMap, int *tqmaskColors, GBool inlineImg);
+                             GfxImageColorMap *colorMap, int *maskColors, GBool inlineImg);
 
     private:
         // delete all interal objects and data
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index e1212817..76b1aa82 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -113,7 +113,7 @@ using namespace KPDF;
 
 unsigned int Part::m_count = 0;
 
-Part::Part(TQWidget *tqparentWidget, const char *widgetName,
+Part::Part(TQWidget *parentWidget, const char *widgetName,
            TQObject *tqparent, const char *name,
            const TQStringList & /*args*/ )
 	: DCOPObject("kpdf"), KParts::ReadOnlyPart(tqparent, name), m_showMenuBarAction(0), m_showFullScreenAction(0),
@@ -157,7 +157,7 @@ Part::Part(TQWidget *tqparentWidget, const char *widgetName,
 		connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) );
 
 	// widgets: ^searchbar (toolbar containing label and SearchWidget)
-//	m_searchToolBar = new KToolBar( tqparentWidget, "searchBar" );
+//	m_searchToolBar = new KToolBar( parentWidget, "searchBar" );
 //	m_searchToolBar->boxLayout()->setSpacing( KDialog::spacingHint() );
 //	TQLabel * sLabel = new TQLabel( i18n( "&Search:" ), m_searchToolBar, "kde toolbar widget" );
 //	m_searchWidget = new SearchWidget( m_searchToolBar, m_document );
@@ -165,7 +165,7 @@ Part::Part(TQWidget *tqparentWidget, const char *widgetName,
 //	m_searchToolBar->setStretchableWidget( m_searchWidget );
 
 	// widgets: [] splitter []
-	m_splitter = new TQSplitter( tqparentWidget, widgetName );
+	m_splitter = new TQSplitter( parentWidget, widgetName );
 	m_splitter->setOpaqueResize( true );
 	setWidget( m_splitter );
 	
diff --git a/kpdf/part.h b/kpdf/part.h
index 23a12271..791c3d2d 100644
--- a/kpdf/part.h
+++ b/kpdf/part.h
@@ -63,7 +63,7 @@ Q_OBJECT
 
 public:
 	// Default constructor
-	Part(TQWidget* tqparentWidget, const char* widgetName,
+	Part(TQWidget* parentWidget, const char* widgetName,
 	     TQObject* tqparent, const char* name, const TQStringList& args);
 
 	// Destructor
diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index df3ebfce..c5d85cea 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -428,7 +428,7 @@ void HoverButton::paintEvent( TQPaintEvent * e )
     else
     {
         TQPainter p( this );
-        p.fillRect(e->rect(), tqparentWidget() ? tqparentWidget()->tqpalette().brush(TQPalette::Active, TQColorGroup::Background) : paletteBackgroundColor());
+        p.fillRect(e->rect(), parentWidget() ? parentWidget()->tqpalette().brush(TQPalette::Active, TQColorGroup::Background) : paletteBackgroundColor());
         drawButtonLabel( &p );
     }
 }
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 7172c6d3..27fe3fcb 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -173,7 +173,7 @@ void PageViewTip::maybeTip( const TQPoint &_p )
  *  160 - constructor and creating actions plus their connected slots (empty stuff)
  *  70  - DocumentObserver inherited methodes (important)
  *  550 - events: mouse, keyboard, drag/drop
- *  170 - slotRetqlayoutPages: set contents of the scrollview on continuous/single modes
+ *  170 - slotRelayoutPages: set contents of the scrollview on continuous/single modes
  *  100 - zoom: zooming pages in different ways, keeping update the toolbar actions, etc..
  *  other misc functions: only slotRequestVisiblePixmaps and pickItemOnPoint noticeable,
  * and many insignificant stuff like this comment :-)
@@ -343,12 +343,12 @@ void PageView::notifySetup( const TQValueVector< KPDFPage * > & pageSet, bool do
         d->items.push_back( new PageViewItem( *setIt ) );
 
     if ( pageSet.count() > 0 )
-        // TODO for Enrico: Check if doing always the slotRetqlayoutPages() is not
+        // TODO for Enrico: Check if doing always the slotRelayoutPages() is not
         // suboptimal in some cases, i'd say it is not but a recheck will not hurt
-        // Need slotRetqlayoutPages() here instead of d->dirtyLayout = true
+        // Need slotRelayoutPages() here instead of d->dirtyLayout = true
         // because opening a pdf from another pdf will not trigger a viewportchange
-        // so pages are never retqlayouted
-        TQTimer::singleShot(0, this, TQT_SLOT(slotRetqlayoutPages()));
+        // so pages are never relayouted
+        TQTimer::singleShot(0, this, TQT_SLOT(slotRelayoutPages()));
     else
     {
         // update the mouse cursor when closing because we may have close through a link and
@@ -395,7 +395,7 @@ void PageView::notifyViewportChanged( bool smoothMove )
     // retqlayout in "Single Pages" mode or if a retqlayout is pending
     d->blockPixmapsRequest = true;
     if ( !KpdfSettings::viewContinuous() || d->dirtyLayout )
-        slotRetqlayoutPages();
+        slotRelayoutPages();
 
     // restore viewport center or use default {x-center,v-top} tqalignment
     const TQRect & r = item->tqgeometry();
@@ -637,7 +637,7 @@ void PageView::viewportResizeEvent( TQResizeEvent * )
     if ( !d->delayResizeTimer )
     {
         d->delayResizeTimer = new TQTimer( this );
-        connect( d->delayResizeTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRetqlayoutPages() ) );
+        connect( d->delayResizeTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRelayoutPages() ) );
     }
     d->delayResizeTimer->start( 333, true );
 }
@@ -1550,7 +1550,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
         // be sure to block updates to document's viewport
         bool prevState = d->blockViewport;
         d->blockViewport = true;
-        slotRetqlayoutPages();
+        slotRelayoutPages();
         d->blockViewport = prevState;
         // request pixmaps
         slotRequestVisiblePixmaps();
@@ -1649,7 +1649,7 @@ void PageView::doTypeAheadSearch()
 }
 
 //BEGIN private SLOTS
-void PageView::slotRetqlayoutPages()
+void PageView::slotRelayoutPages()
 // called by: notifySetup, viewportResizeEvent, slotTwoPagesToggled, slotContinuousToggled, updateZoom
 {
     // set an empty container if we have no pages
@@ -2070,7 +2070,7 @@ void PageView::slotRotateRight()
     // be sure to block updates to document's viewport
     bool prevState = d->blockViewport;
     d->blockViewport = true;
-    slotRetqlayoutPages();
+    slotRelayoutPages();
     d->blockViewport = prevState;
     // request pixmaps
     slotRequestVisiblePixmaps();
@@ -2094,7 +2094,7 @@ void PageView::slotRotateLeft()
     // be sure to block updates to document's viewport
     bool prevState = d->blockViewport;
     d->blockViewport = true;
-    slotRetqlayoutPages();
+    slotRelayoutPages();
     d->blockViewport = prevState;
     // request pixmaps
     slotRequestVisiblePixmaps();
@@ -2108,7 +2108,7 @@ void PageView::slotTwoPagesToggled( bool on )
         KpdfSettings::setViewColumns( newColumns );
         KpdfSettings::writeConfig();
         if ( d->document->pages() > 0 )
-            slotRetqlayoutPages();
+            slotRelayoutPages();
     }
 }
 
@@ -2119,7 +2119,7 @@ void PageView::slotContinuousToggled( bool on )
         KpdfSettings::setViewContinuous( on );
         KpdfSettings::writeConfig();
         if ( d->document->pages() > 0 )
-            slotRetqlayoutPages();
+            slotRelayoutPages();
     }
 }
 
diff --git a/kpdf/ui/pageview.h b/kpdf/ui/pageview.h
index 97114dcc..3bec8be0 100644
--- a/kpdf/ui/pageview.h
+++ b/kpdf/ui/pageview.h
@@ -101,7 +101,7 @@ class PageView : public TQScrollView, public DocumentObserver
         void selectionStart( int x, int y, const TQColor & color, bool aboveAll = false );
         void selectionEndPoint( int x, int y );
         void selectionClear();
-        // update internal zoom values and end in a slotRetqlayoutPages();
+        // update internal zoom values and end in a slotRelayoutPages();
         void updateZoom( ZoomMode newZm );
         // update the text on the label using global zoom value or current page's one
         void updateZoomText();
@@ -115,7 +115,7 @@ class PageView : public TQScrollView, public DocumentObserver
 
     private slots:
         // activated either directly or via TQTimer on the viewportResizeEvent
-        void slotRetqlayoutPages();
+        void slotRelayoutPages();
         // activated either directly or via the contentsMoving(int,int) signal
         void slotRequestVisiblePixmaps( int left = -1, int top = -1 );
         // activated by the viewport move timer
diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp
index ed5c637a..369bcd83 100644
--- a/kpdf/ui/pageviewutils.cpp
+++ b/kpdf/ui/pageviewutils.cpp
@@ -93,10 +93,10 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration
     resize( tqgeometry.size() );
 
     // create and set transparency tqmask
-    TQPainter tqmaskPainter( &tqmask);
+    TQPainter maskPainter( &tqmask);
     tqmask.fill( TQt::black );
-    tqmaskPainter.setBrush( TQt::white );
-    tqmaskPainter.drawRoundRect( tqgeometry, 1600 / tqgeometry.width(), 1600 / tqgeometry.height() );
+    maskPainter.setBrush( TQt::white );
+    maskPainter.drawRoundRect( tqgeometry, 1600 / tqgeometry.width(), 1600 / tqgeometry.height() );
     setMask( tqmask );
 
     // draw background
@@ -119,7 +119,7 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration
     // if the tqlayout is RtL, we can move it to the right place only after we
     // know how much size it will take
     if ( TQApplication::reverseLayout() )
-        move( tqparentWidget()->width() - tqgeometry.width() - 10, 10 );
+        move( parentWidget()->width() - tqgeometry.width() - 10, 10 );
 
     // show widget and schedule a tqrepaint
     show();
diff --git a/kpdf/ui/toc.cpp b/kpdf/ui/toc.cpp
index a453f20d..08880c3d 100644
--- a/kpdf/ui/toc.cpp
+++ b/kpdf/ui/toc.cpp
@@ -104,21 +104,21 @@ void TOC::notifySetup( const TQValueVector< KPDFPage * > & /*pages*/, bool docum
     emit hasTOC( true );
 }
 
-void TOC::addChildren( const TQDomNode & tqparentNode, KListViewItem * tqparentItem )
+void TOC::addChildren( const TQDomNode & parentNode, KListViewItem * parentItem )
 {
     // keep track of the current listViewItem
     TOCItem * currentItem = 0;
-    TQDomNode n = tqparentNode.firstChild();
+    TQDomNode n = parentNode.firstChild();
     while( !n.isNull() )
     {
         // convert the node to an element (sure it is)
         TQDomElement e = n.toElement();
 
-        // insert the entry as top level (listview tqparented) or 2nd+ level
-        if ( !tqparentItem )
+        // insert the entry as top level (listview parented) or 2nd+ level
+        if ( !parentItem )
             currentItem = new TOCItem( this, currentItem, e );
         else
-            currentItem = new TOCItem( tqparentItem, currentItem, e );
+            currentItem = new TOCItem( parentItem, currentItem, e );
 
         // descend recursively and advance to the next node
         if ( e.hasChildNodes() )
diff --git a/kpdf/ui/toc.h b/kpdf/ui/toc.h
index 2d0c76d7..93824166 100644
--- a/kpdf/ui/toc.h
+++ b/kpdf/ui/toc.h
@@ -36,7 +36,7 @@ Q_OBJECT
         void slotExecuted(TQListViewItem *i);
 
     private:
-        void addChildren( const TQDomNode & tqparentNode, KListViewItem * tqparentItem = 0 );
+        void addChildren( const TQDomNode & parentNode, KListViewItem * parentItem = 0 );
         DocumentViewport getViewport( const TQDomElement &e ) const;
         KPDFDocument *m_document;
 };
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 1d13712f..a9e10a2d 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -627,7 +627,7 @@ void PMDockWidget::show()
 void PMDockWidget::setDockWindowType (NET::WindowType windowType)
 {
   d->windowType = windowType;
-  applyToWidget( tqparentWidget(), TQPoint(0,0) );
+  applyToWidget( parentWidget(), TQPoint(0,0) );
 }
 
 #endif
@@ -636,7 +636,7 @@ void PMDockWidget::setDockWindowTransient (TQWidget *tqparent, bool transientEna
 {
   d->_parent = tqparent;
   d->transient = transientEnabled;
-  applyToWidget( tqparentWidget(), TQPoint(0,0) );
+  applyToWidget( parentWidget(), TQPoint(0,0) );
 }
 
 bool PMDockWidget::event( TQEvent* pevent )
@@ -663,13 +663,13 @@ bool PMDockWidget::event( TQEvent* pevent )
       emit manager->change();
       break;
     case TQEvent::CaptionChange:
-      if ( tqparentWidget() ){
+      if ( parentWidget() ){
         if ( tqparent()->inherits("PMDockSplitter") ){
           ((PMDockSplitter*)(tqparent()))->updateName();
         }
-        if ( tqparentDockTabGroup() ){
-          setDockTabName( tqparentDockTabGroup() );
-          tqparentDockTabGroup()->setTabLabel( this, tabPageLabel() );
+        if ( parentDockTabGroup() ){
+          setDockTabName( parentDockTabGroup() );
+          parentDockTabGroup()->setTabLabel( this, tabPageLabel() );
         }
       }
       break;
@@ -715,7 +715,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
     succes = false;
   }
 
-  if ( tqparent() && !tqparent()->inherits("PMDockSplitter") && !tqparentDockTabGroup() ){
+  if ( tqparent() && !tqparent()->inherits("PMDockSplitter") && !parentDockTabGroup() ){
     succes = false;
   }
 
@@ -724,7 +724,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   if( target && ( dockPos != PMDockWidget::DockCenter )
       && ( dockPos != PMDockWidget::DockNone ) )
   {
-     TQWidget* pdt = target->tqparentDockTabGroup( );
+     TQWidget* pdt = target->parentDockTabGroup( );
      if( pdt )
         return manualDock( ( PMDockWidget* ) ( pdt->tqparent( ) ),
                            dockPos, spliPos, pos, check, tabIndex );
@@ -759,19 +759,19 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
     return this;
   }
 
-  PMDockTabGroup* tqparentTab = target->tqparentDockTabGroup();
-  if ( tqparentTab ){
+  PMDockTabGroup* parentTab = target->parentDockTabGroup();
+  if ( parentTab ){
     // add to existing TabGroup
-    applyToWidget( tqparentTab );
-    tqparentTab->insertTab( this, icon() ? *icon() : TQPixmap(),
+    applyToWidget( parentTab );
+    parentTab->insertTab( this, icon() ? *icon() : TQPixmap(),
                           tabPageLabel(), tabIndex );
-    setDockTabName( tqparentTab );
+    setDockTabName( parentTab );
     if( !toolTipStr.isEmpty())
-      tqparentTab->setTabToolTip( this, toolTipStr);
+      parentTab->setTabToolTip( this, toolTipStr);
 
     currentDockPos = PMDockWidget::DockCenter;
     emit manager->change();
-    return (PMDockWidget*)tqparentTab->tqparent();
+    return (PMDockWidget*)parentTab->tqparent();
   }
 
   // MODIFICATION (Zehender):
@@ -792,7 +792,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
         {
            PMDockWidget* dw = ( PMDockWidget* ) wtarget;
            newTarget = dw;
-           TQWidget* pw = wtarget->tqparentWidget( );
+           TQWidget* pw = wtarget->parentWidget( );
            if( pw )
            {
               if( pw->inherits( "PMDockSplitter" ) )
@@ -803,7 +803,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
               }
            }
         }
-        wtarget = wtarget->tqparentWidget( );
+        wtarget = wtarget->parentWidget( );
      }
 
      if( newTarget != target )
@@ -813,8 +813,8 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   // END MODIFICATION
 
   // create a new dockwidget that will contain the target and this
-  TQWidget* tqparentDock = target->tqparentWidget();
-  PMDockWidget* newDock = new PMDockWidget( manager, "tempName", TQPixmap(TQString("")), tqparentDock );
+  TQWidget* parentDock = target->parentWidget();
+  PMDockWidget* newDock = new PMDockWidget( manager, "tempName", TQPixmap(TQString("")), parentDock );
   newDock->currentDockPos = target->currentDockPos;
 
   if ( dockPos == PMDockWidget::DockCenter ){
@@ -824,9 +824,9 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   }
   newDock->eDocking = (target->eDocking & eDocking) & (~(int)PMDockWidget::DockCenter);
 
-  newDock->applyToWidget( tqparentDock );
+  newDock->applyToWidget( parentDock );
 
-  if ( !tqparentDock ){
+  if ( !parentDock ){
     // dock to a toplevel dockwidget means newDock is toplevel now
     newDock->move( target->frameGeometry().topLeft() );
     newDock->resize( target->tqgeometry().size() );
@@ -909,9 +909,9 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
     panner->show();
   }
 
-  if ( tqparentDock ){
-    if ( tqparentDock->inherits("PMDockSplitter") ){
-      PMDockSplitter* sp = (PMDockSplitter*)tqparentDock;
+  if ( parentDock ){
+    if ( parentDock->inherits("PMDockSplitter") ){
+      PMDockSplitter* sp = (PMDockSplitter*)parentDock;
       sp->deactivate();
       if ( sp->getFirst() == target )
         sp->activate( newDock, 0L );
@@ -928,10 +928,10 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   return newDock;
 }
 
-PMDockTabGroup* PMDockWidget::tqparentDockTabGroup() const
+PMDockTabGroup* PMDockWidget::parentDockTabGroup() const
 {
   if ( !tqparent() ) return 0L;
-  TQWidget* candidate = tqparentWidget()->tqparentWidget();
+  TQWidget* candidate = parentWidget()->parentWidget();
   if ( candidate && candidate->inherits("PMDockTabGroup") ) return (PMDockTabGroup*)candidate;
   return 0L;
 }
@@ -948,8 +948,8 @@ void PMDockWidget::toDesktop()
 
 void PMDockWidget::undock()
 {
-  TQWidget* tqparentW = tqparentWidget();
-  if ( !tqparentW ){
+  TQWidget* parentW = parentWidget();
+  if ( !parentW ){
     hide();
     if (!d->blockHasUndockedSignal)
       emit hasUndocked();
@@ -962,73 +962,73 @@ void PMDockWidget::undock()
   manager->blockSignals(true);
   manager->undockProcess = true;
 
-  bool isV = tqparentW->isVisibleToTLW();
+  bool isV = parentW->isVisibleToTLW();
 
-  PMDockTabGroup* tqparentTab = tqparentDockTabGroup();
-  if ( tqparentTab ){
-    d->index = tqparentTab->indexOf( this); // memorize the page position in the tab widget
-    tqparentTab->removePage( this );
-    formerBrotherDockWidget = (PMDockWidget*)tqparentTab->page(0);
+  PMDockTabGroup* parentTab = parentDockTabGroup();
+  if ( parentTab ){
+    d->index = parentTab->indexOf( this); // memorize the page position in the tab widget
+    parentTab->removePage( this );
+    formerBrotherDockWidget = (PMDockWidget*)parentTab->page(0);
     TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
                       this, TQT_SLOT(loseFormerBrotherDockWidget()) );
     applyToWidget( 0L );
-    if ( tqparentTab->count() == 1 ){
+    if ( parentTab->count() == 1 ){
 
       // last subdock widget in the tab control
-      PMDockWidget* lastTab = (PMDockWidget*)tqparentTab->page(0);
-      tqparentTab->removePage( lastTab );
+      PMDockWidget* lastTab = (PMDockWidget*)parentTab->page(0);
+      parentTab->removePage( lastTab );
       lastTab->applyToWidget( 0L );
-      lastTab->move( tqparentTab->mapToGlobal(tqparentTab->frameGeometry().topLeft()) );
+      lastTab->move( parentTab->mapToGlobal(parentTab->frameGeometry().topLeft()) );
 
       // PMDockTabGroup always have a tqparent that is a PMDockWidget
-      PMDockWidget* tqparentOfTab = (PMDockWidget*)tqparentTab->tqparent();
-      delete tqparentTab; // PMDockTabGroup
+      PMDockWidget* parentOfTab = (PMDockWidget*)parentTab->tqparent();
+      delete parentTab; // PMDockTabGroup
 
-      TQWidget* tqparentOfDockWidget = tqparentOfTab->tqparentWidget();
-      if ( tqparentOfDockWidget == 0L ){
+      TQWidget* parentOfDockWidget = parentOfTab->parentWidget();
+      if ( parentOfDockWidget == 0L ){
           if ( isV ) lastTab->show();
       } else {
-        if ( tqparentOfDockWidget->inherits("PMDockSplitter") ){
-          PMDockSplitter* split = (PMDockSplitter*)tqparentOfDockWidget;
+        if ( parentOfDockWidget->inherits("PMDockSplitter") ){
+          PMDockSplitter* split = (PMDockSplitter*)parentOfDockWidget;
           lastTab->applyToWidget( split );
           split->deactivate();
-          if ( split->getFirst() == tqparentOfTab ){
+          if ( split->getFirst() == parentOfTab ){
             split->activate( lastTab );
             if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
-              emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockLeft );
+              emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockLeft );
             else
-              emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockTop );
+              emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockTop );
           } else {
             split->activate( 0L, lastTab );
             if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
-              emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockRight );
+              emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockRight );
             else
-              emit ((PMDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, PMDockWidget::DockBottom );
+              emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockBottom );
           }
           split->show();
         } else {
-          lastTab->applyToWidget( tqparentOfDockWidget );
+          lastTab->applyToWidget( parentOfDockWidget );
         }
         lastTab->show();
       }
       manager->blockSignals(false);
-      emit manager->replaceDock( tqparentOfTab, lastTab );
-      lastTab->currentDockPos = tqparentOfTab->currentDockPos;
-      emit tqparentOfTab->iMBeingClosed();
+      emit manager->replaceDock( parentOfTab, lastTab );
+      lastTab->currentDockPos = parentOfTab->currentDockPos;
+      emit parentOfTab->iMBeingClosed();
       manager->blockSignals(true);
-      delete tqparentOfTab;
+      delete parentOfTab;
 
     } else {
-      setDockTabName( tqparentTab );
+      setDockTabName( parentTab );
     }
   } else {
 /*********************************************************************************************/
-    if ( tqparentW->inherits("PMDockSplitter") ){
-      PMDockSplitter* tqparentSplitterOfDockWidget = (PMDockSplitter*)tqparentW;
-      d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos();
+    if ( parentW->inherits("PMDockSplitter") ){
+      PMDockSplitter* parentSplitterOfDockWidget = (PMDockSplitter*)parentW;
+      d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos();
 
-      PMDockWidget* secondWidget = (PMDockWidget*)tqparentSplitterOfDockWidget->getAnother( this );
-      PMDockWidget* group        = (PMDockWidget*)tqparentSplitterOfDockWidget->tqparentWidget();
+      PMDockWidget* secondWidget = (PMDockWidget*)parentSplitterOfDockWidget->getAnother( this );
+      PMDockWidget* group        = (PMDockWidget*)parentSplitterOfDockWidget->parentWidget();
       formerBrotherDockWidget = secondWidget;
       applyToWidget( 0L );
       group->hide();
@@ -1037,25 +1037,25 @@ void PMDockWidget::undock()
         TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
                           this, TQT_SLOT(loseFormerBrotherDockWidget()) );
 
-      if ( !group->tqparentWidget() ){
+      if ( !group->parentWidget() ){
         secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() );
         secondWidget->resize( group->width(), group->height() );
       } else {
-        TQWidget* obj = group->tqparentWidget();
+        TQWidget* obj = group->parentWidget();
         secondWidget->applyToWidget( obj );
         if ( obj->inherits("PMDockSplitter") ){
-          PMDockSplitter* tqparentOfGroup = (PMDockSplitter*)obj;
-          tqparentOfGroup->deactivate();
+          PMDockSplitter* parentOfGroup = (PMDockSplitter*)obj;
+          parentOfGroup->deactivate();
 
-          if ( tqparentOfGroup->getFirst() == group )
-            tqparentOfGroup->activate( secondWidget );
+          if ( parentOfGroup->getFirst() == group )
+            parentOfGroup->activate( secondWidget );
           else
-            tqparentOfGroup->activate( 0L, secondWidget );
+            parentOfGroup->activate( 0L, secondWidget );
         }
       }
       secondWidget->currentDockPos = group->currentDockPos;
       secondWidget->formerDockPos  = group->formerDockPos;
-      delete tqparentSplitterOfDockWidget;
+      delete parentSplitterOfDockWidget;
       manager->blockSignals(false);
       emit manager->replaceDock( group, secondWidget );
       emit group->iMBeingClosed();
@@ -1107,13 +1107,13 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
   listOfCaption.remove( listOfCaption.length()-1, 1 );
   listOfName.remove( listOfName.length()-1, 1 );
 
-  tab->tqparentWidget()->setName( listOfName.utf8() );
-  tab->tqparentWidget()->setCaption( listOfCaption );
+  tab->parentWidget()->setName( listOfName.utf8() );
+  tab->parentWidget()->setCaption( listOfCaption );
 
-  tab->tqparentWidget()->tqrepaint( false ); // PMDockWidget->tqrepaint
-  if ( tab->tqparentWidget()->tqparent() )
-    if ( tab->tqparentWidget()->tqparent()->inherits("PMDockSplitter") )
-      ((PMDockSplitter*)(tab->tqparentWidget()->tqparent()))->updateName();
+  tab->parentWidget()->tqrepaint( false ); // PMDockWidget->tqrepaint
+  if ( tab->parentWidget()->tqparent() )
+    if ( tab->parentWidget()->tqparent()->inherits("PMDockSplitter") )
+      ((PMDockSplitter*)(tab->parentWidget()->tqparent()))->updateName();
 }
 
 bool PMDockWidget::mayBeHide() const
@@ -1146,16 +1146,16 @@ void PMDockWidget::changeHideShowState()
 
 void PMDockWidget::makeDockVisible()
 {
-  if ( tqparentDockTabGroup() ){
-    tqparentDockTabGroup()->showPage( this );
+  if ( parentDockTabGroup() ){
+    parentDockTabGroup()->showPage( this );
   }
   if ( isVisible() ) return;
 
-  TQWidget* p = tqparentWidget();
+  TQWidget* p = parentWidget();
   while ( p ){
     if ( !p->isVisible() )
       p->show();
-    p = p->tqparentWidget();
+    p = p->parentWidget();
   }
   if( tqparent() == 0L) // is undocked
     dockBack();
@@ -1306,7 +1306,7 @@ void PMDockManager::activate()
   while ( (obj=(PMDockWidget*)it.current()) ) {
     ++it;
     if ( obj->widget ) obj->widget->show();
-    if ( !obj->tqparentDockTabGroup() ){
+    if ( !obj->parentDockTabGroup() ){
         obj->show();
     }
   }
@@ -1468,7 +1468,7 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
   if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "PMDockTabGroup", "_dock_tab" ) ) return 0L;
   if (!childDockWidgetList) return 0L;
   if ( childDockWidgetList->tqfind(w) != -1 ) return 0L;
-  if ( currentDragWidget->isGroup && ((PMDockWidget*)w)->tqparentDockTabGroup() ) return 0L;
+  if ( currentDragWidget->isGroup && ((PMDockWidget*)w)->parentDockTabGroup() ) return 0L;
 
   PMDockWidget* www = (PMDockWidget*)w;
   if ( www->dockSite( ) == (int)PMDockWidget::DockNone ) return 0L;
@@ -1559,9 +1559,9 @@ void PMDockManager::startDrag( PMDockWidget* w )
    || ( w->currentDockPos == PMDockWidget::DockTop) || ( w->currentDockPos == PMDockWidget::DockBottom)) {
     w->prevSideDockPosBeforeDrag = w->currentDockPos;
 
-    if ( w->tqparentWidget()->inherits("PMDockSplitter") ){
-      PMDockSplitter* tqparentSplitterOfDockWidget = (PMDockSplitter*)(w->tqparentWidget());
-      w->d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos();
+    if ( w->parentWidget()->inherits("PMDockSplitter") ){
+      PMDockSplitter* parentSplitterOfDockWidget = (PMDockSplitter*)(w->parentWidget());
+      w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos();
     }
   }
 
@@ -1577,7 +1577,7 @@ void PMDockManager::dragMove( PMDockWidget* dw, TQPoint pos )
   PMDockWidget::DockPosition oldPos = curPos;
 
   TQSize r = dw->widget->size();
-  if ( dw->tqparentDockTabGroup() ){
+  if ( dw->parentDockTabGroup() ){
     curPos = PMDockWidget::DockCenter;
     if ( oldPos != curPos ) {
       d->dragRect.setRect( p.x()+2, p.y()+2, r.width()-4, r.height()-4 );
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index 28e85963..8639e6b0 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -614,7 +614,7 @@ public:
   /**
    * @return the tqparent widget of this if it inherits class PMDockTabGroup
    */
-  PMDockTabGroup* tqparentDockTabGroup() const;
+  PMDockTabGroup* parentDockTabGroup() const;
 
 #ifndef NO_KDE2
 
@@ -855,7 +855,7 @@ public:
 #ifndef NO_KDE2
   /**
    * Saves the current state of the dockmanager and of all controlled widgets.
-   * State means here to save the tqgeometry, visibility, tqparents, internal object names, orientation,
+   * State means here to save the tqgeometry, visibility, parents, internal object names, orientation,
    * separator positions, dockwidget-group information, tab widget states (if it is a tab group) and
    * last but not least some necessary things for recovering the dockmainwindow state.
    *
diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp
index 5a86e25a..3dd59456 100644
--- a/kpovmodeler/pmdockwidget_private.cpp
+++ b/kpovmodeler/pmdockwidget_private.cpp
@@ -238,15 +238,15 @@ void PMDockSplitter::updateName()
   if ( !initialised ) return;
 
   TQString new_name = TQString( child0->name() ) + "," + child1->name();
-  tqparentWidget()->setName( new_name.latin1() );
-  tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() );
-  tqparentWidget()->tqrepaint( false );
+  parentWidget()->setName( new_name.latin1() );
+  parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
+  parentWidget()->tqrepaint( false );
 
-  ((PMDockWidget*)tqparentWidget())->firstName = child0->name();
-  ((PMDockWidget*)tqparentWidget())->lastName = child1->name();
-  ((PMDockWidget*)tqparentWidget())->splitterOrientation = orientation;
+  ((PMDockWidget*)parentWidget())->firstName = child0->name();
+  ((PMDockWidget*)parentWidget())->lastName = child1->name();
+  ((PMDockWidget*)parentWidget())->splitterOrientation = orientation;
 
-  TQWidget* p = tqparentWidget()->tqparentWidget();
+  TQWidget* p = parentWidget()->parentWidget();
   if ( p != 0L && p->inherits("PMDockSplitter" ) )
     ((PMDockSplitter*)p)->updateName();
 }
diff --git a/kpovmodeler/pmfactory.cpp b/kpovmodeler/pmfactory.cpp
index a9bdaee8..57881593 100644
--- a/kpovmodeler/pmfactory.cpp
+++ b/kpovmodeler/pmfactory.cpp
@@ -54,7 +54,7 @@ PMFactory::~PMFactory( )
    s_aboutData = 0L;
 }
 
-KParts::Part* PMFactory::createPartObject( TQWidget* tqparentWidget,
+KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget,
                                      const char* widgetName,
                                      TQObject* tqparent, const char* name,
                                      const char* classname,
@@ -65,7 +65,7 @@ KParts::Part* PMFactory::createPartObject( TQWidget* tqparentWidget,
    bool readwrite = !( ( strcmp( classname, "Browser/View" ) == 0 )
           || ( strcmp( classname, "KParts::ReadOnlyPart" ) == 0 ) );
 
-   KParts::ReadWritePart *part = new PMPart( tqparentWidget, widgetName,
+   KParts::ReadWritePart *part = new PMPart( parentWidget, widgetName,
                                              tqparent, name, readwrite );
 
    return part;
diff --git a/kpovmodeler/pmfactory.h b/kpovmodeler/pmfactory.h
index ee649d84..dac51e7b 100644
--- a/kpovmodeler/pmfactory.h
+++ b/kpovmodeler/pmfactory.h
@@ -33,7 +33,7 @@ public:
    PMFactory( );
    virtual ~PMFactory( );
 
-   virtual KParts::Part* createPartObject( TQWidget* tqparentWidget,
+   virtual KParts::Part* createPartObject( TQWidget* parentWidget,
                                      const char* widgetName,
                                      TQObject* tqparent, const char* name,
                                      const char* classname,
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 823e3c19..91e6d797 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -312,7 +312,7 @@ void PMGLView::initializeGL( )
 
       Window p;
       p = RootWindow( display, vi->screen );
-      TQWidget* pw = tqparentWidget( );
+      TQWidget* pw = parentWidget( );
       if( pw )
          p = pw->winId( );
 
@@ -406,7 +406,7 @@ void PMGLView::setScale( double scale )
    if( m_dScale > 0 )
    {
       m_dScale = scale;
-      tqinvalidateProjection( );
+      invalidateProjection( );
    }
    else
       kdError( PMArea ) << "Scale <= 0 in PMGLView::setScale\n";
@@ -415,18 +415,18 @@ void PMGLView::setScale( double scale )
 void PMGLView::setTranslationX( double d )
 {
    m_dTransX = d;
-   tqinvalidateProjection( );
+   invalidateProjection( );
 }
 
 void PMGLView::setTranslationY( double d )
 {
    m_dTransY = d;
-   tqinvalidateProjection( );
+   invalidateProjection( );
 }
 
 void PMGLView::resizeEvent( TQResizeEvent* )
 {
-   tqinvalidateProjection( );
+   invalidateProjection( );
 }
 
 void PMGLView::paintEvent( TQPaintEvent* )
@@ -434,7 +434,7 @@ void PMGLView::paintEvent( TQPaintEvent* )
    tqrepaint( );
 }
 
-void PMGLView::tqinvalidateProjection( bool graphicalChange /*= true*/ )
+void PMGLView::invalidateProjection( bool graphicalChange /*= true*/ )
 {
    m_viewTransformation = PMMatrix::identity( );
 
@@ -698,14 +698,14 @@ void PMGLView::mouseMoveEvent( TQMouseEvent* e )
             m_dTransX += m_scaleIntX * c;
             m_dTransY += m_scaleIntY * c;
             m_dScale *= s;
-            tqinvalidateProjection( );
+            invalidateProjection( );
          }
       }
       else if( m_bTranslateMode )
       {
          m_dTransX += ( e->x( ) - m_mousePos.x( ) ) / m_dScale;
          m_dTransY -= ( e->y( ) - m_mousePos.y( ) ) / m_dScale;
-         tqinvalidateProjection( );
+         invalidateProjection( );
       }
       m_mousePos = e->pos( );
    }
@@ -713,7 +713,7 @@ void PMGLView::mouseMoveEvent( TQMouseEvent* e )
    {
       m_dTransX += ( e->x( ) - m_mousePos.x( ) ) / m_dScale;
       m_dTransY -= ( e->y( ) - m_mousePos.y( ) ) / m_dScale;
-      tqinvalidateProjection( );
+      invalidateProjection( );
 
       m_mousePos = e->pos( );
    }
@@ -799,7 +799,7 @@ void PMGLView::wheelEvent( TQWheelEvent* e )
       m_dTransX += deltaX * c;
       m_dTransY += deltaY * c;
       m_dScale *= s;
-      tqinvalidateProjection( );
+      invalidateProjection( );
    }
 }
 
@@ -858,7 +858,7 @@ void PMGLView::keyPressEvent( TQKeyEvent* e )
       accept = false;
 
    if( accept )
-      tqinvalidateProjection( );
+      invalidateProjection( );
    else
       e->ignore( );
 }
@@ -885,7 +885,7 @@ void PMGLView::slotAutoScroll( )
 
       m_dTransX += pixels * m_autoScrollDirectionX / m_dScale;
       m_dTransY -= pixels * m_autoScrollDirectionY / m_dScale;
-      tqinvalidateProjection( );
+      invalidateProjection( );
 
    if( m_bGraphicalChangeMode )
       if( m_bMultipleSelectionMode )
@@ -1101,7 +1101,7 @@ void PMGLView::setType( PMViewType t )
    if( m_type != t )
       m_viewTransformation = PMMatrix::identity( );
    m_type = t;
-   tqinvalidateProjection( );
+   invalidateProjection( );
 
    emit viewTypeChanged( viewTypeAsString( t ) );
 }
@@ -1109,7 +1109,7 @@ void PMGLView::setType( PMViewType t )
 void PMGLView::setCamera( PMCamera* c )
 {
    m_pCamera = c;
-   tqinvalidateProjection( );
+   invalidateProjection( );
 }
 
 void PMGLView::slotRefresh( )
@@ -1135,7 +1135,7 @@ void PMGLView::slotClear( )
 void PMGLView::slotActiveRenderModeChanged( )
 {
    if( ( m_type == PMViewCamera ) && m_pCamera )
-      tqinvalidateProjection( );
+      invalidateProjection( );
 }
 
 void PMGLView::slotStopRendering( )
@@ -1176,13 +1176,13 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
       {
          if( obj->type( ) == "Camera" )
             if( m_pCamera == ( PMCamera* ) obj )
-               tqinvalidateProjection( );
+               invalidateProjection( );
 
          if( obj->tqparent( ) )
             if( obj->tqparent( )->type( ) == "Camera" )
                if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
                   if( obj->hasTransformationMatrix( ) )
-                     tqinvalidateProjection( );
+                     invalidateProjection( );
       }
 
       redraw = true;
@@ -1213,7 +1213,7 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
             if( obj->tqparent( )->type( ) == "Camera" )
                if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
                   if( obj->hasTransformationMatrix( ) )
-                     tqinvalidateProjection( );
+                     invalidateProjection( );
       }
       redraw = true;
    }
@@ -1229,7 +1229,7 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
             if( obj->tqparent( )->type( ) == "Camera" )
                if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
                   if( obj->hasTransformationMatrix( ) )
-                     tqinvalidateProjection( );
+                     invalidateProjection( );
 
       redraw = true;
    }
diff --git a/kpovmodeler/pmglview.h b/kpovmodeler/pmglview.h
index 036ce5f5..e6954370 100644
--- a/kpovmodeler/pmglview.h
+++ b/kpovmodeler/pmglview.h
@@ -353,7 +353,7 @@ private:
    /**
     * Invalidates the projection and repaints the view
     */
-   void tqinvalidateProjection( bool graphicaChange = false );
+   void invalidateProjection( bool graphicaChange = false );
 
    /**
     * Starts multiple selection mode
diff --git a/kpovmodeler/pminsertrulesystem.cpp b/kpovmodeler/pminsertrulesystem.cpp
index 4e2b79c3..1090837f 100644
--- a/kpovmodeler/pminsertrulesystem.cpp
+++ b/kpovmodeler/pminsertrulesystem.cpp
@@ -897,7 +897,7 @@ void PMInsertRuleSystem::loadRules( const TQString& fileName )
    PMRuleClass::s_pPrototypeManager = 0;
 }
 
-bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
+bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
                                     const TQString& className,
                                     const PMObject* after,
                                     const PMObjectList* objectsBetween )
@@ -905,7 +905,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
    bool possible = false;
 
    // find rules for target class
-   PMMetaObject* meta = tqparentObject->tqmetaObject( );
+   PMMetaObject* meta = parentObject->tqmetaObject( );
    for( ; meta && !possible; meta = meta->superClass( ) )
    {
       PMRuleTargetClass* tc = m_rulesDict.tqfind( meta->className( ) );
@@ -917,7 +917,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
          TQStringList::ConstIterator it;
          for( it = exceptions.begin( );
               it != exceptions.end( ) && !exceptionFound; ++it )
-            if( tqparentObject->isA( *it ) )
+            if( parentObject->isA( *it ) )
                exceptionFound = true;
 
          if( !exceptionFound )
@@ -935,7 +935,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
 
                   // count already inserted child objects
                   bool afterInsertPoint = false;
-                  PMObject* o = tqparentObject->firstChild( );
+                  PMObject* o = parentObject->firstChild( );
                   if( !after )
                      afterInsertPoint = true;
                   for( ; o; o = o->nextSibling( ) )
@@ -952,7 +952,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
                   }
 
                   // evaluate condition value
-                  possible = rule->evaluate( tqparentObject );
+                  possible = rule->evaluate( parentObject );
                }
             }
          }
@@ -962,15 +962,15 @@ bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
    return possible;
 }
 
-bool PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
+bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
                                     const PMObject* object,
                                     const PMObject* after,
                                     const PMObjectList* objectsBetween )
 {
-   return canInsert( tqparentObject, object->type( ), after, objectsBetween );
+   return canInsert( parentObject, object->type( ), after, objectsBetween );
 }
 
-int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
+int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
                                    const PMObjectList& list,
                                    const PMObject* after )
 {
@@ -978,17 +978,17 @@ int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
    TQStringList classes;
    for( ; it.current( ); ++it )
       classes.append( it.current( )->type( ) );
-   return canInsert( tqparentObject, classes, after );
+   return canInsert( parentObject, classes, after );
 }
 
-int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
+int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
                                    const TQStringList& list,
                                    const PMObject* after )
 {
    if( list.size( ) == 1 )
    {
       // more efficient
-      if( canInsert( tqparentObject, list.first( ), after ) )
+      if( canInsert( parentObject, list.first( ), after ) )
          return 1;
       else
          return 0;
@@ -996,7 +996,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
 
    // find rules for target class
    TQPtrList<PMRuleTargetClass> targetClassList;
-   PMMetaObject* meta = tqparentObject->tqmetaObject( );
+   PMMetaObject* meta = parentObject->tqmetaObject( );
    for( ; meta; meta = meta->superClass( ) )
    {
       PMRuleTargetClass* tc = m_rulesDict.tqfind( meta->className( ) );
@@ -1015,7 +1015,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
       {
          rit.current( )->reset( );
          bool afterInsertPoint = false;
-         PMObject* o = tqparentObject->firstChild( );
+         PMObject* o = parentObject->firstChild( );
          if( !after )
             afterInsertPoint = true;
          for( ; o; o = o->nextSibling( ) )
@@ -1041,7 +1041,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* tqparentObject,
          {
             PMRule* rule = rit.current( );
             if( rule->matches( *oit ) )
-               possible = rule->evaluate( tqparentObject );
+               possible = rule->evaluate( parentObject );
          }
       }
       if( possible )
diff --git a/kpovmodeler/pminsertrulesystem.h b/kpovmodeler/pminsertrulesystem.h
index c280bcc2..0f13a099 100644
--- a/kpovmodeler/pminsertrulesystem.h
+++ b/kpovmodeler/pminsertrulesystem.h
@@ -624,7 +624,7 @@ public:
     * The parser uses the third parameter for top level objects. These objects
     * have to be treated as if they are inserted after the object after.
     */
-   bool canInsert( const PMObject* tqparentObject, const TQString& className,
+   bool canInsert( const PMObject* parentObject, const TQString& className,
                    const PMObject* after, const PMObjectList* objectsBetween = 0 );
 
    /**
@@ -634,20 +634,20 @@ public:
     * The parser uses the third parameter for top level objects. These objects
     * have to be treated as if they are inserted after the object after.
     *
-    * Same as canInsert( tqparentObject, object->class( ), after, objectsBetween )
+    * Same as canInsert( parentObject, object->class( ), after, objectsBetween )
     */
-   bool canInsert( const PMObject* tqparentObject, const PMObject* object,
+   bool canInsert( const PMObject* parentObject, const PMObject* object,
                    const PMObject* after, const PMObjectList* objectsBetween = 0 );
 
    /**
     * Returns the number of objects that can be inserted at that position
     */
-   int canInsert( const PMObject* tqparentObject, const PMObjectList& list,
+   int canInsert( const PMObject* parentObject, const PMObjectList& list,
                   const PMObject* after );
    /**
     * Returns the number of objects that can be inserted at that position
     */
-   int canInsert( const PMObject* tqparentObject, const TQStringList& listOfClasses,
+   int canInsert( const PMObject* parentObject, const TQStringList& listOfClasses,
                   const PMObject* after );
    /**
     * Returns a pointer to the part
diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp
index acafe593..a1be809b 100644
--- a/kpovmodeler/pmlayoutsettings.cpp
+++ b/kpovmodeler/pmlayoutsettings.cpp
@@ -186,7 +186,7 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* tqparent, const char* name )
 void PMLayoutSettings::displaySettings( )
 {
    PMViewLayoutManager* m = PMViewLayoutManager::theManager( );
-   m_viewLayouts = m->tqlayouts( );
+   m_viewLayouts = m->layouts( );
    m_currentViewLayout = m_viewLayouts.begin( );
    m_defaultViewLayout = m_viewLayouts.begin( );
    for( ; ( m_defaultViewLayout != m_viewLayouts.end( ) ) &&
@@ -210,7 +210,7 @@ bool PMLayoutSettings::validateData( )
       if( ( *lit ).name( ).isEmpty( ) )
       {
          emit showMe( );
-         KMessageBox::error( this, i18n( "View tqlayouts may not have empty names." ),
+         KMessageBox::error( this, i18n( "View layouts may not have empty names." ),
                              i18n( "Error" ) );
          return false;
       }
diff --git a/kpovmodeler/pmlibraryhandle.cpp b/kpovmodeler/pmlibraryhandle.cpp
index e22a37f2..36ed2d2a 100644
--- a/kpovmodeler/pmlibraryhandle.cpp
+++ b/kpovmodeler/pmlibraryhandle.cpp
@@ -353,12 +353,12 @@ PMLibraryHandle::PMResult PMLibraryHandle::deleteSubLibrary( const TQString& sub
    return PMLibraryHandle::NotInLib;
 }
 
-PMLibraryHandle::PMResult PMLibraryHandle::changeParentLibrary( const TQString& tqparentPath )
+PMLibraryHandle::PMResult PMLibraryHandle::changeParentLibrary( const TQString& parentPath )
 {
    if( m_readOnly )
       return PMLibraryHandle::ReadOnlyLib;
 
-   TQString newPath = tqparentPath + "/" + m_path.section( '/', -1 );
+   TQString newPath = parentPath + "/" + m_path.section( '/', -1 );
    PMLibraryHandle::EntryIterator itr( m_libraries );
    for( ; itr.current( ); ++itr )
    {
diff --git a/kpovmodeler/pmlibraryhandle.h b/kpovmodeler/pmlibraryhandle.h
index 2263407e..e20d6368 100644
--- a/kpovmodeler/pmlibraryhandle.h
+++ b/kpovmodeler/pmlibraryhandle.h
@@ -181,10 +181,10 @@ public:
 
    /**
     * Changes the tqparent library if this is a sub library
-    * @param tqparentPath The new tqparent path for this library
+    * @param parentPath The new tqparent path for this library
     * @return PMLibraryHandle::Ok if successful or the reason for failure
     */
-   PMLibraryHandle::PMResult changeParentLibrary( const TQString& tqparentPath );
+   PMLibraryHandle::PMResult changeParentLibrary( const TQString& parentPath );
 
 private:
 
diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp
index 03fd15c5..16778e76 100644
--- a/kpovmodeler/pmlibraryiconview.cpp
+++ b/kpovmodeler/pmlibraryiconview.cpp
@@ -220,10 +220,10 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
    TQValueList<bool> subLibList;
    if( m_isSubLibrary && PMLibraryIconDrag::decode( e, pathList, subLibList ) )
    {
-      PMLibraryIconView* source = static_cast<PMLibraryIconView*>( e->source( )->tqparentWidget( ) );
-      PMLibraryHandle* tqparentLib = source->library( );
+      PMLibraryIconView* source = static_cast<PMLibraryIconView*>( e->source( )->parentWidget( ) );
+      PMLibraryHandle* parentLib = source->library( );
       PMLibraryHandle newParentLib = PMLibraryHandle( m_path );
-      if ( tqparentLib->isReadOnly() || newParentLib.isReadOnly() )
+      if ( parentLib->isReadOnly() || newParentLib.isReadOnly() )
       {
          e->ignore();
          return;
@@ -238,7 +238,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
             if( subLibList[i] )
             {
                TQString newpath = newPath( path, true );
-               if( tqparentLib->deleteSubLibrary( path ) == PMLibraryHandle::Ok )
+               if( parentLib->deleteSubLibrary( path ) == PMLibraryHandle::Ok )
                {
                   PMLibraryHandle lib = PMLibraryHandle( path );
                   if( newParentLib.addSubLibrary( newpath, lib.name() ) == PMLibraryHandle::Ok )
@@ -249,7 +249,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
                   else
                   {
                      success = false;
-                     tqparentLib->addSubLibrary( path, lib.name( ) );
+                     parentLib->addSubLibrary( path, lib.name( ) );
                   }
                }
                else
@@ -258,7 +258,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
             else
             {
                TQString newpath = newPath( path, false );
-               if( tqparentLib->deleteObject( path ) == PMLibraryHandle::Ok )
+               if( parentLib->deleteObject( path ) == PMLibraryHandle::Ok )
                {
                   PMLibraryObject obj = PMLibraryObject( path );
                   if( newParentLib.addObject( newpath, obj.name() ) == PMLibraryHandle::Ok )
@@ -268,7 +268,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra
                   else
                   {
                      success = false;
-                     tqparentLib->addObject( path, obj.name( ) );
+                     parentLib->addObject( path, obj.name( ) );
                   }
                }
                else
diff --git a/kpovmodeler/pmlibrarymanager.h b/kpovmodeler/pmlibrarymanager.h
index 698f3f49..1ced4d0b 100644
--- a/kpovmodeler/pmlibrarymanager.h
+++ b/kpovmodeler/pmlibrarymanager.h
@@ -72,7 +72,7 @@ public:
 
    /**
     * Refreshes the list of libraries.
-    * WARNING: This function tqinvalidates all previously given PMLibraryHandle pointers
+    * WARNING: This function invalidates all previously given PMLibraryHandle pointers
     */
    void refresh( );
    
diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp
index 2c027314..e2801943 100644
--- a/kpovmodeler/pmparser.cpp
+++ b/kpovmodeler/pmparser.cpp
@@ -200,7 +200,7 @@ void PMParser::parse( PMObjectList* list, PMObject* tqparent,
          PMObject* obj = tqparent;
          bool stop = false;
          
-         // go to tqparents, until the tqparent is the scene
+         // go to parents, until the tqparent is the scene
          // (declares can only be inserted as top level objects)
          do
          {
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index db94f33e..7dec1524 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -99,7 +99,7 @@ TQTime PMDebugTime;
 
 //#define KPM_WITH_OBJECT_LIBRARY
 
-PMPart::PMPart( TQWidget* tqparentWidget, const char* widgetName,
+PMPart::PMPart( TQWidget* parentWidget, const char* widgetName,
                 TQObject* tqparent, const char* name, bool readwrite,
                 PMShell* shell )
       : DCOPObject( "PMPartIface" ),
@@ -141,7 +141,7 @@ PMPart::PMPart( TQWidget* tqparentWidget, const char* widgetName,
 
    initActions( );
    initDocument( );
-   initView( tqparentWidget, widgetName );
+   initView( parentWidget, widgetName );
 
    restoreConfig( instance( )->config( ) );
 
@@ -161,7 +161,7 @@ PMPart::PMPart( TQWidget* tqparentWidget, const char* widgetName,
    slotObjectChanged( m_pScene, PMCNewSelection, this );
 }
 
-PMPart::PMPart( TQWidget* /*tqparentWidget*/, const char* /*widgetName*/,
+PMPart::PMPart( TQWidget* /*parentWidget*/, const char* /*widgetName*/,
                 TQObject* tqparent, const char* name, bool readwrite,
                 bool /*onlyCutPaste*/, PMShell* shell )
       : DCOPObject( "LibraryBrowserIface" ),
diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h
index 0fe3bd22..30a60d41 100644
--- a/kpovmodeler/pmpart.h
+++ b/kpovmodeler/pmpart.h
@@ -76,7 +76,7 @@ public:
     * construtor of PMPart, calls all init functions to create the
     * application.
     */
-   PMPart( TQWidget* tqparentWidget, const char* widgetName,
+   PMPart( TQWidget* parentWidget, const char* widgetName,
            TQObject* tqparent, const char* name, bool readWrite,
            PMShell* shell = 0 );
 
@@ -84,7 +84,7 @@ public:
     * construtor of PMPart, calls all init functions to create the
     * application. It does not create the main widget.
     */
-   PMPart( TQWidget* tqparentWidget, const char* widgetName,
+   PMPart( TQWidget* parentWidget, const char* widgetName,
            TQObject* tqparent, const char* name, bool readWrite,
            bool onlyCutPaste, PMShell* shell = 0 );
 
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 4eee45a9..27249472 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -159,7 +159,7 @@ void PMShell::setupActions( )
                                     "view_new_librarybrowser" );
 #endif
 
-   // Creating the view tqlayouts menu
+   // Creating the view layouts menu
    m_pViewLayoutsAction = new KActionMenu( i18n( "View Layouts" ),
                                            actionCollection( ), "view_layouts_menu" );
    KPopupMenu* menu = m_pViewLayoutsAction->popupMenu( );
diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp
index 07fa308a..03eb8f7b 100644
--- a/kpovmodeler/pmtreeview.cpp
+++ b/kpovmodeler/pmtreeview.cpp
@@ -804,7 +804,7 @@ bool PMTreeView::targetDisplaysPart( TQWidget* target )
       // find the tree view
       TQWidget* t = target;
       while( t && !t->isA( "PMTreeView" ) )
-         t = t->tqparentWidget( );
+         t = t->parentWidget( );
       if( t )
          if( ( ( PMTreeView* ) t )->part( ) == m_pPart )
             result = true;
diff --git a/kpovmodeler/pmtreeviewitem.h b/kpovmodeler/pmtreeviewitem.h
index 234506bf..81fdeb96 100644
--- a/kpovmodeler/pmtreeviewitem.h
+++ b/kpovmodeler/pmtreeviewitem.h
@@ -61,7 +61,7 @@ public:
    PMObject* object( ) const { return m_pObject; }
    /**
     * Returns a key that can be used for sorting, here the index in the
-    * tqparents list of tqchildren
+    * parents list of tqchildren
     */
    virtual TQString key( int column, bool ascending ) const;
    /**
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp
index 1314ec85..4b57d728 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -663,7 +663,7 @@ void PMViewLayoutManager::loadData( )
 
    m_layoutsLoaded = true;
 
-   TQString fileName = locate( "data", "kpovmodeler/viewtqlayouts.xml" );
+   TQString fileName = locate( "data", "kpovmodeler/viewlayouts.xml" );
    if( fileName.isEmpty( ) )
    {
       // Generate a default tqlayout
@@ -710,7 +710,7 @@ void PMViewLayoutManager::loadData( )
    TQFile file( fileName );
    if( !file.open( IO_ReadOnly ) )
    {
-      kdError( PMArea ) << i18n( "Could not open the view tqlayouts file." )
+      kdError( PMArea ) << i18n( "Could not open the view layouts file." )
                         << endl;
       return;
    }
@@ -740,16 +740,16 @@ void PMViewLayoutManager::loadData( )
 
 void PMViewLayoutManager::saveData( )
 {
-   TQString fileName = locateLocal( "data", "kpovmodeler/viewtqlayouts.xml" );
+   TQString fileName = locateLocal( "data", "kpovmodeler/viewlayouts.xml" );
    if( fileName.isEmpty( ) )
    {
-      kdError( PMArea ) << i18n( "View tqlayouts not found." ) << endl;
+      kdError( PMArea ) << i18n( "View layouts not found." ) << endl;
       return;
    }
    TQFile file( fileName );
    if( !file.open( IO_WriteOnly ) )
    {
-      kdError( PMArea ) << i18n( "Could not open the view tqlayouts file." )
+      kdError( PMArea ) << i18n( "Could not open the view layouts file." )
                         << endl;
       return;
    }
diff --git a/kpovmodeler/pmviewlayoutmanager.h b/kpovmodeler/pmviewlayoutmanager.h
index 686472c3..1ef04eba 100644
--- a/kpovmodeler/pmviewlayoutmanager.h
+++ b/kpovmodeler/pmviewlayoutmanager.h
@@ -198,11 +198,11 @@ private:
 };
 
 /**
- * Singleton that contains the view tqlayouts available.
+ * Singleton that contains the view layouts available.
  *
- * It interacts with @ref PMShell to create the view tqlayouts.
- * The class maintains a list of tqlayouts as well as the name of the default
- * tqlayout. The tqlayouts are stored in a XML file caled viewtqlayouts.xml.
+ * It interacts with @ref PMShell to create the view layouts.
+ * The class maintains a list of layouts as well as the name of the default
+ * tqlayout. The layouts are stored in a XML file caled viewlayouts.xml.
  */
 class PMViewLayoutManager
 {
@@ -217,7 +217,7 @@ public:
    static PMViewLayoutManager* theManager( );
 
    /**
-    * Returns the list of available view tqlayouts
+    * Returns the list of available view layouts
     */
    TQStringList availableLayouts( );
    /**
@@ -237,7 +237,7 @@ public:
     */
    void displayDefaultLayout( PMShell* shell );
    /**
-    * Loads all tqlayouts from the configuration file
+    * Loads all layouts from the configuration file
     */
    void loadData( );
    /**
@@ -261,15 +261,15 @@ public:
     */
    PMViewLayout* findLayout( const TQString& name );
    /**
-    * Returns the list of available tqlayouts
+    * Returns the list of available layouts
     */
-   TQValueList<PMViewLayout> tqlayouts( ) { return m_layouts; }
+   TQValueList<PMViewLayout> layouts( ) { return m_layouts; }
    /**
-    * Sets the list of available tqlayouts
+    * Sets the list of available layouts
     */
    void setLayouts( const TQValueList<PMViewLayout>& l ) { m_layouts = l; }
    /**
-    * Fill the available tqlayouts menu
+    * Fill the available layouts menu
     */
    void fillPopupMenu( KPopupMenu* pMenu );
 private:
diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp
index 17a18eb6..d65f0890 100644
--- a/kruler/klineal.cpp
+++ b/kruler/klineal.cpp
@@ -78,7 +78,7 @@ KLineal::KLineal(TQWidget*tqparent,const char* name):KMainWindow(tqparent,name){
   TQWhatsThis::add(this,
   i18n(
   	"This is a tool to measure pixel distances and colors on the screen. "
-  	"It is useful for working on tqlayouts of dialogs, web pages etc."
+  	"It is useful for working on layouts of dialogs, web pages etc."
   ));
   TQBitmap bim = TQBitmap(TQSize(8, 48), cursorBits);
   TQWMatrix m;
diff --git a/ksnapshot/ksnapshotwidget.ui b/ksnapshot/ksnapshotwidget.ui
index 41fc9146..86e942f2 100644
--- a/ksnapshot/ksnapshotwidget.ui
+++ b/ksnapshot/ksnapshotwidget.ui
@@ -351,8 +351,8 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
     <function specifier="non virtual" returnType="TQPixmap">preview()</function>
 </functions>
 <pixmapfunction>SmallIconSet</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/ksnapshot/windowgrabber.cpp b/ksnapshot/windowgrabber.cpp
index 8bf8deee..0f646a22 100644
--- a/ksnapshot/windowgrabber.cpp
+++ b/ksnapshot/windowgrabber.cpp
@@ -166,15 +166,15 @@ TQPixmap grabWindow( Window child, int x, int y, uint w, uint h, uint border )
 		contents += TQRegion( w - border, 0, border, h );
 	    }
 
-	    //Get the tqmasked away area.
-	    TQRegion tqmaskedAway = bbox - contents;
-	    TQMemArray<TQRect> tqmaskedAwayRects = tqmaskedAway.tqrects();
+	    //Get the masked away area.
+	    TQRegion maskedAway = bbox - contents;
+	    TQMemArray<TQRect> maskedAwayRects = maskedAway.tqrects();
 
 	    //Construct a bitmap tqmask from the rectangles
 	    TQPainter p(&tqmask);
 	    p.fillRect(0, 0, w, h, TQt::color1);
-	    for (uint pos = 0; pos < tqmaskedAwayRects.count(); pos++)
-		    p.fillRect(tqmaskedAwayRects[pos], TQt::color0);
+	    for (uint pos = 0; pos < maskedAwayRects.count(); pos++)
+		    p.fillRect(maskedAwayRects[pos], TQt::color0);
 	    p.end();
 
 	    pm.setMask(tqmask);
diff --git a/ksvg/core/CanvasItems.cpp b/ksvg/core/CanvasItems.cpp
index b5b5681f..2e43a97f 100644
--- a/ksvg/core/CanvasItems.cpp
+++ b/ksvg/core/CanvasItems.cpp
@@ -107,7 +107,7 @@ void CanvasText::handleTSpan(KSVGCanvas *canvas, const SVGMatrixImpl *screenCTM,
 			TQString text = tspan->text();
 			if(!text.isEmpty())
 			{
-				T2P::GlyphLayoutParams *params = tspan->tqlayoutParams();
+				T2P::GlyphLayoutParams *params = tspan->layoutParams();
 
 				if(bMultipleX || bMultipleY)
 				{
@@ -265,7 +265,7 @@ KSVGTextChunk *CanvasText::createTextChunk(KSVGCanvas *canvas, const SVGMatrixIm
 						curx = usex;
 						cury = usey;
 
-						T2P::GlyphLayoutParams *params = tpath->tqlayoutParams();
+						T2P::GlyphLayoutParams *params = tpath->layoutParams();
 
 						if(!params->tb())
 							curx += endx;
@@ -290,7 +290,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
 	TQMemArray<double> _cury(1);
 	_cury[0] = double(cury);
 
-	T2P::GlyphLayoutParams *params = m_text->tqlayoutParams();
+	T2P::GlyphLayoutParams *params = m_text->layoutParams();
 	SVGTextPositioningElementImpl *tp = textChunk->getTextElement(0);
 	SVGTextContentElementImpl *tc = textChunk->getTextContentElement(0);
 	SVGTextContentElementImpl *tc0 = tc;
@@ -373,7 +373,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
 		}
 
 		{
-			T2P::GlyphLayoutParams *params = tc->tqlayoutParams();
+			T2P::GlyphLayoutParams *params = tc->layoutParams();
 			params->setLetterSpacing(params->letterSpacing() + addLetterSpacing);
 			if(bpath)
 			{
@@ -429,7 +429,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
 		return;
 
 	// Draw 'text-decoration'
-	// TODO: Currently just ignore text-decoration on vertical tqlayouts, is that correct?
+	// TODO: Currently just ignore text-decoration on vertical layouts, is that correct?
 	// Underline and overline have to be drawn before the glyphs are rendered
 	if(tc0->getTextDecoration() & UNDERLINE && !params->tb())
 		addTextDecoration(tc0, (curx - anchor), (cury + (glyph->underlinePosition() - glyph->pixelBaseline())),
@@ -444,7 +444,7 @@ void CanvasText::createGlyphs(KSVGTextChunk *textChunk, KSVGCanvas *canvas, cons
 		SVGTextContentElementImpl *style = textChunk->getTextContentElement(j);
 
 		// Draw 'text-decoration'
-		// TODO: Currently just ignore text-decoration on vertical tqlayouts, is that correct?
+		// TODO: Currently just ignore text-decoration on vertical layouts, is that correct?
 		// Underline and overline have to be drawn before the glyphs are rendered
 		if(style->getAttribute("text-decoration") == "underline" && !params->tb())
 			addTextDecoration(style, glyph->bboxX() - anchor, (cury + (glyph->underlinePosition() - glyph->pixelBaseline())),
diff --git a/ksvg/core/KSVGReader.cc b/ksvg/core/KSVGReader.cc
index 690069ba..e5621010 100644
--- a/ksvg/core/KSVGReader.cc
+++ b/ksvg/core/KSVGReader.cc
@@ -300,13 +300,13 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &,
 
 	if(svg && svg->ownerSVGElement() == 0)
 	{
-		SVGImageElementImpl *tqparentImage = Helper::self()->doc()->tqparentImage();
+		SVGImageElementImpl *parentImage = Helper::self()->doc()->parentImage();
 
-		if(tqparentImage)
+		if(parentImage)
 		{
 			// We're being displayed in a document via an 'image' element. Set
 			// us up to fit into it's rectangle.
-			tqparentImage->setupSVGElement(svg);
+			parentImage->setupSVGElement(svg);
 		}
 	}
 
@@ -316,25 +316,25 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &,
 	{
 		// Set up the cached screenCTM
 		SVGLocatableImpl *locatableParent = 0;
-		DOM::Node tqparentNode = newElement->parentNode();
+		DOM::Node parentNode = newElement->parentNode();
 
-		if(!tqparentNode.isNull())
+		if(!parentNode.isNull())
 		{
-			SVGElementImpl *tqparent = Helper::self()->doc()->getElementFromHandle(tqparentNode.handle());
+			SVGElementImpl *tqparent = Helper::self()->doc()->getElementFromHandle(parentNode.handle());
 
 			if(tqparent)
 				locatableParent = dynamic_cast<SVGLocatableImpl *>(tqparent);
 		}
 
-		SVGMatrixImpl *tqparentMatrix = 0;
+		SVGMatrixImpl *parentMatrix = 0;
 
 		if(locatableParent)
-			tqparentMatrix = locatableParent->getScreenCTM();
+			parentMatrix = locatableParent->getScreenCTM();
 		else
-			tqparentMatrix = SVGSVGElementImpl::createSVGMatrix();
+			parentMatrix = SVGSVGElementImpl::createSVGMatrix();
 
-		locatable->updateCachedScreenCTM(tqparentMatrix);
-		tqparentMatrix->deref();
+		locatable->updateCachedScreenCTM(parentMatrix);
+		parentMatrix->deref();
 	}
 
 	m_currentNode = newElement;
diff --git a/ksvg/data/SVGEcma.lut.h b/ksvg/data/SVGEcma.lut.h
index be6a221c..b2a4d2e3 100644
--- a/ksvg/data/SVGEcma.lut.h
+++ b/ksvg/data/SVGEcma.lut.h
@@ -13,7 +13,7 @@ static const char SVGDOMNodeBridge__s_hashTableStrings[] = {
     "attributes\0"
     "childNodes\0"
     "firstChild\0"
-    "tqparentNode\0"
+    "parentNode\0"
     "lastChild\0"
     "localName\0"
     "nodeValue\0"
diff --git a/ksvg/data/SVGMaskElementImpl.lut.h b/ksvg/data/SVGMaskElementImpl.lut.h
index 6d325e81..bcc32c39 100644
--- a/ksvg/data/SVGMaskElementImpl.lut.h
+++ b/ksvg/data/SVGMaskElementImpl.lut.h
@@ -6,8 +6,8 @@ namespace KSVG {
 
 static const char SVGMaskElementImpl__s_hashTableStrings[] = {
     "\0"
-    "tqmaskContentUnits\0"
-    "tqmaskUnits\0"
+    "maskContentUnits\0"
+    "maskUnits\0"
     "height\0"
     "width\0"
     "x\0"
diff --git a/ksvg/dom/SVGElementInstance.cc b/ksvg/dom/SVGElementInstance.cc
index 95b24964..9bc027c0 100644
--- a/ksvg/dom/SVGElementInstance.cc
+++ b/ksvg/dom/SVGElementInstance.cc
@@ -78,10 +78,10 @@ SVGUseElement SVGElementInstance::correspondingUseElement() const
 	return SVGUseElement(impl->correspondingUseElement());
 }
 
-SVGElementInstance SVGElementInstance::tqparentNode() const
+SVGElementInstance SVGElementInstance::parentNode() const
 {
 	if(!impl) return SVGElementInstance(0);
-	return SVGElementInstance(impl->tqparentNode());
+	return SVGElementInstance(impl->parentNode());
 }
 
 SVGElementInstanceList SVGElementInstance::childNodes() const
diff --git a/ksvg/dom/SVGElementInstance.h b/ksvg/dom/SVGElementInstance.h
index 97335b32..51d81831 100644
--- a/ksvg/dom/SVGElementInstance.h
+++ b/ksvg/dom/SVGElementInstance.h
@@ -39,7 +39,7 @@ public:
 
 	SVGElement correspondingElement() const;
 	SVGUseElement correspondingUseElement() const;
-	SVGElementInstance tqparentNode() const;
+	SVGElementInstance parentNode() const;
 	SVGElementInstanceList childNodes() const;
 	SVGElementInstance firstChild() const;
 	SVGElementInstance lastChild() const;
diff --git a/ksvg/dom/SVGMaskElement.cc b/ksvg/dom/SVGMaskElement.cc
index 0ec23f0a..c4513adc 100644
--- a/ksvg/dom/SVGMaskElement.cc
+++ b/ksvg/dom/SVGMaskElement.cc
@@ -70,16 +70,16 @@ SVGMaskElement::~SVGMaskElement()
 		impl->deref();
 }
 
-SVGAnimatedEnumeration SVGMaskElement::tqmaskUnits() const
+SVGAnimatedEnumeration SVGMaskElement::maskUnits() const
 {
 	if(!impl) return SVGAnimatedEnumeration(0);
-	return SVGAnimatedEnumeration(impl->tqmaskUnits());
+	return SVGAnimatedEnumeration(impl->maskUnits());
 }
 
-SVGAnimatedEnumeration SVGMaskElement::tqmaskContentUnits() const
+SVGAnimatedEnumeration SVGMaskElement::maskContentUnits() const
 {
 	if(!impl) return SVGAnimatedEnumeration(0);
-	return SVGAnimatedEnumeration(impl->tqmaskContentUnits());
+	return SVGAnimatedEnumeration(impl->maskContentUnits());
 }
 
 SVGAnimatedLength SVGMaskElement::x() const
diff --git a/ksvg/dom/SVGMaskElement.h b/ksvg/dom/SVGMaskElement.h
index a93958a7..6a8e26a4 100644
--- a/ksvg/dom/SVGMaskElement.h
+++ b/ksvg/dom/SVGMaskElement.h
@@ -48,8 +48,8 @@ public:
 	SVGMaskElement(SVGMaskElementImpl *other);
 	virtual ~SVGMaskElement();
 
-	SVGAnimatedEnumeration tqmaskUnits() const;
-	SVGAnimatedEnumeration tqmaskContentUnits() const;
+	SVGAnimatedEnumeration maskUnits() const;
+	SVGAnimatedEnumeration maskContentUnits() const;
 	SVGAnimatedLength x() const;
 	SVGAnimatedLength y() const;
 	SVGAnimatedLength width() const;
diff --git a/ksvg/dom/SVGTextElement.h b/ksvg/dom/SVGTextElement.h
index 111d2929..1382d693 100644
--- a/ksvg/dom/SVGTextElement.h
+++ b/ksvg/dom/SVGTextElement.h
@@ -57,7 +57,7 @@ class SVGTextElementImpl;
  * specification and painting attributes which describe how exactly to render
  * the characters. Since <code>text</code> elements are rendered using the
  * same rendering methods as other graphics elements, all of the same
- * coordinate system transformations, painting, clipping and tqmasking
+ * coordinate system transformations, painting, clipping and masking
  * features that apply to tqshapes such as paths and rectangles also
  * apply to <code>text</code> elements.
  *
diff --git a/ksvg/ecma/ksvg_lookup.h b/ksvg/ecma/ksvg_lookup.h
index 659ce8c7..ef22000a 100644
--- a/ksvg/ecma/ksvg_lookup.h
+++ b/ksvg/ecma/ksvg_lookup.h
@@ -31,7 +31,7 @@
 #define KSVG_GET_COMMON \
 public: \
     \
-    /* The standard hasProperty call, auto-generated. Looks in hashtable, forwards to tqparents. */ \
+    /* The standard hasProperty call, auto-generated. Looks in hashtable, forwards to parents. */ \
     bool hasProperty(KJS::ExecState *exec, const KJS::Identifier &propertyName) const; \
     \
     /* get() method, called by KSVGBridge::get */ \
@@ -80,7 +80,7 @@ public: \
     /* put() method, called by KSVGBridge::put */ \
     bool put(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::Value &value, int attr); \
 	\
-    /* Called by lookupPut. Auto-generated. Looks in hashtable, forwards to tqparents. */ \
+    /* Called by lookupPut. Auto-generated. Looks in hashtable, forwards to parents. */ \
     bool putInParents(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::Value &value, int attr);
 
 // For classes which inherit a read-write class, but have no readwrite property themselves
@@ -150,7 +150,7 @@ namespace KSVG
 	{
 		const KJS::HashEntry *entry = KJS::Lookup::findEntry(table, propertyName);
 
-		if(!entry) // not found, forward to tqparents
+		if(!entry) // not found, forward to parents
 			return thisObj->getInParents(exec, propertyName, bridge);
 
 		if(entry->attr & KJS::Function)
@@ -174,7 +174,7 @@ namespace KSVG
 	{
 		const KJS::HashEntry *entry = KJS::Lookup::findEntry(table, propertyName);
 
-		if(!entry) // not found, forward to tqparents
+		if(!entry) // not found, forward to parents
 			return thisObj->getInParents(exec, propertyName, bridge);
 
 		if(entry->attr & KJS::Function)
@@ -199,7 +199,7 @@ namespace KSVG
     {
 		const KJS::HashEntry *entry = KJS::Lookup::findEntry(table, propertyName);
 
-		if(!entry) // not found, forward to tqparents
+		if(!entry) // not found, forward to parents
 			return thisObj->putInParents(exec, propertyName, value, attr);
 		else if(entry->attr & KJS::Function) // Function: put as override property
 			return false;
diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp
index 3a6c7469..85c05074 100644
--- a/ksvg/ecma/ksvg_window.cpp
+++ b/ksvg/ecma/ksvg_window.cpp
@@ -496,10 +496,10 @@ WindowQObject::WindowQObject(Window *w) : tqparent(w)
 
 WindowQObject::~WindowQObject()
 {
-	tqparentDestroyed(); // reuse same code
+	parentDestroyed(); // reuse same code
 }
 
-void WindowQObject::tqparentDestroyed()
+void WindowQObject::parentDestroyed()
 {
 	killTimers();
 	
diff --git a/ksvg/ecma/ksvg_window.h b/ksvg/ecma/ksvg_window.h
index 035dbb59..091448a8 100644
--- a/ksvg/ecma/ksvg_window.h
+++ b/ksvg/ecma/ksvg_window.h
@@ -110,7 +110,7 @@ public:
 public slots:
 	void timeoutClose();
 protected slots:
-	void tqparentDestroyed();
+	void parentDestroyed();
 protected:
 	void timerEvent(TQTimerEvent *e);
 private:
diff --git a/ksvg/impl/SVGDocumentImpl.cc b/ksvg/impl/SVGDocumentImpl.cc
index 13de4b79..2b0383ec 100644
--- a/ksvg/impl/SVGDocumentImpl.cc
+++ b/ksvg/impl/SVGDocumentImpl.cc
@@ -74,7 +74,7 @@ unsigned int SVGDocumentImpl::elemDictHashSizes [] =
 
 const int SVGDocumentImpl::numElemDictHashSizes = sizeof(elemDictHashSizes) / sizeof(elemDictHashSizes[0]);
 
-SVGDocumentImpl::SVGDocumentImpl(bool anim, bool fit, SVGImageElementImpl *tqparentImage) : TQObject(), DOM::DomShared(), DOM::Document(), SVGDOMNodeBridge(static_cast<DOM::Node>(*this))
+SVGDocumentImpl::SVGDocumentImpl(bool anim, bool fit, SVGImageElementImpl *parentImage) : TQObject(), DOM::DomShared(), DOM::Document(), SVGDOMNodeBridge(static_cast<DOM::Node>(*this))
 {
 	m_animations = anim;
 
@@ -97,7 +97,7 @@ SVGDocumentImpl::SVGDocumentImpl(bool anim, bool fit, SVGImageElementImpl *tqpar
 	m_resortZIndicesOnFinishedLoading = false;
 	m_fit = fit;
 
-	m_parentImage = tqparentImage;
+	m_parentImage = parentImage;
 	if(m_parentImage)
 		m_parentImage->ref();
 }
@@ -392,9 +392,9 @@ void SVGDocumentImpl::syncCachedMatrices()
 {
 	if(rootElement())
 	{
-		SVGMatrixImpl *tqparentMatrix = SVGSVGElementImpl::createSVGMatrix();
-		rootElement()->checkCachedScreenCTM(tqparentMatrix);
-		tqparentMatrix->deref();
+		SVGMatrixImpl *parentMatrix = SVGSVGElementImpl::createSVGMatrix();
+		rootElement()->checkCachedScreenCTM(parentMatrix);
+		parentMatrix->deref();
 	}
 }
 
diff --git a/ksvg/impl/SVGDocumentImpl.h b/ksvg/impl/SVGDocumentImpl.h
index fcbb9f35..479cb7f7 100644
--- a/ksvg/impl/SVGDocumentImpl.h
+++ b/ksvg/impl/SVGDocumentImpl.h
@@ -74,7 +74,7 @@ class SVGDocumentImpl : public TQObject,
 Q_OBJECT
   TQ_OBJECT
 public:
-	SVGDocumentImpl(bool anim = true, bool bFit = false, SVGImageElementImpl *tqparentImage = 0);
+	SVGDocumentImpl(bool anim = true, bool bFit = false, SVGImageElementImpl *parentImage = 0);
 	virtual ~SVGDocumentImpl();
 
 	float screenPixelsPerMillimeterX() const;
@@ -90,7 +90,7 @@ public:
 	void setRootElement(SVGSVGElementImpl *);
 	SVGSVGElementImpl *rootElement() const;
 
-	SVGImageElementImpl *tqparentImage() const { return m_parentImage; }
+	SVGImageElementImpl *parentImage() const { return m_parentImage; }
 
 	SVGWindowImpl *window();
 
diff --git a/ksvg/impl/SVGEcma.cc b/ksvg/impl/SVGEcma.cc
index e0c427ae..c7105d41 100644
--- a/ksvg/impl/SVGEcma.cc
+++ b/ksvg/impl/SVGEcma.cc
@@ -49,7 +49,7 @@ using namespace KSVG;
  nodeName			SVGDOMNodeBridge::NodeName			DontDelete|ReadOnly
  nodeValue			SVGDOMNodeBridge::NodeValue			DontDelete
  nodeType			SVGDOMNodeBridge::NodeType			DontDelete|ReadOnly
- tqparentNode			SVGDOMNodeBridge::ParentNode		DontDelete|ReadOnly
+ parentNode			SVGDOMNodeBridge::ParentNode		DontDelete|ReadOnly
  childNodes			SVGDOMNodeBridge::ChildNodes		DontDelete|ReadOnly
  firstChild			SVGDOMNodeBridge::FirstChild		DontDelete|ReadOnly
  lastChild			SVGDOMNodeBridge::LastChild			DontDelete|ReadOnly
diff --git a/ksvg/impl/SVGElementInstanceImpl.cc b/ksvg/impl/SVGElementInstanceImpl.cc
index 46252fcd..97cd28a2 100644
--- a/ksvg/impl/SVGElementInstanceImpl.cc
+++ b/ksvg/impl/SVGElementInstanceImpl.cc
@@ -75,7 +75,7 @@ SVGUseElementImpl *SVGElementInstanceImpl::correspondingUseElement() const
 	return m_correspondingUseElement;
 }
 
-SVGElementInstanceImpl *SVGElementInstanceImpl::tqparentNode() const
+SVGElementInstanceImpl *SVGElementInstanceImpl::parentNode() const
 {
 	return m_parentNode;
 }
diff --git a/ksvg/impl/SVGElementInstanceImpl.h b/ksvg/impl/SVGElementInstanceImpl.h
index 7ee469af..d9f3afae 100644
--- a/ksvg/impl/SVGElementInstanceImpl.h
+++ b/ksvg/impl/SVGElementInstanceImpl.h
@@ -40,7 +40,7 @@ public:
 
 	SVGElementImpl *correspondingElement() const;
 	SVGUseElementImpl *correspondingUseElement() const;
-	SVGElementInstanceImpl *tqparentNode() const;
+	SVGElementInstanceImpl *parentNode() const;
 	SVGElementInstanceListImpl *childNodes() const;
 	SVGElementInstanceImpl *firstChild() const;
 	SVGElementInstanceImpl *lastChild() const;
diff --git a/ksvg/impl/SVGImageElementImpl.cc b/ksvg/impl/SVGImageElementImpl.cc
index 19152095..4a60d622 100644
--- a/ksvg/impl/SVGImageElementImpl.cc
+++ b/ksvg/impl/SVGImageElementImpl.cc
@@ -353,7 +353,7 @@ void SVGImageElementImpl::onScreenCTMUpdated()
 		SVGMatrixImpl *ctm = getScreenCTM();
 
 		m_svgRoot->setRootParentScreenCTM(ctm);
-		m_svgRoot->tqinvalidateCachedMatrices();
+		m_svgRoot->invalidateCachedMatrices();
 		m_svgRoot->ownerDoc()->syncCachedMatrices();
 	}
 }
diff --git a/ksvg/impl/SVGLengthImpl.cc b/ksvg/impl/SVGLengthImpl.cc
index da094837..a8c9080c 100644
--- a/ksvg/impl/SVGLengthImpl.cc
+++ b/ksvg/impl/SVGLengthImpl.cc
@@ -282,9 +282,9 @@ void SVGLengthImpl::convertNumToPx()
 				bool sizeLocal = (style->getFontSize() != -1);
 				bool familyLocal = (style->getFontFamily() && style->getFontFamily()->getFirst());
 				
-				SVGStylableImpl *tqparentStyle = 0;
+				SVGStylableImpl *parentStyle = 0;
 				if((!sizeLocal || !familyLocal) && m_context)
-						tqparentStyle = dynamic_cast<SVGStylableImpl *>(m_context->ownerDoc()->getElementFromHandle(m_context->parentNode().handle()));
+						parentStyle = dynamic_cast<SVGStylableImpl *>(m_context->ownerDoc()->getElementFromHandle(m_context->parentNode().handle()));
 				
 				// Look up font-size in a SAFE way, because at this place
 				// processStyle() has NOT yet been called, so we need
@@ -294,13 +294,13 @@ void SVGLengthImpl::convertNumToPx()
 				
 				if(sizeLocal)
 					useSize = style->getFontSize();
-				else if(tqparentStyle && tqparentStyle->getFontSize() != -1)
-					useSize = tqparentStyle->getFontSize();
+				else if(parentStyle && parentStyle->getFontSize() != -1)
+					useSize = parentStyle->getFontSize();
 			
 				if(familyLocal)
 					useFont = style->getFontFamily()->getFirst()->string();
-				else if(tqparentStyle && tqparentStyle->getFontFamily() && tqparentStyle->getFontFamily()->getFirst())
-					useFont = tqparentStyle->getFontFamily()->getFirst()->string();
+				else if(parentStyle && parentStyle->getFontFamily() && parentStyle->getFontFamily()->getFirst())
+					useFont = parentStyle->getFontFamily()->getFirst()->string();
 				
 				if(m_unitType == SVG_LENGTHTYPE_EMS)
 					m_value = m_valueInSpecifiedUnits * useSize;
diff --git a/ksvg/impl/SVGLocatableImpl.cc b/ksvg/impl/SVGLocatableImpl.cc
index 87ccd604..63384d7e 100644
--- a/ksvg/impl/SVGLocatableImpl.cc
+++ b/ksvg/impl/SVGLocatableImpl.cc
@@ -79,9 +79,9 @@ SVGMatrixImpl *SVGLocatableImpl::getTransformToElement(SVGElementImpl *)
 	return ret;
 }
 
-void SVGLocatableImpl::updateCachedScreenCTM(const SVGMatrixImpl *tqparentScreenCTM)
+void SVGLocatableImpl::updateCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM)
 {
-	m_cachedScreenCTM->copy(tqparentScreenCTM);
+	m_cachedScreenCTM->copy(parentScreenCTM);
 
 	const SVGMatrixImpl *local = localMatrix();
 
@@ -114,7 +114,7 @@ void SVGLocatableImpl::updateCachedScreenCTM(const SVGMatrixImpl *tqparentScreen
 	}
 }
 
-void SVGLocatableImpl::checkCachedScreenCTM(const SVGMatrixImpl *tqparentScreenCTM)
+void SVGLocatableImpl::checkCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM)
 {
 	if(m_cachedScreenCTMIsValid)
 	{
@@ -135,7 +135,7 @@ void SVGLocatableImpl::checkCachedScreenCTM(const SVGMatrixImpl *tqparentScreenC
 		}
 	}
 	else
-		updateCachedScreenCTM(tqparentScreenCTM);
+		updateCachedScreenCTM(parentScreenCTM);
 }
 
 // Ecma stuff
diff --git a/ksvg/impl/SVGLocatableImpl.h b/ksvg/impl/SVGLocatableImpl.h
index 49469164..81ce3326 100644
--- a/ksvg/impl/SVGLocatableImpl.h
+++ b/ksvg/impl/SVGLocatableImpl.h
@@ -52,14 +52,14 @@ public:
 	virtual const SVGMatrixImpl *localMatrix() { return 0; }
 
 	bool cachedScreenCTMIsValid() const { return m_cachedScreenCTMIsValid; }
-	void tqinvalidateCachedMatrices() { m_cachedScreenCTMIsValid = false; }
+	void invalidateCachedMatrices() { m_cachedScreenCTMIsValid = false; }
 
 	// If the cached matrix is invalid, update it and update any child elements
 	// recursively. Otherwise, check child elements recursively.
-	virtual void checkCachedScreenCTM(const SVGMatrixImpl *tqparentScreenCTM);
+	virtual void checkCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM);
 	// Update the cached matrix, and update child element cached matrices,
 	// recursively.
-	virtual void updateCachedScreenCTM(const SVGMatrixImpl *tqparentScreenCTM);
+	virtual void updateCachedScreenCTM(const SVGMatrixImpl *parentScreenCTM);
 
 	// Called immediately after the screen ctm has been updated.
 	virtual void onScreenCTMUpdated() {}
diff --git a/ksvg/impl/SVGMaskElementImpl.cc b/ksvg/impl/SVGMaskElementImpl.cc
index b7f26ed3..8096c26d 100644
--- a/ksvg/impl/SVGMaskElementImpl.cc
+++ b/ksvg/impl/SVGMaskElementImpl.cc
@@ -63,11 +63,11 @@ SVGMaskElementImpl::SVGMaskElementImpl(DOM::ElementImpl *impl) : SVGElementImpl(
 	m_height = new SVGAnimatedLengthImpl(LENGTHMODE_HEIGHT, this);
 	m_height->ref();
 
-	m_tqmaskUnits = new SVGAnimatedEnumerationImpl();
-	m_tqmaskUnits->ref();
+	m_maskUnits = new SVGAnimatedEnumerationImpl();
+	m_maskUnits->ref();
 
-	m_tqmaskContentUnits = new SVGAnimatedEnumerationImpl();
-	m_tqmaskContentUnits->ref();
+	m_maskContentUnits = new SVGAnimatedEnumerationImpl();
+	m_maskContentUnits->ref();
 
 	m_converter = new SVGUnitConverter();
 	m_converter->add(m_x);
@@ -77,7 +77,7 @@ SVGMaskElementImpl::SVGMaskElementImpl(DOM::ElementImpl *impl) : SVGElementImpl(
 
 	m_canvas = 0;
 
-	m_tqmaskCache.setMaxTotalCost(1024 * 1024);
+	m_maskCache.setMaxTotalCost(1024 * 1024);
 }
 
 SVGMaskElementImpl::~SVGMaskElementImpl()
@@ -90,23 +90,23 @@ SVGMaskElementImpl::~SVGMaskElementImpl()
 		m_width->deref();
 	if(m_height)
 		m_height->deref();
-	if(m_tqmaskUnits)
-		m_tqmaskContentUnits->deref();
-	if(m_tqmaskUnits)
-		m_tqmaskContentUnits->deref();
+	if(m_maskUnits)
+		m_maskContentUnits->deref();
+	if(m_maskUnits)
+		m_maskContentUnits->deref();
 	delete m_converter;
 	if(m_canvas)
 		delete m_canvas;
 }
 
-SVGAnimatedEnumerationImpl *SVGMaskElementImpl::tqmaskUnits() const
+SVGAnimatedEnumerationImpl *SVGMaskElementImpl::maskUnits() const
 {
-	return m_tqmaskUnits;
+	return m_maskUnits;
 }
 
-SVGAnimatedEnumerationImpl *SVGMaskElementImpl::tqmaskContentUnits() const
+SVGAnimatedEnumerationImpl *SVGMaskElementImpl::maskContentUnits() const
 {
-	return m_tqmaskContentUnits;
+	return m_maskContentUnits;
 }
 
 SVGAnimatedLengthImpl *SVGMaskElementImpl::x() const
@@ -132,8 +132,8 @@ SVGAnimatedLengthImpl *SVGMaskElementImpl::height() const
 /*
 @namespace KSVG
 @begin SVGMaskElementImpl::s_hashTable 7
- tqmaskUnits			SVGMaskElementImpl::MaskUnits			DontDelete|ReadOnly
- tqmaskContentUnits	SVGMaskElementImpl::MaskContentUnits	DontDelete|ReadOnly
+ maskUnits			SVGMaskElementImpl::MaskUnits			DontDelete|ReadOnly
+ maskContentUnits	SVGMaskElementImpl::MaskContentUnits	DontDelete|ReadOnly
  x					SVGMaskElementImpl::X					DontDelete|ReadOnly
  y					SVGMaskElementImpl::Y					DontDelete|ReadOnly
  width				SVGMaskElementImpl::Width				DontDelete|ReadOnly
@@ -148,14 +148,14 @@ Value SVGMaskElementImpl::getValueProperty(ExecState *exec, int token) const
 	{
 		case MaskUnits:
 			if(!attributeMode)
-				return m_tqmaskUnits->cache(exec);
+				return m_maskUnits->cache(exec);
 			else
-				return Number(m_tqmaskUnits->baseVal());
+				return Number(m_maskUnits->baseVal());
 		case MaskContentUnits:
 			if(!attributeMode)
-				return m_tqmaskContentUnits->cache(exec);
+				return m_maskContentUnits->cache(exec);
 			else
-				return Number(m_tqmaskContentUnits->baseVal());
+				return Number(m_maskContentUnits->baseVal());
 		case X:
 			if(!attributeMode)
 				return m_x->cache(exec);
@@ -194,15 +194,15 @@ void SVGMaskElementImpl::putValueProperty(ExecState *exec, int token, const Valu
     {
         case MaskUnits:
             if(value.toString(exec).qstring() == "objectBoundingBox")
-                m_tqmaskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
+                m_maskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
             else
-                m_tqmaskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
+                m_maskUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
             break;
         case MaskContentUnits:
             if(value.toString(exec).qstring() == "objectBoundingBox")
-                m_tqmaskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
+                m_maskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
             else
-                m_tqmaskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
+                m_maskContentUnits->setBaseVal(SVGMaskElement::SVG_UNIT_TYPE_USERSPACEONUSE);
             break;
 		case X:
 			converter()->modify(x(), value.toString(exec).qstring());
@@ -262,7 +262,7 @@ void SVGMaskElementImpl::setAttributes()
 
 SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencingElement, int imageWidth, int imageHeight)
 {
-	converter()->finalize(referencingElement, ownerSVGElement(), tqmaskUnits()->baseVal());
+	converter()->finalize(referencingElement, ownerSVGElement(), maskUnits()->baseVal());
 
 	TQ_UINT32 *imageBits = new TQ_UINT32[imageWidth * imageHeight];
 
@@ -282,12 +282,12 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 
 	SVGRectImpl *bbox = referencingElement->getBBox();
 
-	if(tqmaskUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+	if(maskUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
 		baseMatrix->translate(-(bbox->x() + x()->baseVal()->value()), -(bbox->y() + y()->baseVal()->value()));
 	else
 		baseMatrix->translate(-x()->baseVal()->value(), -y()->baseVal()->value());
 
-	if(tqmaskContentUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+	if(maskContentUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
 	{
 		baseMatrix->translate(bbox->x(), bbox->y());
 		baseMatrix->scaleNonUniform(bbox->width(), bbox->height());
@@ -336,12 +336,12 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 
 	{
 		// Note: r and b reversed
-		//TQImage tqmaskImage(reinterpret_cast<unsigned char *>(imageBits), imageWidth, imageHeight, 32, 0, 0, TQImage::IgnoreEndian);
-		//tqmaskImage.setAlphaBuffer(true);
-		//tqmaskImage.save("tqmask.png", "PNG");
+		//TQImage maskImage(reinterpret_cast<unsigned char *>(imageBits), imageWidth, imageHeight, 32, 0, 0, TQImage::IgnoreEndian);
+		//maskImage.setAlphaBuffer(true);
+		//maskImage.save("tqmask.png", "PNG");
 	}
 
-	TQByteArray tqmaskData(imageWidth * imageHeight);
+	TQByteArray maskData(imageWidth * imageHeight);
     const double epsilon = DBL_EPSILON;
 
 	// Convert the rgba image into an 8-bit tqmask, according to the specs.
@@ -378,9 +378,9 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 		double luminanceAlpha = 0.2125 * r + 0.7154 * g + 0.0721 * b;
 
 		// Multiply by alpha.
-		double tqmaskValue = luminanceAlpha * a;
+		double maskValue = luminanceAlpha * a;
 
-		tqmaskData[i] = static_cast<unsigned char>(tqmaskValue * 255 + 0.5);
+		maskData[i] = static_cast<unsigned char>(maskValue * 255 + 0.5);
 	}
 
 	delete [] imageBits;
@@ -392,12 +392,12 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 	// need to set it here.
 	TQWMatrix tempMatrix;
 
-	return Mask(tqmaskData, tempMatrix, imageWidth, imageHeight);
+	return Mask(maskData, tempMatrix, imageWidth, imageHeight);
 }
 
 SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencingElement)
 {
-	converter()->finalize(referencingElement, ownerSVGElement(), tqmaskUnits()->baseVal());
+	converter()->finalize(referencingElement, ownerSVGElement(), maskUnits()->baseVal());
 
 	SVGMatrixImpl *refCTM = 0;
 	SVGLocatableImpl *locatableRef = dynamic_cast<SVGLocatableImpl *>(referencingElement);
@@ -420,10 +420,10 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 	{
 		CacheKey key(referencingElement, imageWidth, imageHeight);
 
-		if(!m_tqmaskCache.tqfind(key, tqmask))
+		if(!m_maskCache.tqfind(key, tqmask))
 		{
 			tqmask = createMask(referencingElement, imageWidth, imageHeight);
-			m_tqmaskCache.insert(key, tqmask, imageWidth * imageHeight);
+			m_maskCache.insert(key, tqmask, imageWidth * imageHeight);
 		}
 
 		// Generate a tqmask-coordinates to screen-coordinates matrix
@@ -433,7 +433,7 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 		else
 			matrix = SVGSVGElementImpl::createSVGMatrix();
 
-		if(tqmaskUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
+		if(maskUnits()->baseVal() == SVGMaskElement::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
 		{
 			SVGRectImpl *bbox = referencingElement->getBBox();
 			matrix->translate(bbox->x() + x()->baseVal()->value(), bbox->y() + y()->baseVal()->value());
@@ -453,7 +453,7 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin
 	return tqmask;
 }
 
-TQByteArray SVGMaskElementImpl::tqmaskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle)
+TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle)
 {
 	TQByteArray cumulativeMask;
 
@@ -467,18 +467,18 @@ TQByteArray SVGMaskElementImpl::tqmaskRectangle(SVGShapeImpl *tqshape, const TQR
 
 			if(element)
 			{
-				SVGMaskElementImpl *tqmaskElement = dynamic_cast<SVGMaskElementImpl *>(element);
+				SVGMaskElementImpl *maskElement = dynamic_cast<SVGMaskElementImpl *>(element);
 
-				if(tqmaskElement)
+				if(maskElement)
 				{
-					SVGMaskElementImpl::Mask tqmask = tqmaskElement->createMask(tqshape);
+					SVGMaskElementImpl::Mask tqmask = maskElement->createMask(tqshape);
 					
 					if(!tqmask.isEmpty())
 					{
-						TQByteArray tqmaskData = tqmask.rectangle(screenRectangle);
+						TQByteArray maskData = tqmask.rectangle(screenRectangle);
 
 						if(cumulativeMask.size() == 0)
-							cumulativeMask = tqmaskData;
+							cumulativeMask = maskData;
 						else
 						{
 							int size = cumulativeMask.size();
@@ -486,7 +486,7 @@ TQByteArray SVGMaskElementImpl::tqmaskRectangle(SVGShapeImpl *tqshape, const TQR
 							// Multiply into the cumulative tqmask (using fast divide by 255)
 							for(int i = 0; i < size; i++)
 							{
-								int tmp = tqmaskData[i] * cumulativeMask[i] + 0x80;
+								int tmp = maskData[i] * cumulativeMask[i] + 0x80;
 								cumulativeMask[i] = (tmp + (tmp >> 8)) >> 8;
 							}
 						}
@@ -495,11 +495,11 @@ TQByteArray SVGMaskElementImpl::tqmaskRectangle(SVGShapeImpl *tqshape, const TQR
 			}
 		}
 
-		DOM::Node tqparentNode = tqshape->parentNode();
+		DOM::Node parentNode = tqshape->parentNode();
 
-		if(!tqparentNode.isNull())
+		if(!parentNode.isNull())
 		{
-			SVGElementImpl *tqparent = tqshape->ownerDoc()->getElementFromHandle(tqparentNode.handle());
+			SVGElementImpl *tqparent = tqshape->ownerDoc()->getElementFromHandle(parentNode.handle());
 
 			if(tqparent)
 				tqshape = dynamic_cast<SVGShapeImpl *>(tqparent);
diff --git a/ksvg/impl/SVGMaskElementImpl.h b/ksvg/impl/SVGMaskElementImpl.h
index 4631ebae..0e4f0f89 100644
--- a/ksvg/impl/SVGMaskElementImpl.h
+++ b/ksvg/impl/SVGMaskElementImpl.h
@@ -75,8 +75,8 @@ public:
 	SVGMaskElementImpl(DOM::ElementImpl *);
 	virtual ~SVGMaskElementImpl();
 
-	SVGAnimatedEnumerationImpl *tqmaskUnits() const;
-	SVGAnimatedEnumerationImpl *tqmaskContentUnits() const;
+	SVGAnimatedEnumerationImpl *maskUnits() const;
+	SVGAnimatedEnumerationImpl *maskContentUnits() const;
 	SVGAnimatedLengthImpl *x() const;
 	SVGAnimatedLengthImpl *y() const;
 	SVGAnimatedLengthImpl *width() const;
@@ -89,10 +89,10 @@ public:
 
 	Mask createMask(SVGShapeImpl *referencingElement);
 	
-	// Compute the tqmask on a given tqshape, taking into account all tqmasks defined
+	// Compute the tqmask on a given tqshape, taking into account all masks defined
 	// on the tqshape's ancestors. This is a workaround for us not having a buffer
 	// for container elements, so we can't tqmask containers directly.
-	static TQByteArray tqmaskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle);
+	static TQByteArray maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle);
 
 private:
 	class CacheKey
@@ -110,8 +110,8 @@ private:
 
 	Mask createMask(SVGShapeImpl *referencingElement, int imageWidth, int imageHeight);
 
-	SVGAnimatedEnumerationImpl *m_tqmaskUnits;
-	SVGAnimatedEnumerationImpl *m_tqmaskContentUnits;
+	SVGAnimatedEnumerationImpl *m_maskUnits;
+	SVGAnimatedEnumerationImpl *m_maskContentUnits;
 	SVGAnimatedLengthImpl *m_x;
 	SVGAnimatedLengthImpl *m_y;
 	SVGAnimatedLengthImpl *m_width;
@@ -120,7 +120,7 @@ private:
 	SVGUnitConverter *m_converter;
 	KSVGCanvas *m_canvas;
 
-	MinOneLRUCache<CacheKey, Mask> m_tqmaskCache;
+	MinOneLRUCache<CacheKey, Mask> m_maskCache;
 
 public:
 	KSVG_GET
diff --git a/ksvg/impl/SVGSVGElementImpl.cc b/ksvg/impl/SVGSVGElementImpl.cc
index b436ee73..68bb7dd1 100644
--- a/ksvg/impl/SVGSVGElementImpl.cc
+++ b/ksvg/impl/SVGSVGElementImpl.cc
@@ -166,7 +166,7 @@ void SVGSVGElementImpl::setAttributes()
 	m_viewport->setWidth(width()->baseVal()->value());
 	m_viewport->setHeight(height()->baseVal()->value());
 
-	if(isRootElement() && ownerDoc()->tqparentImage() == 0)
+	if(isRootElement() && ownerDoc()->parentImage() == 0)
 	{
 		if(ownerDoc()->canvas())
 			ownerDoc()->canvas()->setViewportDimension(int(ceil(width()->baseVal()->value() * currentScale())), int(ceil(height()->baseVal()->value() * currentScale())));
@@ -271,7 +271,7 @@ void SVGSVGElementImpl::setCurrentScale(float currentScale)
 	if( m_currentScale != currentScale )
 	{
 		m_currentScale = currentScale;
-		tqinvalidateCachedMatrices();
+		invalidateCachedMatrices();
 
 		if(hasEventListener(SVGEvent::ZOOM_EVENT, true))
 			dispatchEvent(SVGEvent::ZOOM_EVENT, false, false);
@@ -289,7 +289,7 @@ void SVGSVGElementImpl::setCurrentTranslate(const TQPoint &p)
 	{
 		m_currentTranslate->setX(p.x());
 		m_currentTranslate->setY(p.y());
-		tqinvalidateCachedMatrices();
+		invalidateCachedMatrices();
 		if(hasEventListener(SVGEvent::SCROLL_EVENT, true))
 			dispatchEvent(SVGEvent::SCROLL_EVENT, false, false);
 	}
diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc
index 4b20ecc7..2bc64df7 100644
--- a/ksvg/impl/SVGStylableImpl.cc
+++ b/ksvg/impl/SVGStylableImpl.cc
@@ -98,9 +98,9 @@ SVGStylableImpl::~SVGStylableImpl()
 
 void SVGStylableImpl::processStyle()
 {
-	SVGStylableImpl *tqparentStyle = 0;
+	SVGStylableImpl *parentStyle = 0;
 	if(m_object && m_object->ownerDoc())
-		tqparentStyle = dynamic_cast<SVGStylableImpl *>(m_object->ownerDoc()->getElementFromHandle((*m_object).parentNode().handle()));
+		parentStyle = dynamic_cast<SVGStylableImpl *>(m_object->ownerDoc()->getElementFromHandle((*m_object).parentNode().handle()));
 
 	// Spec: default "none"
 	if(~m_flags & SVG_STYLE_FLAG_STROKE)
@@ -109,8 +109,8 @@ void SVGStylableImpl::processStyle()
 		m_strokeColor->ref();
 
 		SVGPaintImpl *strokeColor = 0L;
-		if(tqparentStyle)
-			strokeColor = tqparentStyle->getStrokeColor();
+		if(parentStyle)
+			strokeColor = parentStyle->getStrokeColor();
 
 		if(strokeColor)
 			*m_strokeColor = *strokeColor;
@@ -125,8 +125,8 @@ void SVGStylableImpl::processStyle()
 		m_fillColor->ref();
 
 		SVGPaintImpl *fillColor = 0;
-		if(tqparentStyle)
-			fillColor = tqparentStyle->getFillColor();
+		if(parentStyle)
+			fillColor = parentStyle->getFillColor();
 
 		if(fillColor)
 			*m_fillColor = *fillColor;
@@ -140,8 +140,8 @@ void SVGStylableImpl::processStyle()
 		m_color = new SVGColorImpl(m_object);
 		m_color->ref();
 		SVGColorImpl *color = 0;
-		if(tqparentStyle)
-			color = tqparentStyle->getColor();
+		if(parentStyle)
+			color = parentStyle->getColor();
 
 		if(color)
 			*m_color = *color;
@@ -150,8 +150,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default sRGB
 	if(~m_flags & SVG_STYLE_FLAG_COLOR_INTERPOLATION)
 	{
-		if(tqparentStyle)
-			m_colorInterpolation = tqparentStyle->getColorInterpolation();
+		if(parentStyle)
+			m_colorInterpolation = parentStyle->getColorInterpolation();
 		else
 			m_colorInterpolation = CI_SRGB;
 	}
@@ -163,8 +163,8 @@ void SVGStylableImpl::processStyle()
 		m_strokeWidth->ref();
 
 		SVGAnimatedLengthImpl *strokeWidth = 0;
-		if(tqparentStyle)
-			strokeWidth = tqparentStyle->getStrokeWidth();
+		if(parentStyle)
+			strokeWidth = parentStyle->getStrokeWidth();
 
 		if(strokeWidth)
 			*m_strokeWidth = *strokeWidth;
@@ -175,8 +175,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "4"
 	if(~m_flags & SVG_STYLE_FLAG_STROKE_MITER_LIMIT)
 	{
-		if(tqparentStyle)
-			m_strokeMiterlimit = tqparentStyle->getStrokeMiterlimit();
+		if(parentStyle)
+			m_strokeMiterlimit = parentStyle->getStrokeMiterlimit();
 		else
 			m_strokeMiterlimit = 4;
 	}
@@ -184,8 +184,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "butt"
 	if(~m_flags & SVG_STYLE_FLAG_STROKE_LINE_CAP)
 	{
-		if(tqparentStyle)
-			m_capStyle = tqparentStyle->getCapStyle();
+		if(parentStyle)
+			m_capStyle = parentStyle->getCapStyle();
 		else
 			m_capStyle = PATH_STROKE_CAP_BUTT;
 	}
@@ -193,8 +193,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "miter"
 	if(~m_flags & SVG_STYLE_FLAG_STROKE_LINE_JOIN)
 	{
-		if(tqparentStyle)
-			m_joinStyle = tqparentStyle->getJoinStyle();
+		if(parentStyle)
+			m_joinStyle = parentStyle->getJoinStyle();
 		else
 			m_joinStyle = PATH_STROKE_JOIN_MITER;
 	}
@@ -202,8 +202,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "auto"
 	if(~m_flags & SVG_STYLE_FLAG_CURSOR)
 	{
-		if(tqparentStyle)
-			m_cursor = tqparentStyle->getCursor();
+		if(parentStyle)
+			m_cursor = parentStyle->getCursor();
 		else
 			m_cursor = CURSOR_AUTO;
 	}
@@ -211,8 +211,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "visiblePainted"
 	if(~m_flags & SVG_STYLE_FLAG_POINTER_EVENTS)
 	{
-		if(tqparentStyle)
-			m_pointerEvents = tqparentStyle->getPointerEvents();
+		if(parentStyle)
+			m_pointerEvents = parentStyle->getPointerEvents();
 		else
 			m_pointerEvents = PE_VISIBLE_PAINTED;
 	}
@@ -224,8 +224,8 @@ void SVGStylableImpl::processStyle()
 		m_dashOffset->ref();
 
 		SVGAnimatedLengthImpl *dashOffset = 0;
-		if(tqparentStyle)
-			dashOffset = tqparentStyle->getDashOffset();
+		if(parentStyle)
+			dashOffset = parentStyle->getDashOffset();
 
 		if(dashOffset)
 			*m_dashOffset = *dashOffset;
@@ -237,8 +237,8 @@ void SVGStylableImpl::processStyle()
 	if(~m_flags & SVG_STYLE_FLAG_STROKE_DASH_ARRAY)
 	{
 		SVGAnimatedLengthListImpl *dashArray = 0;
-		if(tqparentStyle)
-			dashArray = tqparentStyle->getDashArray();
+		if(parentStyle)
+			dashArray = parentStyle->getDashArray();
 
 		if(dashArray)
 		{
@@ -256,16 +256,16 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "1" -> 1 == Not opaque
 	if(~m_flags & SVG_STYLE_FLAG_FILL_OPACITY)
 	{
-		if(tqparentStyle)
-			m_fillOpacity = tqparentStyle->getFillOpacity();
+		if(parentStyle)
+			m_fillOpacity = parentStyle->getFillOpacity();
 		else
 			m_fillOpacity = 1;
 	}
 
 	if(~m_flags & SVG_STYLE_FLAG_STROKE_OPACITY)
 	{
-		if(tqparentStyle)
-			m_strokeOpacity = tqparentStyle->getStrokeOpacity();
+		if(parentStyle)
+			m_strokeOpacity = parentStyle->getStrokeOpacity();
 		else
 			m_strokeOpacity = 1;
 	}
@@ -273,14 +273,14 @@ void SVGStylableImpl::processStyle()
 	// Fake group opacity by multiplying by our tqparent's group opacity
 	if(~m_flags & SVG_STYLE_FLAG_OPACITY)
 	{
-		if(tqparentStyle)
-			m_opacity = tqparentStyle->getOpacity();
+		if(parentStyle)
+			m_opacity = parentStyle->getOpacity();
 		else
 			m_opacity = 1;
 	}
 	else
-		if(tqparentStyle)
-			m_opacity *= tqparentStyle->getOpacity();
+		if(parentStyle)
+			m_opacity *= parentStyle->getOpacity();
 
 	if(~m_flags & SVG_STYLE_FLAG_CLIP_PATH)
 		m_clipPath = "";
@@ -291,16 +291,16 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "nonzero"
 	if(~m_flags & SVG_STYLE_FLAG_FILL_RULE)
 	{
-		if(tqparentStyle)
-			m_fillRule = tqparentStyle->getFillRule();
+		if(parentStyle)
+			m_fillRule = parentStyle->getFillRule();
 		else
 			m_fillRule = RULE_NONZERO;
 	}
 	
 	if(~m_flags & SVG_STYLE_FLAG_CLIP_RULE)
 	{
-		if(tqparentStyle)
-			m_clipRule = tqparentStyle->getClipRule();
+		if(parentStyle)
+			m_clipRule = parentStyle->getClipRule();
 		else
 			m_clipRule = RULE_NONZERO;
 	}
@@ -308,8 +308,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "hidden"
 	if(~m_flags & SVG_STYLE_FLAG_OVERFLOW)
 	{
-		if(tqparentStyle)
-			m_overflow = tqparentStyle->getOverflow();
+		if(parentStyle)
+			m_overflow = parentStyle->getOverflow();
 		else
 			m_overflow = false;
 	}
@@ -322,8 +322,8 @@ void SVGStylableImpl::processStyle()
 
 	if(~m_flags & SVG_STYLE_FLAG_VISIBILITY)
 	{
-		if(tqparentStyle)
-			m_visible = tqparentStyle->getVisible();
+		if(parentStyle)
+			m_visible = parentStyle->getVisible();
 		else
 			m_visible = true;
 	}
@@ -331,8 +331,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "medium"
 	if(~m_flags & SVG_STYLE_FLAG_FONT_SIZE)
 	{
-		if(tqparentStyle)
-			m_fontSize = tqparentStyle->getFontSize();
+		if(parentStyle)
+			m_fontSize = parentStyle->getFontSize();
 		else
 			m_fontSize = fontSizeForText("medium");
 	}
@@ -347,8 +347,8 @@ void SVGStylableImpl::processStyle()
 		}
 
 		SVGStringListImpl *fontFamily = 0;
-		if(tqparentStyle)
-			fontFamily = tqparentStyle->getFontFamily();
+		if(parentStyle)
+			fontFamily = parentStyle->getFontFamily();
 
 		if(fontFamily)
 			*m_fontFamily = *fontFamily;
@@ -364,8 +364,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "normal"
 	if(~m_flags & SVG_STYLE_FLAG_FONT_STYLE)
 	{
-		if(tqparentStyle)
-			m_fontStyle = tqparentStyle->getFontStyle();
+		if(parentStyle)
+			m_fontStyle = parentStyle->getFontStyle();
 		else
 			m_fontStyle = FSNORMAL;
 	}
@@ -373,8 +373,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "normal"
 	if(~m_flags & SVG_STYLE_FLAG_FONT_WEIGHT)
 	{
-		if(tqparentStyle)
-			m_fontWeight = tqparentStyle->getFontWeight();
+		if(parentStyle)
+			m_fontWeight = parentStyle->getFontWeight();
 		else
 			m_fontWeight = "normal";
 	}
@@ -382,8 +382,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "start"
 	if(~m_flags & SVG_STYLE_FLAG_TEXT_ANCHOR)
 	{
-		if(tqparentStyle)
-			m_textAnchor = tqparentStyle->getTextAnchor();
+		if(parentStyle)
+			m_textAnchor = parentStyle->getTextAnchor();
 		else
 			m_textAnchor = TASTART;
 	}
@@ -391,8 +391,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "LTR"
 	if(~m_flags & SVG_STYLE_FLAG_TEXT_DIRECTION)
 	{
-		if(tqparentStyle)
-			m_textDirection = tqparentStyle->getTextDirection();
+		if(parentStyle)
+			m_textDirection = parentStyle->getTextDirection();
 		else
 			m_textDirection = LTR;
 	}
@@ -400,8 +400,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "none"
 	if(~m_flags & SVG_STYLE_FLAG_TEXT_DECORATION)
 	{
-		if(tqparentStyle)
-			m_textDecoration = tqparentStyle->getTextDecoration();
+		if(parentStyle)
+			m_textDecoration = parentStyle->getTextDecoration();
 		else
 			m_textDecoration = TDNONE;
 	}
@@ -409,8 +409,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "baseline"
 	if(~m_flags & SVG_STYLE_FLAG_BASELINE_SHIFT)
 	{
-		if(tqparentStyle)
-			m_baselineShift = tqparentStyle->getBaselineShift();
+		if(parentStyle)
+			m_baselineShift = parentStyle->getBaselineShift();
 		else
 			m_baselineShift = "baseline";
 	}
@@ -418,8 +418,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "lr-tb", FIXME
 	if(~m_flags & SVG_STYLE_FLAG_TEXT_WRITING_MODE)
 	{
-		if(tqparentStyle)
-			m_textWritingMode = tqparentStyle->getTextWritingMode();
+		if(parentStyle)
+			m_textWritingMode = parentStyle->getTextWritingMode();
 		else
 			m_textWritingMode = LR;
 	}
@@ -427,8 +427,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "normal"
 	if(~m_flags & SVG_STYLE_FLAG_TEXT_UNICODE_BIDI)
 	{
-		if(tqparentStyle)
-			m_textUnicodeBidi = tqparentStyle->getTextUnicodeBidi();
+		if(parentStyle)
+			m_textUnicodeBidi = parentStyle->getTextUnicodeBidi();
 		else
 			m_textUnicodeBidi = UBNORMAL;
 	}
@@ -436,8 +436,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "auto"
 	if(~m_flags & SVG_STYLE_FLAG_GLYPH_ORIENTATION_VERTICAL)
 	{
-		if(tqparentStyle)
-			m_glyphOrientationVertical = tqparentStyle->getGlyphOrientationVertical();
+		if(parentStyle)
+			m_glyphOrientationVertical = parentStyle->getGlyphOrientationVertical();
 		else
 			m_glyphOrientationVertical = "auto";
 	}	
@@ -445,8 +445,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "auto"
 	if(~m_flags & SVG_STYLE_FLAG_GLYPH_ORIENTATION_HORIZONTAL)
 	{
-		if(tqparentStyle)
-			m_glyphOrientationHorizontal = tqparentStyle->getGlyphOrientationHorizontal();
+		if(parentStyle)
+			m_glyphOrientationHorizontal = parentStyle->getGlyphOrientationHorizontal();
 		else
 			m_glyphOrientationHorizontal = "auto";
 	}	
@@ -454,8 +454,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "normal"
 	if(~m_flags & SVG_STYLE_FLAG_LETTER_SPACING)
 	{
-		if(tqparentStyle)
-			m_letterSpacing = tqparentStyle->getLetterSpacing();
+		if(parentStyle)
+			m_letterSpacing = parentStyle->getLetterSpacing();
 		else
 			m_letterSpacing = "normal";
 	}
@@ -463,8 +463,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "normal"
 	if(~m_flags & SVG_STYLE_FLAG_WORD_SPACING)
 	{
-		if(tqparentStyle)
-			m_wordSpacing = tqparentStyle->getWordSpacing();
+		if(parentStyle)
+			m_wordSpacing = parentStyle->getWordSpacing();
 		else
 			m_wordSpacing = "normal";
 	}
@@ -481,8 +481,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "none"
 	if(~m_flags & SVG_STYLE_FLAG_MARKER_START)
 	{
-		if(tqparentStyle)
-			m_startMarker = tqparentStyle->getStartMarker();
+		if(parentStyle)
+			m_startMarker = parentStyle->getStartMarker();
 		else
 			m_startMarker = TQString();
 	}
@@ -490,8 +490,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "none"
 	if(~m_flags & SVG_STYLE_FLAG_MARKER_MID)
 	{
-		if(tqparentStyle)
-			m_midMarker = tqparentStyle->getMidMarker();
+		if(parentStyle)
+			m_midMarker = parentStyle->getMidMarker();
 		else
 			m_midMarker = TQString();
 	}
@@ -499,8 +499,8 @@ void SVGStylableImpl::processStyle()
 	// Spec: default "none"
 	if(~m_flags & SVG_STYLE_FLAG_MARKER_END)
 	{
-		if(tqparentStyle)
-			m_endMarker = tqparentStyle->getEndMarker();
+		if(parentStyle)
+			m_endMarker = parentStyle->getEndMarker();
 		else
 			m_endMarker = TQString();
 	}
diff --git a/ksvg/impl/SVGTextContentElementImpl.cc b/ksvg/impl/SVGTextContentElementImpl.cc
index 63157883..302b54b7 100644
--- a/ksvg/impl/SVGTextContentElementImpl.cc
+++ b/ksvg/impl/SVGTextContentElementImpl.cc
@@ -95,7 +95,7 @@ TQString SVGTextContentElementImpl::textDirectionAwareText()
 	return text;
 }
 
-T2P::GlyphLayoutParams *SVGTextContentElementImpl::tqlayoutParams() const
+T2P::GlyphLayoutParams *SVGTextContentElementImpl::layoutParams() const
 {
 	SVGStylableImpl *style = const_cast<SVGTextContentElementImpl *>(this);
 
diff --git a/ksvg/impl/SVGTextContentElementImpl.h b/ksvg/impl/SVGTextContentElementImpl.h
index 85999cb9..bd962037 100644
--- a/ksvg/impl/SVGTextContentElementImpl.h
+++ b/ksvg/impl/SVGTextContentElementImpl.h
@@ -52,7 +52,7 @@ public:
 
 	TQString textDirectionAwareText();
 
-	virtual T2P::GlyphLayoutParams *tqlayoutParams() const;
+	virtual T2P::GlyphLayoutParams *layoutParams() const;
 
 	SVGAnimatedLengthImpl *textLength() const;
 	SVGAnimatedEnumerationImpl *lengthAdjust() const;
diff --git a/ksvg/impl/SVGTextPathElementImpl.cc b/ksvg/impl/SVGTextPathElementImpl.cc
index 6ef8d545..78c272f8 100644
--- a/ksvg/impl/SVGTextPathElementImpl.cc
+++ b/ksvg/impl/SVGTextPathElementImpl.cc
@@ -104,9 +104,9 @@ void SVGTextPathElementImpl::setAttributes()
 		KSVG_SET_ALT_ATTRIBUTE(Spacing, "exact")
 }
 
-T2P::GlyphLayoutParams *SVGTextPathElementImpl::tqlayoutParams() const
+T2P::GlyphLayoutParams *SVGTextPathElementImpl::layoutParams() const
 {
-	T2P::GlyphLayoutParams *params = SVGTextContentElementImpl::tqlayoutParams();
+	T2P::GlyphLayoutParams *params = SVGTextContentElementImpl::layoutParams();
 	params->setTextPathStartOffset(startOffset()->baseVal()->value());
 	return params;
 }
diff --git a/ksvg/impl/SVGTextPathElementImpl.h b/ksvg/impl/SVGTextPathElementImpl.h
index e1776815..98a88d33 100644
--- a/ksvg/impl/SVGTextPathElementImpl.h
+++ b/ksvg/impl/SVGTextPathElementImpl.h
@@ -41,7 +41,7 @@ public:
 	SVGAnimatedEnumerationImpl *spacing() const;
 
 	virtual void setAttributes();
-	virtual T2P::GlyphLayoutParams *tqlayoutParams() const;
+	virtual T2P::GlyphLayoutParams *layoutParams() const;
 
 private:
 	SVGAnimatedLengthImpl *m_startOffset;
diff --git a/ksvg/impl/SVGTransformableImpl.cc b/ksvg/impl/SVGTransformableImpl.cc
index ce69aa83..4776c679 100644
--- a/ksvg/impl/SVGTransformableImpl.cc
+++ b/ksvg/impl/SVGTransformableImpl.cc
@@ -83,18 +83,18 @@ SVGMatrixImpl *SVGTransformableImpl::getCTM()
 	SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(this);
 	Q_ASSERT(element);
 
-	DOM::Node tqparentNde = element->parentNode();
+	DOM::Node parentNde = element->parentNode();
 
-	if(!tqparentNde.isNull() && tqparentNde.nodeType() != DOM::Node::DOCUMENT_NODE)
+	if(!parentNde.isNull() && parentNde.nodeType() != DOM::Node::DOCUMENT_NODE)
 	{
-		SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(tqparentNde.handle());
+		SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(parentNde.handle());
 		SVGLocatableImpl *locatableParent = dynamic_cast<SVGLocatableImpl *>(tqparent);
 
 		if(locatableParent)
 		{
-			SVGMatrixImpl *tqparentCTM = locatableParent->getCTM();
-			ctm->multiply(tqparentCTM);
-			tqparentCTM->deref();
+			SVGMatrixImpl *parentCTM = locatableParent->getCTM();
+			ctm->multiply(parentCTM);
+			parentCTM->deref();
 		}
 	}
 
@@ -124,7 +124,7 @@ void SVGTransformableImpl::updateLocalMatrix()
 		}
 	}
 
-	tqinvalidateCachedMatrices();
+	invalidateCachedMatrices();
 }
 
 // Ecma stuff
diff --git a/ksvg/impl/libs/art_support/art_misc.c b/ksvg/impl/libs/art_support/art_misc.c
index 6645fe2d..bcf9ec46 100644
--- a/ksvg/impl/libs/art_support/art_misc.c
+++ b/ksvg/impl/libs/art_support/art_misc.c
@@ -592,7 +592,7 @@ ksvg_art_rgb_affine_clip_callback (void *callback_data, int y,
 }
 
 static
-void ksvg_art_rgb_affine_clip_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
 	int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
 {
 	const art_u8 *src_p;
@@ -662,7 +662,7 @@ void ksvg_art_rgb_affine_clip_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, in
 }
 
 static void
-ksvg_art_rgb_affine_clip_tqmask_callback (void *callback_data, int y,
+ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y,
 														int start, ArtSVPRenderAAStep *steps, int n_steps)
 {
 	ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data;
@@ -673,14 +673,14 @@ ksvg_art_rgb_affine_clip_tqmask_callback (void *callback_data, int y,
 	int k;
 	int *alphatab;
 	int alpha;
-	const art_u8 *tqmaskbuf;
+	const art_u8 *maskbuf;
 
 	linebuf = data->dst;
 	x0 = data->x0;
 	x1 = data->x1;
 
 	alphatab = data->alphatab;
-	tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+	maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
 
 	if(n_steps > 0)
 	{
@@ -689,7 +689,7 @@ ksvg_art_rgb_affine_clip_tqmask_callback (void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				ksvg_art_rgb_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+				ksvg_art_rgb_affine_clip_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 		}
 
 		for(k = 0; k < n_steps - 1; k++)
@@ -701,7 +701,7 @@ ksvg_art_rgb_affine_clip_tqmask_callback (void *callback_data, int y,
 			{
 				alpha = (running_sum >> 16) & 0xff;
 				if(alpha)
-					ksvg_art_rgb_affine_clip_tqmask_run(linebuf + (run_x0 - x0) * 3, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+					ksvg_art_rgb_affine_clip_mask_run(linebuf + (run_x0 - x0) * 3, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 			}
 		}
 		running_sum += steps[k].delta;
@@ -709,14 +709,14 @@ ksvg_art_rgb_affine_clip_tqmask_callback (void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				ksvg_art_rgb_affine_clip_tqmask_run(linebuf + (run_x1 - x0) * 3, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+				ksvg_art_rgb_affine_clip_mask_run(linebuf + (run_x1 - x0) * 3, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 		}
 	}
 	else
 	{
 		alpha = (running_sum >> 16) & 0xff;
 		if(alpha)
-			ksvg_art_rgb_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+			ksvg_art_rgb_affine_clip_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 	}
 
 	data->dst += data->dst_rowstride;
@@ -853,7 +853,7 @@ ksvg_art_rgba_affine_clip_callback (void *callback_data, int y,
 }
 
 static
-void ksvg_art_rgba_affine_clip_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
 	int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
 {
 	const art_u8 *src_p;
@@ -930,7 +930,7 @@ void ksvg_art_rgba_affine_clip_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, i
 }
 
 static void
-ksvg_art_rgba_affine_clip_tqmask_callback (void *callback_data, int y,
+ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y,
 														int start, ArtSVPRenderAAStep *steps, int n_steps)
 {
 	ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data;
@@ -941,14 +941,14 @@ ksvg_art_rgba_affine_clip_tqmask_callback (void *callback_data, int y,
 	int k;
 	int *alphatab;
 	int alpha;
-	const art_u8 *tqmaskbuf;
+	const art_u8 *maskbuf;
 
 	linebuf = data->dst;
 	x0 = data->x0;
 	x1 = data->x1;
 
 	alphatab = data->alphatab;
-	tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+	maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
 
 	if(n_steps > 0)
 	{
@@ -957,7 +957,7 @@ ksvg_art_rgba_affine_clip_tqmask_callback (void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				ksvg_art_rgba_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+				ksvg_art_rgba_affine_clip_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 		}
 
 		for(k = 0; k < n_steps - 1; k++)
@@ -969,7 +969,7 @@ ksvg_art_rgba_affine_clip_tqmask_callback (void *callback_data, int y,
 			{
 				alpha = (running_sum >> 16) & 0xff;
 				if(alpha)
-					ksvg_art_rgba_affine_clip_tqmask_run(linebuf + (run_x0 - x0) * 4, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+					ksvg_art_rgba_affine_clip_mask_run(linebuf + (run_x0 - x0) * 4, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 			}
 		}
 		running_sum += steps[k].delta;
@@ -977,14 +977,14 @@ ksvg_art_rgba_affine_clip_tqmask_callback (void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				ksvg_art_rgba_affine_clip_tqmask_run(linebuf + (run_x1 - x0) * 4, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+				ksvg_art_rgba_affine_clip_mask_run(linebuf + (run_x1 - x0) * 4, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 		}
 	}
 	else
 	{
 		alpha = (running_sum >> 16) & 0xff;
 		if(alpha)
-			ksvg_art_rgba_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+			ksvg_art_rgba_affine_clip_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 	}
 
 	data->dst += data->dst_rowstride;
@@ -1064,14 +1064,14 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in
 	if(dst_channels == 3)
 	{
 		if(tqmask)
-			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_tqmask_callback, &data);
+			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_mask_callback, &data);
 		else
 			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_callback, &data);
 	}
 	else
 	{
 		if(tqmask)
-			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_tqmask_callback, &data);
+			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_mask_callback, &data);
 		else
 			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_callback, &data);
 	}
@@ -1228,7 +1228,7 @@ ksvg_art_rgb_texture_callback (void *callback_data, int y,
 }
 
 static
-void ksvg_art_rgb_texture_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
 	int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
 {
 	const art_u8 *src_p;
@@ -1322,7 +1322,7 @@ void ksvg_art_rgb_texture_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0
 }
 
 static void
-ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
+ksvg_art_rgb_texture_mask_callback (void *callback_data, int y,
 														int start, ArtSVPRenderAAStep *steps, int n_steps)
 {
 	ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data;
@@ -1333,7 +1333,7 @@ ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
 	int k;
 	int *alphatab;
 	int alpha;
-	const art_u8 *tqmaskbuf;
+	const art_u8 *maskbuf;
 
 	linebuf = data->dst;
 	x0 = data->x0;
@@ -1341,7 +1341,7 @@ ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
 
 	alphatab = data->alphatab;
 
-	tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+	maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
 
 	if(n_steps > 0)
 	{
@@ -1350,7 +1350,7 @@ ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				ksvg_art_rgb_texture_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+				ksvg_art_rgb_texture_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 		}
 
 		for(k = 0; k < n_steps - 1; k++)
@@ -1362,7 +1362,7 @@ ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
 			{
 				alpha = (running_sum >> 16) & 0xff;
 				if(alpha)
-					ksvg_art_rgb_texture_tqmask_run(linebuf + (run_x0 - x0) * 3, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+					ksvg_art_rgb_texture_mask_run(linebuf + (run_x0 - x0) * 3, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 			}
 		}
 		running_sum += steps[k].delta;
@@ -1370,14 +1370,14 @@ ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				ksvg_art_rgb_texture_tqmask_run(linebuf + (run_x1 - x0) * 3, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+				ksvg_art_rgb_texture_mask_run(linebuf + (run_x1 - x0) * 3, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 		}
 	}
 	else
 	{
 		alpha = (running_sum >> 16) & 0xff;
 		if(alpha)
-			ksvg_art_rgb_texture_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+			ksvg_art_rgb_texture_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 	}
 
 	data->dst += data->dst_rowstride;
@@ -1545,7 +1545,7 @@ ksvg_art_rgba_texture_callback (void *callback_data, int y,
 }
 
 static
-void ksvg_art_rgba_texture_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
+void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6],
 	int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height)
 {
 	const art_u8 *src_p;
@@ -1651,7 +1651,7 @@ void ksvg_art_rgba_texture_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x
 }
 
 static void
-ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
+ksvg_art_rgba_texture_mask_callback (void *callback_data, int y,
 														int start, ArtSVPRenderAAStep *steps, int n_steps)
 {
 	ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data;
@@ -1662,7 +1662,7 @@ ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
 	int k;
 	int *alphatab;
 	int alpha;
-	const art_u8 *tqmaskbuf;
+	const art_u8 *maskbuf;
 
 	linebuf = data->dst;
 	x0 = data->x0;
@@ -1670,7 +1670,7 @@ ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
 
 	alphatab = data->alphatab;
 
-	tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
+	maskbuf = data->tqmask + (y - data->y0) * (x1 - x0);
 
 	if(n_steps > 0)
 	{
@@ -1679,7 +1679,7 @@ ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				ksvg_art_rgba_texture_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+				ksvg_art_rgba_texture_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 		}
 
 		for(k = 0; k < n_steps - 1; k++)
@@ -1691,7 +1691,7 @@ ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
 			{
 				alpha = (running_sum >> 16) & 0xff;
 				if(alpha)
-					ksvg_art_rgba_texture_tqmask_run(linebuf + (run_x0 - x0) * 4, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+					ksvg_art_rgba_texture_mask_run(linebuf + (run_x0 - x0) * 4, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 			}
 		}
 		running_sum += steps[k].delta;
@@ -1699,14 +1699,14 @@ ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				ksvg_art_rgba_texture_tqmask_run(linebuf + (run_x1 - x0) * 4, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+				ksvg_art_rgba_texture_mask_run(linebuf + (run_x1 - x0) * 4, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 		}
 	}
 	else
 	{
 		alpha = (running_sum >> 16) & 0xff;
 		if(alpha)
-			ksvg_art_rgba_texture_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
+			ksvg_art_rgba_texture_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height);
 	}
 
 	data->dst += data->dst_rowstride;
@@ -1796,9 +1796,9 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1
 	if(tqmask)
 	{
 		if(dst_channels == 3)
-			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_texture_tqmask_callback, &data);
+			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_texture_mask_callback, &data);
 		else
-			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_texture_tqmask_callback, &data);
+			art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_texture_mask_callback, &data);
 	}
 	else
 	{
diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.c b/ksvg/impl/libs/art_support/art_rgba_svp.c
index ea2c1476..0c552c42 100644
--- a/ksvg/impl/libs/art_support/art_rgba_svp.c
+++ b/ksvg/impl/libs/art_support/art_rgba_svp.c
@@ -124,7 +124,7 @@ art_ksvg_rgba_run_alpha (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int alpha, i
 }
 
 static void
-art_ksvg_rgba_tqmask_run_alpha (art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
+art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
 {
 	int i;
 	int v;
@@ -330,7 +330,7 @@ art_ksvg_rgba_svp_alpha_opaque_callback(void *callback_data, int y,
 }
 
 static void
-art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
+art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y,
 																 int start, ArtSVPRenderAAStep *steps, int n_steps)
 {
 	ArtKSVGRgbaSVPAlphaData *data = (ArtKSVGRgbaSVPAlphaData *)callback_data;
@@ -342,7 +342,7 @@ art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
 	art_u8 r, g, b;
 	int *alphatab;
 	int alpha;
-	art_u8 *tqmaskbuf;
+	art_u8 *maskbuf;
 
 	linebuf = data->buf;
 	x0 = data->x0;
@@ -353,7 +353,7 @@ art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
 	b = data->b;
 	alphatab = data->alphatab;
 
-	tqmaskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
+	maskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
 
 	if(n_steps > 0)
 	{
@@ -362,7 +362,7 @@ art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				art_ksvg_rgba_tqmask_run_alpha (linebuf, tqmaskbuf,
+				art_ksvg_rgba_mask_run_alpha (linebuf, maskbuf,
 													 r, g, b, alphatab[alpha],
 													 run_x1 - x0);
 		}
@@ -376,7 +376,7 @@ art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
 			{
 				alpha = (running_sum >> 16) & 0xff;
 				if(alpha)
-					art_ksvg_rgba_tqmask_run_alpha (linebuf + (run_x0 - x0) * 4, tqmaskbuf + (run_x0 - x0),
+					art_ksvg_rgba_mask_run_alpha (linebuf + (run_x0 - x0) * 4, maskbuf + (run_x0 - x0),
 														 r, g, b, alphatab[alpha],
 														 run_x1 - run_x0);
 			}
@@ -386,7 +386,7 @@ art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				art_ksvg_rgba_tqmask_run_alpha (linebuf + (run_x1 - x0) * 4, tqmaskbuf + (run_x1 - x0) ,
+				art_ksvg_rgba_mask_run_alpha (linebuf + (run_x1 - x0) * 4, maskbuf + (run_x1 - x0) ,
 													 r, g, b, alphatab[alpha],
 													 x1 - run_x1);
 		}
@@ -395,7 +395,7 @@ art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y,
 	{
 		alpha = (running_sum >> 16) & 0xff;
 		if(alpha)
-			art_ksvg_rgba_tqmask_run_alpha (linebuf,	tqmaskbuf,
+			art_ksvg_rgba_mask_run_alpha (linebuf,	maskbuf,
 												 r, g, b, alphatab[alpha],
 												 x1 - x0);
 	}
@@ -472,7 +472,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
 	data.y0 = y0;
 
 	if(tqmask)
-		art_svp_render_aa (svp, x0, y0, x1, y1, art_ksvg_rgba_svp_alpha_tqmask_callback, &data);
+		art_svp_render_aa (svp, x0, y0, x1, y1, art_ksvg_rgba_svp_alpha_mask_callback, &data);
 	else
 	{
 		if (alpha == 255)
@@ -485,7 +485,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp,
 /* RGB renderers */
 
 static void
-art_ksvg_rgb_tqmask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
+art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n)
 {
 	int i;
 	int v;
@@ -515,7 +515,7 @@ art_ksvg_rgb_tqmask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, a
 }
 
 static void
-art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
+art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y,
 																 int start, ArtSVPRenderAAStep *steps, int n_steps)
 {
 	ArtKSVGRgbaSVPAlphaData *data = (ArtKSVGRgbaSVPAlphaData *)callback_data;
@@ -527,7 +527,7 @@ art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
 	art_u8 r, g, b;
 	int *alphatab;
 	int alpha;
-	art_u8 *tqmaskbuf;
+	art_u8 *maskbuf;
 
 	linebuf = data->buf;
 	x0 = data->x0;
@@ -538,7 +538,7 @@ art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
 	b = data->b;
 	alphatab = data->alphatab;
 
-	tqmaskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
+	maskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0);
 
 	if(n_steps > 0)
 	{
@@ -547,7 +547,7 @@ art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				art_ksvg_rgb_tqmask_run_alpha (linebuf, tqmaskbuf,
+				art_ksvg_rgb_mask_run_alpha (linebuf, maskbuf,
 													 r, g, b, alphatab[alpha],
 													 run_x1 - x0);
 		}
@@ -561,7 +561,7 @@ art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
 			{
 				alpha = (running_sum >> 16) & 0xff;
 				if(alpha)
-					art_ksvg_rgb_tqmask_run_alpha (linebuf + (run_x0 - x0) * 3, tqmaskbuf + (run_x0 - x0),
+					art_ksvg_rgb_mask_run_alpha (linebuf + (run_x0 - x0) * 3, maskbuf + (run_x0 - x0),
 														 r, g, b, alphatab[alpha],
 														 run_x1 - run_x0);
 			}
@@ -571,7 +571,7 @@ art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
 		{
 			alpha = (running_sum >> 16) & 0xff;
 			if(alpha)
-				art_ksvg_rgb_tqmask_run_alpha (linebuf + (run_x1 - x0) * 3, tqmaskbuf + (run_x1 - x0) ,
+				art_ksvg_rgb_mask_run_alpha (linebuf + (run_x1 - x0) * 3, maskbuf + (run_x1 - x0) ,
 													 r, g, b, alphatab[alpha],
 													 x1 - run_x1);
 		}
@@ -580,7 +580,7 @@ art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y,
 	{
 		alpha = (running_sum >> 16) & 0xff;
 		if(alpha)
-			art_ksvg_rgb_tqmask_run_alpha (linebuf,	tqmaskbuf,
+			art_ksvg_rgb_mask_run_alpha (linebuf,	maskbuf,
 												 r, g, b, alphatab[alpha],
 												 x1 - x0);
 	}
@@ -654,6 +654,6 @@ art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp,
 	data.x1 = x1;
 	data.y0 = y0;
 
-	art_svp_render_aa(svp, x0, y0, x1, y1, art_ksvg_rgb_svp_alpha_tqmask_callback, &data);
+	art_svp_render_aa(svp, x0, y0, x1, y1, art_ksvg_rgb_svp_alpha_mask_callback, &data);
 }
 
diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp
index 16aef608..2085e003 100644
--- a/ksvg/impl/libs/libtext2path/src/Converter.cpp
+++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp
@@ -162,7 +162,7 @@ void Converter::selectGlyph(GlyphRenderParams *params)
 	// 2. Load glyph into font's glyphSlot, according to the GlyphLayoutParams
 	int flags = FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
 
-	// 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB tqlayouts when rendering
+	// 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB layouts when rendering
 	// 	  a latin glyph because it needs to be rotated...
 	if(params->tqlayout()->tb())
 	{
@@ -456,7 +456,7 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned
 	result->m_height = T2PMAX(1, int(bbox.b().y() - bbox.a().y()));
 
 	// Correct bounding box information also on
-	// vertical tqlayouts! (Niko)
+	// vertical layouts! (Niko)
 	if(!params->tb())
 	{
 		if(bpath)
diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.h b/ksvg/impl/libs/libtext2path/src/Glyph.h
index 73951b47..8dcbe599 100644
--- a/ksvg/impl/libs/libtext2path/src/Glyph.h
+++ b/ksvg/impl/libs/libtext2path/src/Glyph.h
@@ -185,7 +185,7 @@ namespace T2P
 
 	private:
 		Font *m_font;
-		const GlyphLayoutParams *m_layout; // Glyph tqlayouting params
+		const GlyphLayoutParams *m_layout; // Glyph layouting params
 	
 		unsigned int m_glyphIndex; // 'character' index in font
 		unsigned int m_lastGlyph;	// Kerning
diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
index 696cfec3..3f2fe30d 100644
--- a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
+++ b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp
@@ -372,7 +372,7 @@ template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> co
 #if (defined(__GNUC__) &&  (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238))
 
 // g++ 2.9x doesn't allow static_cast<X const *>(void *)
-// aptqparently EDG 2.38 also doesn't accept it
+// apparently EDG 2.38 also doesn't accept it
 
 template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
 {
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
index 7848f8d3..7d359b61 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
@@ -63,7 +63,7 @@ void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
 
 void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
 					     Pixmap *pixmap_return,
-					     Pixmap *tqmask_return,
+					     Pixmap *mask_return,
 					     int alpha_threshold);
 
 
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c
index 95a6c722..eb7e4cdf 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c
@@ -913,7 +913,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 	  static_image[i]->byte_order = MSBFirst;
 	}
       }
-      /* ok, so aptqparently, image_info->bpp is actually
+      /* ok, so apparently, image_info->bpp is actually
 	 BYTES per pixel.  What fun! */
       switch (static_image[0]->bits_per_pixel) {
       case 1:
diff --git a/ksvg/plugin/backends/libart/LibartCanvas.cpp b/ksvg/plugin/backends/libart/LibartCanvas.cpp
index 05f37e82..8688c28d 100644
--- a/ksvg/plugin/backends/libart/LibartCanvas.cpp
+++ b/ksvg/plugin/backends/libart/LibartCanvas.cpp
@@ -214,7 +214,7 @@ void LibartCanvas::drawImage(TQImage image, SVGStylableImpl *style, const SVGMat
 
 			TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1);
 
-			TQByteArray tqmask = SVGMaskElementImpl::tqmaskRectangle(tqshape, screenBBox);
+			TQByteArray tqmask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox);
 
 			double affine[6];
 			KSVGHelper::matrixToAffine(matrix, affine);
@@ -330,22 +330,22 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape)
 	else
 	{
 		SVGElementImpl *element = dynamic_cast<SVGElementImpl *>(tqshape);
-		DOM::Node tqparentNode = element->parentNode();
+		DOM::Node parentNode = element->parentNode();
 
-		if(!tqparentNode.isNull())
+		if(!parentNode.isNull())
 		{
-			SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(tqparentNode.handle());
+			SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(parentNode.handle());
 
 			if(tqparent)
 			{
-				SVGShapeImpl *tqparentShape = dynamic_cast<SVGShapeImpl *>(tqparent);
+				SVGShapeImpl *parentShape = dynamic_cast<SVGShapeImpl *>(tqparent);
 
-				if(tqparentShape)
+				if(parentShape)
 				{
 					// Clip against ancestor clipping paths
-					ArtSVP *tqparentClippedSvp = clipSingleSVP(clippedSvp, tqparentShape);
+					ArtSVP *parentClippedSvp = clipSingleSVP(clippedSvp, parentShape);
 					art_svp_free(clippedSvp);
-					clippedSvp = tqparentClippedSvp;
+					clippedSvp = parentClippedSvp;
 				}
 			}
 		}
diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
index 32dad452..83b62fb4 100644
--- a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
+++ b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp
@@ -252,7 +252,7 @@ void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *st
 
 		TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1);
 
-		TQByteArray tqmask = SVGMaskElementImpl::tqmaskRectangle(tqshape, screenBBox);
+		TQByteArray tqmask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox);
 
 		if(paintType(style) == SVG_PAINTTYPE_URI)
 		{
diff --git a/ksvg/plugin/ksvg_factory.cpp b/ksvg/plugin/ksvg_factory.cpp
index 41392c55..0f55be71 100644
--- a/ksvg/plugin/ksvg_factory.cpp
+++ b/ksvg/plugin/ksvg_factory.cpp
@@ -56,7 +56,7 @@ KSVGPluginFactory::~KSVGPluginFactory()
 	s_about = 0;
 }
 
-KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *tqparentWidget, const char *wname, TQObject *tqparent, const char *name, const char *, const TQStringList &args)
+KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *parentWidget, const char *wname, TQObject *tqparent, const char *name, const char *, const TQStringList &args)
 {
 	// Get the width and height of the <embed>
 	// TODO : <object>
@@ -72,7 +72,7 @@ KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *tqparentWidget, cons
 			height = r2.cap(3).toUInt(&dummy);
 	}
 	
-	return new KSVGPlugin(tqparentWidget, wname, tqparent, name, width, height);
+	return new KSVGPlugin(parentWidget, wname, tqparent, name, width, height);
 }
 
 KInstance *KSVGPluginFactory::instance()
diff --git a/ksvg/plugin/ksvg_factory.h b/ksvg/plugin/ksvg_factory.h
index 04b351be..c94de0a1 100644
--- a/ksvg/plugin/ksvg_factory.h
+++ b/ksvg/plugin/ksvg_factory.h
@@ -35,7 +35,7 @@ public:
 	KSVGPluginFactory(TQObject *tqparent = 0, const char *name = 0);
 	virtual ~KSVGPluginFactory();
 	
-	virtual KParts::Part *createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList());
+	virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList());
 	
 	static KInstance *instance();
 
diff --git a/ksvg/plugin/ksvg_plugin.h b/ksvg/plugin/ksvg_plugin.h
index 6bff6144..919b0290 100644
--- a/ksvg/plugin/ksvg_plugin.h
+++ b/ksvg/plugin/ksvg_plugin.h
@@ -37,7 +37,7 @@ class KSVGPlugin : public KParts::ReadOnlyPart
 Q_OBJECT
   TQ_OBJECT
 public:
-	KSVGPlugin(TQWidget *tqparentWidget, const char *wname, TQObject *tqparent, const char *name, unsigned int width = 0, unsigned int height = 0);
+	KSVGPlugin(TQWidget *parentWidget, const char *wname, TQObject *tqparent, const char *name, unsigned int width = 0, unsigned int height = 0);
 	virtual ~KSVGPlugin();
 
 	virtual bool openFile() { return false; }
diff --git a/ksvg/test/W3C_TESTSUITE_1.1 b/ksvg/test/W3C_TESTSUITE_1.1
index 39d280c4..a695c8d4 100644
--- a/ksvg/test/W3C_TESTSUITE_1.1
+++ b/ksvg/test/W3C_TESTSUITE_1.1
@@ -103,13 +103,13 @@ linking-uri-02-b	-
 linking-uri-03-t	x
 
 [MASKING]
-tqmasking-tqmask-01-b	-
-tqmasking-opacity-01-b	o
-tqmasking-path-01-b	x
-tqmasking-path-02-b	x
-tqmasking-path-03-t	x
-tqmasking-path-04-b	o
-tqmasking-path-05-f	x
+masking-tqmask-01-b	-
+masking-opacity-01-b	o
+masking-path-01-b	x
+masking-path-02-b	x
+masking-path-03-t	x
+masking-path-04-b	o
+masking-path-05-f	x
 
 [METADATA]
 metadata-example-01-b	x
diff --git a/ksvg/test/ZVON-TEST-PASSED b/ksvg/test/ZVON-TEST-PASSED
index 1f92bef0..476b0afc 100644
--- a/ksvg/test/ZVON-TEST-PASSED
+++ b/ksvg/test/ZVON-TEST-PASSED
@@ -81,15 +81,15 @@ linking-view-BE-05.svg			o
 linking-xlinkAttr-BE-02.svg		x
 
 Group 11: [Masking] - 21.09.2003
-tqmasking-clipPath-BE-01.svg:		x
-tqmasking-clipPath-BE-02.svg:		x
-tqmasking-clipPath-BE-08.svg:		x
-tqmasking-clipRule-BE-03.svg:		x
-tqmasking-groupOpac-BE-04.svg:	x
-tqmasking-tqmask-BE-05.svg:			x
-tqmasking-tqmask-BE-06.svg:			x
-tqmasking-property-BE-07.svg:		x
-tqmasking-vportClip-BE-09.svg:	x
+masking-clipPath-BE-01.svg:		x
+masking-clipPath-BE-02.svg:		x
+masking-clipPath-BE-08.svg:		x
+masking-clipRule-BE-03.svg:		x
+masking-groupOpac-BE-04.svg:	x
+masking-tqmask-BE-05.svg:			x
+masking-tqmask-BE-06.svg:			x
+masking-property-BE-07.svg:		x
+masking-vportClip-BE-09.svg:	x
 
 Group 12: [Metadata] - 21.09.2003
 metadata-sample-BE-01.svg:		x	PLANE REFERENCE IMAGE LOOKS WRONG - WE MATCH BATIK'S OUTPUT
diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp
index fc00b84c..04a1f7a6 100644
--- a/kuickshow/src/filefinder.cpp
+++ b/kuickshow/src/filefinder.cpp
@@ -87,7 +87,7 @@ void FileFinder::keyPressEvent( TQKeyEvent *e )
 void FileFinder::hide()
 {
     KLineEdit::hide();
-    tqparentWidget()->setFocus();
+    parentWidget()->setFocus();
 }
 
 void FileFinder::slotAccept( const TQString& dir )
diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp
index 1eddb704..ee890f4c 100644
--- a/kuickshow/src/imlibwidget.cpp
+++ b/kuickshow/src/imlibwidget.cpp
@@ -519,12 +519,12 @@ void ImlibWidget::restoreCursor()
          setCursor( m_oldCursor );
 }
 
-// Retqparenting a widget in TQt in fact means destroying the old X window of the widget
+// Reparenting a widget in TQt in fact means destroying the old X window of the widget
 // and creating a new one. And since the X window used for the Imlib image is a child
 // of this widget's X window, destroying this widget's X window would mean also
 // destroying the Imlib image X window. Therefore it needs to be temporarily reparented
 // away and reparented back to the new X window.
-// Retqparenting may happen e.g. when doing the old-style (non-NETWM) fullscreen changes.
+// Reparenting may happen e.g. when doing the old-style (non-NETWM) fullscreen changes.
 void ImlibWidget::reparent( TQWidget* tqparent, WFlags f, const TQPoint& p, bool showIt )
 {
     XWindowAttributes attr;
diff --git a/kuickshow/src/kuickshow.h b/kuickshow/src/kuickshow.h
index f45027dd..c8745287 100644
--- a/kuickshow/src/kuickshow.h
+++ b/kuickshow/src/kuickshow.h
@@ -133,7 +133,7 @@ private slots:
     void                slotOpenURL();
     void		slotSetURL( const KURL& );
     void		slotURLComboReturnPressed();
-//     void                tqinvalidateImages( const KFileItemList& items );
+//     void                invalidateImages( const KFileItemList& items );
     void		slotDeleteCurrentImage(ImageWindow *viewer);
     void		slotTrashCurrentImage(ImageWindow *viewer);
     void                slotDeleteCurrentImage();
diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui
index da279892..746fa02c 100644
--- a/kview/kviewcanvas/config/generalconfigwidget.ui
+++ b/kview/kviewcanvas/config/generalconfigwidget.ui
@@ -283,8 +283,8 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp
index 13ee9e43..a26a061f 100644
--- a/kview/kviewcanvas/kimageholder.cpp
+++ b/kview/kviewcanvas/kimageholder.cpp
@@ -96,7 +96,7 @@ void KImageHolder::mouseMoveEvent( TQMouseEvent *ev )
 		}
 		else // create a selection
 		{
-			TQWidget * tqparentwidget = ( TQWidget* )tqparent();
+			TQWidget * parentwidget = ( TQWidget* )tqparent();
 			if( ! m_bSelecting )
 			{
 				m_bSelecting = true;
@@ -127,17 +127,17 @@ void KImageHolder::mouseMoveEvent( TQMouseEvent *ev )
 			//                 -2 => scroll to the left 2 px per 50ms
 			//                  2 => scroll to the right 2 px per 50ms
 			//                 ...
-			m_xOffset = mapTo( tqparentwidget, ev->pos() ).x();
-			m_yOffset = mapTo( tqparentwidget, ev->pos() ).y();
+			m_xOffset = mapTo( parentwidget, ev->pos() ).x();
+			m_yOffset = mapTo( parentwidget, ev->pos() ).y();
 			if( m_xOffset > 0 )
 			{
-				m_xOffset -= tqparentwidget->width();
+				m_xOffset -= parentwidget->width();
 				if( m_xOffset < 0 )
 					m_xOffset = 0;
 			}
 			if( m_yOffset > 0 )
 			{
-				m_yOffset -= tqparentwidget->height();
+				m_yOffset -= parentwidget->height();
 				if( m_yOffset < 0 )
 					m_yOffset = 0;
 			}
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index e566b74b..eb4adb13 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -55,10 +55,10 @@
 typedef KParts::GenericFactory<KViewViewer> KViewViewerFactory;
 K_EXPORT_COMPONENT_FACTORY( libkviewviewer, KViewViewerFactory )
 
-KViewViewer::KViewViewer( TQWidget *tqparentWidget, const char * /*widgetName*/,
+KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/,
 		TQObject *tqparent, const char *name, const TQStringList & )
 	: KImageViewer::Viewer( tqparent, name )
-	, m_pParentWidget( tqparentWidget )
+	, m_pParentWidget( parentWidget )
 	, m_pJob( 0 )
 	, m_pExtension( 0 )
 	, m_pCanvas( 0 )
diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h
index 1d79696e..f63808c8 100644
--- a/kview/kviewviewer/kviewviewer.h
+++ b/kview/kviewviewer/kviewviewer.h
@@ -49,7 +49,7 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf
 	friend class KViewKonqExtension;
 
 	public:
-		KViewViewer( TQWidget * tqparentWidget, const char * widgetName,
+		KViewViewer( TQWidget * parentWidget, const char * widgetName,
 				TQObject * tqparent, const char * name, const TQStringList & );
 		virtual ~KViewViewer();
 
diff --git a/kview/kviewviewer/printimagesettings.ui b/kview/kviewviewer/printimagesettings.ui
index 3c5418af..2eed3c78 100644
--- a/kview/kviewviewer/printimagesettings.ui
+++ b/kview/kviewviewer/printimagesettings.ui
@@ -180,8 +180,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>tqwidget.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index 2bc7206a..d56343dc 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -271,8 +271,8 @@
     <slot access="private" specifier="non virtual">init()</slot>
     <slot specifier="non virtual">noSort()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kdialog.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index d85748c1..6b08593c 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -82,11 +82,11 @@ KViewPresenter::KViewPresenter( TQObject* tqparent, const char* name, const TQSt
 		connect( m_pImageList->m_pSlideshow, TQT_SIGNAL( toggled( bool ) ), m_paSlideshow, TQT_SLOT( setChecked( bool ) ) );
 
 		// search for file_open action
-		KXMLGUIClient * tqparentClient = static_cast<KXMLGUIClient*>( tqparent->qt_cast( "KXMLGUIClient" ) );
-		if( tqparentClient )
+		KXMLGUIClient * parentClient = static_cast<KXMLGUIClient*>( tqparent->qt_cast( "KXMLGUIClient" ) );
+		if( parentClient )
 		{
-			m_paFileOpen = tqparentClient->actionCollection()->action( "file_open" );
-			m_paFileClose = tqparentClient->actionCollection()->action( "file_close" );
+			m_paFileOpen = parentClient->actionCollection()->action( "file_open" );
+			m_paFileClose = parentClient->actionCollection()->action( "file_close" );
 		}
 		if( m_paFileClose )
 			connect( m_paFileClose, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotClose() ) );
diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp
index ce6c5d1e..8503188d 100644
--- a/kview/photobook/photobook.cpp
+++ b/kview/photobook/photobook.cpp
@@ -220,7 +220,7 @@ void PhotoBook::updateButton( bool nextExist, bool previousExit)
 K_EXPORT_COMPONENT_FACTORY(libphotobook, PhotoBookFactory )
 
 PhotoBookPart::PhotoBookPart(
-		TQWidget *tqparentWidget, const char *widgetName,
+		TQWidget *parentWidget, const char *widgetName,
 		TQObject *tqparent, const char *name,
 		const TQStringList&
 	)
@@ -229,7 +229,7 @@ PhotoBookPart::PhotoBookPart(
 	setInstance(PhotoBookFactory::instance());
 
 	new PhotoBookBrowserExtension(this);
-	bv = new PhotoBook(tqparentWidget, this, widgetName);
+	bv = new PhotoBook(parentWidget, this, widgetName);
 	setWidget(bv);
 
 	connect(
diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h
index 3afbefdc..2ce243a9 100644
--- a/kview/photobook/photobook.h
+++ b/kview/photobook/photobook.h
@@ -115,7 +115,7 @@ Q_OBJECT
 
 public:
 	PhotoBookPart(
-			TQWidget *tqparentWidget, const char *widgetName,
+			TQWidget *parentWidget, const char *widgetName,
 			TQObject *tqparent, const char *name=0,
 			const TQStringList& args = TQStringList()
 		);
diff --git a/kviewshell/documentRenderer.cpp b/kviewshell/documentRenderer.cpp
index 947bd10d..c02c3e09 100644
--- a/kviewshell/documentRenderer.cpp
+++ b/kviewshell/documentRenderer.cpp
@@ -17,7 +17,7 @@
 
 
 DocumentRenderer::DocumentRenderer(TQWidget* par)
-  : mutex(true), tqparentWidget(par), accessibilityBackground(false),
+  : mutex(true), parentWidget(par), accessibilityBackground(false),
     accessibilityBackgroundColor(TQColor(255,255,255))
 {
   numPages = 0;
diff --git a/kviewshell/documentRenderer.h b/kviewshell/documentRenderer.h
index 1a43f1b5..a49b1ba7 100644
--- a/kviewshell/documentRenderer.h
+++ b/kviewshell/documentRenderer.h
@@ -447,7 +447,7 @@ protected:
   This pointer can be used by implementations e.g. to display error
   messages. This pointer can well be zero.
   */
-  TQGuardedPtr<TQWidget> tqparentWidget;
+  TQGuardedPtr<TQWidget> parentWidget;
 
   /** specifies if accessibilityBackgroundColor should be used
 
diff --git a/kviewshell/empty_multipage.cpp b/kviewshell/empty_multipage.cpp
index 9ba61627..06d5d396 100644
--- a/kviewshell/empty_multipage.cpp
+++ b/kviewshell/empty_multipage.cpp
@@ -26,9 +26,9 @@
 
 K_EXPORT_COMPONENT_FACTORY(emptymultipagepart, EmptyMultiPageFactory)
 
-EmptyMultiPage::EmptyMultiPage(TQWidget* tqparentWidget, const char* widgetName, TQObject* tqparent, const char* name,
+EmptyMultiPage::EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, TQObject* tqparent, const char* name,
                                const TQStringList& args)
-  : KMultiPage(tqparentWidget, widgetName, tqparent, name), emptyRenderer(tqparentWidget)
+  : KMultiPage(parentWidget, widgetName, tqparent, name), emptyRenderer(parentWidget)
 {
   Q_UNUSED(args);
   setInstance(EmptyMultiPageFactory::instance());
diff --git a/kviewshell/empty_multipage.h b/kviewshell/empty_multipage.h
index 5722e3e9..a77badda 100644
--- a/kviewshell/empty_multipage.h
+++ b/kviewshell/empty_multipage.h
@@ -33,7 +33,7 @@ class EmptyMultiPage : public KMultiPage
   TQ_OBJECT
 
 public:
-  EmptyMultiPage(TQWidget* tqparentWidget, const char* widgetName, TQObject* tqparent, const char* name,
+  EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, TQObject* tqparent, const char* name,
                  const TQStringList& args = TQStringList());
 
   virtual TQStringList fileFormats() const { return TQString(); }
diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp
index 39655602..36be452c 100644
--- a/kviewshell/kmultipage.cpp
+++ b/kviewshell/kmultipage.cpp
@@ -34,7 +34,7 @@
 
 //#define DEBUG_KMULTIPAGE
 
-KMultiPage::KMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name)
+KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name)
   : DCOPObject("kmultipage"), KParts::ReadOnlyPart(tqparent, name)
 {
   // For reasons which I don't understand, the initialization of the
@@ -43,12 +43,12 @@ KMultiPage::KMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObjec
   // This is because of the virtual inheritance. Get rid of it (but it's BC, and this is a lib...) -- DF
   setObjId("kmultipage");
 
-  tqparentWdg = tqparentWidget;
+  parentWdg = parentWidget;
   lastCurrentPage = 0;
   timer_id = -1;
   searchInProgress = false;
   
-  TQVBox* verticalBox = new TQVBox(tqparentWidget);
+  TQVBox* verticalBox = new TQVBox(parentWidget);
   verticalBox->setFocusPolicy(TQ_StrongFocus);
   setWidget(verticalBox);
   
@@ -207,7 +207,7 @@ bool KMultiPage::closeURL()
   widgetList.setAutoDelete(false);
   
   // Update ScrollView.
-  scrollView()->tqlayoutPages();
+  scrollView()->layoutPages();
   enableActions(false);
   
   // Clear Thumbnail List.
@@ -536,7 +536,7 @@ bool KMultiPage::gotoPage(const PageNumber& page, int y, bool isLink)
           if (pageWidget != 0)
             pageWidget->setPageNumber(tableauStartPage + i);
         }
-        scrollView()->tqlayoutPages();
+        scrollView()->layoutPages();
       }
     }
     // move scrollview to "page".
@@ -575,7 +575,7 @@ bool KMultiPage::gotoPage(const PageNumber& page, int y, bool isLink)
     }
 
     pageWidget->setPageNumber(page);
-    scrollView()->tqlayoutPages();
+    scrollView()->layoutPages();
     scrollView()->moveViewportToWidget(pageWidget, y);
   } else {
     // There are multiple widgets, then we are either in the
@@ -689,7 +689,7 @@ void KMultiPage::renderModeChanged()
   pageCache->clear();
 
   generateDocumentWidgets();
-  scrollView()->tqlayoutPages();
+  scrollView()->layoutPages();
 
   for (TQ_UINT16 i=0; i < widgetList.size(); i++)
   {
@@ -732,7 +732,7 @@ void KMultiPage::repaintAllVisibleWidgets()
   // re-aligned. This will automatically update all necessary
   // widgets.
   if (everResized == true)
-    scrollView()->tqlayoutPages(true);
+    scrollView()->layoutPages(true);
 }
 
 
@@ -767,7 +767,7 @@ void KMultiPage::print()
     return;
 
   // initialize the printer using the print dialog
-  if ( printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) {    
+  if ( printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) {    
     // Now do the printing. 
     TQValueList<int> pageList = printer->pageList();
     if (pageList.isEmpty()) 
@@ -891,7 +891,7 @@ void KMultiPage::updateWidgetSize(const PageNumber& pageNumber)
       if (pageSize != documentWidget->pageSize())
       {
         documentWidget->setPageSize(pageSize);
-        scrollView()->tqlayoutPages();
+        scrollView()->layoutPages();
       }
       // We have just one widget per page.
       break;
diff --git a/kviewshell/kmultipage.h b/kviewshell/kmultipage.h
index 4a86f8e4..3414d10c 100644
--- a/kviewshell/kmultipage.h
+++ b/kviewshell/kmultipage.h
@@ -40,7 +40,7 @@ class KMultiPage : public KParts::ReadOnlyPart, virtual public kmultipageInterfa
   TQ_OBJECT
 
 public:
-  KMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name);
+  KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name);
   virtual ~KMultiPage();
 
   /* returns the scrollview used for the display */
@@ -121,7 +121,7 @@ public:
 
   // Show the printer options dialog. Return immediately if the user
   // aborts.
-  if (!printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) )) {
+  if (!printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) )) {
     delete printer;
     return;
   }
@@ -155,7 +155,7 @@ public:
 
   // Show the printer options dialog. Return immediately if the user
   // aborts.
-  if (!printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) )) {
+  if (!printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) )) {
     delete printer;
     return;
   }
@@ -569,7 +569,7 @@ protected:
 
   This pointer is automatically set by the constructor.
   */
-  TQGuardedPtr<TQWidget> tqparentWdg;
+  TQGuardedPtr<TQWidget> parentWdg;
 
   TQPtrVector<DocumentWidget> widgetList;
 
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index eb981335..1a0902f2 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -56,7 +56,7 @@
 typedef KParts::GenericFactory<KViewPart> KViewPartFactory;
 K_EXPORT_COMPONENT_FACTORY(kviewerpart, KViewPartFactory)
 
-KViewPart::KViewPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
                      const char *name, const TQStringList& args)
   : KViewPart_Iface(tqparent, name), showSidebar(0), saveAction(0), partManager(0),
     multiPageLibrary(TQString()), aboutDialog(0)
@@ -71,12 +71,12 @@ KViewPart::KViewPart(TQWidget *tqparentWidget, const char *widgetName, TQObject
   connect(watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(fileChanged(const TQString&)));
   watch->startScan();
 
-  mainWidget = new TQHBox(tqparentWidget, widgetName);
+  mainWidget = new TQHBox(parentWidget, widgetName);
   mainWidget->setFocusPolicy(TQ_StrongFocus);
   setWidget(mainWidget);
 
   // Setup part manager
-  partManager = new KParts::PartManager(tqparentWidget, "PartManager for kviewpart");
+  partManager = new KParts::PartManager(parentWidget, "PartManager for kviewpart");
   setManager(partManager);
   // Don't switch to another part when pressing a mouse button
   partManager->setActivationButtonMask(0);
@@ -113,7 +113,7 @@ KViewPart::KViewPart(TQWidget *tqparentWidget, const char *widgetName, TQObject
   // If still no MultiPage has been found, report an error and abort.
   if (offers.isEmpty())
   {
-    KMessageBox::error(tqparentWidget, i18n("<qt>No MultiPage found.</qt>"));
+    KMessageBox::error(parentWidget, i18n("<qt>No MultiPage found.</qt>"));
     //    return;
   }
 
diff --git a/kviewshell/kviewpart.h b/kviewshell/kviewpart.h
index bbd6f72c..7390faa1 100644
--- a/kviewshell/kviewpart.h
+++ b/kviewshell/kviewpart.h
@@ -34,7 +34,7 @@ class KViewPart : public KViewPart_Iface
   TQ_OBJECT
 
 public:
-  KViewPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+  KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
             const char *name, const TQStringList& args);
   virtual ~KViewPart();
 
diff --git a/kviewshell/marklist.h b/kviewshell/marklist.h
index 5e1a04f8..9f64891c 100644
--- a/kviewshell/marklist.h
+++ b/kviewshell/marklist.h
@@ -46,7 +46,7 @@ class ThumbnailWidget : public TQWidget
   TQ_OBJECT
 
 public:
-  ThumbnailWidget(MarkListWidget* tqparent_, const PageNumber& _pageNumber, DocumentPageCache*);
+  ThumbnailWidget(MarkListWidget* parent_, const PageNumber& _pageNumber, DocumentPageCache*);
 
 private:
   virtual void paintEvent(TQPaintEvent*);
diff --git a/kviewshell/optionDialogAccessibilityWidget.ui b/kviewshell/optionDialogAccessibilityWidget.ui
index aec982e2..09ff3af3 100644
--- a/kviewshell/optionDialogAccessibilityWidget.ui
+++ b/kviewshell/optionDialogAccessibilityWidget.ui
@@ -519,7 +519,7 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="5" margin="11"/>
+<layoutdefaults spacing="5" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kviewshell/optionDialogGUIWidget_base.ui b/kviewshell/optionDialogGUIWidget_base.ui
index 1d37dd34..50f8858a 100644
--- a/kviewshell/optionDialogGUIWidget_base.ui
+++ b/kviewshell/optionDialogGUIWidget_base.ui
@@ -144,5 +144,5 @@
     <tabstop>kcfg_OverviewModeRows</tabstop>
     <tabstop>kcfg_OverviewModeColumns</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kviewshell/pageSizeWidget_base.ui b/kviewshell/pageSizeWidget_base.ui
index c5ca5981..e7ddbde3 100644
--- a/kviewshell/pageSizeWidget_base.ui
+++ b/kviewshell/pageSizeWidget_base.ui
@@ -250,7 +250,7 @@
     <tabstop>widthUnits</tabstop>
     <tabstop>heightInput</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp
index 81e3ed9b..060f2d15 100644
--- a/kviewshell/pageView.cpp
+++ b/kviewshell/pageView.cpp
@@ -66,7 +66,7 @@ void PageView::addChild( TQPtrVector<DocumentWidget> *wdgList )
   }
 
   widgetList = wdgList;
-  tqlayoutPages();
+  layoutPages();
 }
 
 
@@ -237,7 +237,7 @@ void PageView::viewportResizeEvent( TQResizeEvent* e )
   if (!widgetList)
     return;
 
-  tqlayoutPages();
+  layoutPages();
 
   emit viewSizeChanged( viewport()->size() );
 }
@@ -295,7 +295,7 @@ void PageView::setFullScreenMode(bool fullScreen)
   }
 }
 
-void PageView::tqlayoutPages(bool zoomChanged)
+void PageView::layoutPages(bool zoomChanged)
 {
   // Paranoid safety check
   if (widgetList == 0)
diff --git a/kviewshell/pageView.h b/kviewshell/pageView.h
index a7d2ad15..06995e45 100644
--- a/kviewshell/pageView.h
+++ b/kviewshell/pageView.h
@@ -108,7 +108,7 @@ public slots:
 
     /** Set tqlayout of the page widgets according to the current viewmode and zoomlevel.
         Set zoomChanged = true if the the tqlayout needs updateing because the zoomlevel has changed. */
-    void tqlayoutPages(bool zoomChanged = false);
+    void layoutPages(bool zoomChanged = false);
 
     void slotEnableMoveTool(bool enable);
 
diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index dbe68aaa..90ec1969 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -47,9 +47,9 @@ typedef KParts::GenericFactory<DjVuMultiPage> DjVuMultiPageFactory;
 K_EXPORT_COMPONENT_FACTORY(djvuviewpart, DjVuMultiPageFactory)
 
 
-DjVuMultiPage::DjVuMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
                              const char *name, const TQStringList&)
-  : KMultiPage(tqparentWidget, widgetName, tqparent, name), djvuRenderer(tqparentWidget)
+  : KMultiPage(parentWidget, widgetName, tqparent, name), djvuRenderer(parentWidget)
 {
   /* This is kparts wizardry that cannot be understood by man. Simply
      change the names to match your implementation.  */
@@ -162,7 +162,7 @@ void DjVuMultiPage::slotDeletePages()
   if (numberOfPages() == 0)
     return;
   
-  KDialogBase dialog( tqparentWdg, "urldialog", true, i18n("Delete Pages"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
+  KDialogBase dialog( parentWdg, "urldialog", true, i18n("Delete Pages"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
   PageRangeWidget range( 1, numberOfPages(), currentPageNumber(), &dialog, "range widget" );
   TQToolTip::add( &range, i18n( "Select the pages you wish to delete." ) );
   dialog.setButtonOK(i18n("Delete Pages"));
@@ -220,7 +220,7 @@ void DjVuMultiPage::print()
   printer->addDialogPage( conversionOptions );
   
   // initialize the printer using the print dialog
-  if ( printer->setup(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) {    
+  if ( printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1))) ) {    
     // Now do the printing. 
     TQValueList<int> pageList = printer->pageList();
     if (pageList.isEmpty()) 
@@ -334,7 +334,7 @@ void DjVuMultiPage::slotSave()
     fileName = fileName+ending;
 
   if (TQFile(fileName).exists()) {
-    int r = KMessageBox::warningContinueCancel(tqparentWdg, i18n("The file %1\nalready exists. Do you want to overwrite it?").tqarg(fileName),
+    int r = KMessageBox::warningContinueCancel(parentWdg, i18n("The file %1\nalready exists. Do you want to overwrite it?").tqarg(fileName),
 					       i18n("Overwrite File"), i18n("Overwrite"));
     if (r == KMessageBox::Cancel)
       return;
@@ -344,7 +344,7 @@ void DjVuMultiPage::slotSave()
 
   /*
   if (!djvuRenderer.save(fileName) == false)
-    KMessageBox::error( tqparentWdg,
+    KMessageBox::error( parentWdg,
 			i18n("<qt><strong>File error.</strong> Unable to write to the specified file '%1'. The document is <strong>not</strong> saved.</qt>").tqarg(fileName),
 			i18n("File Error"));
   */
diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h
index 83e94e40..eaad8a53 100644
--- a/kviewshell/plugins/djvu/djvumultipage.h
+++ b/kviewshell/plugins/djvu/djvumultipage.h
@@ -96,7 +96,7 @@ public:
   kmultipage. Please have a look at the constructor's source code to
   see how to adjust this for your implementation.
   */
-  DjVuMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
+  DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
 		   const char *name, const TQStringList& args = TQStringList());
   
   /** Destructor
diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp
index e1cbd044..8084e327 100644
--- a/kviewshell/plugins/djvu/djvurenderer.cpp
+++ b/kviewshell/plugins/djvu/djvurenderer.cpp
@@ -270,7 +270,7 @@ bool DjVuRenderer::setFile(const TQString &fname, const KURL &)
   TQFileInfo fi(fname);
   TQString   filename = fi.absFilePath();
   if (!fi.exists() || fi.isDir()) {
-    KMessageBox::error( tqparentWidget,
+    KMessageBox::error( parentWidget,
 			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
 			i18n("File Error"));
     // the return value 'false' indicates that this operation was not successful.
@@ -292,7 +292,7 @@ bool DjVuRenderer::setFile(const TQString &fname, const KURL &)
   // If the above assumption was false.
   if (!document)
   {
-    KMessageBox::error( tqparentWidget,
+    KMessageBox::error( parentWidget,
       i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
       i18n("File Error"));
 
@@ -577,7 +577,7 @@ bool DjVuRenderer::convertToPSFile( DjVuToPS &converter, TQString filename, TQVa
   TQMutexLocker locker( &mutex );
   
   // Set up progress dialog
-  KProgressDialog *pdialog = new KProgressDialog(tqparentWidget, "Printing-ProgressDialog", i18n("Printing..."), i18n("Preparing pages for printing..."), true);
+  KProgressDialog *pdialog = new KProgressDialog(parentWidget, "Printing-ProgressDialog", i18n("Printing..."), i18n("Preparing pages for printing..."), true);
   pdialog->setButtonText(i18n("Abort"));
   pdialog->showCancelButton(true);
   pdialog->progressBar()->setTotalSteps(pageList.size());
@@ -634,7 +634,7 @@ void DjVuRenderer::deletePages(TQ_UINT16 from, TQ_UINT16 to)
 
   KProgressDialog *pdialog = 0;
   if (to-from > 9) {
-    pdialog = new KProgressDialog(tqparentWidget, "Printing-ProgressDialog", i18n("Deleting pages..."), i18n("Please wait while pages are removed..."), true);
+    pdialog = new KProgressDialog(parentWidget, "Printing-ProgressDialog", i18n("Deleting pages..."), i18n("Please wait while pages are removed..."), true);
     pdialog->showCancelButton(false);
     pdialog->progressBar()->setTotalSteps(to-from+1);
     pdialog->progressBar()->setFormat(TQString());
diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui
index 416b7b36..bfaf546c 100644
--- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui
+++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions_basewidget.ui
@@ -141,5 +141,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 </UI>
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
index fa6ad375..8bbc6db6 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp
@@ -433,15 +433,15 @@ DjVuDocEditor::strip_incl_chunks(const GP<DataPool> & pool_in)
 }
 
 GUTF8String
-DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &tqparent_id,
+DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &parent_id,
                            int chunk_num, DjVuPort *source)
       // Will open the 'file_name' and insert it into an existing DjVuFile
-      // with ID 'tqparent_id'. Will insert the INCL chunk at position chunk_num
+      // with ID 'parent_id'. Will insert the INCL chunk at position chunk_num
       // Will NOT process ANY files included into the file being inserted.
       // Moreover it will strip out any INCL chunks in that file...
 {
    DEBUG_MSG("DjVuDocEditor::insert_file(): fname='" << file_url <<
-             "', tqparent_id='" << tqparent_id << "'\n");
+             "', parent_id='" << parent_id << "'\n");
    DEBUG_MAKE_INDENT(3);
    const GP<DjVmDir> dir(get_djvm_dir());
 
@@ -469,16 +469,16 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &tqparent_id,
    file_pool=strip_incl_chunks(file_pool);
 
       // Check if tqparent ID is valid
-   GP<DjVmDir::File> tqparent_frec(dir->id_to_file(tqparent_id));
-   if (!tqparent_frec)
-     tqparent_frec=dir->name_to_file(tqparent_id);
-   if (!tqparent_frec)
-     tqparent_frec=dir->title_to_file(tqparent_id);
-   if (!tqparent_frec)
-     G_THROW( ERR_MSG("DjVuDocEditor.no_file") "\t" +tqparent_id);
-   const GP<DjVuFile> tqparent_file(get_djvu_file(tqparent_id));
-   if (!tqparent_file)
-     G_THROW( ERR_MSG("DjVuDocEditor.create_fail") "\t"+tqparent_id);
+   GP<DjVmDir::File> parent_frec(dir->id_to_file(parent_id));
+   if (!parent_frec)
+     parent_frec=dir->name_to_file(parent_id);
+   if (!parent_frec)
+     parent_frec=dir->title_to_file(parent_id);
+   if (!parent_frec)
+     G_THROW( ERR_MSG("DjVuDocEditor.no_file") "\t" +parent_id);
+   const GP<DjVuFile> parent_file(get_djvu_file(parent_id));
+   if (!parent_file)
+     G_THROW( ERR_MSG("DjVuDocEditor.create_fail") "\t"+parent_id);
 
       // Now obtain ID for the new file
    const GUTF8String id(find_unique_id(file_url.fname()));
@@ -486,7 +486,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &tqparent_id,
       // Add it into the directory
    const GP<DjVmDir::File> frec(
      DjVmDir::File::create(id, id, id, DjVmDir::File::INCLUDE));
-   int pos=dir->get_file_pos(tqparent_frec);
+   int pos=dir->get_file_pos(parent_frec);
    if (pos>=0)
      ++pos;
    dir->insert_file(frec, pos);
@@ -500,7 +500,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &tqparent_id,
    }
 
       // And insert it into the tqparent DjVuFile
-   tqparent_file->insert_file(id, chunk_num);
+   parent_file->insert_file(id, chunk_num);
 
    return id;
 }
@@ -930,7 +930,7 @@ DjVuDocEditor::generate_ref_map(const GP<DjVuFile> & file,
 				GMap<GUTF8String, void *> & ref_map,
 				GMap<GURL, void *> & visit_map)
       // This private function is used to generate a list (implemented as map)
-      // of files referencing the given file. To get list of all tqparents
+      // of files referencing the given file. To get list of all parents
       // for file with ID 'id' iterate map obtained as
       // *((GMap<GUTF8String, void *> *) ref_map[id])
 {
@@ -944,17 +944,17 @@ DjVuDocEditor::generate_ref_map(const GP<DjVuFile> & file,
       for(GPosition pos=files_list;pos;++pos)
       {
          GP<DjVuFile> child_file=files_list[pos];
-            // First: add the current file to the list of tqparents for
+            // First: add the current file to the list of parents for
             // the child being processed
          GURL child_url=child_file->get_url();
          const GUTF8String child_id(
            djvm_dir->name_to_file(child_url.fname())->get_load_name());
-         GMap<GUTF8String, void *> * tqparents=0;
+         GMap<GUTF8String, void *> * parents=0;
          if (ref_map.tqcontains(child_id))
-            tqparents=(GMap<GUTF8String, void *> *) ref_map[child_id];
+            parents=(GMap<GUTF8String, void *> *) ref_map[child_id];
          else
-            ref_map[child_id]=tqparents=new GMap<GUTF8String, void *>();
-         (*tqparents)[id]=0;
+            ref_map[child_id]=parents=new GMap<GUTF8String, void *>();
+         (*parents)[id]=0;
             // Second: go recursively
          generate_ref_map(child_file, ref_map, visit_map);
       }
@@ -972,22 +972,22 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref,
       // Finally, if remove_unref is TRUE, we will go down the files
       // hierarchy removing every file, which becomes unreferenced.
       //
-      // ref_map will be used to find out list of tqparents referencing
+      // ref_map will be used to find out list of parents referencing
       // this file (required when removing INCL chunks)
 {
-      // First get rid of INCL chunks in tqparents
-   GMap<GUTF8String, void *> * tqparents=(GMap<GUTF8String, void *> *) ref_map[id];
-   if (tqparents)
+      // First get rid of INCL chunks in parents
+   GMap<GUTF8String, void *> * parents=(GMap<GUTF8String, void *> *) ref_map[id];
+   if (parents)
    {
-      for(GPosition pos=*tqparents;pos;++pos)
+      for(GPosition pos=*parents;pos;++pos)
       {
-         const GUTF8String tqparent_id((*tqparents).key(pos));
-         const GP<DjVuFile> tqparent(get_djvu_file(tqparent_id));
+         const GUTF8String parent_id((*parents).key(pos));
+         const GP<DjVuFile> tqparent(get_djvu_file(parent_id));
          if (tqparent)
            tqparent->unlink_file(id);
       }
-      delete tqparents;
-      tqparents=0;
+      delete parents;
+      parents=0;
       ref_map.del(id);
    }
 
@@ -1006,10 +1006,10 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref,
             GURL child_url=child_file->get_url();
             const GUTF8String child_id(
               djvm_dir->name_to_file(child_url.fname())->get_load_name());
-            GMap<GUTF8String, void *> * tqparents=(GMap<GUTF8String, void *> *) ref_map[child_id];
-            if (tqparents) tqparents->del(id);
+            GMap<GUTF8String, void *> * parents=(GMap<GUTF8String, void *> *) ref_map[child_id];
+            if (parents) parents->del(id);
 
-            if (remove_unref && (!tqparents || !tqparents->size()))
+            if (remove_unref && (!parents || !parents->size()))
                remove_file(child_id, remove_unref, ref_map);
          }
       } G_CATCH(exc) {
@@ -1041,7 +1041,7 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref)
    if (!djvm_dir->id_to_file(id))
       G_THROW( ERR_MSG("DjVuDocEditor.no_file") "\t"+id);
 
-      // First generate a map of references (containing the list of tqparents
+      // First generate a map of references (containing the list of parents
       // including this particular file. This will speed things up
       // significatly.
    GMap<GUTF8String, void *> ref_map;        // GMap<GUTF8String, GMap<GUTF8String, void *> *> in fact
@@ -1058,8 +1058,8 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref)
    GPosition pos;
    while((pos=ref_map))
    {
-      GMap<GUTF8String, void *> * tqparents=(GMap<GUTF8String, void *> *) ref_map[pos];
-      delete tqparents;
+      GMap<GUTF8String, void *> * parents=(GMap<GUTF8String, void *> *) ref_map[pos];
+      delete parents;
       ref_map.del(pos);
    }
 }
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h
index 96b18a06..7bf6124a 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.h
@@ -199,7 +199,7 @@ public:
 	  an exception is thrown. */
    GUTF8String	page_to_id(int page_num) const;
    
-   GUTF8String	insert_file(const GURL &url, const GUTF8String &tqparent_id,
+   GUTF8String	insert_file(const GURL &url, const GUTF8String &parent_id,
 			    int chunk_num=1, DjVuPort *source=0);
       /** Inserts the referenced file into this DjVu document.
 
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
index 0ba922b3..ed998923 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp
@@ -1328,7 +1328,7 @@ DjVuDocument::get_thumbnail(int page_num, bool dont_decode)
       }
    }
 
-      // Aptqparently we're out of luck and need to decode the requested
+      // Apparently we're out of luck and need to decode the requested
       // page (unless it's already done and if it's allowed) and render
       // it into the thumbnail. If dont_decode is true, do not attempt
       // to create this file (because this will result in a request for data)
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
index acba10f2..e6e1c2ce 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.cpp
@@ -91,7 +91,7 @@ namespace DJVU {
 //// DJVUIMAGE: CONSTRUCTION
 
 DjVuImage::DjVuImage(void) 
-: rotate_count(-1),retqlayout_sent(false)
+: rotate_count(-1),relayout_sent(false)
 {
 }
 
@@ -423,13 +423,13 @@ DjVuImage::get_long_description() const
 void
 DjVuImage::notify_chunk_done(const DjVuPort *, const GUTF8String & name)
 {
-   if (!retqlayout_sent &&
+   if (!relayout_sent &&
      ( !name.cmp("INFO", 4) ||
        !name.cmp("PMxx", 2) ||
        !name.cmp("BMxx", 2)  ) )
    {
       DjVuPort::get_portcaster()->notify_retqlayout(this);
-      retqlayout_sent=true;
+      relayout_sent=true;
    } 
    else if (!name.cmp("Sxxx", 1) ||
             !name.cmp("BGxx", 2) ||
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
index 7f2e836a..30fc9898 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h
@@ -414,7 +414,7 @@ public:
 private:
   GP<DjVuFile>		file;
   int			rotate_count;
-  bool			retqlayout_sent;
+  bool			relayout_sent;
   
   // HELPERS
   int stencil(GPixmap *pm, const GRect &rect, int subs, double gcorr) const;
diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
index a898d4dd..9da00dfe 100644
--- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp
@@ -325,24 +325,24 @@ GIFFChunk::get_chunks_number(const GUTF8String &name)
 //************************************************************************
 
 void
-GIFFManager::add_chunk(GUTF8String tqparent_name, const GP<GIFFChunk> & chunk,
+GIFFManager::add_chunk(GUTF8String parent_name, const GP<GIFFChunk> & chunk,
 		       int pos)
-      // tqparent_name is the fully qualified name of the PARENT
+      // parent_name is the fully qualified name of the PARENT
       //             IT MAY BE EMPTY
       // All the required chunks will be created
       // pos=-1 means to append the chunk
 {
-  DEBUG_MSG("GIFFManager::add_chunk(): Adding chunk to name='" << tqparent_name << "'\n");
+  DEBUG_MSG("GIFFManager::add_chunk(): Adding chunk to name='" << parent_name << "'\n");
   DEBUG_MAKE_INDENT(3);
    
   if (!top_level->get_name().length())
   {
-    if ((!tqparent_name.length())||(tqparent_name[0]!='.'))
+    if ((!parent_name.length())||(parent_name[0]!='.'))
       G_THROW( ERR_MSG("GIFFManager.no_top_name") );
-    if (tqparent_name.length() < 2)
+    if (parent_name.length() < 2)
     {
       // 'chunk' is actually the new top-level chunk
-      DEBUG_MSG("since tqparent_name=='.', making the chunk top-level\n");
+      DEBUG_MSG("since parent_name=='.', making the chunk top-level\n");
       if (!chunk->is_container())
         G_THROW( ERR_MSG("GIFFManager.no_top_cont") );
       top_level=chunk;
@@ -350,33 +350,33 @@ GIFFManager::add_chunk(GUTF8String tqparent_name, const GP<GIFFChunk> & chunk,
     }
 
     DEBUG_MSG("Setting the name of the top-level chunk\n");
-    const int next_dot=tqparent_name.search('.',1);
+    const int next_dot=parent_name.search('.',1);
     if(next_dot>=0)
     {
-      top_level->set_name(tqparent_name.substr(1,next_dot-1));
+      top_level->set_name(parent_name.substr(1,next_dot-1));
     }else
     {
-      top_level->set_name(tqparent_name.substr(1,(unsigned int)-1));
+      top_level->set_name(parent_name.substr(1,(unsigned int)-1));
     }
   }
 
   DEBUG_MSG("top level chunk name='" << top_level->get_name() << "'\n");
    
-  if (tqparent_name.length() && tqparent_name[0] == '.')
+  if (parent_name.length() && parent_name[0] == '.')
   {
-    int next_dot=tqparent_name.search('.',1);
+    int next_dot=parent_name.search('.',1);
     if(next_dot<0)
     {
-      next_dot=tqparent_name.length();
+      next_dot=parent_name.length();
     }
-    GUTF8String top_name=tqparent_name.substr(1,next_dot-1);
+    GUTF8String top_name=parent_name.substr(1,next_dot-1);
     if (!top_level->check_name(top_name))
       G_THROW( ERR_MSG("GIFFManager.wrong_name") "\t"+top_name);
-    tqparent_name=tqparent_name.substr(next_dot,(unsigned int)-1);
+    parent_name=parent_name.substr(next_dot,(unsigned int)-1);
   }
 
   GP<GIFFChunk> cur_sec=top_level;
-  const char * start, * end=(const char *)tqparent_name-1;
+  const char * start, * end=(const char *)parent_name-1;
   do
   {
     for(start=++end;*end&&(*end!='.');end++)
diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h
index 96f13f8f..716f66f9 100644
--- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h
+++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h
@@ -265,8 +265,8 @@ public:
 
       /// Sets the name of the top level chunk to {\em name}
    void		set_name(const GUTF8String &name);
-      /** Adds the chunk {\em chunk} to chunk with name {\em tqparent_name} at
-	  position {\em pos}. {\em tqparent_name} may contain dots, brackets
+      /** Adds the chunk {\em chunk} to chunk with name {\em parent_name} at
+	  position {\em pos}. {\em parent_name} may contain dots, brackets
 	  and colons. All missing chunks in the chain will be created.
 
 	  {\bf Examples:}
@@ -282,7 +282,7 @@ public:
 	     ;; Same thing regardless of the top-level chunk name
 	     m.addChunk("FORM:DJVU[1]", ch);
 	  \end{verbatim} */
-   void		add_chunk(GUTF8String tqparent_name, const GP<GIFFChunk> & chunk, int pos=-1);
+   void		add_chunk(GUTF8String parent_name, const GP<GIFFChunk> & chunk, int pos=-1);
       /** If {\em name}={\em name1}.{\em name2} where {\em name2} doesn't
 	  contain dots, then #addChunk()# will create plain chunk with
 	  name {\em name2} with data {\em buffer} of size {\em length} and
diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
index 3b52faca..fa924324 100644
--- a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp
@@ -1397,7 +1397,7 @@ cotask_select(int nfds,
     }
   // reschedule
   cotask_yield();
-  // call select to update tqmasks
+  // call select to update masks
   if (tm)
     {
       tm->tv_sec = maxwait/1000;
diff --git a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp
index eb429563..2a4d4035 100644
--- a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp
@@ -161,7 +161,7 @@ public:
   /** Initializes an IWBitmap with image #bm#.  This constructor
       performs the wavelet decomposition of image #bm# and records the
       corresponding wavelet coefficient.  Argument #tqmask# is an optional
-      bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}). */
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). */
   void init(const GBitmap &bm, const GP<GBitmap> tqmask=0);
   // CODER
   /** Encodes one data chunk into ByteStream #bs#.  Parameter #parms# controls
@@ -212,7 +212,7 @@ public:
   /** Initializes an IWPixmap with color image #bm#.  This constructor
       performs the wavelet decomposition of image #bm# and records the
       corresponding wavelet coefficient.  Argument #tqmask# is an optional
-      bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}).
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}).
       Argument #crcbmode# specifies how the chrominance information should be
       encoded (see \Ref{CRCBMode}). */
   void init(const GPixmap &bm, const GP<GBitmap> tqmask=0, CRCBMode crcbmode=CRCBnormal);
@@ -724,7 +724,7 @@ interpolate_tqmask(short *data16, int w, int h, int rowsize,
                  const signed char *tqmask8, int mskrowsize)
 {
   int i,j;
-  // count tqmasked bits
+  // count masked bits
   short *count;
   GPBuffer<short> gcount(count,w*h);
   short *cp = count;
@@ -851,7 +851,7 @@ forward_tqmask(short *data16, int w, int h, int rowsize, int begin, int end,
         }
       // Decompose
       IW44Image::Transform::Encode::forward(sdata, w, h, w, scale, scale+scale);
-      // Cancel tqmasked coefficients
+      // Cancel masked coefficients
       d = sdata;
       m = stqmask;
       for (i=0; i<h; i+=scale+scale)
@@ -947,7 +947,7 @@ IW44Image::Map::Encode::create(const signed char *img8, int imgrowsize,
       // Interpolate pixels below tqmask
       DJVU_PROGRESS_RUN(transf, 1);
       interpolate_tqmask(data16, iw, ih, bw, msk8, mskrowsize);
-      // Multiscale iterative tqmasked decomposition
+      // Multiscale iterative masked decomposition
       DJVU_PROGRESS_RUN(transf, 3);
       forward_tqmask(data16, iw, ih, bw, 1, 32, msk8, mskrowsize);
     }
diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.h b/kviewshell/plugins/djvu/libdjvu/IW44Image.h
index 954eee56..0363a1fb 100644
--- a/kviewshell/plugins/djvu/libdjvu/IW44Image.h
+++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.h
@@ -140,7 +140,7 @@
     routine can use an optional bilevel image named the tqmask.  Every non zero
     pixel in the tqmask means the value of the corresponding pixel in the
     background image is irrelevant.  The wavelet decomposition code will
-    replace these tqmasked pixels by a color value whose coding cost is minimal
+    replace these masked pixels by a color value whose coding cost is minimal
     (see \URL{http://www.research.att.com/~leonb/DJVU/tqmask}).
 
     {\bf ToDo} --- There are many improvements to be made.  Besides better
@@ -278,12 +278,12 @@ public:
   /** Initializes an IWBitmap with image #bm#.  This constructor
       performs the wavelet decomposition of image #bm# and records the
       corresponding wavelet coefficient.  Argument #tqmask# is an optional
-      bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}). */
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). */
   static GP<IW44Image> create_encode(const GBitmap &bm, const GP<GBitmap> tqmask=0);
   /** Initializes an IWPixmap with color image #bm#.  This constructor
       performs the wavelet decomposition of image #bm# and records the
       corresponding wavelet coefficient.  Argument #tqmask# is an optional
-      bilevel image specifying the tqmasked pixels (see \Ref{IW44Image.h}).
+      bilevel image specifying the masked pixels (see \Ref{IW44Image.h}).
       Argument #crcbmode# specifies how the chrominance information should be
       encoded (see \Ref{CRCBMode}). */
   static GP<IW44Image> create_encode(const GPixmap &bm, const GP<GBitmap> tqmask=0, CRCBMode crcbmode=CRCBnormal);
diff --git a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
index 57dd5200..3ff9d7df 100644
--- a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp
@@ -467,7 +467,7 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim)
           // Avoid coding null tqshapes/blits
           else if (jshp.bits) 
             {
-              // Make sure all tqparents have been coded
+              // Make sure all parents have been coded
               if (jshp.tqparent>=0 && tqshape2lib[jshp.tqparent]<0)
                 encode_libonly_tqshape(gjim, jshp.tqparent);
               // Allocate library entry when needed
diff --git a/kviewshell/plugins/djvu/pageRangeWidget_base.ui b/kviewshell/plugins/djvu/pageRangeWidget_base.ui
index 90f85b5a..943f0201 100644
--- a/kviewshell/plugins/djvu/pageRangeWidget_base.ui
+++ b/kviewshell/plugins/djvu/pageRangeWidget_base.ui
@@ -65,7 +65,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/libkscan/COPYING.LIB b/libkscan/COPYING.LIB
index e8dcd1e0..5f4b0039 100644
--- a/libkscan/COPYING.LIB
+++ b/libkscan/COPYING.LIB
@@ -250,7 +250,7 @@ linked without the Library, or if the work is itself a library.  The
 threshold for this to be true is not precisely defined by law.
 
   If such an object file uses only numerical parameters, data
-structure tqlayouts and accessors, and small macros and small inline
+structure layouts and accessors, and small macros and small inline
 functions (ten lines or less in length), then the use of the object
 file is unrestricted, regardless of whether it is legally a derivative
 work.  (Executables containing this object code plus portions of the