Browse Source

Rename obsolete tq methods to standard names

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
2d6954f69c
100 changed files with 256 additions and 256 deletions
  1. 1
    1
      chalk/HACKING
  2. 1
    1
      chalk/chalkcolor/kis_basic_histogram_producers.h
  3. 1
    1
      chalk/colorspaces/wet/kis_wet_palette_widget.cc
  4. 2
    2
      chalk/doc/doc-outline
  5. 1
    1
      chalk/doc/the preview widget
  6. 1
    1
      chalk/plugins/filters/blur/wdgblur.ui
  7. 1
    1
      chalk/plugins/filters/colorify/WdgColorifyBase.ui
  8. 1
    1
      chalk/plugins/filters/colors/wdgcolortoalphabase.ui
  9. 2
    2
      chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
  10. 2
    2
      chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
  11. 3
    3
      chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
  12. 1
    1
      chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
  13. 5
    5
      chalk/plugins/filters/levelfilter/wdg_level.ui
  14. 3
    3
      chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
  15. 2
    2
      chalk/plugins/tools/defaulttools/wdgcolorpicker.ui
  16. 1
    1
      chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
  17. 1
    1
      chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
  18. 1
    1
      chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
  19. 1
    1
      chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
  20. 1
    1
      chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
  21. 1
    1
      chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
  22. 1
    1
      chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
  23. 2
    2
      chalk/plugins/tools/tool_crop/wdg_tool_crop.ui
  24. 1
    1
      chalk/plugins/tools/tool_curves/kis_tool_curve.cc
  25. 1
    1
      chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
  26. 2
    2
      chalk/plugins/tools/tool_curves/wdg_tool_example.ui
  27. 2
    2
      chalk/plugins/tools/tool_star/wdg_tool_star.ui
  28. 7
    7
      chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
  29. 4
    4
      chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
  30. 3
    3
      chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
  31. 1
    1
      chalk/plugins/viewplugins/histogram/wdghistogram.ui
  32. 1
    1
      chalk/plugins/viewplugins/performancetest/wdg_perftest.ui
  33. 2
    2
      chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
  34. 1
    1
      chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
  35. 1
    1
      chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
  36. 1
    1
      chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
  37. 2
    2
      chalk/plugins/viewplugins/substrate/wdgsubstrate.ui
  38. 1
    1
      chalk/plugins/viewplugins/variations/wdg_variations.ui
  39. 1
    1
      chalk/ui/kis_brush_chooser.cc
  40. 5
    5
      chalk/ui/kis_clipboard.cc
  41. 7
    7
      chalk/ui/kis_color_cup.cc
  42. 3
    3
      chalk/ui/kis_controlframe.cc
  43. 3
    3
      chalk/ui/kis_dlg_adj_layer_props.cc
  44. 3
    3
      chalk/ui/kis_dlg_adjustment_layer.cc
  45. 1
    1
      chalk/ui/kis_dlg_layer_properties.cc
  46. 1
    1
      chalk/ui/kis_dlg_new_layer.cc
  47. 1
    1
      chalk/ui/kis_double_widget.cc
  48. 1
    1
      chalk/ui/kis_gradient_chooser.cc
  49. 2
    2
      chalk/ui/kis_int_spinbox.cc
  50. 3
    3
      chalk/ui/kis_palette_widget.cc
  51. 1
    1
      chalk/ui/kis_pattern_chooser.cc
  52. 5
    5
      chalk/ui/kis_previewdialog.cc
  53. 3
    3
      chalk/ui/kis_previewwidgetbase.ui
  54. 1
    1
      chalk/ui/kis_selection_manager.cc
  55. 2
    2
      chalk/ui/kis_tool_paint.cc
  56. 2
    2
      chalk/ui/kis_tool_paint.h
  57. 1
    1
      chalk/ui/kis_view.cc
  58. 1
    1
      chalk/ui/layerlist.cpp
  59. 1
    1
      chalk/ui/squeezedcombobox.cpp
  60. 4
    4
      chalk/ui/wdgautobrush.ui
  61. 6
    6
      chalk/ui/wdgautogradient.ui
  62. 3
    3
      chalk/ui/wdgbirdeye.ui
  63. 2
    2
      chalk/ui/wdgcolorsettings.ui
  64. 3
    3
      chalk/ui/wdgcustombrush.ui
  65. 3
    3
      chalk/ui/wdgcustompattern.ui
  66. 1
    1
      chalk/ui/wdgdisplaysettings.ui
  67. 3
    3
      chalk/ui/wdggeneralsettings.ui
  68. 3
    3
      chalk/ui/wdggridsettings.ui
  69. 2
    2
      chalk/ui/wdglayerbox.ui
  70. 1
    1
      chalk/ui/wdgnewimage.ui
  71. 1
    1
      chalk/ui/wdgpalettechooser.ui
  72. 2
    2
      chalk/ui/wdgperformancesettings.ui
  73. 1
    1
      chalk/ui/wdgselectionoptions.ui
  74. 6
    6
      chalk/ui/wdgtabletdevicesettings.ui
  75. 2
    2
      chalk/ui/wdgtabletsettings.ui
  76. 3
    3
      chalk/ui/wdgtextbrush.ui
  77. 3
    3
      filters/chalk/jpeg/kis_wdg_options_jpeg.ui
  78. 4
    4
      filters/chalk/pdf/pdfimportwidgetbase.ui
  79. 3
    3
      filters/chalk/png/kis_wdg_options_png.ui
  80. 3
    3
      filters/chalk/raw/wdgrawimport.ui
  81. 8
    8
      filters/chalk/tiff/kis_wdg_options_tiff.ui
  82. 1
    1
      filters/karbon/applixgraphics/applixgraphicimport.cc
  83. 2
    2
      filters/karbon/kontour/kontourimport.cpp
  84. 6
    6
      filters/karbon/xfig/xfigimport.cc
  85. 13
    13
      filters/kformula/png/pngexportdia.cc
  86. 1
    1
      filters/kpresenter/magicpoint/mgp2kpr.py
  87. 1
    1
      filters/kpresenter/ooimpress/ooimpressexport.cc
  88. 21
    21
      filters/kpresenter/powerpoint/import/powerpointimport.cc
  89. 1
    1
      filters/kpresenter/powerpoint/libppt/pole.cpp
  90. 3
    3
      filters/kpresenter/powerpoint/libppt/ustring.cpp
  91. 2
    2
      filters/kpresenter/powerpoint/libppt/ustring.h
  92. 1
    1
      filters/kspread/csv/dialogui.ui
  93. 1
    1
      filters/kspread/csv/exportdialogui.ui
  94. 14
    14
      filters/kspread/excel/sidewinder/excel.cpp
  95. 2
    2
      filters/kspread/excel/sidewinder/excel.h
  96. 1
    1
      filters/kspread/excel/sidewinder/pole.cpp
  97. 2
    2
      filters/kspread/excel/sidewinder/ustring.cpp
  98. 2
    2
      filters/kspread/excel/sidewinder/ustring.h
  99. 1
    1
      filters/kspread/gnumeric/gnumericexport.cc
  100. 0
    0
      filters/kspread/gnumeric/status.html

+ 1
- 1
chalk/HACKING View File

@@ -62,7 +62,7 @@ Variable/Parameter names
62 62
 
63 63
 Designer
64 64
 
65
-	Chalk has started to use designer. All dialogs and all widgets that have a tqlayout
65
+	Chalk has started to use designer. All dialogs and all widgets that have a layout
66 66
 	manager must be done in designer. We don't add code nor add signal/slot connections
67 67
 	in designer
68 68
 

+ 1
- 1
chalk/chalkcolor/kis_basic_histogram_producers.h View File

@@ -60,7 +60,7 @@ protected:
60 60
     /**
61 61
      * The order in which channels() returns is not the same as the internal representation,
62 62
      * that of the pixel internally. This method converts external usage to internal usage.
63
-     * This method uses some basic assumtpions about the tqlayout of the pixel, so _extremely_
63
+     * This method uses some basic assumtpions about the layout of the pixel, so _extremely_
64 64
      * exotic spaces might want to override this (see makeExternalToInternal source for
65 65
      * those assumptions)
66 66
      **/

+ 1
- 1
chalk/colorspaces/wet/kis_wet_palette_widget.cc View File

