Browse Source

Remove additional unneeded tq method conversions

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)
221 221
 		return;
222 222
 	}
223 223
 
224
-	// Append all this widgets tqchildren
224
+	// Append all this widgets children
225 225
 	for(int i = 0; i < gp_widget_count_children(widget); ++i) {
226 226
 		CameraWidget *widget_child;
227 227
 		gp_widget_get_child(widget, i, &widget_child);
228 228
 		appendWidget(newParent, widget_child);
229 229
 	}
230 230
 	
231
-	// Things that must be done after all tqchildren were added
231
+	// Things that must be done after all children were added
232 232
 /*
233 233
 	switch (widget_type) {
234 234
 	case GP_WIDGET_SECTION:

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

@@ -86,7 +86,7 @@ bool KCamera::initInformation()
86 86
 	int index = gp_abilities_list_lookup_model(m_abilitylist, m_model.local8Bit().data());
87 87
 	if(index < 0) {
88 88
 		emit error(i18n("Description of abilities for camera %1 is not available."
89
-					" Configuration options may be incorrect.").tqarg(m_model));
89
+					" Configuration options may be incorrect.").arg(m_model));
90 90
 		return false;
91 91
 	}
92 92
         gp_abilities_list_get_abilities(m_abilitylist, index, &m_abilities);
@@ -432,7 +432,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
432 432
 	int index = gp_abilities_list_lookup_model(m_device->m_abilitylist, model.local8Bit().data());
433 433
 	if(index < 0) {
434 434
 		slot_error(i18n("Description of abilities for camera %1 is not available."
435
-				" Configuration options may be incorrect.").tqarg(model));
435
+				" Configuration options may be incorrect.").arg(model));
436 436
 	}
437 437
 	int result = gp_abilities_list_get_abilities(m_device->m_abilitylist, index, &abilities);
438 438
 	if (result == GP_OK) {
@@ -452,7 +452,7 @@ void KameraDeviceSelectDialog::slot_setModel(TQListViewItem *item)
452 452
 			setPortType(INDEX_USB);
453 453
 	} else {
454 454
 		slot_error(i18n("Description of abilities for camera %1 is not available."
455
-			     " Configuration options may be incorrect.").tqarg(model));
455
+			     " Configuration options may be incorrect.").arg(model));
456 456
 	}
457 457
 }
458 458
 

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

@@ -242,7 +242,7 @@ void KameraProtocol::get(const KURL &url)
242 242
 
243 243
 #undef GPHOTO_TEXT_FILE
244 244
 	// emit info message
245
-	infoMessage( i18n("Retrieving data from camera <b>%1</b>").tqarg(url.user()) );
245
+	infoMessage( i18n("Retrieving data from camera <b>%1</b>").arg(url.user()) );
246 246
 
247 247
 	// Note: There's no need to re-read directory for each get() anymore
248 248
 	gp_file_new(&m_file);

+ 1
- 1
kcoloredit/kcoloredit.h View File

@@ -74,7 +74,7 @@ class KColorEditApp : public KMainWindow
74 74
     KColorEditDoc *document() const;
75 75
 
76 76
   protected:
77
-    /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
77
+    /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
78 78
      * file
79 79
      */
80 80
     void saveOptions();

+ 1
- 1
kcoloredit/kxycolorselector.cpp View File

@@ -42,7 +42,7 @@ void KXYColorSelector::setType(const int type) {
42 42
 
43 43
 void KXYColorSelector::updateContents() {
44 44
 	drawPalette(&pixmap);
45
-	tqrepaint();
45
+	repaint();
46 46
 }
47 47
 
48 48
 void KXYColorSelector::resizeEvent(TQResizeEvent*) {

+ 1
- 1
kcoloredit/kzcolorselector.cpp View File

@@ -53,7 +53,7 @@ void KZColorSelector::setType(const int type) {
53 53
 
54 54
 void KZColorSelector::updateContents() {
55 55
 	drawPalette(&pixmap);
56
-	tqrepaint(false);
56
+	repaint(false);
57 57
 }
58 58
 
59 59
 void KZColorSelector::resizeEvent(TQResizeEvent*) {

+ 2
- 2
kcoloredit/paletteviewscrolledarea.cpp View File

@@ -77,7 +77,7 @@ void PaletteViewScrolledArea::redraw() {
77 77
 }
78 78
 
79 79
 void PaletteViewScrolledArea::repaintPalette() {
80
-	tqrepaint(false);
80
+	repaint(false);
81 81
 }
82 82
 
83 83
 void PaletteViewScrolledArea::checkSelectionAutoScroll(const int mousePosY) {
@@ -220,7 +220,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
220 220
 	setCellsSizes();
221 221
 	TQPixmap pixmap(size());
222 222
 	TQPainter painter;
223
-	painter.tqbegin(TQT_TQPAINTDEVICE(&pixmap), this);
223
+	painter.begin(TQT_TQPAINTDEVICE(&pixmap), this);
224 224
 	TQFontMetrics fontMetrics = painter.fontMetrics();
225 225
 	int maxLineWidth;
226 226
 	if(viewColorNames) {

+ 3
- 3
kdvi/TeXFontDefinition.cpp View File

@@ -105,7 +105,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
105 105
     TQString filename_test(font_pool->getExtraSearchPath() + "/" + filename);
106 106
     file = fopen( TQFile::encodeName(filename_test), "r");
107 107
     if (file == 0) {
108
-      kdError(4300) << i18n("Cannot find font %1, file %2.").tqarg(fontname).tqarg(filename) << endl;
108
+      kdError(4300) << i18n("Cannot find font %1, file %2.").arg(fontname).arg(filename) << endl;
109 109
       return;
110 110
     } else
111 111
       filename = filename_test;
@@ -121,7 +121,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
121 121
       font = new TeXFont_PK(this);
122 122
       set_char_p = &dviRenderer::set_char;
123 123
       if ((checksum != 0) && (checksum != font->checksum)) 
124
-	kdWarning(4300) << i18n("Checksum mismatch for font file %1").tqarg(filename) << endl;
124
+	kdWarning(4300) << i18n("Checksum mismatch for font file %1").arg(filename) << endl;
125 125
       fontTypeName = "TeX PK";
126 126
       return;
127 127
     }
@@ -169,7 +169,7 @@ void TeXFontDefinition::fontNameReceiver(const TQString& fname)
169 169
 #else
170 170
   // If we don't have the FreeType library, we should never have
171 171
   // reached this point. Complain, and leave this font blank
172
-  kdError(4300) << i18n("Cannot recognize format for font file %1").tqarg(filename) << endl;
172
+  kdError(4300) << i18n("Cannot recognize format for font file %1").arg(filename) << endl;
173 173
 #endif
174 174
 }
175 175
 

+ 8
- 8
kdvi/TeXFont_PFB.cpp View File

@@ -41,13 +41,13 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
41 41
   int error = FT_New_Face( parent->font_pool->FreeType_library, parent->filename.local8Bit(), 0, &face );
42 42
   
43 43
   if ( error == FT_Err_Unknown_File_Format ) {
44
-    errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").tqarg(parent->filename);
44
+    errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").arg(parent->filename);
45 45
     kdError(4300) << errorMessage << endl;
46 46
     fatalErrorInFontLoading = true;
47 47
     return;
48 48
   } else 
49 49
     if ( error ) {
50
-      errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").tqarg(parent->filename);
50
+      errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").arg(parent->filename);
51 51
       kdError(4300) << errorMessage << endl;
52 52
       fatalErrorInFontLoading = true;
53 53
       return;
@@ -168,7 +168,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
168 168
     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 ); 
169 169
     error = FT_Set_Char_Size(face, 0, characterSize_in_printers_points_by_64, res, res );
170 170
     if (error) {
171
-      TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").tqarg(parent->filename);
171
+      TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").arg(parent->filename);
172 172
       if (errorMessage.isEmpty())
173 173
 	errorMessage = msg;
174 174
       kdError(4300) << msg << endl;
@@ -184,7 +184,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
184 184
       error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_HINTING );
185 185
 
186 186
     if (error) {
187
-      TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
187
+      TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
188 188
       if (errorMessage.isEmpty())
189 189
 	errorMessage = msg;
190 190
       kdError(4300) << msg << endl;
@@ -196,7 +196,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
196 196
     // convert to an anti-aliased bitmap
197 197
     error = FT_Render_Glyph( face->glyph, ft_render_mode_normal );
198 198
     if (error) {
199
-      TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
199
+      TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
200 200
       if (errorMessage.isEmpty())
201 201
 	errorMessage = msg;
202 202
       kdError(4300) << msg << endl;
@@ -209,8 +209,8 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
209 209
 
210 210
     if ((slot->bitmap.width == 0) || (slot->bitmap.rows == 0)) {
211 211
       if (errorMessage.isEmpty())
212
-	errorMessage = i18n("Glyph #%1 is empty.").tqarg(ch);
213
-      kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").tqarg(ch).tqarg(parent->filename) << endl;
212
+	errorMessage = i18n("Glyph #%1 is empty.").arg(ch);
213
+      kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").arg(ch).arg(parent->filename) << endl;
214 214
       g->shrunkenCharacter.resize( 15, 15 );
215 215
       g->shrunkenCharacter.fill(TQColor(255, 0, 0));
216 216
       g->x2 = 0;
@@ -279,7 +279,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
279 279
   if (g->dvi_advance_in_units_of_design_size_by_2e20 == 0) {
280 280
     int error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_SCALE);
281 281
     if (error) {
282
-      TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
282
+      TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").arg(ch).arg(parent->filename);
283 283
       if (errorMessage.isEmpty())
284 284
 	errorMessage = msg;
285 285
       kdError(4300) << msg << endl;

+ 8
- 8
kdvi/TeXFont_PK.cpp View File

@@ -91,7 +91,7 @@ TeXFont_PK::TeXFont_PK(TeXFontDefinition *parent)
91 91
     characterBitmaps[i] = 0;
92 92
   file = fopen(TQFile::encodeName(parent->filename), "r");
93 93
   if (file == 0) 
94
-    kdError(4300) << i18n("Cannot open font file %1.").tqarg(parent->filename) << endl;
94
+    kdError(4300) << i18n("Cannot open font file %1.").arg(parent->filename) << endl;
95 95
 #ifdef DEBUG_PK
96 96
   else
97 97
     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
136 136
     // If the character is not defined in the PK file, mark the
137 137
     // character as missing, and print an error message
138 138
     if (g->addr == 0) {
139
-      kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").tqarg(ch).tqarg(parent->filename) << endl;
139
+      kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").arg(ch).arg(parent->filename) << endl;
140 140
       g->addr = -1;
141 141
       return g;
142 142
     }
@@ -454,7 +454,7 @@ void TeXFont_PK::PK_skip_specials()
454 454
       case PK_NOOP :
455 455
 	break;
456 456
       default :
457
-	oops(i18n("Unexpected %1 in PK file %2").tqarg(PK_flag_byte).tqarg(parent->filename) );
457
+	oops(i18n("Unexpected %1 in PK file %2").arg(PK_flag_byte).arg(parent->filename) );
458 458
 	break;
459 459
       }
460 460
     }
@@ -521,7 +521,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
521 521
     w = num(fp, n);
522 522
     h = num(fp, n);
523 523
     if (w > 0x7fff || h > 0x7fff)
524
-      oops(i18n("The character %1 is too large in file %2").tqarg(ch).tqarg(parent->filename));
524
+      oops(i18n("The character %1 is too large in file %2").arg(ch).arg(parent->filename));
525 525
     characterBitmaps[ch]->w = w;
526 526
     characterBitmaps[ch]->h = h;
527 527
   }
@@ -626,9 +626,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
626 626
 	paint_switch = 1 - paint_switch;
627 627
       }
628 628
       if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
629
-	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(parent->filename));
629
+	oops(i18n("Wrong number of bits stored:  char. %1, font %2").arg(ch).arg(parent->filename));
630 630
       if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
631
-	oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
631
+	oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename));
632 632
     }
633 633
     
634 634
     // 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)
712 712
 	paint_switch = 1 - paint_switch;
713 713
       }
714 714
       if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
715
-	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(parent->filename));
715
+	oops(i18n("Wrong number of bits stored:  char. %1, font %2").arg(ch).arg(parent->filename));
716 716
       if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
717
-	oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
717
+	oops(i18n("Bad pk file (%1), too many bits").arg(parent->filename));
718 718
     }
719 719
   } // endif: big or small Endian?
720 720
 }

+ 1
- 1
kdvi/dviFile.cpp View File

@@ -256,7 +256,7 @@ void dvifile::prepare_pages()
256 256
    while (i > 0) {
257 257
     command_pointer  = dvi_Data() + page_offset[i--];
258 258
     if (readUINT8() != BOP) {
259
-      errorMsg = i18n("The page %1 does not start with the BOP command.").tqarg(i+1);
259
+      errorMsg = i18n("The page %1 does not start with the BOP command.").arg(i+1);
260 260
       return;
261 261
     }
262 262
     command_pointer += 10 * 4;

+ 8
- 8
kdvi/dviRenderer.cpp View File

@@ -437,7 +437,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
437 437
   if (!fi.exists() || fi.isDir()) {
438 438
     KMessageBox::error( parentWidget,
439 439
 			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist. "
440
-			     "KDVI already tried to add the ending '.dvi'.</qt>").tqarg(filename),
440
+			     "KDVI already tried to add the ending '.dvi'.</qt>").arg(filename),
441 441
 			i18n("File Error!"));
442 442
     return false;
443 443
   }
@@ -451,8 +451,8 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
451 451
     KMessageBox::sorry( parentWidget,
452 452
 			i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr> which has "
453 453
 			      "type <strong>%2</strong>. KDVI can only load DVI (.dvi) files.</qt>" )
