Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 81 insertions, 81 deletions

diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi
index 66fc04cfd..17678b051 100644
--- a/chalk/doc/chalk.xmi
+++ b/chalk/doc/chalk.xmi
@@ -55,8 +55,8 @@
      <UML:Parameter visibility="private" xmi.id="39" value="" type="KisUndoAdapter *" name="adapter" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="40" type="virtual void" name="intr" />
-    <UML:Operation visibility="public" xmi.id="41" type=TQSTRING_OBJECT_NAME_STRING name="readFilters" ownerScope="classifier" />
-    <UML:Operation visibility="public" xmi.id="42" type=TQSTRING_OBJECT_NAME_STRING name="writeFilters" ownerScope="classifier" />
+    <UML:Operation visibility="public" xmi.id="41" type="TQString" name="readFilters" ownerScope="classifier" />
+    <UML:Operation visibility="public" xmi.id="42" type="TQString" name="writeFilters" ownerScope="classifier" />
     <UML:Operation visibility="public" xmi.id="43" type="virtual " name="~KisImageMagickConverter" />
     <UML:Attribute visibility="private" xmi.id="13" value="" type="KisUndoAdapter *" name="m_adapter" />
     <UML:Attribute visibility="private" xmi.id="14" value="" type="QValueVector" name="m_data" />
@@ -170,7 +170,7 @@ This replaces the KisKrayon facility that used to be present in Krayon." visibil
     <UML:Operation visibility="public" xmi.id="134" type="virtual " name="~KisStrategyColorSpaceCMYK" />
     <UML:Attribute visibility="private" xmi.id="82" value="" type="QUANTUM *" name="m_buf" />
     <UML:Attribute visibility="private" xmi.id="83" value="" type="KPixmapIO" name="m_pixio" />
-    <UML:Attribute visibility="private" xmi.id="84" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_pixmap" />
+    <UML:Attribute visibility="private" xmi.id="84" value="" type="TQPixmap" name="m_pixmap" />
     <UML:Attribute visibility="private" xmi.id="85" value="" type="ColorLUT" name="m_rgbLUT" />
    </UML:Class>
    <UML:Class stereotype="class" visibility="public" xmi.id="135" name="RGB" >
@@ -322,7 +322,7 @@ This replaces the KisKrayon facility that used to be present in Krayon." visibil
     <UML:Operation visibility="public" xmi.id="258" type="virtual " name="~KisStrategyColorSpaceRGB" />
     <UML:Attribute visibility="private" xmi.id="207" value="" type="QUANTUM *" name="m_buf" />
     <UML:Attribute visibility="private" xmi.id="208" value="" type="KPixmapIO" name="m_pixio" />
-    <UML:Attribute visibility="private" xmi.id="209" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_pixmap" />
+    <UML:Attribute visibility="private" xmi.id="209" value="" type="TQPixmap" name="m_pixmap" />
    </UML:Class>
    <UML:Class stereotype="class" comment="This class implements the conversion of the Chalk images that contain cmy + transparency
 data to rbg for screen rendering." visibility="public" xmi.id="259" name="CMYK" >
@@ -400,10 +400,10 @@ data to rbg for screen rendering." visibility="public" xmi.id="259" name="CMYK"
     <UML:Operation visibility="public" xmi.id="324" type="virtual " name="~KisStrategyMove" />
     <UML:Attribute visibility="private" xmi.id="293" value="" type="KisCanvasControllerInterface *" name="m_controller" />
     <UML:Attribute visibility="private" xmi.id="294" value="" type="KoDocument *" name="m_doc" />
-    <UML:Attribute visibility="private" xmi.id="295" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_dragStart" />
+    <UML:Attribute visibility="private" xmi.id="295" value="" type="TQPoint" name="m_dragStart" />
     <UML:Attribute visibility="private" xmi.id="296" value="" type="bool" name="m_dragging" />
-    <UML:Attribute visibility="private" xmi.id="297" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_layerPosition" />
-    <UML:Attribute visibility="private" xmi.id="298" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_layerStart" />
+    <UML:Attribute visibility="private" xmi.id="297" value="" type="TQPoint" name="m_layerPosition" />
+    <UML:Attribute visibility="private" xmi.id="298" value="" type="TQPoint" name="m_layerStart" />
     <UML:Attribute visibility="private" xmi.id="299" value="" type="KisCanvasSubject *" name="m_subject" />
    </UML:Class>
    <UML:Class stereotype="class" comment="KisTileMgr manages the imagedata that for implementations of KisRenderInterface.
@@ -922,7 +922,7 @@ dcop." visibility="public" xmi.id="645" name="KRayonViewIface" >
     <UML:Operation visibility="protected" xmi.id="700" type="void" name="createMasks" >
      <UML:Parameter visibility="private" xmi.id="701" value="" type="const QImage &amp;" name="img" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="702" type=TQPOINT_OBJECT_NAME_STRING name="hotSpot" />
+    <UML:Operation visibility="public" xmi.id="702" type="TQPoint" name="hotSpot" />
     <UML:Operation visibility="public" xmi.id="703" type="virtual QImage" name="img" />
     <UML:Operation visibility="public" xmi.id="704" type="virtual bool" name="loadAsync" />
     <UML:Operation comment="@return a mask computed from the grey-level values of the
@@ -931,7 +931,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="707" type="virtual bool" name="saveAsync" />
     <UML:Operation visibility="public" xmi.id="708" type="void" name="setHotSpot" >
