diff --git a/font.cpp b/font.cpp index b1aad09a0..02f0f7ce1 100644 --- a/font.cpp +++ b/font.cpp @@ -69,13 +69,13 @@ void font::fontNameReceiver(QString fname) set_char_p = &dviWindow::set_char; } else if (magic == GF_MAGIC) - oops(QString(i18n("The GF format for font file %1 is no longer supported")).arg(filename) ); + oops(i18n("The GF format for font file %1 is no longer supported").arg(filename) ); else if (magic == VF_MAGIC) { read_VF_index(); set_char_p = &dviWindow::set_vf_char; } else - oops(QString(i18n("Cannot recognize format for font file %1")).arg(filename) ); + oops(i18n("Cannot recognize format for font file %1").arg(filename) ); } @@ -172,7 +172,7 @@ struct glyph *font::glyphptr(unsigned int ch) { if (file == NULL) { file = fopen(QFile::encodeName(filename), "r"); if (file == NULL) { - oops(QString(i18n("Font file disappeared: %1")).arg(filename) ); + oops(i18n("Font file disappeared: %1").arg(filename) ); return NULL; } } diff --git a/kdvi_multipage.cpp b/kdvi_multipage.cpp index ae82f9f05..bf08f07da 100644 --- a/kdvi_multipage.cpp +++ b/kdvi_multipage.cpp @@ -127,7 +127,7 @@ KDVIMultiPage::~KDVIMultiPage() bool KDVIMultiPage::openFile() { document_history.clear(); - emit setStatusBarText(QString(i18n("Loading file %1")).arg(m_file)); + emit setStatusBarText(i18n("Loading file %1").arg(m_file)); bool r = window->setFile(m_file,url().ref()); if (!r) diff --git a/pk.cpp b/pk.cpp index 6ae7de1bf..58fc4ed17 100644 --- a/pk.cpp +++ b/pk.cpp @@ -199,7 +199,7 @@ void font::PK_skip_specials(void) case PK_NOOP : break; default : - oops(QString(i18n("Unexpected %1 in PK file %2")).arg(PK_flag_byte).arg(filename) ); + oops(i18n("Unexpected %1 in PK file %2").arg(PK_flag_byte).arg(filename) ); break; } } @@ -263,7 +263,7 @@ void font::read_PK_char(unsigned int ch) w = num(fp, n); h = num(fp, n); if (w > 0x7fff || h > 0x7fff) - oops(QString(i18n("The character %1 is too large in file %2")).arg(ch).arg(fontname)); + oops(i18n("The character %1 is too large in file %2").arg(ch).arg(fontname)); g->bitmap.w = w; g->bitmap.h = h; } @@ -363,9 +363,9 @@ void font::read_PK_char(unsigned int ch) paint_switch = 1 - paint_switch; } if (cp != ((BMUNIT *) (g->bitmap.bits + bytes_wide * g->bitmap.h))) - oops(QString(i18n("Wrong number of bits stored: char. %1, font %2")).arg(ch).arg(fontname)); + oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(fontname)); if (rows_left != 0 || h_bit != g->bitmap.w) - oops(QString(i18n("Bad pk file (%1), too many bits")).arg(fontname)); + oops(i18n("Bad pk file (%1), too many bits").arg(fontname)); } // The data in the bitmap is now in the processor's bit order, @@ -450,9 +450,9 @@ void font::read_PK_char(unsigned int ch) paint_switch = 1 - paint_switch; } if (cp != ((BMUNIT *) (g->bitmap.bits + bytes_wide * g->bitmap.h))) - oops(QString(i18n("Wrong number of bits stored: char. %1, font %2")).arg(ch).arg(fontname)); + oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(fontname)); if (rows_left != 0 || h_bit != g->bitmap.w) - oops(QString(i18n("Bad pk file (%1), too many bits")).arg(fontname)); + oops(i18n("Bad pk file (%1), too many bits").arg(fontname)); } } // endif: big or small Endian? } diff --git a/special.cpp b/special.cpp index 892fafcba..da6a3ca4c 100644 --- a/special.cpp +++ b/special.cpp @@ -230,7 +230,7 @@ void dviWindow::epsf_special(QString cp) foreGroundPaint.drawText (bbox, (int)(Qt::AlignCenter), EPSfilename, -1); else foreGroundPaint.drawText (bbox, (int)(Qt::AlignCenter), - QString(i18n("File not found: \n %1")).arg(EPSfilename), -1); + i18n("File not found: \n %1").arg(EPSfilename), -1); foreGroundPaint.restore(); } }