rename the following methods:

tqparent parent
tqmask mask


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

22 files changed, 77 insertions, 77 deletions

diff --git a/kdvi/TeXFont.h b/kdvi/TeXFont.h
index 518c0d0f..39fedb76 100644
--- a/kdvi/TeXFont.h
+++ b/kdvi/TeXFont.h
@@ -17,7 +17,7 @@ class TeXFont {
  public:
   TeXFont(TeXFontDefinition *_parent)
     {
-      tqparent       = _parent;
+      parent       = _parent;
       errorMessage = TQString();
     };
   
@@ -42,7 +42,7 @@ class TeXFont {
    
  protected:
   glyph              glyphtable[TeXFontDefinition::max_num_of_chars_in_font];
-  TeXFontDefinition *tqparent;
+  TeXFontDefinition *parent;
 };
 
 #endif
diff --git a/kdvi/TeXFont_PFB.cpp b/kdvi/TeXFont_PFB.cpp
index a017259d..45c76512 100644
--- a/kdvi/TeXFont_PFB.cpp
+++ b/kdvi/TeXFont_PFB.cpp
@@ -26,28 +26,28 @@
 //#define DEBUG_PFB 1
 
 
-TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *tqparent, fontEncoding *enc, double slant)
-  : TeXFont(tqparent)
+TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double slant)
+  : TeXFont(parent)
 {
 #ifdef DEBUG_PFB
   if (enc != 0)
-    kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( tqparent=" << tqparent << ", encoding=" << enc->encodingFullName << " )" << endl;
+    kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( parent=" << parent << ", encoding=" << enc->encodingFullName << " )" << endl;
   else
-    kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( tqparent=" << tqparent << ", encoding=0 )" << endl;
+    kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( parent=" << parent << ", encoding=0 )" << endl;
 #endif
 
   fatalErrorInFontLoading = false;
 
-  int error = FT_New_Face( tqparent->font_pool->FreeType_library, tqparent->filename.local8Bit(), 0, &face );
+  int error = FT_New_Face( parent->font_pool->FreeType_library, parent->filename.local8Bit(), 0, &face );
   
   if ( error == FT_Err_Unknown_File_Format ) {
-    errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").tqarg(tqparent->filename);
+    errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").tqarg(parent->filename);
     kdError(4300) << errorMessage << endl;
     fatalErrorInFontLoading = true;
     return;
   } else 
     if ( error ) {
-      errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").tqarg(tqparent->filename);
+      errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").tqarg(parent->filename);
       kdError(4300) << errorMessage << endl;
       fatalErrorInFontLoading = true;
       return;
@@ -66,7 +66,7 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *tqparent, fontEncoding *enc, double
   }
   
   if (face->family_name != 0)
-    tqparent->fullFontName = face->family_name;
+    parent->fullFontName = face->family_name;
 
   // Finally, we need to set up the charMap array, which maps TeX
   // character codes to glyph indices in the font. (Remark: the
@@ -74,8 +74,8 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *tqparent, fontEncoding *enc, double
   // TeX is only able to address character codes 0-255 while
   // e.g. Type1 fonts may contain several thousands of characters)
   if (enc != 0) {
-    tqparent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "Encoding" ));
-    tqparent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" ));
+    parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "Encoding" ));
+    parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" ));
 
     // An encoding vector is given for this font, i.e. an array of
     // character names (such as: 'parenleft' or 'dotlessj'). We use