@@ -50,7 +50,7 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s
50 50
 {
51 51
     m_subject = 0;
52 52
 
53
-    TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main tqlayout");
53
+    TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main layout");
54 54
 
55 55
     TQGridLayout * l = new TQGridLayout(vl, 2, 8, 2, "color wells grid");
56 56
 

+ 2
- 2
chalk/doc/doc-outline View File

@@ -85,7 +85,7 @@ The current outline (working towards 1.6):
85 85
   - [TODO] properties, usage, converting, ...
86 86
 
87 87
 - Commands
88
-  - General tqlayout
88
+  - General layout
89 89
   - Menus
90 90
   - Toolbars
91 91
   - Palettes
@@ -142,7 +142,7 @@ Outline for the 1.5 manual (final as of 2006-05-31):
142 142
   - Available colorspaces
143 143
 
144 144
 - Commands ([TODO] make up-to-date)
145
-  - General tqlayout
145
+  - General layout
146 146
   - Menus
147 147
   - Toolbars
148 148
   - Palettes

+ 1
- 1
chalk/doc/the preview widget View File

@@ -2,7 +2,7 @@
2 2
 On Tuesday 21 June 2005 14:16, Casper Boemann wrote:
3 3
 > Hi
4 4
 >
5
-> As you might have noticed I have changed the tqlayout of the preview, to lo=
5
+> As you might have noticed I have changed the layout of the preview, to lo=
6 6
 ok
7 7
 > more like digikam.
8 8
 >

+ 1
- 1
chalk/plugins/filters/blur/wdgblur.ui View File

@@ -58,7 +58,7 @@
58 58
         </spacer>
59 59
         <widget class="TQLayoutWidget" row="0" column="0">
60 60
             <property name="name">
61
-                <cstring>tqlayout17</cstring>
61
+                <cstring>layout17</cstring>
62 62
             </property>
63 63
             <grid>
64 64
                 <property name="name">

+ 1
- 1
chalk/plugins/filters/colorify/WdgColorifyBase.ui View File

@@ -38,7 +38,7 @@
38 38
         </spacer>
39 39
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
40 40
             <property name="name">
41
-                <cstring>tqlayout1</cstring>
41
+                <cstring>layout1</cstring>
42 42
             </property>
43 43
             <hbox>
44 44
                 <property name="name">

+ 1
- 1
chalk/plugins/filters/colors/wdgcolortoalphabase.ui View File

@@ -38,7 +38,7 @@
38 38
         </spacer>
39 39
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
40 40
             <property name="name">
41
-                <cstring>tqlayout1</cstring>
41
+                <cstring>layout1</cstring>
42 42
             </property>
43 43
             <hbox>
44 44
                 <property name="name">

+ 2
- 2
chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui View File

@@ -32,7 +32,7 @@
32 32
         </property>
33 33
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
34 34
             <property name="name">
35
-                <cstring>tqlayout4</cstring>
35
+                <cstring>layout4</cstring>
36 36
             </property>
37 37
             <grid>
38 38
                 <property name="name">
@@ -169,7 +169,7 @@
169 169
         </widget>
170 170
         <widget class="TQLayoutWidget" row="1" column="0">
171 171
             <property name="name">
172
-                <cstring>tqlayout7</cstring>
172
+                <cstring>layout7</cstring>
173 173
             </property>
174 174
             <grid>
175 175
                 <property name="name">

+ 2
- 2
chalk/plugins/filters/colorsfilters/wdg_perchannel.ui View File

@@ -24,7 +24,7 @@
24 24
         </property>
25 25
         <widget class="TQLayoutWidget">
26 26
             <property name="name">
27
-                <cstring>tqlayout4</cstring>
27
+                <cstring>layout4</cstring>
28 28
             </property>
29 29
             <hbox>
30 30
                 <property name="name">
@@ -47,7 +47,7 @@
47 47
         </widget>
48 48
         <widget class="TQLayoutWidget">
49 49
             <property name="name">
50
-                <cstring>tqlayout8</cstring>
50
+                <cstring>layout8</cstring>
51 51
             </property>
52 52
             <grid>
53 53
                 <property name="name">

+ 3
- 3
chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui View File

@@ -21,7 +21,7 @@
21 21
         </property>
22 22
         <widget class="TQLayoutWidget">
23 23
             <property name="name">
24
-                <cstring>tqlayout5</cstring>
24
+                <cstring>layout5</cstring>
25 25
             </property>
26 26
             <vbox>
27 27
                 <property name="name">
@@ -34,7 +34,7 @@
34 34
                 </widget>
35 35
                 <widget class="TQLayoutWidget">
36 36
                     <property name="name">
37
-                        <cstring>tqlayout4</cstring>
37
+                        <cstring>layout4</cstring>
38 38
                     </property>
39 39
                     <hbox>
40 40
                         <property name="name">
@@ -80,7 +80,7 @@
80 80
                 </widget>
81 81
                 <widget class="TQLayoutWidget">
82 82
                     <property name="name">
83
-                        <cstring>tqlayout3</cstring>
83
+                        <cstring>layout3</cstring>
84 84
                     </property>
85 85
                     <hbox>
86 86
                         <property name="name">

+ 1
- 1
chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui View File

@@ -21,7 +21,7 @@
21 21
         </property>
22 22
         <widget class="TQLayoutWidget">
23 23
             <property name="name">
24
-                <cstring>tqlayout1</cstring>
24
+                <cstring>layout1</cstring>
25 25
             </property>
26 26
             <hbox>
27 27
                 <property name="name">

+ 5
- 5
chalk/plugins/filters/levelfilter/wdg_level.ui View File

@@ -60,7 +60,7 @@
60 60
         </widget>
61 61
         <widget class="TQLayoutWidget" row="2" column="0">
62 62
             <property name="name">
63
-                <cstring>tqlayout7</cstring>
63
+                <cstring>layout7</cstring>
64 64
             </property>
65 65
             <vbox>
66 66
                 <property name="name">
@@ -88,7 +88,7 @@
88 88
                 </widget>
89 89
                 <widget class="TQLayoutWidget">
90 90
                     <property name="name">
91
-                        <cstring>tqlayout5</cstring>
91
+                        <cstring>layout5</cstring>
92 92
                     </property>
93 93
                     <vbox>
94 94
                         <property name="name">
@@ -107,7 +107,7 @@
107 107
                         </widget>
108 108
                         <widget class="TQLayoutWidget">
109 109
                             <property name="name">
110
-                                <cstring>tqlayout5</cstring>
110
+                                <cstring>layout5</cstring>
111 111
                             </property>
112 112
                             <hbox>
113 113
                                 <property name="name">
@@ -194,7 +194,7 @@
194 194
                 </widget>
195 195
                 <widget class="TQLayoutWidget">
196 196
                     <property name="name">
197
-                        <cstring>tqlayout6</cstring>
197
+                        <cstring>layout6</cstring>
198 198
                     </property>
199 199
                     <vbox>
200 200
                         <property name="name">
@@ -213,7 +213,7 @@
213 213
                         </widget>
214 214
                         <widget class="TQLayoutWidget">
215 215
                             <property name="name">
216
-                                <cstring>tqlayout2</cstring>
216
+                                <cstring>layout2</cstring>
217 217
                             </property>
218 218
                             <hbox>
219 219
                                 <property name="name">

+ 3
- 3
chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui View File

@@ -39,7 +39,7 @@
39 39
                     </property>
40 40
                     <widget class="TQLayoutWidget" row="0" column="0">
41 41
                         <property name="name">
42
-                            <cstring>tqlayout4</cstring>
42
+                            <cstring>layout4</cstring>
43 43
                         </property>
44 44
                         <vbox>
45 45
                             <property name="name">
@@ -83,7 +83,7 @@
83 83
                     </property>
84 84
                     <widget class="TQLayoutWidget" row="0" column="0">
85 85
                         <property name="name">
86
-                            <cstring>tqlayout3</cstring>
86
+                            <cstring>layout3</cstring>
87 87
                         </property>
88 88
                         <vbox>
89 89
                             <property name="name">
@@ -127,7 +127,7 @@
127 127
                     </property>
128 128
                     <widget class="TQLayoutWidget" row="0" column="0">
129 129
                         <property name="name">
130
-                            <cstring>tqlayout5</cstring>
130
+                            <cstring>layout5</cstring>
131 131
                         </property>
132 132
                         <vbox>
133 133
                             <property name="name">

+ 2
- 2
chalk/plugins/tools/defaulttools/wdgcolorpicker.ui View File

@@ -70,7 +70,7 @@
70 70
         </widget>
71 71
         <widget class="TQLayoutWidget">
72 72
             <property name="name">
73
-                <cstring>tqlayout2</cstring>
73
+                <cstring>layout2</cstring>
74 74
             </property>
75 75
             <hbox>
76 76
                 <property name="name">
@@ -101,7 +101,7 @@
101 101
         </widget>
102 102
         <widget class="TQLayoutWidget">
103 103
             <property name="name">
104
-                <cstring>tqlayout1</cstring>
104
+                <cstring>layout1</cstring>
105 105
             </property>
106 106
             <hbox>
107 107
                 <property name="name">

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc View File

@@ -152,7 +152,7 @@ TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent)
152 152
     Q_CHECK_PTR(m_optWidget);
153 153
     m_optWidget->setCaption(i18n("Selection Brush"));
154 154
 
155
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
155
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
156 156
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
157 157
 
158 158
     return m_optWidget;

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc View File

@@ -189,7 +189,7 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent)
189 189
     Q_CHECK_PTR(m_optWidget);
190 190
     m_optWidget->setCaption(i18n("Contiguous Area Selection"));
191 191
 
192
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
192
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
193 193
     l->setSpacing( 6 );
194 194
 
195 195
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc View File

@@ -305,7 +305,7 @@ TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent)
305 305
 
306 306
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
307 307
 
308
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
308
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
309 309
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
310 310
 
311 311
     return m_optWidget;

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc View File

@@ -139,7 +139,7 @@ TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent)
139 139
     Q_CHECK_PTR(m_optWidget);
140 140
     m_optWidget->setCaption(i18n("Selection Eraser"));
141 141
 
142
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
142
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
143 143
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
144 144
 
145 145
     return m_optWidget;

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc View File

@@ -275,7 +275,7 @@ TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent)
275 275
 
276 276
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
277 277
 
278
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
278
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
279 279
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
280 280
 
281 281
     return m_optWidget;

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc View File

@@ -294,7 +294,7 @@ TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent)
294 294
 
295 295
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
296 296
 
297
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
297
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
298 298
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
299 299
 
300 300
     return m_optWidget;

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc View File

@@ -306,7 +306,7 @@ TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent)
306 306
 
307 307
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
308 308
 
309
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
309
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
310 310
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
311 311
 
312 312
     return m_optWidget;

+ 2
- 2
chalk/plugins/tools/tool_crop/wdg_tool_crop.ui View File

@@ -27,7 +27,7 @@
27 27
         </property>
28 28
         <widget class="TQLayoutWidget">
29 29
             <property name="name">
30
-                <cstring>tqlayout3</cstring>
30
+                <cstring>layout3</cstring>
31 31
             </property>
32 32
             <grid>
33 33
                 <property name="name">
@@ -138,7 +138,7 @@
138 138
         </widget>
139 139
         <widget class="TQLayoutWidget">
140 140
             <property name="name">
141
-                <cstring>tqlayout9</cstring>
141
+                <cstring>layout9</cstring>
142 142
             </property>
143 143
             <hbox>
144 144
                 <property name="name">

+ 1
- 1
chalk/plugins/tools/tool_curves/kis_tool_curve.cc View File

@@ -576,7 +576,7 @@ TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent)
576 576
 
577 577
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
578 578
 
579
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
579
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
580 580
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
581 581
 
582 582
     return m_optWidget;

+ 1
- 1
chalk/plugins/tools/tool_curves/kis_tool_moutline.cc View File

@@ -762,7 +762,7 @@ void KisToolMagnetic::slotSetDistance (int dist)
762 762
 TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent)
763 763
 {
764 764
     m_optWidget = super::createOptionWidget(parent);
765
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
765
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
766 766
     TQGridLayout *box = new TQGridLayout(l, 2, 2, 3);
767 767
     box->setColStretch(0, 1);
768 768
     box->setColStretch(1, 1);

+ 2
- 2
chalk/plugins/tools/tool_curves/wdg_tool_example.ui View File

@@ -24,7 +24,7 @@
24 24
         </property>
25 25
         <widget class="TQLayoutWidget">
26 26
             <property name="name">
27
-                <cstring>tqlayout8</cstring>
27
+                <cstring>layout8</cstring>
28 28
             </property>
29 29
             <hbox>
30 30
                 <property name="name">
@@ -59,7 +59,7 @@
59 59
         </widget>
60 60
         <widget class="TQLayoutWidget">
61 61
             <property name="name">
62
-                <cstring>tqlayout7</cstring>
62
+                <cstring>layout7</cstring>
63 63
             </property>
64 64
             <hbox>
65 65
                 <property name="name">

+ 2
- 2
chalk/plugins/tools/tool_star/wdg_tool_star.ui View File

@@ -24,7 +24,7 @@
24 24
         </property>
25 25
         <widget class="TQLayoutWidget">
26 26
             <property name="name">
27
-                <cstring>tqlayout8</cstring>
27
+                <cstring>layout8</cstring>
28 28
             </property>
29 29
             <hbox>
30 30
                 <property name="name">
@@ -59,7 +59,7 @@
59 59
         </widget>
60 60
         <widget class="TQLayoutWidget">
61 61
             <property name="name">
62
-                <cstring>tqlayout7</cstring>
62
+                <cstring>layout7</cstring>
63 63
             </property>
64 64
             <hbox>
65 65
                 <property name="name">

+ 7
- 7
chalk/plugins/tools/tool_transform/wdg_tool_transform.ui View File

@@ -27,7 +27,7 @@
27 27
         </property>
28 28
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
29 29
             <property name="name">
30
-                <cstring>tqlayout11</cstring>
30
+                <cstring>layout11</cstring>
31 31
             </property>
32 32
             <hbox>
33 33
                 <property name="name">
@@ -35,7 +35,7 @@
35 35
                 </property>
36 36
                 <widget class="TQLayoutWidget">
37 37
                     <property name="name">
38
-                        <cstring>tqlayout7</cstring>
38
+                        <cstring>layout7</cstring>
39 39
                     </property>
40 40
                     <vbox>
41 41
                         <property name="name">
@@ -43,7 +43,7 @@
43 43
                         </property>
44 44
                         <widget class="TQLayoutWidget">
45 45
                             <property name="name">
46
-                                <cstring>tqlayout1</cstring>
46
+                                <cstring>layout1</cstring>
47 47
                             </property>
48 48
                             <hbox>
49 49
                                 <property name="name">
@@ -72,7 +72,7 @@
72 72
                         </widget>
73 73
                         <widget class="TQLayoutWidget">
74 74
                             <property name="name">
75
-                                <cstring>tqlayout2</cstring>
75
+                                <cstring>layout2</cstring>
76 76
                             </property>
77 77
                             <hbox>
78 78
                                 <property name="name">
@@ -103,7 +103,7 @@
103 103
                 </widget>
104 104
                 <widget class="TQLayoutWidget">
105 105
                     <property name="name">
106
-                        <cstring>tqlayout8</cstring>
106
+                        <cstring>layout8</cstring>
107 107
                     </property>
108 108
                     <vbox>
109 109
                         <property name="name">
@@ -111,7 +111,7 @@
111 111
                         </property>
112 112
                         <widget class="TQLayoutWidget">
113 113
                             <property name="name">
114
-                                <cstring>tqlayout3</cstring>
114
+                                <cstring>layout3</cstring>
115 115
                             </property>
116 116
                             <hbox>
117 117
                                 <property name="name">
@@ -140,7 +140,7 @@
140 140
                         </widget>
141 141
                         <widget class="TQLayoutWidget">
142 142
                             <property name="name">
143
-                                <cstring>tqlayout4</cstring>
143
+                                <cstring>layout4</cstring>
144 144
                             </property>
145 145
                             <hbox>
146 146
                                 <property name="name">

+ 4
- 4
chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui View File

@@ -21,7 +21,7 @@
21 21
         </property>
22 22
         <widget class="TQLayoutWidget">
23 23
             <property name="name">
24
-                <cstring>tqlayout10</cstring>
24
+                <cstring>layout10</cstring>
25 25
             </property>
26 26
             <hbox>
27 27
                 <property name="name">
@@ -29,7 +29,7 @@
29 29
                 </property>
30 30
                 <widget class="TQLayoutWidget">
31 31
                     <property name="name">
32
-                        <cstring>tqlayout8</cstring>
32
+                        <cstring>layout8</cstring>
33 33
                     </property>
34 34
                     <vbox>
35 35
                         <property name="name">
@@ -37,7 +37,7 @@
37 37
                         </property>
38 38
                         <widget class="TQLayoutWidget">
39 39
                             <property name="name">
40
-                                <cstring>tqlayout7</cstring>
40
+                                <cstring>layout7</cstring>
41 41
                             </property>
42 42
                             <hbox>
43 43
                                 <property name="name">
@@ -144,7 +144,7 @@
144 144
                 </widget>
145 145
                 <widget class="TQLayoutWidget">
146 146
                     <property name="name">
147
-                        <cstring>tqlayout9</cstring>
147
+                        <cstring>layout9</cstring>
148 148
                     </property>
149 149
                     <vbox>
150 150
                         <property name="name">

+ 3
- 3
chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc View File

@@ -67,7 +67,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const
67 67
     resize( minimumSizeHint());
68 68
     m_widget->previewWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding);
