Browse Source

Rename old tq methods that no longer need a unique name

Timothy Pearson 7 years ago
parent
commit
45f529de24
100 changed files with 329 additions and 329 deletions
  1. 1
    1
      kamera/kcontrol/kamera.cpp
  2. 2
    2
      kamera/kcontrol/kameradevice.cpp
  3. 4
    4
      kamera/kioslave/kamera.cpp
  4. 2
    2
      kdvi/TeXFont_PFB.cpp
  5. 1
    1
      kdvi/dviRenderer.cpp
  6. 2
    2
      kdvi/fontprogress.cpp
  7. 1
    1
      kdvi/optionDialogFontsWidget_base.ui
  8. 1
    1
      kdvi/optionDialogSpecialWidget_base.ui
  9. 1
    1
      kdvi/special.cpp
  10. 5
    5
      kfax/options.cpp
  11. 1
    1
      kfaxview/libkfaximage/kfaximage.cpp
  12. 5
    5
      kfile-plugins/jpeg/exif.cpp
  13. 1
    1
      kfile-plugins/ps/gscreator.cpp
  14. 1
    1
      kgamma/kcmkgamma/displaynumber.cpp
  15. 7
    7
      kgamma/kcmkgamma/kgamma.cpp
  16. 1
    1
      kghostview/displayoptions.cpp
  17. 1
    1
      kghostview/gssettingswidget.ui
  18. 1
    1
      kghostview/infodialog.cpp
  19. 1
    1
      kghostview/kgv_miniwidget.cpp
  20. 3
    3
      kghostview/kgvconfigdialog.cpp
  21. 1
    1
      kghostview/kgvfactory.cpp
  22. 1
    1
      kghostview/kgvpagedecorator.cpp
  23. 1
    1
      kghostview/kgvshell.cpp
  24. 15
    15
      kghostview/viewcontrol.cpp
  25. 1
    1
      kiconedit/kcolorgrid.cpp
  26. 1
    1
      kiconedit/kcolorgrid.h
  27. 1
    1
      kiconedit/kiconcolors.cpp
  28. 3
    3
      kiconedit/kiconconfig.cpp
  29. 2
    2
      kiconedit/kiconedit.cpp
  30. 1
    1
      kiconedit/kiconedit.h
  31. 1
    1
      kiconedit/kicongrid.cpp
  32. 1
    1
      kiconedit/knew.cpp
  33. 2
    2
      kiconedit/palettetoolbar.cpp
  34. 3
    3
      kmrml/kmrml/algorithmdialog.cpp
  35. 1
    1
      kmrml/kmrml/kcontrol/indexcleaner.cpp
  36. 2
    2
      kmrml/kmrml/kcontrol/kcmkmrml.cpp
  37. 1
    1
      kmrml/kmrml/kcontrol/mainpage.cpp
  38. 2
    2
      kmrml/kmrml/kcontrol/serverconfigwidget.ui
  39. 1
    1
      kmrml/kmrml/lib/kmrml_config.cpp
  40. 1
    1
      kmrml/kmrml/lib/kmrml_config.h
  41. 12
    12
      kmrml/kmrml/mrml_part.cpp
  42. 3
    3
      kmrml/kmrml/mrml_part.h
  43. 8
    8
      kmrml/kmrml/mrml_view.cpp
  44. 1
    1
      kmrml/kmrml/mrml_view.h
  45. 2
    2
      kolourpaint/kpcommandhistory.cpp
  46. 48
    48
      kolourpaint/kpdefs.h
  47. 5
    5
      kolourpaint/kpdocument.cpp
  48. 1
    1
      kolourpaint/kpdocumentmetainfo.cpp
  49. 14
    14
      kolourpaint/kpdocumentsaveoptions.cpp
  50. 1
    1
      kolourpaint/kpmainwindow.cpp
  51. 1
    1
      kolourpaint/kpmainwindow.h
  52. 1
    1
      kolourpaint/kpmainwindow_settings.cpp
  53. 1
    1
      kolourpaint/kpmainwindow_text.cpp
  54. 1
    1
      kolourpaint/kpmainwindow_view.cpp
  55. 5
    5
      kolourpaint/kpselection.cpp
  56. 2
    2
      kolourpaint/kpselection.h
  57. 5
    5
      kolourpaint/kpselectiondrag.cpp
  58. 1
    1
      kolourpaint/kpselectiondrag.h
  59. 3
    3
      kolourpaint/kpthumbnail.cpp
  60. 3
    3
      kolourpaint/kptool.cpp
  61. 1
    1
      kolourpaint/kptool.h
  62. 1
    1
      kolourpaint/kpviewscrollablecontainer.cpp
  63. 1
    1
      kolourpaint/pixmapfx/kpeffectbalance.cpp
  64. 3
    3
      kolourpaint/pixmapfx/kpeffectsdialog.cpp
  65. 6
    6
      kolourpaint/pixmapfx/kppixmapfx.cpp
  66. 8
    8
      kolourpaint/tools/kptoolresizescale.cpp
  67. 4
    4
      kolourpaint/widgets/kpcolorsimilaritycube.cpp
  68. 1
    1
      kolourpaint/widgets/kpcolorsimilaritycube.h
  69. 11
    11
      kolourpaint/widgets/kpcolortoolbar.cpp
  70. 2
    2
      kolourpaint/widgets/kpcolortoolbar.h
  71. 3
    3
      kolourpaint/widgets/kpsqueezedtextlabel.cpp
  72. 1
    1
      kolourpaint/widgets/kpsqueezedtextlabel.h
  73. 6
    6
      kolourpaint/widgets/kptoolwidgetbase.cpp
  74. 6
    6
      kooka/img_saver.cpp
  75. 2
    2
      kooka/imgnamecombo.cpp
  76. 1
    1
      kooka/imgprintdialog.cpp
  77. 4
    4
      kooka/kocrbase.cpp
  78. 1
    1
      kooka/kooka.cpp
  79. 6
    6
      kooka/kookapref.cpp
  80. 3
    3
      kooka/kookaview.cpp
  81. 1
    1
      kooka/scanpackager.cpp
  82. 2
    2
      kooka/thumbview.cpp
  83. 10
    10
      kpdf/conf/dlgaccessibility.ui
  84. 2
    2
      kpdf/conf/dlggeneral.ui
  85. 3
    3
      kpdf/conf/dlgperformance.ui
  86. 1
    1
      kpdf/conf/dlgpresentation.ui
  87. 1
    1
      kpdf/core/document.cpp
  88. 2
    2
      kpdf/core/generator_pdf/generator_pdf.cpp
  89. 1
    1
      kpdf/core/pagetransition.h
  90. 1
    1
      kpdf/part.cpp
  91. 3
    3
      kpdf/ui/minibar.cpp
  92. 1
    1
      kpdf/ui/pagepainter.cpp
  93. 6
    6
      kpdf/ui/pageview.cpp
  94. 6
    6
      kpdf/ui/presentationwidget.cpp
  95. 2
    2
      kpdf/ui/propertiesdialog.cpp
  96. 1
    1
      kpdf/ui/thumbnaillist.h
  97. 10
    10
      kpovmodeler/pmactions.cpp
  98. 2
    2
      kpovmodeler/pmbicubicpatch.cpp
  99. 1
    1
      kpovmodeler/pmbicubicpatch.h
  100. 0
    0
      kpovmodeler/pmblendmapmodifiers.cpp

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

@@ -113,7 +113,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
113 113
 	connect(m_deviceSel, TQT_SIGNAL(selectionChanged(TQIconViewItem *)),
114 114
 		TQT_SLOT(slot_deviceSelected(TQIconViewItem *)));
115 115
 
116
-	m_deviceSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
116
+	m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
117 117
 	
118 118
 	// create actions
119 119
 	KAction *act;

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

@@ -293,7 +293,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
293 293
 	connect(m_modelSel, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
294 294
         TQT_SLOT(slot_setModel(TQListViewItem *)));
295 295
 	// make sure listview only as wide as it needs to be
296
-	m_modelSel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
296
+	m_modelSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum,
297 297
 		TQSizePolicy::Preferred));
298 298
 
299 299
 	TQVBoxLayout *rightLayout = new TQVBoxLayout(0L, 0, KDialog::spacingHint());
@@ -347,7 +347,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
347 347
 	for (int i = 0; i < gphoto_ports; i++) {
348 348
 		if (gp_port_info_list_get_info(list, i, &info) >= 0) {
349 349
 			if (strncmp(info.path, "serial:", 7) == 0)
350
-				m_serialPortCombo->insertItem(TQString::tqfromLatin1(info.path).mid(7));
350
+				m_serialPortCombo->insertItem(TQString::fromLatin1(info.path).mid(7));
351 351
 		}
352 352
 	}
353 353
 	gp_port_info_list_free(list);

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

@@ -55,7 +55,7 @@ extern "C"
55 55
 {
56 56
 	KDE_EXPORT int kdemain(int argc, char **argv);
57 57
 
58
-	static void frontendCameratqStatus(GPContext *context, const char *format, va_list args, void *data);
58
+	static void frontendCameraStatus(GPContext *context, const char *format, va_list args, void *data);
59 59
 	static unsigned int frontendProgressStart(
60 60
 		GPContext *context, float totalsize, const char *format,
61 61
 		va_list args, void *data
@@ -795,7 +795,7 @@ void KameraProtocol::setHost(const TQString& host, int port, const TQString& use
795 795
 		}
796 796
 
797 797
 		// register gphoto2 callback functions
798
-		gp_context_set_status_func(m_context, frontendCameratqStatus, this);
798
+		gp_context_set_status_func(m_context, frontendCameraStatus, this);
799 799
 		gp_context_set_progress_funcs(m_context, frontendProgressStart, frontendProgressUpdate, NULL, this);
800 800
 		// gp_camera_set_message_func(m_camera, ..., this)
801 801
 
@@ -881,7 +881,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo
881 881
 
882 882
 	if (info.file.fields & GP_FILE_INFO_TYPE) {
883 883
 		atom.m_uds = UDS_MIME_TYPE;
884
-		atom.m_str = TQString::tqfromLatin1(info.file.type);
884
+		atom.m_str = TQString::fromLatin1(info.file.type);
885 885
 		udsEntry.append(atom);
886 886
 	}
887 887
 
@@ -1028,7 +1028,7 @@ unsigned int frontendProgressStart(
1028 1028
 }
1029 1029
 
1030 1030
 // this callback function is activated on every status message from gphoto2
1031
-static void frontendCameratqStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
1031
+static void frontendCameraStatus(GPContext * /*context*/, const char *format, va_list args, void *data)
1032 1032
 {
1033 1033
 	KameraProtocol *object = (KameraProtocol*)data;
1034 1034
 	char *status;

+ 2
- 2
kdvi/TeXFont_PFB.cpp View File

@@ -74,8 +74,8 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
74 74
   // TeX is only able to address character codes 0-255 while
75 75
   // e.g. Type1 fonts may contain several thousands of characters)
76 76
   if (enc != 0) {
77
-    parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "Encoding" ));
78
-    parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" ));
77
+    parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "Encoding" ));
78
+    parent->fullEncodingName = enc->encodingFullName.remove(TQString::fromLatin1( "encoding" ));
79 79
 
80 80
     // An encoding vector is given for this font, i.e. an array of
81 81
     // character names (such as: 'parenleft' or 'dotlessj'). We use

+ 1
- 1
kdvi/dviRenderer.cpp View File

@@ -277,7 +277,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
277 277
     TQLabel *label2 = new TQLabel( i18n("<qt>This DVI file contains source file information. You may click into the text with the "
278 278
 				      "middle mouse button, and an editor will open the TeX-source file immediately.</qt>"),
279 279
 				 contents);
280
-    label2->setMinimumSize(label2->tqsizeHint());
280
+    label2->setMinimumSize(label2->sizeHint());
281 281
     lay->add( label2 );
282 282
     lay->addStretch(1);
283 283
     TQSize extraSize = TQSize(50,30);

+ 2
- 2
kdvi/fontprogress.cpp View File

@@ -42,7 +42,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
42 42
   TQVBox *page = makeVBoxMainWidget();
43 43
 
44 44
   TextLabel1   = new TQLabel( label, page, "TextLabel2" );
45
-  TextLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) );
45
+  TextLabel1->setAlignment( int( TQLabel::AlignCenter ) );
46 46
   TQWhatsThis::add( TextLabel1, whatsThis );
47 47
   TQToolTip::add( TextLabel1, ttip );
48 48
 
@@ -55,7 +55,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString
55 55
     ProgressBar1 = NULL;
56 56
   
57 57
   TextLabel2   = new TQLabel( "", page, "TextLabel2" );
58
-  TextLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) );
58
+  TextLabel2->setAlignment( int( TQLabel::AlignCenter ) );
59 59
   TQWhatsThis::add( TextLabel2, whatsThis );
60 60
   TQToolTip::add( TextLabel2, ttip );
61 61
 

+ 1
- 1
kdvi/optionDialogFontsWidget_base.ui View File

@@ -44,7 +44,7 @@
44 44
             <property name="sizeType">
45 45
                 <enum>Expanding</enum>
46 46
             </property>
47
-            <property name="tqsizeHint">
47
+            <property name="sizeHint">
48 48
                 <size>
49 49
                     <width>31</width>
50 50
                     <height>121</height>

+ 1
- 1
kdvi/optionDialogSpecialWidget_base.ui View File

@@ -186,7 +186,7 @@
186 186
                     <property name="sizeType">
187 187
                         <enum>Expanding</enum>
188 188
                     </property>
189
-                    <property name="tqsizeHint">
189
+                    <property name="sizeHint">
190 190
                         <size>
191 191
                             <width>390</width>
192 192
                             <height>21</height>

+ 1
- 1
kdvi/special.cpp View File

@@ -453,7 +453,7 @@ void dviRenderer::TPIC_flushPath_special()
453 453
 
454 454
   TQPen pen(TQt::black, (int)(penWidth_in_mInch*resolutionInDPI/1000.0 + 0.5));  // Sets the pen size in milli-inches
455 455
   foreGroundPainter->setPen(pen);
456
-  foreGroundPainter->tqdrawPolyline(TPIC_path, 0, number_of_elements_in_path);
456
+  foreGroundPainter->drawPolyline(TPIC_path, 0, number_of_elements_in_path);
457 457
   number_of_elements_in_path = 0;
458 458
 }
459 459
 

+ 5
- 5
kfax/options.cpp View File

@@ -67,21 +67,21 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
67 67
   vbl->addLayout( hbl1 );
68 68
 
69 69
   displaylabel = new TQLabel(i18n("Display options:"), bg,"displaylabel");
70
-  displaylabel->setFixedSize( displaylabel->tqsizeHint() );
70
+  displaylabel->setFixedSize( displaylabel->sizeHint() );
71 71
   hbl1->addWidget( displaylabel );
72 72
 
73 73
   landscape = new TQCheckBox(i18n("Landscape"), bg,"Landscape");
74
-  landscape->setFixedSize( landscape->tqsizeHint() );
74
+  landscape->setFixedSize( landscape->sizeHint() );
75 75
   hbl1->addSpacing( 10 );
76 76
   hbl1->addWidget( landscape );
77 77
 
78 78
   flip = new TQCheckBox(i18n("Upside down"), bg,"upsidedown");
79
-  flip->setFixedSize( flip->tqsizeHint() );
79
+  flip->setFixedSize( flip->sizeHint() );
80 80
   hbl1->addSpacing( 10 );