454
-			.tqarg( fname )
455
-			.tqarg( mimetype ) );
454
+			.arg( fname )
455
+			.arg( mimetype ) );
456 456
     return false;
457 457
   }
458 458
   
@@ -462,7 +462,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
462 462
     KMessageBox::sorry( parentWidget,
463 463
                         i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
464 464
                              "likely this means that the DVI file is broken.</qt>")
465
-                        .tqarg( fname ) );
465
+                        .arg( fname ) );
466 466
     return false;
467 467
   }
468 468
 
@@ -641,7 +641,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
641 641
 				    "line %1 in the TeX-file <strong>%2</strong>. It seems, however, that the DVI file "
642 642
 				    "does not contain the necessary source file information. "
643 643
 				    "We refer to the manual of KDVI for a detailed explanation on how to include this "
644
-				    "information. Press the F1 key to open the manual.</qt>").tqarg(refLineNumber).tqarg(refFileName),
644
+				    "information. Press the F1 key to open the manual.</qt>").arg(refLineNumber).arg(refFileName),
645 645
 			 i18n("Could Not Find Reference"));
646 646
       mutex.unlock();
647 647
       return Anchor();
@@ -681,7 +681,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
681 681
     } else
682 682
       if (anchorForRefFileFound == false)
683 683
 	KMessageBox::sorry(parentWidget, i18n("<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
684
-					      "line %1 in the TeX-file <strong>%2</strong>.</qt>").tqarg(refLineNumber).tqarg(refFileName),
684
+					      "line %1 in the TeX-file <strong>%2</strong>.</qt>").arg(refLineNumber).arg(refFileName),
685 685
 			   i18n( "Could Not Find Reference" ));
686 686
       else {
687 687
 	mutex.unlock();
@@ -735,7 +735,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
735 735
   {
736 736
       KMessageBox::sorry(parentWidget, TQString("<qt>") +
737 737
 			 i18n("The DVI-file refers to the TeX-file "
738
-			      "<strong>%1</strong> which could not be found.").tqarg(KShellProcess::quote(TeXfile)) +
738
+			      "<strong>%1</strong> which could not be found.").arg(KShellProcess::quote(TeXfile)) +
739 739
 			 TQString("</qt>"),
740 740
 			 i18n( "Could Not Find File" ));
741 741
       return;
@@ -786,7 +786,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
786 786
 			    "for inverse search, reported an error. You might wish to look at the <strong>document info "
787 787
 			    "dialog</strong> which you will find in the File-Menu for a precise error report. The "
788 788
 			    "manual for KDVI contains a detailed explanation how to set up your editor for use with KDVI, "
789
-			    "and a list of common problems.</qt>").tqarg(command);
789
+			    "and a list of common problems.</qt>").arg(command);
790 790
   
791 791
   info->clear(i18n("Starting the editor..."));
792 792
   

+ 2
- 2
kdvi/dviRenderer_draw.cpp View File

@@ -292,7 +292,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
292 292
       if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
293 293
 	currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
294 294
 	if (currinf.fontp == NULL) {
295
-	  errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
295
+	  errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0);
296 296
 	  return;
297 297
 	}
298 298
 	currinf.set_char_p = currinf.fontp->set_char_p;
@@ -567,7 +567,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
567 567
 	  break;
568 568
 	  
569 569
 	default:
570
-	  errorMsg = i18n("The unknown op-code %1 was encountered.").tqarg(ch);
570
+	  errorMsg = i18n("The unknown op-code %1 was encountered.").arg(ch);
571 571
 	  return;
572 572
 	} /* end switch*/
573 573
       } /* end else (ch not a SETCHAR or FNTNUM) */

+ 9
- 9
kdvi/dviRenderer_export.cpp View File

@@ -101,7 +101,7 @@ void dviRenderer::exportPDF()
101 101
     return;
102 102
   TQFileInfo finfo(fileName);
103 103
   if (finfo.exists()) {
104
-    int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
104
+    int r = KMessageBox::warningContinueCancel (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
105 105
 				       i18n("Overwrite File"), i18n("Overwrite"));
106 106
     if (r == KMessageBox::Cancel)
107 107
       return;
@@ -137,12 +137,12 @@ void dviRenderer::exportPDF()
137 137
   export_errorString = i18n("<qt>The external program 'dvipdf', which was used to export the file, reported an error. "
138 138
 			    "You might wish to look at the <strong>document info dialog</strong> which you will "
139 139
 			    "find in the File-Menu for a precise error report.</qt>") ;
140
-  info->clear(i18n("Export: %1 to PDF").tqarg(KShellProcess::quote(dviFile->filename)));
140
+  info->clear(i18n("Export: %1 to PDF").arg(KShellProcess::quote(dviFile->filename)));
141 141
 
142 142
   proc->clearArguments();
143 143
   finfo.setFile(dviFile->filename);
144
-  *proc << TQString("cd %1; dvipdfm").tqarg(KShellProcess::quote(finfo.dirPath(true)));
145
-  *proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
144
+  *proc << TQString("cd %1; dvipdfm").arg(KShellProcess::quote(finfo.dirPath(true)));
145
+  *proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
146 146
   *proc << KShellProcess::quote(dviFile->filename);
147 147
   proc->closeStdin();
148 148
   if (proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) {
@@ -200,7 +200,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
200 200
       return;
201 201
     TQFileInfo finfo(fileName);
202 202
     if (finfo.exists()) {
203
-      int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
203
+      int r = KMessageBox::warningYesNo (parentWidget, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
204 204
 					 i18n("Overwrite File"));
205 205
       if (r == KMessageBox::No)
206 206
 	return;
@@ -300,17 +300,17 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
300 300
   export_errorString = i18n("<qt>The external program 'dvips', which was used to export the file, reported an error. "
301 301
 			    "You might wish to look at the <strong>document info dialog</strong> which you will "
302 302
 			    "find in the File-Menu for a precise error report.</qt>") ;
303
-  info->clear(i18n("Export: %1 to PostScript").tqarg(KShellProcess::quote(dviFile->filename)));
303
+  info->clear(i18n("Export: %1 to PostScript").arg(KShellProcess::quote(dviFile->filename)));
304 304
   
305 305
   proc->clearArguments();
306 306
   TQFileInfo finfo(dviFile->filename);
307
-  *proc << TQString("cd %1; dvips").tqarg(KShellProcess::quote(finfo.dirPath(true)));
307
+  *proc << TQString("cd %1; dvips").arg(KShellProcess::quote(finfo.dirPath(true)));
308 308
   if (printer == 0)
309 309
     *proc << "-z"; // export Hyperlinks
310 310
   if (options.isEmpty() == false)
311 311
     *proc << options;
312
-  *proc << TQString("%1").tqarg(KShellProcess::quote(sourceFileName));
313
-  *proc << TQString("-o %1").tqarg(KShellProcess::quote(fileName));
312
+  *proc << TQString("%1").arg(KShellProcess::quote(sourceFileName));
313
+  *proc << TQString("-o %1").arg(KShellProcess::quote(fileName));
314 314
   proc->closeStdin();
315 315
   if (proc->start(KProcess::NotifyOnExit, KProcess::Stderr) == false) {
316 316
     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)
84 84
 
85 85
   TQString originalFName = EPSfilename;
86 86
 
87
-  embedPS_progress->setLabel(i18n("Embedding %1").tqarg(EPSfilename));  
87
+  embedPS_progress->setLabel(i18n("Embedding %1").arg(EPSfilename));  
88 88
   tqApp->processEvents();
89 89
 
90 90
   
@@ -102,7 +102,7 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
102 102
     for(page=0; page < dviFile->total_pages; page++) 
103 103
       if ((dviFile->page_offset[page] <= currentOffset) && (currentOffset <= dviFile->page_offset[page+1]))
104 104
 	break;
105
-    errorMsg += i18n("Page %1: The PostScript file <strong>%2</strong> could not be found.<br>").tqarg(page+1).tqarg(originalFName);
105
+    errorMsg += i18n("Page %1: The PostScript file <strong>%2</strong> could not be found.<br>").arg(page+1).arg(originalFName);
106 106
     embedPS_progress->progressBar()->advance(1);
107 107
     tqApp->processEvents();
108 108
     return;
@@ -131,13 +131,13 @@ void dviRenderer::prescan_embedPS(char *cp, TQ_UINT8 *beginningOfSpecialCommand)
131 131
   int clip=include_command.find(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
132 132
 
133 133
   // Generate the PostScript commands to be included
134
-  TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury);
134
+  TQString PS = TQString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").arg(llx).arg(lly).arg(urx).arg(ury);
135 135
   if (rwi != 0)
136
-    PS.append( TQString(" %1 @rwi").tqarg(rwi) );
136
+    PS.append( TQString(" %1 @rwi").arg(rwi) );
137 137
   if (rhi != 0)
138
-    PS.append( TQString(" %1 @rhi").tqarg(rhi) );
138
+    PS.append( TQString(" %1 @rhi").arg(rhi) );
139 139
   if (angle != 0)
140
-    PS.append( TQString(" %1 @angle").tqarg(angle) );
140
+    PS.append( TQString(" %1 @angle").arg(angle) );
141 141
   if (clip != -1)
142 142
     PS.append(" @clip");
143 143
   PS.append( " @setspecial\n" );
@@ -252,7 +252,7 @@ void dviRenderer::prescan_ParsePapersizeSpecial(const TQString& _cp)
252 252
     dviFile->suggestedPageSize = new pageSize;
253 253
     dviFile->suggestedPageSize->setPageSize(cp);
254 254
   } else 
255
-    printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").tqarg(cp));
255
+    printErrorMsgForSpecials(i18n("The papersize data '%1' could not be parsed.").arg(cp));
256 256
 
257 257
   return;
258 258
 }
@@ -297,7 +297,7 @@ void dviRenderer::prescan_ParsePSHeaderSpecial(const TQString& cp)
297 297
   }
298 298
   
299 299
   if (TQFile::exists(_file))
300
-    PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").tqarg(_file) );
300
+    PS_interface->PostScriptHeaderString->append( TQString(" (%1) run\n").arg(_file) );
301 301
 }
302 302
 
303 303
 
@@ -321,7 +321,7 @@ void dviRenderer::prescan_ParsePSQuoteSpecial(const TQString& cp)
321 321
   
322 322
   double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
323 323
   double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
324
-  PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
324
+  PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
325 325
   PostScriptOutPutString->append( " @beginspecial @setspecial \n" );
326 326
   PostScriptOutPutString->append( cp );
327 327
   PostScriptOutPutString->append( " @endspecial \n" );
@@ -375,17 +375,17 @@ void dviRenderer::prescan_ParsePSSpecial(const TQString& cp)
375 375
   double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
376 376
   
377 377
   if (cp.find("ps::[begin]", 0, false) == 0) {
378
-    PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
379
-    PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(11)) );
378
+    PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
379
+    PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(11)) );
380 380
   } else {
381 381
     if (cp.find("ps::[end]", 0, false) == 0) {
382
-      PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(9)) );
382
+      PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(9)) );
383 383
     } else {
384 384
       if (cp.find("ps::", 0, false) == 0) {
385
-	PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(4)) );
385
+	PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(4)) );
386 386
       } else {
387
-	PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
388
-	PostScriptOutPutString->append( TQString(" %1\n").tqarg(cp.mid(3)) );
387
+	PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
388
+	PostScriptOutPutString->append( TQString(" %1\n").arg(cp.mid(3)) );
389 389
       }
390 390
     }
391 391
   }
@@ -459,22 +459,22 @@ void dviRenderer::prescan_ParsePSFileSpecial(const TQString& cp)
459 459
   if (TQFile::exists(EPSfilename)) {
460 460
     double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
461 461
     double PS_V = (currinf.data.dvi_v*300.0)/1200 - 300;
462
-    PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").tqarg(PS_H).tqarg(PS_V) );
462
+    PostScriptOutPutString->append( TQString(" %1 %2 moveto\n").arg(PS_H).arg(PS_V) );
463 463
     PostScriptOutPutString->append( "@beginspecial " );
464
-    PostScriptOutPutString->append( TQString(" %1 @llx").tqarg(llx) );
465
-    PostScriptOutPutString->append( TQString(" %1 @lly").tqarg(lly) );
466
-    PostScriptOutPutString->append( TQString(" %1 @urx").tqarg(urx) );
467
-    PostScriptOutPutString->append( TQString(" %1 @ury").tqarg(ury) );
464
+    PostScriptOutPutString->append( TQString(" %1 @llx").arg(llx) );
465
+    PostScriptOutPutString->append( TQString(" %1 @lly").arg(lly) );
466
+    PostScriptOutPutString->append( TQString(" %1 @urx").arg(urx) );
467
+    PostScriptOutPutString->append( TQString(" %1 @ury").arg(ury) );
468 468
     if (rwi != 0)
469
-      PostScriptOutPutString->append( TQString(" %1 @rwi").tqarg(rwi) );
469
+      PostScriptOutPutString->append( TQString(" %1 @rwi").arg(rwi) );
470 470
     if (rhi != 0)
471
-      PostScriptOutPutString->append( TQString(" %1 @rhi").tqarg(rhi) );
471
+      PostScriptOutPutString->append( TQString(" %1 @rhi").arg(rhi) );
472 472
     if (angle != 0)
473
-      PostScriptOutPutString->append( TQString(" %1 @angle").tqarg(angle) );
473
+      PostScriptOutPutString->append( TQString(" %1 @angle").arg(angle) );
474 474
     if (clip != -1)
475 475
       PostScriptOutPutString->append(" @clip");
476 476
     PostScriptOutPutString->append( " @setspecial \n" );
477
-    PostScriptOutPutString->append( TQString(" (%1) run\n").tqarg(EPSfilename) );
477
+    PostScriptOutPutString->append( TQString(" (%1) run\n").arg(EPSfilename) );
478 478
     PostScriptOutPutString->append( "@endspecial \n" );
479 479
   }
