Browse Source

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 7 years ago
parent
commit
bce8199dda
100 changed files with 557 additions and 557 deletions
  1. 4
    4
      kamera/kcontrol/kameradevice.cpp
  2. 1
    1
      kamera/kcontrol/kameradevice.h
  3. 1
    1
      kcoloredit/kcoloreditview.cpp
  4. 7
    7
      kdvi/TeXFont_PK.cpp
  5. 14
    14
      kdvi/dviRenderer.cpp
  6. 9
    9
      kdvi/dviRenderer_export.cpp
  7. 1
    1
      kdvi/fontpool.cpp
  8. 1
    1
      kdvi/fontpool.h
  9. 3
    3
      kdvi/kdvi_multipage.cpp
  10. 1
    1
      kdvi/kdvi_multipage.h
  11. 2
    2
      kdvi/optionDialogFontsWidget_base.ui
  12. 1
    1
      kdvi/optionDialogSpecialWidget_base.ui
  13. 2
    2
      kdvi/special.cpp
  14. 2
    2
      kfaxview/faxmultipage.cpp
  15. 1
    1
      kfaxview/faxmultipage.h
  16. 3
    3
      kfaxview/faxrenderer.cpp
  17. 1
    1
      kfile-plugins/ps/gscreator.cpp
  18. 2
    2
      kghostview/generalsettingswidget.ui
  19. 2
    2
      kghostview/gssettingswidget.ui
  20. 2
    2
      kghostview/kgv_view.cpp
  21. 1
    1
      kghostview/kgv_view.h
  22. 2
    2
      kghostview/kgvfactory.cpp
  23. 1
    1
      kghostview/kgvfactory.h
  24. 1
    1
      kmrml/kmrml/kcontrol/serverconfigwidget.ui
  25. 1
    1
      kmrml/kmrml/mrml.cpp
  26. 5
    5
      kmrml/kmrml/mrml_part.cpp
  27. 2
    2
      kmrml/kmrml/mrml_part.h
  28. 12
    12
      kolourpaint/cursors/kpcursorlightcross.cpp
  29. 1
    1
      kolourpaint/kpcolor.cpp
  30. 1
    1
      kolourpaint/kpcolor.h
  31. 10
    10
      kolourpaint/kpdocument.cpp
  32. 1
    1
      kolourpaint/kpdocument.h
  33. 13
    13
      kolourpaint/kpselection.cpp
  34. 1
    1
      kolourpaint/kpselection.h
  35. 3
    3
      kolourpaint/kpthumbnail.cpp
  36. 21
    21
      kolourpaint/kpview.cpp
  37. 2
    2
      kolourpaint/kpview.h
  38. 1
    1
      kolourpaint/kpviewmanager.cpp
  39. 1
    1
      kolourpaint/kpviewmanager.h
  40. 1
    1
      kolourpaint/pixmapfx/kpeffectreducecolors.cpp
  41. 11
    11
      kolourpaint/pixmapfx/kpfloodfill.cpp
  42. 27
    27
      kolourpaint/pixmapfx/kppixmapfx.cpp
  43. 1
    1
      kolourpaint/pixmapfx/kppixmapfx.h
  44. 7
    7
      kolourpaint/tools/kptoolairspray.cpp
  45. 11
    11
      kolourpaint/tools/kptoolautocrop.cpp
  46. 1
    1
      kolourpaint/tools/kptoolclear.cpp
  47. 1
    1
      kolourpaint/tools/kptoolcrop.cpp
  48. 41
    41
      kolourpaint/tools/kptoolpen.cpp
  49. 2
    2
      kolourpaint/tools/kptoolpen.h
  50. 30
    30
      kolourpaint/tools/kptoolpolygon.cpp
  51. 39
    39
      kolourpaint/tools/kptoolrectangle.cpp
  52. 6
    6
      kolourpaint/tools/kptoolrectangle.h
  53. 3
    3
      kolourpaint/widgets/kptoolwidgetbase.cpp
  54. 1
    1
      kolourpaint/widgets/kptoolwidgetbase.h
  55. 9
    9
      kolourpaint/widgets/kptoolwidgeterasersize.cpp
  56. 5
    5
      kolourpaint/widgets/kptoolwidgetfillstyle.cpp
  57. 2
    2
      kolourpaint/widgets/kptoolwidgetfillstyle.h
  58. 8
    8
      kolourpaint/widgets/kptoolwidgetlinewidth.cpp
  59. 1
    1
      kooka/kocrbase.h
  60. 4
    4
      kooka/kocrocrad.cpp
  61. 2
    2
      kooka/kocrocrad.h
  62. 2
    2
      kooka/kookaimage.cpp
  63. 1
    1
      kooka/kookaimage.h
  64. 1
    1
      kooka/ksaneocr.cpp
  65. 1
    1
      kpdf/conf/dlgaccessibility.ui
  66. 1
    1
      kpdf/conf/dlggeneral.ui
  67. 1
    1
      kpdf/conf/dlgperformance.ui
  68. 1
    1
      kpdf/conf/dlgpresentation.ui
  69. 2
    2
      kpdf/core/generator_pdf/gp_outputdev.cpp
  70. 1
    1
      kpdf/core/generator_pdf/gp_outputdev.h
  71. 3
    3
      kpdf/part.cpp
  72. 1
    1
      kpdf/part.h
  73. 1
    1
      kpdf/ui/minibar.cpp
  74. 13
    13
      kpdf/ui/pageview.cpp
  75. 2
    2
      kpdf/ui/pageview.h
  76. 4
    4
      kpdf/ui/pageviewutils.cpp
  77. 5
    5
      kpdf/ui/toc.cpp
  78. 1
    1
      kpdf/ui/toc.h
  79. 84
    84
      kpovmodeler/pmdockwidget.cpp
  80. 2
    2
      kpovmodeler/pmdockwidget.h
  81. 7
    7
      kpovmodeler/pmdockwidget_private.cpp
  82. 2
    2
      kpovmodeler/pmfactory.cpp
  83. 1
    1
      kpovmodeler/pmfactory.h
  84. 19
    19
      kpovmodeler/pmglview.cpp
  85. 1
    1
      kpovmodeler/pmglview.h
  86. 14
    14
      kpovmodeler/pminsertrulesystem.cpp
  87. 5
    5
      kpovmodeler/pminsertrulesystem.h
  88. 2
    2
      kpovmodeler/pmlayoutsettings.cpp
  89. 2
    2
      kpovmodeler/pmlibraryhandle.cpp
  90. 2
    2
      kpovmodeler/pmlibraryhandle.h
  91. 7
    7
      kpovmodeler/pmlibraryiconview.cpp
  92. 1
    1
      kpovmodeler/pmlibrarymanager.h
  93. 1
    1
      kpovmodeler/pmparser.cpp
  94. 3
    3
      kpovmodeler/pmpart.cpp
  95. 2
    2
      kpovmodeler/pmpart.h
  96. 1
    1
      kpovmodeler/pmshell.cpp
  97. 1
    1
      kpovmodeler/pmtreeview.cpp
  98. 1
    1
      kpovmodeler/pmtreeviewitem.h
  99. 5
    5
      kpovmodeler/pmviewlayoutmanager.cpp
  100. 0
    0
      kpovmodeler/pmviewlayoutmanager.h

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

@@ -197,7 +197,7 @@ void KCamera::load(KConfig *config)
197 197
 		m_model = config->readEntry("Model");
198 198
 	if (m_path.isNull())
199 199
 		m_path = config->readEntry("Path");
200
-	tqinvalidateCamera();
200
+	invalidateCamera();
201 201
 }
202 202
 
203 203
 void KCamera::save(KConfig *config)
@@ -223,17 +223,17 @@ void KCamera::setName(const TQString &name)
223 223
 void KCamera::setModel(const TQString &model)
224 224
 {
225 225
 	m_model = model;
226
-	tqinvalidateCamera();
226
+	invalidateCamera();
227 227
 	initInformation();
228 228
 }
229 229
 
230 230
 void KCamera::setPath(const TQString &path)
231 231
 {
232 232
 	m_path = path;
233
-	tqinvalidateCamera();
233
+	invalidateCamera();
234 234
 }
235 235
 