81 81
   hbl1->addWidget( flip );
82 82
 
83 83
   invert = new TQCheckBox(i18n("Invert"), bg,"invert");
84
-  invert->setFixedSize( invert->tqsizeHint() );
84
+  invert->setFixedSize( invert->sizeHint() );
85 85
   hbl1->addSpacing( 10 );
86 86
   hbl1->addWidget( invert );
87 87
 
@@ -139,7 +139,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
139 139
   rawgroup->setFrameStyle(TQFrame::NoFrame);
140 140
 
141 141
   rawlabel = new TQLabel(i18n("Raw fax format:"),rawgroup,"rawlabel");
142
-  rawlabel->setFixedSize( rawlabel->tqsizeHint() );
142
+  rawlabel->setFixedSize( rawlabel->sizeHint() );
143 143
   hbl4->addWidget( rawlabel );
144 144
 
145 145
   g3 = new TQRadioButton("G3",rawgroup,"g3");

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

@@ -41,7 +41,7 @@ static const char bigTIFF[]    = "\x4d\x4d\x00\x2a";
41 41
 KFaxImage::KFaxImage( const TQString &filename, TQObject *parent, const char *name )
42 42
    : TQObject(parent,name)
43 43
 {
44
-  KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkfaximage") );
44
+  KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkfaximage") );
45 45
   loadImage(filename);
46 46
 }
47 47
 

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

@@ -525,11 +525,11 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
525 525
         switch(Tag){
526 526
 
527 527
             case TAG_MAKE:
528
-                ExifData::CameraMake = TQString::tqfromLatin1((const char*)ValuePtr, 31);
528
+                ExifData::CameraMake = TQString::fromLatin1((const char*)ValuePtr, 31);
529 529
                 break;
530 530
 
531 531
             case TAG_MODEL:
532
-                ExifData::CameraModel = TQString::tqfromLatin1((const char*)ValuePtr, 39);
532
+                ExifData::CameraModel = TQString::fromLatin1((const char*)ValuePtr, 39);
533 533
 		break;
534 534
 
535 535
             case TAG_ORIENTATION:
@@ -537,7 +537,7 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
537 537
                 break;
538 538
 
539 539
             case TAG_DATETIME_ORIGINAL:
540
-		DateTime = TQString::tqfromLatin1((const char*)ValuePtr, 19);
540
+		DateTime = TQString::fromLatin1((const char*)ValuePtr, 19);
541 541
                 break;
542 542
 
543 543
             case TAG_USERCOMMENT:
@@ -558,12 +558,12 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
558 558
                         int c;
559 559
                         c = (ValuePtr)[a];
560 560
                         if (c != '\0' && c != ' '){
561
-                            UserComment = TQString::tqfromLatin1((const char*)(a+ValuePtr), 199);
561
+                            UserComment = TQString::fromLatin1((const char*)(a+ValuePtr), 199);
562 562
                             break;
563 563
                         }
564 564
                     }
565 565
                 }else{
566
-                    UserComment = TQString::tqfromLatin1((const char*)ValuePtr, 199);
566
+                    UserComment = TQString::fromLatin1((const char*)ValuePtr, 199);
567 567
                 }
568 568
                 break;
569 569
 

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

@@ -521,7 +521,7 @@ bool GSCreator::getEPSIPreview(const TQString &path, long start, long
521 521
     return false;
522 522
   }
523 523
 
524
-  TQString previewstr = TQString::tqfromLatin1(buf);
524
+  TQString previewstr = TQString::fromLatin1(buf);
525 525
   free(buf);
526 526
 
527 527
   int offset = 0;

+ 1
- 1
kgamma/kcmkgamma/displaynumber.cpp View File

@@ -28,7 +28,7 @@ DisplayNumber::DisplayNumber(TQWidget *parent, int digits, \
28 28
 
29 29
   setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
30 30
   setBackgroundMode(TQt::PaletteBase);
31
-  tqsetAlignment(TQt::AlignCenter);
31
+  setAlignment(TQt::AlignCenter);
32 32
   setFocusPolicy(TQ_NoFocus);
33 33
 }
34 34
 

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

@@ -157,37 +157,37 @@ void KGamma::setupUI() {
157 157
     pic1->setMinimumSize(530, 171);
158 158
     pic1->setBackgroundPixmap(background);
159 159
     pic1->setPixmap(TQPixmap(locate("data", "kgamma/pics/greyscale.png")));
160
-    pic1->tqsetAlignment(AlignCenter);
160
+    pic1->setAlignment(AlignCenter);
161 161
     stack->addWidget( pic1, 0 );
162 162
 
163 163
     TQLabel *pic2 = new TQLabel(stack);
164 164
     pic2->setBackgroundPixmap(background);
165 165
     pic2->setPixmap(TQPixmap(locate("data", "kgamma/pics/rgbscale.png")));
166
-    pic2->tqsetAlignment(AlignCenter);
166
+    pic2->setAlignment(AlignCenter);
167 167
     stack->addWidget( pic2, 1 );
168 168
 
169 169
     TQLabel *pic3 = new TQLabel(stack);
170 170
     pic3->setBackgroundPixmap(background);
171 171
     pic3->setPixmap(TQPixmap(locate("data", "kgamma/pics/cmyscale.png")));
172
-    pic3->tqsetAlignment(AlignCenter);
172
+    pic3->setAlignment(AlignCenter);
173 173
     stack->addWidget( pic3, 2 );
174 174
 
175 175
     TQLabel *pic4 = new TQLabel(stack);
176 176
     pic4->setBackgroundPixmap(background);
177 177
     pic4->setPixmap(TQPixmap(locate("data", "kgamma/pics/darkgrey.png")));
178
-    pic4->tqsetAlignment(AlignCenter);
178
+    pic4->setAlignment(AlignCenter);
179 179
     stack->addWidget( pic4, 3 );
180 180
 
181 181
     TQLabel *pic5 = new TQLabel(stack);
182 182
     pic5->setBackgroundPixmap(background);
183 183
     pic5->setPixmap(TQPixmap(locate("data", "kgamma/pics/midgrey.png")));
184
-    pic5->tqsetAlignment(AlignCenter);
184
+    pic5->setAlignment(AlignCenter);
185 185
     stack->addWidget( pic5, 4 );
186 186
 
187 187
     TQLabel *pic6 = new TQLabel(stack);
188 188
     pic6->setBackgroundPixmap(background);
189 189
     pic6->setPixmap(TQPixmap(locate("data", "kgamma/pics/lightgrey.png")));
190
-    pic6->tqsetAlignment(AlignCenter);
190
+    pic6->setAlignment(AlignCenter);
191 191
     stack->addWidget( pic6, 5 );
192 192
 
193 193
     topLayout->addWidget(stack, 10);
@@ -279,7 +279,7 @@ void KGamma::setupUI() {
279 279
     TQLabel *error = new TQLabel(this);
280 280
     error->setText(i18n("Gamma correction is not supported by your"
281 281
     " graphics hardware or driver."));
282
-    error->tqsetAlignment(AlignCenter);
282
+    error->setAlignment(AlignCenter);
283 283
     topLayout->addWidget(error);
284 284
   }
285 285
 }

+ 1
- 1
kghostview/displayoptions.cpp View File

@@ -76,7 +76,7 @@ TQString DisplayOptions::toString( const DisplayOptions& options )
76 76
 
77 77
 bool DisplayOptions::fromString( DisplayOptions& out, const TQString& in )
78 78
 {
79
-	TQRegExp regex( TQString::tqfromLatin1( rformat ) );
79
+	TQRegExp regex( TQString::fromLatin1( rformat ) );
80 80
 	if ( regex.search( in ) < 0 ) return false;
81 81
 
82 82
 	out.reset();

+ 1
- 1
kghostview/gssettingswidget.ui View File

@@ -46,7 +46,7 @@
46 46
             <property name="sizeType">
47 47
                 <enum>Expanding</enum>
48 48
             </property>
49
-            <property name="tqsizeHint">
49
+            <property name="sizeHint">
50 50
                 <size>
51 51
                     <width>286</width>
52 52
                     <height>20</height>

+ 1
- 1
kghostview/infodialog.cpp View File

@@ -90,7 +90,7 @@ namespace {
90 90
 		    "(?:(\\+|\\-)(\\d\\d)\'?(\\d\\d)\'?)?"
91 91
 		    "\\)" );
92 92
 	if ( exp.exactMatch( dateStr ) ) {
93
-	    TQStringList list = exp.tqcapturedTexts();
93
+	    TQStringList list = exp.capturedTexts();
94 94
 	    TQStringList::iterator iter = list.begin();
95 95
 	    ++iter; // whole string!
96 96
 #undef GET

+ 1
- 1
kghostview/kgv_miniwidget.cpp View File

@@ -534,7 +534,7 @@ void KGVMiniWidget::buildTOC()
534 534
 	}
535 535
     }
536 536
     else {
537
-	marklist->insertItem( TQString::tqfromLatin1( "1" ), 0 );
537
+	marklist->insertItem( TQString::fromLatin1( "1" ), 0 );
538 538
     }
539 539
 }
540 540
 

+ 3
- 3
kghostview/kgvconfigdialog.cpp View File

@@ -120,7 +120,7 @@ namespace {
120 120
 	if ( version < TQString::number( 7.00 ) ) 
121 121
 	{
122 122
 	    TQStringList arguments = TQStringList::split( ' ', Configuration::antialiasingArguments() );
123
-	    arguments.remove( TQString::tqfromLatin1( "-dMaxBitmap=10000000" ) );
123
+	    arguments.remove( TQString::fromLatin1( "-dMaxBitmap=10000000" ) );
124 124
 	    TQString antiAliasArgs = arguments.join( " " );
125 125
 
126 126
 	    Configuration::setAntialiasingArguments( antiAliasArgs );
@@ -140,9 +140,9 @@ void  ConfigDialog::showSettings( KGVPart* main ) {
140 140
     KConfigDialog* dialog = new KConfigDialog( 0, name,
141 141
 	    Configuration::self(), KDialogBase::IconList );
142 142
     dialog->addPage( new GeneralSettingsWidget( 0, "general-settings" ),
143
-	    i18n( "General" ), TQString::tqfromLatin1( "kghostview" ) );
143
+	    i18n( "General" ), TQString::fromLatin1( "kghostview" ) );
144 144
     GSSettingsWidget *gssw = new GSSettingsWidget( 0, "gs-settings" );
145
-    dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::tqfromLatin1( "pdf" ) );
145
+    dialog->addPage( gssw, i18n( "Ghostscript\nConfiguration" ), TQString::fromLatin1( "pdf" ) );
146 146
 
147 147
     gssw->setDetectedVersion(Configuration::version());
148 148
 

+ 1
- 1
kghostview/kgvfactory.cpp View File

@@ -64,7 +64,7 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *
64 64
      *
65 65
      * as we did before.
66 66
      */
67
-    args << TQString::tqfromLatin1( className );
67
+    args << TQString::fromLatin1( className );
68 68
     if ( !strcmp( className, "Browser/View" ) ) {
69 69
 	    className = "KParts::ReadOnlyPart";
70 70
     }

+ 1
- 1
kghostview/kgvpagedecorator.cpp View File

@@ -63,7 +63,7 @@ void KGVPageDecorator::drawFrame( TQPainter* p )
63 63
     if( !r.isValid() ) 
64 64
 	return;
65 65
     
66
-    const TQColorGroup& cg = tqcolorGroup();
66
+    const TQColorGroup& cg = colorGroup();
67 67
 
68 68
     r.moveCenter( r.center() + _shadowOffset );
69 69
     qDrawPlainRect( p, r, cg.shadow(), _shadowOffset.manhattanLength() );

+ 1
- 1
kghostview/kgvshell.cpp View File

@@ -309,7 +309,7 @@ void KGVShell::slotMaximize()
309 309
 
310 310
 void KGVShell::slotResize()
311 311
 {
312
-    resize( m_gvpart->pageView()->tqsizeHint().width(), height() );
312
+    resize( m_gvpart->pageView()->sizeHint().width(), height() );
313 313
 }
314 314
 
315 315
 void KGVShell::setFullScreen( bool useFullScreen )

+ 15
- 15
kghostview/viewcontrol.cpp View File

@@ -36,7 +36,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
36 36
 	vcGroupBox = new TQGroupBox(  this );
37 37
 	vcGroupBox->setFrameStyle( TQFrame::NoFrame );
38 38
 	//vcGroupBox->setTitle( i18n("Force Changes To") );
39
-	//vcGroupBox->tqsetAlignment( 1 );
39
+	//vcGroupBox->setAlignment( 1 );
40 40
 
41 41
 	topLayout->addWidget( vcGroupBox, 10 );
42 42
 
@@ -51,7 +51,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
51 51
 
52 52
 
53 53
 	magComboBox = new TQComboBox( FALSE, vcGroupBox );
54
-	magComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
54
+	magComboBox->setFixedHeight( magComboBox->sizeHint().height() );
55 55
 
56 56
 
57 57
 	//magComboBox->hide();
@@ -63,7 +63,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
63 63
 
64 64
 
65 65
 	mediaComboBox = new TQComboBox( FALSE, vcGroupBox );
66
-	mediaComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
66
+	mediaComboBox->setFixedHeight( magComboBox->sizeHint().height() );
67 67
 
68 68
 	connect ( mediaComboBox, TQT_SIGNAL (activated (int)),
69 69
 		  this, TQT_SLOT (slotMediaSelection (int)) );
@@ -75,7 +75,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
75 75
 	orientComboBox->insertItem(i18n("Landscape"));
76 76
 	orientComboBox->insertItem(i18n("Seascape"));
77 77
 	orientComboBox->insertItem(i18n("Upside Down"));
78
-	orientComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
78
+	orientComboBox->setFixedHeight( magComboBox->sizeHint().height() );
79 79
 
80 80
 	connect ( orientComboBox, TQT_SIGNAL (activated (int)),
81 81
 		  this, TQT_SLOT (slotOrientSelection (int)) );
@@ -85,9 +85,9 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
85 85
 
86 86
 	TQLabel* vcLabel;
87 87
 	vcLabel = new TQLabel( magComboBox, i18n("&Magnification"), vcGroupBox );
88
-	vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
89
-	if ( vcLabel->tqsizeHint().width() > labelWidth )
90
-		labelWidth = vcLabel->tqsizeHint().width();
88
+	vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
89
+	if ( vcLabel->sizeHint().width() > labelWidth )
90
+		labelWidth = vcLabel->sizeHint().width();
91 91
 	vcLabel->setMinimumWidth( labelWidth );
92 92
 
93 93
 	vcLabel->hide();
@@ -96,24 +96,24 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
96 96
 
97 97
 
98 98
 	vcLabel = new TQLabel( mediaComboBox, i18n("M&edia"), vcGroupBox );
99
-	vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
100
-	if ( vcLabel->tqsizeHint().width() > labelWidth )
101
-		labelWidth = vcLabel->tqsizeHint().width();
99
+	vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
100
+	if ( vcLabel->sizeHint().width() > labelWidth )
101
+		labelWidth = vcLabel->sizeHint().width();
102 102
 	vcLabel->setMinimumWidth( labelWidth );
103 103
 
104 104
 	grid->addWidget( vcLabel, 1, 0 );
105 105
 
106 106
 	vcLabel = new TQLabel( orientComboBox, i18n("&Orientation"), vcGroupBox );
107
-	vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
108
-	if ( vcLabel->tqsizeHint().width() > labelWidth )
109
-		labelWidth = vcLabel->tqsizeHint().width();
107
+	vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
108
+	if ( vcLabel->sizeHint().width() > labelWidth )
109
+		labelWidth = vcLabel->sizeHint().width();
110 110
 	vcLabel->setMinimumWidth( labelWidth );
111 111
 
112 112
 	grid->addWidget( vcLabel, 2, 0 );
113 113
 
114
-	vcGroupBox->setMinimumHeight( 2*orientComboBox->tqsizeHint().height()+20 );
114
+	vcGroupBox->setMinimumHeight( 2*orientComboBox->sizeHint().height()+20 );
115 115
 	vcGroupBox->setMinimumWidth(
116
-		40 + labelWidth + orientComboBox->tqsizeHint().width() );
116
+		40 + labelWidth + orientComboBox->sizeHint().width() );
117 117
 