-     <UML:Parameter visibility="private" xmi.id="709" value="" type=TQPOINT_OBJECT_NAME_STRING />
+     <UML:Parameter visibility="private" xmi.id="709" value="" type="TQPoint" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="710" type="virtual " name="~KisBrush" />
     <UML:Attribute visibility="private" xmi.id="682" value="" type="enumBrushType" name="m_brushType" />
@@ -939,7 +939,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     <UML:Attribute visibility="private" xmi.id="684" value="" type="QValueVector" name="m_data" />
     <UML:Attribute visibility="private" xmi.id="685" value="" type="TQ_UINT32" name="m_header_size" />
     <UML:Attribute visibility="private" xmi.id="686" value="" type="TQ_UINT32" name="m_height" />
-    <UML:Attribute visibility="private" xmi.id="687" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_hotSpot" />
+    <UML:Attribute visibility="private" xmi.id="687" value="" type="TQPoint" name="m_hotSpot" />
     <UML:Attribute visibility="private" xmi.id="688" value="" type="QImage" name="m_img" />
     <UML:Attribute visibility="private" xmi.id="689" value="" type="TQ_UINT32" name="m_magic_number" />
     <UML:Attribute visibility="private" xmi.id="690" value="" type="QPtrList" name="m_masks" />
@@ -978,7 +978,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     <UML:Operation visibility="public" xmi.id="737" type="virtual QString" name="name" />
     <UML:Operation visibility="public" xmi.id="738" type="virtual void" isAbstract="true" name="unexecute" />
     <UML:Operation visibility="public" xmi.id="739" type="virtual " name="~KisCommand" />
-    <UML:Attribute visibility="private" xmi.id="728" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+    <UML:Attribute visibility="private" xmi.id="728" value="" type="TQString" name="m_name" />
     <UML:Attribute visibility="private" xmi.id="729" value="" type="KisUndoAdapter *" name="m_undoAdapter" />
    </UML:Class>
    <UML:Class stereotype="class" visibility="public" xmi.id="740" name="KisGuide" >
@@ -988,7 +988,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     <UML:Operation visibility="public" xmi.id="747" type="bool" name="isSelected" />
     <UML:Operation visibility="public" xmi.id="748" type="double" name="position" />
     <UML:Operation visibility="public" xmi.id="749" type="virtual " name="~KisGuide" />
-    <UML:Attribute visibility="public" xmi.id="741" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="buffer" />
+    <UML:Attribute visibility="public" xmi.id="741" value="" type="TQPixmap" name="buffer" />
     <UML:Attribute visibility="public" xmi.id="742" value="" type="bool" name="hasBuffer" />
     <UML:Attribute visibility="public" xmi.id="743" value="" type="double" name="pos" />
     <UML:Attribute visibility="public" xmi.id="744" value="" type="bool" name="selected" />
@@ -1116,15 +1116,15 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="854" type="void" name="unselectAll" />
     <UML:Operation visibility="public" xmi.id="855" type="" name="~KisGuideMgr" />
-    <UML:Attribute visibility="private" xmi.id="791" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_hGuideLines" />
-    <UML:Attribute visibility="private" xmi.id="792" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_hGuideLinesSelected" />
+    <UML:Attribute visibility="private" xmi.id="791" value="" type="TQPixmap" name="m_hGuideLines" />
+    <UML:Attribute visibility="private" xmi.id="792" value="" type="TQPixmap" name="m_hGuideLinesSelected" />
     <UML:Attribute visibility="private" xmi.id="793" value="" type="vKisGuideSP" name="m_lines" />
-    <UML:Attribute visibility="private" xmi.id="794" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_pattern" />
-    <UML:Attribute visibility="private" xmi.id="795" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_patternSelected" />
+    <UML:Attribute visibility="private" xmi.id="794" value="" type="TQPixmap" name="m_pattern" />
+    <UML:Attribute visibility="private" xmi.id="795" value="" type="TQPixmap" name="m_patternSelected" />
     <UML:Attribute visibility="private" xmi.id="796" value="" type="QSize" name="m_size" />
     <UML:Attribute visibility="private" xmi.id="797" value="" type="vKisGuideSP" name="m_slines" />
-    <UML:Attribute visibility="private" xmi.id="798" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_vGuideLines" />
-    <UML:Attribute visibility="private" xmi.id="799" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_vGuideLinesSelected" />
+    <UML:Attribute visibility="private" xmi.id="798" value="" type="TQPixmap" name="m_vGuideLines" />
+    <UML:Attribute visibility="private" xmi.id="799" value="" type="TQPixmap" name="m_vGuideLinesSelected" />
     <UML:Attribute visibility="private" xmi.id="800" value="" type="const char * []" name="s_xbm" />
     <UML:Attribute visibility="private" xmi.id="801" value="" type="const char * []" name="s_xbm_selected" />
    </UML:Class>
@@ -1227,7 +1227,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     <UML:Operation visibility="public" xmi.id="943" type="KisImageSP" name="imageNum" >
      <UML:Parameter visibility="private" xmi.id="944" value="" type="TQ_UINT32" name="num" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="945" type=TQSTRINGLIST_OBJECT_NAME_STRING name="images" />
+    <UML:Operation visibility="public" xmi.id="945" type="TQStringList" name="images" />
     <UML:Operation visibility="public" xmi.id="946" type="bool" name="importImage" >
      <UML:Parameter visibility="private" xmi.id="947" value="" type="const QString &amp;" name="filename" />
     </UML:Operation>
