Browse Source

Remove additional unneeded tq method conversions

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
74c05bbf9d
100 changed files with 354 additions and 354 deletions
  1. 2
    2
      kamera/kcontrol/kameraconfigdialog.cpp
  2. 3
    3
      kamera/kcontrol/kameradevice.cpp
  3. 1
    1
      kamera/kioslave/kamera.cpp
  4. 1
    1
      kcoloredit/kcoloredit.h
  5. 1
    1
      kcoloredit/kxycolorselector.cpp
  6. 1
    1
      kcoloredit/kzcolorselector.cpp
  7. 2
    2
      kcoloredit/paletteviewscrolledarea.cpp
  8. 3
    3
      kdvi/TeXFontDefinition.cpp
  9. 8
    8
      kdvi/TeXFont_PFB.cpp
  10. 8
    8
      kdvi/TeXFont_PK.cpp
  11. 1
    1
      kdvi/dviFile.cpp
  12. 8
    8
      kdvi/dviRenderer.cpp
  13. 2
    2
      kdvi/dviRenderer_draw.cpp
  14. 9
    9
      kdvi/dviRenderer_export.cpp
  15. 25
    25
      kdvi/dviRenderer_prescan.cpp
  16. 1
    1
      kdvi/dviWidget.cpp
  17. 2
    2
      kdvi/fontEncoding.cpp
  18. 1
    1
      kdvi/fontEncoding.h
  19. 1
    1
      kdvi/fontMap.cpp
  20. 1
    1
      kdvi/fontMap.h
  21. 21
    21
      kdvi/fontpool.cpp
  22. 5
    5
      kdvi/infodialog.cpp
  23. 3
    3
      kdvi/kdvi_multipage.cpp
  24. 2
    2
      kdvi/main.cpp
  25. 1
    1
      kdvi/optionDialogSpecialWidget_base.ui
  26. 7
    7
      kdvi/psgs.cpp
  27. 8
    8
      kdvi/special.cpp
  28. 1
    1
      kdvi/vf.cpp
  29. 6
    6
      kfax/faxinput.cpp
  30. 8
    8
      kfax/kfax.cpp
  31. 3
    3
      kfaxview/faxrenderer.cpp
  32. 2
    2
      kfaxview/libkfaximage/kfaximage.cpp
  33. 2
    2
      kfaxview/main.cpp
  34. 1
    1
      kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
  35. 2
    2
      kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
  36. 5
    5
      kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
  37. 7
    7
      kfile-plugins/exr/kfile_exr.cpp
  38. 1
    1
      kfile-plugins/jpeg/exif.cpp
  39. 5
    5
      kfile-plugins/pdf/kfile_pdf.cpp
  40. 2
    2
      kfile-plugins/rgb/kfile_rgb.cpp
  41. 4
    4
      kgamma/kcmkgamma/kgamma.cpp
  42. 4
    4
      kghostview/displayoptions.cpp
  43. 1
    1
      kghostview/gssettingswidget.ui.h
  44. 1
    1
      kghostview/kdscerrordialog.cpp
  45. 6
    6
      kghostview/kgv_miniwidget.cpp
  46. 4
    4
      kghostview/kgv_view.cpp
  47. 2
    2
      kghostview/kgvconfigdialog.cpp
  48. 18
    18
      kghostview/kgvdocument.cpp
  49. 2
    2
      kghostview/kgvshell.cpp
  50. 3
    3
      kghostview/kpswidget.cpp
  51. 3
    3
      kghostview/scrollbox.cpp
  52. 3
    3
      kiconedit/kcolorgrid.cpp
  53. 5
    5
      kiconedit/kicon.cpp
  54. 1
    1
      kiconedit/kiconedit.cpp
  55. 5
    5
      kiconedit/kiconeditslots.cpp
  56. 2
    2
      kiconedit/kicongrid.cpp
  57. 2
    2
      kmrml/kmrml/kcontrol/indexer.cpp
  58. 1
    1
      kmrml/kmrml/kcontrol/mainpage.cpp
  59. 3
    3
      kmrml/kmrml/lib/mrml_shared.cpp
  60. 2
    2
      kmrml/kmrml/lib/mrml_shared.h
  61. 6
    6
      kmrml/kmrml/mrml.cpp
  62. 1
    1
      kmrml/kmrml/mrml_elements.cpp
  63. 2
    2
      kmrml/kmrml/mrml_part.cpp
  64. 3
    3
      kmrml/kmrml/mrml_view.cpp
  65. 4
    4
      kmrml/kmrml/propertysheet.cpp
  66. 1
    1
      kmrml/kmrml/propertysheet.h
  67. 2
    2
      kmrml/kmrml/server/watcher.cpp
  68. 3
    3
      kolourpaint/BUGS
  69. 3
    3
      kolourpaint/kpcommandhistory.cpp
  70. 3
    3
      kolourpaint/kpcommandhistory.h
  71. 6
    6
      kolourpaint/kpdocument.cpp
  72. 6
    6
      kolourpaint/kpdocumentsaveoptionswidget.cpp
  73. 2
    2
      kolourpaint/kpmainwindow.cpp
  74. 8
    8
      kolourpaint/kpmainwindow_view.cpp
  75. 2
    2
      kolourpaint/kptool.cpp
  76. 2
    2
      kolourpaint/kpview.cpp
  77. 2
    2
      kolourpaint/kpviewmanager.cpp
  78. 2
    2
      kolourpaint/kpviewscrollablecontainer.cpp
  79. 2
    2
      kolourpaint/patches/doc_resize_no_flicker.diff
  80. 2
    2
      kolourpaint/pixmapfx/kpeffectbalance.cpp
  81. 5
    5
      kolourpaint/tools/kptoolautocrop.cpp
  82. 1
    1
      kolourpaint/tools/kptoolautocrop.h
  83. 1
    1
      kolourpaint/tools/kptoolbrush.cpp
  84. 1
    1
      kolourpaint/tools/kptoolpolygon.cpp
  85. 1
    1
      kolourpaint/tools/kptoolpreviewdialog.cpp
  86. 1
    1
      kolourpaint/tools/kptoolrectangle.cpp
  87. 1
    1
      kolourpaint/tools/kptoolrectangle.h
  88. 5
    5
      kolourpaint/tools/kptoolresizescale.cpp
  89. 1
    1
      kolourpaint/views/kpthumbnailview.cpp
  90. 1
    1
      kolourpaint/widgets/kpcolorsimilaritycube.cpp
  91. 1
    1
      kolourpaint/widgets/kptooltoolbar.cpp
  92. 16
    16
      kolourpaint/widgets/kptoolwidgetbrush.cpp
  93. 1
    1
      kolourpaint/widgets/kptoolwidgetbrush.h
  94. 1
    1
      kolourpaint/widgets/kptoolwidgetspraycansize.cpp
  95. 4
    4
      kooka/img_saver.cpp
  96. 1
    1
      kooka/imgprintdialog.cpp
  97. 1
    1
      kooka/kadmosocr.cpp
  98. 2
    2
      kooka/kocrkadmos.cpp
  99. 2
    2
      kooka/kookapref.cpp
  100. 0
    0
      kooka/kookaview.cpp

+ 2
- 2
kamera/kcontrol/kameraconfigdialog.cpp View File

@@ -221,14 +221,14 @@ void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
return;
}