118 118
         KSeparator* sep = new KSeparator( KSeparator::HLine, this);
119 119
 	topLayout->addWidget( sep );

+ 1
- 1
kiconedit/kcolorgrid.cpp View File

@@ -163,7 +163,7 @@ void KColorGrid::resizeEvent(TQResizeEvent *)
163 163
 }
164 164
 */
165 165
 
166
-TQSize KColorGrid::tqsizeHint() const
166
+TQSize KColorGrid::sizeHint() const
167 167
 {
168 168
   return TQSize(totalwidth, totalheight);
169 169
 }

+ 1
- 1
kiconedit/kcolorgrid.h View File

@@ -65,7 +65,7 @@ public:
65 65
 
66 66
   virtual void setCellSize( int s );
67 67
   virtual int cellSize() { return cellsize; }
68
-  virtual TQSize tqsizeHint() const;
68
+  virtual TQSize sizeHint() const;
69 69
 
70 70
   void setSize(const TQSize s) { setNumRows(s.height()); setNumCols(s.width()); }
71 71
 

+ 1
- 1
kiconedit/kiconcolors.cpp View File

@@ -43,7 +43,7 @@ void KDrawColors::paintCell( TQPainter *painter, int row, int col )
43 43
   int d = spacing();
44 44
 
45 45
   qDrawShadePanel( painter, d, d, cellSize()-d, cellSize()-d,
46
-                tqcolorGroup(), true, 1, &brush);
46
+                colorGroup(), true, 1, &brush);
47 47
   if ( row * numCols() + col == selected)
48 48
      painter->drawWinFocusRect( d+1, d+1, cellSize()-(2*d)+1, cellSize()-(2*d)+1 );
49 49
 }

+ 3
- 3
kiconedit/kiconconfig.cpp View File

@@ -49,7 +49,7 @@
49 49
 static inline TQPixmap loadIcon( const char * name )
50 50
 {
51 51
   return KGlobal::instance()->iconLoader()
52
-    ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
52
+    ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
53 53
 }
54 54
 
55 55
 KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent) 
@@ -548,8 +548,8 @@ KIconConfig::KIconConfig(TQWidget *parent)
548 548
 
549 549
   TQSize min(300, 400);
550 550
 
551
-  if (300 < tqsizeHint().width()) { min.setWidth(tqsizeHint().width()); }
552
-  if (400 < tqsizeHint().height()) { min.setHeight(tqsizeHint().height()); }
551
+  if (300 < sizeHint().width()) { min.setWidth(sizeHint().width()); }
552
+  if (400 < sizeHint().height()) { min.setHeight(sizeHint().height()); }
553 553
 
554 554
   resize(min);
555 555
 }

+ 2
- 2
kiconedit/kiconedit.cpp View File

@@ -222,10 +222,10 @@ void KIconEdit::writeConfig()
222 222
     saveMainWindowSettings( config, "MainWindowSettings" );
223 223
 }
224 224
 
225
-TQSize KIconEdit::tqsizeHint() const
225
+TQSize KIconEdit::sizeHint() const
226 226
 {
227 227
     if(gridview)
228
-        return gridview->tqsizeHint();
228
+        return gridview->sizeHint();
229 229
     else
230 230
         return TQSize(-1, -1);
231 231
 }

+ 1
- 1
kiconedit/kiconedit.h View File

@@ -65,7 +65,7 @@ public:
65 65
   KIconEdit( const TQImage image, const char *name = "kiconedit");
66 66
   ~KIconEdit();
67 67
 
68
-  virtual TQSize tqsizeHint() const;
68
+  virtual TQSize sizeHint() const;
69 69
   static WindowList windowList;
70 70
 
71 71
 signals:

+ 1
- 1
kiconedit/kicongrid.cpp View File

@@ -1035,7 +1035,7 @@ void KIconEditGrid::load( TQImage *image)
1035 1035
             setColor((y*numCols())+x, *l, false);
1036 1036
         }
1037 1037
         //kdDebug(4640) << "Row: " << y << endl;
1038
-        kapp->tqprocessEvents(200);
1038
+        kapp->processEvents(200);
1039 1039
     }
1040 1040
 
1041 1041
     updateColors();

+ 1
- 1
kiconedit/knew.cpp View File

@@ -173,7 +173,7 @@ NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent )
173 173
   l->addWidget( rbtempl, 1 );
174 174
   //l->addWidget(rbtempl, 5, AlignLeft);
175 175
   
176
-  //grp->setMinimumSize(grp->tqchildrenRect().size());
176
+  //grp->setMinimumSize(grp->childrenRect().size());
177 177
   
178 178
   grp->setButton( 0 );
179 179
 }

+ 2
- 2
kiconedit/palettetoolbar.cpp View File

@@ -42,7 +42,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
42 42
   m_lblPreview = new TQLabel( base );
43 43
   m_lblPreview->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
44 44
   m_lblPreview->setFixedHeight( 64 );
45
-  m_lblPreview->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
45
+  m_lblPreview->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
46 46
   TQWhatsThis::add(m_lblPreview, i18n( "Preview\n\nThis is a 1:1 preview"
47 47
       " of the current icon" ) );
48 48
   m_layout->addWidget( m_lblPreview );
@@ -50,7 +50,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
50 50
   m_currentColorView = new TQLabel( base );
51 51
   m_currentColorView->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
52 52
   m_currentColorView->setFixedHeight( 24 );
53
-  m_currentColorView->tqsetAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
53
+  m_currentColorView->setAlignment( TQt::AlignHCenter|TQt::AlignVCenter );
54 54
   TQWhatsThis::add(m_currentColorView, i18n( "Current color\n\nThis is the currently selected color" ) );
55 55
   m_layout->addWidget( m_currentColorView );
56 56
 

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

@@ -49,8 +49,8 @@ protected:
49 49
     virtual void viewportResizeEvent(TQResizeEvent* ev)
50 50
     {
51 51
       TQScrollView::viewportResizeEvent(ev);
52
-      m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()),
53
-                       kMax(m_frame->tqsizeHint().height(), ev->size().height()));
52
+      m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()),
53
+                       kMax(m_frame->sizeHint().height(), ev->size().height()));
54 54
     };
55 55
 
56 56
 private:
@@ -106,7 +106,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
106 106
     mainLayout->activate();
107 107
     algoHLayout->move( groupBox->x() + 10, groupBox->y() - 12 );
108 108
     
109
-    box->setMinimumWidth( algoHLayout->tqsizeHint().width() + 
109
+    box->setMinimumWidth( algoHLayout->sizeHint().width() + 
110 110
                           4 * KDialog::spacingHint() );
111 111
 }
112 112
 

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

@@ -78,7 +78,7 @@ void IndexCleaner::startNext()
78 78
     if ( index != -1 )
79 79
         cmd.replace( index, 2, TQUOTE( dir ) );
80 80
     else // no %d? What else can we do?
81
-        cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) );
81
+        cmd.append( TQString::fromLatin1(" ") + TQUOTE( dir ) );
82 82
 
83 83
     *m_process << cmd;
84 84
 

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

@@ -86,9 +86,9 @@ void KCMKMrml::checkGiftInstallation()
86 86
         KMessageBox::error( this, errorMessage );
87 87
         m_mainPage->hide();
88 88
         TQLabel *errorLabel = new TQLabel( errorMessage, this );
89
-        errorLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
89
+        errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
90 90
         KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this ); 
91
-        urlLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
91
+        urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
92 92
         connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) );
93 93
         TQLayout *l = tqlayout();
94 94
         l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );

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

@@ -186,7 +186,7 @@ TQStringList MainPage::difference( const TQStringList& oldIndexDirs,
186 186
 {
187 187
     TQStringList result;
188 188
 
189
-    TQString slash = TQString::tqfromLatin1("/");
189
+    TQString slash = TQString::fromLatin1("/");
190 190
     TQStringList::ConstIterator oldIt = oldIndexDirs.begin();
191 191
     TQString oldDir, newDir;
192 192
 

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

@@ -135,7 +135,7 @@
135 135
                             <property name="sizeType">
136 136
                                 <enum>Expanding</enum>
137 137
                             </property>
138
-                            <property name="tqsizeHint">
138
+                            <property name="sizeHint">
139 139
                                 <size>
140 140
                                     <width>200</width>
141 141
                                     <height>0</height>
@@ -200,7 +200,7 @@
200 200
                     <property name="sizeType">
201 201
                         <enum>Fixed</enum>
202 202
                     </property>
203
-                    <property name="tqsizeHint">
203
+                    <property name="sizeHint">
204 204
                         <size>
205 205
                             <width>16</width>
206 206
                             <height>16</height>

+ 1
- 1
kmrml/kmrml/lib/kmrml_config.cpp View File

@@ -104,7 +104,7 @@ bool Config::sync()
104 104
 void Config::setDefaultHost( const TQString& host )
105 105
 {
106 106
     m_defaultHost = host.isEmpty() ?
107
-                    TQString::tqfromLatin1(DEFAULT_HOST) : host;
107
+                    TQString::fromLatin1(DEFAULT_HOST) : host;
108 108
 
109 109
     m_config->setGroup( CONFIG_GROUP );
110 110
     m_config->writeEntry( "Default Host", m_defaultHost );

+ 1
- 1
kmrml/kmrml/lib/kmrml_config.h View File

@@ -108,7 +108,7 @@ namespace KMrml
108 108
 
109 109
         TQString settingsGroup( const TQString& host ) const
110 110
         {
111
-            return TQString::tqfromLatin1( "SettingsFor: " ).append( host );
111
+            return TQString::fromLatin1( "SettingsFor: " ).append( host );
112 112
         }
113 113
 
114 114
         bool m_serverStartedIndividually;

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

@@ -153,13 +153,13 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
153 153
 
154 154
     m_algoButton = new TQPushButton( TQString(), m_panel );
155 155
     m_algoButton->setPixmap( SmallIcon("configure") );
156
-    m_algoButton->setFixedSize( m_algoButton->tqsizeHint() );
156
+    m_algoButton->setFixedSize( m_algoButton->sizeHint() );
157 157
     connect( m_algoButton, TQT_SIGNAL( clicked() ),
158 158
              TQT_SLOT( slotConfigureAlgorithm() ));
159 159
     TQToolTip::add( m_algoButton, i18n("Configure algorithm") );
160 160
 
161 161
     TQWidget *spacer = new TQWidget( m_panel );
162
-    spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
162
+    spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
163 163
                                         TQSizePolicy::Minimum ) );
164 164
 
165 165
     int resultSize = config->readNumEntry( "Result-size", 20 );
@@ -172,7 +172,7 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
172 172
 
173 173
     m_startButton = new TQPushButton( TQString(), tmp );
174 174
     connect( m_startButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStartClicked() ));
175
-    settqStatus( NeedCollection );
175
+    setStatus( NeedCollection );
176 176
 
177 177
     setWidget( box );
178 178
 
@@ -206,7 +206,7 @@ void MrmlPart::initCollections( const TQDomElement& elem )
206 206
         KMessageBox::information( widget(),
207 207
                                i18n("There is no image collection available\n"
208 208
                                     "at %1.\n"), i18n("No Image Collection"));
209
-        settqStatus( NeedCollection );
209
+        setStatus( NeedCollection );
210 210
     }
211 211
     else
212 212
         m_collectionCombo->updateGeometry(); // adjust the entire grid
@@ -229,7 +229,7 @@ bool MrmlPart::openURL( const KURL& url )
229 229
 
230 230
     m_url = url;
231 231
     TQString host = url.host().isEmpty() ?
232
-                   TQString::tqfromLatin1("localhost") : url.host();
232
+                   TQString::fromLatin1("localhost") : url.host();
233 233
 
234 234
     m_hostCombo->setCurrentItem( host );
235 235
 
@@ -285,8 +285,8 @@ bool MrmlPart::openURL( const KURL& url )
285 285
                  == KMessageBox::Yes )
286 286
             {
287 287
                 KApplication::tdeinitExec( "kcmshell",
288
-                                           TQString::tqfromLatin1("kcmkmrml"));
289
-                settqStatus( NeedCollection );
288
+                                           TQString::fromLatin1("kcmkmrml"));
289
+                setStatus( NeedCollection );
290 290
                 return false;
291 291
             }
292 292
         }
@@ -308,7 +308,7 @@ void MrmlPart::contactServer( const KURL& url )
308 308
     m_job->addMetaData( MrmlShared::kio_task(), MrmlShared::kio_initialize() );
309 309
 
310 310
     TQString host = url.host().isEmpty() ?
311
-                   TQString::tqfromLatin1("localhost") : url.host();
311
+                   TQString::fromLatin1("localhost") : url.host();
312 312
 
313 313
     slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host ));
314 314
 }
@@ -376,7 +376,7 @@ bool MrmlPart::closeURL()
376 376
         m_job = 0L;
377 377
     }
378 378
 
379
-    settqStatus( NeedCollection );
379
+    setStatus( NeedCollection );
380 380
 
381 381
     return true;
382 382
 }
@@ -400,7 +400,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
400 400
 
401 401
     emit started( job );
402 402
     emit setWindowCaption( url.prettyURL() );
403
-    settqStatus( InProgress );
403
+    setStatus( InProgress );
404 404
 
405 405
     return job;
406 406
 }
@@ -423,7 +423,7 @@ void MrmlPart::slotResult( KIO::Job *job )
423 423
     bool auto_random = m_view->isEmpty() && m_queryList.isEmpty();
424 424
     m_random->setChecked( auto_random );
425 425
     m_random->setEnabled( !auto_random );
426
-    settqStatus( job->error() ? NeedCollection : CanSearch );
426
+    setStatus( job->error() ? NeedCollection : CanSearch );
427 427
 
428 428
     if ( !job->error() && !m_queryList.isEmpty() ) {
429 429
         // we have a connection and we got a list of relevant URLs to query for
@@ -776,7 +776,7 @@ void MrmlPart::slotHostComboActivated( const TQString& host )
776 776
     openURL( settings.getUrl() );
777 777
 }
778 778
 
