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

[Laurent Montel]

SVN commit 515952 by mlaurent:

Fix some error


 M  +3 -3      associationwidget.cpp  
 M  +4 -4      codegenerationpolicy.cpp  
 M  +6 -1      codegenerators/cppcodegenerationformbase.ui  
 M  +1 -1      codegenerators/cppcodegenerationpolicy.cpp  
 M  +3 -3      codegenerators/rubycodegenerationpolicy.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/associationwidget.cpp #515951:515952
@@ -2346,7 +2346,7 @@
             oldText = "";
         newText = KInputDialog::getText(i18n("Multiplicity"),
                                         i18n("Enter multiplicity:"),
-                                        oldText, NULL, m_pView, NULL, &v);
+                                        oldText, NULL, m_pView,&v);
         if (newText != oldText) {
             if (FloatingText::isTextValid(newText)) {
                 setMulti(newText, r);
@@ -2364,7 +2364,7 @@
             oldText = "";
         newText = KInputDialog::getText(i18n("Association Name"),
                                         i18n("Enter association name:"),
-                                        oldText, NULL, m_pView, NULL, &v);
+                                        oldText, NULL, m_pView, &v);
         if (newText != oldText) {
             if (FloatingText::isTextValid(newText)) {
                 setName(newText);
@@ -2384,7 +2384,7 @@
             oldText = "";
         newText = KInputDialog::getText(i18n("Role Name"),
                                         i18n("Enter role name:"),
-                                        oldText, NULL, m_pView, NULL, &v);
+                                        oldText, NULL, m_pView, &v);
         if (newText != oldText) {
             if (FloatingText::isTextValid(newText)) {
                 setRoleName(newText, r);
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerationpolicy.cpp #515951:515952
@@ -398,15 +398,15 @@
     config->writeEntry("forceDoc",getCodeVerboseDocumentComments());
     config->writeEntry("forceSections",getCodeVerboseSectionComments());
 
-    config->writeEntry("lineEndingType",getLineEndingType());
-    config->writeEntry("indentationType",getIndentationType());
+    config->writeEntry("lineEndingType",int(getLineEndingType()));
+    config->writeEntry("indentationType",int(getIndentationType()));
     config->writeEntry("indentationAmount",getIndentationAmount());
 
     config->writePathEntry("outputDirectory",getOutputDirectory().absPath());
     config->writePathEntry("headingsDirectory",getHeadingFileDir());
     config->writeEntry("includeHeadings",getIncludeHeadings());
-    config->writeEntry("overwritePolicy",getOverwritePolicy());
-    config->writeEntry("modnamePolicy",  getModifyPolicy());
+    config->writeEntry("overwritePolicy",int(getOverwritePolicy()));
+    config->writeEntry("modnamePolicy",  int(getModifyPolicy()));
 
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui #515951:515952
@@ -474,8 +474,13 @@
     <slot>browseClicked()</slot>
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
+<customwidgets>
+    <customwidget>
+    <class>KHistoryCombo</class>
+    <header>kcombobox.h</header>
+    </customwidget>
+</customwidgets>
 <includehints>
     <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp #515951:515952
@@ -317,7 +317,7 @@
     // write ONLY the CPP specific stuff
     config->setGroup("CPP Code Generation");
 
-    config->writeEntry("commentStyle",getCommentStyle());
+    config->writeEntry("commentStyle",int(getCommentStyle()));
     config->writeEntry("autoGenEmptyConstructors",getAutoGenerateConstructors());
     config->writeEntry("autoGenAccessors",getAutoGenerateAccessors());
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp #515951:515952
@@ -163,9 +163,9 @@
     // write ONLY the Ruby specific stuff
     config->setGroup("Ruby 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());