From ec1fddcd0d6663ad273af85357f04abbc5689468 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:00 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a. --- kdvi/TeXFontDefinition.cpp | 6 ++-- kdvi/TeXFontDefinition.h | 2 +- kdvi/TeXFont_PFB.cpp | 20 +++++++------- kdvi/TeXFont_PK.cpp | 16 +++++------ kdvi/dviFile.cpp | 2 +- kdvi/dviRenderer.cpp | 22 +++++++-------- kdvi/dviRenderer_draw.cpp | 4 +-- kdvi/dviRenderer_export.cpp | 18 ++++++------ kdvi/dviRenderer_prescan.cpp | 50 +++++++++++++++++----------------- kdvi/dviWidget.cpp | 2 +- kdvi/fontEncoding.cpp | 4 +-- kdvi/fontEncoding.h | 2 +- kdvi/fontMap.cpp | 2 +- kdvi/fontMap.h | 2 +- kdvi/fontpool.cpp | 42 ++++++++++++++-------------- kdvi/fontprogress.cpp | 6 ++-- kdvi/infodialog.cpp | 14 +++++----- kdvi/kdvi_multipage.cpp | 6 ++-- kdvi/main.cpp | 4 +-- kdvi/optionDialogFontsWidget_base.ui | 2 +- kdvi/optionDialogSpecialWidget_base.ui | 4 +-- kdvi/psgs.cpp | 14 +++++----- kdvi/special.cpp | 18 ++++++------ kdvi/vf.cpp | 2 +- 24 files changed, 132 insertions(+), 132 deletions(-) (limited to 'kdvi') diff --git a/kdvi/TeXFontDefinition.cpp b/kdvi/TeXFontDefinition.cpp index 49ddcaa0..c89aa59d 100644 --- a/kdvi/TeXFontDefinition.cpp +++ b/kdvi/TeXFontDefinition.cpp @@ -105,7 +105,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname) TQString filename_test(font_pool->getExtraSearchPath() + "/" + filename); file = fopen( TQFile::encodeName(filename_test), "r"); if (file == 0) { - kdError(4300) << i18n("Cannot find font %1, file %2.").arg(fontname).arg(filename) << endl; + kdError(4300) << i18n("Cannot find font %1, file %2.").tqarg(fontname).tqarg(filename) << endl; return; } else filename = filename_test; @@ -121,7 +121,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname) font = new TeXFont_PK(this); set_char_p = &dviRenderer::set_char; if ((checksum != 0) && (checksum != font->checksum)) - kdWarning(4300) << i18n("Checksum mismatch for font file %1").arg(filename) << endl; + kdWarning(4300) << i18n("Checksum mismatch for font file %1").tqarg(filename) << endl; fontTypeName = "TeX PK"; return; } @@ -169,7 +169,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname) #else // If we don't have the FreeType library, we should never have // reached this point. Complain, and leave this font blank - kdError(4300) << i18n("Cannot recognize format for font file %1").arg(filename) << endl; + kdError(4300) << i18n("Cannot recognize format for font file %1").tqarg(filename) << endl; #endif } diff --git a/kdvi/TeXFontDefinition.h b/kdvi/TeXFontDefinition.h index a059a405..9097b2cb 100644 --- a/kdvi/TeXFontDefinition.h +++ b/kdvi/TeXFontDefinition.h @@ -1,6 +1,6 @@ // -*- C++ -*- /* - * The layout of a font information block. + * The tqlayout of a font information block. * There is one of these for every loaded font or magnification thereof. * Duplicates are eliminated: this is necessary because of possible recursion * in virtual fonts. 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; diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp index e2597971..f678df9b 100644 --- a/kdvi/TeXFont_PK.cpp +++ b/kdvi/TeXFont_PK.cpp @@ -91,7 +91,7 @@ TeXFont_PK::TeXFont_PK(TeXFontDefinition *parent) characterBitmaps[i] = 0; file = fopen(TQFile::encodeName(parent->filename), "r"); if (file == 0) - kdError(4300) << i18n("Cannot open font file %1.").arg(parent->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").arg(ch).arg(parent->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; } @@ -454,7 +454,7 @@ void TeXFont_PK::PK_skip_specials() case PK_NOOP : break; default : - oops(i18n("Unexpected %1 in PK file %2").arg(PK_flag_byte).arg(parent->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").arg(ch).arg(parent->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").arg(ch).arg(parent->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").arg(parent->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").arg(ch).arg(parent->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").arg(parent->filename)); + oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename)); } } // endif: big or small Endian? } diff --git a/kdvi/dviFile.cpp b/kdvi/dviFile.cpp index b3937265..33dc601d 100644 --- a/kdvi/dviFile.cpp +++ b/kdvi/dviFile.cpp @@ -256,7 +256,7 @@ void dvifile::prepare_pages() while (i > 0) { command_pointer = dvi_Data() + page_offset[i--]; if (readUINT8() != BOP) { - errorMsg = i18n("The page %1 does not start with the BOP command.").arg(i+1); + errorMsg = i18n("The page %1 does not start with the BOP command.").tqarg(i+1); return; } command_pointer += 10 * 4; diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp index b42135eb..acb3dceb 100644 --- a/kdvi/dviRenderer.cpp +++ b/kdvi/dviRenderer.cpp @@ -15,11 +15,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -277,7 +277,7 @@ void dviRenderer::showThatSourceInformationIsPresent() TQLabel *label2 = new TQLabel( i18n("This DVI file contains source file information. You may click into the text with the " "middle mouse button, and an editor will open the TeX-source file immediately."), contents); - label2->setMinimumSize(label2->sizeHint()); + label2->setMinimumSize(label2->tqsizeHint()); lay->add( label2 ); lay->addStretch(1); TQSize extraSize = TQSize(50,30); @@ -437,7 +437,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base) if (!fi.exists() || fi.isDir()) { KMessageBox::error( parentWidget, i18n("File error. The specified file '%1' does not exist. " - "KDVI already tried to add the ending '.dvi'.").arg(filename), + "KDVI already tried to add the ending '.dvi'.").tqarg(filename), i18n("File Error!")); return false; } @@ -451,8 +451,8 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base) KMessageBox::sorry( parentWidget, i18n( "Could not open file %1 which has " "type %2. KDVI can only load DVI (.dvi) files." ) - .arg( fname ) - .arg( mimetype ) ); + .tqarg( fname ) + .tqarg( mimetype ) ); return false; } @@ -462,7 +462,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base) KMessageBox::sorry( parentWidget, i18n("File corruption! KDVI had trouble interpreting your DVI file. Most " "likely this means that the DVI file is broken.") - .arg( fname ) ); + .tqarg( fname ) ); return false; } @@ -641,7 +641,7 @@ Anchor dviRenderer::parseReference(const TQString &reference) "line %1 in the TeX-file %2. 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 " - "information. Press the F1 key to open the manual.").arg(refLineNumber).arg(refFileName), + "information. Press the F1 key to open the manual.").tqarg(refLineNumber).tqarg(refFileName), i18n("Could Not Find Reference")); mutex.unlock(); return Anchor(); @@ -681,7 +681,7 @@ Anchor dviRenderer::parseReference(const TQString &reference) } else if (anchorForRefFileFound == false) KMessageBox::sorry(parentWidget, i18n("KDVI was not able to locate the place in the DVI file which corresponds to " - "line %1 in the TeX-file %2.").arg(refLineNumber).arg(refFileName), + "line %1 in the TeX-file %2.").tqarg(refLineNumber).tqarg(refFileName), i18n( "Could Not Find Reference" )); else { mutex.unlock(); @@ -735,7 +735,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum { KMessageBox::sorry(parentWidget, TQString("") + i18n("The DVI-file refers to the TeX-file " - "%1 which could not be found.").arg(KShellProcess::quote(TeXfile)) + + "%1 which could not be found.").tqarg(KShellProcess::quote(TeXfile)) + TQString(""), i18n( "Could Not Find File" )); return; @@ -786,7 +786,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum "for inverse search, reported an error. You might wish to look at the document info " "dialog which you will find in the File-Menu for a precise error report. The " "manual for KDVI contains a detailed explanation how to set up your editor for use with KDVI, " - "and a list of common problems.").arg(command); + "and a list of common problems.").tqarg(command); info->clear(i18n("Starting the editor...")); diff --git a/kdvi/dviRenderer_draw.cpp b/kdvi/dviRenderer_draw.cpp index 050396e9..2031fcd7 100644 --- a/kdvi/dviRenderer_draw.cpp +++ b/kdvi/dviRenderer_draw.cpp @@ -292,7 +292,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro) if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) { currinf.fontp = currinf.fonttable->find(ch - FNTNUM0); if (currinf.fontp == NULL) { - errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0); + errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0); return; } currinf.set_char_p = currinf.fontp->set_char_p; @@ -567,7 +567,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro) break; default: - errorMsg = i18n("The unknown op-code %1 was encountered.").arg(ch); + errorMsg = i18n("The unknown op-code %1 was encountered.").tqarg(ch); return; } /* end switch*/ } /* end else (ch not a SETCHAR or FNTNUM) */ diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp index 2b4ffd65..110aaacb 100644 --- a/kdvi/dviRenderer_export.cpp +++ b/kdvi/dviRenderer_export.cpp @@ -101,7 +101,7 @@ void dviRenderer::exportPDF() return; TQFileInfo finfo(fileName); if (finfo.exists()) { - int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(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; @@ -137,12 +137,12 @@ void dviRenderer::exportPDF() export_errorString = i18n("The external program 'dvipdf', which was used to export the file, reported an error. " "You might wish to look at the document info dialog which you will " "find in the File-Menu for a precise error report.") ; - info->clear(i18n("Export: %1 to PDF").arg(KShellProcess::quote(dviFile->filename))); + info->clear(i18n("Export: %1 to PDF").tqarg(KShellProcess::quote(dviFile->filename))); proc->clearArguments(); finfo.setFile(dviFile->filename); - *proc << TQString("cd %1; dvipdfm").arg(KShellProcess::quote(finfo.dirPath(true))); - *proc << TQString("-o %1").arg(KShellProcess::quote(fileName)); + *proc << TQString("cd %1; dvipdfm").tqarg(KShellProcess::quote(finfo.dirPath(true))); + *proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName)); *proc << KShellProcess::quote(dviFile->filename); proc->closeStdin(); if (proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) { @@ -200,7 +200,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin return; TQFileInfo finfo(fileName); if (finfo.exists()) { - int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(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; @@ -300,17 +300,17 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin export_errorString = i18n("The external program 'dvips', which was used to export the file, reported an error. " "You might wish to look at the document info dialog which you will " "find in the File-Menu for a precise error report.") ; - info->clear(i18n("Export: %1 to PostScript").arg(KShellProcess::quote(dviFile->filename))); + info->clear(i18n("Export: %1 to PostScript").tqarg(KShellProcess::quote(dviFile->filename))); proc->clearArguments(); TQFileInfo finfo(dviFile->filename); - *proc << TQString("cd %1; dvips").arg(KShellProcess::quote(finfo.dirPath(true))); + *proc << TQString("cd %1; dvips").tqarg(KShellProcess::quote(finfo.dirPath(true))); if (printer == 0) *proc << "-z"; // export Hyperlinks if (options.isEmpty() == false) *proc << options; - *proc << TQString("%1").arg(KShellProcess::quote(sourceFileName)); - *proc << TQString("-o %1").arg(KShellProcess::quote(fileName)); + *proc << TQString("%1").tqarg(KShellProcess::quote(sourceFileName)); + *proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName)); proc->closeStdin(); if (proc->start(KProcess::NotifyOnExit, KProcess::Stderr) == false) { kdError(4300) << "dvips failed to start" << endl; diff --git a/kdvi/dviRenderer_prescan.cpp b/kdvi/dviRenderer_prescan.cpp index 81a3b40f..7cfd2415 100644 --- a/kdvi/dviRenderer_prescan.cpp +++ b/kdvi/dviRenderer_prescan.cpp @@ -84,7 +84,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand) TQString originalFName = EPSfilename; - embedPS_progress->setLabel(i18n("Embedding %1").arg(EPSfilename)); + embedPS_progress->setLabel(i18n("Embedding %1").tqarg(EPSfilename)); tqApp->processEvents(); @@ -102,7 +102,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand) for(page=0; page < dviFile->total_pages; page++) if ((dviFile->page_offset[page] <= currentOffset) && (currentOffset <= dviFile->page_offset[page+1])) break; - errorMsg += i18n("Page %1: The PostScript file %2 could not be found.
").arg(page+1).arg(originalFName); + errorMsg += i18n("Page %1: The PostScript file %2 could not be found.
").tqarg(page+1).tqarg(originalFName); embedPS_progress->progressBar()->advance(1); tqApp->processEvents(); return; @@ -131,13 +131,13 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand) int clip=include_command.find(" clip"); // -1 if clip keyword is not present, >= 0 otherwise // Generate the PostScript commands to be included - TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").arg(llx).arg(lly).arg(urx).arg(ury); + TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury); if (rwi != 0) - PS.append( TQString(" %1 @rwi").arg(rwi) ); + PS.append( TQString(" %1 @rwi").tqarg(rwi) ); if (rhi != 0) - PS.append( TQString(" %1 @rhi").arg(rhi) ); + PS.append( TQString(" %1 @rhi").tqarg(rhi) ); if (angle != 0) - PS.append( TQString(" %1 @angle").arg(angle) ); + PS.append( TQString(" %1 @angle").tqarg(angle) ); if (clip != -1) PS.append(" @clip"); PS.append( " @setspecial\n" ); @@ -252,7 +252,7 @@ void dviRenderer::prescan_ParsePapersizeSpecial(const TQString& _cp) dviFile->suggestedPageSize = new pageSize; dviFile->suggestedPageSize->setPageSize(cp); } else - printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").arg(cp)); + printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").tqarg(cp)); return; } @@ -297,7 +297,7 @@ void dviRenderer::prescan_ParsePSHeaderSpecial(const TQString& cp) } if (TQFile::exists(_file)) - PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").arg(_file) ); + PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").tqarg(_file) ); } @@ -321,7 +321,7 @@ void dviRenderer::prescan_ParsePSQuoteSpecial(const TQString& cp) double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300; double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300; - PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) ); + PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) ); PostScriptOutPutString->append( " @beginspecial @setspecial \n" ); PostScriptOutPutString->append( cp ); PostScriptOutPutString->append( " @endspecial \n" ); @@ -375,17 +375,17 @@ void dviRenderer::prescan_ParsePSSpecial(const TQString& cp) double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300; if (cp.find("ps::[begin]", 0, false) == 0) { - PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) ); - PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(11)) ); + PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) ); + PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(11)) ); } else { if (cp.find("ps::[end]", 0, false) == 0) { - PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(9)) ); + PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(9)) ); } else { if (cp.find("ps::", 0, false) == 0) { - PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(4)) ); + PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(4)) ); } else { - PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) ); - PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(3)) ); + PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) ); + PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(3)) ); } } } @@ -459,22 +459,22 @@ void dviRenderer::prescan_ParsePSFileSpecial(const TQString& cp) if (TQFile::exists(EPSfilename)) { double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300; double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300; - PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) ); + PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) ); PostScriptOutPutString->append( "@beginspecial " ); - PostScriptOutPutString->append( TQString(" %1 @llx").arg(llx) ); - PostScriptOutPutString->append( TQString(" %1 @lly").arg(lly) ); - PostScriptOutPutString->append( TQString(" %1 @urx").arg(urx) ); - PostScriptOutPutString->append( TQString(" %1 @ury").arg(ury) ); + PostScriptOutPutString->append( TQString(" %1 @llx").tqarg(llx) ); + PostScriptOutPutString->append( TQString(" %1 @lly").tqarg(lly) ); + PostScriptOutPutString->append( TQString(" %1 @urx").tqarg(urx) ); + PostScriptOutPutString->append( TQString(" %1 @ury").tqarg(ury) ); if (rwi != 0) - PostScriptOutPutString->append( TQString(" %1 @rwi").arg(rwi) ); + PostScriptOutPutString->append( TQString(" %1 @rwi").tqarg(rwi) ); if (rhi != 0) - PostScriptOutPutString->append( TQString(" %1 @rhi").arg(rhi) ); + PostScriptOutPutString->append( TQString(" %1 @rhi").tqarg(rhi) ); if (angle != 0) - PostScriptOutPutString->append( TQString(" %1 @angle").arg(angle) ); + PostScriptOutPutString->append( TQString(" %1 @angle").tqarg(angle) ); if (clip != -1) PostScriptOutPutString->append(" @clip"); PostScriptOutPutString->append( " @setspecial \n" ); - PostScriptOutPutString->append( TQString(" (%1) run\n").arg(EPSfilename) ); + PostScriptOutPutString->append( TQString(" (%1) run\n").tqarg(EPSfilename) ); PostScriptOutPutString->append( "@endspecial \n" ); } @@ -633,7 +633,7 @@ void dviRenderer::prescan(parseSpecials specialParser) if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) { currinf.fontp = currinf.fonttable->find(ch - FNTNUM0); if (currinf.fontp == NULL) { - errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0); + errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0); return; } currinf.set_char_p = currinf.fontp->set_char_p; diff --git a/kdvi/dviWidget.cpp b/kdvi/dviWidget.cpp index ded6e6cb..a0f43da3 100644 --- a/kdvi/dviWidget.cpp +++ b/kdvi/dviWidget.cpp @@ -112,7 +112,7 @@ void DVIWidget::mouseMoveEvent(TQMouseEvent* e) if (cp[i].isDigit() == false) break; - emit setStatusBarText( i18n("line %1 of %2").arg(cp.left(i)).arg(cp.mid(i).simplifyWhiteSpace()) ); + emit setStatusBarText( i18n("line %1 of %2").tqarg(cp.left(i)).tqarg(cp.mid(i).simplifyWhiteSpace()) ); return; } } diff --git a/kdvi/fontEncoding.cpp b/kdvi/fontEncoding.cpp index 9f2d4de2..62905030 100644 --- a/kdvi/fontEncoding.cpp +++ b/kdvi/fontEncoding.cpp @@ -36,7 +36,7 @@ fontEncoding::fontEncoding(const TQString &encName) encFileName = encFileName.stripWhiteSpace(); if (encFileName.isEmpty()) { - kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").arg(encName) << endl; + kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").tqarg(encName) << endl; return; } @@ -76,7 +76,7 @@ fontEncoding::fontEncoding(const TQString &encName) for(; i<256; i++) glyphNameVector[i] = ".notdef"; } else { - kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").arg(encFileName) << endl; + kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").tqarg(encFileName) << endl; return; } diff --git a/kdvi/fontEncoding.h b/kdvi/fontEncoding.h index 8ce0d18b..95eb4dd0 100644 --- a/kdvi/fontEncoding.h +++ b/kdvi/fontEncoding.h @@ -20,7 +20,7 @@ * MetaFont fonts. A DVI file referres to a MetaFont font by giving an * at-most-8-character name, such as 'cmr10'. The DVI previewer would * then locate the associated PK font file (e.g. cmr10.600pk), load - * it, and retrieve the character shaped. + * it, and retrieve the character tqshaped. * * Today TeX is also used to access Type1 and TrueType fonts, which it * was never designed to do. As in the case of MetaFont font, the DVI diff --git a/kdvi/fontMap.cpp b/kdvi/fontMap.cpp index 8cbe4a0e..7dec6f4f 100644 --- a/kdvi/fontMap.cpp +++ b/kdvi/fontMap.cpp @@ -98,7 +98,7 @@ fontMap::fontMap() } file.close(); } else - kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").arg(map_fileName) << endl; + kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").tqarg(map_fileName) << endl; #ifdef DEBUG_FONTMAP kdDebug(4300) << "FontMap file parsed. Results:" << endl; diff --git a/kdvi/fontMap.h b/kdvi/fontMap.h index 4e02f742..da80b72a 100644 --- a/kdvi/fontMap.h +++ b/kdvi/fontMap.h @@ -55,7 +55,7 @@ class fontMapEntry { * Long time ago, when TeX was only used with MetaFont fonts, the DVI * file would specify a font by giving an 8-character name, such as * 'cmr10'. The DVI previewer would then locate the associated PK font - * file, load it, and retrieve the character shaped. Happy times, they + * file, load it, and retrieve the character tqshaped. Happy times, they * were. * * Today TeX is also used to access Type1 and TrueType fonts, which do diff --git a/kdvi/fontpool.cpp b/kdvi/fontpool.cpp index 463d123b..8cd35df7 100644 --- a/kdvi/fontpool.cpp +++ b/kdvi/fontpool.cpp @@ -187,12 +187,12 @@ TQString fontPool::status() text.append(""); text.append( TQString("") - .arg(i18n("TeX Name")) - .arg(i18n("Family")) - .arg(i18n("Zoom")) - .arg(i18n("Type")) - .arg(i18n("Encoding")) - .arg(i18n("Comment")) ); + .tqarg(i18n("TeX Name")) + .tqarg(i18n("Family")) + .tqarg(i18n("Zoom")) + .tqarg(i18n("Type")) + .tqarg(i18n("Encoding")) + .tqarg(i18n("Comment")) ); TeXFontDefinition *fontp = fontList.first(); while ( fontp != 0 ) { @@ -210,12 +210,12 @@ TQString fontPool::status() #ifdef HAVE_FREETYPE tmp << TQString ("") - .arg(fontp->fontname) - .arg(fontp->getFullFontName()) - .arg((int)(fontp->enlargement*100 + 0.5)) - .arg(fontp->getFontTypeName()) - .arg(encoding) - .arg(errMsg); + .tqarg(fontp->fontname) + .tqarg(fontp->getFullFontName()) + .tqarg((int)(fontp->enlargement*100 + 0.5)) + .tqarg(fontp->getFontTypeName()) + .tqarg(encoding) + .tqarg(errMsg); #endif fontp=fontList.next(); @@ -280,7 +280,7 @@ void fontPool::locateFonts() // present an error message to the user. if (!areFontsLocated()) { markFontsAsLocated(); - TQString details = TQString("