69 69
     m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder);
70
-    m_widget->configWidgetHolder->tqlayout()->add(m_labelNoCW);
70
+    m_widget->configWidgetHolder->layout()->add(m_labelNoCW);
71 71
     m_labelNoCW->hide();
72 72
 }
73 73
 
@@ -81,7 +81,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item )
81 81
     m_currentFilter = kisitem->filter();
82 82
     if(m_currentConfigWidget != 0)
83 83
     {
84
-        m_widget->configWidgetHolder->tqlayout()->remove(m_currentConfigWidget);
84
+        m_widget->configWidgetHolder->layout()->remove(m_currentConfigWidget);
85 85
         delete m_currentConfigWidget;
86 86
         m_currentConfigWidget = 0;
87 87
     } else {
@@ -95,7 +95,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item )
95 95
     
96 96
     if(m_currentConfigWidget != 0) {
97 97
         //m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
98
-        m_widget->configWidgetHolder->tqlayout()->add(m_currentConfigWidget);
98
+        m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget);
99 99
         m_currentConfigWidget->show();
100 100
         connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged()));
101 101
     }

+ 1
- 1
chalk/plugins/viewplugins/histogram/wdghistogram.ui View File

@@ -133,7 +133,7 @@
133 133
         </widget>
134 134
         <widget class="TQLayoutWidget">
135 135
             <property name="name">
136
-                <cstring>tqlayout2</cstring>
136
+                <cstring>layout2</cstring>
137 137
             </property>
138 138
             <hbox>
139 139
                 <property name="name">

+ 1
- 1
chalk/plugins/viewplugins/performancetest/wdg_perftest.ui View File

@@ -233,7 +233,7 @@
233 233
                 </widget>
234 234
                 <widget class="TQLayoutWidget" row="18" column="0" rowspan="1" colspan="2">
235 235
                     <property name="name">
236
-                        <cstring>tqlayout5</cstring>
236
+                        <cstring>layout5</cstring>
237 237
                     </property>
238 238
                     <hbox>
239 239
                         <property name="name">

+ 2
- 2
chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui View File

@@ -32,7 +32,7 @@
32 32
                 </property>
33 33
                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
34 34
                     <property name="name">
35
-                        <cstring>tqlayout6</cstring>
35
+                        <cstring>layout6</cstring>
36 36
                     </property>
37 37
                     <hbox>
38 38
                         <property name="name">
@@ -177,7 +177,7 @@
177 177
                 </widget>
178 178
                 <widget class="TQLayoutWidget">
179 179
                     <property name="name">
180
-                        <cstring>tqlayout1</cstring>
180
+                        <cstring>layout1</cstring>
181 181
                     </property>
182 182
                     <hbox>
183 183
                         <property name="name">

+ 1
- 1
chalk/plugins/viewplugins/screenshot/ksnapshot.cpp View File

@@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url )
162 162
 
163 163
 void KSnapshot::slotCopy()
164 164
 {
165
-    TQClipboard *cb = TQApplication::tqclipboard();
165
+    TQClipboard *cb = TQApplication::clipboard();
166 166
     cb->setPixmap( snapshot );
167 167
 }
168 168
 

+ 1
- 1
chalk/plugins/viewplugins/screenshot/regiongrabber.cpp View File

@@ -161,7 +161,7 @@ void RegionGrabber::drawRubber()
161 161
   p.setPen( TQPen( color0, 1 ) );
162 162
   p.setBrush( NoBrush );
163 163
 
164
-  tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
164
+  style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
165 165
       TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) );
166 166
 
167 167
   p.end();

+ 1
- 1
chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc View File

@@ -46,7 +46,7 @@ DlgShearImage::DlgShearImage( TQWidget *  parent,
46 46
     m_lock = false;
47 47
 
48 48
     m_page = new WdgShearImage(this, "shear_image");
49
-    m_page->tqlayout()->setMargin(0);
49
+    m_page->layout()->setMargin(0);
50 50
     Q_CHECK_PTR(m_page);
51 51
 
52 52
     setMainWidget(m_page);

+ 2
- 2
chalk/plugins/viewplugins/substrate/wdgsubstrate.ui View File

@@ -29,7 +29,7 @@
29 29
                 </property>
30 30
                 <widget class="TQLayoutWidget">
31 31
                     <property name="name">
32
-                        <cstring>tqlayout3</cstring>
32
+                        <cstring>layout3</cstring>
33 33
                     </property>
34 34
                     <grid>
35 35
                         <property name="name">
@@ -92,7 +92,7 @@
92 92
                 </widget>
93 93
                 <widget class="TQLayoutWidget">
94 94
                     <property name="name">
95
-                        <cstring>tqlayout2</cstring>
95
+                        <cstring>layout2</cstring>
96 96
                     </property>
97 97
                     <grid>
98 98
                         <property name="name">

+ 1
- 1
chalk/plugins/viewplugins/variations/wdg_variations.ui View File

@@ -228,7 +228,7 @@
228 228
     </widget>
229 229
     <widget class="TQLayoutWidget">
230 230
         <property name="name">
231
-            <cstring>tqlayout5</cstring>
231
+            <cstring>layout5</cstring>
232 232
         </property>
233 233
         <property name="geometry">
234 234
             <rect>

+ 1
- 1
chalk/ui/kis_brush_chooser.cc View File

@@ -41,7 +41,7 @@ KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name)
41 41
 
42 42
     m_lbName = new TQLabel(this);
43 43
 
44
-    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
44
+    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
45 45
 
46 46
     mainLayout->addWidget(m_lbName);
47 47
     mainLayout->addWidget(chooserWidget(), 10);

+ 5
- 5
chalk/ui/kis_clipboard.cc View File

@@ -52,7 +52,7 @@ KisClipboard::KisClipboard()
52 52
     clipboardDataChanged();
53 53
 
54 54
     // Make sure we are notified when clipboard changes
55
-    connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
55
+    connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
56 56
          this, TQT_SLOT( clipboardDataChanged() ) );
57 57
 }
58 58
 
@@ -132,14 +132,14 @@ void KisClipboard::setClip(KisPaintDeviceSP selection)
132 132
     multiDrag->addDragObject( storeDrag );
133 133
 
134 134
 
135
-    TQClipboard *cb = TQApplication::tqclipboard();
135
+    TQClipboard *cb = TQApplication::clipboard();
136 136
     cb->setData(multiDrag);
137 137
     m_pushedClipboard = true;
138 138
 }
139 139
 
140 140
 KisPaintDeviceSP KisClipboard::clip()
141 141
 {
142
-    TQClipboard *cb = TQApplication::tqclipboard();
142
+    TQClipboard *cb = TQApplication::clipboard();
143 143
     TQCString mimeType("application/x-chalk-selection");
144 144
     TQMimeSource *cbData = cb->data();
145 145
 
@@ -211,7 +211,7 @@ void KisClipboard::clipboardDataChanged()
211 211
 {
212 212
     if (!m_pushedClipboard) {
213 213
         m_hasClip = false;
214
-        TQClipboard *cb = TQApplication::tqclipboard();
214
+        TQClipboard *cb = TQApplication::clipboard();
215 215
         TQImage qimg = cb->image();
216 216
         TQMimeSource *cbData = cb->data();
217 217
         TQCString mimeType("application/x-chalk-selection");
@@ -235,7 +235,7 @@ bool KisClipboard::hasClip()
235 235
 TQSize KisClipboard::clipSize()
236 236
 {
237 237
 
238
-    TQClipboard *cb = TQApplication::tqclipboard();
238
+    TQClipboard *cb = TQApplication::clipboard();
239 239
     TQCString mimeType("application/x-chalk-selection");
240 240
     TQMimeSource *cbData = cb->data();
241 241
 

+ 7
- 7
chalk/ui/kis_color_cup.cc View File

@@ -83,25 +83,25 @@ void KisColorCup::slotClicked()
83 83
 
84 84
 TQSize KisColorCup::sizeHint() const
85 85
 {
86
-    return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
86
+    return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
87 87
             expandedTo(TQApplication::globalStrut());
88 88
 }
89 89
 
90 90
 void KisColorCup::drawButtonLabel( TQPainter *painter )
91 91
 {
92 92
     int x, y, w, h;
93
-    TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this );
93
+    TQRect r = style().subRect( TQStyle::SR_PushButtonContents, this );
94 94
     r.rect(&x, &y, &w, &h);
95 95
 
96
-    int margin = 2; //tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this );
96
+    int margin = 2; //style().pixelMetric( TQStyle::PM_ButtonMargin, this );
97 97
     x += margin;
98 98
     y += margin;
99 99
     w -= 2*margin;
100 100
     h -= 2*margin;
101 101
 
102 102
     if (isOn() || isDown()) {
103
-        x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
104
-        y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
103
+        x += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
104
+        y += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
105 105
     }
106 106
 
107 107
     qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL);
@@ -109,8 +109,8 @@ void KisColorCup::drawButtonLabel( TQPainter *painter )
109 109
         painter->fillRect( x+1, y+1, w-2, h-2, m_color );
110 110
 
111 111
     if ( hasFocus() ) {
112
-        TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this );
113
-        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
112
+        TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this );
113
+        style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
114 114
     }
115 115
 
116 116
 }

+ 3
- 3
chalk/ui/kis_controlframe.cc View File

@@ -218,7 +218,7 @@ void KisControlFrame::createBrushesChooser(KisView * view)
218 218
 
219 219
     m_brushChooserPopup = new KisPopupFrame(m_brushWidget, "brush_chooser_popup");
220 220
 
221
-    TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuptqlayout");
221
+    TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuplayout");
222 222
 
223 223
     TQTabWidget * m_brushesTab = new TQTabWidget(m_brushChooserPopup, "brushestab");
224 224
     m_brushesTab->setTabShape(TQTabWidget::Triangular);
@@ -270,7 +270,7 @@ void KisControlFrame::createPatternsChooser(KisView * view)
270 270
 {
271 271
     m_patternChooserPopup = new KisPopupFrame(m_patternWidget, "pattern_chooser_popup");
272 272
 
273
-    TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuptqlayout");
273
+    TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuplayout");
274 274
 
275 275
     TQTabWidget * m_patternsTab = new TQTabWidget(m_patternChooserPopup, "patternstab");
276 276
     m_patternsTab->setTabShape(TQTabWidget::Triangular);
@@ -311,7 +311,7 @@ void KisControlFrame::createGradientsChooser(KisView * view)
311 311
 {
312 312
     m_gradientChooserPopup = new KisPopupFrame(m_gradientWidget, "gradient_chooser_popup");
313 313
 
314
-    TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuptqlayout");
314
+    TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuplayout");
315 315
 
316 316
     TQTabWidget * m_gradientTab = new TQTabWidget(m_gradientChooserPopup, "gradientstab");
317 317
     m_gradientTab->setTabShape(TQTabWidget::Triangular);

+ 3
- 3
chalk/ui/kis_dlg_adj_layer_props.cc View File

@@ -85,16 +85,16 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,
85 85
     }
86 86
     setCaption(caption);
87 87
     TQWidget * page = new TQWidget(this, "page widget");
88
-    TQHBoxLayout * tqlayout = new TQHBoxLayout(page, 0, 6);
88
+    TQHBoxLayout * layout = new TQHBoxLayout(page, 0, 6);
89 89
     setMainWidget(page);
90 90
 
91 91
     m_preview = new KisPreviewWidget(page, "dlgadjustment.preview");
92 92
     m_preview->slotSetDevice( dev );
93 93
 
94 94
     connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview()));
95
-    tqlayout->addWidget(m_preview, 1, 1);
95
+    layout->addWidget(m_preview, 1, 1);
96 96
 
97
-    TQVBoxLayout *v1 = new TQVBoxLayout( tqlayout );
97
+    TQVBoxLayout *v1 = new TQVBoxLayout( layout );
98 98
     TQHBoxLayout *hl = new TQHBoxLayout( v1 );
99 99
 
100 100
     TQLabel * lblName = new TQLabel(i18n("Layer name:"), page, "lblName");

+ 3
- 3
chalk/ui/kis_dlg_adjustment_layer.cc View File

@@ -102,7 +102,7 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img,
102 102
 
103 103
     m_labelNoConfigWidget = new TQLabel(i18n("No configuration options are available for this filter"),
104 104
                                         m_configWidgetHolder);
105
-    m_configWidgetHolder->tqlayout()->add(m_labelNoConfigWidget);
105
+    m_configWidgetHolder->layout()->add(m_labelNoConfigWidget);
106 106
     m_labelNoConfigWidget->hide();