@@ -1247,7 +1247,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
      <UML:Parameter visibility="private" xmi.id="960" value="" type="const QString &amp;" name="name" />
      <UML:Parameter visibility="private" xmi.id="961" value="" type="CompositeOp" name="compositeOp" />
      <UML:Parameter visibility="private" xmi.id="962" value="" type="QUANTUM" name="opacity" />
-     <UML:Parameter visibility="private" xmi.id="963" value="" type=TQPOINT_OBJECT_NAME_STRING name="pos" />
+     <UML:Parameter visibility="private" xmi.id="963" value="" type="TQPoint" name="pos" />
      <UML:Parameter visibility="private" xmi.id="964" value="" type="enumImgType" name="type" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="965" type="KisLayerSP" name="layerAdd" >
@@ -1311,7 +1311,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
      <UML:Parameter visibility="private" xmi.id="1010" value="" type="TQ_INT32" name="height" />
      <UML:Parameter visibility="private" xmi.id="1011" value="" type="enumImgType" name="type" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1012" type=TQSTRING_OBJECT_NAME_STRING name="nextImageName" />
+    <UML:Operation visibility="public" xmi.id="1012" type="TQString" name="nextImageName" />
     <UML:Operation visibility="public" xmi.id="1013" type="TQ_INT32" name="nimages" />
     <UML:Operation visibility="public" xmi.id="1014" type="virtual void" name="paintContent" >
      <UML:Parameter visibility="private" xmi.id="1015" value="" type="QPainter &amp;" name="painter" />
@@ -1732,10 +1732,10 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
      <UML:Parameter visibility="private" xmi.id="1379" value="" type="KisLayerSP" name="layer" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1380" type="KisChannelSP" name="mask" />
-    <UML:Operation visibility="public" xmi.id="1381" type=TQSTRING_OBJECT_NAME_STRING name="name" />
+    <UML:Operation visibility="public" xmi.id="1381" type="TQString" name="name" />
     <UML:Operation visibility="public" xmi.id="1382" type="enumImgType" name="nativeImgType" />
     <UML:Operation visibility="public" xmi.id="1383" type="TQ_INT32" name="nchannels" />
-    <UML:Operation visibility="public" xmi.id="1384" type=TQSTRING_OBJECT_NAME_STRING name="nextLayerName" />
+    <UML:Operation visibility="public" xmi.id="1384" type="TQString" name="nextLayerName" />
     <UML:Operation visibility="public" xmi.id="1385" type="TQ_INT32" name="nlayers" />
     <UML:Operation visibility="public" xmi.id="1386" type="void" name="notify" />
     <UML:Operation visibility="public" xmi.id="1387" type="void" name="notify" >
@@ -1842,7 +1842,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     <UML:Attribute visibility="private" xmi.id="1274" value="" type="KoColor" name="m_maskClr" />
     <UML:Attribute visibility="private" xmi.id="1275" value="" type="bool" name="m_maskEnabled" />
     <UML:Attribute visibility="private" xmi.id="1276" value="" type="bool" name="m_maskInverted" />
-    <UML:Attribute visibility="private" xmi.id="1277" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+    <UML:Attribute visibility="private" xmi.id="1277" value="" type="TQString" name="m_name" />
     <UML:Attribute visibility="private" xmi.id="1278" value="" type="KisNameServer *" name="m_nserver" />
     <UML:Attribute visibility="private" xmi.id="1279" value="" type="TQ_INT32" name="m_ntileCols" />
     <UML:Attribute visibility="private" xmi.id="1280" value="" type="TQ_INT32" name="m_ntileRows" />
@@ -1959,7 +1959,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     <UML:Operation visibility="public" xmi.id="1551" type="virtual void" name="move" >
      <UML:Parameter visibility="private" xmi.id="1552" value="" type="const QPoint &amp;" name="pt" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1553" type=TQSTRING_OBJECT_NAME_STRING name="name" />
+    <UML:Operation visibility="public" xmi.id="1553" type="TQString" name="name" />
     <UML:Operation visibility="public" xmi.id="1554" type="void" name="offsetBy" >
      <UML:Parameter visibility="private" xmi.id="1555" value="" type="TQ_INT32" name="x" />
      <UML:Parameter visibility="private" xmi.id="1556" value="" type="TQ_INT32" name="y" />
@@ -2047,13 +2047,13 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     <UML:Attribute visibility="private" xmi.id="1454" value="" type="bool" name="m_alpha" />
     <UML:Attribute visibility="private" xmi.id="1456" value="" type="TQ_INT32" name="m_depth" />
     <UML:Attribute visibility="private" xmi.id="1457" value="" type="TQ_INT32" name="m_height" />
-    <UML:Attribute visibility="private" xmi.id="1459" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+    <UML:Attribute visibility="private" xmi.id="1459" value="" type="TQString" name="m_name" />
     <UML:Attribute visibility="private" xmi.id="1460" value="" type="TQ_INT32" name="m_offH" />
     <UML:Attribute visibility="private" xmi.id="1461" value="" type="TQ_INT32" name="m_offW" />
     <UML:Attribute visibility="private" xmi.id="1462" value="" type="TQ_INT32" name="m_offX" />
     <UML:Attribute visibility="private" xmi.id="1463" value="" type="TQ_INT32" name="m_offY" />
     <UML:Attribute visibility="private" xmi.id="1464" value="" type="KisImageSP" name="m_owner" />
