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

[Oliver Kellogg]

SVN commit 434368 by okellogg:

BUG:97188 - updateContent(): Backport fix by Paulo Sehn.


 M  +1 -1      ChangeLog  
 M  +10 -0     THANKS  
 M  +1 -1      umbrello/codegenerators/cppheadercodeoperation.cpp  
 M  +1 -1      umbrello/codegenerators/cppsourcecodeoperation.cpp  


--- branches/KDE/3.4/kdesdk/umbrello/ChangeLog #434367:434368
@@ -1,7 +1,7 @@
 Version 1.4.2 (maintenance release)
 
 * Bugs fixed from http://bugs.kde.org :
-72016 103170 106356 106632 106673 107101 107551
+72016 97188 103170 106356 106632 106673 107101 107551 108688
 
 Version 1.4.1 (maintenance release)
 
--- branches/KDE/3.4/kdesdk/umbrello/THANKS #434367:434368
@@ -20,29 +20,39 @@
 Zoltan Bartko <bartko.zoltan @pobox.sk>
 Luis De la Parra Blum <lparrab @gmx.net>
 Raymond Bosman <bosman @hetnet.nl>
+Ben Burton <bab @debian.org>
 Albert Cervera <albertca @jazzfree.com>
 Albert Astals Cid <tsdgeos @terra.es>
 Vincent Decorges <vincent.decorges @eivd.ch>
+Jean-Remy Falleri <jr.falleri @gmail.com>
+Andi Fischer <andi.fischer @hispeed.ch>
 Pascal Fleury <fleury @users.sourceforge.net>
+Gregorio Guidi <g.guidi @sns.it>
 Esben Mose Hansen <esben @despammed.com>
+Olaf Hartig <OleBowle @gmx.de>
 Michel Hermier <michel.hermier @wanadoo.fr>
+Paul Hensgen <phensgen @bigpond.net.au>
 David Hugh-Jones <hughjonesd @yahoo.co.uk>
 Pekka Jääskeläinen <pjaaskel @cs.tut.fi>
 Klas Kalass  <klas.kalass @gmx.de>
 Oliver Kellogg <okellogg @users.sourceforge.net>
 Tobias Koenig <tokoe @kde.org>
 Piotr Kolaczkowski <P.Kolaczkowski @elka.pw.edu.pl>
+Matthias Kretz <kretz @kde.org>
 Thorsten Kunz <tk @bytecrash.net>
 Gustavo Madrigal <gmadrigal @nextphere.com>
 martin <mv123q3 @hotmail.com>
 Laurent Montel <montel @kde.org>
+Lutz Mueller <lutz.mueller @gmx.de>
 Heiko Nardmann <heiko.nardmann @onlinehome.de>
 Carsten Pfeiffer <pfeiffer @kde.org>
 Ivan Porres <iporres @abo.fi>
+Ruediger Ranft <kdebugs @rranft1.mail.htwm.de>
 John Ratke <jratke @comcast.net>
 Daniel Richard G. <skunk @iskunk.org>
 Jonathan Riddell <jr @jriddell.org>
 Peeter Russak <pezz @tkwcy.ee>
+Paulo Roberto Rodriguez Sehn <paulo.sehn @gmail.com>
 Achim Spangler <Achim.Spangler @mnet-online.de>
 Sebastian Stein <seb.stein @gmx.de>
 Andrew Sutton <asutton @cs.kent.edu>
--- branches/KDE/3.4/kdesdk/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp #434367:434368
@@ -40,7 +40,7 @@
 void CPPHeaderCodeOperation::updateContent( )
 {
         CPPCodeGenerationPolicy * policy = (CPPCodeGenerationPolicy*) getParentDocument()->getParentGenerator()->getPolicy();
-        bool isInlineMethod = policy->getAccessorsAreInline( );
+        bool isInlineMethod = policy->getOperationsAreInline( );
 
 	if(isInlineMethod)
 		setText(""); // change whatever it is to "";
--- branches/KDE/3.4/kdesdk/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp #434367:434368
@@ -40,7 +40,7 @@
 void CPPSourceCodeOperation::updateContent( )
 {
         CPPCodeGenerationPolicy * policy = (CPPCodeGenerationPolicy*) getParentDocument()->getParentGenerator()->getPolicy();
-        bool isInlineMethod = policy->getAccessorsAreInline( );
+        bool isInlineMethod = policy->getOperationsAreInline();
 
         if(!isInlineMethod)
                 setText(""); // change whatever it is to "";