107 107
 
108 108
     resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
@@ -156,7 +156,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item )
156 156
 
157 157
     if ( m_currentConfigWidget != 0 )
158 158
     {
159
-        m_configWidgetHolder->tqlayout()->remove(m_currentConfigWidget);
159
+        m_configWidgetHolder->layout()->remove(m_currentConfigWidget);
160 160
 
161 161
         delete m_currentConfigWidget;
162 162
         m_currentConfigWidget = 0;
@@ -173,7 +173,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item )
173 173
 
174 174
     if (m_currentConfigWidget != 0)
175 175
     {
176
-        m_configWidgetHolder->tqlayout()->add(m_currentConfigWidget);
176
+        m_configWidgetHolder->layout()->add(m_currentConfigWidget);
177 177
         m_currentConfigWidget->show();
178 178
         connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged()));
179 179
     } else {

+ 1
- 1
chalk/ui/kis_dlg_layer_properties.cc View File

@@ -43,7 +43,7 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName,
43 43
     : super(parent, name, f, name, Ok | Cancel)
44 44
 {
45 45
     m_page = new WdgLayerProperties(this);
46
-    m_page->tqlayout()->setMargin(0);
46
+    m_page->layout()->setMargin(0);
47 47
 
48 48
     opacity = int((opacity * 100.0) / 255 + 0.5);
49 49
 

+ 1
- 1
chalk/ui/kis_dlg_new_layer.cc View File

@@ -48,7 +48,7 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID,
48 48
     : super(parent, name, true, "", Ok | Cancel)
49 49
 {
50 50
     m_page = new WdgLayerProperties(this);
51
-    m_page->tqlayout()->setMargin(0);
51
+    m_page->layout()->setMargin(0);
52 52
 
53 53
     setCaption(i18n("New Layer"));
54 54
 

+ 1
- 1
chalk/ui/kis_double_widget.cc View File

@@ -53,7 +53,7 @@ void KisDoubleWidget::init(double min, double max)
53 53
     connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed()));
54 54
     connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased()));
55 55
 
56
-    m_layout = new TQHBoxLayout(this, 0, -1, "hbox tqlayout");
56
+    m_layout = new TQHBoxLayout(this, 0, -1, "hbox layout");
57 57
 
58 58
     m_layout->addWidget(m_slider);
59 59
     m_layout->addSpacing(5);

+ 1
- 1
chalk/ui/kis_gradient_chooser.cc View File

@@ -49,7 +49,7 @@ KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const c
49 49
     KisCustomGradientDialog * autogradient = new KisCustomGradientDialog(view, this, "autogradient");
50 50
     connect(m_customGradient, TQT_SIGNAL(clicked()), autogradient, TQT_SLOT(show()));
51 51
     
52
-    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
52
+    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
53 53
     
54 54
     mainLayout->addWidget(m_lbName);
55 55
     mainLayout->addWidget(chooserWidget(), 10);

+ 2
- 2
chalk/ui/kis_int_spinbox.cc View File

@@ -98,7 +98,7 @@ void KisIntSpinbox::init(int val)
98 98
     d->m_prevValue = val;
99 99
     setValue(val);
100 100
     setFocusProxy(d->m_numinput);
101
-    tqlayout();
101
+    layout();
102 102
 
103 103
     connect(d->m_numinput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinboxValueChanged(int)));
104 104
     connect(d->m_slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int)));
@@ -128,7 +128,7 @@ void KisIntSpinbox::setRange(int lower, int upper, int /*step*/)
128 128
     lower = kMin(upper, lower);
129 129
     d->m_slider->setRange(lower, upper);
130 130
 
131
-    tqlayout();
131
+    layout();
132 132
 }
133 133
 
134 134
 void KisIntSpinbox::setMinValue(int min)

+ 3
- 3
chalk/ui/kis_palette_widget.cc View File

@@ -67,14 +67,14 @@ KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols)
67 67
 
68 68
     m_currentPalette = 0;
69 69
 
70
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
70
+    TQVBoxLayout *layout = new TQVBoxLayout( this );
71 71
 
72 72
     combo = new TQComboBox( false, this );
73 73
     combo->setFocusPolicy( TQ_ClickFocus );
74
-    tqlayout->addWidget(combo);
74
+    layout->addWidget(combo);
75 75
 
76 76
     m_view = new KisPaletteView(this, 0, minWidth, cols);
77
-    tqlayout->addWidget( m_view );
77
+    layout->addWidget( m_view );
78 78
 
79 79
     //setFixedSize(sizeHint());
80 80
 

+ 1
- 1
chalk/ui/kis_pattern_chooser.cc View File

@@ -30,7 +30,7 @@ KisPatternChooser::KisPatternChooser(TQWidget *parent, const char *name) : super
30 30
 {
31 31
     m_lbName = new TQLabel(this);
32 32
 
33
-    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
33
+    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
34 34
 
35 35
     mainLayout->addWidget(m_lbName);
36 36
     mainLayout->addWidget(chooserWidget(), 10);

+ 5
- 5
chalk/ui/kis_previewdialog.cc View File

@@ -28,14 +28,14 @@
28 28
 KisPreviewDialog::KisPreviewDialog( TQWidget *  parent, const char * name, bool modal, const TQString &caption)
29 29
     : super (parent, name, modal, caption, Ok | Cancel, Ok)
30 30
 {
31
-    TQHBox* tqlayout = new TQHBox(this);
32
-    tqlayout->setSpacing( 6 );
31
+    TQHBox* layout = new TQHBox(this);
32
+    layout->setSpacing( 6 );
33 33
 
34
-    m_containerFrame = new TQFrame( tqlayout, "container" );
34
+    m_containerFrame = new TQFrame( layout, "container" );
35 35
 
36
-    m_preview = new KisPreviewWidget( tqlayout, "previewWidget" );
36
+    m_preview = new KisPreviewWidget( layout, "previewWidget" );
37 37
 
38
-    setMainWidget(tqlayout);
38
+    setMainWidget(layout);
39 39
 }
40 40
 
41 41
 KisPreviewDialog::~KisPreviewDialog()

+ 3
- 3
chalk/ui/kis_previewwidgetbase.ui View File

@@ -73,7 +73,7 @@
73 73
         </widget>
74 74
         <widget class="TQLayoutWidget">
75 75
             <property name="name">
76
-                <cstring>tqlayout4</cstring>
76
+                <cstring>layout4</cstring>
77 77
             </property>
78 78
             <hbox>
79 79
                 <property name="name">
@@ -122,7 +122,7 @@
122 122
                 </widget>
123 123
                 <widget class="TQLayoutWidget">
124 124
                     <property name="name">
125
-                        <cstring>tqlayout5</cstring>
125
+                        <cstring>layout5</cstring>
126 126
                     </property>
127 127
                     <vbox>
128 128
                         <property name="name">
@@ -130,7 +130,7 @@
130 130
                         </property>
131 131
                         <widget class="TQLayoutWidget">
132 132
                             <property name="name">
133
-                                <cstring>tqlayout4</cstring>
133
+                                <cstring>layout4</cstring>
134 134
                             </property>
135 135
                             <hbox>
136 136
                                 <property name="name">

+ 1
- 1
chalk/ui/kis_selection_manager.cc View File

@@ -236,7 +236,7 @@ void KisSelectionManager::setup(KActionCollection * collection)
236 236
 //                   this, TQT_SLOT(save()),
237 237
 //                   collection, "save_selection");
238 238
 
239
-        TQClipboard *cb = TQApplication::tqclipboard();
239
+        TQClipboard *cb = TQApplication::clipboard();
240 240
         connect(cb, TQT_SIGNAL(dataChanged()), TQT_SLOT(clipboardDataChanged()));
241 241
 }
242 242
 

+ 2
- 2
chalk/ui/kis_tool_paint.cc View File

@@ -161,12 +161,12 @@ TQWidget* KisToolPaint::optionWidget()
161 161
     return m_optionWidget;
162 162
 }
163 163
 
164
-void KisToolPaint::addOptionWidgetLayout(TQLayout *tqlayout)
164
+void KisToolPaint::addOptionWidgetLayout(TQLayout *layout)
165 165
 {
166 166
     Q_ASSERT(m_optionWidget != 0);
167 167
     Q_ASSERT(m_optionWidgetLayout != 0);
168 168
     int rowCount = m_optionWidgetLayout->numRows();
169
-    m_optionWidgetLayout->addMultiCellLayout(tqlayout, rowCount, rowCount, 0, 1);
169
+    m_optionWidgetLayout->addMultiCellLayout(layout, rowCount, rowCount, 0, 1);
170 170
 }
171 171
 
172 172
 void KisToolPaint::addOptionWidgetOption(TQWidget *control, TQWidget *label)

+ 2
- 2
chalk/ui/kis_tool_paint.h View File

@@ -88,8 +88,8 @@ public slots:
88 88
 protected:
89 89
     void notifyModified() const;
90 90
 
91
-    // Add the tool-specific tqlayout to the default option widget's tqlayout.
92
-    void addOptionWidgetLayout(TQLayout *tqlayout);
91
+    // Add the tool-specific layout to the default option widget's layout.
92
+    void addOptionWidgetLayout(TQLayout *layout);
93 93
 
94 94
 private:
95 95
     void updateCompositeOpComboBox();

+ 1
- 1
chalk/ui/kis_view.cc View File

@@ -694,7 +694,7 @@ void KisView::resizeEvent(TQResizeEvent *)
694 694
     }
695 695
 
696 696
     KisImageSP img = currentImg();
697
-    TQ_INT32 scrollBarExtent = tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
697
+    TQ_INT32 scrollBarExtent = style().pixelMetric(TQStyle::PM_ScrollBarExtent);
698 698
     TQ_INT32 drawH;
699 699
     TQ_INT32 drawW;
700 700
     TQ_INT32 docW;

+ 1
- 1
chalk/ui/layerlist.cpp View File

@@ -1277,7 +1277,7 @@ void LayerItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int colum
1277 1277
 
1278 1278
     p.setFont( font() );
1279 1279
 
1280
-    const TQColorGroup cg_ = isEnabled() ? listView()->tqpalette().active() : listView()->tqpalette().disabled();
1280
+    const TQColorGroup cg_ = isEnabled() ? listView()->palette().active() : listView()->palette().disabled();
1281 1281
 
1282 1282
     const TQColor bg = isSelected()  ? cg_.highlight()
1283 1283
                     : isAlternate() ? listView()->alternateBackground()

+ 1
- 1
chalk/ui/squeezedcombobox.cpp View File

@@ -98,7 +98,7 @@ TQSize SqueezedComboBox::sizeHint() const
98 98
     int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18;
99 99
     int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2;
100 100
 
101
-    return tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this,
101
+    return style().tqsizeFromContents(TQStyle::CT_ComboBox, this,
102 102
     TQSize(maxW, maxH)).
103 103
             expandedTo(TQApplication::globalStrut());
104 104
 }

+ 4
- 4
chalk/ui/wdgautobrush.ui View File

@@ -26,7 +26,7 @@
26 26
         </property>
27 27
         <widget class="TQLayoutWidget" row="0" column="1">
28 28
             <property name="name">
29
-                <cstring>tqlayout3</cstring>
29
+                <cstring>layout3</cstring>
30 30
             </property>
31 31
             <vbox>
32 32
                 <property name="name">
@@ -48,7 +48,7 @@
48 48
                         </property>
49 49
                         <widget class="TQLayoutWidget">
50 50
                             <property name="name">
51
-                                <cstring>tqlayout21</cstring>
51
+                                <cstring>layout21</cstring>
52 52
                             </property>
53 53
                             <grid>
54 54
                                 <property name="name">
@@ -169,7 +169,7 @@
169 169
                         </property>
170 170
                         <widget class="TQLayoutWidget">
171 171
                             <property name="name">
172
-                                <cstring>tqlayout23</cstring>
172
+                                <cstring>layout23</cstring>
173 173
                             </property>
174 174
                             <grid>
175 175
                                 <property name="name">
@@ -273,7 +273,7 @@
273 273
         </widget>
274 274
         <widget class="TQLayoutWidget" row="0" column="0">
275 275
             <property name="name">
276
-                <cstring>tqlayout6</cstring>
276
+                <cstring>layout6</cstring>
277 277
             </property>
278 278
             <vbox>
279 279
                 <property name="name">

+ 6
- 6
chalk/ui/wdgautogradient.ui View File

@@ -57,7 +57,7 @@
57 57
                 </widget>
58 58
                 <widget class="TQLayoutWidget">
59 59
                     <property name="name">
60
-                        <cstring>tqlayout11</cstring>
60
+                        <cstring>layout11</cstring>
61 61
                     </property>
62 62
                     <property name="font">
63 63
                         <font>
@@ -71,7 +71,7 @@
71 71
                         </property>
72 72
                         <widget class="TQLayoutWidget">