-    <UML:Attribute visibility="private" xmi.id="1465" value="" type=TQPIXMAP_OBJECT_NAME_STRING name="m_projection" />
+    <UML:Attribute visibility="private" xmi.id="1465" value="" type="TQPixmap" name="m_projection" />
     <UML:Attribute visibility="private" xmi.id="1466" value="" type="bool" name="m_projectionValid" />
     <UML:Attribute visibility="private" xmi.id="1467" value="" type="TQ_INT32" name="m_quantumSize" />
     <UML:Attribute visibility="private" xmi.id="1468" value="" type="KisTileMgrSP" name="m_shadow" />
@@ -2128,11 +2128,11 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
      <UML:Parameter visibility="private" xmi.id="1672" value="" type="TQ_INT32" name="seed" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1673" type="TQ_INT32" name="currentSeed" />
-    <UML:Operation visibility="public" xmi.id="1674" type=TQSTRING_OBJECT_NAME_STRING name="name" />
+    <UML:Operation visibility="public" xmi.id="1674" type="TQString" name="name" />
     <UML:Operation visibility="public" xmi.id="1675" type="TQ_INT32" name="number" />
     <UML:Operation visibility="public" xmi.id="1676" type="" name="~KisNameServer" />
     <UML:Attribute visibility="private" xmi.id="1668" value="" type="TQ_INT32" name="m_generator" />
-    <UML:Attribute visibility="private" xmi.id="1669" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_prefix" />
+    <UML:Attribute visibility="private" xmi.id="1669" value="" type="TQString" name="m_prefix" />
    </UML:Class>
    <UML:Class stereotype="class" visibility="public" xmi.id="1677" name="KisMemento" >
     <UML:Operation visibility="public" xmi.id="1678" type="virtual " name="~KisMemento" />
@@ -2225,7 +2225,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
      <UML:Parameter visibility="private" xmi.id="1751" value="" type="const QString &amp;" name="filename" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1752" type="virtual enumBrushType" name="brushType" />
-    <UML:Operation visibility="public" xmi.id="1753" type=TQPOINT_OBJECT_NAME_STRING name="hotSpot" />
+    <UML:Operation visibility="public" xmi.id="1753" type="TQPoint" name="hotSpot" />
     <UML:Operation comment="@return the next image in the pipe." visibility="public" xmi.id="1754" type="virtual QImage" name="img" />
     <UML:Operation visibility="public" xmi.id="1755" type="virtual bool" name="loadAsync" />
     <UML:Operation comment="@return the next mask in the pipe." visibility="public" xmi.id="1756" type="virtual KisAlphaMask *" name="mask" >
@@ -2233,7 +2233,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1758" type="virtual bool" name="saveAsync" />
     <UML:Operation visibility="public" xmi.id="1759" type="void" name="setHotSpot" >
-     <UML:Parameter visibility="private" xmi.id="1760" value="" type=TQPOINT_OBJECT_NAME_STRING />
+     <UML:Parameter visibility="private" xmi.id="1760" value="" type="TQPoint" />
     </UML:Operation>
     <UML:Operation visibility="protected" xmi.id="1761" type="void" name="setParasite" >
      <UML:Parameter visibility="private" xmi.id="1762" value="" type="const QString &amp;" name="parasite" />
@@ -2242,10 +2242,10 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     <UML:Attribute visibility="private" xmi.id="1743" value="" type="QPtrList" name="m_brushes" />
     <UML:Attribute visibility="private" xmi.id="1744" value="" type="TQ_UINT32" name="m_currentBrush" />
     <UML:Attribute visibility="private" xmi.id="1745" value="" type="QValueVector" name="m_data" />
-    <UML:Attribute visibility="private" xmi.id="1746" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_hotSpot" />
-    <UML:Attribute visibility="private" xmi.id="1747" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+    <UML:Attribute visibility="private" xmi.id="1746" value="" type="TQPoint" name="m_hotSpot" />
+    <UML:Attribute visibility="private" xmi.id="1747" value="" type="TQString" name="m_name" />
     <UML:Attribute visibility="private" xmi.id="1748" value="" type="TQ_UINT32" name="m_numOfBrushes" />
-    <UML:Attribute visibility="private" xmi.id="1749" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_parasite" />
+    <UML:Attribute visibility="private" xmi.id="1749" value="" type="TQString" name="m_parasite" />
    </UML:Class>
    <UML:Class stereotype="class" visibility="public" xmi.id="1767" name="KisPainter" >
     <UML:Operation visibility="protected" xmi.id="1784" type="KisPainter &amp;" name="=" >
@@ -2401,7 +2401,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     <UML:Attribute visibility="private" xmi.id="1773" value="" type="KisPaintDeviceSP" name="m_device" />
     <UML:Attribute visibility="private" xmi.id="1774" value="" type="QRect" name="m_dirtyRect" />
     <UML:Attribute visibility="private" xmi.id="1775" value="" type="KoColor" name="m_fillColor" />
-    <UML:Attribute visibility="private" xmi.id="1777" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_hotSpot" />
+    <UML:Attribute visibility="private" xmi.id="1777" value="" type="TQPoint" name="m_hotSpot" />
     <UML:Attribute visibility="private" xmi.id="1778" value="" type="TQ_INT32" name="m_hotSpotX" />
     <UML:Attribute visibility="private" xmi.id="1779" value="" type="TQ_INT32" name="m_hotSpotY" />
     <UML:Attribute visibility="private" xmi.id="1780" value="" type="QUANTUM" name="m_opacity" />
@@ -2454,7 +2454,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     <UML:Attribute visibility="private" xmi.id="1905" value="" type="QImage" name="m_clipImg" />
     <UML:Attribute visibility="private" xmi.id="1906" value="" type="bool" name="m_firstMove" />
     <UML:Attribute visibility="private" xmi.id="1907" value="" type="KisImageSP" name="m_img" />