480 480
   
@@ -633,7 +633,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
633 633
     if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) {
634 634
       currinf.fontp = currinf.fonttable->find(ch - FNTNUM0);
635 635
       if (currinf.fontp == NULL) {
636
-	errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").tqarg(ch - FNTNUM0);
636
+	errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.").arg(ch - FNTNUM0);
637 637
 	return;
638 638
       }
639 639
       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)
112 112
 	  if (cp[i].isDigit() == false)
113 113
 	    break;
114 114
 	
115
-	emit setStatusBarText( i18n("line %1 of %2").tqarg(cp.left(i)).tqarg(cp.mid(i).simplifyWhiteSpace()) );
115
+	emit setStatusBarText( i18n("line %1 of %2").arg(cp.left(i)).arg(cp.mid(i).simplifyWhiteSpace()) );
116 116
 	return;
117 117
       }
118 118
     }

+ 2
- 2
kdvi/fontEncoding.cpp View File

@@ -36,7 +36,7 @@ fontEncoding::fontEncoding(const TQString &encName)
36 36
   encFileName = encFileName.stripWhiteSpace();
37 37
 
38 38
   if (encFileName.isEmpty()) {
39
-    kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").tqarg(encName) << endl;
39
+    kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").arg(encName) << endl;
40 40
     return;
41 41
   }
42 42
 
@@ -76,7 +76,7 @@ fontEncoding::fontEncoding(const TQString &encName)
76 76
     for(; i<256; i++)
77 77
       glyphNameVector[i] = ".notdef";
78 78
   } else {
79
-    kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").tqarg(encFileName) << endl;
79
+    kdError(4300) << TQString("fontEncoding::fontEncoding(...): The file '%1' could not be opened.").arg(encFileName) << endl;
80 80
     return;
81 81
   }
82 82
 

+ 1
- 1
kdvi/fontEncoding.h View File

@@ -20,7 +20,7 @@
20 20
  * MetaFont fonts. A DVI file referres to a MetaFont font by giving an
21 21
  * at-most-8-character name, such as 'cmr10'. The DVI previewer would
22 22
  * then locate the associated PK font file (e.g. cmr10.600pk), load
23
- * it, and retrieve the character tqshaped.
23
+ * it, and retrieve the character shaped.
24 24
  *
25 25
  * Today TeX is also used to access Type1 and TrueType fonts, which it
26 26
  * 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()
98 98
     }
99 99
     file.close();
100 100
   } else
101
-    kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").tqarg(map_fileName) << endl;
101
+    kdError(4300) << TQString("fontMap::fontMap(): The file '%1' could not be opened.").arg(map_fileName) << endl;
102 102
   
103 103
 #ifdef DEBUG_FONTMAP
104 104
   kdDebug(4300) << "FontMap file parsed. Results:" << endl;

+ 1
- 1
kdvi/fontMap.h View File

@@ -55,7 +55,7 @@ class fontMapEntry {
55 55
  * Long time ago, when TeX was only used with MetaFont fonts, the DVI
56 56
  * file would specify a font by giving an 8-character name, such as
57 57
  * 'cmr10'. The DVI previewer would then locate the associated PK font
58
- * file, load it, and retrieve the character tqshaped. Happy times, they
58
+ * file, load it, and retrieve the character shaped. Happy times, they
59 59
  * were.
60 60
  *
61 61
  * 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()
187 187
 
188 188
   text.append("<table WIDTH=\"100%\" NOSAVE >");
189 189
   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>")
190
-	       .tqarg(i18n("TeX Name"))
191
-	       .tqarg(i18n("Family"))
192
-	       .tqarg(i18n("Zoom"))
193
-	       .tqarg(i18n("Type"))
194
-	       .tqarg(i18n("Encoding"))
195
-	       .tqarg(i18n("Comment")) );
190
+	       .arg(i18n("TeX Name"))
191
+	       .arg(i18n("Family"))
192
+	       .arg(i18n("Zoom"))
193
+	       .arg(i18n("Type"))
194
+	       .arg(i18n("Encoding"))
195
+	       .arg(i18n("Comment")) );
196 196
 
197 197
  TeXFontDefinition *fontp = fontList.first();
198 198
   while ( fontp != 0 ) {
@@ -210,12 +210,12 @@ TQString fontPool::status()
210 210
 
211 211
 #ifdef HAVE_FREETYPE
212 212
     tmp << TQString ("<tr><td>%1</td> <td>%2</td> <td>%3%</td> <td>%4</td> <td>%5</td> <td>%6</td></tr>")
213
-      .tqarg(fontp->fontname)
214
-      .tqarg(fontp->getFullFontName())
215
-      .tqarg((int)(fontp->enlargement*100 + 0.5))
216
-      .tqarg(fontp->getFontTypeName())
217
-      .tqarg(encoding)
218
-      .tqarg(errMsg);
213
+      .arg(fontp->fontname)
214
+      .arg(fontp->getFullFontName())
215
+      .arg((int)(fontp->enlargement*100 + 0.5))
216
+      .arg(fontp->getFontTypeName())
217
+      .arg(encoding)
218
+      .arg(errMsg);
219 219
 #endif
220 220
 
221 221
     fontp=fontList.next();
@@ -280,7 +280,7 @@ void fontPool::locateFonts()
280 280
   // present an error message to the user.
281 281
   if (!areFontsLocated()) {
282 282
     markFontsAsLocated();
283
-    TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(kpsewhichOutput);
283
+    TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").arg(getenv("PATH")).arg(kpsewhichOutput);
284 284
     KMessageBox::detailedError( 0, i18n("<qt><p>KDVI was not able to locate all the font files "
285 285
 					"which are necessary to display the current DVI file. "
286 286
 					"Your document might be unreadable.</p></qt>"),
@@ -330,17 +330,17 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
330 330
       numFontsInJob++;
331 331
       
332 332
       if (locateTFMonly == true)
333
-	shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").tqarg(fontp->fontname));
333
+	shellProcessCmdLine += KShellProcess::quote(TQString("%1.tfm").arg(fontp->fontname));
334 334
       else {
335 335
 #ifdef HAVE_FREETYPE
336 336
 	if (FreeType_could_be_loaded == true) {
337 337
 	  const TQString &filename = fontsByTeXName.findFileName(fontp->fontname);
338 338
 	  if (!filename.isEmpty())
339
-	    shellProcessCmdLine += KShellProcess::quote(TQString("%1").tqarg(filename));
339
+	    shellProcessCmdLine += KShellProcess::quote(TQString("%1").arg(filename));
340 340
 	}
341 341
 #endif
342
-	shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").tqarg(fontp->fontname));
343
-	shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").tqarg(fontp->fontname));
342
+	shellProcessCmdLine += KShellProcess::quote(TQString("%1.vf").arg(fontp->fontname));
343
+	shellProcessCmdLine += KShellProcess::quote(TQString("%1.1200pk").arg(fontp->fontname));
344 344
       }
345 345
     }
346 346
     fontp=fontList.next();
@@ -363,7 +363,7 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
363 363
 			"and your document might by unreadable. If this error is reproducable "
364 364
 			"please report the issue to the KDVI developers using the 'Help' menu.<p>" );
365 365
     TQApplication::restoreOverrideCursor();
366
-    KMessageBox::error( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg),
366
+    KMessageBox::error( 0, TQString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(msg),
367 367
 			i18n("Problem locating fonts - KDVI") );
368 368
     markFontsAsLocated();
369 369
     return;
@@ -399,9 +399,9 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo
399 399
 			  "typesetting system. If TeX is not installed on your system, you could install the TeTeX distribution (www.tetex.org). "
400 400
 			  "If you are sure that TeX is installed, please try to use the kpsewhich program from the command line to check if it "
401 401
 			  "really works.</p>");
402
-      TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").tqarg(getenv("PATH")).tqarg(kpsewhichOutput);
402
+      TQString details = TQString("<qt><p><b>PATH:</b> %1</p>%2</qt>").arg(getenv("PATH")).arg(kpsewhichOutput);
403 403
       
404
-      KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").tqarg(importanceOfKPSEWHICH).tqarg(msg), details,
404
+      KMessageBox::detailedError( 0, TQString("<qt>%1%2</qt>").arg(importanceOfKPSEWHICH).arg(msg), details,
405 405
 				  i18n("Problem locating fonts - KDVI") );
406 406
       // This makes sure the we don't try to run kpsewhich again
407 407
       markFontsAsLocated();
@@ -587,7 +587,7 @@ void fontPool::mf_output_receiver(KProcess *, char *buffer, int buflen)
587 587
       TQString dpi       = startLine.mid(secondblank+1,lastblank-secondblank-1);
588 588
 
589 589
       progress.show();
590
-      progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").tqarg(fontName).tqarg(dpi) );
590
+      progress.increaseNumSteps( i18n("Currently generating %1 at %2 dpi").arg(fontName).arg(dpi) );
591 591
     }
592 592
     MetafontOutput = MetafontOutput.remove(0,numleft+1);
593 593
   }

+ 5
- 5
kdvi/infodialog.cpp View File

@@ -64,17 +64,17 @@ void infoDialog::setDVIData(dvifile *dviFile)
64 64
     text = i18n("There is no DVI file loaded at the moment.");
65 65
   else {
66 66
     text.append("<table WIDTH=\"100%\" NOSAVE >");
67
-    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("Filename")).tqarg(dviFile->filename));
67
+    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("Filename")).arg(dviFile->filename));
68 68
 
69 69
     TQFile file(dviFile->filename);
70 70
     if (file.exists())
71
-      text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("File Size")).tqarg(KIO::convertSize(file.size())));
71
+      text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(KIO::convertSize(file.size())));
72 72
     else
73
-      text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").tqarg(i18n("The file does no longer exist.")));
73
+      text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").arg(i18n("The file does no longer exist.")));
74 74
 
75 75
     text.append(TQString("<tr><td><b>  </b></td> <td>  </td></tr>"));
76
-    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("#Pages")).tqarg(dviFile->total_pages));
77
-    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").tqarg(i18n("Generator/Date")).tqarg(dviFile->generatorString));
76
+    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("#Pages")).arg(dviFile->total_pages));
77
+    text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("Generator/Date")).arg(dviFile->generatorString));
78 78
   } // else (dviFile == NULL)
79 79
 
80 80
   TextLabel1->setText( text );

+ 3
- 3
kdvi/kdvi_multipage.cpp View File

@@ -161,7 +161,7 @@ void KDVIMultiPage::slotSave()
161 161
     fileName = fileName+ending;
162 162
 
163 163
   if (TQFile(fileName).exists()) {
164
-    int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").tqarg(fileName),
164
+    int r = KMessageBox::warningContinueCancel (0, i18n("The file %1\nexists. Do you want to overwrite that file?").arg(fileName),
165 165
                        i18n("Overwrite File"), i18n("Overwrite"));
166 166
     if (r == KMessageBox::Cancel)
167 167
       return;
@@ -239,7 +239,7 @@ void KDVIMultiPage::print()
239 239
 
240 240
   // Show the printer options dialog. Return immediately if the user
241 241
   // aborts.
242
-  if (!printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) ))
242
+  if (!printer->setup(parentWdg, i18n("Print %1").arg(m_file.section('/', -1)) ))
243 243
     return;
244 244
 
245 245
   // This funny method call is necessary for the KPrinter to return
@@ -379,7 +379,7 @@ void KDVIMultiPage::print()
379 379
       dvips_options +=  TQString(",");
380 380
     else
381 381
       commaflag = 1;
382
-    dvips_options += TQString("%1").tqarg(*it);
382
+    dvips_options += TQString("%1").arg(*it);
383 383
   }
384 384
 
385 385
   // 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)
77 77
 
78 78
       if (!url.isValid()) 
79 79
       {
80
-        kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl;
80
+        kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl;
81 81
         return -1;
82 82
       }
83 83
 
84 84
       if (!url.isLocalFile()) 
85 85
       {
86 86
         kdError(4300) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local "
87
-             "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
87
+             "files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
88 88
         return -1;
89 89
       }
90 90
 

+ 1
- 1
kdvi/optionDialogSpecialWidget_base.ui View File

@@ -169,7 +169,7 @@
169 169
                     <property name="text">
170 170
                         <string>What is 'inverse search'? </string>
171 171
                     </property>
172
-                    <property name="tqalignment">
172
+                    <property name="alignment">
173 173
                         <set>AlignVCenter|AlignRight</set>
174 174
                     </property>
175 175
                     <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
211 211
   TQStringList argus;
212 212
   argus << "gs";
213 213
   argus << "-dSAFER" << "-dPARANOIDSAFER" << "-dDELAYSAFER" << "-dNOPAUSE" << "-dBATCH";
214
-  argus << TQString("-sDEVICE=%1").tqarg(*gsDevice);
215
-  argus << TQString("-sOutputFile=%1").tqarg(filename);
216
-  argus << TQString("-sExtraIncludePath=%1").tqarg(includePath);
217
-  argus << TQString("-g%1x%2").tqarg(pixel_page_w).tqarg(pixel_page_h); // page size in pixels
218
-  argus << TQString("-r%1").tqarg(resolution);                       // resolution in dpi
214
+  argus << TQString("-sDEVICE=%1").arg(*gsDevice);
215
+  argus << TQString("-sOutputFile=%1").arg(filename);
216
+  argus << TQString("-sExtraIncludePath=%1").arg(includePath);
217
+  argus << TQString("-g%1x%2").arg(pixel_page_w).arg(pixel_page_h); // page size in pixels
218
+  argus << TQString("-r%1").arg(resolution);                       // resolution in dpi
219 219
   argus << "-c" << "<< /PermitFileReading [ ExtraIncludePath ] /PermitFileWriting [] /PermitFileControl [] >> setuserparams .locksafe";
