[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Fix the fix.


  M +2 -0      uml.cpp   1.132
  M +1 -10     codegenerators/cppcodegenerationpolicy.cpp   1.13


--- kdesdk/umbrello/umbrello/uml.cpp  #1.131:1.132
@@ -1249,4 +1249,6 @@ CodeGenerator* UMLApp::createGenerator()
         QString generatorName = codeGeneratorFactory.generatorName(activeLanguage);
         g = codeGeneratorFactory.createObject(getDocument(), generatorName.latin1());
+        if (getDocument()->getCurrentCodeGenerator() == NULL)
+                getDocument()->setCurrentCodeGenerator(g);
 
         // now set defaults on the new policy from the configuration

--- kdesdk/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp  #1.12:1.13
@@ -388,13 +388,4 @@ void CPPCodeGenerationPolicy::setDefault
         setAutoGenerateConstructors(config->readBoolEntry("autoGenEmptyConstructors",DEFAULT_AUTO_GEN_EMPTY_CONSTRUCTORS));
         setAutoGenerateAccessors(config->readBoolEntry("autoGenAccessors",DEFAULT_AUTO_GEN_ACCESSORS));
-/**** Temporarily commented because of following endless recursion:
- #0  UMLApp::createGenerator() (this=0x841f0f8) at uml.cpp:1250
- #1  0x0818a5f9 in UMLApp::getGenerator(bool) (this=0x841f0f8, warnMissing=true) at uml.cpp:1216
- #2  0x0829c481 in CPPCodeGenerationPolicy::setDefaults(KConfig*, bool) (this=0x8508db8, config=0x83f3ac8, 
-     emitUpdateSignal=false) at cppcodegenerationpolicy.cpp:391
- #3  0x0818a7ea in UMLApp::createGenerator() (this=0x841f0f8) at uml.cpp:1257
- #4  0x0818a5f9 in UMLApp::getGenerator(bool) (this=0x841f0f8, warnMissing=true) at uml.cpp:1216
- #5  0x0819fe6d in UMLDoc::addDefaultDatatypes() (this=0x8428cb0) at umldoc.cpp:2943
- #6  0x0819018e in UMLDoc::newDocument() (this=0x8428cb0) at umldoc.cpp:346
 
         CodeGenerator *codegen = UMLApp::app()->getGenerator();
@@ -404,5 +395,5 @@ void CPPCodeGenerationPolicy::setDefault
                 cppcodegen->setCreateProjectMakefile(mkmf);
         }
-*************************************************************************************************/
+
         setAccessorsAreInline(config->readBoolEntry("inlineAccessors",DEFAULT_INLINE_ACCESSORS));
         setOperationsAreInline(config->readBoolEntry("inlineOps",DEFAULT_INLINE_OPERATIONS));