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

[Oliver Kellogg]

SVN commit 654003 by okellogg:

readOptionState(): Reinstall barrier against advanced code generators.
Further use of the newcodegen config has revealed that it's still unstable.
In order to work on this, add -DWORK_ON_BUG_126262 to the CFLAGS in the
Makefile.
CCBUG:126262


 M  +4 -0      uml.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/uml.cpp #654002:654003
@@ -1097,7 +1097,11 @@
     Settings::OptionState& optionState = Settings::getOptionState();
     optionState.generalState.undo = m_config -> readBoolEntry( "undo", true );
     optionState.generalState.tabdiagrams = m_config -> readBoolEntry("tabdiagrams", false);
+#if defined (WORK_ON_BUG_126262)
     optionState.generalState.newcodegen = m_config -> readBoolEntry("newcodegen", false);
+#else
+    optionState.generalState.newcodegen = false;
+#endif
     optionState.generalState.angularlines = m_config->readBoolEntry("angularlines", false);
     optionState.generalState.autosave = m_config -> readBoolEntry( "autosave", true );
     optionState.generalState.time = m_config -> readNumEntry( "time", 0 ); //old autosavetime value kept for compatibility