[Uml-devel] branches/KDE/3.5/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 674094 by okellogg:

writeClass(): Use the classname instead of the fixed name "TObject".
Thanks to Dmitry N. Kurashkin for the patch.
BUG:146676


 M  +6 -0      ChangeLog  
 M  +1 -0      THANKS  
 M  +2 -2      umbrello/codegenerators/pascalwriter.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #674093:674094
@@ -1,3 +1,9 @@
+Version 1.5.72
+
+* Bugs/wishes from http://bugs.kde.org:
+* Umbrello appends ".xmi" to the saved diagram name when it is told not to do so (146061)
+* Wrong pascal code generation (146676)
+
 Version 1.5.71
 
 * Bugs/wishes from http://bugs.kde.org:
--- branches/KDE/3.5/kdesdk/umbrello/THANKS #674093:674094
@@ -49,6 +49,7 @@
 Piotr Kolaczkowski <P.Kolaczkowski @elka.pw.edu.pl>
 Matthias Kretz <kretz @kde.org>
 Thorsten Kunz <tk @bytecrash.net>
+Dmitry N. Kurashkin <dkur @nm.ru>
 Jari-Matti Mäkelä <jmjm @iki.fi>
 Gustavo Madrigal <gmadrigal @nextphere.com>
 martin <mv123q3 @hotmail.com>
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/pascalwriter.cpp #674093:674094
@@ -241,7 +241,7 @@
 
     UMLClassifierList superclasses = c->getSuperClasses();
 
-    pas << getIndent() << "TObject = object";
+    pas << getIndent() << classname << " = object";
     if (!superclasses.isEmpty()) {
         // FIXME: Multiple inheritance is not yet supported
         UMLClassifier* parent = superclasses.first();
@@ -312,7 +312,7 @@
     }
     pas << getIndent() << "end;" << m_endl << m_endl;
 
-    pas << getIndent() << "PObject = ^TObject;" << m_endl << m_endl;
+    pas << getIndent() << "P" << classname << " = ^" << classname <<";" << m_endl << m_endl;
 
     m_indentLevel--;
     pas << "end;" << m_endl << m_endl;