73 73
                             <property name="name">
74
-                                <cstring>tqlayout10</cstring>
74
+                                <cstring>layout10</cstring>
75 75
                             </property>
76 76
                             <property name="font">
77 77
                                 <font>
@@ -95,7 +95,7 @@
95 95
                                 </widget>
96 96
                                 <widget class="TQLayoutWidget">
97 97
                                     <property name="name">
98
-                                        <cstring>tqlayout8</cstring>
98
+                                        <cstring>layout8</cstring>
99 99
                                     </property>
100 100
                                     <property name="font">
101 101
                                         <font>
@@ -150,7 +150,7 @@
150 150
                                 </widget>
151 151
                                 <widget class="TQLayoutWidget">
152 152
                                     <property name="name">
153
-                                        <cstring>tqlayout9</cstring>
153
+                                        <cstring>layout9</cstring>
154 154
                                     </property>
155 155
                                     <property name="font">
156 156
                                         <font>
@@ -207,7 +207,7 @@
207 207
                         </widget>
208 208
                         <widget class="TQLayoutWidget">
209 209
                             <property name="name">
210
-                                <cstring>tqlayout5</cstring>
210
+                                <cstring>layout5</cstring>
211 211
                             </property>
212 212
                             <property name="font">
213 213
                                 <font>
@@ -287,7 +287,7 @@
287 287
                 </widget>
288 288
                 <widget class="TQLayoutWidget">
289 289
                     <property name="name">
290
-                        <cstring>tqlayout11_2</cstring>
290
+                        <cstring>layout11_2</cstring>
291 291
                     </property>
292 292
                     <property name="font">
293 293
                         <font>

+ 3
- 3
chalk/ui/wdgbirdeye.ui View File

@@ -39,7 +39,7 @@
39 39
         </property>
40 40
         <widget class="TQLayoutWidget">
41 41
             <property name="name">
42
-                <cstring>tqlayout4</cstring>
42
+                <cstring>layout4</cstring>
43 43
             </property>
44 44
             <hbox>
45 45
                 <property name="name">
@@ -53,7 +53,7 @@
53 53
                 </property>
54 54
                 <widget class="TQLayoutWidget">
55 55
                     <property name="name">
56
-                        <cstring>tqlayout10</cstring>
56
+                        <cstring>layout10</cstring>
57 57
                     </property>
58 58
                     <vbox>
59 59
                         <property name="name">
@@ -195,7 +195,7 @@
195 195
         </widget>
196 196
         <widget class="TQLayoutWidget">
197 197
             <property name="name">
198
-                <cstring>tqlayout4</cstring>
198
+                <cstring>layout4</cstring>
199 199
             </property>
200 200
             <hbox>
201 201
                 <property name="name">

+ 2
- 2
chalk/ui/wdgcolorsettings.ui View File

@@ -21,7 +21,7 @@
21 21
         </property>
22 22
         <widget class="TQLayoutWidget">
23 23
             <property name="name">
24
-                <cstring>tqlayout8</cstring>
24
+                <cstring>layout8</cstring>
25 25
             </property>
26 26
             <hbox>
27 27
                 <property name="name">
@@ -266,7 +266,7 @@ The different rendering intent methods will affect only what is shown on screen,
266 266
         </widget>
267 267
         <widget class="TQLayoutWidget">
268 268
             <property name="name">
269
-                <cstring>tqlayout6</cstring>
269
+                <cstring>layout6</cstring>
270 270
             </property>
271 271
             <vbox>
272 272
                 <property name="name">

+ 3
- 3
chalk/ui/wdgcustombrush.ui View File

@@ -18,7 +18,7 @@
18 18
         </property>
19 19
         <widget class="TQLayoutWidget">
20 20
             <property name="name">
21
-                <cstring>tqlayout4</cstring>
21
+                <cstring>layout4</cstring>
22 22
             </property>
23 23
             <grid>
24 24
                 <property name="name">
@@ -103,7 +103,7 @@
103 103
         </widget>
104 104
         <widget class="TQLayoutWidget">
105 105
             <property name="name">
106
-                <cstring>tqlayout6</cstring>
106
+                <cstring>layout6</cstring>
107 107
             </property>
108 108
             <hbox>
109 109
                 <property name="name">
@@ -169,7 +169,7 @@
169 169
         </widget>
170 170
         <widget class="TQLayoutWidget">
171 171
             <property name="name">
172
-                <cstring>tqlayout7</cstring>
172
+                <cstring>layout7</cstring>
173 173
             </property>
174 174
             <vbox>
175 175
                 <property name="name">

+ 3
- 3
chalk/ui/wdgcustompattern.ui View File

@@ -18,7 +18,7 @@
18 18
         </property>
19 19
         <widget class="TQLayoutWidget">
20 20
             <property name="name">
21
-                <cstring>tqlayout4</cstring>
21
+                <cstring>layout4</cstring>
22 22
             </property>
23 23
             <hbox>
24 24
                 <property name="name">
@@ -49,7 +49,7 @@
49 49
         </widget>
50 50
         <widget class="TQLayoutWidget">
51 51
             <property name="name">
52
-                <cstring>tqlayout6</cstring>
52
+                <cstring>layout6</cstring>
53 53
             </property>
54 54
             <hbox>
55 55
                 <property name="name">
@@ -115,7 +115,7 @@
115 115
         </widget>
116 116
         <widget class="TQLayoutWidget">
117 117
             <property name="name">
118
-                <cstring>tqlayout7</cstring>
118
+                <cstring>layout7</cstring>
119 119
             </property>
120 120
             <vbox>
121 121
                 <property name="name">

+ 1
- 1
chalk/ui/wdgdisplaysettings.ui View File

@@ -49,7 +49,7 @@
49 49
                 </property>
50 50
                 <widget class="TQLayoutWidget">
51 51
                     <property name="name">
52
-                        <cstring>tqlayout4</cstring>
52
+                        <cstring>layout4</cstring>
53 53
                     </property>
54 54
                     <vbox>
55 55
                         <property name="name">

+ 3
- 3
chalk/ui/wdggeneralsettings.ui View File

@@ -18,7 +18,7 @@
18 18
         </property>
19 19
         <widget class="TQLayoutWidget" row="0" column="0">
20 20
             <property name="name">
21
-                <cstring>tqlayout3</cstring>
21
+                <cstring>layout3</cstring>
22 22
             </property>
23 23
             <vbox>
24 24
                 <property name="name">
@@ -26,7 +26,7 @@
26 26
                 </property>
27 27
                 <widget class="TQLayoutWidget">
28 28
                     <property name="name">
29
-                        <cstring>tqlayout1</cstring>
29
+                        <cstring>layout1</cstring>
30 30
                     </property>
31 31
                     <hbox>
32 32
                         <property name="name">
@@ -112,7 +112,7 @@
112 112
                 </widget>
113 113
                 <widget class="TQLayoutWidget">
114 114
                     <property name="name">
115
-                        <cstring>tqlayout2</cstring>
115
+                        <cstring>layout2</cstring>
116 116
                     </property>
117 117
                     <hbox>
118 118
                         <property name="name">

+ 3
- 3
chalk/ui/wdggridsettings.ui View File

@@ -214,7 +214,7 @@
214 214
                 </property>
215 215
                 <widget class="TQLayoutWidget" row="0" column="0">
216 216
                     <property name="name">
217
-                        <cstring>tqlayout8</cstring>
217
+                        <cstring>layout8</cstring>
218 218
                     </property>
219 219
                     <hbox>
220 220
                         <property name="name">
@@ -222,7 +222,7 @@
222 222
                         </property>
223 223
                         <widget class="TQLayoutWidget">
224 224
                             <property name="name">
225
-                                <cstring>tqlayout6</cstring>
225
+                                <cstring>layout6</cstring>
226 226
                             </property>
227 227
                             <grid>
228 228
                                 <property name="name">
@@ -320,7 +320,7 @@
320 320
                 </widget>
321 321
                 <widget class="TQLayoutWidget" row="1" column="0">
322 322
                     <property name="name">
323
-                        <cstring>tqlayout9</cstring>
323
+                        <cstring>layout9</cstring>
324 324
                     </property>
325 325
                     <hbox>
326 326
                         <property name="name">

+ 2
- 2
chalk/ui/wdglayerbox.ui View File

@@ -24,7 +24,7 @@
24 24
         </property>
25 25
         <widget class="TQLayoutWidget">
26 26
             <property name="name">
27
-                <cstring>tqlayout3</cstring>
27
+                <cstring>layout3</cstring>
28 28
             </property>
29 29
             <hbox>
30 30
                 <property name="name">
@@ -74,7 +74,7 @@
74 74
         </widget>
75 75
         <widget class="TQLayoutWidget">
76 76
             <property name="name">
77
-                <cstring>tqlayout6</cstring>
77
+                <cstring>layout6</cstring>
78 78
             </property>
79 79
             <hbox>
80 80
                 <property name="name">

+ 1
- 1
chalk/ui/wdgnewimage.ui View File

@@ -316,7 +316,7 @@
316 316
         </widget>
317 317
         <widget class="TQLayoutWidget">
318 318
             <property name="name">
319
-                <cstring>tqlayout1</cstring>
319
+                <cstring>layout1</cstring>
320 320
             </property>
321 321
             <hbox>
322 322
                 <property name="name">

+ 1
- 1
chalk/ui/wdgpalettechooser.ui View File

@@ -29,7 +29,7 @@
29 29
         </widget>
30 30
         <widget class="TQLayoutWidget">
31 31
             <property name="name">
32
-                <cstring>tqlayout2</cstring>
32
+                <cstring>layout2</cstring>
33 33
             </property>
34 34
             <hbox>
35 35
                 <property name="name">

+ 2
- 2
chalk/ui/wdgperformancesettings.ui View File

@@ -18,7 +18,7 @@
18 18
         </property>
19 19
         <widget class="TQLayoutWidget">
20 20
             <property name="name">
21
-                <cstring>tqlayout4</cstring>
21
+                <cstring>layout4</cstring>
22 22
             </property>
23 23
             <hbox>
24 24
                 <property name="name">
@@ -72,7 +72,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
72 72
         </widget>
73 73
         <widget class="TQLayoutWidget">
74 74
             <property name="name">
75
-                <cstring>tqlayout5</cstring>
75
+                <cstring>layout5</cstring>
76 76
             </property>
77 77
             <hbox>
78 78
                 <property name="name">

+ 1
- 1
chalk/ui/wdgselectionoptions.ui View File

@@ -24,7 +24,7 @@
24 24
         </property>
25 25
         <widget class="TQLayoutWidget">
26 26
             <property name="name">
27
-                <cstring>tqlayout1</cstring>
27
+                <cstring>layout1</cstring>
28 28
             </property>
29 29
             <hbox>
30 30
                 <property name="name">

+ 6
- 6
chalk/ui/wdgtabletdevicesettings.ui View File

@@ -49,7 +49,7 @@
49 49
                 </property>
50 50
                 <widget class="TQLayoutWidget">
51 51
                     <property name="name">
52
-                        <cstring>tqlayout4</cstring>
52
+                        <cstring>layout4</cstring>
53 53
                     </property>
54 54
                     <hbox>
55 55
                         <property name="name">
@@ -72,7 +72,7 @@
72 72
                 </widget>
73 73
                 <widget class="TQLayoutWidget">
74 74
                     <property name="name">
75
-                        <cstring>tqlayout4_4</cstring>
75
+                        <cstring>layout4_4</cstring>
76 76
                     </property>
77 77
                     <hbox>
78 78
                         <property name="name">
@@ -95,7 +95,7 @@
95 95
                 </widget>
96 96
                 <widget class="TQLayoutWidget">
97 97
                     <property name="name">
98
-                        <cstring>tqlayout4_2</cstring>
98
+                        <cstring>layout4_2</cstring>
99 99
                     </property>
100 100
                     <hbox>
101 101
                         <property name="name">
@@ -118,7 +118,7 @@
118 118
                 </widget>
119 119
                 <widget class="TQLayoutWidget">
120 120
                     <property name="name">
121
-                        <cstring>tqlayout4_3</cstring>
121
+                        <cstring>layout4_3</cstring>
122 122
                     </property>
123 123
                     <hbox>
124 124
                         <property name="name">
@@ -141,7 +141,7 @@
141 141
                 </widget>
142 142
                 <widget class="TQLayoutWidget">
143 143
                     <property name="name">
144
-                        <cstring>tqlayout4_6</cstring>
144
+                        <cstring>layout4_6</cstring>
145 145
                     </property>
146 146
                     <hbox>
147 147
                         <property name="name">
@@ -164,7 +164,7 @@
164 164
                 </widget>
165 165
                 <widget class="TQLayoutWidget">
166 166
                     <property name="name">
167
-                        <cstring>tqlayout4_5</cstring>
167
+                        <cstring>layout4_5</cstring>
168 168
                     </property>