220 220
   argus << "-f" << PSfile.name();
221 221
   
@@ -241,7 +241,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
241 241
     while(proc.readln(GSoutput) != -1) {
242 242
       if (GSoutput.contains("Unknown device")) {
243 243
 	kdDebug(4300) << TQString("The version of ghostview installed on this computer does not support "
244
-				   "the '%1' ghostview device driver.").tqarg(*gsDevice) << endl;
244
+				   "the '%1' ghostview device driver.").arg(*gsDevice) << endl;
245 245
 	knownDevices.remove(gsDevice);
246 246
 	gsDevice = knownDevices.begin();
247 247
 	if (knownDevices.isEmpty())
@@ -267,7 +267,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
267 267
 					  "drivers. Note that KDVI needs to be restarted to re-enable PostScript support."
268 268
 					  "</p></qt>"));
269 269
 	else {
270
-	  kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").tqarg(*gsDevice) << endl;
270
+	  kdDebug(4300) << TQString("KDVI will now try to use the '%1' device driver.").arg(*gsDevice) << endl;
271 271
 	  gs_generate_graphics_file(page, filename, magnification);
272 272
 	}
273 273
 	return;

+ 8
- 8
kdvi/special.cpp View File

@@ -222,7 +222,7 @@ void dviRenderer::color_special(const TQString& _cp)
222 222
     // Take color off the stack
223 223
     if (colorStack.isEmpty())
224 224
       printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Color pop command issued when the color stack is empty." ).
225
-				tqarg(dviFile->filename).tqarg(current_page));
225
+				arg(dviFile->filename).arg(current_page));
226 226
     else
227 227
       colorStack.pop();
228 228
     return;
@@ -308,7 +308,7 @@ void parse_special_argument(const TQString& strg, const char* argument_name, int
308 308
       // Maybe we should open a dialog here.
309 309
       kdError(4300) << i18n("Malformed parameter in the epsf special command.\n"
310 310
                             "Expected a float to follow %1 in %2")
311
-                       .tqarg(argument_name).tqarg(strg) << endl;
311
+                       .arg(argument_name).arg(strg) << endl;
312 312
   }
313 313
 }
314 314
 
@@ -432,7 +432,7 @@ void dviRenderer::epsf_special(const TQString& cp)
432 432
       foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter), EPSfilename_orig, -1);
433 433
     else
434 434
       foreGroundPainter->drawText (bbox, (int)(TQt::AlignCenter), 
435
-				i18n("File not found: \n %1").tqarg(EPSfilename_orig), -1);
435
+				i18n("File not found: \n %1").arg(EPSfilename_orig), -1);
436 436
     foreGroundPainter->restore();
437 437
   }
438 438
   
@@ -469,12 +469,12 @@ void dviRenderer::TPIC_addPath_special(const TQString& cp)
469 469
   bool ok;
470 470
   float xKoord = cp_noWhiteSpace.section(' ', 0, 0).toFloat(&ok);
471 471
   if (ok == false) {
472
-    printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").tqarg(cp) );
472
+    printErrorMsgForSpecials( TQString("TPIC special; cannot parse first argument in 'pn %1'.").arg(cp) );
473 473
     return;
474 474
   }
475 475
   float yKoord = cp_noWhiteSpace.section(' ', 1, 1).toFloat(&ok);
476 476
   if (ok == false) {
477
-    printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").tqarg(cp) );
477
+    printErrorMsgForSpecials( TQString("TPIC special; cannot parse second argument in 'pn %1'.").arg(cp) );
478 478
     return;
479 479
   }
480 480
   
@@ -502,7 +502,7 @@ void dviRenderer::TPIC_setPen_special(const TQString& cp)
502 502
   bool ok;
503 503
   penWidth_in_mInch = cp.stripWhiteSpace().toFloat(&ok);
504 504
   if (ok == false) {
505
-    printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").tqarg(cp) );
505
+    printErrorMsgForSpecials( TQString("TPIC special; cannot parse argument in 'pn %1'.").arg(cp) );
506 506
     penWidth_in_mInch = 0.0;
507 507
     return;
508 508
   }
@@ -700,7 +700,7 @@ void dviRenderer::applicationDoSpecial(char *cp)
700 700
       foreGroundPainter->translate(-x,-y);
701 701
     } else
702 702
       printErrorMsgForSpecials( i18n("Error in DVIfile '%1', page %2. Could not interpret angle in text rotation special." ).
703
-				tqarg(dviFile->filename).tqarg(current_page));
703
+				arg(dviFile->filename).arg(current_page));
704 704
   }
705 705
 
706 706
   // The graphicx package marks the end of rotated text with this
@@ -722,6 +722,6 @@ void dviRenderer::applicationDoSpecial(char *cp)
722 722
       (strncasecmp(cp, "background", 10) == 0) )
723 723
     return;
724 724
   
725
-  printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").tqarg(special_command));
725
+  printErrorMsgForSpecials(i18n("The special command '%1' is not implemented.").arg(special_command));
726 726
   return;
727 727
 }

+ 1
- 1
kdvi/vf.cpp View File

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

+ 6
- 6
kfax/faxinput.cpp View File

@@ -110,7 +110,7 @@ notetiff(const char *name)
110 110
 
111 111
 
112 112
     if ((tf = fopen(name, "r")) == NULL) {
113
-        TQString mesg = i18n("Unable to open:\n%1\n").tqarg(TQFile::decodeName(name));
113
+        TQString mesg = i18n("Unable to open:\n%1\n").arg(TQFile::decodeName(name));
114 114
 	kfaxerror(i18n("Sorry"), mesg);
115 115
 	return 0;
116 116
     }
@@ -147,7 +147,7 @@ notetiff(const char *name)
147 147
 
148 148
 	if (fseek(tf, IFDoff, SEEK_SET) < 0) {
149 149
 	realbad:
150
-	  str = i18n("Invalid tiff file:\n%1\n").tqarg(TQFile::decodeName(name));
150
+	  str = i18n("Invalid tiff file:\n%1\n").arg(TQFile::decodeName(name));
151 151
 	  kfaxerror(i18n("Sorry"),str);
152 152
 	bad:
153 153
 	    if (strips)
@@ -249,7 +249,7 @@ notetiff(const char *name)
249 249
 	    case 279:		/* StripByteCounts */
250 250
 		if (count != nstrips) {
251 251
 		  str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n")
252
-			      .tqarg(TQFile::decodeName(name)).tqarg(nstrips).tqarg(count);
252
+			      .arg(TQFile::decodeName(name)).arg(nstrips).arg(count);
253 253
 		  kfaxerror(i18n("Message"),str);
254 254
 		  goto realbad;
255 255
 		}
@@ -419,7 +419,7 @@ getstrip(struct pagenode *pn, int strip)
419 419
 	pn->length = pn->strips[strip].size;
420 420
     }
421 421
     else {
422
-      str = i18n("Trying to expand too many strips\n%1%n").tqarg(TQFile::decodeName(pn->pathname));
422
+      str = i18n("Trying to expand too many strips\n%1%n").arg(TQFile::decodeName(pn->pathname));
423 423
       kfaxerror(i18n("Warning"),str);
424 424
       return NULL;
425 425
     }
@@ -448,7 +448,7 @@ getstrip(struct pagenode *pn, int strip)
448 448
 	/* handle ghostscript / PC Research fax file */
449 449
       if (Data[24] != 1 || Data[25] != 0){
450 450
 	str = i18n("Only the first page of the PC Research multipage file\n%1\nwill be shown\n")
451
-		.tqarg(TQFile::decodeName(pn->pathname));
451
+		.arg(TQFile::decodeName(pn->pathname));
452 452
 	kfaxerror(i18n("Message"),str);
453 453
       }
454 454
 	pn->length -= 64;
@@ -462,7 +462,7 @@ getstrip(struct pagenode *pn, int strip)
462 462
 	pn->height = G3count(pn, pn->expander == g32expand);
