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

[Oliver Kellogg]

SVN commit 644781 by okellogg:

It looks as though the bug fixed by commit 644749 may have been causing the
problems with the advanced code generators, too.
I'm experimentally lifting the BUG84739 barrier.
If you feel adventurous and want to help improving Umbrello then go to the
Setting->Configure Umbrello menu and enable "Use new C++/Java/Ruby generators".
Is the advanced-codegen configuration back to stable?  Please send reports to
CCBUG:84739


 M  +0 -3      dialogs/settingsdlg.cpp  
 M  +0 -4      uml.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp #644780:644781
@@ -115,9 +115,6 @@
 
     m_GeneralWidgets.newcodegenCB = new QCheckBox( i18n("Use new C++/Java/Ruby generators"), m_GeneralWidgets.miscGB );
     m_GeneralWidgets.newcodegenCB -> setChecked( m_pOptionState->generalState.newcodegen );
-#ifndef BUG84739_FIXED
-    m_GeneralWidgets.newcodegenCB->setEnabled(false);
-#endif
     miscLayout -> addWidget( m_GeneralWidgets.newcodegenCB, 1, 0 );
 
     m_GeneralWidgets.angularLinesCB = new QCheckBox( i18n("Use angular association lines"), m_GeneralWidgets.miscGB );
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/uml.cpp #644780:644781
@@ -1097,11 +1097,7 @@
     Settings::OptionState& optionState = Settings::getOptionState();
     optionState.generalState.undo = m_config -> readBoolEntry( "undo", true );
     optionState.generalState.tabdiagrams = m_config -> readBoolEntry("tabdiagrams", false);
-#if defined (BUG84739_FIXED)
     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