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

[Oliver Kellogg]

SVN commit 699085 by okellogg:

move closer to branches/KDE/3.5

 M  +1 -1      classifierlistitem.cpp  
 M  +1 -1      codegenerator.cpp  
 M  +2 -2      codegenerators/csharpwriter.cpp  
 M  +0 -1      codegenerators/javawriter.cpp  
 M  +0 -3      codegenerators/rubycodeaccessormethod.cpp  
 M  +2 -1      docgenerators/docbook2xhtml.xsl  
 M  +2 -2      import_rose.cpp  
 M  +2 -3      umlview.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/classifierlistitem.cpp #699084:699085
@@ -76,7 +76,7 @@
 void UMLClassifierListItem::setTypeName(const QString &type) {
     if (type.isEmpty() || type == "void") {
         m_pSecondary = NULL;
-        m_SecondaryId.clear();
+        m_SecondaryId = QString();
         return;
     }
     UMLDoc *pDoc = UMLApp::app()->getDocument();
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerator.cpp #699084:699085
@@ -485,7 +485,7 @@
  */
 QString CodeGenerator::cleanName ( const QString &name ) {
     QString retval = name;
-    retval.replace(QRegExp("\\W"), "_");
+    retval.replace(QRegExp("\\W+"), "_");
     return retval;
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/csharpwriter.cpp #699084:699085
@@ -477,7 +477,7 @@
 
             // FIXME: "returns" should contain documentation, not type.
             cs << m_container_indent << m_indentation << "/// <returns>";
-            if (!( op->getTypeName() ).isEmpty()) {
+            if (! op->getTypeName().isEmpty()) {
                 cs << makeLocalTypeName(op);
             }
             cs << "</returns>" << m_endl;
@@ -500,7 +500,7 @@
         }
 
         // return type
-        if (( op->getTypeName() ).isEmpty()) {
+        if (op->getTypeName().isEmpty()) {
             cs << "void ";
         }
         else {
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/javawriter.cpp #699084:699085
@@ -406,7 +406,6 @@
         // force capitalizing the field name, this is silly,
         // from what I can tell, this IS the default behavior for
         // cleanName. I dunno why its not working -b.t.
-        fieldName.trimmed();
         fieldName.replace(0,1,fieldName.at(0).upper());
 
         writeSingleAttributeAccessorMethods(at->getTypeName(),
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp #699084:699085
@@ -109,9 +109,6 @@
     case CodeAccessorMethod::REMOVE:
         {
             int minOccurs = rubyfield->minimumListOccurances();
-            /*
-             RubyClassifierCodeDocument * rubydoc = dynamic_cast<RubyClassifierCodeDocument*>(rubyfield->getParentDocument());
-             */
             QString fieldType = rubyfield->getTypeName();
             QString indent = getIndentation();
 
--- trunk/KDE/kdesdk/umbrello/umbrello/docgenerators/docbook2xhtml.xsl #699084:699085
@@ -3,4 +3,5 @@
   <!--xsl:import href="docbook-xsl-1.70.1/xhtml/docbook.xsl"/-->
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/snapshot/html/docbook.xsl"/>
   <xsl:param name="html.stylesheet">xmi.css</xsl:param>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
+
--- trunk/KDE/kdesdk/umbrello/umbrello/import_rose.cpp #699084:699085
@@ -67,7 +67,7 @@
             lexeme += c;
             if (inString) {
                 result.append(lexeme);
-                lexeme.clear();
+                lexeme = QString();
             }
             inString = !inString;
         } else if (inString ||
@@ -76,7 +76,7 @@
         } else {
             if (!lexeme.isEmpty()) {
                 result.append(lexeme);
-                lexeme.clear();
+                lexeme = QString();
             }
             if (! c.isSpace()) {
                 result.append(QString(c));
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #699084:699085
@@ -2528,7 +2528,6 @@
     m_bDrawSelectedOnly = false;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
 void UMLView::setMenu() {
     slotRemovePopupMenu();
     ListPopupMenu::Menu_Type menu = ListPopupMenu::mt_Undefined;
@@ -3339,7 +3338,7 @@
 }
 
 UMLWidget* UMLView::loadWidgetFromXMI(QDomElement& widgetElement) {
-    UMLWidget* widget = 0;
+
     if ( !m_pDoc ) {
         kWarning() << "UMLView::loadWidgetFromXMI(): m_pDoc is NULL";
         return 0L;
@@ -3347,7 +3346,7 @@
 
     QString tag  = widgetElement.tagName();
     QString idstr  = widgetElement.attribute( "xmi.id", "-1" );
-    widget = Widget_Factory::makeWidgetFromXMI(tag, idstr, this);
+    UMLWidget* widget = Widget_Factory::makeWidgetFromXMI(tag, idstr, this);
 
     if (widget == NULL)
         return NULL;