236
-void KCamera::tqinvalidateCamera()
236
+void KCamera::invalidateCamera()
237 237
 {
238 238
 	if (m_camera) {
239 239
 		gp_camera_free(m_camera);

+ 1
- 1
kamera/kcontrol/kameradevice.h View File

@@ -44,7 +44,7 @@ class KCamera : public TQObject {
44 44
 public:
45 45
 	KCamera(const TQString &name, const TQString &path);
46 46
 	~KCamera();
47
-	void tqinvalidateCamera();
47
+	void invalidateCamera();
48 48
 	bool configure();
49 49
 	void load(KConfig *m_config);
50 50
 	void save(KConfig *m_config);

+ 1
- 1
kcoloredit/kcoloreditview.cpp View File

@@ -145,7 +145,7 @@ void KColorEditView::setColorAtCursorComponentValueLabelSizes(TQLabel* const lab
145 145
 }
146 146
 
147 147
 KColorEditDoc *KColorEditView::document() const {
148
-  KColorEditApp *theApp=(KColorEditApp *) tqparentWidget();
148
+  KColorEditApp *theApp=(KColorEditApp *) parentWidget();
149 149
 
150 150
   return theApp->document();
151 151
 }

+ 7
- 7
kdvi/TeXFont_PK.cpp View File

@@ -347,7 +347,7 @@ static const uchar bitflip[256] = {
347 347
   15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255
348 348
 };                                                                              
349 349
 
350
-static TQ_UINT32	bit_tqmasks[33] = {
350
+static TQ_UINT32	bit_masks[33] = {
351 351
 	0x0,		0x1,		0x3,		0x7,
352 352
 	0xf,		0x1f,		0x3f,		0x7f,
353 353
 	0xff,		0x1ff,		0x3ff,		0x7ff,
@@ -595,12 +595,12 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
595 595
 	    h_bit -= count;
596 596
 	    word_weight -= count;
597 597
 	    if (paint_switch)
598
-	      word |= bit_tqmasks[count] << word_weight;
598
+	      word |= bit_masks[count] << word_weight;
599 599
 	    count = 0;
600 600
 	  } else 
601 601
 	    if (count >= h_bit && h_bit <= word_weight) {
602 602
 	      if (paint_switch)
603
-		word |= bit_tqmasks[h_bit] << (word_weight - h_bit);
603
+		word |= bit_masks[h_bit] << (word_weight - h_bit);
604 604
 	      *cp++ = word;
605 605
 	      /* "output" row(s) */
606 606
 	      for (i = PK_repeat_count * bytes_wide / 4; i > 0; --i) {
@@ -615,7 +615,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
615 615
 	      h_bit = characterBitmaps[ch]->w;
616 616
 	    } else {
617 617
 	      if (paint_switch)
618
-		word |= bit_tqmasks[word_weight];
618
+		word |= bit_masks[word_weight];
619 619
 	      *cp++ = word;
620 620
 	      word = 0;
621 621
 	      count -= word_weight;
@@ -679,14 +679,14 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
679 679
 	while (count > 0) {
680 680
 	  if (count < word_weight && count < h_bit) {
681 681
 	    if (paint_switch)
682
-	      word |= bit_tqmasks[count] << (32 - word_weight);
682
+	      word |= bit_masks[count] << (32 - word_weight);
683 683
 	    h_bit -= count;
684 684
 	    word_weight -= count;
685 685
 	    count = 0;
686 686
 	  } else 
687 687
 	    if (count >= h_bit && h_bit <= word_weight) {
688 688
 	      if (paint_switch)
689
-		word |= bit_tqmasks[h_bit] << (32 - word_weight);
689
+		word |= bit_masks[h_bit] << (32 - word_weight);
690 690
 	      *cp++ = word;
691 691
 	      /* "output" row(s) */
692 692
 	      for (i = PK_repeat_count * bytes_wide / 4; i > 0; --i) {
@@ -701,7 +701,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
701 701
 	      h_bit = characterBitmaps[ch]->w;
702 702
 	    } else {
703 703
 	      if (paint_switch)
704
-		word |= bit_tqmasks[word_weight] << (32 - word_weight);
704
+		word |= bit_masks[word_weight] << (32 - word_weight);
705 705
 	      *cp++ = word;
706 706
 	      word = 0;
707 707
 	      count -= word_weight;

+ 14
- 14
kdvi/dviRenderer.cpp View File

@@ -79,7 +79,7 @@ dviRenderer::dviRenderer(TQWidget *par)
79 79
 
80 80
   connect(&font_pool, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) );
81 81
 
82
-  tqparentWidget = par;
82
+  parentWidget = par;
83 83
   shrinkfactor = 3;
84 84
   current_page = 0;
85 85
   resolutionInDPI = 0.0;
@@ -206,7 +206,7 @@ void dviRenderer::drawPage(double resolution, RenderedDocumentPage *page)
206 206
   
207 207
   page->isEmpty = false;
208 208
   if (errorMsg.isEmpty() != true) {
209
-    KMessageBox::detailedError(tqparentWidget,
209
+    KMessageBox::detailedError(parentWidget,
210 210
 			       i18n("<qt><strong>File corruption!</strong> KDVI had trouble interpreting your DVI file. Most "
211 211
 				    "likely this means that the DVI file is broken.</qt>"),
212 212
 			       errorMsg, i18n("DVI File Error"));
@@ -260,7 +260,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
260 260
   
261 261
   if (showMsg) {
262 262
     KDialogBase *dialog= new KDialogBase(i18n("KDVI: Information"), KDialogBase::Yes, KDialogBase::Yes, KDialogBase::Yes,
263
-					 tqparentWidget, "information", true, true,KStdGuiItem::ok() );
263
+					 parentWidget, "information", true, true,KStdGuiItem::ok() );
264 264
     
265 265
     TQVBox *topcontents = new TQVBox (dialog);
266 266
     topcontents->setSpacing(KDialog::spacingHint()*2);
@@ -311,7 +311,7 @@ void dviRenderer::embedPostScript()
311 311
   if (!dviFile)
312 312
     return;
313 313
 
314
-  embedPS_progress = new KProgressDialog(tqparentWidget, "embedPSProgressDialog",
314
+  embedPS_progress = new KProgressDialog(parentWidget, "embedPSProgressDialog",
315 315
 					 i18n("Embedding PostScript Files"), TQString(), true);
316 316
   if (!embedPS_progress)
317 317
     return;
@@ -342,10 +342,10 @@ void dviRenderer::embedPostScript()
342 342
 
343 343
   if (!errorMsg.isEmpty()) {
344 344
     errorMsg = "<qt>" + errorMsg + "</qt>";
345
-    KMessageBox::detailedError(tqparentWidget, "<qt>" + i18n("Not all PostScript files could be embedded into your document.") + "</qt>", errorMsg);
345
+    KMessageBox::detailedError(parentWidget, "<qt>" + i18n("Not all PostScript files could be embedded into your document.") + "</qt>", errorMsg);
346 346
     errorMsg = TQString();
347 347
   } else
348
-    KMessageBox::information(tqparentWidget, "<qt>" + i18n("All external PostScript files were embedded into your document. You "
348
+    KMessageBox::information(parentWidget, "<qt>" + i18n("All external PostScript files were embedded into your document. You "
349 349
 						 "will probably want to save the DVI file now.") + "</qt>",
350 350
 			     TQString(), "embeddingDone");
351 351
 
@@ -435,7 +435,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
435 435
   
436 436
   // Make sure the file actually exists.
437 437
   if (!fi.exists() || fi.isDir()) {
438
-    KMessageBox::error( tqparentWidget,
438
+    KMessageBox::error( parentWidget,
439 439
 			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist. "
440 440
 			     "KDVI already tried to add the ending '.dvi'.</qt>").tqarg(filename),
441 441
 			i18n("File Error!"));
@@ -448,7 +448,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
448 448
   // the multipage.
449 449
   TQString mimetype( KMimeMagic::self()->findFileType( fname )->mimeType() );
450 450
   if (mimetype != "application/x-dvi") {
451
-    KMessageBox::sorry( tqparentWidget,
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 454
 			.tqarg( fname )
@@ -459,7 +459,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
459 459
   // Check if the file is a valid DVI file.
460 460
   if (!isValidFile(filename))
461 461
   {
462
-    KMessageBox::sorry( tqparentWidget,
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 465
                         .tqarg( fname ) );
@@ -477,7 +477,7 @@ bool dviRenderer::setFile(const TQString &fname, const KURL &base)
477 477
   if ((dviFile_new->dvi_Data() == NULL)||(dviFile_new->errorMsg.isEmpty() != true)) {
478 478
     TQApplication::restoreOverrideCursor();
479 479
     if (dviFile_new->errorMsg.isEmpty() != true)
480
-      KMessageBox::detailedError(tqparentWidget,
480
+      KMessageBox::detailedError(parentWidget,
481 481
 				 i18n("<qt>File corruption! KDVI had trouble interpreting your DVI file. Most "
482 482
 				      "likely this means that the DVI file is broken.</qt>"),
483 483
 				 dviFile_new->errorMsg, i18n("DVI File Error"));
@@ -637,7 +637,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
637 637
     TQString  refFileName   = splitter.filePath();
638 638
     
639 639
     if (sourceHyperLinkAnchors.isEmpty()) {
640
-      KMessageBox::sorry(tqparentWidget, i18n("<qt>You have asked KDVI to locate the place in the DVI file which corresponds to "
640
+      KMessageBox::sorry(parentWidget, i18n("<qt>You have asked KDVI to locate the place in the DVI file which corresponds to "
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 "
@@ -680,7 +680,7 @@ Anchor dviRenderer::parseReference(const TQString &reference)
680 680
       return Anchor(bestMatch->page, bestMatch->distance_from_top);
681 681
     } else
682 682
       if (anchorForRefFileFound == false)
683
-	KMessageBox::sorry(tqparentWidget, i18n("<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
683
+	KMessageBox::sorry(parentWidget, i18n("<qt>KDVI was not able to locate the place in the DVI file which corresponds to "
684 684
 					      "line %1 in the TeX-file <strong>%2</strong>.</qt>").tqarg(refLineNumber).tqarg(refFileName),
685 685
 			   i18n( "Could Not Find Reference" ));
686 686
       else {
@@ -733,7 +733,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
733 733
   TQString TeXfile = splitter.filePath();
734 734
   if ( ! splitter.fileExists() )
735 735
   {
736
-      KMessageBox::sorry(tqparentWidget, TQString("<qt>") +
736
+      KMessageBox::sorry(parentWidget, TQString("<qt>") +
737 737
 			 i18n("The DVI-file refers to the TeX-file "
738 738
 			      "<strong>%1</strong> which could not be found.").tqarg(KShellProcess::quote(TeXfile)) +
739 739
 			 TQString("</qt>"),
@@ -743,7 +743,7 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum
743 743
   
744 744
   TQString command = editorCommand;
745 745
   if (command.isEmpty() == true) {
746
-    int r = KMessageBox::warningContinueCancel(tqparentWidget, TQString("<qt>") +
746
+    int r = KMessageBox::warningContinueCancel(parentWidget, TQString("<qt>") +
747 747
 					       i18n("You have not yet specified an editor for inverse search. "
748 748
 						    "Please choose your favorite editor in the "
749 749
 						    "<strong>DVI options dialog</strong> "

+ 9
- 9
kdvi/dviRenderer_export.cpp View File

@@ -96,12 +96,12 @@ void dviRenderer::exportPDF()
96 96
   TQString suggestedName = dviFile->filename;
97 97
   suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".pdf";
98 98
 
99
-  TQString fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.pdf|Portable Document Format (*.pdf)"), tqparentWidget, i18n("Export File As"));
99
+  TQString fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.pdf|Portable Document Format (*.pdf)"), parentWidget, i18n("Export File As"));
100 100
   if (fileName.isEmpty())
101 101
     return;
102 102
   TQFileInfo finfo(fileName);
103 103
   if (finfo.exists()) {
104
-    int r = KMessageBox::warningContinueCancel (tqparentWidget, 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?").tqarg(fileName),
105 105
 				       i18n("Overwrite File"), i18n("Overwrite"));
106 106
     if (r == KMessageBox::Cancel)
107 107
       return;
@@ -116,7 +116,7 @@ void dviRenderer::exportPDF()
116 116
 					  "a while because dvipdfm needs to generate its own bitmap fonts "
117 117
 					  "Please be patient."),
118 118
 				     i18n("Waiting for dvipdfm to finish..."),
119
-				     tqparentWidget, i18n("dvipdfm progress dialog"), false );
119
+				     parentWidget, i18n("dvipdfm progress dialog"), false );
120 120
   if (progress != 0) {
121 121
     progress->TextLabel2->setText( i18n("Please be patient") );
122 122
     progress->setTotalSteps( dviFile->total_pages );
@@ -177,7 +177,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
177 177
     return;
178 178
 
179 179
   if (dviFile->numberOfExternalNONPSFiles != 0) {
180
-    KMessageBox::sorry( tqparentWidget, 
180
+    KMessageBox::sorry( parentWidget, 
181 181
 			i18n("<qt><P>This DVI file refers to external graphic files which are not in PostScript format, and cannot be handled by the "
182 182
 			     "<strong>dvips</strong> program that KDVI uses interally to print or to export to PostScript. The functionality that "
183 183
 			     "you require is therefore unavailable in this version of KDVI.</p>"
@@ -195,12 +195,12 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
195 195
     TQString suggestedName = dviFile->filename;
196 196
     suggestedName = suggestedName.left(suggestedName.tqfind(".")) + ".ps";
197 197
 
198
-    fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.ps|PostScript (*.ps)"), tqparentWidget, i18n("Export File As"));
198
+    fileName = KFileDialog::getSaveFileName(suggestedName, i18n("*.ps|PostScript (*.ps)"), parentWidget, i18n("Export File As"));
199 199
     if (fileName.isEmpty())
200 200
       return;
201 201
     TQFileInfo finfo(fileName);
202 202
     if (finfo.exists()) {
203
-      int r = KMessageBox::warningYesNo (tqparentWidget, 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?").tqarg(fileName),
204 204
 					 i18n("Overwrite File"));
205 205
       if (r == KMessageBox::No)
206 206
 	return;
@@ -219,7 +219,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin
219 219
 					  "a while because dvips needs to generate its own bitmap fonts "
220 220
 					  "Please be patient."),
221 221
 				     i18n("Waiting for dvips to finish..."),
222
-				     tqparentWidget, i18n("dvips progress dialog"), false );
222
+				     parentWidget, i18n("dvips progress dialog"), false );
223 223
   if (progress != 0) {
224 224
     progress->TextLabel2->setText( i18n("Please be patient") );
225 225
     progress->setTotalSteps( dviFile->total_pages );
@@ -341,7 +341,7 @@ void dviRenderer::dvips_terminated(KProcess *sproc)
341 341
   // export_errorString, does not correspond to sproc. In that case,
342 342
   // we ingore the return status silently.
343 343
   if ((proc == sproc) && (sproc->normalExit() == true) && (sproc->exitStatus() != 0))
344
-    KMessageBox::error( tqparentWidget, export_errorString );
344
+    KMessageBox::error( parentWidget, export_errorString );
345 345
 
346 346
   if (export_printer != 0)
347 347
     export_printer->printFiles( TQStringList(export_fileName), true );
@@ -359,7 +359,7 @@ void dviRenderer::editorCommand_terminated(KProcess *sproc)
359 359
   // export_errorString, does not correspond to sproc. In that case,
360 360
   // we ingore the return status silently.
361 361
   if ((proc == sproc) && (sproc->normalExit() == true) && (sproc->exitStatus() != 0))
362
-    KMessageBox::error( tqparentWidget, export_errorString );
362
+    KMessageBox::error( parentWidget, export_errorString );
363 363
 
364 364
   // Let's hope that this is not all too nasty... killing a
365 365
   // KShellProcess from a slot that was called from the KShellProcess

+ 1
- 1
kdvi/fontpool.cpp View File

@@ -77,7 +77,7 @@ fontPool::fontPool()
77 77
   // pixmaps. Experiments show that --depending of the configuration
78 78
   // of QT at compile and runtime or the availability of the XFt
79 79
   // extension, alpha channels are either supported, or silently
80
-  // converted to 1-bit tqmasks.
80
+  // converted to 1-bit masks.
81 81
   TQImage start(1, 1, 32); // Generate a 1x1 image, black with alpha=0x10
82 82
   start.setAlphaBuffer(true);
83 83
   TQ_UINT32 *destScanLine = (TQ_UINT32 *)start.scanLine(0);

+ 1
- 1
kdvi/fontpool.h View File

@@ -125,7 +125,7 @@ public:
125 125
       channel of pixmaps. Experiments show that --depending of the
126 126
       configuration of QT at compile and runtime or the availability
127 127
       of the XFt extension, alpha channels are either supported, or
128
-      silently converted to 1-bit tqmasks. The redering routines in the
128
+      silently converted to 1-bit masks. The redering routines in the
129 129
       TeXFont implementation use this flag to choose the apropriate
130 130
       drawing routines for the different setups. */
131 131
   bool TQPixmapSupportsAlpha;

+ 3
- 3
kdvi/kdvi_multipage.cpp View File

@@ -49,9 +49,9 @@ K_EXPORT_COMPONENT_FACTORY(kdvipart, KDVIMultiPageFactory)
49 49
 
50 50
 
51 51
 
52
-KDVIMultiPage::KDVIMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
52
+KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
53 53
                              const char *name, const TQStringList& args)
54
-  : KMultiPage(tqparentWidget, widgetName, tqparent, name), DVIRenderer(tqparentWidget)
54
+  : KMultiPage(parentWidget, widgetName, tqparent, name), DVIRenderer(parentWidget)
55 55
 {
56 56
   Q_UNUSED(args);
57 57
 #ifdef PERFORMANCE_MEASUREMENT
@@ -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(tqparentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) ))
242
+  if (!printer->setup(parentWdg, i18n("Print %1").tqarg(m_file.section('/', -1)) ))
243 243
     return;
244 244
 
245 245
   // This funny method call is necessary for the KPrinter to return

+ 1
- 1
kdvi/kdvi_multipage.h View File

@@ -15,7 +15,7 @@ class KDVIMultiPage : public KMultiPage
15 15
   TQ_OBJECT
16 16
 
17 17
 public:
18
-  KDVIMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
18
+  KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
19 19
                 const char *name, const TQStringList& args = TQStringList());
20 20
   virtual ~KDVIMultiPage();
21 21
 

+ 2
- 2
kdvi/optionDialogFontsWidget_base.ui View File

@@ -59,6 +59,6 @@
59 59
 <Q_SLOTS>
60 60
     <slot>buttonGroup1_clicked(int)</slot>
61 61
 </Q_SLOTS>
62
-<tqlayoutdefaults spacing="6" margin="11"/>
63
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
62
+<layoutdefaults spacing="6" margin="11"/>
63
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
64 64
 </UI>

+ 1
- 1
kdvi/optionDialogSpecialWidget_base.ui View File

@@ -199,7 +199,7 @@
199 199
 </widget>
200 200
 <customwidgets>
201 201
 </customwidgets>
202
-<tqlayoutdefaults spacing="6" margin="11"/>
202
+<layoutdefaults spacing="6" margin="11"/>
203 203
 <includehints>
204 204
     <includehint>kcombobox.h</includehint>
205 205
     <includehint>klineedit.h</includehint>

+ 2
- 2
kdvi/special.cpp View File

@@ -650,11 +650,11 @@ void dviRenderer::applicationDoSpecial(char *cp)
650 650
     // line break is encountered) 
651 651
     if (special_command.startsWith("ps:SDict begin [") && special_command.endsWith(" pdfmark end")) {
652 652
       if (!currentlyDrawnPage->hyperLinkList.isEmpty()) {
653
-        // Parse the PostScript literal text string inside tqparentheses
653
+        // Parse the PostScript literal text string inside parentheses
654 654
         // and store it into 'targetName'.  The scanner works
655 655
         // according to "PostScript language reference, third edition"
656 656
         // - Sec. 3.2.2. The specification is implemented completely:
657
-        // balanced tqparentheses and all escape sequences are
657
+        // balanced parentheses and all escape sequences are
658 658
         // considered.
659 659
         TQString tmpTargetName = special_command.section('(', 1);
660 660
         TQString targetName;

+ 2
- 2
kfaxview/faxmultipage.cpp View File

@@ -31,9 +31,9 @@ typedef KParts::GenericFactory<FaxMultiPage> FaxMultiPageFactory;
31 31
 K_EXPORT_COMPONENT_FACTORY(kfaxviewpart, FaxMultiPageFactory)
32 32
 
33 33
 
34
-FaxMultiPage::FaxMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
34
+FaxMultiPage::FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
35 35
                              const char *name, const TQStringList&)
36
-  : KMultiPage(tqparentWidget, widgetName, tqparent, name), faxRenderer(tqparentWidget)
36
+  : KMultiPage(parentWidget, widgetName, tqparent, name), faxRenderer(parentWidget)
37 37
 {
38 38
   /* This is kparts wizardry that cannot be understood by man. Simply
39 39
      change the names to match your implementation.  */

+ 1
- 1
kfaxview/faxmultipage.h View File

@@ -90,7 +90,7 @@ public:
90 90
   kmultipage. Please have a look at the constructor's source code to
91 91
   see how to adjust this for your implementation.
92 92
   */
93
-  FaxMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
93
+  FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
94 94
 		   const char *name, const TQStringList& args = TQStringList());
95 95
   
96 96
   /** Destructor

+ 3
- 3
kfaxview/faxrenderer.cpp View File

@@ -135,7 +135,7 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
135 135
   TQFileInfo fi(fname);
136 136
   TQString   filename = fi.absFilePath();
137 137
   if (!fi.exists() || fi.isDir()) {
138
-    KMessageBox::error( tqparentWidget,
138
+    KMessageBox::error( parentWidget,
139 139
 			i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
140 140
 			i18n("File Error"));
141 141
     // the return value 'false' indicates that this operation was not successful.
@@ -156,11 +156,11 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
156 156
     // leaving an error message in fax.errorString(). We try to handle
157 157
     // this case gracefully.
158 158
     if (fax.errorString().isEmpty())
159
-      KMessageBox::error( tqparentWidget,
159
+      KMessageBox::error( parentWidget,
160 160
 			  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
161 161
 			  i18n("File Error"));
162 162
     else
163
-      KMessageBox::detailedError( tqparentWidget,
163
+      KMessageBox::detailedError( parentWidget,
164 164
 				  i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
165 165
 				  fax.errorString(),
166 166
 				  i18n("File Error"));

+ 1
- 1
kfile-plugins/ps/gscreator.cpp View File

@@ -176,7 +176,7 @@ bool GSCreator::create(const TQString &path, int width, int height, TQImage &img
176 176
 {
177 177
 // The code in the loop (when testing whether got_sig_term got set)
178 178
 // should read some variation of:
179
-// 		tqparentJob()->wasKilled()
179
+// 		parentJob()->wasKilled()
180 180
 //
181 181
 // Unfortunatelly, that's currently impossible without breaking BIC.
182 182
 // So we need to catch the signal ourselves.

+ 2
- 2
kghostview/generalsettingswidget.ui View File

@@ -106,6 +106,6 @@ In case of problems you might want to see its error messages</string>
106 106
     <include location="global" impldecl="in implementation">kdialog.h</include>
107 107
     <include location="local" impldecl="in implementation">generalsettingswidget.ui.h</include>
108 108
 </includes>
109
-<tqlayoutdefaults spacing="6" margin="11"/>
110
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
109
+<layoutdefaults spacing="6" margin="11"/>
110
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
111 111
 </UI>

+ 2
- 2
kghostview/gssettingswidget.ui View File

@@ -145,8 +145,8 @@
145 145
 <Q_SLOTS>
146 146
     <slot specifier="non virtual">setDetectedVersion( TQString v )</slot>
147 147
 </Q_SLOTS>
148
-<tqlayoutdefaults spacing="6" margin="11"/>
149
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
148
+<layoutdefaults spacing="6" margin="11"/>
149
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
150 150
 <includehints>
151 151
     <includehint>kpushbutton.h</includehint>
152 152
     <includehint>kurlrequester.h</includehint>

+ 2
- 2
kghostview/kgv_view.cpp View File

@@ -74,7 +74,7 @@ namespace KGV {
74 74
     }
75 75
 }
76 76
 
77
-KGVPart::KGVPart( TQWidget* tqparentWidget, const char*,
77
+KGVPart::KGVPart( TQWidget* parentWidget, const char*,
78 78
                   TQObject* tqparent, const char* name,
79 79
                   const TQStringList &args ) :
80 80
     KParts::ReadOnlyPart( tqparent, name ),
@@ -108,7 +108,7 @@ KGVPart::KGVPart( TQWidget* tqparentWidget, const char*,
108 108
 	     this, TQT_SLOT( slotDoFileDirty() ) );
109 109
 
110 110
     // Setup main widget
111
-    _mainWidget = new KGVMainWidget( tqparentWidget );
111
+    _mainWidget = new KGVMainWidget( parentWidget );
112 112
     _mainWidget->setFocusPolicy( TQ_StrongFocus );
113 113
     _mainWidget->installEventFilter( this );
114 114
     _mainWidget->setAcceptDrops( true );

+ 1
- 1
kghostview/kgv_view.h View File

@@ -57,7 +57,7 @@ class KGVPart: public KParts::ReadOnlyPart
57 57
   Q_OBJECT
58 58
   TQ_OBJECT
59 59
 public:
60
-    KGVPart( TQWidget* tqparentWidget, const char* widgetName,
60
+    KGVPart( TQWidget* parentWidget, const char* widgetName,
61 61
              TQObject* tqparent, const char* name,
62 62
              const TQStringList& args = TQStringList() );
63 63
 

+ 2
- 2
kghostview/kgvfactory.cpp View File

@@ -52,7 +52,7 @@ KGVFactory *KGVFactory::s_self;
52 52
 KInstance *KGVFactory::s_instance;
53 53
 KAboutData *KGVFactory::s_aboutData;
54 54
 
55
-KParts::Part *KGVFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
55
+KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
56 56
         TQObject *tqparent, const char *name,
57 57
         const char *className,
58 58
         const TQStringList &args_ )
@@ -68,7 +68,7 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *tqparentWidget, const char
68 68
     if ( !strcmp( className, "Browser/View" ) ) {
69 69
 	    className = "KParts::ReadOnlyPart";
70 70
     }
71
-    KGVPart *part = KDEPrivate::ConcreteFactory<KGVPart>::create( tqparentWidget,
71
+    KGVPart *part = KDEPrivate::ConcreteFactory<KGVPart>::create( parentWidget,
72 72
             widgetName,
73 73
             tqparent,
74 74
             name,

+ 1
- 1
kghostview/kgvfactory.h View File

@@ -33,7 +33,7 @@ class KDE_EXPORT KGVFactory : public KParts::Factory
33 33
         static KInstance *instance();
34 34
         static KAboutData *aboutData();
35 35
 
36
-        virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName,
36
+        virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
37 37
                 TQObject *tqparent, const char *name,
38 38
                 const char *className,
39 39
                 const TQStringList &args );

+ 1
- 1
kmrml/kmrml/kcontrol/serverconfigwidget.ui View File

@@ -268,5 +268,5 @@
268 268
     <tabstop>m_userEdit</tabstop>
269 269
     <tabstop>m_passEdit</tabstop>
270 270
 </tabstops>
271
-<tqlayoutdefaults spacing="6" margin="11"/>
271
+<layoutdefaults spacing="6" margin="11"/>
272 272
 </UI>

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

@@ -214,7 +214,7 @@ bool Mrml::startSession( const KURL& url )
214 214
     // desired collection-id
215 215
 
216 216
     // Wolfgang says, we shouldn't create an own session-id here, as gcc 2.95
217
-    // aptqparently makes problems in exception handling somehow. So we simply
217
+    // apparently makes problems in exception handling somehow. So we simply
218 218
     // accept the server's session-id.
219 219
     TQString msg = mrmlString( TQString() ).tqarg(
220 220
         "<open-session user-name=\"%1\" session-name=\"kio_mrml session\" /> \

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

@@ -90,14 +90,14 @@ KInstance * PartFactory::instance()
90 90
     return s_instance;
91 91
 }
92 92
 
93
-KParts::Part * PartFactory::createPartObject( TQWidget *tqparentWidget,
93
+KParts::Part * PartFactory::createPartObject( TQWidget *parentWidget,
94 94
                                               const char *widgetName,
95 95
                                               TQObject *tqparent,
96 96
                                               const char *name,
97 97
                                               const char *,
98 98
                                               const TQStringList& args )
99 99
 {
100
-    return new MrmlPart( tqparentWidget, widgetName, tqparent, name, args );
100
+    return new MrmlPart( parentWidget, widgetName, tqparent, name, args );
101 101
 }
102 102
 
103 103
 
@@ -111,7 +111,7 @@ KParts::Part * PartFactory::createPartObject( TQWidget *tqparentWidget,
111 111
 
112 112
 uint MrmlPart::s_sessionId = 0;
113 113
 
114
-MrmlPart::MrmlPart( TQWidget *tqparentWidget, const char * /* widgetName */,
114
+MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
115 115
                     TQObject *tqparent, const char *name,
116 116
                     const TQStringList& /* args */ )
117 117
     : KParts::ReadOnlyPart( tqparent, name ),
@@ -126,7 +126,7 @@ MrmlPart::MrmlPart( TQWidget *tqparentWidget, const char * /* widgetName */,
126 126
     KConfig *config = PartFactory::instance()->config();
127 127
     config->setGroup("MRML Settings");
128 128
 
129
-    TQVBox *box = new TQVBox( tqparentWidget, "main mrml box" );
129
+    TQVBox *box = new TQVBox( parentWidget, "main mrml box" );
130 130
     m_view = new MrmlView( box, "MrmlView" );
131 131
     connect( m_view, TQT_SIGNAL( activated( const KURL&, ButtonState )),
132 132
              this, TQT_SLOT( slotActivated( const KURL&, ButtonState )));
@@ -677,7 +677,7 @@ void MrmlPart::performQuery( TQDomDocument& doc )
677 677
             queryStep.setAttribute("query-type", "at-random");
678 678
 
679 679
             // remove user-relevance-element-list element for random search
680
-            relevanceList.tqparentNode().removeChild( relevanceList );
680
+            relevanceList.parentNode().removeChild( relevanceList );
681 681
         }
682 682
     }
683 683
     else

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

@@ -59,7 +59,7 @@ class MrmlPart : public KParts::ReadOnlyPart
59 59
 public:
60 60
     enum tqStatus { NeedCollection, CanSearch, InProgress };
61 61
 
62
-    MrmlPart( TQWidget *tqparentWidget, const char *widgetName,
62
+    MrmlPart( TQWidget *parentWidget, const char *widgetName,
63 63
               TQObject *tqparent, const char *name, const TQStringList& args );
64 64
     ~MrmlPart();
65 65
 
@@ -160,7 +160,7 @@ public:
160 160
     static KInstance * instance();
161 161
 
162 162
 protected:
163
-    virtual KParts::Part * createPartObject( TQWidget *tqparentWidget = 0,
163
+    virtual KParts::Part * createPartObject( TQWidget *parentWidget = 0,
164 164
                                         const char *widgetName = 0,
165 165
                                         TQObject *tqparent = 0,
166 166
                                         const char *name = 0,

+ 12
- 12
kolourpaint/cursors/kpcursorlightcross.cpp View File

@@ -42,7 +42,7 @@ enum PixelValue
42 42
 };
43 43
 
44 44
 static void setPixel (unsigned char *colorBitmap,
45
-                      unsigned char *tqmaskBitmap,
45
+                      unsigned char *maskBitmap,
46 46
                       int width,
47 47
                       int y, int x, enum PixelValue pv)
48 48
 {
@@ -52,32 +52,32 @@ static void setPixel (unsigned char *colorBitmap,
52 52
     const int MaskOpaque = 1;
53 53
     const int MaskTransparent = 0;
54 54
 
55
-    int colorValue, tqmaskValue;
55
+    int colorValue, maskValue;
56 56
 
57 57
     switch (pv)
58 58
     {
59 59
     case White:
60 60
         colorValue = ColorWhite;
61
-        tqmaskValue = MaskOpaque;
61
+        maskValue = MaskOpaque;
62 62
         break;
63 63
 
64 64
     case Black:
65 65
         colorValue = ColorBlack;
66
-        tqmaskValue = MaskOpaque;
66
+        maskValue = MaskOpaque;
67 67
         break;
68 68
 
69 69
     case Transparent:
70 70
     default:
71 71
         colorValue = ColorWhite;
72
-        tqmaskValue = MaskTransparent;
72
+        maskValue = MaskTransparent;
73 73
         break;
74 74
     }
75 75
 
76 76
     if (colorValue)
77 77
         colorBitmap [y * (width / 8) + (x / 8)] |= (1 << (x % 8));
78 78
 
79
-    if (tqmaskValue)
80
-        tqmaskBitmap [y * (width / 8) + (x / 8)] |= (1 << (x % 8));
79
+    if (maskValue)
80
+        maskBitmap [y * (width / 8) + (x / 8)] |= (1 << (x % 8));
81 81
 }
82 82
 
83 83
 
@@ -90,10 +90,10 @@ const TQCursor *kpMakeCursorLightCross ()
90 90
     const int side = 24;
91 91
     const int byteSize = (side * side) / 8;
92 92
     unsigned char *colorBitmap = new unsigned char [byteSize];
93
-    unsigned char *tqmaskBitmap = new unsigned char [byteSize];
93
+    unsigned char *maskBitmap = new unsigned char [byteSize];
94 94
 
95 95
     memset (colorBitmap, 0, byteSize);
96
-    memset (tqmaskBitmap, 0, byteSize);
96
+    memset (maskBitmap, 0, byteSize);
97 97
 
98 98
     const int oddSide = side - 1;
99 99
     const int strokeLen = oddSide * 3 / 8;
@@ -104,7 +104,7 @@ const TQCursor *kpMakeCursorLightCross ()
104 104
 
105 105
     #define X_(val) (val)
106 106
     #define Y_(val) (val)
107
-    #define DRAW(y,x) setPixel (colorBitmap, tqmaskBitmap, side, (y), (x), pv)
107
+    #define DRAW(y,x) setPixel (colorBitmap, maskBitmap, side, (y), (x), pv)
108 108
         // horizontal
109 109
         DRAW (Y_(side / 2), X_(1 + i));
110 110
         DRAW (Y_(side / 2), X_(side - 1 - i));
@@ -118,9 +118,9 @@ const TQCursor *kpMakeCursorLightCross ()
118 118
     }
119 119
 
120 120
     TQCursor *cursor = new TQCursor (TQBitmap (side, side, colorBitmap, true/*little endian bit order*/),
121
-                                   TQBitmap (side, side, tqmaskBitmap, true/*little endian bit order*/));
121
+                                   TQBitmap (side, side, maskBitmap, true/*little endian bit order*/));
122 122
 
123
-    delete [] tqmaskBitmap;
123
+    delete [] maskBitmap;
124 124
     delete [] colorBitmap;
125 125
 
126 126
     return cursor;

+ 1
- 1
kolourpaint/kpcolor.cpp View File

@@ -354,7 +354,7 @@ const TQColor &kpColor::toTQColor () const
354 354
 }
355 355
 
356 356
 // public
357
-TQColor kpColor::tqmaskColor () const
357
+TQColor kpColor::maskColor () const
358 358
 {
359 359
     return isTransparent () ? TQt::color0 : TQt::color1;
360 360
 }

+ 1
- 1
kolourpaint/kpcolor.h View File

@@ -87,7 +87,7 @@ public:
87 87
     // (const TQColor & return results in fewer color reallocations)
88 88
     const TQColor &toTQColor () const;
89 89
 
90
-    TQColor tqmaskColor () const;
90
+    TQColor maskColor () const;
91 91
 
92 92
 private:
93 93
     bool m_rgbaIsValid;

+ 10
- 10
kolourpaint/kpdocument.cpp View File

@@ -1235,7 +1235,7 @@ void kpDocument::setSelection (const kpSelection &selection)
1235 1235
 }
1236 1236
 
1237 1237
 // public
1238
-TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &tqmaskBitmap_) const
1238
+TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &maskBitmap_) const
1239 1239
 {
1240 1240
     kpSelection *sel = selection ();
1241 1241
 
@@ -1259,13 +1259,13 @@ TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &tqmaskBitmap_) const
1259 1259
     }
1260 1260
 
1261 1261
 
1262
-    TQBitmap tqmaskBitmap = tqmaskBitmap_;
1263
-    if (tqmaskBitmap.isNull () &&
1262
+    TQBitmap maskBitmap = maskBitmap_;
1263
+    if (maskBitmap.isNull () &&
1264 1264
         !sel->isRectangular ())
1265 1265
     {
1266
-        tqmaskBitmap = sel->tqmaskForOwnType ();
1266
+        maskBitmap = sel->maskForOwnType ();
1267 1267
 
1268
-        if (tqmaskBitmap.isNull ())
1268
+        if (maskBitmap.isNull ())
1269 1269
         {
1270 1270
             kdError () << "kpDocument::getSelectedPixmap() could not get tqmask" << endl;
1271 1271
             return TQPixmap ();
@@ -1275,7 +1275,7 @@ TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &tqmaskBitmap_) const
1275 1275
 
1276 1276
     TQPixmap selPixmap = getPixmapAt (boundingRect);
1277 1277
 
1278
-    if (!tqmaskBitmap.isNull ())
1278
+    if (!maskBitmap.isNull ())
1279 1279
     {
1280 1280
         // Src Dest = Result
1281 1281
         // -----------------
@@ -1286,8 +1286,8 @@ TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &tqmaskBitmap_) const
1286 1286
         TQBitmap selMaskBitmap = kpPixmapFX::getNonNullMask (selPixmap);
1287 1287
         bitBlt (&selMaskBitmap,
1288 1288
                 TQPoint (0, 0),
1289
-                &tqmaskBitmap,
1290
-                TQRect (0, 0, tqmaskBitmap.width (), tqmaskBitmap.height ()),
1289
+                &maskBitmap,
1290
+                TQRect (0, 0, maskBitmap.width (), maskBitmap.height ()),
1291 1291
                 TQt::AndROP);
1292 1292
         selPixmap.setMask (selMaskBitmap);
1293 1293
     }
@@ -1328,14 +1328,14 @@ bool kpDocument::selectionPullFromDocument (const kpColor &backgroundColor)
1328 1328
     // Figure out tqmask for non-rectangular selections
1329 1329
     //
1330 1330
 
1331
-    TQBitmap tqmaskBitmap = sel->tqmaskForOwnType (true/*return null bitmap for rectangular*/);
1331
+    TQBitmap maskBitmap = sel->maskForOwnType (true/*return null bitmap for rectangular*/);
1332 1332
 
1333 1333
 
1334 1334
     //
1335 1335
     // Get selection pixmap from document
1336 1336
     //
1337 1337
 
1338
-    TQPixmap selPixmap = getSelectedPixmap (tqmaskBitmap);
1338
+    TQPixmap selPixmap = getSelectedPixmap (maskBitmap);
1339 1339
 
1340 1340
     if (vm)
1341 1341
         vm->setQueueUpdates ();

+ 1
- 1
kolourpaint/kpdocument.h View File

@@ -189,7 +189,7 @@ public:
189 189
     void setSelection (const kpSelection &selection);
190 190
 
191 191
     // TODO: this always returns opaque pixmap - need transparent ver
192
-    TQPixmap getSelectedPixmap (const TQBitmap &tqmaskBitmap = TQBitmap ()) const;
192
+    TQPixmap getSelectedPixmap (const TQBitmap &maskBitmap = TQBitmap ()) const;
193 193
 
194 194
     bool selectionPullFromDocument (const kpColor &backgroundColor);
195 195
     bool selectionDelete ();

+ 13
- 13
kolourpaint/kpselection.cpp View File

@@ -337,11 +337,11 @@ int kpSelection::size () const
337 337
 
338 338
 
339 339
 // public
340
-TQBitmap kpSelection::tqmaskForOwnType (bool nullForRectangular) const
340
+TQBitmap kpSelection::maskForOwnType (bool nullForRectangular) const
341 341
 {
342 342
     if (!m_rect.isValid ())
343 343
     {
344
-        kdError () << "kpSelection::tqmaskForOwnType() boundingRect invalid" << endl;
344
+        kdError () << "kpSelection::maskForOwnType() boundingRect invalid" << endl;
345 345
         return TQBitmap ();
346 346
     }
347 347
 
@@ -351,17 +351,17 @@ TQBitmap kpSelection::tqmaskForOwnType (bool nullForRectangular) const
351 351
         if (nullForRectangular)
352 352
             return TQBitmap ();
353 353
 
354
-        TQBitmap tqmaskBitmap (m_rect.width (), m_rect.height ());
355
-        tqmaskBitmap.fill (TQt::color1/*opaque*/);
356
-        return tqmaskBitmap;
354
+        TQBitmap maskBitmap (m_rect.width (), m_rect.height ());
355
+        maskBitmap.fill (TQt::color1/*opaque*/);
356
+        return maskBitmap;
357 357
     }
358 358
 
359 359
 
360
-    TQBitmap tqmaskBitmap (m_rect.width (), m_rect.height ());
361
-    tqmaskBitmap.fill (TQt::color0/*transparent*/);
360
+    TQBitmap maskBitmap (m_rect.width (), m_rect.height ());
361
+    maskBitmap.fill (TQt::color0/*transparent*/);
362 362
 
363 363
     TQPainter painter;
364
-    painter.begin (&tqmaskBitmap);
364
+    painter.begin (&maskBitmap);
365 365
     painter.setPen (TQt::color1)/*opaque*/;
366 366
     painter.setBrush (TQt::color1/*opaque*/);
367 367
 
@@ -379,7 +379,7 @@ TQBitmap kpSelection::tqmaskForOwnType (bool nullForRectangular) const
379 379
     painter.end ();
380 380
 
381 381
 
382
-    return tqmaskBitmap;
382
+    return maskBitmap;
383 383
 }
384 384
 
385 385
 
@@ -615,11 +615,11 @@ static TQRgb mostContrastingRGB (TQRgb val)
615 615
 }
616 616
 
617 617
 // private
618
-static void drawTextLines (TQPainter *painter, TQPainter *tqmaskPainter,
618
+static void drawTextLines (TQPainter *painter, TQPainter *maskPainter,
619 619
                            const TQRect &rect,
620 620
                            const TQValueVector <TQString> &textLines)
621 621
 {
622
-    if (!painter->clipRegion ().isEmpty () || !tqmaskPainter->clipRegion ().isEmpty ())
622
+    if (!painter->clipRegion ().isEmpty () || !maskPainter->clipRegion ().isEmpty ())
623 623
     {
624 624
         // TODO: fix esp. before making method public
625 625
         kdError () << "kpselection.cpp:drawTextLines() can't deal with existing painter clip regions" << endl;
@@ -632,8 +632,8 @@ static void drawTextLines (TQPainter *painter, TQPainter *tqmaskPainter,
632 632
     if (painter->isActive ())      \
633 633
         painter->cmd;              \
634 634
                                    \
635
-    if (tqmaskPainter->isActive ())  \
636
-        tqmaskPainter->cmd;          \
635
+    if (maskPainter->isActive ())  \
636
+        maskPainter->cmd;          \
637 637
 }
638 638
 
639 639
 

+ 1
- 1
kolourpaint/kpselection.h View File

@@ -103,7 +103,7 @@ public:
103 103
 
104 104
     int size () const;
105 105
 
106
-    TQBitmap tqmaskForOwnType (bool nullForRectangular = false) const;
106
+    TQBitmap maskForOwnType (bool nullForRectangular = false) const;
107 107
 
108 108
     // synonyms
109 109
     TQPoint topLeft () const;

+ 3
- 3
kolourpaint/kpthumbnail.cpp View File

@@ -63,7 +63,7 @@ kpThumbnail::kpThumbnail (kpMainWindow *tqparent, const char *name)
63 63
     }
64 64
 
65 65
 
66
-    TQSize tqlayoutMinimumSize = tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ();
66
+    TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ();
67 67
 #if DEBUG_KP_THUMBNAIL
68 68
     kdDebug () << "\ttqlayout=" << tqlayout ()
69 69
                << " minSize=" << (tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ()) << endl;
@@ -73,8 +73,8 @@ kpThumbnail::kpThumbnail (kpMainWindow *tqparent, const char *name)
73 73
 #endif
74 74
     if (tqlayout ())
75 75
         tqlayout ()->setResizeMode (TQLayout::FreeResize);
76
-    setMinimumSize (TQMAX (tqlayoutMinimumSize.width (), 64),
77
-                    TQMAX (tqlayoutMinimumSize.height (), 64));
76
+    setMinimumSize (TQMAX (layoutMinimumSize.width (), 64),
77
+                    TQMAX (layoutMinimumSize.height (), 64));
78 78
 
79 79
 
80 80
     // Enable "X" Close Button

+ 21
- 21
kolourpaint/kpview.cpp View File

@@ -590,10 +590,10 @@ void kpView::addToQueuedArea (const TQRect &rect)
590 590
 }
591 591
 
592 592
 // public
593
-void kpView::tqinvalidateQueuedArea ()
593
+void kpView::invalidateQueuedArea ()
594 594
 {
595 595
 #if DEBUG_KP_VIEW && 0
596
-    kdDebug () << "kpView::tqinvalidateQueuedArea()" << endl;
596
+    kdDebug () << "kpView::invalidateQueuedArea()" << endl;
597 597
 #endif
598 598
 
599 599
     d->m_queuedUpdateArea = TQRegion ();
@@ -621,7 +621,7 @@ void kpView::updateQueuedArea ()
621 621
     if (!d->m_queuedUpdateArea.isNull ())
622 622
         vm->updateView (this, d->m_queuedUpdateArea);
623 623
 
624
-    tqinvalidateQueuedArea ();
624
+    invalidateQueuedArea ();
625 625
 }
626 626
 
627 627
 // public
@@ -1346,21 +1346,21 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
1346 1346
         destPixmapPainter.setBackgroundMode (Qt::OpaqueMode);
1347 1347
         destPixmapPainter.setBackgroundColor (TQt::blue);
1348 1348
 
1349
-        TQBitmap tqmaskBitmap;
1350
-        TQPainter tqmaskBitmapPainter;
1349
+        TQBitmap maskBitmap;
1350
+        TQPainter maskBitmapPainter;
1351 1351
         if (destPixmap->tqmask ())
1352 1352
         {
1353
-            tqmaskBitmap = *destPixmap->tqmask ();
1354
-            tqmaskBitmapPainter.begin (&tqmaskBitmap);
1355
-            tqmaskBitmapPainter.setPen (TQt::color1/*opaque*/);
1353
+            maskBitmap = *destPixmap->tqmask ();
1354
+            maskBitmapPainter.begin (&maskBitmap);
1355
+            maskBitmapPainter.setPen (TQt::color1/*opaque*/);
1356 1356
         }
1357 1357
 
1358 1358
 
1359 1359
     #define PAINTER_CMD(cmd)                 \
1360 1360
     {                                        \
1361 1361
         destPixmapPainter . cmd;             \
1362
-        if (tqmaskBitmapPainter.isActive ())   \
1363
-            tqmaskBitmapPainter . cmd;         \
1362
+        if (maskBitmapPainter.isActive ())   \
1363
+            maskBitmapPainter . cmd;         \
1364 1364
     }
1365 1365
 
1366 1366
         TQRect boundingRect = sel->boundingRect ();
@@ -1450,10 +1450,10 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
1450 1450
     #undef PAINTER_CMD
1451 1451
 
1452 1452
         destPixmapPainter.end ();
1453
-        if (tqmaskBitmapPainter.isActive ())
1454
-            tqmaskBitmapPainter.end ();
1453
+        if (maskBitmapPainter.isActive ())
1454
+            maskBitmapPainter.end ();
1455 1455
 
1456
-        destPixmap->setMask (tqmaskBitmap);
1456
+        destPixmap->setMask (maskBitmap);
1457 1457
     }
1458 1458
 
1459 1459
 
@@ -1480,15 +1480,15 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
1480 1480
             {
1481 1481
                 rect.moveBy (-docRect.x (), -docRect.y ());
1482 1482
 
1483
-                TQBitmap tqmaskBitmap;
1484
-                TQPainter destPixmapPainter, tqmaskBitmapPainter;
1483
+                TQBitmap maskBitmap;
1484
+                TQPainter destPixmapPainter, maskBitmapPainter;
1485 1485
 
1486 1486
                 if (destPixmap->tqmask ())
1487 1487
                 {
1488
-                    tqmaskBitmap = *destPixmap->tqmask ();
1489
-                    tqmaskBitmapPainter.begin (&tqmaskBitmap);
1490
-                    tqmaskBitmapPainter.fillRect (rect, TQt::color1/*opaque*/);
1491
-                    tqmaskBitmapPainter.end ();
1488
+                    maskBitmap = *destPixmap->tqmask ();
1489
+                    maskBitmapPainter.begin (&maskBitmap);
1490
+                    maskBitmapPainter.fillRect (rect, TQt::color1/*opaque*/);
1491
+                    maskBitmapPainter.end ();
1492 1492
                 }
1493 1493
 
1494 1494
                 destPixmapPainter.begin (destPixmap);
@@ -1496,8 +1496,8 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
1496 1496
                 destPixmapPainter.fillRect (rect, TQt::white);
1497 1497
                 destPixmapPainter.end ();
1498 1498
 
1499
-                if (!tqmaskBitmap.isNull ())
1500
-                    destPixmap->setMask (tqmaskBitmap);
1499
+                if (!maskBitmap.isNull ())
1500
+                    destPixmap->setMask (maskBitmap);
1501 1501
             }
1502 1502
         }
1503 1503
     }

+ 2
- 2
kolourpaint/kpview.h View File

@@ -366,11 +366,11 @@ public:
366 366
      * Removes the dirty region that has been queued for updating.
367 367
      * Does not update the view.
368 368
      */
369
-    void tqinvalidateQueuedArea ();
369
+    void invalidateQueuedArea ();
370 370
 
371 371
     /**
372 372
      * Updates the part of the view described by dirty region and then
373
-     * calls tqinvalidateQueuedArea().  Does nothing if @ref kpViewManager
373
+     * calls invalidateQueuedArea().  Does nothing if @ref kpViewManager
374 374
      * is set to queue updates.
375 375
      */
376 376
     void updateQueuedArea ();

+ 1
- 1
kolourpaint/kpviewmanager.cpp View File

@@ -152,7 +152,7 @@ void kpViewManager::setTempPixmap (const kpTempPixmap &tempPixmap)
152 152
 }
153 153
 
154 154
 // public
155
-void kpViewManager::tqinvalidateTempPixmap ()
155
+void kpViewManager::invalidateTempPixmap ()
156 156
 {
157 157
     if (!m_tempPixmap)
158 158
         return;

+ 1
- 1
kolourpaint/kpviewmanager.h View File

@@ -69,7 +69,7 @@ public:
69 69
 
70 70
     const kpTempPixmap *tempPixmap () const;
71 71
     void setTempPixmap (const kpTempPixmap &tempPixmap);
72
-    void tqinvalidateTempPixmap ();
72
+    void invalidateTempPixmap ();
73 73
 
74 74
 
75 75
     //

+ 1
- 1
kolourpaint/pixmapfx/kpeffectreducecolors.cpp View File

@@ -240,7 +240,7 @@ void kpEffectReduceColorsCommand::apply (TQPixmap *destPixmapPtr, int depth, boo
240 240
 
241 241
     // HACK: The above "image.convertDepth()" erases the Alpha Channel
242 242
     //       (at least for monochrome).
243
-    //       tqpixmap.html says "alpha tqmasks on monochrome images are ignored."
243
+    //       tqpixmap.html says "alpha masks on monochrome images are ignored."
244 244
     //
245 245
     //       Put the tqmask back.
246 246
     //

+ 11
- 11
kolourpaint/pixmapfx/kpfloodfill.cpp View File

@@ -97,14 +97,14 @@ bool kpFloodFill::fill ()
97 97
     {
98 98
         TQApplication::setOverrideCursor (TQt::waitCursor);
99 99
 
100
-        TQPainter painter, tqmaskPainter;
101
-        TQBitmap tqmaskBitmap;
100
+        TQPainter painter, maskPainter;
101
+        TQBitmap maskBitmap;
102 102
 
103 103
         if (m_pixmapPtr->tqmask () || m_color.isTransparent ())
104 104
         {
105
-            tqmaskBitmap = kpPixmapFX::getNonNullMask (*m_pixmapPtr);
106
-            tqmaskPainter.begin (&tqmaskBitmap);
107
-            tqmaskPainter.setPen (m_color.tqmaskColor ());
105
+            maskBitmap = kpPixmapFX::getNonNullMask (*m_pixmapPtr);
106
+            maskPainter.begin (&maskBitmap);
107
+            maskPainter.setPen (m_color.maskColor ());
108 108
         }
109 109
 
110 110
         if (m_color.isOpaque ())
@@ -124,18 +124,18 @@ bool kpFloodFill::fill ()
124 124
             if (painter.isActive ())
125 125
                 painter.drawLine (p1, p2);
126 126
 
127
-            if (tqmaskPainter.isActive ())
128
-                tqmaskPainter.drawLine (p1, p2);
127
+            if (maskPainter.isActive ())
128
+                maskPainter.drawLine (p1, p2);
129 129
         }
130 130
 
131 131
         if (painter.isActive ())
132 132
             painter.end ();
133 133
 
134
-        if (tqmaskPainter.isActive ())
135
-            tqmaskPainter.end ();
134
+        if (maskPainter.isActive ())
135
+            maskPainter.end ();
136 136
 
137
-        if (!tqmaskBitmap.isNull ())
138
-            m_pixmapPtr->setMask (tqmaskBitmap);
137
+        if (!maskBitmap.isNull ())
138
+            m_pixmapPtr->setMask (maskBitmap);
139 139
 
140 140
         TQApplication::restoreOverrideCursor ();
141 141
     }

+ 27
- 27
kolourpaint/pixmapfx/kppixmapfx.cpp View File

@@ -772,7 +772,7 @@ void kpPixmapFX::paintPixmapAt (TQPixmap *destPixmapPtr, const TQPoint &destAt,
772 772
     if (!destPixmapPtr)
773 773
         return;
774 774
 
775
-    // Copy src (tqmasked by src's tqmask) on top of dest.
775
+    // Copy src (masked by src's tqmask) on top of dest.
776 776
     bitBlt (destPixmapPtr, /* dest */
777 777
             destAt.x (), destAt.y (), /* dest pt */
778 778
             &srcPixmap, /* src */
@@ -856,10 +856,10 @@ TQBitmap kpPixmapFX::getNonNullMask (const TQPixmap &pm)
856 856
         return *pm.tqmask ();
857 857
     else
858 858
     {
859
-        TQBitmap tqmaskBitmap (pm.width (), pm.height ());
860
-        tqmaskBitmap.fill (TQt::color1/*opaque*/);
859
+        TQBitmap maskBitmap (pm.width (), pm.height ());
860
+        maskBitmap.fill (TQt::color1/*opaque*/);
861 861
 
862
-        return tqmaskBitmap;
862
+        return maskBitmap;
863 863
     }
864 864
 }
865 865
 
@@ -870,9 +870,9 @@ void kpPixmapFX::ensureTransparentAt (TQPixmap *destPixmapPtr, const TQRect &des
870 870
     if (!destPixmapPtr)
871 871
         return;
872 872
 
873
-    TQBitmap tqmaskBitmap = getNonNullMask (*destPixmapPtr);
873
+    TQBitmap maskBitmap = getNonNullMask (*destPixmapPtr);
874 874
 
875
-    TQPainter p (&tqmaskBitmap);
875
+    TQPainter p (&maskBitmap);
876 876
 
877 877
     p.setPen (TQt::color0/*transparent*/);
878 878
     p.setBrush (TQt::color0/*transparent*/);
@@ -881,7 +881,7 @@ void kpPixmapFX::ensureTransparentAt (TQPixmap *destPixmapPtr, const TQRect &des
881 881
 
882 882
     p.end ();
883 883
 
884
-    destPixmapPtr->setMask (tqmaskBitmap);
884
+    destPixmapPtr->setMask (maskBitmap);
885 885
 }
886 886
 
887 887
 
@@ -937,9 +937,9 @@ void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect
937 937
     if (!destPixmapPtr || !destPixmapPtr->tqmask ()/*already opaque*/)
938 938
         return;
939 939
 
940
-    TQBitmap tqmaskBitmap = *destPixmapPtr->tqmask ();
940
+    TQBitmap maskBitmap = *destPixmapPtr->tqmask ();
941 941
 
942
-    TQPainter p (&tqmaskBitmap);
942
+    TQPainter p (&maskBitmap);
943 943
 
944 944
     p.setPen (TQt::color1/*opaque*/);
945 945
     p.setBrush (TQt::color1/*opaque*/);
@@ -948,7 +948,7 @@ void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect
948 948
 
949 949
     p.end ();
950 950
 
951
-    destPixmapPtr->setMask (tqmaskBitmap);
951
+    destPixmapPtr->setMask (maskBitmap);
952 952
 }
953 953
 
954 954
 // public static
@@ -1107,8 +1107,8 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h,
1107 1107
     #if DEBUG_KP_PIXMAP_FX && 1
1108 1108
         kdDebug () << "\tfilling in new areas" << endl;
1109 1109
     #endif
1110
-        TQBitmap tqmaskBitmap;
1111
-        TQPainter painter, tqmaskPainter;
1110
+        TQBitmap maskBitmap;
1111
+        TQPainter painter, maskPainter;
1112 1112
 
1113 1113
         if (backgroundColor.isOpaque ())
1114 1114
         {
@@ -1119,10 +1119,10 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h,
1119 1119
 
1120 1120
         if (backgroundColor.isTransparent () || destPixmapPtr->tqmask ())
1121 1121
         {
1122
-            tqmaskBitmap = kpPixmapFX::getNonNullMask (*destPixmapPtr);
1123
-            tqmaskPainter.begin (&tqmaskBitmap);
1124
-            tqmaskPainter.setPen (backgroundColor.tqmaskColor ());
1125
-            tqmaskPainter.setBrush (backgroundColor.tqmaskColor ());
1122
+            maskBitmap = kpPixmapFX::getNonNullMask (*destPixmapPtr);
1123
+            maskPainter.begin (&maskBitmap);
1124
+            maskPainter.setPen (backgroundColor.maskColor ());
1125
+            maskPainter.setBrush (backgroundColor.maskColor ());
1126 1126
         }
1127 1127
 
1128 1128
     #define PAINTER_CALL(cmd)         \
@@ -1130,8 +1130,8 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h,
1130 1130
         if (painter.isActive ())      \
1131 1131
             painter . cmd ;           \
1132 1132
                                       \
1133
-        if (tqmaskPainter.isActive ())  \
1134
-            tqmaskPainter . cmd ;       \
1133
+        if (maskPainter.isActive ())  \
1134
+            maskPainter . cmd ;       \
1135 1135
     }
1136 1136
         if (w > oldWidth)
1137 1137
             PAINTER_CALL (drawRect (oldWidth, 0, w - oldWidth, oldHeight));
@@ -1140,14 +1140,14 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h,
1140 1140
             PAINTER_CALL (drawRect (0, oldHeight, w, h - oldHeight));
1141 1141
     #undef PAINTER_CALL
1142 1142
 
1143
-        if (tqmaskPainter.isActive ())
1144
-            tqmaskPainter.end ();
1143
+        if (maskPainter.isActive ())
1144
+            maskPainter.end ();
1145 1145
 
1146 1146
         if (painter.isActive ())
1147 1147
             painter.end ();
1148 1148
 
1149
-        if (!tqmaskBitmap.isNull ())
1150
-            destPixmapPtr->setMask (tqmaskBitmap);
1149
+        if (!maskBitmap.isNull ())
1150
+            destPixmapPtr->setMask (maskBitmap);
1151 1151
     }
1152 1152
 }
1153 1153
 
@@ -1378,7 +1378,7 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_,
1378 1378
     if (backgroundColor.isTransparent () || pm.tqmask ())
1379 1379
     {
1380 1380
         newBitmapMask.resize (newPixmap.width (), newPixmap.height ());
1381
-        newBitmapMask.fill (backgroundColor.tqmaskColor ());
1381
+        newBitmapMask.fill (backgroundColor.maskColor ());
1382 1382
     }
1383 1383
 
1384 1384
     TQPainter painter (&newPixmap);
@@ -1416,10 +1416,10 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_,
1416 1416
 
1417 1417
     if (!newBitmapMask.isNull ())
1418 1418
     {
1419
-        TQPainter tqmaskPainter (&newBitmapMask);
1420
-        tqmaskPainter.setWorldMatrix (transformMatrix);
1421
-        tqmaskPainter.drawPixmap (TQPoint (0, 0), kpPixmapFX::getNonNullMask (pm));
1422
-        tqmaskPainter.end ();
1419
+        TQPainter maskPainter (&newBitmapMask);
1420
+        maskPainter.setWorldMatrix (transformMatrix);
1421
+        maskPainter.drawPixmap (TQPoint (0, 0), kpPixmapFX::getNonNullMask (pm));
1422
+        maskPainter.end ();
1423 1423
         newPixmap.setMask (newBitmapMask);
1424 1424
     }
1425 1425
 

+ 1
- 1
kolourpaint/pixmapfx/kppixmapfx.h View File

@@ -294,7 +294,7 @@ public:
294 294
     //
295 295
     // Removes <*destPixmapPtr>'s Alpha Channel and attempts to convert it
296 296
     // to a tqmask.  KolourPaint - and TQPixmap to a great extent - does not
297
-    // support Alpha Channels - only tqmasks.  Call this whenever you get
297
+    // support Alpha Channels - only masks.  Call this whenever you get
298 298
     // a pixmap from a foreign source; else all KolourPaint code will
299 299
     // exhibit "undefined behaviour".
300 300
     //

+ 7
- 7
kolourpaint/tools/kptoolairspray.cpp View File

@@ -314,7 +314,7 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points)
314 314
     TQPixmap pixmap = document ()->getPixmapAt (docRect);
315 315
     TQBitmap tqmask;
316 316
 
317
-    TQPainter painter, tqmaskPainter;
317
+    TQPainter painter, maskPainter;
318 318
 
319 319
     if (m_color.isOpaque ())
320 320
     {
@@ -325,8 +325,8 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points)
325 325
     if (pixmap.tqmask () || m_color.isTransparent ())
326 326
     {
327 327
         tqmask = kpPixmapFX::getNonNullMask (pixmap);
328
-        tqmaskPainter.begin (&tqmask);
329
-        tqmaskPainter.setPen (m_color.tqmaskColor ());
328
+        maskPainter.begin (&tqmask);
329
+        maskPainter.setPen (m_color.maskColor ());
330 330
     }
331 331
 
332 332
     for (int i = 0; i < (int) points.count (); i++)
@@ -337,12 +337,12 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points)
337 337
         if (painter.isActive ())
338 338
             painter.drawPoint (pt);
339 339
 
340
-        if (tqmaskPainter.isActive ())
341
-            tqmaskPainter.drawPoint (pt);
340
+        if (maskPainter.isActive ())
341
+            maskPainter.drawPoint (pt);
342 342
     }
343 343
 
344
-    if (tqmaskPainter.isActive ())
345
-        tqmaskPainter.end ();
344
+    if (maskPainter.isActive ())
345
+        maskPainter.end ();
346 346
 
347 347
     if (painter.isActive ())
348 348
         painter.end ();

+ 11
- 11
kolourpaint/tools/kptoolautocrop.cpp View File

@@ -654,7 +654,7 @@ void kpToolAutoCropCommand::unexecute ()
654 654
         return;
655 655
 
656 656
     TQPixmap pixmap (m_oldWidth, m_oldHeight);
657
-    TQBitmap tqmaskBitmap;
657
+    TQBitmap maskBitmap;
658 658
 
659 659
     // restore the position of the centre image
660 660
     kpPixmapFX::setPixmapAt (&pixmap, m_contentsRect,
@@ -663,7 +663,7 @@ void kpToolAutoCropCommand::unexecute ()
663 663
     // draw the borders
664 664
 
665 665
     TQPainter painter (&pixmap);
666
-    TQPainter tqmaskPainter;
666
+    TQPainter maskPainter;
667 667
 
668 668
     const kpToolAutoCropBorder *borders [] =
669 669
     {
@@ -699,14 +699,14 @@ void kpToolAutoCropCommand::unexecute ()
699 699
             }
700 700
             else
701 701
             {
702
-                if (tqmaskBitmap.isNull ())
702
+                if (maskBitmap.isNull ())
703 703
                 {
704 704
                     // TODO: dangerous when a painter is active on pixmap?
705
-                    tqmaskBitmap = kpPixmapFX::getNonNullMask (pixmap);
706
-                    tqmaskPainter.begin (&tqmaskBitmap);
705
+                    maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
706
+                    maskPainter.begin (&maskBitmap);
707 707
                 }
708 708
 
709
-                tqmaskPainter.fillRect ((*b)->rect (), TQt::color0/*transparent*/);
709
+                maskPainter.fillRect ((*b)->rect (), TQt::color0/*transparent*/);
710 710
             }
711 711
         }
712 712
         else
@@ -721,7 +721,7 @@ void kpToolAutoCropCommand::unexecute ()
721 721
             if (*p)
722 722
             {
723 723
                 // TODO: We should really edit the tqmask here.  Due to good
724
-                //       luck (if "tqmaskBitmap" is initialized above, this region
724
+                //       luck (if "maskBitmap" is initialized above, this region
725 725
                 //       will be marked as opaque in the tqmask; if it's not
726 726
                 //       initialized, we will be opaque by default), we
727 727
                 //       don't actually have to edit the tqmask but this is
@@ -731,13 +731,13 @@ void kpToolAutoCropCommand::unexecute ()
731 731
         }
732 732
     }
733 733
 
734
-    if (tqmaskPainter.isActive ())
735
-        tqmaskPainter.end ();
734
+    if (maskPainter.isActive ())
735
+        maskPainter.end ();
736 736
 
737 737
     painter.end ();
738 738
 
739
-    if (!tqmaskBitmap.isNull ())
740
-        pixmap.setMask (tqmaskBitmap);
739
+    if (!maskBitmap.isNull ())
740
+        pixmap.setMask (maskBitmap);
741 741
 
742 742
 
743 743
     if (!m_actOnSelection)

+ 1
- 1
kolourpaint/tools/kptoolclear.cpp View File

@@ -108,7 +108,7 @@ void kpToolClearCommand::execute ()
108 108
         kpPixmapFX::fill (&newPixmap, m_newColor);
109 109
         // TODO: maybe disable Image/Clear if transparent colour
110 110
         if (m_newColor.isOpaque ())
111
-            newPixmap.setMask (sel->tqmaskForOwnType ());
111
+            newPixmap.setMask (sel->maskForOwnType ());
112 112
 
113 113
         sel->setPixmap (newPixmap);
114 114
     }

+ 1
- 1
kolourpaint/tools/kptoolcrop.cpp View File

@@ -167,7 +167,7 @@ void kpToolCropSetImageCommand::execute ()
167 167
 
168 168
         kpPixmapFX::paintMaskTransparentWithBrush (&newDocPixmap,
169 169
             TQPoint (0, 0),
170
-            m_fromSelection.tqmaskForOwnType ());
170
+            m_fromSelection.maskForOwnType ());
171 171
 
172 172
         kpPixmapFX::paintPixmapAt (&newDocPixmap,
173 173
             TQPoint (0, 0),

+ 41
- 41
kolourpaint/tools/kptoolpen.cpp View File

@@ -179,7 +179,7 @@ void kpToolPen::end ()
179 179
     if (vm)
180 180
     {
181 181
         if (vm->tempPixmap () && vm->tempPixmap ()->isBrush ())
182
-            vm->tqinvalidateTempPixmap ();
182
+            vm->invalidateTempPixmap ();
183 183
 
184 184
         if (m_mode & (SquareBrushes | DiverseBrushes))
185 185
             vm->unsetCursor ();
@@ -218,7 +218,7 @@ void kpToolPen::beginDraw ()
218 218
     // user starts drawing in the background color, we don't want to leave
219 219
     // the cursor in the foreground colour -- just hide it in all cases
220 220
     // to avoid confusion
221
-    viewManager ()->tqinvalidateTempPixmap ();
221
+    viewManager ()->invalidateTempPixmap ();
222 222
 
223 223
     setUserMessage (cancelUserMessage ());
224 224
 }
@@ -282,15 +282,15 @@ void kpToolPen::hover (const TQPoint &point)
282 282
     setUserShapePoints (point);
283 283
 }
284 284
 
285
-bool kpToolPen::wash (TQPainter *painter, TQPainter *tqmaskPainter,
285
+bool kpToolPen::wash (TQPainter *painter, TQPainter *maskPainter,
286 286
                       const TQImage &image,
287 287
                       const kpColor &colorToReplace,
288 288
                       const TQRect &imageRect, int plotx, int ploty)
289 289
 {
290
-    return wash (painter, tqmaskPainter, image, colorToReplace, imageRect, hotRect (plotx, ploty));
290
+    return wash (painter, maskPainter, image, colorToReplace, imageRect, hotRect (plotx, ploty));
291 291
 }
292 292
 
293
-bool kpToolPen::wash (TQPainter *painter, TQPainter *tqmaskPainter,
293
+bool kpToolPen::wash (TQPainter *painter, TQPainter *maskPainter,
294 294
                       const TQImage &image,
295 295
                       const kpColor &colorToReplace,
296 296
                       const TQRect &imageRect, const TQRect &drawRect)
@@ -308,8 +308,8 @@ bool kpToolPen::wash (TQPainter *painter, TQPainter *tqmaskPainter,
308 308
 {                                                        \
309 309
     if (painter && painter->isActive ())                 \
310 310
         painter->drawLine (startDrawX, y, x - 1, y);     \
311
-    if (tqmaskPainter && tqmaskPainter->isActive ())         \
312
-        tqmaskPainter->drawLine (startDrawX, y, x - 1, y); \
311
+    if (maskPainter && maskPainter->isActive ())         \
312
+        maskPainter->drawLine (startDrawX, y, x - 1, y); \
313 313
     didSomething = true;                                 \
314 314
     startDrawX = -1;                                     \
315 315
 }
@@ -388,8 +388,8 @@ void kpToolPen::globalDraw ()
388 388
         kpToolPenCommand *cmd = new kpToolPenCommand (
389 389
             i18n ("Color Eraser"), mainWindow ());
390 390
 
391
-        TQPainter painter, tqmaskPainter;
392
-        TQBitmap tqmaskBitmap;
391
+        TQPainter painter, maskPainter;
392
+        TQBitmap maskBitmap;
393 393
 
394 394
         if (backgroundColor ().isOpaque ())
395 395
         {
@@ -400,16 +400,16 @@ void kpToolPen::globalDraw ()
400 400
         if (backgroundColor ().isTransparent () ||
401 401
             document ()->pixmap ()->tqmask ())
402 402
         {
403
-            tqmaskBitmap = kpPixmapFX::getNonNullMask (*document ()->pixmap ());
404
-            tqmaskPainter.begin (&tqmaskBitmap);
403
+            maskBitmap = kpPixmapFX::getNonNullMask (*document ()->pixmap ());
404
+            maskPainter.begin (&maskBitmap);
405 405
 
406
-            tqmaskPainter.setPen (backgroundColor ().tqmaskColor ());
406
+            maskPainter.setPen (backgroundColor ().maskColor ());
407 407
         }
408 408
 
409 409
         const TQImage image = kpPixmapFX::convertToImage (*document ()->pixmap ());
410 410
         TQRect rect = document ()->rect ();
411 411
 
412
-        const bool didSomething = wash (&painter, &tqmaskPainter, image,
412
+        const bool didSomething = wash (&painter, &maskPainter, image,
413 413
                                         foregroundColor ()/*replace foreground*/,
414 414
                                         rect, rect);
415 415
 
@@ -417,13 +417,13 @@ void kpToolPen::globalDraw ()
417 417
         if (painter.isActive ())
418 418
             painter.end ();
419 419
 
420
-        if (tqmaskPainter.isActive ())
421
-            tqmaskPainter.end ();
420
+        if (maskPainter.isActive ())
421
+            maskPainter.end ();
422 422
 
423 423
         if (didSomething)
424 424
         {
425
-            if (!tqmaskBitmap.isNull ())
426
-                document ()->pixmap ()->setMask (tqmaskBitmap);
425
+            if (!maskBitmap.isNull ())
426
+                document ()->pixmap ()->setMask (maskBitmap);
427 427
 
428 428
 
429 429
             document ()->slotContentsChanged (rect);
@@ -519,8 +519,8 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
519 519
         #if DEBUG_KP_TOOL_PEN
520 520
             kdDebug () << "\tconvert to image: " << timer.restart () << "ms" << endl;
521 521
         #endif
522
-            TQPainter painter, tqmaskPainter;
523
-            TQBitmap tqmaskBitmap;
522
+            TQPainter painter, maskPainter;
523
+            TQBitmap maskBitmap;
524 524
 
525 525
             if (color (m_mouseButton).isOpaque ())
526 526
             {
@@ -531,12 +531,12 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
531 531
             if (color (m_mouseButton).isTransparent () ||
532 532
                 pixmap.tqmask ())
533 533
             {
534
-                tqmaskBitmap = kpPixmapFX::getNonNullMask (pixmap);
535
-                tqmaskPainter.begin (&tqmaskBitmap);
536
-                tqmaskPainter.setPen (color (m_mouseButton).tqmaskColor ());
534
+                maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
535
+                maskPainter.begin (&maskBitmap);
536
+                maskPainter.setPen (color (m_mouseButton).maskColor ());
537 537
             }
538 538
 
539
-            bool didSomething = wash (&painter, &tqmaskPainter,
539
+            bool didSomething = wash (&painter, &maskPainter,
540 540
                                       image,
541 541
                                       color (1 - m_mouseButton)/*color to tqreplace*/,
542 542
                                       rect, rect);
@@ -544,13 +544,13 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
544 544
             if (painter.isActive ())
545 545
                 painter.end ();
546 546
 
547
-            if (tqmaskPainter.isActive ())
548
-                tqmaskPainter.end ();
547
+            if (maskPainter.isActive ())
548
+                maskPainter.end ();
549 549
 
550 550
             if (didSomething)
551 551
             {
552
-                if (!tqmaskBitmap.isNull ())
553
-                    pixmap.setMask (tqmaskBitmap);
552
+                if (!maskBitmap.isNull ())
553
+                    pixmap.setMask (maskBitmap);
554 554
 
555 555
             #if DEBUG_KP_TOOL_PEN
556 556
                 kdDebug () << "\twashed: " << timer.restart () << "ms" << endl;
@@ -594,9 +594,9 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
594 594
         bool transparent = c.isTransparent ();
595 595
 
596 596
         TQPixmap pixmap = document ()->getPixmapAt (rect);
597
-        TQBitmap tqmaskBitmap;
597
+        TQBitmap maskBitmap;
598 598
 
599
-        TQPainter painter, tqmaskPainter;
599
+        TQPainter painter, maskPainter;
600 600
 
601 601
         if (m_mode & (DrawsPixels | WashesPixmaps))
602 602
         {
@@ -608,9 +608,9 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
608 608
 
609 609
             if (transparent || pixmap.tqmask ())
610 610
             {
611
-                tqmaskBitmap = kpPixmapFX::getNonNullMask (pixmap);
612
-                tqmaskPainter.begin (&tqmaskBitmap);
613
-                tqmaskPainter.setPen (c.tqmaskColor ());
611
+                maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
612
+                maskPainter.begin (&maskBitmap);
613
+                maskPainter.setPen (c.maskColor ());
614 614
             }
615 615
         }
616 616
 
@@ -635,8 +635,8 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
635 635
             if (painter.isActive ())
636 636
                 painter.drawLine (sp, ep);
637 637
 
638
-            if (tqmaskPainter.isActive ())
639
-                tqmaskPainter.drawLine (sp, ep);
638
+            if (maskPainter.isActive ())
639
+                maskPainter.drawLine (sp, ep);
640 640
 
641 641
             didSomething = true;
642 642
         }
@@ -678,7 +678,7 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
678 678
 
679 679
             if (m_mode & WashesPixmaps)
680 680
             {
681
-                if (wash (&painter, &tqmaskPainter, image,
681
+                if (wash (&painter, &maskPainter, image,
682 682
                           colorToReplace,
683 683
                           rect, plotx + rect.left (), ploty + rect.top ()))
684 684
                 {
@@ -746,7 +746,7 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
746 746
 
747 747
                         if (m_mode & WashesPixmaps)
748 748
                         {
749
-                            if (wash (&painter, &tqmaskPainter, image,
749
+                            if (wash (&painter, &maskPainter, image,
750 750
                                       colorToReplace,
751 751
                                       rect, plotx + rect.left (), oldploty + rect.top ()))
752 752
                             {
@@ -774,7 +774,7 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
774 774
 
775 775
                     if (m_mode & WashesPixmaps)
776 776
                     {
777
-                        if (wash (&painter, &tqmaskPainter, image,
777
+                        if (wash (&painter, &maskPainter, image,
778 778
                                   colorToReplace,
779 779
                                   rect, plotx + rect.left (), ploty + rect.top ()))
780 780
                         {
@@ -806,8 +806,8 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
806 806
         if (painter.isActive ())
807 807
             painter.end ();
808 808
 
809
-        if (tqmaskPainter.isActive ())
810
-            tqmaskPainter.end ();
809
+        if (maskPainter.isActive ())
810
+            maskPainter.end ();
811 811
 
812 812
     #if DEBUG_KP_TOOL_PEN
813 813
         if (m_mode & WashesPixmaps)
@@ -824,8 +824,8 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
824 824
 
825 825
         if (didSomething)
826 826
         {
827
-            if (!tqmaskBitmap.isNull ())
828
-                pixmap.setMask (tqmaskBitmap);
827
+            if (!maskBitmap.isNull ())
828
+                pixmap.setMask (maskBitmap);
829 829
 
830 830
             // draw onto doc
831 831
             document ()->setPixmapAt (pixmap, rect.topLeft ());

+ 2
- 2
kolourpaint/tools/kptoolpen.h View File

@@ -103,11 +103,11 @@ private slots:
103 103
     void slotEraserSizeChanged (int size);
104 104
 
105 105
 private:
106
-    bool wash (TQPainter *painter, TQPainter *tqmaskPainter,
106
+    bool wash (TQPainter *painter, TQPainter *maskPainter,
107 107
                const TQImage &image,
108 108
                const kpColor &colorToReplace,
109 109
                const TQRect &imageRect, int plotx, int ploty);
110
-    bool wash (TQPainter *painter, TQPainter *tqmaskPainter,
110
+    bool wash (TQPainter *painter, TQPainter *maskPainter,
111 111
                const TQImage &image,
112 112
                const kpColor &colorToReplace,
113 113
                const TQRect &imageRect, const TQRect &drawRect);

+ 30
- 30
kolourpaint/tools/kptoolpolygon.cpp View File

@@ -81,7 +81,7 @@ static const char *pointArrayToString (const TQPointArray &pointArray)
81 81
 
82 82
 static TQPen makeMaskPen (const kpColor &color, int lineWidth, Qt::PenStyle lineStyle)
83 83
 {
84
-    return TQPen (color.tqmaskColor (),
84
+    return TQPen (color.maskColor (),
85 85
                  lineWidth == 1 ? 0/*closer to looking width 1*/ : lineWidth, lineStyle,
86 86
                  Qt::RoundCap, Qt::RoundJoin);
87 87
 }
@@ -103,7 +103,7 @@ static TQBrush makeMaskBrush (const kpColor &foregroundColor,
103 103
                              kpToolWidgetFillStyle *toolWidgetFillStyle)
104 104
 {
105 105
     if (toolWidgetFillStyle)
106
-        return toolWidgetFillStyle->tqmaskBrush (foregroundColor, backgroundColor);
106
+        return toolWidgetFillStyle->maskBrush (foregroundColor, backgroundColor);
107 107
     else
108 108
         return Qt::NoBrush;
109 109
 }
@@ -155,33 +155,33 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
155 155
     // draw
156 156
 
157 157
     TQPen pen = makePen (foregroundColor, lineWidth, lineStyle),
158
-         tqmaskPen = makeMaskPen (foregroundColor, lineWidth, lineStyle);
158
+         maskPen = makeMaskPen (foregroundColor, lineWidth, lineStyle);
159 159
     TQBrush brush = makeBrush (foregroundColor, backgroundColor, toolWidgetFillStyle),
160
-           tqmaskBrush = makeMaskBrush (foregroundColor, backgroundColor, toolWidgetFillStyle);
160
+           maskBrush = makeMaskBrush (foregroundColor, backgroundColor, toolWidgetFillStyle);
161 161
 
162 162
     TQPixmap pixmap = oldPixmap;
163
-    TQBitmap tqmaskBitmap;
163
+    TQBitmap maskBitmap;
164 164
 
165
-    TQPainter painter, tqmaskPainter;
165
+    TQPainter painter, maskPainter;
166 166
 
167 167
     if (pixmap.tqmask () ||
168
-        (tqmaskPen.style () != TQt::NoPen &&
169
-         tqmaskPen.color () == TQt::color0/*transparent*/) ||
170
-        (tqmaskBrush.style () != TQt::NoBrush &&
171
-         tqmaskBrush.color () == TQt::color0/*transparent*/))
168
+        (maskPen.style () != TQt::NoPen &&
169
+         maskPen.color () == TQt::color0/*transparent*/) ||
170
+        (maskBrush.style () != TQt::NoBrush &&
171
+         maskBrush.color () == TQt::color0/*transparent*/))
172 172
     {
173
-        tqmaskBitmap = kpPixmapFX::getNonNullMask (pixmap);
174
-        tqmaskPainter.begin (&tqmaskBitmap);
175
-        tqmaskPainter.setPen (tqmaskPen);
176
-        tqmaskPainter.setBrush (tqmaskBrush);
173
+        maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
174
+        maskPainter.begin (&maskBitmap);
175
+        maskPainter.setPen (maskPen);
176
+        maskPainter.setBrush (maskBrush);
177 177
 
178 178
     #if DEBUG_KP_TOOL_POLYGON && 0
179
-        kdDebug () << "\ttqmaskPainter begin because:" << endl
179
+        kdDebug () << "\tmaskPainter begin because:" << endl
180 180
                    << "\t\tpixmap.tqmask=" << pixmap.tqmask () << endl
181
-                   << "\t\t(tqmaskPenStyle!=NoPen)=" << (tqmaskPen.style () != TQt::NoPen) << endl
182
-                   << "\t\t(tqmaskPenColor==trans)=" << (tqmaskPen.color () == TQt::color0) << endl
183
-                   << "\t\t(tqmaskBrushStyle!=NoBrush)=" << (tqmaskBrush.style () != TQt::NoBrush) << endl
184
-                   << "\t\t(tqmaskBrushColor==trans)=" << (tqmaskBrush.color () == TQt::color0) << endl;
181
+                   << "\t\t(maskPenStyle!=NoPen)=" << (maskPen.style () != TQt::NoPen) << endl
182
+                   << "\t\t(maskPenColor==trans)=" << (maskPen.color () == TQt::color0) << endl
183
+                   << "\t\t(maskBrushStyle!=NoBrush)=" << (maskBrush.style () != TQt::NoBrush) << endl
184
+                   << "\t\t(maskBrushColor==trans)=" << (maskBrush.color () == TQt::color0) << endl;
185 185
     #endif
186 186
     }
187 187
 
@@ -204,8 +204,8 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
204 204
     if (painter.isActive ())      \
205 205
         painter . cmd ;           \
206 206
                                   \
207
-    if (tqmaskPainter.isActive ())  \
208
-        tqmaskPainter . cmd ;       \
207
+    if (maskPainter.isActive ())  \
208
+        maskPainter . cmd ;       \
209 209
 }
210 210
 
211 211
     // SYNC: TQt bug
@@ -240,9 +240,9 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
240 240
                         painter.setRasterOp (TQt::XorROP);
241 241
                     }
242 242
 
243
-                    if (tqmaskPainter.isActive ())
243
+                    if (maskPainter.isActive ())
244 244
                     {
245
-                        TQPen XORpen = tqmaskPainter.pen ();
245
+                        TQPen XORpen = maskPainter.pen ();
246 246
 
247 247
                         // TODO???
248 248
                         #if 0
@@ -252,7 +252,7 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
252 252
                             XORpen.setColor (TQt::color0/*transparent*/);
253 253
                         #endif
254 254
 
255
-                        tqmaskPainter.setPen (XORpen);
255
+                        maskPainter.setPen (XORpen);
256 256
                     }
257 257
 
258 258
                     PAINTER_CALL (drawLine (pointsInRect [0], pointsInRect [count - 1]));
@@ -288,11 +288,11 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
288 288
     if (painter.isActive ())
289 289
         painter.end ();
290 290
 
291
-    if (tqmaskPainter.isActive ())
292
-        tqmaskPainter.end ();
291
+    if (maskPainter.isActive ())
292
+        maskPainter.end ();
293 293
 
294
-    if (!tqmaskBitmap.isNull ())
295
-        pixmap.setMask (tqmaskBitmap);
294
+    if (!maskBitmap.isNull ())
295
+        pixmap.setMask (maskBitmap);
296 296
 
297 297
     return pixmap;
298 298
 }
@@ -671,7 +671,7 @@ void kpToolPolygon::cancelShape ()
671 671
     endDraw (TQPoint (), TQRect ());
672 672
     commandHistory ()->undo ();
673 673
 #else
674
-    viewManager ()->tqinvalidateTempPixmap ();
674
+    viewManager ()->invalidateTempPixmap ();
675 675
 #endif
676 676
     m_points.resize (0);
677 677
 
@@ -781,7 +781,7 @@ void kpToolPolygon::endShape (const TQPoint &, const TQRect &)
781 781
     if (!hasBegunShape ())
782 782
         return;
783 783
 
784
-    viewManager ()->tqinvalidateTempPixmap ();
784
+    viewManager ()->invalidateTempPixmap ();
785 785
 
786 786
     TQRect boundingRect = kpTool::neededRect (m_points.boundingRect (), m_lineWidth);
787 787
 

+ 39
- 39
kolourpaint/tools/kptoolrectangle.cpp View File

@@ -53,39 +53,39 @@
53 53
 static TQPixmap pixmap (const kpToolRectangle::Mode mode,
54 54
                        kpDocument *document, const TQRect &rect,
55 55
                        const TQPoint &startPoint, const TQPoint &endPoint,
56
-                       const TQPen &pen, const TQPen &tqmaskPen,
57
-                       const TQBrush &brush, const TQBrush &tqmaskBrush)
56
+                       const TQPen &pen, const TQPen &maskPen,
57
+                       const TQBrush &brush, const TQBrush &maskBrush)
58 58
 {
59 59
     TQPixmap pixmap = document->getPixmapAt (rect);
60
-    TQBitmap tqmaskBitmap;
60
+    TQBitmap maskBitmap;
61 61
 
62
-    TQPainter painter, tqmaskPainter;
62
+    TQPainter painter, maskPainter;
63 63
 
64 64
 #if DEBUG_KP_TOOL_RECTANGLE && 1
65 65
     kdDebug () << "pixmap: rect=" << rect
66 66
                << " startPoint=" << startPoint
67 67
                << " endPoint=" << endPoint
68 68
                << endl;
69
-    kdDebug () << "\tm: p=" << (tqmaskPen.style () != TQt::NoPen)
70
-               << " b=" << (tqmaskBrush.style () != TQt::NoBrush)
69
+    kdDebug () << "\tm: p=" << (maskPen.style () != TQt::NoPen)
70
+               << " b=" << (maskBrush.style () != TQt::NoBrush)
71 71
                << " o: p=" << (pen.style () != TQt::NoPen)
72 72
                << " b=" << (brush.style () != TQt::NoBrush)
73 73
                << endl;
74
-    kdDebug () << "\ttqmaskPen.color()=" << (int *) tqmaskPen.color ().rgb ()
74
+    kdDebug () << "\tmaskPen.color()=" << (int *) maskPen.color ().rgb ()
75 75
                << " transparent=" << (int *) TQt::color0.rgb ()/*transparent*/
76 76
                << endl;
77 77
 #endif
78 78
 
79 79
     if (pixmap.tqmask () ||
80
-        (tqmaskPen.style () != TQt::NoPen &&
81
-         tqmaskPen.color () ==  TQt::color0/*transparent*/) ||
82
-        (tqmaskBrush.style () != TQt::NoBrush &&
83
-         tqmaskBrush.color () == TQt::color0/*transparent*/))
80
+        (maskPen.style () != TQt::NoPen &&
81
+         maskPen.color () ==  TQt::color0/*transparent*/) ||
82
+        (maskBrush.style () != TQt::NoBrush &&
83
+         maskBrush.color () == TQt::color0/*transparent*/))
84 84
     {
85
-        tqmaskBitmap = kpPixmapFX::getNonNullMask (pixmap);
86
-        tqmaskPainter.begin (&tqmaskBitmap);
87
-        tqmaskPainter.setPen (tqmaskPen);
88
-        tqmaskPainter.setBrush (tqmaskBrush);
85
+        maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
86
+        maskPainter.begin (&maskBitmap);
87
+        maskPainter.setPen (maskPen);
88
+        maskPainter.setBrush (maskBrush);
89 89
     }
90 90
 
91 91
     if (pen.style () != TQt::NoPen ||
@@ -101,8 +101,8 @@ static TQPixmap pixmap (const kpToolRectangle::Mode mode,
101 101
     if (painter.isActive ())      \
102 102
         painter . cmd ;           \
103 103
                                   \
104
-    if (tqmaskPainter.isActive ())  \
105
-        tqmaskPainter . cmd ;       \
104
+    if (maskPainter.isActive ())  \
105
+        maskPainter . cmd ;       \
106 106
 }
107 107
 
108 108
     if (startPoint != endPoint)
@@ -144,11 +144,11 @@ static TQPixmap pixmap (const kpToolRectangle::Mode mode,
144 144
     if (painter.isActive ())
145 145
         painter.end ();
146 146
 
147
-    if (tqmaskPainter.isActive ())
148
-        tqmaskPainter.end ();
147
+    if (maskPainter.isActive ())
148
+        maskPainter.end ();
149 149
 
150
-    if (!tqmaskBitmap.isNull ())
151
-        pixmap.setMask (tqmaskBitmap);
150
+    if (!maskBitmap.isNull ())
151
+        pixmap.setMask (maskBitmap);
152 152
 
153 153
     return pixmap;
154 154
 }
@@ -231,7 +231,7 @@ void kpToolRectangle::slotBackgroundColorChanged (const kpColor &)
231 231
 // private
232 232
 void kpToolRectangle::updatePen (int mouseButton)
233 233
 {
234
-    TQColor tqmaskPenColor = color (mouseButton).tqmaskColor ();
234
+    TQColor maskPenColor = color (mouseButton).maskColor ();
235 235
 
236 236
     if (!m_toolWidgetLineWidth)
237 237
     {
@@ -239,7 +239,7 @@ void kpToolRectangle::updatePen (int mouseButton)
239 239
             m_pen [mouseButton] = TQPen (color (mouseButton).toTQColor ());
240 240
         else
241 241
             m_pen [mouseButton] = TQPen(Qt::NoPen);
242
-        m_tqmaskPen [mouseButton] = TQPen (tqmaskPenColor);
242
+        m_maskPen [mouseButton] = TQPen (maskPenColor);
243 243
     }
244 244
     else
245 245
     {
@@ -251,7 +251,7 @@ void kpToolRectangle::updatePen (int mouseButton)
251 251
         }
252 252
         else
253 253
             m_pen [mouseButton] = TQPen(Qt::NoPen);
254
-        m_tqmaskPen [mouseButton] = TQPen (tqmaskPenColor,
254
+        m_maskPen [mouseButton] = TQPen (maskPenColor,
255 255
                                         m_toolWidgetLineWidth->lineWidth (),
256 256
                                         TQt::SolidLine);
257 257
     }
@@ -270,14 +270,14 @@ void kpToolRectangle::updateBrush (int mouseButton)
270 270
             color (mouseButton)/*foreground colour*/,
271 271
             color (1 - mouseButton)/*background colour*/);
272 272
 
273
-        m_tqmaskBrush [mouseButton] = m_toolWidgetFillStyle->tqmaskBrush (
273
+        m_maskBrush [mouseButton] = m_toolWidgetFillStyle->maskBrush (
274 274
             color (mouseButton)/*foreground colour*/,
275 275
             color (1 - mouseButton)/*background colour*/);
276 276
     }
277 277
     else
278 278
     {
279 279
         m_brush [mouseButton] = TQBrush(Qt::NoBrush);
280
-        m_tqmaskBrush [mouseButton] = TQBrush(Qt::NoBrush);
280
+        m_maskBrush [mouseButton] = TQBrush(Qt::NoBrush);
281 281
     }
282 282
 }
283 283
 
@@ -437,7 +437,7 @@ void kpToolRectangle::applyModifiers ()
437 437
 
438 438
     m_toolRectangleRectWithoutLineWidth = rect;
439 439
     m_toolRectangleRect = kpTool::neededRect (rect, TQMAX (m_pen [m_mouseButton].width (),
440
-                                                          m_tqmaskPen [m_mouseButton].width ()));
440
+                                                          m_maskPen [m_mouseButton].width ()));
441 441
 }
442 442
 
443 443
 void kpToolRectangle::beginDraw ()
@@ -451,8 +451,8 @@ void kpToolRectangle::updateShape ()
451 451
 
452 452
     TQPixmap newPixmap = pixmap (m_mode, document (), m_toolRectangleRect,
453 453
                                 m_toolRectangleStartPoint, m_toolRectangleEndPoint,
454
-                                m_pen [m_mouseButton], m_tqmaskPen [m_mouseButton],
455
-                                m_brush [m_mouseButton], m_tqmaskBrush [m_mouseButton]);
454
+                                m_pen [m_mouseButton], m_maskPen [m_mouseButton],
455
+                                m_brush [m_mouseButton], m_maskBrush [m_mouseButton]);
456 456
     kpTempPixmap newTempPixmap (false/*always display*/,
457 457
                                 kpTempPixmap::SetPixmap/*render mode*/,
458 458
                                 m_toolRectangleRect.topLeft (),
@@ -511,7 +511,7 @@ void kpToolRectangle::cancelShape ()
511 511
     endDraw (m_currentPoint, TQRect (m_startPoint, m_currentPoint).normalize ());
512 512
     mainWindow ()->commandHistory ()->undo ();
513 513
 #else
514
-    viewManager ()->tqinvalidateTempPixmap ();
514
+    viewManager ()->invalidateTempPixmap ();
515 515
 #endif
516 516
 
517 517
     setUserMessage (i18n ("Let go of all the mouse buttons."));
@@ -527,13 +527,13 @@ void kpToolRectangle::endDraw (const TQPoint &, const TQRect &)
527 527
     applyModifiers ();
528 528
 
529 529
     // TODO: flicker
530
-    viewManager ()->tqinvalidateTempPixmap ();
530
+    viewManager ()->invalidateTempPixmap ();
531 531
 
532 532
     mainWindow ()->commandHistory ()->addCommand (
533 533
         new kpToolRectangleCommand
534 534
             (m_mode,
535
-             m_pen [m_mouseButton], m_tqmaskPen [m_mouseButton],
536
-             m_brush [m_mouseButton], m_tqmaskBrush [m_mouseButton],
535
+             m_pen [m_mouseButton], m_maskPen [m_mouseButton],
536
+             m_brush [m_mouseButton], m_maskBrush [m_mouseButton],
537 537
              m_toolRectangleRect, m_toolRectangleStartPoint, m_toolRectangleEndPoint,
538 538
              mainWindow ()));
539 539
 
@@ -546,15 +546,15 @@ void kpToolRectangle::endDraw (const TQPoint &, const TQRect &)
546 546
  */
547 547
 
548 548
 kpToolRectangleCommand::kpToolRectangleCommand (kpToolRectangle::Mode mode,
549
-                                                const TQPen &pen, const TQPen &tqmaskPen,
550
-                                                const TQBrush &brush, const TQBrush &tqmaskBrush,
549
+                                                const TQPen &pen, const TQPen &maskPen,
550
+                                                const TQBrush &brush, const TQBrush &maskBrush,
551 551
                                                 const TQRect &rect,
552 552
                                                 const TQPoint &startPoint, const TQPoint &endPoint,
553 553
                                                 kpMainWindow *mainWindow)
554 554
     : kpCommand (mainWindow),
555 555
       m_mode (mode),
556
-      m_pen (pen), m_tqmaskPen (tqmaskPen),
557
-      m_brush (brush), m_tqmaskBrush (tqmaskBrush),
556
+      m_pen (pen), m_maskPen (maskPen),
557
+      m_brush (brush), m_maskBrush (maskBrush),
558 558
       m_rect (rect),
559 559
       m_startPoint (startPoint),
560 560
       m_endPoint (endPoint),
@@ -612,8 +612,8 @@ void kpToolRectangleCommand::execute ()
612 612
 
613 613
     doc->setPixmapAt (pixmap (m_mode, doc,
614 614
                               m_rect, m_startPoint, m_endPoint,
615
-                              m_pen, m_tqmaskPen,
616
-                              m_brush, m_tqmaskBrush),
615
+                              m_pen, m_maskPen,
616
+                              m_brush, m_maskBrush),
617 617
                       m_rect.topLeft ());
618 618
 }
619 619
 

+ 6
- 6
kolourpaint/tools/kptoolrectangle.h View File

@@ -103,10 +103,10 @@ private:
103 103
     kpToolWidgetFillStyle *m_toolWidgetFillStyle;
104 104
 
105 105
     void updatePen (int mouseButton);
106
-    TQPen m_pen [2], m_tqmaskPen [2];
106
+    TQPen m_pen [2], m_maskPen [2];
107 107
 
108 108
     void updateBrush (int mouseButton);
109
-    TQBrush m_brush [2], m_tqmaskBrush [2];
109
+    TQBrush m_brush [2], m_maskBrush [2];
110 110
 
111 111
     void applyModifiers ();
112 112
     TQPoint m_toolRectangleStartPoint, m_toolRectangleEndPoint;
@@ -117,8 +117,8 @@ class kpToolRectangleCommand : public kpCommand
117 117
 {
118 118
 public:
119 119
     kpToolRectangleCommand (kpToolRectangle::Mode mode,
120
-                            const TQPen &pen, const TQPen &tqmaskPen,
121
-                            const TQBrush &brush, const TQBrush &tqmaskBrush,
120
+                            const TQPen &pen, const TQPen &maskPen,
121
+                            const TQBrush &brush, const TQBrush &maskBrush,
122 122
                             const TQRect &rect,
123 123
                             const TQPoint &startPoint, const TQPoint &endPoint,
124 124
                             kpMainWindow *mainWindow);
@@ -133,8 +133,8 @@ public:
133 133
 
134 134
 private:
135 135
     kpToolRectangle::Mode m_mode;
136
-    TQPen m_pen, m_tqmaskPen;
137
-    TQBrush m_brush, m_tqmaskBrush;
136
+    TQPen m_pen, m_maskPen;
137
+    TQBrush m_brush, m_maskBrush;
138 138
     TQRect m_rect;
139 139
     TQPoint m_startPoint, m_endPoint;
140 140
     TQPixmap *m_oldPixmapPtr;

+ 3
- 3
kolourpaint/widgets/kptoolwidgetbase.cpp View File

@@ -92,7 +92,7 @@ void kpToolWidgetBase::finishConstruction (int fallBackRow, int fallBackCol)
92 92
                << endl;
93 93
 #endif
94 94
 
95
-    retqlayoutOptions ();
95
+    relayoutOptions ();
96 96
 
97 97
     const TQPair <int, int> rowColPair = defaultSelectedRowAndCol ();
98 98
     if (!setSelected (rowColPair.first, rowColPair.second, false/*don't save*/))
@@ -226,10 +226,10 @@ void kpToolWidgetBase::saveSelectedAsDefault () const
226 226
 
227 227
 
228 228
 // public
229
-void kpToolWidgetBase::retqlayoutOptions ()
229
+void kpToolWidgetBase::relayoutOptions ()
230 230
 {
231 231
 #if DEBUG_KP_TOOL_WIDGET_BASE
232
-    kdDebug () << "kpToolWidgetBase::retqlayoutOptions()" << endl;
232
+    kdDebug () << "kpToolWidgetBase::relayoutOptions()" << endl;
233 233
 #endif
234 234
 
235 235
     while (!m_pixmaps.isEmpty () && m_pixmaps.last ().count () == 0)

+ 1
- 1
kolourpaint/widgets/kptoolwidgetbase.h View File

@@ -70,7 +70,7 @@ public:  // (only have to use these if you don't use finishConstruction())
70 70
 
71 71
     void saveSelectedAsDefault () const;
72 72
 
73
-    void retqlayoutOptions ();
73
+    void relayoutOptions ();
74 74
 
75 75
 public:
76 76
     int selectedRow () const;

+ 9
- 9
kolourpaint/widgets/kptoolwidgeterasersize.cpp View File

@@ -78,9 +78,9 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *tqparent, const char *
78 78
         TQBitmap tqmask (previewPixmap.width (), previewPixmap.height ());
79 79
         tqmask.fill (TQt::color0/*transparent*/);
80 80
 
81
-        TQPainter tqmaskPainter (&tqmask);
82
-        tqmaskPainter.fillRect (rect, TQt::color1/*opaque*/);
83
-        tqmaskPainter.end ();
81
+        TQPainter maskPainter (&tqmask);
82
+        maskPainter.fillRect (rect, TQt::color1/*opaque*/);
83
+        maskPainter.end ();
84 84
 
85 85
         previewPixmap.setMask (tqmask);
86 86
 
@@ -130,19 +130,19 @@ TQPixmap kpToolWidgetEraserSize::cursorPixmap (const kpColor &color) const
130 130
 
131 131
     if (color.isTransparent ())
132 132
     {
133
-        TQBitmap tqmaskBitmap (pixmap.width (), pixmap.height ());
134
-        tqmaskBitmap.fill (TQt::color0/*transparent*/);
133
+        TQBitmap maskBitmap (pixmap.width (), pixmap.height ());
134
+        maskBitmap.fill (TQt::color0/*transparent*/);
135 135
 
136 136
 
137 137
         if (showBorder)
138 138
         {
139
-            TQPainter tqmaskBitmapPainter (&tqmaskBitmap);
140
-            tqmaskBitmapPainter.setPen (TQt::color1/*opaque*/);
141
-            tqmaskBitmapPainter.drawRect (tqmaskBitmap.rect ());
139
+            TQPainter maskBitmapPainter (&maskBitmap);
140
+            maskBitmapPainter.setPen (TQt::color1/*opaque*/);
141
+            maskBitmapPainter.drawRect (maskBitmap.rect ());
142 142
         }
143 143
 
144 144
 
145
-        pixmap.setMask (tqmaskBitmap);
145
+        pixmap.setMask (maskBitmap);
146 146
     }
147 147
 
148 148
 

+ 5
- 5
kolourpaint/widgets/kptoolwidgetfillstyle.cpp View File

@@ -139,7 +139,7 @@ kpToolWidgetFillStyle::FillStyle kpToolWidgetFillStyle::fillStyle () const
139 139
 }
140 140
 
141 141
 // public static
142
-TQBrush kpToolWidgetFillStyle::tqmaskBrushForFillStyle (FillStyle fs,
142
+TQBrush kpToolWidgetFillStyle::maskBrushForFillStyle (FillStyle fs,
143 143
                                                      const kpColor &foregroundColor,
144 144
                                                      const kpColor &backgroundColor)
145 145
 {
@@ -152,10 +152,10 @@ TQBrush kpToolWidgetFillStyle::tqmaskBrushForFillStyle (FillStyle fs,
152 152
         return Qt::NoBrush;
153 153
         break;
154 154
     case FillWithBackground:
155
-        return TQBrush (backgroundColor.tqmaskColor ());
155
+        return TQBrush (backgroundColor.maskColor ());
156 156
         break;
157 157
     case FillWithForeground:
158
-        return TQBrush (foregroundColor.tqmaskColor ());
158
+        return TQBrush (foregroundColor.maskColor ());
159 159
         break;
160 160
     default:
161 161
         return Qt::NoBrush;
@@ -163,10 +163,10 @@ TQBrush kpToolWidgetFillStyle::tqmaskBrushForFillStyle (FillStyle fs,
163 163
     }
164 164
 }
165 165
 
166
-TQBrush kpToolWidgetFillStyle::tqmaskBrush (const kpColor &foregroundColor,
166
+TQBrush kpToolWidgetFillStyle::maskBrush (const kpColor &foregroundColor,
167 167
                                          const kpColor &backgroundColor)
168 168
 {
169
-    return tqmaskBrushForFillStyle (fillStyle (), foregroundColor, backgroundColor);
169
+    return maskBrushForFillStyle (fillStyle (), foregroundColor, backgroundColor);
170 170
 }
171 171
 
172 172
 // public static

+ 2
- 2
kolourpaint/widgets/kptoolwidgetfillstyle.h View File

@@ -59,10 +59,10 @@ private:
59 59
 public:
60 60
     FillStyle fillStyle () const;
61 61
 
62
-    static TQBrush tqmaskBrushForFillStyle (FillStyle fs,
62
+    static TQBrush maskBrushForFillStyle (FillStyle fs,
63 63
                                          const kpColor &foregroundColor,
64 64
                                          const kpColor &backgroundColor);
65
-    TQBrush tqmaskBrush (const kpColor &foregroundColor,
65
+    TQBrush maskBrush (const kpColor &foregroundColor,
66 66
                       const kpColor &backgroundColor);
67 67
 
68 68
     static TQBrush brushForFillStyle (FillStyle fs,

+ 8
- 8
kolourpaint/widgets/kptoolwidgetlinewidth.cpp View File

@@ -52,22 +52,22 @@ kpToolWidgetLineWidth::kpToolWidgetLineWidth (TQWidget *tqparent, const char *na
52 52
                         (h <= 0 ? height () : h));
53 53
         pixmap.fill (TQt::white);
54 54
 
55
-        TQBitmap tqmaskBitmap (pixmap.width (), pixmap.height ());
56
-        tqmaskBitmap.fill (TQt::color0/*transparent*/);
55
+        TQBitmap maskBitmap (pixmap.width (), pixmap.height ());
56
+        maskBitmap.fill (TQt::color0/*transparent*/);
57 57
         
58 58
         
59
-        TQPainter painter (&pixmap), tqmaskPainter (&tqmaskBitmap);
60
-        painter.setPen (TQt::black), tqmaskPainter.setPen (TQt::color1/*opaque*/);
61
-        painter.setBrush (TQt::black), tqmaskPainter.setBrush (TQt::color1/*opaque*/);
59
+        TQPainter painter (&pixmap), maskPainter (&maskBitmap);
60
+        painter.setPen (TQt::black), maskPainter.setPen (TQt::color1/*opaque*/);
61
+        painter.setBrush (TQt::black), maskPainter.setBrush (TQt::color1/*opaque*/);
62 62
 
63 63
         TQRect rect = TQRect (0, (pixmap.height () - lineWidths [i]) / 2,
64 64
                             pixmap.width (), lineWidths [i]);
65
-        painter.drawRect (rect), tqmaskPainter.drawRect (rect);
65
+        painter.drawRect (rect), maskPainter.drawRect (rect);
66 66
 
67
-        painter.end (), tqmaskPainter.end ();
67
+        painter.end (), maskPainter.end ();
68 68
         
69 69
         
70
-        pixmap.setMask (tqmaskBitmap);
70
+        pixmap.setMask (maskBitmap);
71 71
 
72 72
         addOption (pixmap, TQString::number (lineWidths [i]));
73 73
         startNewOptionRow ();

+ 1
- 1
kooka/kocrbase.h View File

@@ -107,7 +107,7 @@ protected:
107 107
      * ocr engine used.
108 108
      * It calls the virtual subs ocrEngineName, ocrEngineLogo and ocrEngineDesc which
109 109
      * must return the approbiate values for the engines.
110
-     * @return a pointer to a VBox in which further elements can be tqlayouted
110
+     * @return a pointer to a VBox in which further elements can be layouted
111 111
      */
112 112
     virtual void ocrIntro();
113 113
 

+ 4
- 4
kooka/kocrocrad.cpp View File

@@ -92,7 +92,7 @@ TQString ocradDialog::ocrEngineDesc() const
92 92
 }
93 93
 
94 94
 
95
-int ocradDialog::tqlayoutDetectionMode() const
95
+int ocradDialog::layoutDetectionMode() const
96 96
 {
97 97
     return m_layoutMode->currentItem();
98 98
 }
@@ -131,8 +131,8 @@ EngineError ocradDialog::setupGui()
131 131
 
132 132
     /** tqlayout detection button **/
133 133
     conf->setGroup( CFG_GROUP_OCRAD );
134
-    int tqlayoutDetect = conf->readNumEntry( CFG_OCRAD_LAYOUT_DETECTION, 0 );
135
-    kdDebug(28000) << "Layout detection from config: " << tqlayoutDetect << endl;
134
+    int layoutDetect = conf->readNumEntry( CFG_OCRAD_LAYOUT_DETECTION, 0 );
135
+    kdDebug(28000) << "Layout detection from config: " << layoutDetect << endl;
136 136
 
137 137
     (void) new KSeparator( KSeparator::HLine, page);
138 138
     TQHBox *hb1 = new TQHBox(page);
@@ -142,7 +142,7 @@ EngineError ocradDialog::setupGui()
142 142
     m_layoutMode->insertItem(i18n("No Layout Detection"), 0 );
143 143
     m_layoutMode->insertItem(i18n("Column Detection"), 1 );
144 144
     m_layoutMode->insertItem(i18n("Full Layout Detection"), 2);
145
-    m_layoutMode->setCurrentItem(tqlayoutDetect);
145
+    m_layoutMode->setCurrentItem(layoutDetect);
146 146
 
147 147
     /** stating the ocrad binary **/
148 148
     (void) new KSeparator( KSeparator::HLine, page);

+ 2
- 2
kooka/kocrocrad.h View File

@@ -38,7 +38,7 @@
38 38
 #include "kocrbase.h"
39 39
 
40 40
 #define CFG_GROUP_OCRAD "ocrad"
41
-#define CFG_OCRAD_LAYOUT_DETECTION "tqlayoutDetection"
41
+#define CFG_OCRAD_LAYOUT_DETECTION "layoutDetection"
42 42
 #define CFG_OCRAD_EXTRA_ARGUMENTS  "extraArguments"
43 43
 #define CFG_OCRAD_FORMAT "format"
44 44
 #define CFG_OCRAD_CHARSET "charset"
@@ -71,7 +71,7 @@ public:
71 71
 
72 72
     TQString orfUrl() const;
73 73
 
74
-    int tqlayoutDetectionMode() const;
74
+    int layoutDetectionMode() const;
75 75
 
76 76
     /**
77 77
      * returns the numeric version of the ocrad program.

+ 2
- 2
kooka/kookaimage.cpp View File

@@ -205,7 +205,7 @@ void KookaImage::extractNow()
205 205
 {
206 206
    kdDebug(28000) << "extracting a subimage number " << m_subNo << endl;
207 207
 
208
-   KookaImage *tqparent = tqparentImage();
208
+   KookaImage *tqparent = parentImage();
209 209
 
210 210
    if( tqparent )
211 211
    {
@@ -328,7 +328,7 @@ KookaImage::~KookaImage()
328 328
 
329 329
 }
330 330
 
331
-KookaImage* KookaImage::tqparentImage() const
331
+KookaImage* KookaImage::parentImage() const
332 332
 {
333 333
    return( m_parent );
334 334
 }

+ 1
- 1
kooka/kookaimage.h View File

@@ -78,7 +78,7 @@ public:
78 78
     /**
79 79
      * the tqparent image.
80 80
      */
81
-    KookaImage*  tqparentImage() const;
81
+    KookaImage*  parentImage() const;
82 82
 
83 83
     /**
84 84
      * returns true if this is a subimage.

+ 1
- 1
kooka/ksaneocr.cpp View File

@@ -401,7 +401,7 @@ void KSANEOCR::startOCRAD( )
401 401
     *daemon <<  m_tmpOrfName;                   // the orf result file
402 402
     *daemon << TQFile::encodeName( m_ocrImagePBM ).data();      // The name of the image
403 403