// Append all this widgets tqchildren
// Append all this widgets children
for(int i = 0; i < gp_widget_count_children(widget); ++i) {
CameraWidget *widget_child;
gp_widget_get_child(widget, i, &widget_child);
appendWidget(newParent, widget_child);
}
// Things that must be done after all tqchildren were added
// Things that must be done after all children were added
/*
switch (widget_type) {
case GP_WIDGET_SECTION:

+ 3
- 3
kamera/kcontrol/kameradevice.cpp View File

@@ -86,7 +86,7 @@ bool KCamera::initInformation()
int index = gp_abilities_list_lookup_model(m_abilitylist, m_model.local8Bit().data());
if(index < 0) {
emit error(i18n("Description of abilities for camera %1 is not available."
" Configuration options may be incorrect.").tqarg(m_model));
" Configuration options may be incorrect.").arg(m_model));
return false;
}
gp_abilities_list_get_abilities(m_abilitylist, index, &m_abilities);
@@ -432,7 +432,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
int index = gp_abilities_list_lookup_model(m_device->m_abilitylist, model.local8Bit().data());
if(index < 0) {
slot_error(i18n("Description of abilities for camera %1 is not available."
" Configuration options may be incorrect.").tqarg(model));
" Configuration options may be incorrect.").arg(model));
}
int result = gp_abilities_list_get_abilities(m_device->m_abilitylist, index, &abilities);
if (result == GP_OK) {
@@ -452,7 +452,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
setPortType(INDEX_USB);
} else {
slot_error(i18n("Description of abilities for camera %1 is not available."
" Configuration options may be incorrect.").tqarg(model));
" Configuration options may be incorrect.").arg(model));
}
}


+ 1
- 1
kamera/kioslave/kamera.cpp View File

@@ -242,7 +242,7 @@ void KameraProtocol::get(const KURL &url)

#undef GPHOTO_TEXT_FILE
// emit info message
infoMessage( i18n("Retrieving data from camera <b>%1</b>").tqarg(url.user()) );
infoMessage( i18n("Retrieving data from camera <b>%1</b>").arg(url.user()) );

// Note: There's no need to re-read directory for each get() anymore
gp_file_new(&m_file);

+ 1
- 1
kcoloredit/kcoloredit.h View File

@@ -74,7 +74,7 @@ class KColorEditApp : public KMainWindow
KColorEditDoc *document() const;

protected:
/** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
/** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
* file
*/
void saveOptions();

+ 1
- 1
kcoloredit/kxycolorselector.cpp View File

@@ -42,7 +42,7 @@ void KXYColorSelector::setType(const int type) {

void KXYColorSelector::updateContents() {
drawPalette(&pixmap);
tqrepaint();
repaint();
}

void KXYColorSelector::resizeEvent(TQResizeEvent*) {

+ 1
- 1
kcoloredit/kzcolorselector.cpp View File

@@ -53,7 +53,7 @@ void KZColorSelector::setType(const int type) {

void KZColorSelector::updateContents() {
drawPalette(&pixmap);
tqrepaint(false);
repaint(false);
}

void KZColorSelector::resizeEvent(TQResizeEvent*) {

+ 2
- 2
kcoloredit/paletteviewscrolledarea.cpp View File

@@ -77,7 +77,7 @@ void PaletteViewScrolledArea::redraw() {
}

void PaletteViewScrolledArea::repaintPalette() {
tqrepaint(false);
repaint(false);
}

void PaletteViewScrolledArea::checkSelectionAutoScroll(const int mousePosY) {
@@ -220,7 +220,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
setCellsSizes();
TQPixmap pixmap(size());
TQPainter painter;
painter.tqbegin(TQT_TQPAINTDEVICE(&pixmap), this);
painter.begin(TQT_TQPAINTDEVICE(&pixmap), this);
TQFontMetrics fontMetrics = painter.fontMetrics();
int maxLineWidth;
if(viewColorNames) {

+ 3
- 3
kdvi/TeXFontDefinition.cpp View File

@@ -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.").tqarg(fontname).tqarg(filename) << endl;
kdError(4300) << i18n("Cannot find font %1, file %2.").arg(fontname).arg(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").tqarg(filename) << endl;
kdWarning(4300) << i18n("Checksum mismatch for font file %1").arg(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").tqarg(filename) << endl;
kdError(4300) << i18n("Cannot recognize format for font file %1").arg(filename) << endl;
#endif
}


+ 8
- 8
kdvi/TeXFont_PFB.cpp View File

@@ -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.").tqarg(parent->filename);
errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").arg(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.").tqarg(parent->filename);
errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").arg(parent->filename);
kdError(4300) << errorMessage << endl;
fatalErrorInFontLoading = true;
return;
@@ -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.").tqarg(parent->filename);
TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").arg(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.").tqarg(ch).tqarg(parent->filename);
TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").arg(ch).arg(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.").tqarg(ch).tqarg(parent->filename);
TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").arg(ch).arg(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.").tqarg(ch);
kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").tqarg(ch).tqarg(parent->filename) << endl;
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;
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.").tqarg(ch).tqarg(parent->filename);
TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
if (errorMessage.isEmpty())
errorMessage = msg;
kdError(4300) << msg << endl;

+ 8
- 8
kdvi/TeXFont_PK.cpp View File

@@ -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.").tqarg(parent->filename) << endl;
kdError(4300) << i18n("Cannot open font file %1.").arg(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").tqarg(ch).tqarg(parent->filename) << endl;
kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").arg(ch).arg(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").tqarg(PK_flag_byte).tqarg(parent->filename) );
oops(i18n("Unexpected %1 in PK file %2").arg(PK_flag_byte).arg(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").tqarg(ch).tqarg(parent->filename));
oops(i18n("The character %1 is too large in file %2").arg(ch).arg(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").tqarg(ch).tqarg(parent->filename));
oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(parent->filename));
if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
oops(i18n("Bad pk file (%1), too many bits").arg(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").tqarg(ch).tqarg(parent->filename));
oops(i18n("Wrong number of bits stored: char. %1, font %2").arg(ch).arg(parent->filename));
if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename));
}
} // endif: big or small Endian?
}

+ 1
- 1
kdvi/dviFile.cpp View File

@@ -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.").tqarg(i+1);
errorMsg = i18n("The page %1 does not start with the BOP command.").arg(i+1);
return;
}
command_pointer += 10 * 4;

+ 8
- 8
kdvi/dviRenderer.cpp View File

@@ -437,7 +437,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
if (!fi.exists() || fi.isDir()) {
KMessageBox::error( parentWidget,
i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist. "
"KDVI already tried to add the ending '.dvi'.</qt>").tqarg(filename),
"KDVI already tried to add the ending '.dvi'.</qt>").arg(filename),
i18n("File Error!"));
return false;
}
@@ -451,8 +451,8 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
KMessageBox::sorry( parentWidget,
i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr> which has "
"type <strong>%2</strong>. KDVI can only load DVI (.dvi) files.</qt>" )
.tqarg( fname )
.tqarg( mimetype ) );
.arg( fname )
.arg( mimetype ) );
return false;
}
@@ -462,7 +462,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
KMessageBox::sorry( parentWidget,
i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
"likely this means that the DVI file is broken.</qt>")
.tqarg( fname ) );
.arg( fname ) );
return false;
}

@@ -641,7 +641,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
"line %1 in the TeX-file <strong>%2</strong>. 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.</qt>").tqarg(refLineNumber).tqarg(refFileName),
"information. Press the F1 key to open the manual.</qt>").arg(refLineNumber).arg(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("<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
"line %1 in the TeX-file <strong>%2</strong>.</qt>").tqarg(refLineNumber).tqarg(refFileName),
"line %1 in the TeX-file <strong>%2</strong>.</qt>").arg(refLineNumber).arg(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("<qt>") +
i18n("The DVI-file refers to the TeX-file "
"<strong>%1</strong> which could not be found.").tqarg(KShellProcess::quote(TeXfile)) +
"<strong>%1</strong> which could not be found.").arg(KShellProcess::quote(TeXfile)) +
TQString("</qt>"),
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 <strong>document info "
"dialog</strong> 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.</qt>").tqarg(command);
"and a list of common problems.</qt>").arg(command);
info->clear(i18n("Starting the editor..."));

+ 2
- 2
kdvi/dviRenderer_draw.cpp View File

