Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.

1 files changed, 10 insertions, 10 deletions

diff --git a/kdvi/TeXFont_PFB.cpp b/kdvi/TeXFont_PFB.cpp
index d2c74e27..45c76512 100644
--- a/kdvi/TeXFont_PFB.cpp
+++ b/kdvi/TeXFont_PFB.cpp
@@ -41,13 +41,13 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
   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.").arg(parent->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.").arg(parent->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;
@@ -74,8 +74,8 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
   // TeX is only able to address character codes 0-255 while
   // e.g. Type1 fonts may contain several thousands of characters)
   if (enc != 0) {
-    parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "Encoding" ));
-    parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "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
@@ -168,7 +168,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
     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.").arg(parent->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;
@@ -184,7 +184,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
       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.").arg(ch).arg(parent->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.").arg(ch).arg(parent->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;
@@ -209,8 +209,8 @@ 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.").arg(ch);
-      kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").arg(ch).arg(parent->filename) << endl;
+	errorMessage = i18n("Glyph #%1 is empty.").tqarg(ch);
+      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;
@@ -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.").arg(ch).arg(parent->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;