463 463
     if (pn->height == 0) {
464 464
 
465
-      str = i18n("No fax found in file:\n%1\n").tqarg(TQFile::decodeName(pn->pathname));
465
+      str = i18n("No fax found in file:\n%1\n").arg(TQFile::decodeName(pn->pathname));
466 466
       kfaxerror(i18n("Sorry"),str);
467 467
       errno = 0;
468 468
       badfile(pn);

+ 8
- 8
kfax/kfax.cpp View File

@@ -701,7 +701,7 @@ void TopLevel::print(){
701 701
   printer.setFullPage( true );
702 702
   printer.setUsePrinterResolution( true );
703 703
   printer.setCreator( i18n("KFax") + " " KFAXVERSION );
704
-  printer.setDocName( TQString("%1 - %2").tqarg(firstpage->name).tqarg(i18n("KFax")));
704
+  printer.setDocName( TQString("%1 - %2").arg(firstpage->name).arg(i18n("KFax")));
705 705
   printer.setDocFileName( firstpage->name );
706 706
   printer.setPageSelection( KPrinter::ApplicationSide );
707 707
   printer.setMinMax( 1, pages ); 
@@ -792,11 +792,11 @@ void TopLevel::printIt( KPrinter &printer, TQPainter &painter )
792 792
     TQSize scaledImageSize = size;
793 793
     if (size.width() > maxSize.width() || size.height() > maxSize.height() ) {
794 794
 	// Image does not fit - scale it and print centered
795
-	scaledImageSize.tqscale( maxSize, TQSize::ScaleMin );
795
+	scaledImageSize.scale( maxSize, TQSize::ScaleMin );
796 796
 	kdDebug() << "Image does not fit - scaling to " << maxSize << endl;
797 797
     } else {
798 798
 	// Image does fit - print it in original size, but centered
799
-	scaledImageSize.tqscale( size, TQSize::ScaleMin );
799
+	scaledImageSize.scale( size, TQSize::ScaleMin );
800 800
 	kdDebug() << "Image does fit - scaling to " << size << endl;
801 801
     }
802 802
     kdDebug() << "Final image size " << scaledImageSize << endl;
@@ -846,7 +846,7 @@ void TopLevel::openNetFile( const KURL &u)
846 846
 
847 847
   if ( u.isLocalFile() )
848 848
   {
849
-    TQString string = i18n("Loading '%1'").tqarg(u.path());
849
+    TQString string = i18n("Loading '%1'").arg(u.path());
850 850
     statusbar->message(string);
851 851
     openadd( u.path());
852 852
     statusbar->clear();
@@ -1441,17 +1441,17 @@ void TopLevel::uiUpdate(){
1441 1441
 	currentpage = pages;
1442 1442
     }
1443 1443
 
1444
-    TQString pagestr = i18n("Page: %1 of %2").tqarg(currentpage).tqarg(pages);
1444
+    TQString pagestr = i18n("Page: %1 of %2").arg(currentpage).arg(pages);
1445 1445
 
1446 1446
     statusbar->changeItem(pagestr, ID_PAGE_NO);
1447 1447
 
1448 1448
     if(Image){
1449
-      TQString wh = i18n("W: %1 H: %2").tqarg(Image->width).tqarg(Image->height);
1449
+      TQString wh = i18n("W: %1 H: %2").arg(Image->width).arg(Image->height);
1450 1450
       statusbar->changeItem(wh, ID_INS_OVR);
1451 1451
     }
1452 1452
 
1453
-    TQString resolution = i18n("Res: %1").tqarg(thispage->vres?i18n("Fine"):i18n("Normal"));
1454
-    // TODO: resolution += TQString("%1x%2").tqarg(thispage->dpiX).tqarg(thispage->dpiY);
1453
+    TQString resolution = i18n("Res: %1").arg(thispage->vres?i18n("Fine"):i18n("Normal"));
1454
+    // TODO: resolution += TQString("%1x%2").arg(thispage->dpiX).arg(thispage->dpiY);
1455 1455
     statusbar->changeItem(resolution, ID_GENERAL);
1456 1456
 
1457 1457
     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 &)
136 136
   TQString   filename = fi.absFilePath();
137 137
   if (!fi.exists() || fi.isDir()) {
138 138
     KMessageBox::error( parentWidget,
139
-			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
139
+			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").arg(filename),
140 140
 			i18n("File Error"));
141 141
     // the return value 'false' indicates that this operation was not successful.
142 142
     mutex.unlock();
@@ -157,11 +157,11 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
157 157
     // this case gracefully.
158 158
     if (fax.errorString().isEmpty())
159 159
       KMessageBox::error( parentWidget,
160
-			  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
160
+			  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
161 161
 			  i18n("File Error"));
162 162
     else
163 163
       KMessageBox::detailedError( parentWidget,
164
-				  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
164
+				  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
165 165
 				  fax.errorString(),
166 166
 				  i18n("File Error"));
167 167
     clear();

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

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

+ 2
- 2
kfaxview/main.cpp View File

@@ -97,14 +97,14 @@ int main(int argc, char** argv)
97 97
 
98 98
       if (!url.isValid()) 
99 99
       {
100
-        kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl;
100
+        kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl;
101 101
         return -1;
102 102
       }
103 103
 
104 104
       if (!url.isLocalFile()) 
105 105
       {
106 106
         kdError(4300) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local "
107
-             "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
107
+             "files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
108 108
         return -1;
109 109
       }
110 110
 

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

@@ -68,7 +68,7 @@ int PageTransition::duration() const
68 68
   return data->pt->getDuration();
69 69
 }
70 70
 
71
-PageTransition::Alignment PageTransition::tqalignment() const
71
+PageTransition::Alignment PageTransition::alignment() const
72 72
 {
73 73
   return (Poppler::PageTransition::Alignment)data->pt->getAlignment();
74 74
 }

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

@@ -60,7 +60,7 @@ class PageTransition {
60 60
     Fade
61 61
   };
62 62
   
63
-  /** \brief tqalignment of the transition effect that shall be used
63
+  /** \brief alignment of the transition effect that shall be used
64 64
    */
65 65
   // if changed remember to keep in sync with PageTransition.h enum
66 66
   enum Alignment {
@@ -114,7 +114,7 @@ class PageTransition {
114 114
   /**
115 115
      \brief Get dimension in which the transition effect occurs.
116 116
   */
117
-  Alignment tqalignment() const;
117
+  Alignment alignment() const;
118 118
   
119 119
   /**
120 120
      \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)
79 79
     int len = s.length();
80 80
     char *cstring = (char *)gmallocn(s.length(), sizeof(char));
81 81
     for (int i = 0; i < len; ++i)
82
-      cstring[i] = s.tqat(i).tqunicode();
82
+      cstring[i] = s.at(i).tqunicode();
83 83
     GooString *ret = new GooString(cstring, len);
84 84
     gfree(cstring);
85 85
     return ret;
@@ -136,11 +136,11 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, G
136 136
                 }
137 137
             }
138 138
 
139
-        // 3. recursively descend over tqchildren
139
+        // 3. recursively descend over children
140 140
         outlineItem->open();
141
-        GooList * tqchildren = outlineItem->getKids();
142
-        if ( tqchildren )
143
-            addTocChildren( docSyn, &item, tqchildren );
141
+        GooList * children = outlineItem->getKids();
142
+        if ( children )
143
+            addTocChildren( docSyn, &item, children );
144 144
     }
145 145
 }
146 146
 

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

@@ -237,10 +237,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
237 237
 #endif
238 238
 			TQString UTCOffset;
239 239
 			if (utcOffset(h)>0.0) {
240
-				UTCOffset.append(TQString("%1").tqarg(utcOffset(h)/3600, 0, 'f', 1));
240
+				UTCOffset.append(TQString("%1").arg(utcOffset(h)/3600, 0, 'f', 1));
241 241
 				UTCOffset.append(" hours behind UTC");
242 242
 			} else {
243
-				UTCOffset.append(TQString("%1").tqarg(-1.0*utcOffset(h)/3600, 0, 'f', 1));
243
+				UTCOffset.append(TQString("%1").arg(-1.0*utcOffset(h)/3600, 0, 'f', 1));
244 244
 				UTCOffset.append(" hours ahead of UTC");
245 245
 			}
246 246
 			appendItem( stdgroup, "UTC Offset", UTCOffset); 
@@ -264,10 +264,10 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
264 264
 		if ( hasLongitude(h) ) {
265 265
 			TQString Longitude;
266 266
 			if (longitude(h)<0.0) {
267
-				Longitude.append(TQString("%1").tqarg(-1.0*longitude(h),0,'f',3));
267
+				Longitude.append(TQString("%1").arg(-1.0*longitude(h),0,'f',3));
268 268
 				Longitude.append(" deg West");
269 269
 			} else {
270
-				Longitude.append(TQString("%1").tqarg(longitude(h),0,'f',3));
270
+				Longitude.append(TQString("%1").arg(longitude(h),0,'f',3));
271 271
 				Longitude.append(" deg East");
272 272
 			}
273 273
 			appendItem( stdgroup, "Longitude", Longitude);
@@ -275,17 +275,17 @@ bool KExrPlugin::readInfo( KFileMetaInfo& info, uint what)
275 275
 		if ( hasLatitude(h) ) {
276 276
 			TQString Latitude;
277 277
 			if (latitude(h)<0.0) {
278
-				Latitude.append(TQString("%1").tqarg(-1.0*latitude(h),0,'f',3));
278
+				Latitude.append(TQString("%1").arg(-1.0*latitude(h),0,'f',3));
279 279
 				Latitude.append(" deg South");
280 280
 			} else {
281
-				Latitude.append(TQString("%1").tqarg(latitude(h),0,'f',3));
281
+				Latitude.append(TQString("%1").arg(latitude(h),0,'f',3));
282 282
 				Latitude.append(" deg North");
283 283
 			}
284 284
 			appendItem( stdgroup, "Latitude", Latitude );
285 285
 		}
286 286
 		if ( hasAltitude(h) ) {
287 287
 			double Altitude = altitude(h);
288
-			appendItem( stdgroup, "Altitude", TQString("%1").tqarg(Altitude,0,'f',1) );
288
+			appendItem( stdgroup, "Altitude", TQString("%1").arg(Altitude,0,'f',1) );
289 289
 		}
290 290
 		if ( hasIsoSpeed(h) ) {
291 291
 			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)
803 803
             // printf("Exif section in Motorola order\n");
804 804
             MotorolaOrder = 1;
805 805
         }else{
806
-            throw FatalError("Invalid Exif tqalignment marker.");
806
+            throw FatalError("Invalid Exif alignment marker.");
807 807
         }
808 808
     }
809 809
 

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

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

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

@@ -134,7 +134,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
134 134
 		long compressed = file.size() - 512;
135 135
 		long verbatim = xsize * ysize * zsize;
136 136
 		appendItem(group, "Compression", i18n("Runlength Encoded")
137
-				+ TQString(", %1%").tqarg(compressed * 100.0 / verbatim, 0, 'f', 1));
137
+				+ TQString(", %1%").arg(compressed * 100.0 / verbatim, 0, 'f', 1));
138 138
 
139 139
 		long k;
140 140
 		TQ_UINT32 offs;
@@ -152,7 +152,7 @@ bool KRgbPlugin::readInfo(KFileMetaInfo& info, uint /*what*/)
152 152
 			k += it.data();
153 153
 
154 154
 		if (k)
155
-			appendItem(group, "SharedRows", TQString("%1%").tqarg(k * 100.0
155
+			appendItem(group, "SharedRows", TQString("%1%").arg(k * 100.0
156 156
 					/ (ysize * zsize), 0, 'f', 1));
157 157
 		else
158 158
 			appendItem(group, "SharedRows", i18n("None"));

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

@@ -264,7 +264,7 @@ void KGamma::setupUI() {
264 264
 
265 265
     screenselect = new TQComboBox( options );
266 266
     for ( int i = 0; i < ScreenCount; i++ )
267
-      screenselect->insertItem( i18n("Screen %1").tqarg(i+1) );
267
+      screenselect->insertItem( i18n("Screen %1").arg(i+1) );
268 268
     screenselect->setCurrentItem(currentScreen);
269 269
     connect(screenselect, TQT_SIGNAL(activated(int)), TQT_SLOT(changeScreen(int)));
270 270
 
@@ -351,7 +351,7 @@ void KGamma::save() {
351 351
 
352 352
     if ( !xf86cfgbox->isChecked() ) { //write gamma settings to the users config
353 353
       for (int i = 0; i < ScreenCount; i++) {
354
-        config->setGroup( TQString("Screen %1").tqarg(i) );
354
+        config->setGroup( TQString("Screen %1").arg(i) );
355 355
         config->writeEntry("rgamma", rgamma[i]);
356 356
         config->writeEntry("ggamma", ggamma[i]);
357 357
         config->writeEntry("bgamma", bgamma[i]);
@@ -405,7 +405,7 @@ bool KGamma::loadUserSettings() {
405 405
   KConfig *config = new KConfig("kgammarc");
406 406
 
407 407
   for (int i = 0; i < ScreenCount; i++) {
408
-    config->setGroup(TQString( "Screen %1" ).tqarg(i) );
408
+    config->setGroup(TQString( "Screen %1" ).arg(i) );
409 409
     rgamma[i] = config->readEntry("rgamma");
410 410
     ggamma[i] = config->readEntry("ggamma");
411 411
     bgamma[i] = config->readEntry("bgamma");
@@ -610,7 +610,7 @@ extern "C"
610 610
 
611 611
       for (int i = 0; i < xv._ScreenCount(); i++) {
612 612
         xv.setScreen(i);
613
-        config->setGroup( TQString("Screen %1").tqarg(i) );
613
+        config->setGroup( TQString("Screen %1").arg(i) );
614 614
 
615 615
         if ((rgamma = config->readEntry("rgamma").toFloat()))
616 616
           xv.setGamma(XVidExtWrap::Red, rgamma);

+ 4
- 4
kghostview/displayoptions.cpp View File

@@ -68,10 +68,10 @@ namespace {
68 68
 TQString DisplayOptions::toString( const DisplayOptions& options )
69 69
 {
70 70
 	return TQString( qformat )
71
-		.tqarg( options.page() )
72
-		.tqarg( options.magnification() )
73
-		.tqarg( options.overrideOrientation() )
74
-		.tqarg( options.overridePageMedia().utf8().data() );
71
+		.arg( options.page() )
72
+		.arg( options.magnification() )
73
+		.arg( options.overrideOrientation() )
74
+		.arg( options.overridePageMedia().utf8().data() );
75 75
 }
76 76
 
77 77
 bool DisplayOptions::fromString( DisplayOptions& out, const TQString& in )

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

@@ -9,6 +9,6 @@
9 9
 
10 10
 void GSSettingsWidget::setDetectedVersion( TQString v)
11 11
 {
12
-    mDetectedVersion->setText(mDetectedVersion->text().tqarg( v ));
12
+    mDetectedVersion->setText(mDetectedVersion->text().arg( v ));
13 13
 }
14 14
 

+ 1
- 1
kghostview/kdscerrordialog.cpp View File

@@ -97,7 +97,7 @@ KDSCErrorHandler::Response KDSCErrorDialog::error( const KDSCError& err )
97 97
 	break;
98 98
     }
99 99
 
100
-    _lineNumberLabel->setText( i18n( "On line %1:" ).tqarg( err.lineNumber() ) );
100
+    _lineNumberLabel->setText( i18n( "On line %1:" ).arg( err.lineNumber() ) );
101 101
     _lineLabel->setText( err.line() );
102 102
     _descriptionLabel->setText( description( err.type() ) );
103 103
     

+ 6
- 6
kghostview/kgv_miniwidget.cpp View File

@@ -441,7 +441,7 @@ void KGVMiniWidget::showPage( int pagenumber )
441 441
 	    /*
442 442
 	    KNotifyClient::userEvent
443 443
 	      (i18n("KGhostview cannot load the document, \"%1\".\n"
444
-		    "It appears to be broken.").tqarg( _fileName ),
444
+		    "It appears to be broken.").arg( _fileName ),
445 445
 	       KNotifyClient::Messagebox);
446 446
 	    _psWidget->disableInterpreter();
447 447
 	    _psFile=0;
@@ -486,13 +486,13 @@ void KGVMiniWidget::updateStatusBarText( int pageNumber )
486 486
 	else
487 487
 	    if( !_usePageLabels || document()->format() == KGVDocument::PDF )
488 488
 		text = i18n( "Page %1 of %2" )
489
-		       .tqarg( pageNumber + 1 )
490
-		       .tqarg( dsc()->page_count() );
489
+		       .arg( pageNumber + 1 )
490
+		       .arg( dsc()->page_count() );
491 491
 	    else
492 492
 		text = i18n( "Page %1 (%2 of %3)" )
493
-		       .tqarg( dsc()->page()[ _options.page() ].label )
494
-		       .tqarg( pageNumber + 1 )
495
-		       .tqarg( dsc()->page_count() );
493
+		       .arg( dsc()->page()[ _options.page() ].label )
494
+		       .arg( pageNumber + 1 )
495
+		       .arg( dsc()->page_count() );
496 496
 
497 497
 	emit setStatusBarText( text );
498 498
     }

+ 4
- 4
kghostview/kgv_view.cpp View File

@@ -264,7 +264,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
264 264
     for ( TQValueList<double>::iterator first = mags.begin(), last = mags.end();
265 265
 	    first != last;
266 266
 	    ++first ) {
267
-        TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
267
+        TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( *first * 100.0, 2 ));
268 268
         str.remove( KGlobal::locale()->decimalSymbol() + "00" );
269 269
         zooms << str;
270 270
 	if ( *first == 1.0 ) idx = cur;
@@ -600,7 +600,7 @@ void KGVPart::updateZoomActions()
600 600
     }
601 601
 
602 602
     // Show percentage that isn't predefined
603
-    TQString str = TQString( "%1%" ).tqarg( KGlobal::locale()->formatNumber( zoom, 2 ));
603
+    TQString str = TQString( "%1%" ).arg( KGlobal::locale()->formatNumber( zoom, 2 ));
604 604
     str.remove( KGlobal::locale()->decimalSymbol() + "00" );
605 605
     items.insert( items.at(idx), 1, str );
606 606
     _zoomTo->setItems( items );
@@ -750,8 +750,8 @@ void KGVPart::slotGhostscriptError( const TQString& error )
750 750
 				"Below are any error messages which were received from Ghostscript "
751 751
 				"(<nobr><strong>%2</strong></nobr>) "
752 752
 				"which may help you.</qt>" )
753
-		    .tqarg( error )
754
-		    .tqarg( Configuration::interpreter() ),
753
+		    .arg( error )
754
+		    .arg( Configuration::interpreter() ),
755 755
 	   true );
756 756
     // The true above makes it show a "configure gs" option, but maybe we
757 757
     // should trigger an auto-redetection?

+ 2
- 2
kghostview/kgvconfigdialog.cpp View File

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

+ 18
- 18
kghostview/kgvdocument.cpp View File

@@ -98,7 +98,7 @@ void KGVDocument::doOpenFile()
98 98
 	KMessageBox::sorry( _part->widget(),
99 99
 		i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: "
100 100
 		      "File does not exist.</qt>" )
101
-		.tqarg( _fileName ) );
101
+		.arg( _fileName ) );
102 102
 	emit canceled( TQString() );
103 103
 	return;
104 104
     }
@@ -107,7 +107,7 @@ void KGVDocument::doOpenFile()
107 107
     	KMessageBox::sorry( _part->widget(),
108 108
 		i18n( "<qt>Could not open <nobr><strong>%1</strong></nobr>: "
109 109
 		      "Permission denied.</qt>" )
110
-		.tqarg( _fileName ) );
110
+		.arg( _fileName ) );
111 111
 	emit canceled( TQString() );
112 112
 	return;
113 113
     }
@@ -132,7 +132,7 @@ void KGVDocument::doOpenFile()
132 132
 	if( _tmpDSC->status() != 0 ) {
133 133
 	    KMessageBox::error( _part->widget(),
134 134
 		    i18n( "Could not create temporary file: %1" )
135
-		    .tqarg( strerror( _tmpDSC->status() ) ) );
135
+		    .arg( strerror( _tmpDSC->status() ) ) );
136 136
 	    emit canceled( TQString() );
137 137
 	    return;
138 138
 	}
@@ -159,8 +159,8 @@ void KGVDocument::doOpenFile()
159 159
 	              "which has type <strong>%2</strong>. KGhostview can "
160 160
 	              "only load PostScript (.ps, .eps) and Portable "
161 161
 	              "Document Format (.pdf) files.</qt>" )
162
-		      .tqarg( _fileName )
163
-		      .tqarg( _mimetype ) );
162
+		      .arg( _fileName )
163
+		      .arg( _mimetype ) );
164 164
 	emit canceled( TQString() );
165 165
 	return;
166 166
     }
@@ -190,7 +190,7 @@ bool KGVDocument::uncompressFile()
190 190
     {
191 191
 	KMessageBox::error( _part->widget(),
192 192
 		i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" )
193
-		.tqarg( _fileName ) );
193
+		.arg( _fileName ) );
194 194
 	emit canceled( TQString() );
195 195
 	return false;
196 196
     }
@@ -201,7 +201,7 @@ bool KGVDocument::uncompressFile()
201 201
     {
202 202
 	KMessageBox::error( _part->widget(),
203 203
 		i18n( "Could not create temporary file: %2" )
204
-		.tqarg( strerror( _tmpUnzipped->status() ) ) );
204
+		.arg( strerror( _tmpUnzipped->status() ) ) );
205 205
 	emit canceled( TQString() );
206 206
 	return false;
207 207
     }
@@ -221,7 +221,7 @@ bool KGVDocument::uncompressFile()
221 221
     {
222 222
 	KMessageBox::error( _part->widget(),
223 223
 	    i18n( "<qt>Could not uncompress <nobr><strong>%1</strong></nobr>.</qt>" )
224
-	    .tqarg( _fileName ) );
224
+	    .arg( _fileName ) );
225 225
 	emit canceled( TQString() );
226 226
 	return false;
227 227
     }
@@ -239,7 +239,7 @@ void KGVDocument::openPDFFileContinue( bool pdf2dscResult )
239 239
     {
240 240
 	KMessageBox::error( _part->widget(),
241 241
 		i18n( "<qt>Could not open file <nobr><strong>%1</strong></nobr>.</qt>" ) 
242
-		.tqarg( _part->url().url() ) );
242
+		.arg( _part->url().url() ) );
243 243
 	emit canceled( TQString() );
244 244
 	return;
245 245
     }
@@ -260,8 +260,8 @@ void KGVDocument::openPSFile(const TQString &file)
260 260
     {
261 261
 	KMessageBox::error( _part->widget(),
262 262
 		i18n( "<qt>Error opening file <nobr><strong>%1</strong></nobr>: %2</qt>" )
263
-		.tqarg( _part->url().url() )
264
-		.tqarg( strerror( errno ) ) );
263
+		.arg( _part->url().url() )
264
+		.arg( strerror( errno ) ) );
265 265
 	emit canceled( "" );
266 266
 	return;
267 267
     }
@@ -497,7 +497,7 @@ TQString KGVDocument::pageListToRange( const PageList& pageList )
497 497
 	    if( bss == ess )
498 498
 		range += TQString::number( *ess );
499 499
 	    else
500
-		range += TQString( "%1-%2" ).tqarg( *bss ).tqarg( *ess );
500
+		range += TQString( "%1-%2" ).arg( *bss ).arg( *ess );
501 501
 
502 502
 	    bss = it;
503 503
 	}
@@ -521,7 +521,7 @@ void KGVDocument::print()
521 521
 	printer.setOption( "kde-range", 
522 522
 	                    pageListToRange( _part->markList()->markList() ) );
523 523
 
524
-	if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) ) 
524
+	if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) ) 
525 525
 	{
526 526
 	    KTempFile tf( TQString(), ".ps" );
527 527
 	    if( tf.status() == 0 ) 
@@ -548,7 +548,7 @@ void KGVDocument::print()
548 548
     {
549 549
 	printer.setPageSelection( KPrinter::SystemSide );
550 550
 	
551
-	if( printer.setup( _part->widget(), i18n("Print %1").tqarg(_part->url().fileName()) ) )
551
+	if( printer.setup( _part->widget(), i18n("Print %1").arg(_part->url().fileName()) ) )
552 552
 	    printer.printFiles( _fileName );
553 553
     }
554 554
 }
@@ -775,13 +775,13 @@ void KGVDocument::runPdf2ps( const TQString& pdfName,
775 775
     process << _interpreterPath
776 776
 	    << "-dNODISPLAY"
777 777
 	    << "-dTQUIET"
778
-	    << TQString( "-sPDFname=%1" ).tqarg( pdfName )
778
+	    << TQString( "-sPDFname=%1" ).arg( pdfName )
779 779
 	    << TQString( "-sDSCnamale locale( "kghostview" );
780 780
     _fallBackPageMedia = pageSizeToString( 
781 781
               static_cast< TQPrinter::PageSize >( locale.pageSize() ) );
782 782
     
783 783
     _usePageLabels = false;
784
-e=%1" ).tqarg( dscName )
784
+e=%1" ).arg( dscName )
785 785
 	    << "pdf2dsc.ps"
786 786
 	    << "-c"
787 787
 	    << "quit";
@@ -823,8 +823,8 @@ void Pdf2dsc::run( const TQString& pdfName, const TQString& dscName )
823 823
               << "-dDELAYSAFER"
824 824
               << "-dNODISPLAY"
825 825
               << "-dTQUIET"
826
-              << TQString( "-sPDFname=%1" ).tqarg( pdfName )
827
-              << TQString( "-sDSCname=%1" ).tqarg( dscName )
826
+              << TQString( "-sPDFname=%1" ).arg( pdfName )
827
+              << TQString( "-sDSCname=%1" ).arg( dscName )
828 828
               << "-c"
829 829
               << "<< /PermitFileReading [ PDFname ] /PermitFileWriting [ DSCname ] /PermitFileControl [] >> setuserparams .locksafe"
830 830
               << "-f"

+ 2
- 2
kghostview/kgvshell.cpp View File

@@ -252,7 +252,7 @@ KGVShell::openStdin()
252 252
     if( _tmpFile->status() != 0 ) {
253 253
 	KMessageBox::error( this,
254 254
 		i18n( "Could not create temporary file: %1" )
255
-		.tqarg( strerror( _tmpFile->status() ) ) );
255
+		.arg( strerror( _tmpFile->status() ) ) );
256 256
 	return;
257 257
     }
258 258
 
@@ -269,7 +269,7 @@ KGVShell::openStdin()
269 269
     if( read != 0 ) {
270 270
 	KMessageBox::error( this,
271 271
 		i18n( "Could not open standard input stream: %1" )
272
-		.tqarg( strerror( errno ) ) );
272
+		.arg( strerror( errno ) ) );
273 273
 	return;
274 274
     }
275 275
 

+ 3
- 3
kghostview/kpswidget.cpp View File

@@ -333,7 +333,7 @@ void KPSWidget::setupWidget()
333 333
     // Make sure the properties are updated immediately.
334 334
     XSync( x11Display(), false );
335 335
 
336
-    tqrepaint();
336
+    repaint();
337 337
 
338 338
     _widgetDirty = false;
339 339
 }
@@ -343,7 +343,7 @@ bool KPSWidget::startInterpreter()
343 343
     setupWidget();
344 344
 
345 345
     _process = new KProcess;
346
-    if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString(  "%1 %2" ).tqarg( winId() ).tqarg( _backgroundPixmap.handle() ) );
346
+    if ( _doubleBuffer ) _process->setEnvironment( "GHOSTVIEW", TQString(  "%1 %2" ).arg( winId() ).arg( _backgroundPixmap.handle() ) );
347 347
     else _process->setEnvironment( "GHOSTVIEW", TQString::number( winId() ) );
348 348
 
349 349
     *_process << _ghostscriptPath.local8Bit();
@@ -420,7 +420,7 @@ void KPSWidget::slotProcessExited( KProcess* process )
420 420
     {
421 421
 	kdDebug( 4500 ) << "KPSWidget::slotProcessExited(): looks like it was not a clean exit." << endl;
422 422
 	if ( process->normalExit() ) {
423
-	    emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).tqarg( process->exitStatus() ) ) );
423
+	    emit ghostscriptError( TQString( i18n( "Exited with error code %1." ).arg( process->exitStatus() ) ) );
424 424
 	} else {
425 425
 	    emit ghostscriptError( TQString( i18n( "Process killed or crashed." ) ) );
426 426
 	}

+ 3
- 3
kghostview/scrollbox.cpp View File

@@ -99,19 +99,19 @@ void ScrollBox::setPageSize( const TQSize& s )
99 99
 {
100 100
     pagesize = s;
101 101
     setFixedHeight( s.height() * width() / s.width() );
102
-    tqrepaint();
102
+    repaint();
103 103
 }
104 104
 
105 105
 void ScrollBox::setViewSize( const TQSize& s )
106 106
 {
107 107
     viewsize = s;
108
-    tqrepaint();
108
+    repaint();
109 109
 }
110 110
 
111 111
 void ScrollBox::setViewPos( const TQPoint& pos )
112 112
 {
113 113
     viewpos = pos;
114
-    tqrepaint();
114
+    repaint();
115 115
 }
116 116
 
117 117
 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 )
293 293
   }
294 294
 
295 295
   //kdDebug(4640) << "KColorGrid::setColor - before updateCell" << endl;
296
-  tqrepaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize,  cellsize, cellsize);
296
+  repaint((colNum%numCols())*cellsize,(colNum/numCols())*cellsize,  cellsize, cellsize);
297 297
   //updateCell( colNum/numCols(), colNum%numCols(), false );
298 298
   //kdDebug(4640) << "KColorGrid::setColor - after updateCell" << endl;
299 299
 }
300 300
 
301 301
 void KColorGrid::updateCell( int row, int col, bool  )
302 302
 {
303
-    //kdDebug(4640) << "updateCell - before tqrepaint" << endl;
303
+    //kdDebug(4640) << "updateCell - before repaint" << endl;
304 304
   TQWMatrix matrix;
305 305
   TQPainter p;
306 306
   p.begin( this );
@@ -330,6 +330,6 @@ void KColorGrid::setCellSize( int s )
330 330
   totalheight = (numRows() * s) + 1;
331 331
   resize(totalwidth, totalheight);
332 332
   if ( isVisible() )
333
-    tqrepaint(viewRect(), false);
333
+    repaint(viewRect(), false);
334 334
 }
335 335
 #include "kcolorgrid.moc"

+ 5
- 5
kiconedit/kicon.cpp View File

@@ -70,7 +70,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
70 70
 
71 71
         if(!url.isValid()) // Giving up
72 72
         {
73
-            TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").tqarg(url.url());
73
+            TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").arg(url.url());
74 74
             KMessageBox::sorry((TQWidget*)parent(), msg);
75 75
             return false;
76 76
         }
@@ -86,7 +86,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
86 86
     {
87 87
         if(!KIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
88 88
         {
89
-            TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
89
+            TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
90 90
             KMessageBox::error((TQWidget*)parent(), msg);
91 91
             return false;
92 92
         }
@@ -101,7 +101,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
101 101
 
102 102
     if(!loadedOk) 
103 103
     {
104
-          TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
104
+          TQString msg = i18n("There was an error loading:\n%1\n").arg(url.prettyURL());
105 105
           KMessageBox::error((TQWidget*)parent(), msg);
106 106
     }
107 107
     else
@@ -208,7 +208,7 @@ bool KIconEditIcon::saveAs(const TQImage *image)
208 208
     {
209 209
         int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
210 210
             i18n( "A file named \"%1\" already exists. "
211
-                  "Overwrite it?" ).tqarg(file),
211
+                  "Overwrite it?" ).arg(file),
212 212
             i18n( "Overwrite File?" ),
213 213
             i18n( "&Overwrite" ) );
214 214
   
@@ -265,7 +265,7 @@ bool KIconEditIcon::save(const TQImage *image, const TQString &_filename)
265 265
     }
266 266
     else 
267 267
     {
268
-        TQString msg = i18n("There was an error saving:\n%1\n").tqarg(str);
268
+        TQString msg = i18n("There was an error saving:\n%1\n").arg(str);
269 269
         KMessageBox::error((TQWidget*)parent(), msg);
270 270
         kdDebug(4640) << "KIconEditIcon::save - " << msg << endl;
271 271
     }

+ 1
- 1
kiconedit/kiconedit.cpp View File

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

+ 5
- 5
kiconedit/kiconeditslots.cpp View File

@@ -195,7 +195,7 @@ void KIconEdit::slotPrint()
195 195
 {
196 196
     KPrinter printer;
197 197
 
198
-    if ( printer.setup(this, i18n("Print %1").tqarg(icon->url().section('/', -1))) )
198
+    if ( printer.setup(this, i18n("Print %1").arg(icon->url().section('/', -1))) )
199 199
     {
200 200
         int margin = 10, yPos = 0;
201 201
         printer.setCreator("KDE Icon Editor");
@@ -422,13 +422,13 @@ void KIconEdit::slotUpdateZoom( int s )
422 422
 
423 423
 void KIconEdit::slotUpdateStatusPos(int x, int y)
424 424
 {
425
-    TQString str = i18n("Status Position", "%1, %2").tqarg(x).tqarg(y);
425
+    TQString str = i18n("Status Position", "%1, %2").arg(x).arg(y);
426 426
     statusbar->changeItem( str, 0);
427 427
 }
428 428
 
429 429
 void KIconEdit::slotUpdateStatusSize(int x, int y)
430 430
 {
431
-    TQString str = i18n("Status Size", "%1 x %2").tqarg(x).tqarg(y);
431
+    TQString str = i18n("Status Size", "%1 x %2").arg(x).arg(y);
432 432
     statusbar->changeItem( str, 1);
433 433
 }
434 434
 
@@ -443,13 +443,13 @@ void KIconEdit::slotUpdateStatusScaling(int s)
443 443
 
444 444
 void KIconEdit::slotUpdateStatusColors(uint)
445 445
 {
446
-    TQString str = i18n("Colors: %1").tqarg(grid->numColors());
446
+    TQString str = i18n("Colors: %1").arg(grid->numColors());
447 447
     statusbar->changeItem( str, 3);
448 448
 }
449 449
 
450 450
 void KIconEdit::slotUpdateStatusColors(uint n, uint *)
451 451
 {
452
-    TQString str = i18n("Colors: %1").tqarg(n);
452
+    TQString str = i18n("Colors: %1").arg(n);
453 453
     statusbar->changeItem( str, 3);
454 454
 }
455 455
 

+ 2
- 2
kiconedit/kicongrid.cpp View File

@@ -1044,7 +1044,7 @@ void KIconEditGrid::load( TQImage *image)
1044 1044
     emit changed(pixmap());
1045 1045
     setUpdatesEnabled(true);
1046 1046
     emit needPainting();
1047
-    //tqrepaint(viewRect(), false);
1047
+    //repaint(viewRect(), false);
1048 1048
     history->clear();
1049 1049
 }
1050 1050
 
@@ -1379,7 +1379,7 @@ void KIconEditGrid::editPasteAsNew()
1379 1379
             *img = tmp;
1380 1380
             load(img);
1381 1381
             setModified(true);
1382
-            //tqrepaint(viewRect(), false);
1382
+            //repaint(viewRect(), false);
1383 1383
   
1384 1384
             p = *img;
1385 1385
             emit changed(TQPixmap(p));

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

@@ -112,7 +112,7 @@ void Indexer::processNext()
112 112
          *m_process << *it;
113 113
 #endif
114 114
 
115
-    emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").tqarg( m_currentDir ));
115
+    emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").arg( m_currentDir ));
116 116
     m_process->start();
117 117
 }
118 118
 
@@ -160,7 +160,7 @@ void Indexer::slotCanRead( KProcIO *proc )
160 160
                     if ( ok )
161 161
                     {
162 162
                         uint dirsLeft = m_dirs.count();
163
-                        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 );
163
+                        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 );
164 164
                         emit progress( perc, message );
165 165
                     }
166 166
                 }

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

@@ -465,7 +465,7 @@ void MainPage::slotIndexingFinished( int returnCode )
465 465
             if ( err )
466 466
                 syserr = TQString::fromLocal8Bit( err );
467 467
             else
468
-                syserr = i18n("Unknown error: %1").tqarg( returnCode );
468
+                syserr = i18n("Unknown error: %1").arg( returnCode );
469 469
         }
470 470
 
471 471
         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;
53 53
 const TQString * MrmlShared::m_attribute = 0L;
54 54
 const TQString * MrmlShared::m_attributeName = 0L;
55 55
 const TQString * MrmlShared::m_attributeValue = 0L;
56
-const TQString * MrmlShared::m_tqchildren = 0L;
56
+const TQString * MrmlShared::m_children = 0L;
57 57
 const TQString * MrmlShared::m_none = 0L;
58 58
 
59 59
 const TQString * MrmlShared::m_multiSet = 0L;
@@ -141,7 +141,7 @@ void MrmlShared::init()
141 141
     m_attribute = new TQString ( "attribute" ) ;
142 142
     m_attributeName = new TQString ( "attribute-name" ) ;
143 143
     m_attributeValue = new TQString ( "attribute-value" ) ;
144
-    m_tqchildren = new TQString ( "tqchildren" ) ;
144
+    m_children = new TQString ( "children" ) ;
145 145
     m_none = new TQString ( "none" ) ;
146 146
 
147 147
     m_multiSet = new TQString ( "multi-set" ) ;
@@ -215,7 +215,7 @@ void MrmlShared::cleanup()
215 215
     delete m_attribute;
216 216
     delete m_attributeName;
217 217
     delete m_attributeValue;
218
-    delete m_tqchildren;
218
+    delete m_children;
219 219
     delete m_none;
220 220
 
221 221
     delete m_visibility;

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

@@ -76,7 +76,7 @@ public:
76 76
     static const TQString& attribute()           { return *m_attribute; }
77 77
     static const TQString& attributeName()       { return *m_attributeName; }
78 78
     static const TQString& attributeValue()      { return *m_attributeValue; }
79
-    static const TQString& tqchildren()            { return *m_tqchildren; }
79
+    static const TQString& children()            { return *m_children; }
80 80
     static const TQString& none()                { return *m_none; }
81 81
 
82 82
     static const TQString& visibility()          { return *m_visibility; }
@@ -139,7 +139,7 @@ private:
139 139
     static const TQString * m_attribute;
140 140
     static const TQString * m_attributeName;
141 141
     static const TQString * m_attributeValue;
142
-    static const TQString * m_tqchildren;
142
+    static const TQString * m_children;
143 143
     static const TQString * m_none;
144 144
 
145 145
     static const TQString * m_visibility;

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

@@ -216,11 +216,11 @@ bool Mrml::startSession( const KURL& url )
216 216
     // Wolfgang says, we shouldn't create an own session-id here, as gcc 2.95
217 217
     // apparently makes problems in exception handling somehow. So we simply
218 218
     // accept the server's session-id.
219
-    TQString msg = mrmlString( TQString() ).tqarg(
219
+    TQString msg = mrmlString( TQString() ).arg(
220 220
         "<open-session user-name=\"%1\" session-name=\"kio_mrml session\" /> \
221 221
          <get-algorithms />                                                  \
222 222
          <get-collections />                                                 \
223
-         </mrml>" ).tqarg( user( url ));
223
+         </mrml>" ).arg( user( url ));
224 224
 
225 225
     TQCString utf8 = msg.utf8();
226 226
 //     qDebug(":::Writing: %s", utf8.data());
@@ -240,13 +240,13 @@ TQString Mrml::mrmlString( const TQString& sessionId, const TQString& transactio
240 240
          </mrml>";
241 241
 
242 242
     if ( sessionId.isEmpty() ) // when we don't have one yet
243
-        return msg.tqarg( "<mrml>%1" );
243
+        return msg.arg( "<mrml>%1" );
244 244
 
245 245
     if ( transactionId.isNull() )
246
-        return msg.tqarg( "<mrml session-id=\"%1\">%1" ).tqarg( sessionId );
246
+        return msg.arg( "<mrml session-id=\"%1\">%1" ).arg( sessionId );
247 247
     else
248
-        return msg.tqarg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
249
-                  .tqarg( sessionId ).tqarg( transactionId );
248
+        return msg.arg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
249
+                  .arg( sessionId ).arg( transactionId );
250 250
 }
251 251
 
252 252
 void Mrml::emitData( const TQCString& msg )

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

@@ -28,7 +28,7 @@ using namespace KMrml;
28 28
 //
29 29
 // MrmlElement is currently the baseclass for Algorithm and Collection. Both
30 30
 // may have a single child-element <query-paradigm-list>, with a number of
31
-// <query-paradigm> elements as tqchildren.
31
+// <query-paradigm> elements as children.
32 32
 //
33 33
 
34 34
 MrmlElement::MrmlElement( const TQDomElement& elem )

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

@@ -310,7 +310,7 @@ void MrmlPart::contactServer( const KURL& url )
310 310
     TQString host = url.host().isEmpty() ?
311 311
                    TQString::fromLatin1("localhost") : url.host();
312 312
 
313
-    slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host ));
313
+    slotSetStatusBar( i18n("Connecting to indexing server at %1...").arg( host ));
314 314
 }
315 315
 
316 316
 //
@@ -495,7 +495,7 @@ void MrmlPart::parseMrml( TQDomDocument& doc )
495 495
                 else if ( tagName == "error" ) {
496 496
                     KMessageBox::information( widget(),
497 497
                                        i18n("Server returned error:\n%1\n")
498
-                                       .tqarg( elem.attribute( "message" )),
498
+                                       .arg( elem.attribute( "message" )),
499 499
                                               i18n("Server Error") );
500 500
                 }
501 501
 

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

@@ -307,10 +307,10 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL,
307 307
     /*
308 308
     if ( similarity > -1 )
309 309
         TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>")
310
-                       .tqarg( url )
311
-                       .tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity))));
310
+                       .arg( url )
311
+                       .arg(i18n("Similarity: %1").arg( TQString::number(similarity))));
312 312
     else
313
-        TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").tqarg( url ) );
313
+        TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").arg( url ) );
314 314
     */
315 315
 
316 316
     setMinimumSize( 130, 130 ); // ###

+ 4
- 4
kmrml/kmrml/propertysheet.cpp View File

@@ -98,10 +98,10 @@ void PropertySheet::initFromDOM( const TQDomElement& elem )
98 98
     m_minSubsetSize = toInt( elem.attribute( MrmlShared::minSubsetSize() ));
99 99
     m_maxSubsetSize = toInt( elem.attribute( MrmlShared::maxSubsetSize() ));
100 100
 
101
-    TQValueList<TQDomElement> tqchildren =
101
+    TQValueList<TQDomElement> children =
102 102
         KMrml::directChildElements( elem, MrmlShared::propertySheet() );
103
-    TQValueListConstIterator<TQDomElement> it = tqchildren.begin();
104
-    for ( ; it != tqchildren.end(); ++it )
103
+    TQValueListConstIterator<TQDomElement> it = children.begin();
104
+    for ( ; it != children.end(); ++it )
105 105
         m_subSheets.append( new PropertySheet( *it ) );
106 106
 }
107 107
 
@@ -190,7 +190,7 @@ PropertySheet::SendType PropertySheet::getSendType( const TQString& value )
190 190
         type = AttributeName;
191 191
     else if ( value == MrmlShared::attributeValue() )
192 192
         type = AttributeValue;
193
-    else if ( value == MrmlShared::tqchildren() )
193
+    else if ( value == MrmlShared::children() )
194 194
         type = Children;
195 195
     else if ( value == MrmlShared::none() )
196 196
         type = None;

+ 1
- 1
kmrml/kmrml/propertysheet.h View File

@@ -34,7 +34,7 @@ namespace KMrml
34 34
         {
35 35
             MultiSet = 1,       // ??
36 36
             Subset,             // radio-button/combobox or listbox
37
-            SetElement,         // CheckBox -> disables/enables tqchildren?
37
+            SetElement,         // CheckBox -> disables/enables children?
38 38
             Boolean,            // CheckBox
39 39
             Numeric,            // Slider/Spinbox
40 40
             Textual,            // lineedit

+ 2
- 2
kmrml/kmrml/server/watcher.cpp View File

@@ -146,7 +146,7 @@ void Watcher::slotProcExited( KProcess *proc )
146 146
                              i18n("<qt>The server with the command line"
147 147
                                   "<br>%1<br>"
148 148
                                   "is not available anymore. Do you want to "
149
-                                  "restart it?" ).tqarg( daemon->commandline ),
149
+                                  "restart it?" ).arg( daemon->commandline ),
150 150
                                             i18n("Service Failure"), i18n("Restart Server"), i18n("Do Not Restart") )
151 151
                  == KMessageBox::Yes )
152 152
             {
@@ -175,7 +175,7 @@ bool Watcher::startDaemon( DaemonData *daemon )
175 175
                       i18n("Unable to start the server with the "
176 176
                            "command line"
177 177
                            "<br>%1<br>"
178
-                          "Try again?").tqarg( daemon->commandline ),
178
+                          "Try again?").arg( daemon->commandline ),
179 179
                                          i18n("Service Failure"), i18n("Try Again"), i18n("Do Not Try") )
180 180
              == KMessageBox::Yes )
181 181
         {

+ 3
- 3
kolourpaint/BUGS View File

@@ -27,8 +27,8 @@ This file lists known bugs in this version that are not considered
27 27
    manifestations of the current QSpinBox behaviour.
28 28
 
29 29
 6. a) The undo history and document modified state are not updated during
30
-      the drawing of multi-segment tqshapes (Polygon, Connected Lines,
31
-      Curve).  They are however updated after tqshapes' completion.
30
+      the drawing of multi-segment shapes (Polygon, Connected Lines,
31
+      Curve).  They are however updated after shapes' completion.
32 32
 
33 33
    b) The text and brush-like tools set the document modified flag even if
34 34
       user cancels the draw operation.
@@ -37,7 +37,7 @@ This file lists known bugs in this version that are not considered
37 37
       still marked as modified (because 2 commands - the create selection
38 38
       and the move - were added but only one was undone).
39 39
 
40
-7. Certain tqshapes may have the wrong size (usually only a pixel off and
40
+7. Certain shapes may have the wrong size (usually only a pixel off and
41 41
    only in extreme cases) e.g. an ellipse of height 1 always has a width 1
42 42
    pixel less than it should be.  This is a Qt bug.
43 43
 

+ 3
- 3
kolourpaint/kpcommandhistory.cpp View File

@@ -763,7 +763,7 @@ void kpCommandHistoryBase::trimCommandLists ()
763 763
             -m_documentRestoredPosition > (int) m_undoCommandList.size ())
764 764
         {
765 765
         #if DEBUG_KP_COMMAND_HISTORY
766
-            kdDebug () << "\t\t\ttqinvalidate documentRestoredPosition" << endl;
766
+            kdDebug () << "\t\t\tinvalidate documentRestoredPosition" << endl;
767 767
         #endif
768 768
             m_documentRestoredPosition = INT_MAX;
769 769
         }
@@ -911,7 +911,7 @@ void kpCommandHistory::undo ()
911 911
     if (m_mainWindow && m_mainWindow->toolHasBegunShape ())
912 912
     {
913 913
     #if DEBUG_KP_COMMAND_HISTORY
914
-        kdDebug () << "\thas begun tqshape - cancel draw" << endl;
914
+        kdDebug () << "\thas begun shape - cancel draw" << endl;
915 915
     #endif
916 916
         m_mainWindow->tool ()->cancelShapeInternal ();
917 917
     }
@@ -928,7 +928,7 @@ void kpCommandHistory::redo ()
928 928
         //
929 929
         // Ignoring the request would not be intuitive for tools like
930 930
         // Polygon & Polyline (where it's not always apparent to the user
931
-        // that s/he's still drawing a tqshape even though the mouse isn't
931
+        // that s/he's still drawing a shape even though the mouse isn't
932 932
         // down).
933 933
         m_mainWindow->tool ()->cancelShapeInternal ();
934 934
     }

+ 3
- 3
kolourpaint/kpcommandhistory.h View File

@@ -222,16 +222,16 @@ private:
222 222
 
223 223
 // Intercepts Undo/Redo requests:
224 224
 //
225
-// If the user is currently drawing a tqshape, it cancels it.
225
+// If the user is currently drawing a shape, it cancels it.
226 226
 // Else it passes on the Undo/Redo request to kpCommandHistoryBase.
227 227
 //
228 228
 // TODO: This is wrong.  It won't work if the Undo action is disabled,
229 229
 //       for instance.
230 230
 //
231 231
 //       Maybe the real solution is to call kpCommandHistoryBase::addCommand()
232
-//       as _soon_ as the tqshape starts - not after it ends.  But the
232
+//       as _soon_ as the shape starts - not after it ends.  But the
233 233
 //       trouble with this solution is that if the user Undoes/cancels
234
-//       the tqshape s/he's currently drawing, it would replace a Redo
234
+//       the shape s/he's currently drawing, it would replace a Redo
235 235
 //       slot in the history.  Arguably you shouldn't be able to Redo
236 236
 //       something you never finished drawing.
237 237
 //

+ 6
- 6
kolourpaint/kpdocument.cpp View File

@@ -1109,22 +1109,22 @@ void kpDocument::setSelection (const kpSelection &selection)
1109 1109
                                 (selection.type () == kpSelection::Text));
1110 1110
 
1111 1111
     // We don't change the Selection Tool if the new selection's
1112
-    // tqshape is merely different to the current tool's (e.g. rectangular
1112
+    // shape is merely different to the current tool's (e.g. rectangular
1113 1113
     // vs elliptical) because:
1114 1114
     //
1115 1115
     // 1. All image selection tools support editing selections of all the
1116
-    //    different tqshapes anyway.
1116
+    //    different shapes anyway.
1117 1117
     // 2. Suppose the user is trying out different drags of selection borders
1118
-    //    and then decides to paste a differently tqshaped selection before continuing
1118
+    //    and then decides to paste a differently shaped selection before continuing
1119 1119
     //    to try out different borders.  If the pasting were to switch to
1120
-    //    a differently tqshaped tool, the borders drawn after the paste would
1121
-    //    be using a new tqshape rather than the tqshape before the paste.  This
1120
+    //    a differently shaped tool, the borders drawn after the paste would
1121
+    //    be using a new shape rather than the shape before the paste.  This
1122 1122
     //    could get irritating so we don't do the switch.
1123 1123
     //
1124 1124
     if (m_mainWindow &&
1125 1125
         (!m_mainWindow->toolIsASelectionTool () || isTextChanged))
1126 1126
     {
1127
-        // Switch to the appropriately tqshaped selection tool
1127
+        // Switch to the appropriately shaped selection tool
1128 1128
         // _before_ we change the selection
1129 1129
         // (all selection tool's ::end() functions nuke the current selection)
1130 1130
         switch (selection.type ())

+ 6
- 6
kolourpaint/kpdocumentsaveoptionswidget.cpp View File

@@ -712,9 +712,9 @@ void kpDocumentSaveOptionsWidget::setMode (Mode mode)
712 712
 void kpDocumentSaveOptionsWidget::repaintLabels ()
713 713
 {
714 714
     if (mode () != Quality)
715
-        m_colorDepthLabel->tqrepaint ();
715
+        m_colorDepthLabel->repaint ();
716 716
     if (mode () == Quality)
717
-        m_qualityLabel->tqrepaint ();
717
+        m_qualityLabel->repaint ();
718 718
 }
719 719
 
720 720
 
@@ -767,7 +767,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
767 767
         if (m_previewDialogLastRelativeGeometry.isEmpty ())
768 768
         {
769 769
         #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
770
-            kdDebug () << "\tread cfg preview dialog last rel tqgeometry" << endl;
770
+            kdDebug () << "\tread cfg preview dialog last rel geometry" << endl;
771 771
         #endif
772 772
             KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave);
773 773
             KConfigBase *cfg = cfgGroupSaver.config ();
@@ -826,7 +826,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
826 826
 
827 827
 
828 828
     #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
829
-        kdDebug () << "\ttqgeometry after show="
829
+        kdDebug () << "\tgeometry after show="
830 830
                    << TQRect (m_previewDialog->x (), m_previewDialog->y (),
831 831
                               m_previewDialog->width (), m_previewDialog->height ())
832 832
                    << endl;
@@ -852,7 +852,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
852 852
         cfg->sync ();
853 853
 
854 854
     #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
855
-        kdDebug () << "\tsaving preview tqgeometry "
855
+        kdDebug () << "\tsaving preview geometry "
856 856
                    << m_previewDialogLastRelativeGeometry
857 857
                    << " (TQt would have us believe "
858 858
                    << kpWidgetMapper::fromGlobal (m_visualParent,
@@ -942,7 +942,7 @@ void kpDocumentSaveOptionsWidget::updatePreviewDialogLastRelativeGeometry ()
942 942
     else
943 943
     {
944 944
     #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
945
-        kdDebug () << "\tnot visible - ignoring tqgeometry" << endl;
945
+        kdDebug () << "\tnot visible - ignoring geometry" << endl;
946 946
     #endif
947 947
     }
948 948
 }

+ 2
- 2
kolourpaint/kpmainwindow.cpp View File

@@ -157,7 +157,7 @@ void kpMainWindow::readThumbnailSettings ()
157 157
 
158 158
 #if DEBUG_KP_MAIN_WINDOW
159 159
     kdDebug () << "\t\tThumbnail Settings: shown=" << m_configThumbnailShown
160
-               << " tqgeometry=" << m_configThumbnailGeometry
160
+               << " geometry=" << m_configThumbnailGeometry
161 161
                << " zoomed=" << m_configZoomedThumbnail
162 162
                << " showRectangle=" << d->m_configThumbnailShowRectangle
163 163
                << endl;
@@ -808,7 +808,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
808 808
             #endif
809 809
                 slotCreateThumbnail ();
810 810
             }
811
-            // this' tqgeometry is weird ATM
811
+            // this' geometry is weird ATM
812 812
             else
813 813
             {
814 814
             #if DEBUG_KP_MAIN_WINDOW

+ 8
- 8
kolourpaint/kpmainwindow_view.cpp View File

@@ -842,13 +842,13 @@ void kpMainWindow::slotSaveThumbnailGeometry ()
842 842
     TQRect rect (m_thumbnail->x (), m_thumbnail->y (),
843 843
                 m_thumbnail->width (), m_thumbnail->height ());
844 844
 #if DEBUG_KP_MAIN_WINDOW
845
-    kdDebug () << "\tthumbnail relative tqgeometry=" << rect << endl;
845
+    kdDebug () << "\tthumbnail relative geometry=" << rect << endl;
846 846
 #endif
847 847
 
848 848
     m_configThumbnailGeometry = mapFromGlobal (rect);
849 849
 
850 850
 #if DEBUG_KP_MAIN_WINDOW
851
-    kdDebug () << "\tCONFIG: saving thumbnail tqgeometry "
851
+    kdDebug () << "\tCONFIG: saving thumbnail geometry "
852 852
                 << m_configThumbnailGeometry
853 853
                 << endl;
854 854
 #endif
@@ -1067,11 +1067,11 @@ void kpMainWindow::updateThumbnail ()
1067 1067
         kdDebug () << "\tcreating thumbnail" << endl;
1068 1068
     #endif
1069 1069
 
1070
-        // Read last saved tqgeometry before creating thumbnail & friends
1070
+        // Read last saved geometry before creating thumbnail & friends
1071 1071
         // in case they call notifyThumbnailGeometryChanged()
1072 1072
         TQRect thumbnailGeometry = m_configThumbnailGeometry;
1073 1073
     #if DEBUG_KP_MAIN_WINDOW
1074
-        kdDebug () << "\t\tlast used tqgeometry=" << thumbnailGeometry << endl;
1074
+        kdDebug () << "\t\tlast used geometry=" << thumbnailGeometry << endl;
1075 1075
     #endif
1076 1076
 
1077 1077
         m_thumbnail = new kpThumbnail (this, "thumbnail");
@@ -1084,9 +1084,9 @@ void kpMainWindow::updateThumbnail ()
1084 1084
         if (!thumbnailGeometry.isEmpty () &&
1085 1085
             TQRect (0, 0, width (), height ()).intersects (thumbnailGeometry))
1086 1086
         {
1087
-            const TQRect tqgeometry = mapToGlobal (thumbnailGeometry);
1088
-            m_thumbnail->resize (tqgeometry.size ());
1089
-            m_thumbnail->move (tqgeometry.topLeft ());
1087
+            const TQRect geometry = mapToGlobal (thumbnailGeometry);
1088
+            m_thumbnail->resize (geometry.size ());
1089
+            m_thumbnail->move (geometry.topLeft ());
1090 1090
         }
1091 1091
         else
1092 1092
         {
@@ -1101,7 +1101,7 @@ void kpMainWindow::updateThumbnail ()
1101 1101
                                     initialHeight);
1102 1102
 
1103 1103
             #if DEBUG_KP_MAIN_WINDOW
1104
-                kdDebug () << "\t\tcreating tqgeometry=" << geometryRect << endl;
1104
+                kdDebug () << "\t\tcreating geometry=" << geometryRect << endl;
1105 1105
             #endif
1106 1106
 
1107 1107
                 geometryRect = mapToGlobal (geometryRect);

+ 2
- 2
kolourpaint/kptool.cpp View File

@@ -744,7 +744,7 @@ void kpTool::endDrawInternal (const TQPoint &thisPoint, const TQRect &normalized
744 744
 // private
745 745
 void kpTool::endShapeInternal (const TQPoint &thisPoint, const TQRect &normalizedRect)
746 746
 {
747
-    endDrawInternal (thisPoint, normalizedRect, true/*end tqshape*/);
747
+    endDrawInternal (thisPoint, normalizedRect, true/*end shape*/);
748 748
 }
749 749
 
750 750
 // virtual
@@ -1154,7 +1154,7 @@ void kpTool::wheelEvent (TQWheelEvent *e)
1154 1154
     if ((e->state () & TQt::ControlButton) == 0)
1155 1155
         return;
1156 1156
     
1157
-    // If drawing, bye; don't care if a tqshape in progress though.
1157
+    // If drawing, bye; don't care if a shape in progress though.
1158 1158
     if (hasBegunDraw ())
1159 1159
         return;
1160 1160
         

+ 2
- 2
kolourpaint/kpview.cpp View File

@@ -1568,7 +1568,7 @@ void kpView::paintEventDrawSelectionResizeHandles (TQPainter *painter, const TQR
1568 1568
         painter->setRasterOp (TQt::XorROP);
1569 1569
     }
1570 1570
 
1571
-    TQMemArray <TQRect> rects = selResizeHandlesRegion.tqrects ();
1571
+    TQMemArray <TQRect> rects = selResizeHandlesRegion.rects ();
1572 1572
     for (TQMemArray <TQRect>::ConstIterator it = rects.begin ();
1573 1573
          it != rects.end ();
1574 1574
          it++)
@@ -1888,7 +1888,7 @@ void kpView::paintEvent (TQPaintEvent *e)
1888 1888
 
1889 1889
 
1890 1890
     TQRegion viewRegion = clipRegion ().intersect (e->region ());
1891
-    TQMemArray <TQRect> rects = viewRegion.tqrects ();
1891
+    TQMemArray <TQRect> rects = viewRegion.rects ();
1892 1892
 #if DEBUG_KP_VIEW_RENDERER && 1
1893 1893
     kdDebug () << "\t#rects = " << rects.count () << endl;
1894 1894
 #endif

+ 2
- 2