@@ -159,16 +159,16 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
   
   if ((generateCharacterPixmap == true) && ((g->shrunkenCharacter.isNull()) || (color != g->color)) ) {
     int error;
-    unsigned int res =  (unsigned int)(tqparent->displayResolution_in_dpi/tqparent->enlargement +0.5);
+    unsigned int res =  (unsigned int)(parent->displayResolution_in_dpi/parent->enlargement +0.5);
     g->color = color;
 
     // Character height in 1/64th of points (reminder: 1 pt = 1/72 inch)
     // Only approximate, may vary from file to file!!!! @@@@@
 
-    long int characterSize_in_printers_points_by_64 = (long int)((64.0*72.0*tqparent->scaled_size_in_DVI_units*tqparent->font_pool->getCMperDVIunit())/2.54 + 0.5 ); 
+    long int characterSize_in_printers_points_by_64 = (long int)((64.0*72.0*parent->scaled_size_in_DVI_units*parent->font_pool->getCMperDVIunit())/2.54 + 0.5 ); 
     error = FT_Set_Char_Size(face, 0, characterSize_in_printers_points_by_64, res, res );
     if (error) {
-      TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").tqarg(tqparent->filename);
+      TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").tqarg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;
@@ -178,13 +178,13 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
     }
     
     // load glyph image into the slot and erase the previous one
-    if (tqparent->font_pool->getUseFontHints() == true)
+    if (parent->font_pool->getUseFontHints() == true)
       error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_DEFAULT ); 
     else
       error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_HINTING );
 
     if (error) {
-      TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").tqarg(ch).tqarg(tqparent->filename);
+      TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;
@@ -196,7 +196,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
     // convert to an anti-aliased bitmap
     error = FT_Render_Glyph( face->glyph, ft_render_mode_normal );
     if (error) {
-      TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").tqarg(ch).tqarg(tqparent->filename);
+      TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;
@@ -210,7 +210,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
     if ((slot->bitmap.width == 0) || (slot->bitmap.rows == 0)) {
       if (errorMessage.isEmpty())
 	errorMessage = i18n("Glyph #%1 is empty.").tqarg(ch);
-      kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").tqarg(ch).tqarg(tqparent->filename) << endl;
+      kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").tqarg(ch).tqarg(parent->filename) << endl;
       g->shrunkenCharacter.resize( 15, 15 );
       g->shrunkenCharacter.fill(TQColor(255, 0, 0));
       g->x2 = 0;
@@ -221,7 +221,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
 
       // Do TQPixmaps fully support the alpha channel? If yes, we use
       // that. Otherwise, use other routines as a fallback
-      if (tqparent->font_pool->TQPixmapSupportsAlpha) {
+      if (parent->font_pool->TQPixmapSupportsAlpha) {
 	// If the alpha channel is properly supported, we set the
 	// character glyph to a colored rectangle, and define the
 	// character outline only using the alpha channel. That
@@ -239,7 +239,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
 	}
       } else {
 	// If the alpha channel is not supported... QT seems to turn
-	// the alpha channel into a crude bitmap which is used to tqmask
+	// the alpha channel into a crude bitmap which is used to mask
 	// the resulting TQPixmap. In this case, we define the
 	// character outline using the image data, and use the alpha
 	// channel only to store "maximally opaque" or "completely
@@ -279,7 +279,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
   if (g->dvi_advance_in_units_of_design_size_by_2e20 == 0) {
     int error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_SCALE);
     if (error) {
-      TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").tqarg(ch).tqarg(tqparent->filename);
+      TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;
diff --git a/kdvi/TeXFont_PFB.h b/kdvi/TeXFont_PFB.h
index 45d94be4..ed80d72b 100644
--- a/kdvi/TeXFont_PFB.h
+++ b/kdvi/TeXFont_PFB.h
@@ -23,7 +23,7 @@ class glyph;
 
 class TeXFont_PFB : public TeXFont {
  public:
-  TeXFont_PFB(TeXFontDefinition *tqparent, fontEncoding *enc=0, double slant=0.0 );
+  TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc=0, double slant=0.0 );
   ~TeXFont_PFB();
   
   glyph* getGlyph(TQ_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=TQt::black);
diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp
index 496e8ff9..f678df9b 100644
--- a/kdvi/TeXFont_PK.cpp
+++ b/kdvi/TeXFont_PK.cpp
@@ -80,18 +80,18 @@ extern void oops(TQString message);
 
 
 
-TeXFont_PK::TeXFont_PK(TeXFontDefinition *tqparent)
-  : TeXFont(tqparent)
+TeXFont_PK::TeXFont_PK(TeXFontDefinition *parent)
+  : TeXFont(parent)
 {
 #ifdef DEBUG_PK
-  kdDebug(4300) << "TeXFont_PK::TeXFont_PK( tqparent=" << tqparent << ")" << endl;
+  kdDebug(4300) << "TeXFont_PK::TeXFont_PK( parent=" << parent << ")" << endl;
 #endif
 
   for(unsigned int i=0; i<TeXFontDefinition::max_num_of_chars_in_font; i++)
     characterBitmaps[i] = 0;
-  file = fopen(TQFile::encodeName(tqparent->filename), "r");
+  file = fopen(TQFile::encodeName(parent->filename), "r");
   if (file == 0) 
-    kdError(4300) << i18n("Cannot open font file %1.").tqarg(tqparent->filename) << endl;
+    kdError(4300) << i18n("Cannot open font file %1.").tqarg(parent->filename) << endl;
 #ifdef DEBUG_PK
   else
     kdDebug(4300) << "TeXFont_PK::TeXFont_PK(): file opened successfully" << endl;
@@ -136,7 +136,7 @@ glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQ
     // If the character is not defined in the PK file, mark the
     // character as missing, and print an error message
     if (g->addr == 0) {
-      kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").tqarg(ch).tqarg(tqparent->filename) << endl;
+      kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").tqarg(ch).tqarg(parent->filename) << endl;
       g->addr = -1;
       return g;
     }
@@ -163,7 +163,7 @@ glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQ
       ((g->shrunkenCharacter.isNull()) || (color != g->color)) &&
       (characterBitmaps[ch]->w != 0)) {
     g->color = color;
-    double shrinkFactor = 1200 / tqparent->displayResolution_in_dpi;
+    double shrinkFactor = 1200 / parent->displayResolution_in_dpi;
     
     // All is fine? Then we rescale the bitmap in order to produce the
     // required pixmap.  Rescaling a character, however, is an art
@@ -270,7 +270,7 @@ glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQ
     im32.setAlphaBuffer(true);
     // Do TQPixmaps fully support the alpha channel? If yes, we use
     // that. Otherwise, use other routines as a fallback
-    if (tqparent->font_pool->TQPixmapSupportsAlpha) {
+    if (parent->font_pool->TQPixmapSupportsAlpha) {
       // If the alpha channel is properly supported, we set the
       // character glyph to a colored rectangle, and define the
       // character outline only using the alpha channel. That ensures
@@ -283,7 +283,7 @@ glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQ
       }
     } else {
       // If the alpha channel is not supported... QT seems to turn the
-      // alpha channel into a crude bitmap which is used to tqmask the
+      // alpha channel into a crude bitmap which is used to mask the
       // resulting TQPixmap. In this case, we define the character
       // outline using the image data, and use the alpha channel only
       // to store "maximally opaque" or "completely transparent"
@@ -454,7 +454,7 @@ void TeXFont_PK::PK_skip_specials()
       case PK_NOOP :
 	break;
       default :
-	oops(i18n("Unexpected %1 in PK file %2").tqarg(PK_flag_byte).tqarg(tqparent->filename) );
+	oops(i18n("Unexpected %1 in PK file %2").tqarg(PK_flag_byte).tqarg(parent->filename) );
 	break;
       }
     }
@@ -521,7 +521,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
     w = num(fp, n);
     h = num(fp, n);
     if (w > 0x7fff || h > 0x7fff)
-      oops(i18n("The character %1 is too large in file %2").tqarg(ch).tqarg(tqparent->filename));
+      oops(i18n("The character %1 is too large in file %2").tqarg(ch).tqarg(parent->filename));
     characterBitmaps[ch]->w = w;
     characterBitmaps[ch]->h = h;
   }
@@ -626,9 +626,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	paint_switch = 1 - paint_switch;
       }
       if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
-	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(tqparent->filename));
+	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(parent->filename));
       if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
-	oops(i18n("Bad pk file (%1), too many bits").tqarg(tqparent->filename));
+	oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
     }
     
     // The data in the bitmap is now in the processor's bit order,
