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/fontpool.cpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'kdvi/fontpool.cpp') 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); } -- cgit v1.2.3
%1 %2 %3 %4 %5 %6
%1 %2 %3% %4 %5 %6