169 169
                     <hbox>
170 170
                         <property name="name">

+ 2
- 2
chalk/ui/wdgtabletsettings.ui View File

@@ -32,7 +32,7 @@
32 32
                 </property>
33 33
                 <widget class="TQLayoutWidget">
34 34
                     <property name="name">
35
-                        <cstring>tqlayout4</cstring>
35
+                        <cstring>layout4</cstring>
36 36
                     </property>
37 37
                     <hbox>
38 38
                         <property name="name">
@@ -55,7 +55,7 @@
55 55
                 </widget>
56 56
                 <widget class="TQLayoutWidget">
57 57
                     <property name="name">
58
-                        <cstring>tqlayout5</cstring>
58
+                        <cstring>layout5</cstring>
59 59
                     </property>
60 60
                     <hbox>
61 61
                         <property name="name">

+ 3
- 3
chalk/ui/wdgtextbrush.ui View File

@@ -21,7 +21,7 @@
21 21
         </property>
22 22
         <widget class="TQLayoutWidget" row="0" column="0">
23 23
             <property name="name">
24
-                <cstring>tqlayout3</cstring>
24
+                <cstring>layout3</cstring>
25 25
             </property>
26 26
             <vbox>
27 27
                 <property name="name">
@@ -29,7 +29,7 @@
29 29
                 </property>
30 30
                 <widget class="TQLayoutWidget">
31 31
                     <property name="name">
32
-                        <cstring>tqlayout9</cstring>
32
+                        <cstring>layout9</cstring>
33 33
                     </property>
34 34
                     <hbox>
35 35
                         <property name="name">
@@ -65,7 +65,7 @@
65 65
                 </widget>
66 66
                 <widget class="TQLayoutWidget">
67 67
                     <property name="name">
68
-                        <cstring>tqlayout10</cstring>
68
+                        <cstring>layout10</cstring>
69 69
                     </property>
70 70
                     <hbox>
71 71
                         <property name="name">

+ 3
- 3
filters/chalk/jpeg/kis_wdg_options_jpeg.ui View File

@@ -21,7 +21,7 @@
21 21
         </property>
22 22
         <widget class="TQLayoutWidget">
23 23
             <property name="name">
24
-                <cstring>tqlayout4</cstring>
24
+                <cstring>layout4</cstring>
25 25
             </property>
26 26
             <hbox>
27 27
                 <property name="name">
@@ -40,7 +40,7 @@
40 40
                 </widget>
41 41
                 <widget class="TQLayoutWidget">
42 42
                     <property name="name">
43
-                        <cstring>tqlayout5</cstring>
43
+                        <cstring>layout5</cstring>
44 44
                     </property>
45 45
                     <vbox>
46 46
                         <property name="name">
@@ -80,7 +80,7 @@
80 80
                         </widget>
81 81
                         <widget class="TQLayoutWidget">
82 82
                             <property name="name">
83
-                                <cstring>tqlayout4</cstring>
83
+                                <cstring>layout4</cstring>
84 84
                             </property>
85 85
                             <hbox>
86 86
                                 <property name="name">

+ 4
- 4
filters/chalk/pdf/pdfimportwidgetbase.ui View File

@@ -40,7 +40,7 @@
40 40
                 </widget>
41 41
                 <widget class="TQLayoutWidget">
42 42
                     <property name="name">
43
-                        <cstring>tqlayout6</cstring>
43
+                        <cstring>layout6</cstring>
44 44
                     </property>
45 45
                     <hbox>
46 46
                         <property name="name">
@@ -65,7 +65,7 @@
65 65
                         </spacer>
66 66
                         <widget class="TQLayoutWidget">
67 67
                             <property name="name">
68
-                                <cstring>tqlayout2</cstring>
68
+                                <cstring>layout2</cstring>
69 69
                             </property>
70 70
                             <grid>
71 71
                                 <property name="name">
@@ -160,7 +160,7 @@
160 160
                 </widget>
161 161
                 <widget class="TQLayoutWidget">
162 162
                     <property name="name">
163
-                        <cstring>tqlayout4</cstring>
163
+                        <cstring>layout4</cstring>
164 164
                     </property>
165 165
                     <hbox>
166 166
                         <property name="name">
@@ -185,7 +185,7 @@
185 185
                         </spacer>
186 186
                         <widget class="TQLayoutWidget">
187 187
                             <property name="name">
188
-                                <cstring>tqlayout3</cstring>
188
+                                <cstring>layout3</cstring>
189 189
                             </property>
190 190
                             <grid>
191 191
                                 <property name="name">

+ 3
- 3
filters/chalk/png/kis_wdg_options_png.ui View File

@@ -24,7 +24,7 @@
24 24
         </property>
25 25
         <widget class="TQLayoutWidget" row="0" column="0">
26 26
             <property name="name">
27
-                <cstring>tqlayout6</cstring>
27
+                <cstring>layout6</cstring>
28 28
             </property>
29 29
             <hbox>
30 30
                 <property name="name">
@@ -50,7 +50,7 @@
50 50
                 </widget>
51 51
                 <widget class="TQLayoutWidget">
52 52
                     <property name="name">
53
-                        <cstring>tqlayout5</cstring>
53
+                        <cstring>layout5</cstring>
54 54
                     </property>
55 55
                     <vbox>
56 56
                         <property name="name">
@@ -88,7 +88,7 @@
88 88
                         </widget>
89 89
                         <widget class="TQLayoutWidget">
90 90
                             <property name="name">
91
-                                <cstring>tqlayout4</cstring>
91
+                                <cstring>layout4</cstring>
92 92
                             </property>
93 93
                             <hbox>
94 94
                                 <property name="name">

+ 3
- 3
filters/chalk/raw/wdgrawimport.ui View File

@@ -45,7 +45,7 @@
45 45
         </widget>
46 46
         <widget class="TQLayoutWidget" row="0" column="0">
47 47
             <property name="name">
48
-                <cstring>tqlayout2</cstring>
48
+                <cstring>layout2</cstring>
49 49
             </property>
50 50
             <vbox>
51 51
                 <property name="name">
@@ -330,7 +330,7 @@
330 330
         </spacer>
331 331
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
332 332
             <property name="name">
333
-                <cstring>tqlayout4</cstring>
333
+                <cstring>layout4</cstring>
334 334
             </property>
335 335
             <hbox>
336 336
                 <property name="name">
@@ -355,7 +355,7 @@
355 355
                 </widget>
356 356
                 <widget class="TQLayoutWidget">
357 357
                     <property name="name">
358
-                        <cstring>tqlayout10</cstring>
358
+                        <cstring>layout10</cstring>
359 359
                     </property>
360 360
                     <hbox>
361 361
                         <property name="name">

+ 8
- 8
filters/chalk/tiff/kis_wdg_options_tiff.ui View File

@@ -51,7 +51,7 @@
51 51
                 </property>
52 52
                 <widget class="TQLayoutWidget">
53 53
                     <property name="name">
54
-                        <cstring>tqlayout10</cstring>
54
+                        <cstring>layout10</cstring>
55 55
                     </property>
56 56
                     <hbox>
57 57
                         <property name="name">
@@ -119,7 +119,7 @@
119 119
                 </widget>
120 120
                 <widget class="TQLayoutWidget">
121 121
                     <property name="name">
122
-                        <cstring>tqlayout7</cstring>
122
+                        <cstring>layout7</cstring>
123 123
                     </property>
124 124
                     <hbox>
125 125
                         <property name="name">
@@ -289,7 +289,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
289 289
                             </widget>
290 290
                             <widget class="TQLayoutWidget">
291 291
                                 <property name="name">
292
-                                    <cstring>tqlayout5</cstring>
292
+                                    <cstring>layout5</cstring>
293 293
                                 </property>
294 294
                                 <vbox>
295 295
                                     <property name="name">
@@ -329,7 +329,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
329 329
                                     </widget>
330 330
                                     <widget class="TQLayoutWidget">
331 331
                                         <property name="name">
332
-                                            <cstring>tqlayout4_2</cstring>
332
+                                            <cstring>layout4_2</cstring>
333 333
                                         </property>
334 334
                                         <hbox>
335 335
                                             <property name="name">
@@ -418,7 +418,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
418 418
                             </widget>
419 419
                             <widget class="TQLayoutWidget">
420 420
                                 <property name="name">
421
-                                    <cstring>tqlayout5_2</cstring>
421
+                                    <cstring>layout5_2</cstring>
422 422
                                 </property>
423 423
                                 <vbox>
424 424
                                     <property name="name">
@@ -456,7 +456,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
456 456
                                     </widget>
457 457
                                     <widget class="TQLayoutWidget">
458 458
                                         <property name="name">
459
-                                            <cstring>tqlayout4</cstring>
459
+                                            <cstring>layout4</cstring>
460 460
                                         </property>
461 461
                                         <hbox>
462 462
                                             <property name="name">
@@ -621,7 +621,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
621 621
                             </widget>
622 622
                             <widget class="TQLayoutWidget">
623 623
                                 <property name="name">
624
-                                    <cstring>tqlayout5_2_2</cstring>
624
+                                    <cstring>layout5_2_2</cstring>
625 625
                                 </property>
626 626
                                 <vbox>
627 627
                                     <property name="name">
@@ -659,7 +659,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
659 659
                                     </widget>
660 660
                                     <widget class="TQLayoutWidget">
661 661
                                         <property name="name">
662
-                                            <cstring>tqlayout4_3</cstring>
662
+                                            <cstring>layout4_3</cstring>
663 663
                                         </property>
664 664
                                         <hbox>
665 665
                                             <property name="name">

+ 1
- 1
filters/karbon/applixgraphics/applixgraphicimport.cc View File

@@ -156,7 +156,7 @@ KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from,
156 156
     str += "<!DOCTYPE karbon>\n";
157 157
     str += " <karbon mime=\"application/x-karbon\" version=\"2\" editor=\"APPLIXGRAPHICS import filter\">\n";
158 158
 //      str += "  <head>\n";
159
-//      str += "   <tqlayout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n";
159
+//      str += "   <layout width=\"210\" lmargin=\"0\" format=\"a4\" bmargin=\"0\" height=\"297\" rmargin=\"0\" tmargin=\"0\" orientation=\"portrait\"/>\n";
160 160
 //      str += "   <grid dx=\"20\" dy=\"20\" align=\"0\">\n";
161 161
 //      str += "    <helplines align=\"0\"/>\n";
162 162
 //      str += "   </grid>\n";

+ 2
- 2
filters/karbon/kontour/kontourimport.cpp View File

@@ -198,8 +198,8 @@ KontourImport::convert()
198 198
 	if( docElem.attribute( "version" ).toInt() == 2 )
199 199
 	{
200 200
 		lay = docElem;
201
-		height = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "height" ).toDouble();
202
-		width = lay.firstChild().namedItem( "tqlayout" ).toElement().attribute( "width" ).toDouble();
201
+		height = lay.firstChild().namedItem( "layout" ).toElement().attribute( "height" ).toDouble();
202
+		width = lay.firstChild().namedItem( "layout" ).toElement().attribute( "width" ).toDouble();
203 203
 	}
204 204
 	else