@@ -712,9 +712,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	paint_switch = 1 - paint_switch;
       }
       if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
-	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(tqparent->filename));
+	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(parent->filename));
       if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
-	oops(i18n("Bad pk file (%1), too many bits").tqarg(tqparent->filename));
+	oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
     }
   } // endif: big or small Endian?
 }
diff --git a/kdvi/TeXFont_PK.h b/kdvi/TeXFont_PK.h
index 68935d16..ab9c6b5c 100644
--- a/kdvi/TeXFont_PK.h
+++ b/kdvi/TeXFont_PK.h
@@ -9,7 +9,7 @@ class glyph;
 
 class TeXFont_PK : public TeXFont {
  public:
-  TeXFont_PK(TeXFontDefinition *tqparent);
+  TeXFont_PK(TeXFontDefinition *parent);
   ~TeXFont_PK();
   
   glyph* getGlyph(TQ_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=TQt::black);
diff --git a/kdvi/TeXFont_TFM.cpp b/kdvi/TeXFont_TFM.cpp
index ebd1b7f5..456a27c3 100644
--- a/kdvi/TeXFont_TFM.cpp
+++ b/kdvi/TeXFont_TFM.cpp
@@ -21,14 +21,14 @@
 //#define DEBUG_TFM
 
 
-TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *tqparent) 
-  : TeXFont(tqparent)
+TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *parent) 
+  : TeXFont(parent)
 {
 #ifdef DEBUG_TFM
-  kdDebug(4300) << "TeXFont_TFM::TeXFont_TFM( tqparent=" << tqparent << " )" << endl;
+  kdDebug(4300) << "TeXFont_TFM::TeXFont_TFM( parent=" << parent << " )" << endl;
 #endif
 
-  TQFile file( tqparent->filename );
+  TQFile file( parent->filename );
   if ( !file.open( IO_ReadOnly ) ) {
     kdError(4300) << "TeXFont_TFM::TeXFont_TFM(): Could not read TFM file" << endl;
     return;
@@ -49,7 +49,7 @@ TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *tqparent)
 		<< "nd= " << nd << endl;
 #endif
   if ((bc > ec) || (ec >= TeXFontDefinition::max_num_of_chars_in_font)) {
-    kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << tqparent->filename << " ): The font has an invalid bc and ec entries." << endl;
+    kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << parent->filename << " ): The font has an invalid bc and ec entries." << endl;
     file.close();
     return;
   }
@@ -97,7 +97,7 @@ TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *tqparent)
     TQ_UINT8 byte;
     stream >> byte;
     if (byte >= nw) 