@@ -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.").tqarg(ch - FNTNUM0);
errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(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.").tqarg(ch);
errorMsg = i18n("The unknown op-code %1 was encountered.").arg(ch);
return;
} /* end switch*/
} /* end else (ch not a SETCHAR or FNTNUM) */

+ 9
- 9
kdvi/dviRenderer_export.cpp View File

@@ -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?").tqarg(fileName),
int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
i18n("Overwrite File"), i18n("Overwrite"));
if (r == KMessageBox::Cancel)
return;
@@ -137,12 +137,12 @@ void dviRenderer::exportPDF()
export_errorString = i18n("<qt>The external program 'dvipdf', which was used to export the file, reported an error. "
"You might wish to look at the <strong>document info dialog</strong> which you will "
"find in the File-Menu for a precise error report.</qt>") ;
info->clear(i18n("Export: %1 to PDF").tqarg(KShellProcess::quote(dviFile->filename)));
info->clear(i18n("Export: %1 to PDF").arg(KShellProcess::quote(dviFile->filename)));

proc->clearArguments();
finfo.setFile(dviFile->filename);
*proc << TQString("cd %1; dvipdfm").tqarg(KShellProcess::quote(finfo.dirPath(true)));
*proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
*proc << TQString("cd %1; dvipdfm").arg(KShellProcess::quote(finfo.dirPath(true)));
*proc << TQString("-o %1").arg(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?").tqarg(fileName),
int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(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("<qt>The external program 'dvips', which was used to export the file, reported an error. "
"You might wish to look at the <strong>document info dialog</strong> which you will "
"find in the File-Menu for a precise error report.</qt>") ;
info->clear(i18n("Export: %1 to PostScript").tqarg(KShellProcess::quote(dviFile->filename)));
info->clear(i18n("Export: %1 to PostScript").arg(KShellProcess::quote(dviFile->filename)));
proc->clearArguments();
TQFileInfo finfo(dviFile->filename);
*proc << TQString("cd %1; dvips").tqarg(KShellProcess::quote(finfo.dirPath(true)));
*proc << TQString("cd %1; dvips").arg(KShellProcess::quote(finfo.dirPath(true)));
if (printer == 0)
*proc << "-z"; // export Hyperlinks
if (options.isEmpty() == false)
*proc << options;
*proc << TQString("%1").tqarg(KShellProcess::quote(sourceFileName));
*proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
*proc << TQString("%1").arg(KShellProcess::quote(sourceFileName));
*proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
proc->closeStdin();
if (proc->start(KProcess::NotifyOnExit, KProcess::Stderr) == false) {
kdError(4300) << "dvips failed to start" << endl;

+ 25
- 25
kdvi/dviRenderer_prescan.cpp View File

@@ -84,7 +84,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)

TQString originalFName = EPSfilename;

embedPS_progress->setLabel(i18n("Embedding %1").tqarg(EPSfilename));
embedPS_progress->setLabel(i18n("Embedding %1").arg(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 <strong>%2</strong> could not be found.<br>").tqarg(page+1).tqarg(originalFName);
errorMsg += i18n("Page %1: The PostScript file <strong>%2</strong> could not be found.<br>").arg(page+1).arg(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").tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury);
TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").arg(llx).arg(lly).arg(urx).arg(ury);
if (rwi != 0)
PS.append( TQString(" %1 @rwi").tqarg(rwi) );
PS.append( TQString(" %1 @rwi").arg(rwi) );
if (rhi != 0)
PS.append( TQString(" %1 @rhi").tqarg(rhi) );
PS.append( TQString(" %1 @rhi").arg(rhi) );
if (angle != 0)
PS.append( TQString(" %1 @angle").tqarg(angle) );
PS.append( TQString(" %1 @angle").arg(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.").tqarg(cp));
printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").arg(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").tqarg(_file) );
PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").arg(_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").tqarg(PS_H).tqarg(PS_V) );
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(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").tqarg(PS_H).tqarg(PS_V) );
PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(11)) );
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(11)) );
} else {
if (cp.find("ps::[end]", 0, false) == 0) {
PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(9)) );
PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(9)) );
} else {
if (cp.find("ps::", 0, false) == 0) {
PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(4)) );
PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(4)) );
} else {
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(3)) );
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
PostScriptOutPutString->append( TQString(" %1\n").arg(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").tqarg(PS_H).tqarg(PS_V) );
PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
PostScriptOutPutString->append( "@beginspecial " );
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) );
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) );
if (rwi != 0)
PostScriptOutPutString->append( TQString(" %1 @rwi").tqarg(rwi) );
PostScriptOutPutString->append( TQString(" %1 @rwi").arg(rwi) );
if (rhi != 0)
PostScriptOutPutString->append( TQString(" %1 @rhi").tqarg(rhi) );
PostScriptOutPutString->append( TQString(" %1 @rhi").arg(rhi) );
if (angle != 0)
PostScriptOutPutString->append( TQString(" %1 @angle").tqarg(angle) );
PostScriptOutPutString->append( TQString(" %1 @angle").arg(angle) );
if (clip != -1)
PostScriptOutPutString->append(" @clip");
PostScriptOutPutString->append( " @setspecial \n" );
PostScriptOutPutString->append( TQString(" (%1) run\n").tqarg(EPSfilename) );
PostScriptOutPutString->append( TQString(" (%1) run\n").arg(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.").tqarg(ch - FNTNUM0);
errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0);
return;
}
currinf.set_char_p = currinf.fontp->set_char_p;

+ 1
- 1
kdvi/dviWidget.cpp View File

@@ -112,7 +112,7 @@ void DVIWidget::mouseMoveEvent(TQMouseEvent* e)
if (cp[i].isDigit() == false)
break;
emit setStatusBarText( i18n("line %1 of %2").tqarg(cp.left(i)).tqarg(cp.mid(i).simplifyWhiteSpace()) );
emit setStatusBarText( i18n("line %1 of %2").arg(cp.left(i)).arg(cp.mid(i).simplifyWhiteSpace()) );
return;
}
}

+ 2
- 2
kdvi/fontEncoding.cpp View File

@@ -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.").tqarg(encName) << endl;
kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").arg(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.").tqarg(encFileName) << endl;
kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").arg(encFileName) << endl;
return;
}


+ 1
- 1
kdvi/fontEncoding.h View File

@@ -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 tqshaped.
* it, and retrieve the character shaped.
*
* 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

+ 1
- 1
kdvi/fontMap.cpp View File

@@ -98,7 +98,7 @@ fontMap::fontMap()
}
file.close();
} else
kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").tqarg(map_fileName) << endl;
kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").arg(map_fileName) << endl;
#ifdef DEBUG_FONTMAP
kdDebug(4300) << "FontMap file parsed. Results:" << endl;

+ 1
- 1
kdvi/fontMap.h View File

@@ -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 tqshaped. Happy times, they
* file, load it, and retrieve the character shaped. Happy times, they
* were.
*
* Today TeX is also used to access Type1 and TrueType fonts, which do

+ 21
- 21
kdvi/fontpool.cpp View File

@@ -187,12 +187,12 @@ TQString fontPool::status()

text.append("<table WIDTH=\"100%\" NOSAVE >");
text.append( TQString("<tr><td><b>%1</b></td> <td><b>%2</b></td> <td><b>%3</b></td> <td><b>%4</b> <td><b>%5</b></td> <td><b>%6</b></td></tr>")
.tqarg(i18n("TeX Name"))
.tqarg(i18n("Family"))
.tqarg(i18n("Zoom"))
.tqarg(i18n("Type"))
.tqarg(i18n("Encoding"))
.tqarg(i18n("Comment")) );
.arg(i18n("TeX Name"))
.arg(i18n("Family"))
.arg(i18n("Zoom"))
.arg(i18n("Type"))
.arg(i18n("Encoding"))
.arg(i18n("Comment")) );