PATH: %1

%2").arg(getenv("PATH")).arg(kpsewhichOutput); + TQString details = TQString("

PATH: %1

%2").tqarg(getenv("PATH")).tqarg(kpsewhichOutput); KMessageBox::detailedError( 0, i18n("

KDVI was not able to locate all the font files " "which are necessary to display the current DVI file. " "Your document might be unreadable.

"), @@ -330,17 +330,17 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo numFontsInJob++; if (locateTFMonly == true) - shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").arg(fontp->fontname)); + shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").tqarg(fontp->fontname)); else { #ifdef HAVE_FREETYPE if (FreeType_could_be_loaded == true) { const TQString &filename = fontsByTeXName.findFileName(fontp->fontname); if (!filename.isEmpty()) - shellProcessCmdLine += KShellProcess::quote(TQString("%1").arg(filename)); + shellProcessCmdLine += KShellProcess::quote(TQString("%1").tqarg(filename)); } #endif - shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").arg(fontp->fontname)); - shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").arg(fontp->fontname)); + shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").tqarg(fontp->fontname)); + shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").tqarg(fontp->fontname)); } } fontp=fontList.next(); @@ -363,7 +363,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo "and your document might by unreadable. If this error is reproducable " "please report the issue to the KDVI developers using the 'Help' menu.