-      kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << tqparent->filename << " ): The font has an invalid Char-Info table." << endl;
+      kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << parent->filename << " ): The font has an invalid Char-Info table." << endl;
     else {
       characterWidth_in_units_of_design_size[characterCode] = widthTable_in_units_of_design_size[byte];
       g->dvi_advance_in_units_of_design_size_by_2e20 = widthTable_in_units_of_design_size[byte].value;
@@ -106,7 +106,7 @@ TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *tqparent)
     stream >> byte;
     byte = byte >> 4;
     if (byte >= nh)
-      kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << tqparent->filename << " ): The font has an invalid Char-Info table." << endl;
+      kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << parent->filename << " ): The font has an invalid Char-Info table." << endl;
     else 
       characterHeight_in_units_of_design_size[characterCode] = heightTable_in_units_of_design_size[byte];
     
@@ -139,10 +139,10 @@ glyph *TeXFont_TFM::getGlyph(TQ_UINT16 characterCode, bool generateCharacterPixm
   
   if ((generateCharacterPixmap == true) && ((g->shrunkenCharacter.isNull()) || (color != g->color)) ) {
     g->color = color;
-    TQ_UINT16 pixelWidth = (TQ_UINT16)(tqparent->displayResolution_in_dpi *
+    TQ_UINT16 pixelWidth = (TQ_UINT16)(parent->displayResolution_in_dpi *
 				     design_size_in_TeX_points.toDouble() *
 				     characterWidth_in_units_of_design_size[characterCode].toDouble() * 100.0/7227.0 + 0.5);
-    TQ_UINT16 pixelHeight = (TQ_UINT16)(tqparent->displayResolution_in_dpi *
+    TQ_UINT16 pixelHeight = (TQ_UINT16)(parent->displayResolution_in_dpi *
 				      design_size_in_TeX_points.toDouble() *
 				      characterHeight_in_units_of_design_size[characterCode].toDouble() * 100.0/7227.0 + 0.5);
     
diff --git a/kdvi/TeXFont_TFM.h b/kdvi/TeXFont_TFM.h
index 9a3639e0..1d10dc1b 100644
--- a/kdvi/TeXFont_TFM.h
+++ b/kdvi/TeXFont_TFM.h
@@ -23,7 +23,7 @@ class fix_word {
 
 class TeXFont_TFM : public TeXFont {
  public:
-  TeXFont_TFM(TeXFontDefinition *tqparent);
+  TeXFont_TFM(TeXFontDefinition *parent);
   ~TeXFont_TFM();
   
   glyph* getGlyph(TQ_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=TQt::black);
diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp
index 7f21c65d..acb3dceb 100644
--- a/kdvi/dviRenderer.cpp
+++ b/kdvi/dviRenderer.cpp
@@ -71,7 +71,7 @@ dviRenderer::dviRenderer(TQWidget *par)
   : DocumentRenderer(par), info(new infoDialog(par))
 {
 #ifdef DEBUG_DVIRENDERER
-  kdDebug(4300) << "dviRenderer( tqparent=" << par << " )" << endl;
+  kdDebug(4300) << "dviRenderer( parent=" << par << " )" << endl;
 #endif
 
   // initialize the dvi machinery
diff --git a/kdvi/dviRenderer.h b/kdvi/dviRenderer.h
index 6d71b1ed..bf3512db 100644
--- a/kdvi/dviRenderer.h
+++ b/kdvi/dviRenderer.h
@@ -88,7 +88,7 @@ class dviRenderer : public DocumentRenderer, bigEndianByteReader
   TQ_OBJECT
 
 public:
-  dviRenderer(TQWidget *tqparent);
+  dviRenderer(TQWidget *parent);
   ~dviRenderer();
 
   virtual bool	setFile(const TQString &fname, const KURL &base);
diff --git a/kdvi/dviWidget.cpp b/kdvi/dviWidget.cpp
index 68f4b124..a0f43da3 100644
--- a/kdvi/dviWidget.cpp
+++ b/kdvi/dviWidget.cpp
@@ -22,8 +22,8 @@
 #include "renderedDviPagePixmap.h"
 #include "selection.h"
 
-DVIWidget::DVIWidget(TQWidget* tqparent, PageView* sv, DocumentPageCache* cache, const char* name)
-  : DocumentWidget(tqparent, sv, cache, name)
+DVIWidget::DVIWidget(TQWidget* parent, PageView* sv, DocumentPageCache* cache, const char* name)
+  : DocumentWidget(parent, sv, cache, name)
 {
 }
 
@@ -74,7 +74,7 @@ void DVIWidget::mousePressEvent(TQMouseEvent* e)
     e->accept();
   }
 
-  // Call implementation from tqparent
+  // Call implementation from parent
   DocumentWidget::mousePressEvent(e);
 }
 
diff --git a/kdvi/dviWidget.h b/kdvi/dviWidget.h
index 864bb526..7f37c44c 100644
--- a/kdvi/dviWidget.h
+++ b/kdvi/dviWidget.h
@@ -26,7 +26,7 @@ class DVIWidget : public DocumentWidget
   TQ_OBJECT
 
 public: 
-  DVIWidget(TQWidget* tqparent, PageView* sv, DocumentPageCache* cache, const char* name);
+  DVIWidget(TQWidget* parent, PageView* sv, DocumentPageCache* cache, const char* name);
 
 signals:
   void SRCLink(const TQString&, TQMouseEvent* e, DocumentWidget*);
diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp
index 19fe63cd..24810714 100644
--- a/kdvi/fontprogress.cpp
+++ b/kdvi/fontprogress.cpp
@@ -22,11 +22,11 @@
 #include <tqvbox.h>
 
 /* 
- *  Constructs a fontProgressDialog which is a child of 'tqparent', with the 
+ *  Constructs a fontProgressDialog which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
-fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString& label, const TQString& abortTip, const TQString& whatsThis, const TQString& ttip, TQWidget* tqparent, const TQString& name, bool progressbar)
-  : KDialogBase( tqparent, "Font Generation Progress Dialog", true, name, Cancel, Cancel, true )
+fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString& label, const TQString& abortTip, const TQString& whatsThis, const TQString& ttip, TQWidget* parent, const TQString& name, bool progressbar)
+  : KDialogBase( parent, "Font Generation Progress Dialog", true, name, Cancel, Cancel, true )
 {
   setCursor( TQCursor( 3 ) );
 
diff --git a/kdvi/fontprogress.h b/kdvi/fontprogress.h
index 6c19520c..5ecd3e92 100644
--- a/kdvi/fontprogress.h
+++ b/kdvi/fontprogress.h
@@ -35,7 +35,7 @@ class fontProgressDialog : public KDialogBase
 
 public:
     fontProgressDialog( const TQString& helpIndex, const TQString& label, const TQString& abortTip, const TQString& whatsThis, const TQString& ttip,
-			TQWidget* tqparent = 0, const TQString &name = 0, bool progressbar=true );
+			TQWidget* parent = 0, const TQString &name = 0, bool progressbar=true );
     ~fontProgressDialog();
     
     /** The number of steps already done is increased, the text received
diff --git a/kdvi/infodialog.cpp b/kdvi/infodialog.cpp
index 3e2bbf16..97ffef6f 100644
--- a/kdvi/infodialog.cpp
+++ b/kdvi/infodialog.cpp
@@ -21,8 +21,8 @@
 #include "fontpool.h"
 #include "infodialog.h"
 
-infoDialog::infoDialog( TQWidget* tqparent )
-  : KDialogBase( Tabbed, i18n("Document Info"), Ok, Ok, tqparent, "Document Info", false, false)
+infoDialog::infoDialog( TQWidget* parent )
+  : KDialogBase( Tabbed, i18n("Document Info"), Ok, Ok, parent, "Document Info", false, false)
 {
   TQFrame *page1 = addPage( i18n("DVI File") );
   TQVBoxLayout *topLayout1 = new TQVBoxLayout( page1, 0, 6 );
diff --git a/kdvi/infodialog.h b/kdvi/infodialog.h
index d7f37e56..a5ecde8b 100644
--- a/kdvi/infodialog.h
+++ b/kdvi/infodialog.h
@@ -23,7 +23,7 @@ class infoDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    infoDialog( TQWidget* tqparent = 0 );
+    infoDialog( TQWidget* parent = 0 );
 
     /** This method is used to set the data coming from the DVI
         file. Note that 0 is a permissible argument, that just means:
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index bceacddc..e318a160 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -49,9 +49,9 @@ K_EXPORT_COMPONENT_FACTORY(kdvipart, KDVIMultiPageFactory)
 
 
 
-KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
+KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
                              const char *name, const TQStringList& args)
-  : KMultiPage(parentWidget, widgetName, tqparent, name), DVIRenderer(parentWidget)
+  : KMultiPage(parentWidget, widgetName, parent, name), DVIRenderer(parentWidget)
 {
   Q_UNUSED(args);
 #ifdef PERFORMANCE_MEASUREMENT
@@ -213,7 +213,7 @@ void KDVIMultiPage::addConfigDialogs(KConfigDialog* configDialog)
 
 void KDVIMultiPage::preferencesChanged()
 {
-  // Call method from tqparent class
+  // Call method from parent class
   KMultiPage::preferencesChanged();
 #ifdef  KDVI_MULTIPAGE_DEBUG
   kdDebug(4300) << "preferencesChanged" << endl;
diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h
index ee50e218..9e2137a7 100644
--- a/kdvi/kdvi_multipage.h
+++ b/kdvi/kdvi_multipage.h
@@ -15,7 +15,7 @@ class KDVIMultiPage : public KMultiPage
   TQ_OBJECT
 
 public:
-  KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
+  KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
                 const char *name, const TQStringList& args = TQStringList());
   virtual ~KDVIMultiPage();
 
diff --git a/kdvi/optionDialogFontsWidget.cpp b/kdvi/optionDialogFontsWidget.cpp
index 60a52c66..14a72ee2 100644
--- a/kdvi/optionDialogFontsWidget.cpp
+++ b/kdvi/optionDialogFontsWidget.cpp
@@ -21,10 +21,10 @@
 #include "optionDialogFontsWidget.h"
 
 
-// Constructs a optionDialogWidget_base which is a child of 'tqparent', with
+// Constructs a optionDialogWidget_base which is a child of 'parent', with
 // the name 'name' and widget flags set to 'f'.
-optionDialogFontsWidget::optionDialogFontsWidget( TQWidget* tqparent,  const char* name, WFlags fl )
-    : optionDialogFontsWidget_base( tqparent,  name, fl )
+optionDialogFontsWidget::optionDialogFontsWidget( TQWidget* parent,  const char* name, WFlags fl )
+    : optionDialogFontsWidget_base( parent,  name, fl )
 {
 #ifndef HAVE_FREETYPE
   kcfg_UseType1Fonts->setChecked(false);
diff --git a/kdvi/optionDialogFontsWidget.h b/kdvi/optionDialogFontsWidget.h
index ce8c85f3..c5f0bc06 100644
--- a/kdvi/optionDialogFontsWidget.h
+++ b/kdvi/optionDialogFontsWidget.h
@@ -18,7 +18,7 @@ class optionDialogFontsWidget : public optionDialogFontsWidget_base
   TQ_OBJECT
     
  public:
-  optionDialogFontsWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  optionDialogFontsWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   ~optionDialogFontsWidget();
 };
 
diff --git a/kdvi/optionDialogSpecialWidget.cpp b/kdvi/optionDialogSpecialWidget.cpp
index 6c27b019..1b61e4a5 100644
--- a/kdvi/optionDialogSpecialWidget.cpp
+++ b/kdvi/optionDialogSpecialWidget.cpp
@@ -23,10 +23,10 @@
 #include "prefs.h"
 
 
-// Constructs a optionDialogWidget_base which is a child of 'tqparent', with
+// Constructs a optionDialogWidget_base which is a child of 'parent', with
 // the name 'name' and widget flags set to 'f'.
-optionDialogSpecialWidget::optionDialogSpecialWidget( TQWidget* tqparent,  const char* name, WFlags fl )
-    : optionDialogSpecialWidget_base( tqparent,  name, fl )
+optionDialogSpecialWidget::optionDialogSpecialWidget( TQWidget* parent,  const char* name, WFlags fl )
+    : optionDialogSpecialWidget_base( parent,  name, fl )
 {
   // Set up the list of known and supported editors
   editorNameString        += i18n("User-Defined Editor");
diff --git a/kdvi/optionDialogSpecialWidget.h b/kdvi/optionDialogSpecialWidget.h
index 42c16c27..5bafd618 100644
--- a/kdvi/optionDialogSpecialWidget.h
+++ b/kdvi/optionDialogSpecialWidget.h
@@ -18,7 +18,7 @@ class optionDialogSpecialWidget : public optionDialogSpecialWidget_base
   TQ_OBJECT
     
  public:
-  optionDialogSpecialWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  optionDialogSpecialWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   ~optionDialogSpecialWidget();
   
  public slots:
diff --git a/kdvi/psheader.txt b/kdvi/psheader.txt
index 244e4a3b..f5e543d1 100644
--- a/kdvi/psheader.txt
+++ b/kdvi/psheader.txt
@@ -21,7 +21,7 @@ B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr
 1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx
 0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx
 sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{
-rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagetqmask restore}B/G{{id gp get/gp
+rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp
 gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B
 /chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{
 /cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{
@@ -45,9 +45,9 @@ index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N
 /Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT)
 (LaserWriter 16/600)]{A length product length le{A length product exch 0
 exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse
-end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagetqmask
+end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask
 grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot}
-imagetqmask grestore}}ifelse B/QV{gsave newpath transform round exch round
+imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round
 exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto
 fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p
 delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M}