779
-void MrmlPart::settqStatus( tqStatus status )
779
+void MrmlPart::setStatus( Status status )
780 780
 {
781 781
     switch ( status )
782 782
     {

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

@@ -57,7 +57,7 @@ class MrmlPart : public KParts::ReadOnlyPart
57 57
   TQ_OBJECT
58 58
 
59 59
 public:
60
-    enum tqStatus { NeedCollection, CanSearch, InProgress };
60
+    enum Status { NeedCollection, CanSearch, InProgress };
61 61
 
62 62
     MrmlPart( TQWidget *parentWidget, const char *widgetName,
63 63
               TQObject *parent, const char *name, const TQStringList& args );
@@ -116,7 +116,7 @@ private:
116 116
     void initHostCombo();
117 117
     void enableServerDependentWidgets( bool enable );
118 118
 
119
-    void settqStatus( tqStatus status );
119
+    void setStatus( Status status );
120 120
 
121 121
     void contactServer( const KURL& url );
122 122
     void downloadReferenceFiles( const KURL::List& downloadList );
@@ -143,7 +143,7 @@ private:
143 143
     CollectionList m_collections;
144 144
     AlgorithmList m_algorithms;
145 145
 
146
-    tqStatus m_status;
146
+    Status m_status;
147 147
     static uint s_sessionId;
148 148
 
149 149
 };

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

@@ -57,7 +57,7 @@ MrmlView::MrmlView( TQWidget *parent, const char *name )
57 57
     // query result image
58 58
     TQLabel l( i18n( "No thumbnail available" ), 0L );
59 59
     l.setFixedSize( 80, 80 );
60
-    l.tqsetAlignment( WordBreak | AlignCenter );
60
+    l.setAlignment( WordBreak | AlignCenter );
61 61
 //     l.setFrameStyle( TQLabel::Box | TQLabel::Plain );
62 62
 //     l.setLineWidth( 1 );
63 63
     l.setPaletteBackgroundColor( TQt::white );
@@ -176,7 +176,7 @@ void MrmlView::slotLayout()
176 176
     TQPtrListIterator<MrmlViewItem> it( m_items );
177 177
 
178 178
     for ( ; it.current(); ++it ) {
179
-        itemWidth = TQMAX( itemWidth, it.current()->tqsizeHint().width() );
179
+        itemWidth = TQMAX( itemWidth, it.current()->sizeHint().width() );
180 180
     }
181 181
 
182 182
     if ( itemWidth == 0 )
@@ -202,7 +202,7 @@ void MrmlView::slotLayout()
202 202
         if ( item == 0 )
203 203
             rowIt = it;
204 204
 
205
-        rowHeight = TQMAX( rowHeight, it.current()->tqsizeHint().height() );
205
+        rowHeight = TQMAX( rowHeight, it.current()->sizeHint().height() );
206 206
         addChild( it.current(), margin + item * itemWidth, y );
207 207
         it.current()->show();
208 208
 
@@ -306,11 +306,11 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL,
306 306
 
307 307
     /*
308 308
     if ( similarity > -1 )
309
-        TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1<br>%1</qt>")
309
+        TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>")
310 310
                        .tqarg( url )
311 311
                        .tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity))));
312 312
     else
313
-        TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1</qt>").tqarg( url ) );
313
+        TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").tqarg( url ) );
314 314
     */
315 315
 
316 316
     setMinimumSize( 130, 130 ); // ###
@@ -342,14 +342,14 @@ void MrmlViewItem::paintEvent( TQPaintEvent *e )
342 342
 
343 343
     if ( m_similarity >= 0 ) {
344 344
         TQPainter p( this );
345
-        TQPen pen( tqcolorGroup().highlight(), 1, TQPen::SolidLine );
345
+        TQPen pen( colorGroup().highlight(), 1, TQPen::SolidLine );
346 346
         p.setPen( pen );
347 347
         int x = margin;
348 348
         int y = m_combo->y() - similarityHeight - 2;
349 349
         int w = (int) (similarityFullWidth * m_similarity);
350 350
         int h = similarityHeight;
351 351
         p.drawRect( x, y, similarityFullWidth, h );
352
-        p.fillRect( x, y, w, h, tqcolorGroup().highlight() );
352
+        p.fillRect( x, y, w, h, colorGroup().highlight() );
353 353
     }
354 354
 }
355 355
 
@@ -361,7 +361,7 @@ void MrmlViewItem::resizeEvent( TQResizeEvent *e )
361 361
     m_combo->move( width()/2 - m_combo->width()/2, y );
362 362
 }
363 363
 
364
-TQSize MrmlViewItem::tqsizeHint() const
364
+TQSize MrmlViewItem::sizeHint() const
365 365
 {
366 366
     int w = TQMAX( TQMAX(minimumHeight(), m_combo->width()), m_pixmap.width() );
367 367
     w += 2 * margin;

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

@@ -126,7 +126,7 @@ public:
126 126
 
127 127
     void setSimilarity( double value );
128 128
 
129
-    virtual TQSize tqsizeHint() const;
129
+    virtual TQSize sizeHint() const;
130 130
 
131 131
     const KURL& url() const { return m_url; }
132 132
     const KURL& thumbURL() const { return m_thumbURL; }

+ 2
- 2
kolourpaint/kpcommandhistory.cpp View File

@@ -257,13 +257,13 @@ kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig,
257 257
     : d (new kpCommandHistoryBasePrivate ())
258 258
 {
259 259
     m_actionUndo = new KToolBarPopupAction (undoActionText (),
260
-        TQString::tqfromLatin1 ("undo"),
260
+        TQString::fromLatin1 ("undo"),
261 261
         KStdAccel::shortcut (KStdAccel::Undo),
262 262
         this, TQT_SLOT (undo ()),
263 263
         ac, KStdAction::name (KStdAction::Undo));
264 264
 
265 265
     m_actionRedo = new KToolBarPopupAction (redoActionText (),
266
-        TQString::tqfromLatin1 ("redo"),
266
+        TQString::fromLatin1 ("redo"),
267 267
         KStdAccel::shortcut (KStdAccel::Redo),
268 268
         this, TQT_SLOT (redo ()),
269 269
         ac, KStdAction::name (KStdAction::Redo));

+ 48
- 48
kolourpaint/kpdefs.h View File

@@ -65,71 +65,71 @@
65 65
 // Settings
66 66
 //
67 67
 
68
-#define kpSettingsGroupGeneral TQString::tqfromLatin1 ("General Settings")
69
-#define kpSettingFirstTime TQString::tqfromLatin1 ("First Time")
70
-#define kpSettingShowGrid TQString::tqfromLatin1 ("Show Grid")
71
-#define kpSettingShowPath TQString::tqfromLatin1 ("Show Path")
72
-#define kpSettingColorSimilarity TQString::tqfromLatin1 ("Color Similarity")
73
-#define kpSettingDitherOnOpen TQString::tqfromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than")
74
-#define kpSettingPrintImageCenteredOnPage TQString::tqfromLatin1 ("Print Image Centered On Page")
68
+#define kpSettingsGroupGeneral TQString::fromLatin1 ("General Settings")
69
+#define kpSettingFirstTime TQString::fromLatin1 ("First Time")
70
+#define kpSettingShowGrid TQString::fromLatin1 ("Show Grid")
71
+#define kpSettingShowPath TQString::fromLatin1 ("Show Path")
72
+#define kpSettingColorSimilarity TQString::fromLatin1 ("Color Similarity")
73
+#define kpSettingDitherOnOpen TQString::fromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than")
74
+#define kpSettingPrintImageCenteredOnPage TQString::fromLatin1 ("Print Image Centered On Page")
75 75
 
76
-#define kpSettingsGroupFileSaveAs TQString::tqfromLatin1 ("File/Save As")
77
-#define kpSettingsGroupFileExport TQString::tqfromLatin1 ("File/Export")
78
-#define kpSettingsGroupEditCopyTo TQString::tqfromLatin1 ("Edit/Copy To")
76
+#define kpSettingsGroupFileSaveAs TQString::fromLatin1 ("File/Save As")
77
+#define kpSettingsGroupFileExport TQString::fromLatin1 ("File/Export")
78
+#define kpSettingsGroupEditCopyTo TQString::fromLatin1 ("Edit/Copy To")
79 79
 
80
-#define kpSettingForcedMimeType TQString::tqfromLatin1 ("Forced MimeType")
81
-#define kpSettingForcedColorDepth TQString::tqfromLatin1 ("Forced Color Depth")
82
-#define kpSettingForcedDither TQString::tqfromLatin1 ("Forced Dither")
83
-#define kpSettingForcedQuality TQString::tqfromLatin1 ("Forced Quality")
80
+#define kpSettingForcedMimeType TQString::fromLatin1 ("Forced MimeType")
81
+#define kpSettingForcedColorDepth TQString::fromLatin1 ("Forced Color Depth")
82
+#define kpSettingForcedDither TQString::fromLatin1 ("Forced Dither")
83
+#define kpSettingForcedQuality TQString::fromLatin1 ("Forced Quality")
84 84
 
85
-#define kpSettingLastDocSize TQString::tqfromLatin1 ("Last Document Size")
85
+#define kpSettingLastDocSize TQString::fromLatin1 ("Last Document Size")
86 86
 
87
-#define kpSettingMoreEffectsLastEffect TQString::tqfromLatin1 ("More Effects - Last Effect")
87
+#define kpSettingMoreEffectsLastEffect TQString::fromLatin1 ("More Effects - Last Effect")
88 88
 
89
-#define kpSettingResizeScaleLastKeepAspect TQString::tqfromLatin1 ("Resize Scale - Last Keep Aspect")
89
+#define kpSettingResizeScaleLastKeepAspect TQString::fromLatin1 ("Resize Scale - Last Keep Aspect")
90 90
 
91 91
 
92
-#define kpSettingsGroupMimeTypeProperties TQString::tqfromLatin1 ("MimeType Properties Version 1.2-2")
93
-#define kpSettingMimeTypeMaximumColorDepth TQString::tqfromLatin1 ("Maximum Color Depth")
94
-#define kpSettingMimeTypeHasConfigurableColorDepth TQString::tqfromLatin1 ("Configurable Color Depth")
95
-#define kpSettingMimeTypeHasConfigurableQuality TQString::tqfromLatin1 ("Configurable Quality Setting")
92
+#define kpSettingsGroupMimeTypeProperties TQString::fromLatin1 ("MimeType Properties Version 1.2-2")
93
+#define kpSettingMimeTypeMaximumColorDepth TQString::fromLatin1 ("Maximum Color Depth")
94
+#define kpSettingMimeTypeHasConfigurableColorDepth TQString::fromLatin1 ("Configurable Color Depth")
95
+#define kpSettingMimeTypeHasConfigurableQuality TQString::fromLatin1 ("Configurable Quality Setting")
96 96
 
97 97
 
98
-#define kpSettingsGroupUndoRedo TQString::tqfromLatin1 ("Undo/Redo Settings")
99
-#define kpSettingUndoMinLimit TQString::tqfromLatin1 ("Min Limit")
100
-#define kpSettingUndoMaxLimit TQString::tqfromLatin1 ("Max Limit")
101
-#define kpSettingUndoMaxLimitSizeLimit TQString::tqfromLatin1 ("Max Limit Size Limit")
98
+#define kpSettingsGroupUndoRedo TQString::fromLatin1 ("Undo/Redo Settings")
99
+#define kpSettingUndoMinLimit TQString::fromLatin1 ("Min Limit")
100
+#define kpSettingUndoMaxLimit TQString::fromLatin1 ("Max Limit")
101
+#define kpSettingUndoMaxLimitSizeLimit TQString::fromLatin1 ("Max Limit Size Limit")
102 102
 
103 103
 
104
-#define kpSettingsGroupThumbnail TQString::tqfromLatin1 ("Thumbnail Settings")
105
-#define kpSettingThumbnailShown TQString::tqfromLatin1 ("Shown")
106
-#define kpSettingThumbnailGeometry TQString::tqfromLatin1 ("Geometry")
107
-#define kpSettingThumbnailZoomed TQString::tqfromLatin1 ("Zoomed")
108
-#define kpSettingThumbnailShowRectangle TQString::tqfromLatin1 ("ShowRectangle")
104
+#define kpSettingsGroupThumbnail TQString::fromLatin1 ("Thumbnail Settings")
105
+#define kpSettingThumbnailShown TQString::fromLatin1 ("Shown")
106
+#define kpSettingThumbnailGeometry TQString::fromLatin1 ("Geometry")
107
+#define kpSettingThumbnailZoomed TQString::fromLatin1 ("Zoomed")
108
+#define kpSettingThumbnailShowRectangle TQString::fromLatin1 ("ShowRectangle")
109 109
 
110 110
 
111
-#define kpSettingsGroupPreviewSave TQString::tqfromLatin1 ("Save Preview Settings")
112
-#define kpSettingPreviewSaveGeometry TQString::tqfromLatin1 ("Geometry")
113
-#define kpSettingPreviewSaveUpdateDelay TQString::tqfromLatin1 ("Update Delay")
111
+#define kpSettingsGroupPreviewSave TQString::fromLatin1 ("Save Preview Settings")
112
+#define kpSettingPreviewSaveGeometry TQString::fromLatin1 ("Geometry")
113
+#define kpSettingPreviewSaveUpdateDelay TQString::fromLatin1 ("Update Delay")
114 114
 
115 115
 
116
-#define kpSettingsGroupTools TQString::tqfromLatin1 ("Tool Settings")
117
-#define kpSettingLastTool TQString::tqfromLatin1 ("Last Used Tool")
118
-#define kpSettingToolBoxIconSize TQString::tqfromLatin1 ("Tool Box Icon Size")
116
+#define kpSettingsGroupTools TQString::fromLatin1 ("Tool Settings")
117
+#define kpSettingLastTool TQString::fromLatin1 ("Last Used Tool")
118
+#define kpSettingToolBoxIconSize TQString::fromLatin1 ("Tool Box Icon Size")
119 119
 
120 120
 
121
-#define kpSettingsGroupText TQString::tqfromLatin1 ("Text Settings")
122
-#define kpSettingFontFamily TQString::tqfromLatin1 ("Font Family")
123
-#define kpSettingFontSize TQString::tqfromLatin1 ("Font Size")
124
-#define kpSettingBold TQString::tqfromLatin1 ("Bold")
125
-#define kpSettingItalic TQString::tqfromLatin1 ("Italic")
126
-#define kpSettingUnderline TQString::tqfromLatin1 ("Underline")
127
-#define kpSettingStrikeThru TQString::tqfromLatin1 ("Strike Thru")
121
+#define kpSettingsGroupText TQString::fromLatin1 ("Text Settings")
122
+#define kpSettingFontFamily TQString::fromLatin1 ("Font Family")
123
+#define kpSettingFontSize TQString::fromLatin1 ("Font Size")
124
+#define kpSettingBold TQString::fromLatin1 ("Bold")
125
+#define kpSettingItalic TQString::fromLatin1 ("Italic")
126
+#define kpSettingUnderline TQString::fromLatin1 ("Underline")
127
+#define kpSettingStrikeThru TQString::fromLatin1 ("Strike Thru")
128 128
 
129 129
 
130
-#define kpSettingsGroupFlattenEffect TQString::tqfromLatin1 ("Flatten Effect Settings")
131
-#define kpSettingFlattenEffectColor1 TQString::tqfromLatin1 ("Color1")
132
-#define kpSettingFlattenEffectColor2 TQString::tqfromLatin1 ("Color2")
130
+#define kpSettingsGroupFlattenEffect TQString::fromLatin1 ("Flatten Effect Settings")
131
+#define kpSettingFlattenEffectColor1 TQString::fromLatin1 ("Color1")
132
+#define kpSettingFlattenEffectColor2 TQString::fromLatin1 ("Color2")
133 133
 
134 134
 
135 135
 //
@@ -140,11 +140,11 @@
140 140
 //
141 141
 // This key only exists if the document does.  If it exists, it can be empty.
142 142
 // The URL need not point to a file that exists e.g. "kolourpaint doesnotexist.png".
143
-#define kpSessionSettingDocumentUrl TQString::tqfromLatin1 ("Session Document Url")
143
+#define kpSessionSettingDocumentUrl TQString::fromLatin1 ("Session Document Url")
144 144
 
145 145
 // The size of a document which is not from a URL e.g. "kolourpaint doesnotexist.png".
146 146
 // This key does not exist for documents from URLs.
147
-#define kpSessionSettingNotFromUrlDocumentSize TQString::tqfromLatin1 ("Session Not-From-Url Document Size")
147
+#define kpSessionSettingNotFromUrlDocumentSize TQString::fromLatin1 ("Session Not-From-Url Document Size")
148 148
 
149 149
 
150 150
 #endif  // __kp_defs_h__

+ 5
- 5
kolourpaint/kpdocument.cpp View File

@@ -156,7 +156,7 @@ TQPixmap kpDocument::convertToPixmapAsLosslessAsPossible (
156 156
         metaInfo->setDotsPerMeterY (image.dotsPerMeterY ());
157 157
         metaInfo->setOffset (image.offset ());
158 158
 
159
-        TQValueList <TQImageTextKeyLang> keyList = image.tqtextList ();
159
+        TQValueList <TQImageTextKeyLang> keyList = image.textList ();
160 160
         for (TQValueList <TQImageTextKeyLang>::const_iterator it = keyList.begin ();
161 161
              it != keyList.end ();
162 162
              it++)
@@ -475,7 +475,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
475 475
                 //       low maximum colour depth
476 476
                 i18n ("Lossy File Format"),
477 477
                 KStdGuiItem::save (),
478
-                TQString::tqfromLatin1 ("SaveInLossyMimeTypeDontAskAgain")));
478
+                TQString::fromLatin1 ("SaveInLossyMimeTypeDontAskAgain")));
479 479
     }