" ); TQApplication::restoreOverrideCursor(); - KMessageBox::error( 0, TQString("%1%2").arg(importanceOfKPSEWHICH).arg(msg), + KMessageBox::error( 0, TQString("%1%2").tqarg(importanceOfKPSEWHICH).tqarg(msg), i18n("Problem locating fonts - KDVI") ); markFontsAsLocated(); return; @@ -399,9 +399,9 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo "typesetting system. If TeX is not installed on your system, you could install the TeTeX distribution (www.tetex.org). " "If you are sure that TeX is installed, please try to use the kpsewhich program from the command line to check if it " "really works.

"); - TQString details = TQString("

PATH: %1

%2").arg(getenv("PATH")).arg(kpsewhichOutput); + TQString details = TQString("

PATH: %1

%2").tqarg(getenv("PATH")).tqarg(kpsewhichOutput); - KMessageBox::detailedError( 0, TQString("%1%2").arg(importanceOfKPSEWHICH).arg(msg), details, + KMessageBox::detailedError( 0, TQString("%1%2").tqarg(importanceOfKPSEWHICH).tqarg(msg), details, i18n("Problem locating fonts - KDVI") ); // This makes sure the we don't try to run kpsewhich again markFontsAsLocated(); @@ -587,7 +587,7 @@ void fontPool::mf_output_receiver(KProcess *, char *buffer, int buflen) TQString dpi = startLine.mid(secondblank+1,lastblank-secondblank-1); progress.show(); - progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").arg(fontName).arg(dpi) ); + progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").tqarg(fontName).tqarg(dpi) ); } MetafontOutput = MetafontOutput.remove(0,numleft+1); } diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp index d67f8bc3..24810714 100644 --- a/kdvi/fontprogress.cpp +++ b/kdvi/fontprogress.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -42,7 +42,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString TQVBox *page = makeVBoxMainWidget(); TextLabel1 = new TQLabel( label, page, "TextLabel2" ); - TextLabel1->setAlignment( int( TQLabel::AlignCenter ) ); + TextLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) ); TQWhatsThis::add( TextLabel1, whatsThis ); TQToolTip::add( TextLabel1, ttip ); @@ -55,7 +55,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString ProgressBar1 = NULL; TextLabel2 = new TQLabel( "", page, "TextLabel2" ); - TextLabel2->setAlignment( int( TQLabel::AlignCenter ) ); + TextLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) ); TQWhatsThis::add( TextLabel2, whatsThis ); TQToolTip::add( TextLabel2, ttip ); diff --git a/kdvi/infodialog.cpp b/kdvi/infodialog.cpp index 4ac46810..97ffef6f 100644 --- a/kdvi/infodialog.cpp +++ b/kdvi/infodialog.cpp @@ -10,9 +10,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -64,17 +64,17 @@ void infoDialog::setDVIData(dvifile *dviFile) text = i18n("There is no DVI file loaded at the moment."); else { text.append("
%1 %2 %3 %4 %5 %6
%1 %2 %3% %4 %5 %6
"); - text.append(TQString("").arg(i18n("Filename")).arg(dviFile->filename)); + text.append(TQString("").tqarg(i18n("Filename")).tqarg(dviFile->filename)); TQFile file(dviFile->filename); if (file.exists()) - text.append(TQString("").arg(i18n("File Size")).arg(KIO::convertSize(file.size()))); + text.append(TQString("").tqarg(i18n("File Size")).tqarg(KIO::convertSize(file.size()))); else - text.append(TQString("").arg(i18n("The file does no longer exist."))); + text.append(TQString("").tqarg(i18n("The file does no longer exist."))); text.append(TQString("")); - text.append(TQString("").arg(i18n("#Pages")).arg(dviFile->total_pages)); - text.append(TQString("").arg(i18n("Generator/Date")).arg(dviFile->generatorString)); + text.append(TQString("").tqarg(i18n("#Pages")).tqarg(dviFile->total_pages)); + text.append(TQString("").tqarg(i18n("Generator/Date")).tqarg(dviFile->generatorString)); } // else (dviFile == NULL) TextLabel1->setText( text ); diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp index 18a3df78..e318a160 100644 --- a/kdvi/kdvi_multipage.cpp +++ b/kdvi/kdvi_multipage.cpp @@ -161,7 +161,7 @@ void KDVIMultiPage::slotSave() fileName = fileName+ending; if (TQFile(fileName).exists()) { - int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName), + int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName), i18n("Overwrite File"), i18n("Overwrite")); if (r == KMessageBox::Cancel) return; @@ -239,7 +239,7 @@ void KDVIMultiPage::print() // Show the printer options dialog. Return immediately if the user // aborts. - if (!printer->setup(parentWdg, i18n("Print %1").arg(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 @@ -379,7 +379,7 @@ void KDVIMultiPage::print() dvips_options += TQString(","); else commaflag = 1; - dvips_options += TQString("%1").arg(*it); + dvips_options += TQString("%1").tqarg(*it); } // Now print. For that, export the DVI-File to PostScript. Note that diff --git a/kdvi/main.cpp b/kdvi/main.cpp index af7bc928..f10501bd 100644 --- a/kdvi/main.cpp +++ b/kdvi/main.cpp @@ -77,14 +77,14 @@ int main(int argc, char** argv) if (!url.isValid()) { - kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl; + kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl; return -1; } if (!url.isLocalFile()) { kdError(4300) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local " - "files if you are using the '--unique' option.")).arg(args->arg(0)) << endl; + "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl; return -1; } diff --git a/kdvi/optionDialogFontsWidget_base.ui b/kdvi/optionDialogFontsWidget_base.ui index bb7e18f4..766f6b98 100644 --- a/kdvi/optionDialogFontsWidget_base.ui +++ b/kdvi/optionDialogFontsWidget_base.ui @@ -44,7 +44,7 @@ Expanding - + 31 121 diff --git a/kdvi/optionDialogSpecialWidget_base.ui b/kdvi/optionDialogSpecialWidget_base.ui index 4610984b..e821d761 100644 --- a/kdvi/optionDialogSpecialWidget_base.ui +++ b/kdvi/optionDialogSpecialWidget_base.ui @@ -169,7 +169,7 @@ What is 'inverse search'? - + AlignVCenter|AlignRight @@ -186,7 +186,7 @@ Expanding - + 390 21 diff --git a/kdvi/psgs.cpp b/kdvi/psgs.cpp index d7f087e4..9f1f925f 100644 --- a/kdvi/psgs.cpp +++ b/kdvi/psgs.cpp @@ -211,11 +211,11 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co TQStringList argus; argus << "gs"; argus << "-dSAFER" << "-dPARANOIDSAFER" << "-dDELAYSAFER" << "-dNOPAUSE" << "-dBATCH"; - argus << TQString("-sDEVICE=%1").arg(*gsDevice); - argus << TQString("-sOutputFile=%1").arg(filename); - argus << TQString("-sExtraIncludePath=%1").arg(includePath); - argus << TQString("-g%1x%2").arg(pixel_page_w).arg(pixel_page_h); // page size in pixels - argus << TQString("-r%1").arg(resolution); // resolution in dpi + argus << TQString("-sDEVICE=%1").tqarg(*gsDevice); + argus << TQString("-sOutputFile=%1").tqarg(filename); + argus << TQString("-sExtraIncludePath=%1").tqarg(includePath); + argus << TQString("-g%1x%2").tqarg(pixel_page_w).tqarg(pixel_page_h); // page size in pixels + argus << TQString("-r%1").tqarg(resolution); // resolution in dpi argus << "-c" << "<< /PermitFileReading [ ExtraIncludePath ] /PermitFileWriting [] /PermitFileControl [] >> setuserparams .locksafe"; argus << "-f" << PSfile.name(); @@ -241,7 +241,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co while(proc.readln(GSoutput) != -1) { if (GSoutput.contains("Unknown device")) { kdDebug(4300) << TQString("The version of ghostview installed on this computer does not support " - "the '%1' ghostview device driver.").arg(*gsDevice) << endl; + "the '%1' ghostview device driver.").tqarg(*gsDevice) << endl; knownDevices.remove(gsDevice); gsDevice = knownDevices.begin(); if (knownDevices.isEmpty()) @@ -267,7 +267,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co "drivers. Note that KDVI needs to be restarted to re-enable PostScript support." "

