diff options
Diffstat (limited to 'kfax')
| -rw-r--r-- | kfax/faxinput.cpp | 12 | ||||
| -rw-r--r-- | kfax/kfax.cpp | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/kfax/faxinput.cpp b/kfax/faxinput.cpp index e37e9dd7..40ae2a41 100644 --- a/kfax/faxinput.cpp +++ b/kfax/faxinput.cpp @@ -110,7 +110,7 @@ notetiff(const char *name) if ((tf = fopen(name, "r")) == NULL) { - TQString mesg = i18n("Unable to open:\n%1\n").tqarg(TQFile::decodeName(name)); + TQString mesg = i18n("Unable to open:\n%1\n").arg(TQFile::decodeName(name)); kfaxerror(i18n("Sorry"), mesg); return 0; } @@ -147,7 +147,7 @@ notetiff(const char *name) if (fseek(tf, IFDoff, SEEK_SET) < 0) { realbad: - str = i18n("Invalid tiff file:\n%1\n").tqarg(TQFile::decodeName(name)); + str = i18n("Invalid tiff file:\n%1\n").arg(TQFile::decodeName(name)); kfaxerror(i18n("Sorry"),str); bad: if (strips) @@ -249,7 +249,7 @@ notetiff(const char *name) case 279: /* StripByteCounts */ if (count != nstrips) { str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n") - .tqarg(TQFile::decodeName(name)).tqarg(nstrips).tqarg(count); + .arg(TQFile::decodeName(name)).arg(nstrips).arg(count); kfaxerror(i18n("Message"),str); goto realbad; } @@ -419,7 +419,7 @@ getstrip(struct pagenode *pn, int strip) pn->length = pn->strips[strip].size; } else { - str = i18n("Trying to expand too many strips\n%1%n").tqarg(TQFile::decodeName(pn->pathname)); + str = i18n("Trying to expand too many strips\n%1%n").arg(TQFile::decodeName(pn->pathname)); kfaxerror(i18n("Warning"),str); return NULL; } @@ -448,7 +448,7 @@ getstrip(struct pagenode *pn, int strip) /* handle ghostscript / PC Research fax file */ if (Data[24] != 1 || Data[25] != 0){ str = i18n("Only the first page of the PC Research multipage file\n%1\nwill be shown\n") - .tqarg(TQFile::decodeName(pn->pathname)); + .arg(TQFile::decodeName(pn->pathname)); kfaxerror(i18n("Message"),str); } pn->length -= 64; @@ -462,7 +462,7 @@ getstrip(struct pagenode *pn, int strip) pn->height = G3count(pn, pn->expander == g32expand); if (pn->height == 0) { - str = i18n("No fax found in file:\n%1\n").tqarg(TQFile::decodeName(pn->pathname)); + str = i18n("No fax found in file:\n%1\n").arg(TQFile::decodeName(pn->pathname)); kfaxerror(i18n("Sorry"),str); errno = 0; badfile(pn); diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp index 1a97400c..bbc9121a 100644 --- a/kfax/kfax.cpp +++ b/kfax/kfax.cpp @@ -701,7 +701,7 @@ void TopLevel::print(){ printer.setFullPage( true ); printer.setUsePrinterResolution( true ); printer.setCreator( i18n("KFax") + " " KFAXVERSION ); - printer.setDocName( TQString("%1 - %2").tqarg(firstpage->name).tqarg(i18n("KFax"))); + printer.setDocName( TQString("%1 - %2").arg(firstpage->name).arg(i18n("KFax"))); printer.setDocFileName( firstpage->name ); printer.setPageSelection( KPrinter::ApplicationSide ); printer.setMinMax( 1, pages ); @@ -792,11 +792,11 @@ void TopLevel::printIt( KPrinter &printer, TQPainter &painter ) TQSize scaledImageSize = size; if (size.width() > maxSize.width() || size.height() > maxSize.height() ) { // Image does not fit - scale it and print centered - scaledImageSize.tqscale( maxSize, TQSize::ScaleMin ); + scaledImageSize.scale( maxSize, TQSize::ScaleMin ); kdDebug() << "Image does not fit - scaling to " << maxSize << endl; } else { // Image does fit - print it in original size, but centered - scaledImageSize.tqscale( size, TQSize::ScaleMin ); + scaledImageSize.scale( size, TQSize::ScaleMin ); kdDebug() << "Image does fit - scaling to " << size << endl; } kdDebug() << "Final image size " << scaledImageSize << endl; @@ -846,7 +846,7 @@ void TopLevel::openNetFile( const KURL &u) if ( u.isLocalFile() ) { - TQString string = i18n("Loading '%1'").tqarg(u.path()); + TQString string = i18n("Loading '%1'").arg(u.path()); statusbar->message(string); openadd( u.path()); statusbar->clear(); @@ -1441,17 +1441,17 @@ void TopLevel::uiUpdate(){ currentpage = pages; } - TQString pagestr = i18n("Page: %1 of %2").tqarg(currentpage).tqarg(pages); + TQString pagestr = i18n("Page: %1 of %2").arg(currentpage).arg(pages); statusbar->changeItem(pagestr, ID_PAGE_NO); if(Image){ - TQString wh = i18n("W: %1 H: %2").tqarg(Image->width).tqarg(Image->height); + TQString wh = i18n("W: %1 H: %2").arg(Image->width).arg(Image->height); statusbar->changeItem(wh, ID_INS_OVR); } - TQString resolution = i18n("Res: %1").tqarg(thispage->vres?i18n("Fine"):i18n("Normal")); - // TODO: resolution += TQString("%1x%2").tqarg(thispage->dpiX).tqarg(thispage->dpiY); + TQString resolution = i18n("Res: %1").arg(thispage->vres?i18n("Fine"):i18n("Normal")); + // TODO: resolution += TQString("%1x%2").arg(thispage->dpiX).arg(thispage->dpiY); statusbar->changeItem(resolution, ID_GENERAL); statusbar->changeItem(thispage->name, ID_FNAME); |