480 480
     else if (lossyType & kpDocumentSaveOptions::ColorDepthLow)
481 481
     {
@@ -490,7 +490,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
490 490
                     .arg (saveOptions.colorDepth ()),
491 491
                 i18n ("Low Color Depth"),
492 492
                 KStdGuiItem::save (),
493
-                TQString::tqfromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
493
+                TQString::fromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
494 494
     }
495 495
 #undef TQUIT_IF_CANCEL
496 496
 
@@ -628,8 +628,8 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
628 628
                << ",overwritePrompt=" << overwritePrompt
629 629
                << ",lossyPrompt=" << lossyPrompt
630 630
                << ")" << endl;
631
-    saveOptions.printDebug (TQString::tqfromLatin1 ("\tsaveOptions"));
632
-    metaInfo.printDebug (TQString::tqfromLatin1 ("\tmetaInfo"));
631
+    saveOptions.printDebug (TQString::fromLatin1 ("\tsaveOptions"));
632
+    metaInfo.printDebug (TQString::fromLatin1 ("\tmetaInfo"));
633 633
 #endif
634 634
 
635 635
     if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, parent))

+ 1
- 1
kolourpaint/kpdocumentmetainfo.cpp View File

@@ -82,7 +82,7 @@ kpDocumentMetaInfo &kpDocumentMetaInfo::operator= (const kpDocumentMetaInfo &rhs
82 82
 void kpDocumentMetaInfo::printDebug (const TQString &prefix) const
83 83
 {
84 84
     const TQString usedPrefix = !prefix.isEmpty () ?
85
-                                   prefix + TQString::tqfromLatin1 (":") :
85
+                                   prefix + TQString::fromLatin1 (":") :
86 86
                                    TQString();
87 87
 
88 88
     kdDebug () << usedPrefix << endl;

+ 14
- 14
kolourpaint/kpdocumentsaveoptions.cpp View File

@@ -114,7 +114,7 @@ kpDocumentSaveOptions &kpDocumentSaveOptions::operator= (const kpDocumentSaveOpt
114 114
 void kpDocumentSaveOptions::printDebug (const TQString &prefix) const
115 115
 {
116 116
     const TQString usedPrefix = !prefix.isEmpty () ?
117
-                                   prefix + TQString::tqfromLatin1 (": ") :
117
+                                   prefix + TQString::fromLatin1 (": ") :
118 118
                                    TQString();
119 119
 
120 120
     kdDebug () << usedPrefix
@@ -246,7 +246,7 @@ bool kpDocumentSaveOptions::qualityIsInvalid () const
246 246
 TQString kpDocumentSaveOptions::defaultMimeType (KConfigBase *config)
247 247
 {
248 248
     return config->readEntry (kpSettingForcedMimeType,
249
-                              TQString::tqfromLatin1 ("image/png"));
249
+                              TQString::fromLatin1 ("image/png"));
250 250
 }
251 251
 
252 252
 // public static
@@ -445,19 +445,19 @@ int kpDocumentSaveOptions::mimeTypeMaximumColorDepth (const TQString &mimeType)
445 445
     // SYNC: update mime info here
446 446
     
447 447
     // Greyscale actually (unenforced since depth not set to configurable)
448
-    defaultList << TQString::tqfromLatin1 ("image/x-eps:32");
448
+    defaultList << TQString::fromLatin1 ("image/x-eps:32");
449 449
     
450
-    defaultList << TQString::tqfromLatin1 ("image/x-portable-bitmap:1");
450
+    defaultList << TQString::fromLatin1 ("image/x-portable-bitmap:1");
451 451
     
452 452
     // Greyscale actually (unenforced since depth not set to configurable)
453
-    defaultList << TQString::tqfromLatin1 ("image/x-portable-greymap:8");
453
+    defaultList << TQString::fromLatin1 ("image/x-portable-greymap:8");
454 454
     
455
-    defaultList << TQString::tqfromLatin1 ("image/x-xbm:1");
455
+    defaultList << TQString::fromLatin1 ("image/x-xbm:1");
456 456
 
457 457
     const TQStringList mimeTypeList = mimeTypesSupportingProperty (
458 458
         kpSettingMimeTypeMaximumColorDepth, defaultList);
459 459
 
460
-    const TQString mimeTypeColon = mimeType + TQString::tqfromLatin1 (":");
460
+    const TQString mimeTypeColon = mimeType + TQString::fromLatin1 (":");
461 461
     for (TQStringList::const_iterator it = mimeTypeList.begin ();
462 462
          it != mimeTypeList.end ();
463 463
          it++)
@@ -488,16 +488,16 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableColorDepth (const TQString &m
488 488
     TQStringList defaultMimeTypes;
489 489
 
490 490
     // SYNC: update mime info here
491
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/png");
492
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-bmp");
493
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-pcx");
491
+    defaultMimeTypes << TQString::fromLatin1 ("image/png");
492
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-bmp");
493
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-pcx");
494 494
     
495 495
     // TODO: Only 1, 24 not 8; TQt only sees 32 but "file" cmd realises
496 496
     //       it's either 1 or 24.
497
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-rgb");
497
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-rgb");
498 498
   
499 499
     // TODO: Only 8 and 24 - no 1.
500
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-xpm");
500
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-xpm");
501 501
 
502 502
     return mimeTypeSupportsProperty (mimeType,
503 503
         kpSettingMimeTypeHasConfigurableColorDepth,
@@ -517,8 +517,8 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableQuality (const TQString &mime
517 517
     TQStringList defaultMimeTypes;
518 518
 
519 519
     // SYNC: update mime info here
520
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/jp2");
521
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/jpeg");
520
+    defaultMimeTypes << TQString::fromLatin1 ("image/jp2");
521
+    defaultMimeTypes << TQString::fromLatin1 ("image/jpeg");
522 522
 
523 523
     return mimeTypeSupportsProperty (mimeType,
524 524
         kpSettingMimeTypeHasConfigurableQuality,

+ 1
- 1
kolourpaint/kpmainwindow.cpp View File

@@ -731,7 +731,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
731 731
         connect (m_document, TQT_SIGNAL (selectionIsTextChanged (bool)),
732 732
                  this, TQT_SLOT (slotImageMenuUpdateDueToSelection ()));
733 733
 
734
-        // tqStatus bar
734
+        // Status bar
735 735
         connect (m_document, TQT_SIGNAL (documentOpened ()),
736 736
                  this, TQT_SLOT (recalculateStatusBar ()));
737 737
 

+ 1
- 1
kolourpaint/kpmainwindow.h View File

@@ -640,7 +640,7 @@ private slots:
640 640
 
641 641
 
642 642
     /*
643
-     * tqStatus Bar
643
+     * Status Bar
644 644
      */
645 645
 
646 646
 private:

+ 1
- 1
kolourpaint/kpmainwindow_settings.cpp View File

@@ -195,7 +195,7 @@ void kpMainWindow::slotNewToolBarConfig ()
195 195
     KMessageBox::information (this,
196 196
         i18n ("You have to restart KolourPaint for these changes to take effect."),
197 197
         i18n ("Toolbar Settings Changed"),
198
-        TQString::tqfromLatin1 ("ToolBarSettingsChanged"));
198
+        TQString::fromLatin1 ("ToolBarSettingsChanged"));
199 199
 
200 200
     //createGUI();
201 201
     //applyMainWindowSettings (kapp->config (), autoSaveGroup ());

+ 1
- 1
kolourpaint/kpmainwindow_text.cpp View File

@@ -80,7 +80,7 @@ void kpMainWindow::readAndApplyTextSettings ()
80 80
     KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
81 81
     KConfigBase *cfg = cfgGroupSaver.config ();
82 82
 
83
-    m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::tqfromLatin1 ("Times")));
83
+    m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::fromLatin1 ("Times")));
84 84
     m_actionTextFontSize->setFontSize (cfg->readNumEntry (kpSettingFontSize, 14));
85 85
     m_actionTextBold->setChecked (cfg->readBoolEntry (kpSettingBold, false));
86 86
     m_actionTextItalic->setChecked (cfg->readBoolEntry (kpSettingItalic, false));

+ 1
- 1
kolourpaint/kpmainwindow_view.cpp View File

@@ -289,7 +289,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor)
289 289
             // Ordinary flicker is better than the whole view moving
290 290
             TQPainter p (m_mainView);
291 291
             p.fillRect (m_mainView->rect (),
292
-                        m_scrollView->viewport ()->tqcolorGroup ().background ());
292
+                        m_scrollView->viewport ()->colorGroup ().background ());
293 293
         }
294 294
     }
295 295
 

+ 5
- 5
kolourpaint/kpselection.cpp View File

@@ -373,7 +373,7 @@ TQBitmap kpSelection::maskForOwnType (bool nullForRectangular) const
373 373
         points.detach ();
374 374
         points.translate (-m_rect.x (), -m_rect.y ());
375 375
 
376
-        painter.tqdrawPolygon (points, false/*even-odd algo*/);
376
+        painter.drawPolygon (points, false/*even-odd algo*/);
377 377
     }
378 378
 
379 379
     painter.end ();
@@ -921,7 +921,7 @@ TQString kpSelection::textForTextLines (const TQValueVector <TQString> &textLine
921 921
          it != textLines_.end ();
922 922
          it++)
923 923
     {
924
-        bigString += TQString::tqfromLatin1 ("\n");
924
+        bigString += TQString::fromLatin1 ("\n");
925 925
         bigString += (*it);
926 926
     }
927 927
 
@@ -1049,7 +1049,7 @@ int kpSelection::minimumHeightForTextStyle (const kpTextStyle &)
1049 1049
 }
1050 1050
 
1051 1051
 // public static
1052
-TQSize kpSelection::tqminimumSizeForTextStyle (const kpTextStyle &textStyle)
1052
+TQSize kpSelection::minimumSizeForTextStyle (const kpTextStyle &textStyle)
1053 1053
 {
1054 1054
     return TQSize (minimumWidthForTextStyle (textStyle),
1055 1055
                   minimumHeightForTextStyle (textStyle));
@@ -1061,7 +1061,7 @@ int kpSelection::preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle
1061 1061
 {
1062 1062
     const int about15CharsWidth =
1063 1063
         textStyle.fontMetrics ().width (
1064
-            TQString::tqfromLatin1 ("1234567890abcde"));
1064
+            TQString::fromLatin1 ("1234567890abcde"));
1065 1065
 
1066 1066
     const int preferredMinWidth =
1067 1067
         TQMAX (150,
@@ -1108,7 +1108,7 @@ int kpSelection::minimumHeight () const
1108 1108
 }
1109 1109
 
1110 1110
 // public
1111
-TQSize kpSelection::tqminimumSize () const
1111
+TQSize kpSelection::minimumSize () const
1112 1112
 {
1113 1113
     return TQSize (minimumWidth (), minimumHeight ());
1114 1114
 }

+ 2
- 2
kolourpaint/kpselection.h View File

@@ -169,7 +169,7 @@ public:
169 169
     //       Be more robust when external enforcement fails.
170 170
     static int minimumWidthForTextStyle (const kpTextStyle &);
171 171
     static int minimumHeightForTextStyle (const kpTextStyle &);
172
-    static TQSize tqminimumSizeForTextStyle (const kpTextStyle &);
172
+    static TQSize minimumSizeForTextStyle (const kpTextStyle &);
173 173
 
174 174
     static int preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle);
175 175
     static int preferredMinimumHeightForTextStyle (const kpTextStyle &textStyle);
@@ -177,7 +177,7 @@ public:
177 177
 
178 178
     int minimumWidth () const;
179 179
     int minimumHeight () const;
180
-    TQSize tqminimumSize () const;
180
+    TQSize minimumSize () const;
181 181
 
182 182
     int textRowForPoint (const TQPoint &globalPoint) const;
183 183
     int textColForPoint (const TQPoint &globalPoint) const;

+ 5
- 5
kolourpaint/kpselectiondrag.cpp View File

@@ -143,10 +143,10 @@ bool kpSelectionDrag::provides (const char *mimeType) const
143 143
 }
144 144
 
145 145
 // public virtual [base TQMimeSource]
146
-TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
146
+TQByteArray kpSelectionDrag::encodedData (const char *mimeType) const
147 147
 {
148 148
 #if DEBUG_KP_SELECTION_DRAG
149
-    kdDebug () << "kpSelectionDrag::tqencodedData(" << mimeType << ")" << endl;
149
+    kdDebug () << "kpSelectionDrag::encodedData(" << mimeType << ")" << endl;
150 150
 #endif
151 151
 
152 152
     if (!mimeType)
@@ -192,7 +192,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
192 192
             }
193 193
             else
194 194
             {
195
-                kdError () << "kpSelectionDrag::tqencodedData(" << mimeType << ")"
195
+                kdError () << "kpSelectionDrag::encodedData(" << mimeType << ")"
196 196
                            << " kpSelectionDrag(TQImage) could not decode data into TQImage"
197 197
                            << endl;
198 198
                 stream << kpSelection ();
@@ -207,7 +207,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
207 207
         kdDebug () << "\twant it as TQImage in TQByteArray" << endl;
208 208
     #endif
209 209
 
210
-        return TQImageDrag::tqencodedData (mimeType);
210
+        return TQImageDrag::encodedData (mimeType);
211 211
     }
