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

[Laurent Montel]

SVN commit 515941 by mlaurent:

Fix some error


 M  +3 -3      codegenerators/javacodegenerationpolicy.cpp  
 M  +2 -2      dialogs/settingsdlg.cpp  
 M  +1 -1      dialogs/statedialog.cpp  
 M  +2 -2      dialogs/umlviewdialog.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp #515940:515941
@@ -160,9 +160,9 @@
     // write ONLY the Java specific stuff
     config->setGroup("Java Code Generation");
 
-    config->writeEntry("defaultAttributeAccessorScope",getAttributeAccessorScope());
-    config->writeEntry("defaultAssocFieldScope",getAssociationFieldScope());
-    config->writeEntry("commentStyle",getCommentStyle());
+    config->writeEntry("defaultAttributeAccessorScope",int(getAttributeAccessorScope()));
+    config->writeEntry("defaultAssocFieldScope",int(getAssociationFieldScope()));
+    config->writeEntry("commentStyle",int(getCommentStyle()));
     config->writeEntry("autoGenEmptyConstructors",getAutoGenerateConstructors());
     config->writeEntry("autoGenAccessors",getAutoGenerateAttribAccessors());
     config->writeEntry("autoGenAssocAccessors",getAutoGenerateAssocAccessors());
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp #515940:515941
@@ -83,7 +83,7 @@
 
     // Low-Limit: 0, High-Limit: 10, Step: 1, Initial-Val: m_pOptionState->uiState.lineWidth
     // Number-Base: 10 ( decimal ), Parent: m_UiWidgets.colorGB
-    m_UiWidgets.lineWidthB = new KIntSpinBox( 0, 10, 1, m_pOptionState->uiState.lineWidth, 10, m_UiWidgets.colorGB );
+    m_UiWidgets.lineWidthB = new KIntSpinBox( 0, 10, 1, m_pOptionState->uiState.lineWidth, m_UiWidgets.colorGB );
     colorLayout -> addWidget( m_UiWidgets.lineWidthB, 2, 1 );
 
     m_UiWidgets.lineWidthDefaultB = new QPushButton( i18n("D&efault Width"), m_UiWidgets.colorGB );
@@ -140,7 +140,7 @@
     m_GeneralWidgets.autosaveL = new QLabel( i18n("Select auto-save time interval (mins):"), m_GeneralWidgets.autosaveGB );
     autosaveLayout -> addWidget( m_GeneralWidgets.autosaveL, 1, 0 );
 
-    m_GeneralWidgets.timeISB = new KIntSpinBox( 1, 600, 1, m_pOptionState->generalState.autosavetime, 10, m_GeneralWidgets.autosaveGB );
+    m_GeneralWidgets.timeISB = new KIntSpinBox( 1, 600, 1, m_pOptionState->generalState.autosavetime, m_GeneralWidgets.autosaveGB );
     m_GeneralWidgets.timeISB -> setEnabled( m_pOptionState->generalState.autosave );
     autosaveLayout -> addWidget( m_GeneralWidgets.timeISB, 1, 1 );
 
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/statedialog.cpp #515940:515941
@@ -129,7 +129,7 @@
     if ( !m_pStateWidget )
         return;
     KVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts")  );
-    m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);
+    m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
     m_pChooser -> setFont( m_pStateWidget -> getFont() );
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp #515940:515941
@@ -29,7 +29,7 @@
 #include <QHBoxLayout>
 #include <knuminput.h>
 #include <q3vbox.h>
-
+#include <kvbox.h>
 #include "umlviewdialog.h"
 #include "../umlview.h"
 #include "../umldoc.h"
@@ -106,7 +106,7 @@
 
 void UMLViewDialog::setupFontPage() {
     KVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts")  );
-    m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);
+    m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
     m_pChooser -> setFont( m_pView -> getOptionState().uiState.font );
 }