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

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 12 insertions, 12 deletions

diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi
index 539d9cf1..7579734d 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>