[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 434174 by okellogg:

Patch by Paulo Sehn fixes BUG:97188 . Many thanks.


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


--- trunk/KDE/kdesdk/umbrello/ChangeLog #434173:434174
@@ -5,12 +5,12 @@
 * Change interface into class and vice versa (if abstract and no attributes)
 
 * Bugs fixed / wishes implemented (see http://bugs.kde.org)
-57588 67719 79433 87252 88117 105564 108223
+57588 67719 79433 87252 88117 97188 105564 108223
 
 Version 1.4.2 (maintenance release)
 
 * Bugs fixed from http://bugs.kde.org :
-72016 103170 106356 106632 106673 107551
+72016 103170 106356 106632 106673 107101 107551 108688
 
 Version 1.4.1 (maintenance release)
 
--- trunk/KDE/kdesdk/umbrello/THANKS #434173:434174
@@ -50,6 +50,7 @@
 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>
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp #434173:434174
@@ -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 "";
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp #434173:434174
@@ -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 "";
@@ -57,7 +57,7 @@
     UMLClassifier * c = doc->getParentClassifier();
     UMLOperation * o = getParentOperation();
     bool isInterface = doc->parentIsInterface();
-    bool isInlineMethod = policy->getAccessorsAreInline( );
+    bool isInlineMethod = policy->getOperationsAreInline( );
 
     // first, the comment on the operation
     QString comment = o->getDoc();