-    <UML:Attribute visibility="private" xmi.id="1908" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+    <UML:Attribute visibility="private" xmi.id="1908" value="" type="TQString" name="m_name" />
     <UML:Attribute visibility="private" xmi.id="1909" value="" type="KisPaintDeviceSP" name="m_parent" />
     <UML:Attribute visibility="private" xmi.id="1910" value="" type="QRect" name="m_rc" />
    </UML:Class>
@@ -2499,11 +2499,11 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     <UML:Operation visibility="public" xmi.id="1982" type="TQ_INT32" name="pipebrushCount" />
     <UML:Operation visibility="public" xmi.id="1983" type="QPtrList" name="pipebrushes" />
     <UML:Operation visibility="public" xmi.id="1984" type="virtual " name="~KisResourceServer" />
-    <UML:Attribute visibility="private" xmi.id="1965" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING name="m_brushFilenames" />
+    <UML:Attribute visibility="private" xmi.id="1965" value="" type="TQStringList" name="m_brushFilenames" />
     <UML:Attribute visibility="private" xmi.id="1966" value="" type="QPtrList" name="m_brushes" />
-    <UML:Attribute visibility="private" xmi.id="1967" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING name="m_patternFilenames" />
+    <UML:Attribute visibility="private" xmi.id="1967" value="" type="TQStringList" name="m_patternFilenames" />
     <UML:Attribute visibility="private" xmi.id="1968" value="" type="QPtrList" name="m_patterns" />
-    <UML:Attribute visibility="private" xmi.id="1969" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING name="m_pipebrushFilenames" />
+    <UML:Attribute visibility="private" xmi.id="1969" value="" type="TQStringList" name="m_pipebrushFilenames" />
     <UML:Attribute visibility="private" xmi.id="1970" value="" type="QPtrList" name="m_pipebrushes" />
    </UML:Class>
    <UML:Class stereotype="class" visibility="public" xmi.id="1985" name="KisPluginServer" >
@@ -2548,7 +2548,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     <UML:Operation visibility="public" xmi.id="2021" type="virtual void" name="unexecute" />
     <UML:Operation visibility="public" xmi.id="2022" type="virtual " name="~KisTileCommand" />
     <UML:Attribute visibility="private" xmi.id="1997" value="" type="KisPaintDeviceSP" name="m_device" />
-    <UML:Attribute visibility="private" xmi.id="1998" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+    <UML:Attribute visibility="private" xmi.id="1998" value="" type="TQString" name="m_name" />
     <UML:Attribute visibility="private" xmi.id="1999" value="" type="TileMap" name="m_originals" />
     <UML:Attribute visibility="private" xmi.id="2000" value="" type="QRect" name="m_rc" />
     <UML:Attribute visibility="private" xmi.id="2001" value="" type="TileMap" name="m_tiles" />
@@ -2562,22 +2562,22 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
      <UML:Parameter visibility="private" xmi.id="2036" value="" type="const QString &amp;" name="category" />
      <UML:Parameter visibility="private" xmi.id="2037" value="" type="PluginType" name="type" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="2038" type=TQSTRING_OBJECT_NAME_STRING name="category" />
-    <UML:Operation visibility="public" xmi.id="2039" type=TQSTRING_OBJECT_NAME_STRING name="comment" />
-    <UML:Operation visibility="public" xmi.id="2040" type=TQSTRING_OBJECT_NAME_STRING name="dir" />
+    <UML:Operation visibility="public" xmi.id="2038" type="TQString" name="category" />
+    <UML:Operation visibility="public" xmi.id="2039" type="TQString" name="comment" />
+    <UML:Operation visibility="public" xmi.id="2040" type="TQString" name="dir" />
     <UML:Operation visibility="public" xmi.id="2041" type="int" name="id" />
-    <UML:Operation visibility="public" xmi.id="2042" type=TQSTRING_OBJECT_NAME_STRING name="library" />
-    <UML:Operation visibility="public" xmi.id="2043" type=TQSTRING_OBJECT_NAME_STRING name="name" />
+    <UML:Operation visibility="public" xmi.id="2042" type="TQString" name="library" />
+    <UML:Operation visibility="public" xmi.id="2043" type="TQString" name="name" />
     <UML:Operation visibility="public" xmi.id="2044" type="void" name="setId" >
      <UML:Parameter visibility="private" xmi.id="2045" value="" type="int" name="id" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="2046" type="PluginType" name="type" />
-    <UML:Attribute visibility="private" xmi.id="2024" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_category" />
-    <UML:Attribute visibility="private" xmi.id="2025" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_comment" />
-    <UML:Attribute visibility="private" xmi.id="2026" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_dir" />
+    <UML:Attribute visibility="private" xmi.id="2024" value="" type="TQString" name="m_category" />
+    <UML:Attribute visibility="private" xmi.id="2025" value="" type="TQString" name="m_comment" />
+    <UML:Attribute visibility="private" xmi.id="2026" value="" type="TQString" name="m_dir" />
     <UML:Attribute visibility="private" xmi.id="2027" value="" type="int" name="m_id" />
-    <UML:Attribute visibility="private" xmi.id="2028" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_library" />
-    <UML:Attribute visibility="private" xmi.id="2029" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+    <UML:Attribute visibility="private" xmi.id="2028" value="" type="TQString" name="m_library" />
+    <UML:Attribute visibility="private" xmi.id="2029" value="" type="TQString" name="m_name" />
     <UML:Attribute visibility="private" xmi.id="2030" value="" type="PluginType" name="m_type" />
    </UML:Class>
    <UML:Class stereotype="class" comment="The KisResource class provides a representation of Chalk image resources.  This