212 212
 }
213 213
 
@@ -255,7 +255,7 @@ bool kpSelectionDrag::decode (const TQMimeSource *e, kpSelection &sel,
255 255
     #if DEBUG_KP_SELECTION_DRAG
256 256
         kdDebug () << "\tmimeSource provides selection - just return it in TQByteArray" << endl;
257 257
     #endif
258
-        TQByteArray data = e->tqencodedData (kpSelectionDrag::selectionMimeType);
258
+        TQByteArray data = e->encodedData (kpSelectionDrag::selectionMimeType);
259 259
         TQDataStream stream (data, IO_ReadOnly);
260 260
 
261 261
         // (no need for wali as kpSelection's by definition only support TQPixmap's)

+ 1
- 1
kolourpaint/kpselectiondrag.h View File

@@ -56,7 +56,7 @@ protected:
56 56
 public:
57 57
     virtual const char *format (int which = 0) const;
58 58
     virtual bool provides (const char *mimeType) const;
59
-    virtual TQByteArray tqencodedData (const char *mimeType) const;
59
+    virtual TQByteArray encodedData (const char *mimeType) const;
60 60
 
61 61
     static bool canDecode (const TQMimeSource *e);
62 62
     static bool decode (const TQMimeSource *e, TQImage &img);

+ 3
- 3
kolourpaint/kpthumbnail.cpp View File

@@ -63,12 +63,12 @@ kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name)
63 63
     }
64 64
 
65 65
 
66
-    TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ();
66
+    TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->minimumSize () : TQSize ();
67 67
 #if DEBUG_KP_THUMBNAIL
68 68
     kdDebug () << "\ttqlayout=" << tqlayout ()
69
-               << " minSize=" << (tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ()) << endl;
69
+               << " minSize=" << (tqlayout () ? tqlayout ()->minimumSize () : TQSize ()) << endl;
70 70
     kdDebug () << "\tboxLayout=" << boxLayout ()
71
-               << " minSize=" << (boxLayout () ? boxLayout ()->tqminimumSize () : TQSize ())
71
+               << " minSize=" << (boxLayout () ? boxLayout ()->minimumSize () : TQSize ())
72 72
                << endl;
73 73
 #endif
74 74
     if (tqlayout ())

+ 3
- 3
kolourpaint/kptool.cpp View File

@@ -153,7 +153,7 @@ void kpTool::createAction ()
153 153
     m_action = new kpToolAction (text (), iconName (), shortcutForKey (m_key),
154 154
                                  this, TQT_SLOT (slotActionActivated ()),
155 155
                                  m_mainWindow->actionCollection (), name ());
156
-    m_action->setExclusiveGroup (TQString::tqfromLatin1 ("Tool Box Actions"));
156
+    m_action->setExclusiveGroup (TQString::fromLatin1 ("Tool Box Actions"));
157 157
     m_action->setWhatsThis (description ());
158 158
 
159 159
     connect (m_action, TQT_SIGNAL (toolTipChanged (const TQString &)),
@@ -1046,7 +1046,7 @@ void kpTool::mouseMoveEvent (TQMouseEvent *e)
1046 1046
                << " viewUnderCursorTQt=" << (v1 ? v1->name () : "(none)")
1047 1047
                << " viewUnderStartPoint=" << (v2 ? v2->name () : "(none)")
1048 1048
                << endl;
1049
-    kdDebug () << "\ttqfocusWidget=" << kapp->tqfocusWidget () << endl;
1049
+    kdDebug () << "\tfocusWidget=" << kapp->focusWidget () << endl;
1050 1050
 #endif
1051 1051
 
1052 1052
     TQt::ButtonState buttonState = e->stateAfter ();
@@ -1652,7 +1652,7 @@ bool kpTool::warnIfBigImageSize (int oldWidth, int oldHeight,
1652 1652
             text,
1653 1653
             caption,
1654 1654
             continueButtonText,
1655
-            TQString::tqfromLatin1 ("BigImageDontAskAgain"));
1655
+            TQString::fromLatin1 ("BigImageDontAskAgain"));
1656 1656
 
1657 1657
         return (accept == KMessageBox::Continue);
1658 1658
     }

+ 1
- 1
kolourpaint/kptool.h View File

@@ -341,7 +341,7 @@ protected:
341 341
 
342 342
 
343 343
     /*
344
-     * User Notifications (tqStatus Bar)
344
+     * User Notifications (Status Bar)
345 345
      */
346 346
 
347 347
 public:

+ 1
- 1
kolourpaint/kpviewscrollablecontainer.cpp View File

@@ -184,7 +184,7 @@ void kpGrip::updatePixmap ()
184 184
         return;
185 185
 
186 186
     TQPixmap pixmap (width (), height ());
187
-    pixmap.fill (tqcolorGroup ().highlight ());
187
+    pixmap.fill (colorGroup ().highlight ());
188 188
     kpPixmapFX::ensureTransparentAt (&pixmap, pixmap.rect ());
189 189
     const TQRect hr = hotRect ();
190 190
 #if DEBUG_KP_VIEW_SCROLLABLE_CONTAINER

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

@@ -277,7 +277,7 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection,
277 277
     // TODO: This doesn't seem to be wide enough with some fonts so the
278 278
     //       whole tqlayout moves when we drag the gamma slider.
279 279
     m_gammaLabel->setMinimumWidth (m_gammaLabel->fontMetrics ().width (" 10.00 "));
280
-    m_gammaLabel->tqsetAlignment (m_gammaLabel->tqalignment () | TQt::AlignRight);
280
+    m_gammaLabel->setAlignment (m_gammaLabel->tqalignment () | TQt::AlignRight);
281 281
     TQPushButton *gammaResetPushButton = new TQPushButton (i18n ("Rese&t"), this);
282 282
 
283 283
 

+ 3
- 3
kolourpaint/pixmapfx/kpeffectsdialog.cpp View File

@@ -255,11 +255,11 @@ void kpEffectsDialog::selectEffect (int which)
255 255
         // Don't resize the preview when showing the widget:
256 256
         // TODO: actually work
257 257
 
258
-        TQSize previewGroupBoxMinSize = m_previewGroupBox->tqminimumSize ();
259
-        TQSize previewGroupBoxMaxSize = m_previewGroupBox->tqmaximumSize ();
258
+        TQSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize ();
259
+        TQSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize ();
260 260
         TQLayout::ResizeMode previewGroupBoxResizeMode = 
261 261
             m_previewGroupBox->tqlayout () ?
262
-                m_previewGroupBox->tqlayout ()->tqresizeMode () :
262
+                m_previewGroupBox->tqlayout ()->resizeMode () :
263 263
                 TQLayout::Auto;
264 264
     #if DEBUG_KP_EFFECTS_DIALOG
265 265
         kdDebug () << "\tpreviewGroupBox: minSize=" << previewGroupBoxMinSize

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

@@ -1403,12 +1403,12 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_,
1403 1403
     painter.setWorldMatrix (transformMatrix);
1404 1404
 #if DEBUG_KP_PIXMAP_FX && 0
1405 1405
     kdDebug () << "\ttranslate top=" << painter.xForm (TQPoint (0, 0)) << endl;
1406
-    kdDebug () << "\tmatrix: m11=" << painter.tqworldMatrix ().m11 ()
1407
-               << " m12=" << painter.tqworldMatrix ().m12 ()
1408
-               << " m21=" << painter.tqworldMatrix ().m21 ()
1409
-               << " m22=" << painter.tqworldMatrix ().m22 ()
1410
-               << " dx=" << painter.tqworldMatrix ().dx ()
1411
-               << " dy=" << painter.tqworldMatrix ().dy ()
1406
+    kdDebug () << "\tmatrix: m11=" << painter.worldMatrix ().m11 ()
1407
+               << " m12=" << painter.worldMatrix ().m12 ()
1408
+               << " m21=" << painter.worldMatrix ().m21 ()
1409
+               << " m22=" << painter.worldMatrix ().m22 ()
1410
+               << " dx=" << painter.worldMatrix ().dx ()
1411
+               << " dy=" << painter.worldMatrix ().dy ()
1412 1412
                << endl;
1413 1413
 #endif
1414 1414
     painter.drawPixmap (TQPoint (0, 0), pm);

+ 8
- 8
kolourpaint/tools/kptoolresizescale.cpp View File

@@ -665,17 +665,17 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
665 665
     // TODO: ALT+R doesn't select the button.
666 666
     m_resizeButton = new TQToolButton (m_operationGroupBox);
667 667
     toolButtonSetLook (m_resizeButton,
668
-                       TQString::tqfromLatin1 ("resize"),
668
+                       TQString::fromLatin1 ("resize"),
669 669
                        i18n ("&Resize"));
670 670
 
671 671
     m_scaleButton = new TQToolButton (m_operationGroupBox);
672 672
     toolButtonSetLook (m_scaleButton,
673
-                       TQString::tqfromLatin1 ("scale"),
673
+                       TQString::fromLatin1 ("scale"),
674 674
                        i18n ("&Scale"));
675 675
 
676 676
     m_smoothScaleButton = new TQToolButton (m_operationGroupBox);
677 677
     toolButtonSetLook (m_smoothScaleButton,
678
-                       TQString::tqfromLatin1 ("smooth_scale"),
678
+                       TQString::fromLatin1 ("smooth_scale"),
679 679
                        i18n ("S&mooth Scale"));
680 680
 
681 681
 
@@ -684,9 +684,9 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
684 684
     //m_smoothScaleLabel = new TQLabel (i18n ("S&mooth scale"), m_operationGroupBox);
685 685
 
686 686
 
687
-    //m_resizeLabel->tqsetAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix);
688
-    //m_scaleLabel->tqsetAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix);
689
-    //m_smoothScaleLabel->tqsetAlignment (m_smoothScaleLabel->tqalignment () | TQt::ShowPrefix);
687
+    //m_resizeLabel->setAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix);
688
+    //m_scaleLabel->setAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix);
689
+    //m_smoothScaleLabel->setAlignment (m_smoothScaleLabel->tqalignment () | TQt::ShowPrefix);
690 690
 
691 691
 
692 692
     TQButtonGroup *resizeScaleButtonGroup = new TQButtonGroup (baseWidget);
@@ -727,9 +727,9 @@ void kpToolResizeScaleDialog::createDimensionsGroupBox (TQWidget *baseWidget)
727 727
     m_dimensionsGroupBox = new TQGroupBox (i18n ("Dimensions"), baseWidget);
728 728
 
729 729
     TQLabel *widthLabel = new TQLabel (i18n ("Width:"), m_dimensionsGroupBox);
730
-    widthLabel->tqsetAlignment (widthLabel->tqalignment () | TQt::AlignHCenter);
730
+    widthLabel->setAlignment (widthLabel->tqalignment () | TQt::AlignHCenter);
731 731
     TQLabel *heightLabel = new TQLabel (i18n ("Height:"), m_dimensionsGroupBox);
732
-    heightLabel->tqsetAlignment (heightLabel->tqalignment () | TQt::AlignHCenter);
732
+    heightLabel->setAlignment (heightLabel->tqalignment () | TQt::AlignHCenter);
733 733
 
734 734
     TQLabel *originalLabel = new TQLabel (i18n ("Original:"), m_dimensionsGroupBox);
735 735
     m_originalWidthInput = new KIntNumInput (

+ 4
- 4
kolourpaint/widgets/kpcolorsimilaritycube.cpp View File

@@ -138,7 +138,7 @@ void kpColorSimilarityCube::setColorSimilarity (double similarity)
138 138
 
139 139
 
140 140
 // protected virtual [base TQWidget]
141
-TQSize kpColorSimilarityCube::tqsizeHint () const
141
+TQSize kpColorSimilarityCube::sizeHint () const
142 142
 {
143 143
     return TQSize (52, 52);
144 144
 }
@@ -247,8 +247,8 @@ void kpColorSimilarityCube::drawFace (TQPainter *p,
247 247
     #if DEBUG_KP_COLOR_SIMILARITY_CUBE
248 248
         kdDebug () << "\tnot enabled - making us grey" << endl;
249 249
     #endif
250
-        colors [0] = tqcolorGroup ().background ();
251
-        colors [1] = tqcolorGroup ().background ();
250
+        colors [0] = colorGroup ().background ();
251
+        colors [1] = colorGroup ().background ();
252 252
     }
253 253
 
254 254
 #if DEBUG_KP_COLOR_SIMILARITY_CUBE
@@ -274,7 +274,7 @@ void kpColorSimilarityCube::drawContents (TQPainter *p)
274 274
     TQRect cr (contentsRect ());
275 275
 
276 276
     TQPixmap backBuffer (cr.width (), cr.height ());
277
-    backBuffer.fill (tqcolorGroup ().background ());
277
+    backBuffer.fill (colorGroup ().background ());
278 278
 
279 279
     TQPainter backBufferPainter (&backBuffer);
280 280
 

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

@@ -55,7 +55,7 @@ public:
55 55
     double colorSimilarity () const;
56 56
     void setColorSimilarity (double similarity);
57 57
 
58
-    virtual TQSize tqsizeHint () const;
58
+    virtual TQSize sizeHint () const;
59 59
 
60 60
 protected:
61 61
     TQColor color (int redOrGreenOrBlue, int baseBrightness, int similarityDirection) const;

+ 11
- 11
kolourpaint/widgets/kpcolortoolbar.cpp View File

@@ -150,7 +150,7 @@ kpColor kpDualColorButton::oldBackgroundColor () const
150 150
 
151 151
 
152 152
 // public virtual [base TQWidget]
153
-TQSize kpDualColorButton::tqsizeHint () const
153
+TQSize kpDualColorButton::sizeHint () const
154 154
 {
155 155
     return TQSize (52, 52);
156 156
 }
@@ -318,14 +318,14 @@ void kpDualColorButton::drawContents (TQPainter *p)
318 318
     else
319 319
     {
320 320
         backBufferPainter.fillRect (m_backBuffer->rect (),
321
-                                    tqcolorGroup ().color (TQColorGroup::Background));
321
+                                    colorGroup ().color (TQColorGroup::Background));
322 322
     }
323 323
 
324 324
     TQPixmap swapPixmap = UserIcon ("colorbutton_swap_16x16");
325 325
     if (!isEnabled ())
326 326
     {
327 327
         // swapPixmap has a mask after all
328
-        swapPixmap.fill (tqcolorGroup ().color (TQColorGroup::Dark));
328
+        swapPixmap.fill (colorGroup ().color (TQColorGroup::Dark));
329 329
     }
330 330
     backBufferPainter.drawPixmap (swapPixmapRect ().topLeft (), swapPixmap);
331 331
 
@@ -346,8 +346,8 @@ void kpDualColorButton::drawContents (TQPainter *p)
346 346
             backBufferPainter.drawPixmap (bgRectInside, UserIcon ("color_transparent_26x26"));
347 347
     }
348 348
     else