")); else { - kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").arg(*gsDevice) << endl; + kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").tqarg(*gsDevice) << endl; gs_generate_graphics_file(page, filename, magnification); } return; diff --git a/kdvi/special.cpp b/kdvi/special.cpp index 48c99ec8..918b7352 100644 --- a/kdvi/special.cpp +++ b/kdvi/special.cpp @@ -222,7 +222,7 @@ void dviRenderer::color_special(const TQString& _cp) // Take color off the stack if (colorStack.isEmpty()) printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Color pop command issued when the color stack is empty." ). - arg(dviFile->filename).arg(current_page)); + tqarg(dviFile->filename).tqarg(current_page)); else colorStack.pop(); return; @@ -308,7 +308,7 @@ void parse_special_argument(const TQString& strg, const char* argument_name, int // Maybe we should open a dialog here. kdError(4300) << i18n("Malformed parameter in the epsf special command.\n" "Expected a float to follow %1 in %2") - .arg(argument_name).arg(strg) << endl; + .tqarg(argument_name).tqarg(strg) << endl; } } @@ -432,7 +432,7 @@ void dviRenderer::epsf_special(const TQString& cp) foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter), EPSfilename_orig, -1); else foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter), - i18n("File not found: \n %1").arg(EPSfilename_orig), -1); + i18n("File not found: \n %1").tqarg(EPSfilename_orig), -1); foreGroundPainter->restore(); } @@ -453,7 +453,7 @@ void dviRenderer::TPIC_flushPath_special() TQPen pen(TQt::black, (int)(penWidth_in_mInch*resolutionInDPI/1000.0 + 0.5)); // Sets the pen size in milli-inches foreGroundPainter->setPen(pen); - foreGroundPainter->drawPolyline(TPIC_path, 0, number_of_elements_in_path); + foreGroundPainter->tqdrawPolyline(TPIC_path, 0, number_of_elements_in_path); number_of_elements_in_path = 0; } @@ -469,12 +469,12 @@ void dviRenderer::TPIC_addPath_special(const TQString& cp) bool ok; float xKoord = cp_noWhiteSpace.section(' ', 0, 0).toFloat(&ok); if (ok == false) { - printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").arg(cp) ); + printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").tqarg(cp) ); return; } float yKoord = cp_noWhiteSpace.section(' ', 1, 1).toFloat(&ok); if (ok == false) { - printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").arg(cp) ); + printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").tqarg(cp) ); return; } @@ -502,7 +502,7 @@ void dviRenderer::TPIC_setPen_special(const TQString& cp) bool ok; penWidth_in_mInch = cp.stripWhiteSpace().toFloat(&ok); if (ok == false) { - printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").arg(cp) ); + printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").tqarg(cp) ); penWidth_in_mInch = 0.0; return; } @@ -700,7 +700,7 @@ void dviRenderer::applicationDoSpecial(char *cp) foreGroundPainter->translate(-x,-y); } else printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Could not interpret angle in text rotation special." ). - arg(dviFile->filename).arg(current_page)); + tqarg(dviFile->filename).tqarg(current_page)); } // The graphicx package marks the end of rotated text with this @@ -722,6 +722,6 @@ void dviRenderer::applicationDoSpecial(char *cp) (strncasecmp(cp, "background", 10) == 0) ) return; - printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").arg(special_command)); + printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").tqarg(special_command)); return; } diff --git a/kdvi/vf.cpp b/kdvi/vf.cpp index 6e8f7a41..b6da55c0 100644 --- a/kdvi/vf.cpp +++ b/kdvi/vf.cpp @@ -177,7 +177,7 @@ void TeXFontDefinition::read_VF_index() } } if (cmnd != POST) - oops(i18n("Wrong command byte found in VF macro list: %1").arg(cmnd)); + oops(i18n("Wrong command byte found in VF macro list: %1").tqarg(cmnd)); fclose (VF_file); file = NULL; -- cgit v1.2.3
%1 %2
%1 %2
%1 %2
%1 %2
%1
%1
%1 %2
%1 %2
%1 %2
%1 %2