@@ -2597,12 +2597,12 @@ in the constructor, you have to call loadAsync.
      <UML:Parameter visibility="private" xmi.id="2060" value="" type="const QString &amp;" name="filename" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="2061" type="bool" name="dirty" />
-    <UML:Operation visibility="public" xmi.id="2062" type=TQSTRING_OBJECT_NAME_STRING name="filename" />
+    <UML:Operation visibility="public" xmi.id="2062" type="TQString" name="filename" />
     <UML:Operation visibility="public" xmi.id="2063" type="TQ_INT32" name="height" />
     <UML:Operation comment="Returns a QImage representing this resource.  This image could be null." visibility="public" xmi.id="2064" type="virtual QImage" isAbstract="true" name="img" />
     <UML:Operation comment="Load this resource asynchronously.  The signal loadComplete is emitted when
 the resource has been loaded and valid flag is set to true." visibility="public" xmi.id="2065" type="virtual bool" isAbstract="true" name="loadAsync" />
-    <UML:Operation visibility="public" xmi.id="2066" type=TQSTRING_OBJECT_NAME_STRING name="name" />
+    <UML:Operation visibility="public" xmi.id="2066" type="TQString" name="name" />
     <UML:Operation comment="Save this resource asynchronously.  The signal saveComplete is emitted when
 the resource has been saved." visibility="public" xmi.id="2067" type="virtual bool" isAbstract="true" name="saveAsync" />
     <UML:Operation visibility="public" xmi.id="2068" type="void" name="setDirty" >
@@ -2634,9 +2634,9 @@ in the constructor, you have to call loadAsync.
 
 @param filename the file name to save and load from." visibility="public" xmi.id="2085" type="virtual " name="~KisResource" />
     <UML:Attribute visibility="private" xmi.id="2048" value="" type="bool" name="m_dirty" />
-    <UML:Attribute visibility="private" xmi.id="2049" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_filename" />
+    <UML:Attribute visibility="private" xmi.id="2049" value="" type="TQString" name="m_filename" />
     <UML:Attribute visibility="private" xmi.id="2050" value="" type="TQ_INT32" name="m_height" />
-    <UML:Attribute visibility="private" xmi.id="2051" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
+    <UML:Attribute visibility="private" xmi.id="2051" value="" type="TQString" name="m_name" />
     <UML:Attribute visibility="private" xmi.id="2052" value="" type="TQ_INT32" name="m_spacing" />
     <UML:Attribute visibility="private" xmi.id="2053" value="" type="bool" name="m_valid" />
     <UML:Attribute visibility="private" xmi.id="2054" value="" type="TQ_INT32" name="m_width" />
@@ -2676,7 +2676,7 @@ in the constructor, you have to call loadAsync.
     <UML:Operation visibility="public" xmi.id="2117" type="" name="KisPattern" >
      <UML:Parameter visibility="private" xmi.id="2118" value="" type="const QString &amp;" name="file" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="2119" type=TQPOINT_OBJECT_NAME_STRING name="hotSpot" />
+    <UML:Operation visibility="public" xmi.id="2119" type="TQPoint" name="hotSpot" />
     <UML:Operation visibility="public" xmi.id="2120" type="virtual QImage" name="img" />
     <UML:Operation visibility="public" xmi.id="2121" type="bool" name="isValid" />
     <UML:Operation visibility="public" xmi.id="2122" type="virtual bool" name="loadAsync" />
@@ -2684,8 +2684,8 @@ in the constructor, you have to call loadAsync.
     <UML:Operation visibility="public" xmi.id="2124" type="virtual bool" name="saveAsync" />
     <UML:Operation visibility="public" xmi.id="2125" type="QPixmap &amp;" name="thumbPixmap" />
     <UML:Operation visibility="public" xmi.id="2126" type="virtual " name="~KisPattern" />
-    <UML:Attribute visibility="private" xmi.id="2110" value="" type=TQBYTEARRAY_OBJECT_NAME_STRING name="m_data" />
-    <UML:Attribute visibility="private" xmi.id="2111" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_hotSpot" />
+    <UML:Attribute visibility="private" xmi.id="2110" value="" type="TQByteArray" name="m_data" />
+    <UML:Attribute visibility="private" xmi.id="2111" value="" type="TQPoint" name="m_hotSpot" />
     <UML:Attribute visibility="private" xmi.id="2112" value="" type="QImage" name="m_img" />
     <UML:Attribute visibility="private" xmi.id="2113" value="" type="QPixmap *" name="m_pixmap" />
     <UML:Attribute visibility="private" xmi.id="2114" value="" type="QPixmap *" name="m_thumbPixmap" />
@@ -2810,7 +2810,7 @@ in the constructor, you have to call loadAsync.
    <UML:Class stereotype="class" visibility="public" xmi.id="2218" name="KisUtil" >
     <UML:Operation visibility="public" xmi.id="2219" type="void" name="enlargeRectToContainPoint" ownerScope="classifier" >
      <UML:Parameter visibility="private" xmi.id="2220" value="" type="QRect &amp;" name="r" />
-     <UML:Parameter visibility="private" xmi.id="2221" value="" type=TQPOINT_OBJECT_NAME_STRING name="p" />
+     <UML:Parameter visibility="private" xmi.id="2221" value="" type="TQPoint" name="p" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="2222" type="QRect" name="findBoundingTiles" ownerScope="classifier" >
      <UML:Parameter visibility="private" xmi.id="2223" value="" type="const QRect &amp;" name="area" />