349
-        backBufferPainter.fillRect (bgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
350
-    qDrawShadePanel (&backBufferPainter, bgRect, tqcolorGroup (),
349
+        backBufferPainter.fillRect (bgRectInside, colorGroup ().color (TQColorGroup::Button));
350
+    qDrawShadePanel (&backBufferPainter, bgRect, colorGroup (),
351 351
                      false/*not sunken*/, 2/*lineWidth*/,
352 352
                      0/*never fill*/);
353 353
 
@@ -366,8 +366,8 @@ void kpDualColorButton::drawContents (TQPainter *p)
366 366
             backBufferPainter.drawPixmap (fgRectInside, UserIcon ("color_transparent_26x26"));
367 367
     }
368 368
     else
369
-        backBufferPainter.fillRect (fgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
370
-    qDrawShadePanel (&backBufferPainter, fgRect, tqcolorGroup (),
369
+        backBufferPainter.fillRect (fgRectInside, colorGroup ().color (TQColorGroup::Button));
370
+    qDrawShadePanel (&backBufferPainter, fgRect, colorGroup (),
371 371
                      false/*not sunken*/, 2/*lineWidth*/,
372 372
                      0/*never fill*/);
373 373
 
@@ -768,7 +768,7 @@ kpTransparentColorCell::~kpTransparentColorCell ()
768 768
 
769 769
 
770 770
 // public virtual [base TQWidget]
771
-TQSize kpTransparentColorCell::tqsizeHint () const
771
+TQSize kpTransparentColorCell::sizeHint () const
772 772
 {
773 773
     return TQSize (m_pixmap.width () + frameWidth () * 2,
774 774
                   m_pixmap.height () + frameWidth () * 2);
@@ -829,7 +829,7 @@ kpColorPalette::kpColorPalette (TQWidget *parent,
829 829
 #endif
830 830
 
831 831
     m_transparentColorCell = new kpTransparentColorCell (this);
832
-    m_transparentColorCell->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
832
+    m_transparentColorCell->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
833 833
     connect (m_transparentColorCell, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
834 834
              this, TQT_SIGNAL (foregroundColorChanged (const kpColor &)));
835 835
     connect (m_transparentColorCell, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
@@ -964,7 +964,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
964 964
                                   5/*margin*/, (10 * 4)/*spacing*/);
965 965
 
966 966
     m_dualColorButton = new kpDualColorButton (mainWindow, base);
967
-    m_dualColorButton->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
967
+    m_dualColorButton->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
968 968
     connect (m_dualColorButton, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
969 969
              this, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)));
970 970
     connect (m_dualColorButton, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
@@ -981,7 +981,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
981 981
     m_boxLayout->addWidget (m_colorPalette, 0/*stretch*/);
982 982
 
983 983
     m_colorSimilarityToolBarItem = new kpColorSimilarityToolBarItem (mainWindow, base);
984
-    m_colorSimilarityToolBarItem->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
984
+    m_colorSimilarityToolBarItem->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
985 985
     connect (m_colorSimilarityToolBarItem, TQT_SIGNAL (colorSimilarityChanged (double, int)),
986 986
              this, TQT_SIGNAL (colorSimilarityChanged (double, int)));
987 987
     m_boxLayout->addWidget (m_colorSimilarityToolBarItem, 0/*stretch*/);

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

@@ -91,7 +91,7 @@ public:
91 91
     kpColor oldBackgroundColor () const;
92 92
 
93 93
 public:
94
-    virtual TQSize tqsizeHint () const;
94
+    virtual TQSize sizeHint () const;
95 95
 
96 96
 protected:
97 97
     TQRect swapPixmapRect () const;
@@ -163,7 +163,7 @@ public:
163 163
     kpTransparentColorCell (TQWidget *parent, const char *name = 0);
164 164
     virtual ~kpTransparentColorCell ();
165 165
 
166
-    virtual TQSize tqsizeHint () const;
166
+    virtual TQSize sizeHint () const;
167 167
 
168 168
 signals:
169 169
     void transparentColorSelected (int mouseButton);

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

@@ -53,11 +53,11 @@ kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent
53 53
 
54 54
 
55 55
 // public virtual
56
-TQSize kpSqueezedTextLabel::tqminimumSizeHint () const
56
+TQSize kpSqueezedTextLabel::minimumSizeHint () const
57 57
 {
58 58
 #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
59
-    kdDebug () << "kpSqueezedTextLabel::tqminimumSizeHint() qLabel prefers"
60
-               << TQLabel::tqminimumSizeHint () << endl;
59
+    kdDebug () << "kpSqueezedTextLabel::minimumSizeHint() qLabel prefers"
60
+               << TQLabel::minimumSizeHint () << endl;
61 61
 #endif
62 62
     return TQSize (-1/*no minimum width*/, TQLabel::minimumHeight ());
63 63
 }

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

@@ -43,7 +43,7 @@ public:
43 43
     kpSqueezedTextLabel (TQWidget *parent, const char *name = 0);
44 44
     kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name = 0);
45 45
 
46
-    virtual TQSize tqminimumSizeHint () const;
46
+    virtual TQSize minimumSizeHint () const;
47 47
 
48 48
     // TODO: maybe text() should return the full text?
49 49
     TQString fullText () const;

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

@@ -175,10 +175,10 @@ TQPair <int, int> kpToolWidgetBase::defaultSelectedRowAndCol () const
175 175
         KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
176 176
         KConfigBase *cfg = cfgGroupSaver.config ();
177 177
 
178
-        TQString nameString = TQString::tqfromLatin1 (name ());
178
+        TQString nameString = TQString::fromLatin1 (name ());
179 179
 
180
-        row = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Row"), -1);
181
-        col = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Col"), -1);
180
+        row = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Row"), -1);
181
+        col = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Col"), -1);
182 182
     }
183 183
 
184 184
 #if DEBUG_KP_TOOL_WIDGET_BASE
@@ -218,9 +218,9 @@ void kpToolWidgetBase::saveSelectedAsDefault () const
218 218
     KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
219 219
     KConfigBase *cfg = cfgGroupSaver.config ();
220 220
 
221
-    TQString nameString = TQString::tqfromLatin1 (name ());
222
-    cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Row"), m_selectedRow);
223
-    cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Col"), m_selectedCol);
221
+    TQString nameString = TQString::fromLatin1 (name ());
222
+    cfg->writeEntry (nameString + TQString::fromLatin1 (" Row"), m_selectedRow);
223
+    cfg->writeEntry (nameString + TQString::fromLatin1 (" Col"), m_selectedCol);
224 224
     cfg->sync ();
225 225
 }
226 226
 

+ 6
- 6
kooka/img_saver.cpp View File

@@ -116,7 +116,7 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name
116 116
    Q_CHECK_PTR(l_help);
117 117
    l_help->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
118 118
    l_help->setText( i18n("-No format selected-" ));
119
-   l_help->tqsetAlignment( AlignVCenter | AlignHCenter );
119
+   l_help->setAlignment( AlignVCenter | AlignHCenter );
120 120
    l_help->setMinimumWidth(230);
121 121
 
122 122
    // Insert Selbox for subformat
@@ -208,11 +208,11 @@ TQCString FormatDialog::getSubFormat( ) const
208 208
 #include "formathelp.h"
209 209
 void FormatDialog::buildHelp( void )
210 210
 {
211
-   format_help.insert( TQString::tqfromLatin1("BMP"), HELP_BMP );
212
-   format_help.insert( TQString::tqfromLatin1("PNM"), HELP_PNM );
213
-   format_help.insert( TQString::tqfromLatin1("JPEG"), HELP_JPG );
214
-   format_help.insert( TQString::tqfromLatin1("JPG"), HELP_JPG );
215
-   format_help.insert( TQString::tqfromLatin1("EPS"), HELP_EPS );
211
+   format_help.insert( TQString::fromLatin1("BMP"), HELP_BMP );
212
+   format_help.insert( TQString::fromLatin1("PNM"), HELP_PNM );
213
+   format_help.insert( TQString::fromLatin1("JPEG"), HELP_JPG );
214
+   format_help.insert( TQString::fromLatin1("JPG"), HELP_JPG );
215
+   format_help.insert( TQString::fromLatin1("EPS"), HELP_EPS );
216 216
 }
217 217
 
218 218
 

+ 2
- 2
kooka/imgnamecombo.cpp View File

@@ -51,7 +51,7 @@ ImageNameCombo::~ImageNameCombo()
51 51
 
52 52
 void ImageNameCombo::slotPathRemove( KFileTreeBranch *branch, const TQString& relPath )
53 53
 {
54
-   TQString path = branch->name() + TQString::tqfromLatin1(" - ") + relPath;
54
+   TQString path = branch->name() + TQString::fromLatin1(" - ") + relPath;
55 55
 
56 56
    kdDebug(28000) << "ImageNameCombo: Removing " << path << endl;
57 57
    TQString select = currentText();
@@ -82,7 +82,7 @@ void ImageNameCombo::slotGalleryPathChanged( KFileTreeBranch* branch, const TQSt
82 82
 {
83 83
    TQString newPath;
84 84
 
85
-   newPath = branch->name() + TQString::tqfromLatin1(" - ") + relativPath;
85
+   newPath = branch->name() + TQString::fromLatin1(" - ") + relativPath;
86 86
 
87 87
    kdDebug( 28000) << "Inserting " << newPath << " to combobox" << endl;
88 88
 

+ 1
- 1
kooka/imgprintdialog.cpp View File

@@ -127,7 +127,7 @@ ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* n
127 127
 
128 128
 
129 129
     TQWidget *spaceEater = new TQWidget( this );
130
-    spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
130
+    spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
131 131
     tqlayout->addWidget( spaceEater );
132 132
 
133 133
     /* Set start values */

+ 4
- 4
kooka/kocrbase.cpp View File

@@ -129,7 +129,7 @@ void KOCRBase::imgIntro()
129 129
     m_previewPix = new TQLabel( m_imgHBox );
130 130
     m_previewPix->setPixmap(TQPixmap());
131 131
     m_previewPix->setFixedSize(m_previewSize);
132
-    m_previewPix->tqsetAlignment( TQt::AlignCenter );
132
+    m_previewPix->setAlignment( TQt::AlignCenter );
133 133
     m_previewPix->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
134 134
     // m_previewPix->resize(m_previewSize);
135 135
 
@@ -164,7 +164,7 @@ void KOCRBase::ocrIntro( )
164 164
         hb_cap->setSpacing( KDialog::spacingHint());
165 165
 
166 166
         TQLabel *imgLab = new TQLabel( hb_cap );
167
-        imgLab->tqsetAlignment( TQt::AlignHCenter | TQt::AlignTop  );
167
+        imgLab->setAlignment( TQt::AlignHCenter | TQt::AlignTop  );
168 168
         imgLab->setPixmap( pix );
169 169
         pa = hb_cap;
170 170
     }
@@ -188,7 +188,7 @@ void KOCRBase::spellCheckIntro()
188 188
     KSpellConfig *sCfg = new KSpellConfig( m_gbSpellOpts, "SPELLCHK", m_spellConfig, false );
189 189
     /* A space eater */
190 190
     TQWidget *spaceEater = new TQWidget(m_spellchkPage);
191
-    spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
191
+    spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
192 192
 
193 193
     /* connect toggle button */
194 194
     connect( m_cbWantCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slWantSpellcheck(bool)));
@@ -285,7 +285,7 @@ void KOCRBase::introduceImage( KookaImage* img)
285 285
         }
286 286
     }
287 287
     TQWidget *spaceEater = new TQWidget( m_metaBox );
288
-    spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
288
+    spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
289 289
     m_metaBox->show();
290 290
 }
291 291
 

+ 1
- 1
kooka/kooka.cpp View File

@@ -96,7 +96,7 @@ Kooka::Kooka( const TQCString& deviceToUse)
96 96
 
97 97
     changeCaption( i18n( "KDE Scanning" ));
98 98
 
99
-    setAutoSaveSettings(  TQString::tqfromLatin1("General Options"),
99
+    setAutoSaveSettings(  TQString::fromLatin1("General Options"),
100 100
                           true );
101 101
 }
102 102
 

+ 6
- 6
kooka/kookapref.cpp View File

@@ -149,7 +149,7 @@ void KookaPreferences::setupOCRPage()
149 149
 #endif
150 150
     top->addWidget( kgp );
151 151
     TQWidget *spaceEater = new TQWidget( page );
152
-    spaceEater->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
152
+    spaceEater->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
153 153
     top->addWidget( spaceEater );
154 154
 
155 155
     /*
@@ -418,8 +418,8 @@ void KookaPreferences::setupThumbnailPage()
418 418
 
419 419
    /* Frame Stuff */
420 420
    int frameWidth = konf->readNumEntry( THUMB_MARGIN, 3 );
421
-   TQColor col1    = konf->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base()));
422
-   TQColor col2    = konf->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground()));
421
+   TQColor col1    = konf->readColorEntry( MARGIN_COLOR1, &(colorGroup().base()));
422
+   TQColor col2    = konf->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground()));
423 423
 
424 424
    TQGrid *fGrid = new TQGrid( 2, hgb3 );
425 425
    fGrid->setSpacing( 2 );
@@ -457,7 +457,7 @@ void KookaPreferences::slotApply( void )
457 457
     /* ** startup options ** */
458 458
 
459 459
    /** write the global one, to read from libkscan also */
460
-   konf->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
460
+   konf->setGroup(TQString::fromLatin1(GROUP_STARTUP));
461 461
    bool cbVal = !(cbShowScannerSelection->isChecked());
462 462
    kdDebug(28000) << "Writing for " << STARTUP_SKIP_ASK << ": " << cbVal << endl;
463 463
    konf->writeEntry( STARTUP_SKIP_ASK, cbVal, true, true ); /* global flag goes to kdeglobals */
@@ -532,8 +532,8 @@ void KookaPreferences::slotDefault( void )
532 532
     m_tileSelector->setURL( KURL(bgImg) );
533 533
     m_thumbWidth->setValue( 100 );
534 534
     m_thumbHeight->setValue( 120 );
535
-    TQColor col1    = TQColor( tqcolorGroup().base());
536
-    TQColor col2    = TQColor( tqcolorGroup().foreground());
535
+    TQColor col1    = TQColor( colorGroup().base());
536
+    TQColor col2    = TQColor( colorGroup().foreground());
537 537
 
538 538
     m_frameWidth->setValue( 3 );
539 539
     m_colButt1->setColor( col1 );

+ 3
- 3
kooka/kookaview.cpp View File

@@ -164,7 +164,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
164 164
    TQHBox *recentBox = new TQHBox( m_dockRecent );
165 165
    recentBox->setMargin(KDialog::marginHint());
166 166
    TQLabel *lab = new TQLabel( i18n("Gallery:"), recentBox );
167
-   lab->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
167
+   lab->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
168 168
    recentFolder = new ImageNameCombo( recentBox );
169 169
 
170 170
    m_dockRecent->setWidget( recentBox );
@@ -277,7 +277,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
277 277
 
278 278
    packager->openRoots();
279 279
 
280
-   /* tqStatus Bar */
280
+   /* Status Bar */
281 281
    KStatusBar *statBar = m_mainWindow->statusBar();
282 282
 
283 283
    // statBar->insertItem(TQString("1"), SBAR_ZOOM,  0, true );
@@ -842,7 +842,7 @@ void KookaView::slShowAImage( KookaImage *img )
842 842
        ocrFabric->slSetImage( img );
843 843
    }
844 844
 
845
-   /* tqStatus Bar */
845
+   /* Status Bar */
846 846
    KStatusBar *statBar = m_mainWindow->statusBar();
847 847
    if( img_canvas )
848 848
        statBar->changeItem( img_canvas->imageInfoString(), StatusImage );

+ 1
- 1
kooka/scanpackager.cpp View File