TeXFontDefinition *fontp = fontList.first();
while ( fontp != 0 ) {
@@ -210,12 +210,12 @@ TQString fontPool::status()

#ifdef HAVE_FREETYPE
tmp << TQString ("<tr><td>%1</td> <td>%2</td> <td>%3%</td> <td>%4</td> <td>%5</td> <td>%6</td></tr>")
.tqarg(fontp->fontname)
.tqarg(fontp->getFullFontName())
.tqarg((int)(fontp->enlargement*100 + 0.5))
.tqarg(fontp->getFontTypeName())
.tqarg(encoding)
.tqarg(errMsg);
.arg(fontp->fontname)
.arg(fontp->getFullFontName())
.arg((int)(fontp->enlargement*100 + 0.5))
.arg(fontp->getFontTypeName())
.arg(encoding)
.arg(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("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(kpsewhichOutput);
TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").arg(getenv("PATH")).arg(kpsewhichOutput);
KMessageBox::detailedError( 0, i18n("<qt><p>KDVI was not able to locate all the font files "
"which are necessary to display the current DVI file. "
"Your document might be unreadable.</p></qt>"),
@@ -330,17 +330,17 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
numFontsInJob++;
if (locateTFMonly == true)
shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").tqarg(fontp->fontname));
shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").arg(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").tqarg(filename));
shellProcessCmdLine += KShellProcess::quote(TQString("%1").arg(filename));
}
#endif
shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").tqarg(fontp->fontname));
shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").tqarg(fontp->fontname));
shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").arg(fontp->fontname));
shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").arg(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.<p>" );
TQApplication::restoreOverrideCursor();
KMessageBox::error( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg),
KMessageBox::error( 0, TQString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(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.</p>");
TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(kpsewhichOutput);
TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").arg(getenv("PATH")).arg(kpsewhichOutput);
KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg), details,
KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(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").tqarg(fontName).tqarg(dpi) );
progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").arg(fontName).arg(dpi) );
}
MetafontOutput = MetafontOutput.remove(0,numleft+1);
}

+ 5
- 5
kdvi/infodialog.cpp View File

@@ -64,17 +64,17 @@ void infoDialog::setDVIData(dvifile *dviFile)
text = i18n("There is no DVI file loaded at the moment.");
else {
text.append("<table WIDTH=\"100%\" NOSAVE >");
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("Filename")).tqarg(dviFile->filename));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("Filename")).arg(dviFile->filename));

TQFile file(dviFile->filename);
if (file.exists())
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("File Size")).tqarg(KIO::convertSize(file.size())));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(KIO::convertSize(file.size())));
else
text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").tqarg(i18n("The file does no longer exist.")));
text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").arg(i18n("The file does no longer exist.")));

text.append(TQString("<tr><td><b> </b></td> <td> </td></tr>"));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("#Pages")).tqarg(dviFile->total_pages));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("Generator/Date")).tqarg(dviFile->generatorString));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("#Pages")).arg(dviFile->total_pages));
text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("Generator/Date")).arg(dviFile->generatorString));
} // else (dviFile == NULL)

TextLabel1->setText( text );

+ 3
- 3
kdvi/kdvi_multipage.cpp View File

@@ -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?").tqarg(fileName),
int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(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").tqarg(m_file.section('/', -1)) ))
if (!printer->setup(parentWdg, i18n("Print %1").arg(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").tqarg(*it);
dvips_options += TQString("%1").arg(*it);
}

// Now print. For that, export the DVI-File to PostScript. Note that

+ 2
- 2
kdvi/main.cpp View File

@@ -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.")).tqarg(args->arg(0)) << endl;
kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(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.")).tqarg(args->arg(0)) << endl;
"files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
return -1;
}


+ 1
- 1
kdvi/optionDialogSpecialWidget_base.ui View File

@@ -169,7 +169,7 @@
<property name="text">
<string>What is 'inverse search'? </string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="url" stdset="0">

+ 7
- 7
kdvi/psgs.cpp View File

@@ -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").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 << 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 << "-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.").tqarg(*gsDevice) << endl;
"the '%1' ghostview device driver.").arg(*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."
"</p></qt>"));
else {
kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").tqarg(*gsDevice) << endl;
kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").arg(*gsDevice) << endl;
gs_generate_graphics_file(page, filename, magnification);
}
return;

+ 8
- 8
kdvi/special.cpp View File

@@ -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." ).
tqarg(dviFile->filename).tqarg(current_page));
arg(dviFile->filename).arg(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")
.tqarg(argument_name).tqarg(strg) << endl;
.arg(argument_name).arg(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").tqarg(EPSfilename_orig), -1);
i18n("File not found: \n %1").arg(EPSfilename_orig), -1);
foreGroundPainter->restore();
}
@@ -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'.").tqarg(cp) );
printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").arg(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'.").tqarg(cp) );
printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").arg(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'.").tqarg(cp) );
printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").arg(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." ).
tqarg(dviFile->filename).tqarg(current_page));
arg(dviFile->filename).arg(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.").tqarg(special_command));
printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").arg(special_command));
return;
}

+ 1
- 1
kdvi/vf.cpp View File

@@ -177,7 +177,7 @@ void TeXFontDefinition::read_VF_index()
}
}
if (cmnd != POST)
oops(i18n("Wrong command byte found in VF macro list: %1").tqarg(cmnd));
oops(i18n("Wrong command byte found in VF macro list: %1").arg(cmnd));
fclose (VF_file);
file = NULL;

+ 6
- 6
kfax/faxinput.cpp View File

@@ -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);

+ 8
- 8
kfax/kfax.cpp View File

@@ -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);

+ 3
- 3
kfaxview/faxrenderer.cpp View File