@@ -3170,7 +3170,7 @@ in the constructor, you have to call loadAsync.
     <UML:Attribute visibility="private" xmi.id="2398" value="" type="TDEAction *" name="m_imgResizeToLayer" />
     <UML:Attribute visibility="private" xmi.id="2399" value="" type="TDEAction *" name="m_imgRm" />
     <UML:Attribute visibility="private" xmi.id="2400" value="" type="TDEAction *" name="m_imgScan" />
-    <UML:Attribute visibility="private" xmi.id="2401" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_lastGuidePoint" />
+    <UML:Attribute visibility="private" xmi.id="2401" value="" type="TQPoint" name="m_lastGuidePoint" />
     <UML:Attribute visibility="private" xmi.id="2402" value="" type="TDEAction *" name="m_layerAdd" />
     <UML:Attribute visibility="private" xmi.id="2403" value="" type="TDEAction *" name="m_layerBottom" />
     <UML:Attribute visibility="private" xmi.id="2404" value="" type="KisListBox *" name="m_layerBox" />
diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi
index 8fae7b488..d263e79fd 100644
--- a/chalk/doc/colorspaces.xmi
+++ b/chalk/doc/colorspaces.xmi
@@ -500,7 +500,7 @@ model together." isSpecification="false" isLeaf="false" visibility="protected" x
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="44" isRoot="false" isAbstract="false" name="TQ_INT32" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="49" isRoot="false" isAbstract="false" name="bool" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="53" isRoot="false" isAbstract="false" name="TQ_UINT8" />
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="57" isRoot="false" isAbstract="false" name=TQSTRING_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="57" isRoot="false" isAbstract="false" name="TQString" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="69" isRoot="false" isAbstract="false" name="KisCompositeOpList" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="72" isRoot="false" isAbstract="false" name="vKisProfileSP" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="75" isRoot="false" isAbstract="false" name="QColor" />
@@ -513,7 +513,7 @@ model together." isSpecification="false" isLeaf="false" visibility="protected" x
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="175" isRoot="false" isAbstract="false" name="enumChannelFlags" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="201" isRoot="false" isAbstract="false" name="KisCompositeOp" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="222" isRoot="false" isAbstract="false" name="cmsHTRANSFORM" />
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="226" isRoot="false" isAbstract="false" name=TQSTRINGLIST_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="226" isRoot="false" isAbstract="false" name="TQStringList" />
     <UML:Class comment=" Copyright (c) 2005 Boudewijn Rempt &lt;boud@valdyas.org>
 
  This program is free software; you can redistribute it and/or modify
@@ -1691,7 +1691,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
       <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="865" isRoot="false" isAbstract="false" name="Plugin" />
      </UML:Namespace.ownedElement>
     </UML:Class>
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="870" isRoot="false" isAbstract="false" name=TQOBJECT_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="870" isRoot="false" isAbstract="false" name="TQObject" />
     <UML:Class comment=" Copyright (c) 2002 Patrick Julien  &lt;freak@codepimps.org>
  Copyright (c) 2005 Adrian Page &lt;adrian@pagenet.plus.com>
 
@@ -7373,7 +7373,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="57" parent_class="57" fileExt=".java" fileName=TQSTRING_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="57" parent_class="57" fileExt=".java" fileName="TQString" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9248,7 +9248,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="226" parent_class="226" fileExt=".java" fileName=TQSTRINGLIST_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="226" parent_class="226" fileExt=".java" fileName="TQStringList" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13009,7 +13009,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="870" parent_class="870" fileExt=".java" fileName=TQOBJECT_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="870" parent_class="870" fileExt=".java" fileName="TQObject" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi
index 539d9cf11..7579734d5 100644
--- a/chalk/doc/controller.xmi
+++ b/chalk/doc/controller.xmi
@@ -1797,12 +1797,12 @@ and contains data that must be associated with an image for purposes of import/e
     <UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="452" isRoot="false" isAbstract="false" name="vKisFileFormatSP" />
     <UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="453" isRoot="false" isAbstract="false" name="vKisFileFormatSP_it" />
     <UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="454" isRoot="false" isAbstract="false" name="vKisFileFormatSP_cit" />
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="455" isRoot="false" isAbstract="false" name=TQWIDGET_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="455" isRoot="false" isAbstract="false" name="TQWidget" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="456" isRoot="false" isAbstract="false" name="KisRect" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="457" isRoot="false" isAbstract="false" name="KisPoint" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="463" isRoot="false" isAbstract="false" name="TQ_INT32" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="475" isRoot="false" isAbstract="false" name="QRect" />
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="497" isRoot="false" isAbstract="false" name=TQPOINT_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="497" isRoot="false" isAbstract="false" name="TQPoint" />
     <UML:Class comment="The canvas subject is the subset of operations that are directy available to
 tools." isSpecification="false" isLeaf="false" visibility="public" xmi.id="528" isRoot="false" isAbstract="false" name="KisPainterControllerInterface" >
      <UML:Classifier.feature>
@@ -2056,7 +2056,7 @@ That last bit has not been solved yet.
      </UML:Classifier.feature>
     </UML:Class>
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="542" isRoot="false" isAbstract="false" name="TDEShared" />
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="548" isRoot="false" isAbstract="false" name=TQSTRING_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="548" isRoot="false" isAbstract="false" name="TQString" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="558" isRoot="false" isAbstract="false" name="bool" />
     <UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="570" isRoot="false" isAbstract="false" name="KisIDList" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="571" isRoot="false" isAbstract="false" name="KoDocument" />
