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

[Oliver Kellogg]

SVN commit 541718 by okellogg:

Use UMLApp::getDefaultLanguage() for the default programming language.

 M  +1 -1      uml.cpp  
 M  +2 -2      umldoc.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/uml.cpp #541717:541718
@@ -1549,7 +1549,7 @@
 
 void UMLApp::newDocument() {
     m_doc->newDocument();
-    Uml::Programming_Language defaultLanguage = Uml::pl_Cpp;
+    Uml::Programming_Language defaultLanguage = getDefaultLanguage();
     if (m_codegen) {
         defaultLanguage = m_codegen->getLanguage();
         delete m_codegen;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umldoc.cpp #541717:541718
@@ -1788,7 +1788,7 @@
     resolveTypes();
     // set a default code generator if no <XMI.extensions><codegeneration> tag seen
     if (UMLApp::app()->getGenerator() == NULL)
-        UMLApp::app()->setGenerator(Uml::pl_Cpp);
+        UMLApp::app()->setGenerator(UMLApp::app()->getDefaultLanguage());
     emit sigWriteToStatusBar( i18n("Setting up the document...") );
     kapp->processEvents();  // give UI events a chance
     m_currentView = NULL;
@@ -2014,7 +2014,7 @@
             cgelement = cgnode.toElement();
         }
         if (UMLApp::app()->getGenerator() == NULL)
-            UMLApp::app()->setGenerator(Uml::pl_Cpp);
+            UMLApp::app()->setGenerator(UMLApp::app()->getDefaultLanguage());
     }
 }