@@ -136,7 +136,7 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
TQString filename = fi.absFilePath();
if (!fi.exists() || fi.isDir()) {
KMessageBox::error( parentWidget,
i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").arg(filename),
i18n("File Error"));
// the return value 'false' indicates that this operation was not successful.
mutex.unlock();
@@ -157,11 +157,11 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
// this case gracefully.
if (fax.errorString().isEmpty())
KMessageBox::error( parentWidget,
i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
i18n("File Error"));
else
KMessageBox::detailedError( parentWidget,
i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
fax.errorString(),
i18n("File Error"));
clear();

+ 2
- 2
kfaxview/libkfaximage/kfaximage.cpp View File

@@ -327,7 +327,7 @@ KFaxImage::notetiff()
case 279: /* StripByteCounts */
if (count != nstrips) {
str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n")
.tqarg(filename()).tqarg(nstrips).tqarg(count);
.arg(filename()).arg(nstrips).arg(count);
kfaxerror(str);
goto realbad;
}
@@ -403,7 +403,7 @@ KFaxImage::notetiff()
void
KFaxImage::badfile(pagenode *pn)
{
kfaxerror(i18n("%1: Bad Fax File").tqarg(filename()));
kfaxerror(i18n("%1: Bad Fax File").arg(filename()));
FreeImage(pn);
}


+ 2
- 2
kfaxview/main.cpp View File

@@ -97,14 +97,14 @@ int main(int argc, char** argv)

if (!url.isValid())
{
kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl;
kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(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.")).tqarg(args->arg(0)) << endl;
"files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
return -1;
}


+ 1
- 1
kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc View File

@@ -68,7 +68,7 @@ int PageTransition::duration() const
return data->pt->getDuration();
}

PageTransition::Alignment PageTransition::tqalignment() const
PageTransition::Alignment PageTransition::alignment() const
{
return (Poppler::PageTransition::Alignment)data->pt->getAlignment();
}

+ 2
- 2
kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h View File

@@ -60,7 +60,7 @@ class PageTransition {
Fade
};
/** \brief tqalignment of the transition effect that shall be used
/** \brief alignment of the transition effect that shall be used
*/
// if changed remember to keep in sync with PageTransition.h enum
enum Alignment {
@@ -114,7 +114,7 @@ class PageTransition {
/**
\brief Get dimension in which the transition effect occurs.
*/
Alignment tqalignment() const;
Alignment alignment() const;
/**
\brief Get direction of motion of the transition effect.

+ 5
- 5
kfile-plugins/dependencies/poppler-tqt/poppler-private.cc View File

@@ -79,7 +79,7 @@ GooString *TQStringToGooString(const TQString &s)
int len = s.length();
char *cstring = (char *)gmallocn(s.length(), sizeof(char));
for (int i = 0; i < len; ++i)
cstring[i] = s.tqat(i).tqunicode();
cstring[i] = s.at(i).tqunicode();
GooString *ret = new GooString(cstring, len);
gfree(cstring);
return ret;
@@ -136,11 +136,11 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G
}
}

// 3. recursively descend over tqchildren
// 3. recursively descend over children
outlineItem->open();
GooList * tqchildren = outlineItem->getKids();
if ( tqchildren )
addTocChildren( docSyn, &item, tqchildren );
GooList * children = outlineItem->getKids();
if ( children )
addTocChildren( docSyn, &item, children );
}
}


+ 7
- 7
kfile-plugins/exr/kfile_exr.cpp View File

@@ -237,10 +237,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
#endif
TQString UTCOffset;
if (utcOffset(h)>0.0) {
UTCOffset.append(TQString("%1").tqarg(utcOffset(h)/3600, 0, 'f', 1));
UTCOffset.append(TQString("%1").arg(utcOffset(h)/3600, 0, 'f', 1));
UTCOffset.append(" hours behind UTC");
} else {
UTCOffset.append(TQString("%1").tqarg(-1.0*utcOffset(h)/3600, 0, 'f', 1));
UTCOffset.append(TQString("%1").arg(-1.0*utcOffset(h)/3600, 0, 'f', 1));
UTCOffset.append(" hours ahead of UTC");
}
appendItem( stdgroup, "UTC Offset", UTCOffset);
@@ -264,10 +264,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
if ( hasLongitude(h) ) {
TQString Longitude;
if (longitude(h)<0.0) {
Longitude.append(TQString("%1").tqarg(-1.0*longitude(h),0,'f',3));
Longitude.append(TQString("%1").arg(-1.0*longitude(h),0,'f',3));
Longitude.append(" deg West");
} else {
Longitude.append(TQString("%1").tqarg(longitude(h),0,'f',3));
Longitude.append(TQString("%1").arg(longitude(h),0,'f',3));
Longitude.append(" deg East");
}
appendItem( stdgroup, "Longitude", Longitude);
@@ -275,17 +275,17 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
if ( hasLatitude(h) ) {
TQString Latitude;
if (latitude(h)<0.0) {
Latitude.append(TQString("%1").tqarg(-1.0*latitude(h),0,'f',3));
Latitude.append(TQString("%1").arg(-1.0*latitude(h),0,'f',3));
Latitude.append(" deg South");
} else {
Latitude.append(TQString("%1").tqarg(latitude(h),0,'f',3));
Latitude.append(TQString("%1").arg(latitude(h),0,'f',3));
Latitude.append(" deg North");
}
appendItem( stdgroup, "Latitude", Latitude );
}
if ( hasAltitude(h) ) {
double Altitude = altitude(h);
appendItem( stdgroup, "Altitude", TQString("%1").tqarg(Altitude,0,'f',1) );
appendItem( stdgroup, "Altitude", TQString("%1").arg(Altitude,0,'f',1) );
}
if ( hasIsoSpeed(h) ) {
double IsoSpeed = isoSpeed(h);

+ 1
- 1
kfile-plugins/jpeg/exif.cpp View File

@@ -803,7 +803,7 @@ void ExifData::process_EXIF(unsigned char * CharBuf, unsigned int length)
// printf("Exif section in Motorola order\n");
MotorolaOrder = 1;
}else{
throw FatalError("Invalid Exif tqalignment marker.");
throw FatalError("Invalid Exif alignment marker.");
}
}


+ 5
- 5
kfile-plugins/pdf/kfile_pdf.cpp View File

@@ -83,16 +83,16 @@ bool KPdfPlugin::readInfo( KFileMetaInfo& info, uint /* what */)
if (doc->isEncrypted())
{
enc = i18n("Yes (Can Print:%1 Can Copy:%2 Can Change:%3 Can Add notes:%4)")
.tqarg(doc->okToPrint() ? i18n("Yes") : i18n("No"))
.tqarg(doc->okToCopy() ? i18n("Yes") : i18n("No"))
.tqarg(doc->okToChange() ? i18n("Yes") : i18n("No"))
.tqarg(doc->okToAddNotes() ? i18n("Yes") : i18n("No"));
.arg(doc->okToPrint() ? i18n("Yes") : i18n("No"))
.arg(doc->okToCopy() ? i18n("Yes") : i18n("No"))
.arg(doc->okToChange() ? i18n("Yes") : i18n("No"))
.arg(doc->okToAddNotes() ? i18n("Yes") : i18n("No"));
}
else enc = i18n("No");
appendItem(generalGroup, "Protected", enc );
appendItem(generalGroup, "Linearized", doc->isLinearized() ? i18n("Yes") : i18n("No") );
TQString versionString = TQString("%1").tqarg( doc->getPDFVersion(), 0, 'f', 1 );
TQString versionString = TQString("%1").arg( doc->getPDFVersion(), 0, 'f', 1 );
appendItem(generalGroup, "Version", versionString );

delete doc;

+ 2
- 2
kfile-plugins/rgb/kfile_rgb.cpp View File

@@ -134,7 +134,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
long compressed = file.size() - 512;
long verbatim = xsize * ysize * zsize;
appendItem(group, "Compression", i18n("Runlength Encoded")
+ TQString(", %1%").tqarg(compressed * 100.0 / verbatim, 0, 'f', 1));
+ TQString(", %1%").arg(compressed * 100.0 / verbatim, 0, 'f', 1));

long k;
TQ_UINT32 offs;
@@ -152,7 +152,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
k += it.data();

if (k)
appendItem(group, "SharedRows", TQString("%1%").tqarg(k * 100.0
appendItem(group, "SharedRows", TQString("%1%").arg(k * 100.0
/ (ysize * zsize), 0, 'f', 1));
else
appendItem(group, "SharedRows", i18n("None"));

+ 4
- 4
kgamma/kcmkgamma/kgamma.cpp View File

@@ -264,7 +264,7 @@ void KGamma::setupUI() {

screenselect = new TQComboBox( options );
for ( int i = 0; i < ScreenCount; i++ )
screenselect->insertItem( i18n("Screen %1").tqarg(i+1) );
screenselect->insertItem( i18n("Screen %1").arg(i+1) );
screenselect->setCurrentItem(currentScreen);
connect(screenselect, TQT_SIGNAL(activated(int)), TQT_SLOT(changeScreen(int)));

@@ -351,7 +351,7 @@ void KGamma::save() {

if ( !xf86cfgbox->isChecked() ) { //write gamma settings to the users config
for (int i = 0; i < ScreenCount; i++) {
config->setGroup( TQString("Screen %1").tqarg(i) );
config->setGroup( TQString("Screen %1").arg(i) );
config->writeEntry("rgamma", rgamma[i]);
config->writeEntry("ggamma", ggamma[i]);
config->writeEntry("bgamma", bgamma[i]);
@@ -405,7 +405,7 @@ bool KGamma::loadUserSettings() {
KConfig *config = new KConfig("kgammarc");

for (int i = 0; i < ScreenCount; i++) {
config->setGroup(TQString( "Screen %1" ).tqarg(i) );
config->setGroup(TQString( "Screen %1" ).arg(i) );
rgamma[i] = config->readEntry("rgamma");
ggamma[i] = config->readEntry("ggamma");
bgamma[i] = config->readEntry("bgamma");
@@ -610,7 +610,7 @@ extern "C"

for (int i = 0; i < xv._ScreenCount(); i++) {
xv.setScreen(i);
config->setGroup( TQString("Screen %1").tqarg(i) );
config->setGroup( TQString("Screen %1").arg(i) );

if ((rgamma = config->readEntry("rgamma").toFloat()))
xv.setGamma(XVidExtWrap::Red, rgamma);

+ 4
- 4
kghostview/displayoptions.cpp View File

@@ -68,10 +68,10 @@ namespace {
TQString DisplayOptions::toString( const DisplayOptions& options )
{
return TQString( qformat )
.tqarg( options.page() )
.tqarg( options.magnification() )
.tqarg( options.overrideOrientation() )
.tqarg( options.overridePageMedia().utf8().data() );
.arg( options.page() )
.arg( options.magnification() )
.arg( options.overrideOrientation() )
.arg( options.overridePageMedia().utf8().data() );
}

bool DisplayOptions::fromString( DisplayOptions& out, const TQString& in )

+ 1
- 1
kghostview/gssettingswidget.ui.h View File

@@ -9,6 +9,6 @@

void GSSettingsWidget::setDetectedVersion( TQString v)
{
mDetectedVersion->setText(mDetectedVersion->text().tqarg( v ));
mDetectedVersion->setText(mDetectedVersion->text().arg( v ));
}


+ 1
- 1
kghostview/kdscerrordialog.cpp View File

@@ -97,7 +97,7 @@ KDSCErrorHandler::Response KDSCErrorDialog::error( const KDSCError& err )
break;
}

_lineNumberLabel->setText( i18n( "On line %1:" ).tqarg( err.lineNumber() ) );
_lineNumberLabel->setText( i18n( "On line %1:" ).arg( err.lineNumber() ) );
_lineLabel->setText( err.line() );
_descriptionLabel->setText( description( err.type() ) );

+ 6
- 6
kghostview/kgv_miniwidget.cpp View File

@@ -441,7 +441,7 @@ void KGVMiniWidget::showPage( int pagenumber )
/*
KNotifyClient::userEvent
(i18n("KGhostview cannot load the document, \"%1\".\n"
"It appears to be broken.").tqarg( _fileName ),
"It appears to be broken.").arg( _fileName ),
KNotifyClient::Messagebox);
_psWidget->disableInterpreter();
_psFile=0;
@@ -486,13 +486,13 @@ void KGVMiniWidget::updateStatusBarText( int pageNumber )
else
if( !_usePageLabels || document()->format() == KGVDocument::PDF )
text = i18n( "Page %1 of %2" )
.tqarg( pageNumber + 1 )
.tqarg( dsc()->page_count() );
.arg( pageNumber + 1 )
.arg( dsc()->page_count() );
else
text = i18n( "Page %1 (%2 of %3)" )
.tqarg( dsc()->page()[ _options.page() ].label )
.tqarg( pageNumber + 1 )
.tqarg( dsc()->page_count() );
.arg( dsc()->page()[ _options.page() ].label )
.arg( pageNumber + 1 )
.arg( dsc()->page_count() );

emit setStatusBarText( text );
}

+ 4
- 4
kghostview/kgv_view.cpp View File

@@ -264,7 +264,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
for ( TQValueList<double>::iterator first = mags.begin(), last = mags.end();
first != last;
++first ) {
TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
str.remove( KGlobal::locale()->decimalSymbol() + "00" );
zooms << str;
if ( *first == 1.0 ) idx = cur;
@@ -600,7 +600,7 @@ void KGVPart::updateZoomActions()
}

// Show percentage that isn't predefined
TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( zoom, 2 ));
TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( zoom, 2 ));
str.remove( KGlobal::locale()->decimalSymbol() + "00" );
items.insert( items.at(idx), 1, str );
_zoomTo->setItems( items );
@@ -750,8 +750,8 @@ void KGVPart::slotGhostscriptError( const TQString& error )
"Below are any error messages which were received from Ghostscript "
"(<nobr><strong>%2</strong></nobr>) "
"which may help you.</qt>" )
.tqarg( error )
.tqarg( Configuration::interpreter() ),
.arg( error )
.arg( Configuration::interpreter() ),
true );
// The true above makes it show a "configure gs" option, but maybe we
// should trigger an auto-redetection?

+ 2
- 2
kghostview/kgvconfigdialog.cpp View File

@@ -114,8 +114,8 @@ namespace {
"which are impossible to resolve. Please upgrade to a newer version.\n"
"KGhostView will try to work with it, but it may not display any files at all.\n"
"Version %2 seems to be appropriate on your system, although newer versions will work as well." )
.tqarg( version )
.tqarg( recommended ) );
.arg( version )
.arg( recommended ) );
}
if ( version < TQString::number( 7.00 ) )
{

+ 18
- 18
kghostview/kgvdocument.cpp View File

@@ -98,7 +98,7 @@ void KGVDocument::doOpenFile()
KMessageBox::sorry( _part->widget(),
i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: "
"File does not exist.</qt>" )
.tqarg( _fileName ) );
.arg( _fileName ) );
emit canceled( TQString() );
return;
}
@@ -107,7 +107,7 @@ void KGVDocument::doOpenFile()
KMessageBox::sorry( _part->widget(),
i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: "
"Permission denied.</qt>" )
.tqarg( _fileName ) );
.arg( _fileName ) );
emit canceled( TQString() );
return;
}
@@ -132,7 +132,7 @@ void KGVDocument::doOpenFile()
if( _tmpDSC->status() != 0 ) {
KMessageBox::error( _part->widget(),
i18n( "Could not create temporary file: %1" )
.tqarg( strerror( _tmpDSC->status() ) ) );
.arg( strerror( _tmpDSC->status() ) ) );
emit canceled( TQString() );
return;
}
@@ -159,8 +159,8 @@ void KGVDocument::doOpenFile()
"which has type <strong>%2</strong>. KGhostview can "
"only load PostScript (.ps, .eps) and Portable "
"Document Format (.pdf) files.</qt>" )
.tqarg( _fileName )
.tqarg( _mimetype ) );
.arg( _fileName )
.arg( _mimetype ) );
emit canceled( TQString() );
return;
}
@@ -190,7 +190,7 @@ bool KGVDocument::uncompressFile()
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" )
.tqarg( _fileName ) );
.arg( _fileName ) );
emit canceled( TQString() );
return false;
}
@@ -201,7 +201,7 @@ bool KGVDocument::uncompressFile()
{
KMessageBox::error( _part->widget(),
i18n( "Could not create temporary file: %2" )
.tqarg( strerror( _tmpUnzipped->status() ) ) );
.arg( strerror( _tmpUnzipped->status() ) ) );
emit canceled( TQString() );
return false;
}
@@ -221,7 +221,7 @@ bool KGVDocument::uncompressFile()
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" )
.tqarg( _fileName ) );
.arg( _fileName ) );
emit canceled( TQString() );
return false;
}
@@ -239,7 +239,7 @@ void KGVDocument::openPDFFileContinue( bool pdf2dscResult )
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr>.</qt>" )
.tqarg( _part->url().url() ) );
.arg( _part->url().url() ) );
emit canceled( TQString() );
return;
}
@@ -260,8 +260,8 @@ void KGVDocument::openPSFile(const TQString &file)
{
KMessageBox::error( _part->widget(),
i18n( "<qt>Error opening file <nobr><strong>%1</strong></nobr>: %2</qt>" )
.tqarg( _part->url().url() )
.tqarg( strerror( errno ) ) );
.arg( _part->url().url() )
.arg( strerror( errno ) ) );
emit canceled( "" );
return;
}
@@ -497,7 +497,7 @@ TQString KGVDocument::pageListToRange( const PageList& pageList )
if( bss == ess )
range += TQString::number( *ess );
else
range += TQString( "%1-%2" ).tqarg( *bss ).tqarg( *ess );
range += TQString( "%1-%2" ).arg( *bss ).arg( *ess );

bss = it;
}
@@ -521,7 +521,7 @@ void KGVDocument::print()
printer.setOption( "kde-range",
pageListToRange( _part->markList()->markList() ) );

if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) )
if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) )
{
KTempFile tf( TQString(), ".ps" );
if( tf.status() == 0 )
@@ -548,7 +548,7 @@ void KGVDocument::print()
{
printer.setPageSelection( KPrinter::SystemSide );
if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) )
if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) )
printer.printFiles( _fileName );
}
}
@@ -775,13 +775,13 @@ void KGVDocument::runPdf2ps( const TQString& pdfName,
process << _interpreterPath
<< "-dNODISPLAY"
<< "-dTQUIET"
<< TQString( "-sPDFname=%1" ).tqarg( pdfName )
<< TQString( "-sPDFname=%1" ).arg( pdfName )
<< TQString( "-sDSCnamale locale( "kghostview" );
_fallBackPageMedia = pageSizeToString(
static_cast< TQPrinter::PageSize >( locale.pageSize() ) );
_usePageLabels = false;
e=%1" ).tqarg( dscName )
e=%1" ).arg( dscName )
<< "pdf2dsc.ps"
<< "-c"
<< "quit";
@@ -823,8 +823,8 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName )
<< "-dDELAYSAFER"
<< "-dNODISPLAY"
<< "-dTQUIET"
<< TQString( "-sPDFname=%1" ).tqarg( pdfName )
<< TQString( "-sDSCname=%1" ).tqarg( dscName )
<< TQString( "-sPDFname=%1" ).arg( pdfName )
<< TQString( "-sDSCname=%1" ).arg( dscName )
<< "-c"
<< "<< /PermitFileReading [ PDFname ] /PermitFileWriting [ DSCname ] /PermitFileControl [] >> setuserparams .locksafe"
<< "-f"

+ 2
- 2
kghostview/kgvshell.cpp View File

@@ -252,7 +252,7 @@ KGVShell::openStdin()
if( _tmpFile->status() != 0 ) {
KMessageBox::error( this,
i18n( "Could not create temporary file: %1" )
.tqarg( strerror( _tmpFile->status() ) ) );
.arg( strerror( _tmpFile->status() ) ) );
return;
}

@@ -269,7 +269,7 @@ KGVShell::openStdin()
if( read != 0 ) {
KMessageBox::error( this,
i18n( "Could not open standard input stream: %1" )
.tqarg( strerror( errno ) ) );
.arg( strerror( errno ) ) );
return;
}


+ 3
- 3
kghostview/kpswidget.cpp View File

@@ -333,7 +333,7 @@ void KPSWidget::setupWidget()
// Make sure the properties are updated immediately.
XSync( x11Display(), false );

tqrepaint();
repaint();

_widgetDirty = false;
}
@@ -343,7 +343,7 @@ bool KPSWidget::startInterpreter()
setupWidget();

_process = new KProcess;
if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString( "%1 %2" ).tqarg( winId() ).tqarg( _backgroundPixmap.handle() ) );
if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString( "%1 %2" ).arg( winId() ).arg( _backgroundPixmap.handle() ) );
else _process->setEnvironment( "GHOSTVIEW", TQString::number( winId() ) );

*_process << _ghostscriptPath.local8Bit();
@@ -420,7 +420,7 @@ void KPSWidget::slotProcessExited( KProcess* process )
{
kdDebug( 4500 ) << "KPSWidget::slotProcessExited(): looks like it was not a clean exit." << endl;
if ( process->normalExit() ) {
emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).tqarg( process->exitStatus() ) ) );
emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).arg( process->exitStatus() ) ) );
} else {
emit ghostscriptError( TQString( i18n( "Process killed or crashed." ) ) );
}

+ 3
- 3
kghostview/scrollbox.cpp View File

@@ -99,19 +99,19 @@ void ScrollBox::setPageSize( const TQSize& s )
{
pagesize = s;
setFixedHeight( s.height() * width() / s.width() );
tqrepaint();
repaint();
}

void ScrollBox::setViewSize( const TQSize& s )
{
viewsize = s;
tqrepaint();
repaint();
}

void ScrollBox::setViewPos( const TQPoint& pos )
{
viewpos = pos;
tqrepaint();
repaint();
}

void ScrollBox::setThumbnail( TQPixmap img )

+ 3
- 3
kiconedit/kcolorgrid.cpp View File

@@ -293,14 +293,14 @@ void KColorGrid::setColor( int colNum, uint col, bool update )
}

//kdDebug(4640) << "KColorGrid::setColor - before updateCell" << endl;
tqrepaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize, cellsize, cellsize);
repaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize, cellsize, cellsize);
//updateCell( colNum/numCols(), colNum%numCols(), false );
//kdDebug(4640) << "KColorGrid::setColor - after updateCell" << endl;
}

void KColorGrid::updateCell( int row, int col, bool )
{
//kdDebug(4640) << "updateCell - before tqrepaint" << endl;
//kdDebug(4640) << "updateCell - before repaint" << endl;
TQWMatrix matrix;
TQPainter p;
p.begin( this );
@@ -330,6 +330,6 @@ void KColorGrid::setCellSize( int s )
totalheight = (numRows() * s) + 1;
resize(totalwidth, totalheight);
if ( isVisible() )
tqrepaint(viewRect(), false);
repaint(viewRect(), false);
}
#include "kcolorgrid.moc"

+ 5
- 5
kiconedit/kicon.cpp View File

@@ -70,7 +70,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)

if(!url.isValid()) // Giving up
{
TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").tqarg(url.url());
TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").arg(url.url());
KMessageBox::sorry((TQWidget*)parent(), msg);
return false;
}
@@ -86,7 +86,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
{
if(!KIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
{
TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
KMessageBox::error((TQWidget*)parent(), msg);
return false;
}
@@ -101,7 +101,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)

if(!loadedOk)
{
TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
KMessageBox::error((TQWidget*)parent(), msg);
}
else
@@ -208,7 +208,7 @@ bool KIconEditIcon::saveAs(const TQImage *image)
{
int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).tqarg(file),
"Overwrite it?" ).arg(file),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) );
@@ -265,7 +265,7 @@ bool KIconEditIcon::save(const TQImage *image, const TQString &_filename)
}
else
{
TQString msg = i18n("There was an error saving:\n%1\n").tqarg(str);
TQString msg = i18n("There was an error saving:\n%1\n").arg(str);
KMessageBox::error((TQWidget*)parent(), msg);
kdDebug(4640) << "KIconEditIcon::save - " << msg << endl;
}

+ 1
- 1
kiconedit/kiconedit.cpp View File

@@ -477,7 +477,7 @@ bool KIconEdit::setupStatusBar()
statusbar->insertFixedItem("99999,99999", 0, true);
statusbar->insertFixedItem("99999 x 99999", 1, true);
statusbar->insertFixedItem(" 1:999", 2, true);
str = i18n("Colors: %1").tqarg(9999999);
str = i18n("Colors: %1").arg(9999999);
statusbar->insertFixedItem(str, 3, true);
statusbar->insertItem("", 4);


+ 5
- 5
kiconedit/kiconeditslots.cpp View File

@@ -195,7 +195,7 @@ void KIconEdit::slotPrint()
{
KPrinter printer;

if ( printer.setup(this, i18n("Print %1").tqarg(icon->url().section('/', -1))) )
if ( printer.setup(this, i18n("Print %1").arg(icon->url().section('/', -1))) )
{
int margin = 10, yPos = 0;
printer.setCreator("KDE Icon Editor");
@@ -422,13 +422,13 @@ void KIconEdit::slotUpdateZoom( int s )

void KIconEdit::slotUpdateStatusPos(int x, int y)
{
TQString str = i18n("Status Position", "%1, %2").tqarg(x).tqarg(y);
TQString str = i18n("Status Position", "%1, %2").arg(x).arg(y);
statusbar->changeItem( str, 0);
}

void KIconEdit::slotUpdateStatusSize(int x, int y)
{
TQString str = i18n("Status Size", "%1 x %2").tqarg(x).tqarg(y);
TQString str = i18n("Status Size", "%1 x %2").arg(x).arg(y);
statusbar->changeItem( str, 1);
}

@@ -443,13 +443,13 @@ void KIconEdit::slotUpdateStatusScaling(int s)

void KIconEdit::slotUpdateStatusColors(uint)
{
TQString str = i18n("Colors: %1").tqarg(grid->numColors());
TQString str = i18n("Colors: %1").arg(grid->numColors());
statusbar->changeItem( str, 3);
}

void KIconEdit::slotUpdateStatusColors(uint n, uint *)
{
TQString str = i18n("Colors: %1").tqarg(n);
TQString str = i18n("Colors: %1").arg(n);
statusbar->changeItem( str, 3);
}


+ 2
- 2
kiconedit/kicongrid.cpp View File

@@ -1044,7 +1044,7 @@ void KIconEditGrid::load( TQImage *image)
emit changed(pixmap());
setUpdatesEnabled(true);
emit needPainting();
//tqrepaint(viewRect(), false);
//repaint(viewRect(), false);
history->clear();
}

@@ -1379,7 +1379,7 @@ void KIconEditGrid::editPasteAsNew()
*img = tmp;
load(img);
setModified(true);
//tqrepaint(viewRect(), false);
//repaint(viewRect(), false);
p = *img;
emit changed(TQPixmap(p));

+ 2
- 2
kmrml/kmrml/kcontrol/indexer.cpp View File

@@ -112,7 +112,7 @@ void Indexer::processNext()
*m_process << *it;
#endif

emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").tqarg( m_currentDir ));
emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").arg( m_currentDir ));
m_process->start();
}

@@ -160,7 +160,7 @@ void Indexer::slotCanRead( KProcIO *proc )
if ( ok )
{
uint dirsLeft = m_dirs.count();
TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").tqarg( m_dirCount - dirsLeft ).tqarg( m_dirCount).tqarg( m_currentDir ).tqarg( currentFile ).tqarg( numFiles );
TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").arg( m_dirCount - dirsLeft ).arg( m_dirCount).arg( m_currentDir ).arg( currentFile ).arg( numFiles );
emit progress( perc, message );
}
}

+ 1
- 1
kmrml/kmrml/kcontrol/mainpage.cpp View File

@@ -465,7 +465,7 @@ void MainPage::slotIndexingFinished( int returnCode )
if ( err )
syserr = TQString::fromLocal8Bit( err );
else
syserr = i18n("Unknown error: %1").tqarg( returnCode );
syserr = i18n("Unknown error: %1").arg( returnCode );
}

KMessageBox::detailedError( this, i18n("An error occurred during indexing. The index might be invalid."),

+ 3
- 3
kmrml/kmrml/lib/mrml_shared.cpp View File

@@ -53,7 +53,7 @@ const TQString * MrmlShared::m_element = 0L;
const TQString * MrmlShared::m_attribute = 0L;
const TQString * MrmlShared::m_attributeName = 0L;
const TQString * MrmlShared::m_attributeValue = 0L;
const TQString * MrmlShared::m_tqchildren = 0L;
const TQString * MrmlShared::m_children = 0L;
const TQString * MrmlShared::m_none = 0L;

const TQString * MrmlShared::m_multiSet = 0L;
@@ -141,7 +141,7 @@ void MrmlShared::init()
m_attribute = new TQString ( "attribute" ) ;
m_attributeName = new TQString ( "attribute-name" ) ;
m_attributeValue = new TQString ( "attribute-value" ) ;
m_tqchildren = new TQString ( "tqchildren" ) ;
m_children = new TQString ( "children" ) ;
m_none = new TQString ( "none" ) ;

m_multiSet = new TQString ( "multi-set" ) ;
@@ -215,7 +215,7 @@ void MrmlShared::cleanup()
delete m_attribute;
delete m_attributeName;
delete m_attributeValue;
delete m_tqchildren;
delete m_children;
delete m_none;

delete m_visibility;

+ 2
- 2
kmrml/kmrml/lib/mrml_shared.h View File

@@ -76,7 +76,7 @@ public:
static const TQString& attribute() { return *m_attribute; }
static const TQString& attributeName() { return *m_attributeName; }
static const TQString& attributeValue() { return *m_attributeValue; }
static const TQString& tqchildren() { return *m_tqchildren; }
static const TQString& children() { return *m_children; }
static const TQString& none() { return *m_none; }

static const TQString& visibility() { return *m_visibility; }
@@ -139,7 +139,7 @@ private:
static const TQString * m_attribute;
static const TQString * m_attributeName;
static const TQString * m_attributeValue;
static const TQString * m_tqchildren;
static const TQString * m_children;
static const TQString * m_none;

static const TQString * m_visibility;

+ 6
- 6
kmrml/kmrml/mrml.cpp View File

@@ -216,11 +216,11 @@ bool Mrml::startSession( const KURL& url )
// Wolfgang says, we shouldn't create an own session-id here, as gcc 2.95
// apparently makes problems in exception handling somehow. So we simply
// accept the server's session-id.
TQString msg = mrmlString( TQString() ).tqarg(
TQString msg = mrmlString( TQString() ).arg(
"<open-session user-name=\"%1\" session-name=\"kio_mrml session\" /> \
<get-algorithms /> \
<get-collections /> \
</mrml>" ).tqarg( user( url ));
</mrml>" ).arg( user( url ));

TQCString utf8 = msg.utf8();
// qDebug(":::Writing: %s", utf8.data());
@@ -240,13 +240,13 @@ TQString Mrml::mrmlString( const TQString& sessionId, const TQString& transactio
</mrml>";

if ( sessionId.isEmpty() ) // when we don't have one yet
return msg.tqarg( "<mrml>%1" );
return msg.arg( "<mrml>%1" );

if ( transactionId.isNull() )
return msg.tqarg( "<mrml session-id=\"%1\">%1" ).tqarg( sessionId );
return msg.arg( "<mrml session-id=\"%1\">%1" ).arg( sessionId );
else
return msg.tqarg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
.tqarg( sessionId ).tqarg( transactionId );
return msg.arg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
.arg( sessionId ).arg( transactionId );
}

void Mrml::emitData( const TQCString& msg )

+ 1
- 1
kmrml/kmrml/mrml_elements.cpp View File

@@ -28,7 +28,7 @@ using namespace KMrml;
//
// MrmlElement is currently the baseclass for Algorithm and Collection. Both
// may have a single child-element <query-paradigm-list>, with a number of
// <query-paradigm> elements as tqchildren.
// <query-paradigm> elements as children.
//

MrmlElement::MrmlElement( const TQDomElement& elem )

+ 2
- 2
kmrml/kmrml/mrml_part.cpp View File

@@ -310,7 +310,7 @@ void MrmlPart::contactServer( const KURL& url )
TQString host = url.host().isEmpty() ?
TQString::fromLatin1("localhost") : url.host();

slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host ));
slotSetStatusBar( i18n("Connecting to indexing server at %1...").arg( host ));
}

//
@@ -495,7 +495,7 @@ void MrmlPart::parseMrml( TQDomDocument& doc )
else if ( tagName == "error" ) {
KMessageBox::information( widget(),
i18n("Server returned error:\n%1\n")
.tqarg( elem.attribute( "message" )),
.arg( elem.attribute( "message" )),
i18n("Server Error") );
}


+ 3
- 3
kmrml/kmrml/mrml_view.cpp View File

@@ -307,10 +307,10 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL,
/*
if ( similarity > -1 )
TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>")
.tqarg( url )
.tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity))));
.arg( url )
.arg(i18n("Similarity: %1").arg( TQString::number(similarity))));
else
TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").tqarg( url ) );