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

[Oliver Kellogg]

SVN commit 634255 by okellogg:

getHeadingFile(): Attachment 19707 from Antoine Dopffer adds substitution of
 %time% and %date% with the current time and date.
BUG:96612


 M  +1 -0      ChangeLog  
 M  +1 -0      THANKS  
 M  +5 -1      umbrello/codegenerationpolicy.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #634254:634255
@@ -1,6 +1,7 @@
 Version 1.5.7
 
 * Bugs fixed from http://bugs.kde.org:
+* %date% and %time% not being parsed (96612)
 * Relationships for entities do not live outside of an entity relationship diagram (125146)
 * Javascript Code Generation creates bad format methods (135540)
 * Crash when deleting the link between a package and a class (141602)
--- branches/KDE/3.5/kdesdk/umbrello/THANKS #634254:634255
@@ -26,6 +26,7 @@
 Albert Astals Cid <tsdgeos @terra.es>
 Richard Dale <duke @tipitina.demon.co.uk>
 Vincent Decorges <vincent.decorges @eivd.ch>
+Antoine Dopffer <adopffer @nerdshack.com>
 Alan Ezust <alan.ezust @gmail.com>
 Jean-Remy Falleri <jr.falleri @gmail.com>
 Andi Fischer <andi.fischer @hispeed.ch>
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerationpolicy.cpp #634254:634255
@@ -24,6 +24,7 @@
 #include <qstringlist.h>
 #include <qregexp.h>
 #include <qtextstream.h>
+#include <qdatetime.h>
 
 // kde includes
 #include <kconfig.h>
@@ -551,7 +552,10 @@
     //do variable substitution
     retstr.replace( QRegExp("%author%"),QString(getenv("USER")));  //get the user name from some where else
     retstr.replace( QRegExp("%headingpath%"),filename );
-    //the replace filepath, time parts are now in the code document updateHeader method (which you may override as needed)...
+    retstr.replace( QRegExp("%time%"), QTime::currentTime().toString());
+    retstr.replace( QRegExp("%date%"), QDate::currentDate().toString());
+    // the replace filepath, time parts are also in the code document updateHeader method
+    // (which is not a virtual function)...
 
     return retstr;
 }