[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

fix wee logic error which was preventing list view items being dragged and dropped


  M +2 -2      codegenerators/javawriter.cpp   1.6
  M +3 -2      umllistview.cpp   1.13


--- kdesdk/umbrello/umbrello/umllistview.cpp  #1.12:1.13
@@ -403,5 +403,6 @@ QDragObject* UMLListView::dragObject() {
                 ++it;
                 type = item->getType();
-                if(typeIsCanvasWidget(type) && (type < Uml::lvt_UseCase_Diagram || type > Uml::lvt_Sequence_Diagram) &&
+                if (!typeIsCanvasWidget(type) &&
+                    (type < Uml::lvt_UseCase_Diagram || type > Uml::lvt_Sequence_Diagram) &&
                         (type != Uml::lvt_UseCase_Folder) && (type != Uml::lvt_Logical_Folder)) {
                         return 0;

--- kdesdk/umbrello/umbrello/codegenerators/javawriter.cpp  #1.5:1.6
@@ -489,5 +489,5 @@ void JavaWriter::writeVectorAttributeAcc
 
         fieldClassName = fixTypeName(fieldClassName);
-        fieldName = capitalizeFirstLetter(fieldName);
+        fieldName = capitaliseFirstLetter(fieldName);
         QString strVis = scopeToJavaDecl(visibility);
 
@@ -531,5 +531,5 @@ void JavaWriter::writeSingleAttributeAcc
         QString strVis = scopeToJavaDecl(visibility);
         fieldClassName = fixTypeName(fieldClassName);
-        fieldName = capitalizeFirstLetter(fieldName);
+        fieldName = capitaliseFirstLetter(fieldName);
 
         // set method