@@ -2209,13 +2209,13 @@ and the clipboard." isSpecification="false" isLeaf="false" visibility="public" x
       <UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="633" isRoot="false" isAbstract="false" name="storageMap" />
      </UML:Namespace.ownedElement>
     </UML:Class>
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="662" isRoot="false" isAbstract="false" name=TQBYTEARRAY_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="662" isRoot="false" isAbstract="false" name="TQByteArray" />
     <UML:Package isSpecification="false" isLeaf="false" visibility="public" xmi.id="677" isRoot="false" isAbstract="false" name="Qt" >
      <UML:Namespace.ownedElement>
       <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="678" isRoot="false" isAbstract="false" name="Orientation" />
      </UML:Namespace.ownedElement>
     </UML:Package>
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="685" isRoot="false" isAbstract="false" name=TQPIXMAP_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="685" isRoot="false" isAbstract="false" name="TQPixmap" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="690" isRoot="false" isAbstract="false" name="KisGuideMgr" >
      <UML:Classifier.feature>
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="756" isRoot="false" initialValue="" type="728" isAbstract="false" name="m_size" />
@@ -2677,7 +2677,7 @@ the resource has been saved." isSpecification="false" isLeaf="false" visibility=
       </UML:Operation>
      </UML:Classifier.feature>
     </UML:Class>
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="869" isRoot="false" isAbstract="false" name=TQOBJECT_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="869" isRoot="false" isAbstract="false" name="TQObject" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="879" isRoot="false" isAbstract="false" name="QImage" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="924" isRoot="false" isAbstract="false" name="TQ_UINT32" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="930" isRoot="false" isAbstract="false" name="cmsHPROFILE" />
@@ -15867,7 +15867,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="455" parent_class="455" fileExt=".java" fileName=TQWIDGET_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="455" parent_class="455" fileExt=".java" fileName="TQWidget" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16467,7 +16467,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="497" parent_class="497" fileExt=".java" fileName=TQPOINT_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="497" parent_class="497" fileExt=".java" fileName="TQPoint" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -17964,7 +17964,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="548" parent_class="548" fileExt=".java" fileName=TQSTRING_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="548" parent_class="548" fileExt=".java" fileName="TQString" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21542,7 +21542,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="662" parent_class="662" fileExt=".java" fileName=TQBYTEARRAY_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="662" parent_class="662" fileExt=".java" fileName="TQByteArray" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21917,7 +21917,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="685" parent_class="685" fileExt=".java" fileName=TQPIXMAP_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="685" parent_class="685" fileExt=".java" fileName="TQPixmap" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -26390,7 +26390,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="869" parent_class="869" fileExt=".java" fileName=TQOBJECT_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="869" parent_class="869" fileExt=".java" fileName="TQObject" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
diff --git a/chalk/doc/histograms.xmi b/chalk/doc/histograms.xmi
index fb6bc5113..56ad12970 100644
--- a/chalk/doc/histograms.xmi
+++ b/chalk/doc/histograms.xmi
@@ -148,7 +148,7 @@
       </UML:Operation>
      </UML:Classifier.feature>
     </UML:Class>
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="12" isRoot="false" isAbstract="false" name=TQSTRING_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="12" isRoot="false" isAbstract="false" name="TQString" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="13" isRoot="false" isAbstract="false" name="KisChannelInfo" />
     <UML:Class comment="This class is an interface used in the generation of a histogram. It is a container of
 data, all mathematically interesting things will calculated by a KisHistogram.
@@ -3153,7 +3153,7 @@ of choice, and rounded to a reasonable precision to avoid 0.999999" isSpecificat
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="883" isRoot="false" isAbstract="false" name="KisImageIface" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="884" isRoot="false" isAbstract="false" name="KisProfile" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="885" isRoot="false" isAbstract="false" name="KisProgressDisplayInterface" />
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="886" isRoot="false" isAbstract="false" name=TQOBJECT_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="886" isRoot="false" isAbstract="false" name="TQObject" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="912" isRoot="false" isAbstract="false" name="QPainter" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="925" isRoot="false" isAbstract="false" name="QImage" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1065" isRoot="false" isAbstract="false" name="KisGuideMgr" />
@@ -3163,7 +3163,7 @@ of choice, and rounded to a reasonable precision to avoid 0.999999" isSpecificat
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1133" isRoot="false" isAbstract="false" name="vKisAnnotationSP" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1136" isRoot="false" isAbstract="false" name="QMutex" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1138" isRoot="false" isAbstract="false" name="QSize" />
-    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1139" isRoot="false" isAbstract="false" name=TQPOINT_OBJECT_NAME_STRING />
+    <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1139" isRoot="false" isAbstract="false" name="TQPoint" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1140" isRoot="false" isAbstract="false" name="QWMatrix" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1141" isRoot="false" isAbstract="false" name="KNamedCommand" />
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1142" isRoot="false" isAbstract="false" name="KisRotateVisitor" />
diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp
index 59da51890..bf029fb10 100644
--- a/chalk/ui/kis_view.cpp
+++ b/chalk/ui/kis_view.cpp
@@ -3515,7 +3515,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
 
             child->installEventFilter(this);
 
-            TQObjectList *objectList = child->queryList(TQWIDGET_OBJECT_NAME_STRING);
+            TQObjectList *objectList = child->queryList("TQWidget");
             TQObjectListIt it(*objectList);
             TQObject *obj;
             while ((obj = it.current()) != 0) {