205 205
 	{

+ 6
- 6
filters/karbon/xfig/xfigimport.cc View File

@@ -167,7 +167,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
167 167
 
168 168
   char buf[255];
169 169
   int value;
170
-  KoPageLayout tqlayout;
170
+  KoPageLayout layout;
171 171
 
172 172
   ifstream fin( file.local8Bit() );
173 173
   if (! fin)
@@ -177,7 +177,7 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
177 177
     GDocument *gdoc             = kidoc->gdoc();
178 178
     //GPage *activePage           = gdoc->activePage();
179 179
 
180
-  tqlayout = gdoc->activePage()->pageLayout ();
180
+  layout = gdoc->activePage()->pageLayout ();
181 181
 
182 182
   fin.getline (buf, 255);
183 183
   if (::strncmp (buf, "#FIG 3", 6)) {
@@ -203,9 +203,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
203 203
   // orientation
204 204
   fin.getline (buf, 255);
205 205
   if (::strcmp (buf, "Landscape") == 0)
206
-      tqlayout.orientation = PG_LANDSCAPE;
206
+      layout.orientation = PG_LANDSCAPE;
207 207
   else if (::strcmp (buf, "Portrait") == 0)
208
-      tqlayout.orientation = PG_PORTRAIT;
208
+      layout.orientation = PG_PORTRAIT;
209 209
   else
210 210
       kdDebug() << "ERROR: invalid orientation" << endl;
211 211
 
@@ -215,9 +215,9 @@ bool XFIGImport::filterImport( const TQString &file, KoDocument *doc,
215 215
   // units
216 216
   fin.getline (buf, 255);
217 217
   if (::strcmp (buf, "Metric") == 0)
218
-      tqlayout.unit = PG_MM;
218
+      layout.unit = PG_MM;
219 219
   else if (::strcmp (buf, "Inches") == 0)
220
-      tqlayout.unit = PG_INCH;
220
+      layout.unit = PG_INCH;
221 221
   else
222 222
       kdDebug() << "ERROR: invalid units" << endl;
223 223
 

+ 13
- 13
filters/kformula/png/pngexportdia.cc View File

@@ -190,13 +190,13 @@ void PNGExportDia::setupGUI()
190 190
     width->setText( i18n( "Width" ) );
191 191
     heightEdit = new KIntNumInput( page, "heightEdit" );
192 192
 
193
-    TQGridLayout* tqlayout1 = new TQGridLayout;
194
-    tqlayout1->addWidget( height, 1, 0 );
195
-    tqlayout1->addWidget( widthEdit, 0, 1 );
196
-    tqlayout1->addWidget( width, 0, 0 );
197
-    tqlayout1->addWidget( heightEdit, 1, 1 );
193
+    TQGridLayout* layout1 = new TQGridLayout;
194
+    layout1->addWidget( height, 1, 0 );
195
+    layout1->addWidget( widthEdit, 0, 1 );
196
+    layout1->addWidget( width, 0, 0 );
197
+    layout1->addWidget( heightEdit, 1, 1 );
198 198
 
199
-    mainLayout->addLayout( tqlayout1 );
199
+    mainLayout->addLayout( layout1 );
200 200
 
201 201
     TQLabel* percentHeight = new TQLabel( page, "PercentHeight" );
202 202
     percentHeight->setText( i18n( "Height (%)" ) );
@@ -205,15 +205,15 @@ void PNGExportDia::setupGUI()
205 205
     percWidthEdit = new KDoubleNumInput( page, "percWidthEdit" );
206 206
     percHeightEdit = new KDoubleNumInput( page, "percHeightEdit" );
207 207
 
208
-    TQGridLayout* tqlayout2 = new TQGridLayout;
209
-    tqlayout2->addWidget( percWidthEdit, 0, 1 );
210
-    tqlayout2->addWidget( percHeightEdit, 1, 1 );
211
-    tqlayout2->addWidget( percentHeight, 1, 0 );
212
-    tqlayout2->addWidget( percentWidth, 0, 0 );
208
+    TQGridLayout* layout2 = new TQGridLayout;
209
+    layout2->addWidget( percWidthEdit, 0, 1 );
210
+    layout2->addWidget( percHeightEdit, 1, 1 );
211
+    layout2->addWidget( percentHeight, 1, 0 );
212
+    layout2->addWidget( percentWidth, 0, 0 );
213 213
 
214
-    mainLayout->addLayout( tqlayout2 );
214
+    mainLayout->addLayout( layout2 );
215 215
 
216
-    /* Display the main tqlayout */
216
+    /* Display the main layout */
217 217
     mainLayout->addStretch( 5 );
218 218
     mainLayout->activate();
219 219
 }

+ 1
- 1
filters/kpresenter/magicpoint/mgp2kpr.py View File

@@ -283,7 +283,7 @@ class MgpImporter:
283 283
     if (self.fontItalic!=0):
284 284
       elem.setAttribute("italic", "1")
285 285
     
286
-    text=self.document.createTextNode(tqunicode(line, self.charset, 'ignore'))
286
+    text=self.document.createTextNode(unicode(line, self.charset, 'ignore'))
287 287
     elem.appendChild(text)
288 288
     pElem.appendChild(elem)
289 289
     self.textElem.appendChild(pElem)

+ 1
- 1
filters/kpresenter/ooimpress/ooimpressexport.cc View File

@@ -758,7 +758,7 @@ void OoImpressExport::appendNote( TQDomDocument & doc, TQDomElement & source, TQ
758 758
     TQDomElement noteTextBox = doc.createElement( "draw:text-box" );
759 759
 
760 760
     //TODO : add draw:text-box size :
761
-    //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="tqlayout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
761
+    //<draw:text-box draw:style-name="gr2" draw:text-style-name="P2" draw:layer="layout" svg:width="13.336cm" svg:height="56.288cm" svg:x="-0.54cm" svg:y="-14.846cm">
762 762
 
763 763
     TQStringList text = TQStringList::split( "\n", noteText );
764 764
     for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) {

+ 21
- 21
filters/kpresenter/powerpoint/import/powerpointimport.cc View File

@@ -178,10 +178,10 @@ TQByteArray PowerPointImport::createStyles()
178 178
 
179 179
   // office:automatic-styles
180 180
   stylesWriter->startElement( "office:automatic-styles" );
181
-  stylesWriter->startElement( "style:page-tqlayout" );
181
+  stylesWriter->startElement( "style:page-layout" );
182 182
   stylesWriter->addAttribute( "style:name","pm1" );
183 183
   stylesWriter->addAttribute( "style:page-usage","all" );
184
-  stylesWriter->startElement( "style:page-tqlayout-properties" );
184
+  stylesWriter->startElement( "style:page-layout-properties" );
185 185
   stylesWriter->addAttribute( "fo:margin-bottom","0pt" ); 
186 186
   stylesWriter->addAttribute( "fo:margin-left","0pt" );   
187 187
   stylesWriter->addAttribute( "fo:margin-right","0pt" );  
@@ -189,8 +189,8 @@ TQByteArray PowerPointImport::createStyles()
189 189
   stylesWriter->addAttribute( "fo:page-height", pageHeight );
190 190
   stylesWriter->addAttribute( "fo:page-width", pageWidth );
191 191
   stylesWriter->addAttribute( "style:print-orientation","landscape" );
192
-  stylesWriter->endElement(); // style:page-tqlayout-properties
193
-  stylesWriter->endElement(); // style:page-tqlayout
192
+  stylesWriter->endElement(); // style:page-layout-properties
193
+  stylesWriter->endElement(); // style:page-layout
194 194
 
195 195
   stylesWriter->startElement( "style:style" );
196 196
   stylesWriter->addAttribute( "style:name","dp1" );
@@ -237,7 +237,7 @@ TQByteArray PowerPointImport::createStyles()
237 237
   stylesWriter->startElement( "office:master-styles" );
238 238
   stylesWriter->startElement( "style:master-page" );
239 239
   stylesWriter->addAttribute( "style:name", "Standard" );
240
-  stylesWriter->addAttribute( "style:page-tqlayout-name", "pm1" );
240
+  stylesWriter->addAttribute( "style:page-layout-name", "pm1" );
241 241
   stylesWriter->addAttribute( "draw:style-name", "dp1" );
242 242
   stylesWriter->endElement();
243 243
   stylesWriter->endElement();
@@ -363,7 +363,7 @@ void PowerPointImport::processEllipse (DrawObject* drawObject, KoXmlWriter* xmlW
363 363
   xmlWriter->addAttribute( "svg:height", heightStr );
364 364
   xmlWriter->addAttribute( "svg:x", xStr );
365 365
   xmlWriter->addAttribute( "svg:y", yStr );
366
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
366
+  xmlWriter->addAttribute( "draw:layer", "layout" );
367 367
   xmlWriter->endElement(); // draw:ellipse
368 368
 }
369 369
 
@@ -401,7 +401,7 @@ void PowerPointImport::processRectangle (DrawObject* drawObject, KoXmlWriter* xm
401 401
     xmlWriter->addAttribute( "svg:x", xStr );
402 402
     xmlWriter->addAttribute( "svg:y", yStr );
403 403
   }
404
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
404
+  xmlWriter->addAttribute( "draw:layer", "layout" );
405 405
   xmlWriter->endElement(); // draw:rect
406 406
 }
407 407
 
@@ -463,7 +463,7 @@ void PowerPointImport::processRoundRectangle (DrawObject* drawObject, KoXmlWrite
463 463
  // xmlWriter->addAttribute( "svg:x", xStr );
464 464
  // xmlWriter->addAttribute( "svg:y", yStr );
465 465
   
466
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
466
+  xmlWriter->addAttribute( "draw:layer", "layout" );
467 467
     xmlWriter->startElement( "draw:enhanced-geometry" );
468 468
     xmlWriter->addAttribute( "draw:type", "round-rectangle"); 
469 469
       xmlWriter->startElement( "draw:equation" );
@@ -525,7 +525,7 @@ void PowerPointImport::processDiamond (DrawObject* drawObject, KoXmlWriter* xmlW
525 525
     xmlWriter->startElement( "draw:enhanced-geometry" );
526 526
     xmlWriter->addAttribute( "draw:type", "diamond");
527 527
     xmlWriter->endElement();    
528
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
528
+  xmlWriter->addAttribute( "draw:layer", "layout" );
529 529
   xmlWriter->endElement(); 
530 530
 }
531 531
 
@@ -546,7 +546,7 @@ void PowerPointImport::processTriangle (DrawObject* drawObject, KoXmlWriter* xml
546 546
   xmlWriter->addAttribute( "svg:height", heightStr );
547 547
   xmlWriter->addAttribute( "svg:x", xStr );
548 548
   xmlWriter->addAttribute( "svg:y", yStr );
549
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
549
+  xmlWriter->addAttribute( "draw:layer", "layout" );
550 550
     xmlWriter->startElement( "draw:glue-point" );
551 551
     xmlWriter->addAttribute( "svg:x", 5 );
552 552
     xmlWriter->addAttribute( "svg:y", 0 );
@@ -657,7 +657,7 @@ void PowerPointImport::processTrapezoid (DrawObject* drawObject, KoXmlWriter* xm
657 657
   xmlWriter->addAttribute( "svg:height", heightStr );
658 658
   xmlWriter->addAttribute( "svg:x", xStr );
659 659
   xmlWriter->addAttribute( "svg:y", yStr );
660
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
660
+  xmlWriter->addAttribute( "draw:layer", "layout" );
661 661
   
662 662
         xmlWriter->startElement( "draw:glue-point" );
663 663
   xmlWriter->addAttribute( "svg:x", 5 );
@@ -738,7 +738,7 @@ void PowerPointImport::processParallelogram (DrawObject* drawObject, KoXmlWriter
738 738
   xmlWriter->addAttribute( "svg:height", heightStr );
739 739
   xmlWriter->addAttribute( "svg:x", xStr );
740 740
   xmlWriter->addAttribute( "svg:y", yStr );
741
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
741
+  xmlWriter->addAttribute( "draw:layer", "layout" );
742 742
         xmlWriter->startElement( "draw:glue-point" );
743 743
   xmlWriter->addAttribute( "svg:x", 6.25 );
744 744
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -854,7 +854,7 @@ void PowerPointImport::processHexagon (DrawObject* drawObject, KoXmlWriter* xmlW
854 854
     xmlWriter->addAttribute( "svg:height", heightStr );
855 855
     xmlWriter->addAttribute( "svg:x", xStr );
856 856
     xmlWriter->addAttribute( "svg:y", yStr );
857
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
857
+    xmlWriter->addAttribute( "draw:layer", "layout" );
858 858
   xmlWriter->startElement( "draw:glue-point" );
859 859
   xmlWriter->addAttribute( "svg:x", 5 );
860 860
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -918,7 +918,7 @@ void PowerPointImport::processOctagon (DrawObject* drawObject, KoXmlWriter* xmlW
918 918
   xmlWriter->addAttribute( "svg:height", heightStr );
919 919
   xmlWriter->addAttribute( "svg:x", xStr );
920 920
   xmlWriter->addAttribute( "svg:y", yStr );
921
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
921
+  xmlWriter->addAttribute( "draw:layer", "layout" );
922 922
   xmlWriter->startElement( "draw:glue-point" );
923 923
   xmlWriter->addAttribute( "svg:x", 5 );
924 924
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -998,7 +998,7 @@ void PowerPointImport::processArrow (DrawObject* drawObject, KoXmlWriter* xmlWri
998 998
   xmlWriter->addAttribute( "svg:height", heightStr );
999 999
   xmlWriter->addAttribute( "svg:x", xStr );
1000 1000
   xmlWriter->addAttribute( "svg:y", yStr );
1001
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
1001
+  xmlWriter->addAttribute( "draw:layer", "layout" );
1002 1002
     xmlWriter->startElement( "draw:enhanced-geometry" );
1003 1003
     
1004 1004
                 if (drawObject->shape() == DrawObject::RightArrow)
@@ -1090,7 +1090,7 @@ void PowerPointImport::processLine (DrawObject* drawObject, KoXmlWriter* xmlWrit
1090 1090
   xmlWriter->addAttribute( "svg:y2", y2Str );
1091 1091
   xmlWriter->addAttribute( "svg:x1", x1Str );
1092 1092
   xmlWriter->addAttribute( "svg:x2", x2Str );
1093
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
1093
+  xmlWriter->addAttribute( "draw:layer", "layout" );
1094 1094
  
1095 1095
  xmlWriter->endElement(); 
1096 1096
 }
@@ -1111,7 +1111,7 @@ void PowerPointImport::processSmiley (DrawObject* drawObject, KoXmlWriter* xmlWr
1111 1111
     xmlWriter->addAttribute( "svg:height", heightStr );
1112 1112
     xmlWriter->addAttribute( "svg:x", xStr );
1113 1113
     xmlWriter->addAttribute( "svg:y", yStr );
1114
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
1114
+    xmlWriter->addAttribute( "draw:layer", "layout" );
1115 1115
   xmlWriter->startElement( "draw:glue-point" );
1116 1116
   xmlWriter->addAttribute( "svg:x", 5 );
1117 1117
   xmlWriter->addAttribute( "svg:y", 0 );
@@ -1176,7 +1176,7 @@ void PowerPointImport::processHeart (DrawObject* drawObject, KoXmlWriter* xmlWri
1176 1176
     xmlWriter->addAttribute( "svg:height", heightStr );
1177 1177
     xmlWriter->addAttribute( "svg:x", xStr );
1178 1178
     xmlWriter->addAttribute( "svg:y", yStr );
1179
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );
1179
+    xmlWriter->addAttribute( "draw:layer", "layout" );
1180 1180
   xmlWriter->startElement( "draw:glue-point" );
1181 1181
   xmlWriter->addAttribute( "svg:x", 5 );
1182 1182
   xmlWriter->addAttribute( "svg:y", 1 );
@@ -1216,7 +1216,7 @@ void PowerPointImport::processFreeLine (DrawObject* drawObject, KoXmlWriter* xml
1216 1216
     xmlWriter->addAttribute( "svg:height", heightStr );
1217 1217
     xmlWriter->addAttribute( "svg:x", xStr );
1218 1218
     xmlWriter->addAttribute( "svg:y", yStr );
1219
-    xmlWriter->addAttribute( "draw:layer", "tqlayout" );  
1219
+    xmlWriter->addAttribute( "draw:layer", "layout" );  
1220 1220
     xmlWriter->endElement(); // path
1221 1221
 }
1222 1222
 
@@ -1324,7 +1324,7 @@ void PowerPointImport::processTextObjectForBody( TextObject* textObject, KoXmlWr
1324 1324
 
1325 1325
   xmlWriter->startElement( "draw:frame" );
1326 1326
   xmlWriter->addAttribute( "presentation:style-name", "pr1" );
1327
-  xmlWriter->addAttribute( "draw:layer", "tqlayout" );
1327
+  xmlWriter->addAttribute( "draw:layer", "layout" );
1328 1328
   xmlWriter->addAttribute( "svg:width", widthStr );
1329 1329
   xmlWriter->addAttribute( "svg:height", heightStr );
1330 1330
   xmlWriter->addAttribute( "svg:x", xStr );
@@ -1389,7 +1389,7 @@ void PowerPointImport::processSlideForBody( unsigned slideNo, Slide* slide, KoXm
1389 1389
   xmlWriter->addAttribute( "draw:master-page-name", "Default" );
1390 1390
   xmlWriter->addAttribute( "draw:name", nameStr );
1391 1391
   xmlWriter->addAttribute( "draw:style-name", styleNameStr );
1392
-  xmlWriter->addAttribute( "presentation:presentation-page-tqlayout-name", "AL1T0");
1392
+  xmlWriter->addAttribute( "presentation:presentation-page-layout-name", "AL1T0");
1393 1393
 
1394 1394
   GroupObject* root = slide->rootObject();
1395 1395
   if( root )

+ 1
- 1
filters/kpresenter/powerpoint/libppt/pole.cpp View File

@@ -94,7 +94,7 @@ class DirEntry
94 94
 {
95 95
   public:
96 96
     bool valid;            // false if invalid (should be skipped)
97
-    std::string name;      // the name, not in tqunicode anymore 
97
+    std::string name;      // the name, not in unicode anymore 
98 98
     bool dir;              // true if directory   
99 99
     unsigned long size;    // size (not valid if directory)
100 100
     unsigned long start;   // starting block

+ 3
- 3
filters/kpresenter/powerpoint/libppt/ustring.cpp View File

@@ -216,13 +216,13 @@ UString UString::null;
216 216
 static char *statBuffer = 0L;
217 217
 
218 218
 UChar::UChar(const UCharReference &c)
219
-    : uc( c.tqunicode() )
219
+    : uc( c.unicode() )
220 220
 {
221 221
 }
222 222
 
223 223
 UChar UChar::toLower() const
224 224
 {
225
-  // ### properly support tqunicode tolower
225
+  // ### properly support unicode tolower
226 226
   if (uc >= 256 || islower(uc))
227 227
     return *this;
228 228
 
@@ -644,7 +644,7 @@ bool Libppt::operator<(const UString& s1, const UString& s2)
644 644
     l++;
645 645
   }
646 646
   if (l < lmin)
647
-    return (c1->tqunicode() < c2->tqunicode());
647
+    return (c1->unicode() < c2->unicode());
648 648
 
649 649
   return (l1 < l2);
650 650
 }

+ 2
- 2
filters/kpresenter/powerpoint/libppt/ustring.h View File

@@ -71,7 +71,7 @@ namespace Libppt {
71 71
     /**
72 72
      * @return the 16 bit Unicode value of the character
73 73
      */
74
-    unsigned short tqunicode() const { return uc; }
74
+    unsigned short unicode() const { return uc; }
75 75
   public:
76 76
     /**
77 77
      * @return The character converted to lower case.
@@ -128,7 +128,7 @@ namespace Libppt {
128 128
     /**
129 129
      * @return Unicode value.
130 130
      */
131
-    unsigned short tqunicode() const { return ref().tqunicode(); }
131
+    unsigned short unicode() const { return ref().unicode(); }
132 132
     /**
133 133
      * @return Lower byte.
134 134
      */

+ 1
- 1
filters/kspread/csv/dialogui.ui View File

@@ -66,7 +66,7 @@
66 66
                     </property>
67 67
                     <widget class="TQLayoutWidget">
68 68
                         <property name="name">
69
-                            <cstring>tqlayout3</cstring>
69
+                            <cstring>layout3</cstring>
70 70
                         </property>
71 71
                         <hbox>
72 72
                             <property name="name">

+ 1
- 1
filters/kspread/csv/exportdialogui.ui View File

@@ -47,7 +47,7 @@
47 47
                     </property>
48 48
                     <widget class="TQLayoutWidget">
49 49
                         <property name="name">
50
-                            <cstring>tqlayout3</cstring>
50
+                            <cstring>layout3</cstring>
51 51
                         </property>
52 52
                         <hbox>
53 53
                             <property name="name">

+ 14
- 14
filters/kspread/excel/sidewinder/excel.cpp View File

@@ -185,7 +185,7 @@ static Value errorAsValue( int errorCode )
185 185
 class EString::Private
186 186
 {
187 187
 public:
188
-  bool tqunicode;
188
+  bool unicode;
189 189
   bool richText;
190 190
   UString str;
191 191
   unsigned size;
@@ -194,7 +194,7 @@ public:
194 194
 EString::EString()
195 195
 {
196 196
   d = new EString::Private();
197
-  d->tqunicode  = false;
197
+  d->unicode  = false;
198 198
   d->richText = false;
199 199
   d->str      = UString::null;
200 200
   d->size     = 0;
@@ -208,7 +208,7 @@ EString::EString( const EString& es )
208 208
 
209 209
 EString& EString::operator=( const EString& es )
210 210
 {
211
-  d->tqunicode  = es.d->tqunicode;
211
+  d->unicode  = es.d->unicode;
212 212
   d->richText = es.d->richText;
213 213
   d->size     = es.d->size;
214 214
   d->str      = es.d->str;
@@ -220,14 +220,14 @@ EString::~EString()
220 220
   delete d;
221 221
 }
222 222
 
223
-bool EString::tqunicode() const
223
+bool EString::unicode() const
224 224
 {
225
-  return d->tqunicode;
225
+  return d->unicode;
226 226
 }
227 227
 
228 228
 void EString::setUnicode( bool u )
229 229
 {
230
-  d->tqunicode = u;
230
+  d->unicode = u;
231 231
 }
232 232
 
233 233
 bool EString::richText() const
@@ -271,7 +271,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
271 271
   unsigned char flag = data[ offset ];
272 272
   offset++; // for flag (1 byte)
273 273
   
274
-  bool tqunicode = flag & 0x01;
274
+  bool unicode = flag & 0x01;
275 275
   bool richText = flag & 0x08;
276 276
   unsigned formatRuns = 0;
277 277
   
@@ -283,10 +283,10 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
283 283
   
284 284
   // find out total bytes used in this string
285 285
   unsigned size = offset + len; // string data
286
-  if( tqunicode ) size += len; // because tqunicode takes 2-bytes char
286
+  if( unicode ) size += len; // because unicode takes 2-bytes char
287 287
   if( richText ) size += (formatRuns*4);
288 288
   
289
-  if( !tqunicode )
289
+  if( !unicode )
290 290
   {
291 291
     char* buffer = new char[ len+1 ];
292 292
     memcpy( buffer, data + offset, len );
@@ -303,7 +303,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
303 303
   }
304 304
   
305 305
   EString result;
306
-  result.setUnicode( tqunicode );
306
+  result.setUnicode( unicode );
307 307
   result.setRichText( richText );
308 308
   result.setSize( size );
309 309
   result.setStr( str );
@@ -351,14 +351,14 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
351 351
   
352 352
   unsigned len = data[0];
353 353
   unsigned flag = data[1];
354
-  bool tqunicode = flag & 1;
354
+  bool unicode = flag & 1;
355 355
   
356 356
   if( len > datasize-2 ) len = datasize-2;
357 357
   if( len == 0 ) return EString();
358 358
   
359 359
   unsigned offset = 2;
360 360
   
361
-  if( !tqunicode )
361
+  if( !unicode )
362 362
   {
363 363
     char* buffer = new char[ len+1 ];
364 364
     memcpy( buffer, data + offset, len );
@@ -376,7 +376,7 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
376 376
   }
377 377
   
378 378
   EString result;
379
-  result.setUnicode( tqunicode );
379
+  result.setUnicode( unicode );
380 380
   result.setRichText( richText );
381 381
   result.setSize( datasize );
382 382
   result.setStr( str );
@@ -2012,7 +2012,7 @@ void BoundSheetRecord::setData( unsigned size, const unsigned char* data )
2012 2012
   d->visibility = data[4];
2013 2013
   d->type = data[5];
2014 2014
   
2015
-  /* FIXME: it turned out that sheet name is not normal tqunicode string
2015
+  /* FIXME: it turned out that sheet name is not normal unicode string
2016 2016
      where the first two bytes specifies string length, but instead
2017 2017
      only the first specifies it.
2018 2018
      the next byte could be correctly interpreted as flag.

+ 2
- 2
filters/kspread/excel/sidewinder/excel.h View File

@@ -36,7 +36,7 @@ enum { UnknownExcel = 0, Excel95, Excel97, Excel2000 };
36 36
 
37 37
 class Record;
38 38
 
39
-// rich-text, tqunicode, far-east support Excel string
39
+// rich-text, unicode, far-east support Excel string
40 40
 
41 41
 class EString
42 42
 {
@@ -50,7 +50,7 @@ public:
50 50
   
51 51
   ~EString();
52 52
   
53
-  bool tqunicode() const;
53
+  bool unicode() const;
54 54
   
55 55
   void setUnicode( bool u );
56 56
   

+ 1
- 1
filters/kspread/excel/sidewinder/pole.cpp View File

@@ -95,7 +95,7 @@ class DirEntry
95 95
 {
96 96
   public:
97 97
     bool valid;            // false if invalid (should be skipped)
98
-    std::string name;      // the name, not in tqunicode anymore
98
+    std::string name;      // the name, not in unicode anymore
99 99
     bool dir;              // true if directory
100 100
     unsigned long size;    // size (not valid if directory)
101 101
     unsigned long start;   // starting block

+ 2
- 2
filters/kspread/excel/sidewinder/ustring.cpp View File

@@ -39,7 +39,7 @@ UString UString::null;
39 39
 static char *statBuffer = 0L;
40 40
 
41 41
 UChar::UChar(const UCharReference &c)
42
-    : uc( c.tqunicode() )
42
+    : uc( c.unicode() )
43 43
 {
44 44
 }
45 45
 
@@ -579,7 +579,7 @@ bool Swinder::operator<(const UString& s1, const UString& s2)
579 579
     l++;
580 580
   }
581 581
   if (l < lmin)
582
-    return (c1->tqunicode() < c2->tqunicode());
582
+    return (c1->unicode() < c2->unicode());
583 583
 
584 584
   return (l1 < l2);
585 585
 }

+ 2
- 2
filters/kspread/excel/sidewinder/ustring.h View File

@@ -68,7 +68,7 @@ namespace Swinder {
68 68
     /**
69 69
      * @return the 16 bit Unicode value of the character