@@ -463,7 +463,7 @@ void ScanPackager::slotSelectDirectory( const TQString & dirString )
463 463
 {
464 464
    kdDebug(28000) << "Trying to decode directory string " << dirString << endl;
465 465
 
466
-   TQString searchFor = TQString::tqfromLatin1(" - ");
466
+   TQString searchFor = TQString::fromLatin1(" - ");
467 467
    int pos = dirString.find( searchFor );
468 468
 
469 469
    if( pos > -1 )

+ 2
- 2
kooka/thumbview.cpp View File

@@ -91,14 +91,14 @@ bool ThumbView::readSettings()
91 91
    bool dirty = false;
92 92
 
93 93
    TQColor color;
94
-   color = cfg->readColorEntry( MARGIN_COLOR1, &(tqcolorGroup().base()));
94
+   color = cfg->readColorEntry( MARGIN_COLOR1, &(colorGroup().base()));
95 95
    if( color != m_marginColor1 )
96 96
    {
97 97
       dirty = true;
98 98
       m_marginColor1 = color;
99 99
    }
100 100
 
101
-   color = cfg->readColorEntry( MARGIN_COLOR2, &(tqcolorGroup().foreground()));
101
+   color = cfg->readColorEntry( MARGIN_COLOR2, &(colorGroup().foreground()));
102 102
    if( color != m_marginColor2 )
103 103
    {
104 104
       dirty = true;

+ 10
- 10
kpdf/conf/dlgaccessibility.ui View File

@@ -154,7 +154,7 @@
154 154
                                     <property name="sizeType">
155 155
                                         <enum>Fixed</enum>
156 156
                                     </property>
157
-                                    <property name="tqsizeHint">
157
+                                    <property name="sizeHint">
158 158
                                         <size>
159 159
                                             <width>16</width>
160 160
                                             <height>20</height>
@@ -196,7 +196,7 @@
196 196
                                     <property name="sizeType">
197 197
                                         <enum>Expanding</enum>
198 198
                                     </property>
199
-                                    <property name="tqsizeHint">
199
+                                    <property name="sizeHint">
200 200
                                         <size>
201 201
                                             <width>30</width>
202 202
                                             <height>20</height>
@@ -234,7 +234,7 @@
234 234
                                     <property name="sizeType">
235 235
                                         <enum>Expanding</enum>
236 236
                                     </property>
237
-                                    <property name="tqsizeHint">
237
+                                    <property name="sizeHint">
238 238
                                         <size>
239 239
                                             <width>48</width>
240 240
                                             <height>21</height>
@@ -262,7 +262,7 @@
262 262
                                     <property name="sizeType">
263 263
                                         <enum>Fixed</enum>
264 264
                                     </property>
265
-                                    <property name="tqsizeHint">
265
+                                    <property name="sizeHint">
266 266
                                         <size>
267 267
                                             <width>16</width>
268 268
                                             <height>20</height>
@@ -290,7 +290,7 @@
290 290
                                     <property name="sizeType">
291 291
                                         <enum>Expanding</enum>
292 292
                                     </property>
293
-                                    <property name="tqsizeHint">
293
+                                    <property name="sizeHint">
294 294
                                         <size>
295 295
                                             <width>48</width>
296 296
                                             <height>21</height>
@@ -318,7 +318,7 @@
318 318
                                     <property name="sizeType">
319 319
                                         <enum>Fixed</enum>
320 320
                                     </property>
321
-                                    <property name="tqsizeHint">
321
+                                    <property name="sizeHint">
322 322
                                         <size>
323 323
                                             <width>16</width>
324 324
                                             <height>20</height>
@@ -375,7 +375,7 @@
375 375
                                     <property name="sizeType">
376 376
                                         <enum>Expanding</enum>
377 377
                                     </property>
378
-                                    <property name="tqsizeHint">
378
+                                    <property name="sizeHint">
379 379
                                         <size>
380 380
                                             <width>48</width>
381 381
                                             <height>21</height>
@@ -392,7 +392,7 @@
392 392
                                     <property name="sizeType">
393 393
                                         <enum>Fixed</enum>
394 394
                                     </property>
395
-                                    <property name="tqsizeHint">
395
+                                    <property name="sizeHint">
396 396
                                         <size>
397 397
                                             <width>16</width>
398 398
                                             <height>20</height>
@@ -409,7 +409,7 @@
409 409
                                     <property name="sizeType">
410 410
                                         <enum>Fixed</enum>
411 411
                                     </property>
412
-                                    <property name="tqsizeHint">
412
+                                    <property name="sizeHint">
413 413
                                         <size>
414 414
                                             <width>16</width>
415 415
                                             <height>20</height>
@@ -426,7 +426,7 @@
426 426
                                     <property name="sizeType">
427 427
                                         <enum>Expanding</enum>
428 428
                                     </property>
429
-                                    <property name="tqsizeHint">
429
+                                    <property name="sizeHint">
430 430
                                         <size>
431 431
                                             <width>48</width>
432 432
                                             <height>21</height>

+ 2
- 2
kpdf/conf/dlggeneral.ui View File

@@ -128,7 +128,7 @@
128 128
                             <property name="sizeType">
129 129
                                 <enum>Minimum</enum>
130 130
                             </property>
131
-                            <property name="tqsizeHint">
131
+                            <property name="sizeHint">
132 132
                                 <size>
133 133
                                     <width>20</width>
134 134
                                     <height>1</height>
@@ -149,7 +149,7 @@
149 149
             <property name="sizeType">
150 150
                 <enum>Expanding</enum>
151 151
             </property>
152
-            <property name="tqsizeHint">
152
+            <property name="sizeHint">
153 153
                 <size>
154 154
                     <width>20</width>
155 155
                     <height>20</height>

+ 3
- 3
kpdf/conf/dlgperformance.ui View File

@@ -98,7 +98,7 @@
98 98
                             <property name="sizeType">
99 99
                                 <enum>Minimum</enum>
100 100
                             </property>
101
-                            <property name="tqsizeHint">
101
+                            <property name="sizeHint">
102 102
                                 <size>
103 103
                                     <width>21</width>
104 104
                                     <height>1</height>
@@ -210,7 +210,7 @@
210 210
                             <property name="sizeType">
211 211
                                 <enum>Minimum</enum>
212 212
                             </property>
213
-                            <property name="tqsizeHint">
213
+                            <property name="sizeHint">
214 214
                                 <size>
215 215
                                     <width>21</width>
216 216
                                     <height>1</height>
@@ -231,7 +231,7 @@
231 231
             <property name="sizeType">
232 232
                 <enum>Expanding</enum>
233 233
             </property>
234
-            <property name="tqsizeHint">
234
+            <property name="sizeHint">
235 235
                 <size>
236 236
                     <width>21</width>
237 237
                     <height>16</height>

+ 1
- 1
kpdf/conf/dlgpresentation.ui View File

@@ -258,7 +258,7 @@
258 258
             <property name="sizeType">
259 259
                 <enum>Expanding</enum>
260 260
             </property>
261
-            <property name="tqsizeHint">
261
+            <property name="sizeHint">
262 262
                 <size>
263 263
                     <width>20</width>
264 264
                     <height>1</height>

+ 1
- 1
kpdf/core/document.cpp View File

@@ -1067,7 +1067,7 @@ void KPDFDocument::processLink( const KPDFLink * link )
1067 1067
         case KPDFLink::Browse: {
1068 1068
             const KPDFLinkBrowse * browse = static_cast< const KPDFLinkBrowse * >( link );
1069 1069
             // if the url is a mailto one, invoke mailer
1070
-            if ( browse->url().tqstartsWith( "mailto:", false ) )
1070
+            if ( browse->url().startsWith( "mailto:", false ) )
1071 1071
                 kapp->invokeMailer( browse->url() );
1072 1072
             else
1073 1073
             {

+ 2
- 2
kpdf/core/generator_pdf/generator_pdf.cpp View File

@@ -1017,10 +1017,10 @@ void PDFGenerator::addTransition( int pageNumber, KPDFPage * page )
1017 1017
 
1018 1018
     switch ( pdfTransition->getAlignment() ) {
1019 1019
         case PageTransition::Horizontal:
1020
-            transition->tqsetAlignment( KPDFPageTransition::Horizontal );
1020
+            transition->setAlignment( KPDFPageTransition::Horizontal );
1021 1021
             break;
1022 1022
         case PageTransition::Vertical:
1023
-            transition->tqsetAlignment( KPDFPageTransition::Vertical );
1023
+            transition->setAlignment( KPDFPageTransition::Vertical );
1024 1024
             break;
1025 1025
     }
1026 1026
 

+ 1
- 1
kpdf/core/pagetransition.h View File

@@ -67,7 +67,7 @@ class KPDFPageTransition
67 67
 
68 68
         inline void setType( Type type ) { m_type = type; }
69 69
         inline void setDuration( int duration ) { m_duration = duration; }
70
-        inline void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; }
70
+        inline void setAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; }
71 71
         inline void setDirection( Direction direction ) { m_direction = direction; }
72 72
         inline void setAngle( int angle ) { m_angle = angle; }
73 73
         inline void setScale( double scale ) { m_scale = scale; }

+ 1
- 1
kpdf/part.cpp View File

@@ -151,7 +151,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
151 151
 	connect( m_document, TQT_SIGNAL( openURL(const KURL &) ), this, TQT_SLOT( openURLFromDocument(const KURL &) ) );
152 152
 	connect( m_document, TQT_SIGNAL( close() ), this, TQT_SLOT( close() ) );
153 153
 	
154
-	if (parent && parent->tqmetaObject()->slotNames(true).contains("slotQuit()"))
154
+	if (parent && parent->metaObject()->slotNames(true).contains("slotQuit()"))
155 155
 		connect( m_document, TQT_SIGNAL( quit() ), parent, TQT_SLOT( slotQuit() ) );
156 156
 	else
157 157
 		connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) );

+ 3
- 3
kpdf/ui/minibar.cpp View File

@@ -198,7 +198,7 @@ void MiniBar::notifyViewportChanged( bool /*smoothMove*/ )
198 198
 void MiniBar::resizeEvent( TQResizeEvent * e )
199 199
 {
200 200
     // auto-hide 'prev' and 'next' buttons if not enough space
201
-    const TQSize & myHint = tqminimumSizeHint();
201
+    const TQSize & myHint = minimumSizeHint();
202 202
     bool shown = m_prevButton->isVisible() && m_nextButton->isVisible();
203 203
     if ( shown && e->size().width() < myHint.width() )
204 204
     {
@@ -208,7 +208,7 @@ void MiniBar::resizeEvent( TQResizeEvent * e )
208 208
     }
209 209
     else if ( !shown )
210 210
     {
211
-        int histeresis = m_prevButton->tqsizeHint().width() * 2 + 2;
211
+        int histeresis = m_prevButton->sizeHint().width() * 2 + 2;
212 212
         if ( e->size().width() > (myHint.width() + histeresis) )
213 213
         {
214 214
             m_prevButton->show();
@@ -337,7 +337,7 @@ PagesEdit::PagesEdit( MiniBar * parent )
337 337
     setValidator( m_validator );
338 338
 
339 339
     // customize text properties
340
-    tqsetAlignment( TQt::AlignCenter );
340
+    setAlignment( TQt::AlignCenter );
341 341
     setMaxLength( 4 );
342 342
 }
343 343
 

+ 1
- 1
kpdf/ui/pagepainter.cpp View File

@@ -139,7 +139,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags,
139 139
             {
140 140
                 case KpdfSettings::EnumRenderMode::Inverted:
141 141
                     // Invert image pixels using TQImage internal function
142
-                    backImage.tqinvertPixels(false);
142
+                    backImage.invertPixels(false);
143 143
                     break;
144 144
                 case KpdfSettings::EnumRenderMode::Recolor:
145 145
                     // Recolor image using KImageEffect::flatten with dither:0

+ 6
- 6
kpdf/ui/pageview.cpp View File

@@ -592,7 +592,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe )
592 592
                     TQImage blendedImage = blendedPixmap.convertToImage();
593 593
                     KImageEffect::blend( selBlendColor.dark(140), blendedImage, 0.2 );
594 594
                     // copy the blended pixmap back to its place
595
-                    pixmapPainter.tqdrawPixmap( blendRect.left(), blendRect.top(), blendedImage );
595
+                    pixmapPainter.drawPixmap( blendRect.left(), blendRect.top(), blendedImage );
596 596
                 }
597 597
                 // draw border (red if the selection is too small)
598 598
                 pixmapPainter.setPen( selBlendColor );
@@ -1105,16 +1105,16 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
1105 1105
             for ( ; iIt != iEnd; ++iIt )
1106 1106
             {
1107 1107
                 PageViewItem * item = *iIt;
1108
-                const TQRect & tqitemRect = item->tqgeometry();
1109
-                if ( selectionRect.intersects( tqitemRect ) )
1108
+                const TQRect & itemRect = item->tqgeometry();
1109
+                if ( selectionRect.intersects( itemRect ) )
1110 1110
                 {
1111 1111
                     // request the textpage if there isn't one
1112 1112
                     const KPDFPage * kpdfPage = item->page();
1113 1113
                     if ( !kpdfPage->hasSearchPage() )
1114 1114
                         d->document->requestTextPage( kpdfPage->number() );
1115
-                    // grab text in the rect that intersects tqitemRect
1116
-                    TQRect relativeRect = selectionRect.intersect( tqitemRect );
1117
-                    relativeRect.moveBy( -tqitemRect.left(), -tqitemRect.top() );
1115
+                    // grab text in the rect that intersects itemRect
1116
+                    TQRect relativeRect = selectionRect.intersect( itemRect );
1117
+                    relativeRect.moveBy( -itemRect.left(), -itemRect.top() );
1118 1118
                     NormalizedRect normRect( relativeRect, item->width(), item->height() );
1119 1119
                     selectedText += kpdfPage->getText( normRect );
1120 1120
                 }

+ 6
- 6
kpdf/ui/presentationwidget.cpp View File

@@ -837,14 +837,14 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
837 837
         case KpdfSettings::EnumSlidesTransition::BlindsHorizontal:
838 838
         {
839 839
             KPDFPageTransition transition( KPDFPageTransition::Blinds );
840
-            transition.tqsetAlignment( KPDFPageTransition::Horizontal );
840
+            transition.setAlignment( KPDFPageTransition::Horizontal );
841 841
             return transition;
842 842
             break;
843 843
         }
844 844
         case KpdfSettings::EnumSlidesTransition::BlindsVertical:
845 845
         {
846 846
             KPDFPageTransition transition( KPDFPageTransition::Blinds );
847
-            transition.tqsetAlignment( KPDFPageTransition::Vertical );
847
+            transition.setAlignment( KPDFPageTransition::Vertical );
848 848
             return transition;
849 849
             break;
850 850
         }
@@ -896,7 +896,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
896 896
         case KpdfSettings::EnumSlidesTransition::SplitHorizontalIn:
897 897
         {
898 898
             KPDFPageTransition transition( KPDFPageTransition::Split );
899
-            transition.tqsetAlignment( KPDFPageTransition::Horizontal );
899
+            transition.setAlignment( KPDFPageTransition::Horizontal );
900 900
             transition.setDirection( KPDFPageTransition::Inward );
901 901
             return transition;
902 902
             break;
@@ -904,7 +904,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const
904 904
         case KpdfSettings::EnumSlidesTransition::SplitHorizontalOut: