[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [umbrello] /: Fix of llvm-clang bug reports.
From:       Ralf Habacker <ralf.habacker () freenet ! de>
Date:       2013-04-30 19:49:32
Message-ID: 20130430194932.C3C72A603F () git ! kde ! org
[Download RAW message or body]

Git commit e956609ca6eb3b5d206c37556229f3fcee88f5f2 by Ralf Habacker.
Committed on 30/04/2013 at 21:48.
Pushed by habacker into branch 'master'.

Fix of llvm-clang bug reports.

BUG: 319129

M  +4    -0    ChangeLog
M  +1    -1    umbrello/assocrules.cpp
M  +1    -1    umbrello/codegenerators/cpp/cppwriter.cpp
M  +1    -1    umbrello/codegenerators/d/dwriter.cpp
M  +1    -3    umbrello/codegenerators/ruby/rubywriter.cpp
M  +2    -4    umbrello/widgets/classifierwidget.cpp

http://commits.kde.org/umbrello/e956609ca6eb3b5d206c37556229f3fcee88f5f2

diff --git a/ChangeLog b/ChangeLog
index 4f4ed6c..7f7ac2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+version 2.10.3
+
+* Fix of llvm-clang bug reports (319129)
+
 Version 2.10.2
 
 * Auto detection fix of dot path on windows (Ralf Habacker)
diff --git a/umbrello/assocrules.cpp b/umbrello/assocrules.cpp
index cfa9d28..b711296 100644
--- a/umbrello/assocrules.cpp
+++ b/umbrello/assocrules.cpp
@@ -67,7 +67,7 @@ bool AssocRules::allowAssociation( Uml::AssociationType::Enum \
                assocType, UMLWidg
         if (view && view->umlScene()->type() == Uml::DiagramType::Component &&
             widgetType == WidgetBase::wt_Package &&
             (assocType == Uml::AssociationType::Generalization || assocType == \
                Uml::AssociationType::Realization))
-            bValid = true;
+            ;
         else
             return false;
     }
diff --git a/umbrello/codegenerators/cpp/cppwriter.cpp \
b/umbrello/codegenerators/cpp/cppwriter.cpp index 3d7ac33..f799c05 100644
--- a/umbrello/codegenerators/cpp/cppwriter.cpp
+++ b/umbrello/codegenerators/cpp/cppwriter.cpp
@@ -417,7 +417,7 @@ void CppWriter::writeClassDecl(UMLClassifier *c, QTextStream \
&cpp)  QString typeName = t->getTypeName();
             cpp << typeName << " " << formalName;
             if ( tlit.hasNext() ) {
-                t = tlit.next();
+                tlit.next();
                 cpp << ", ";
             }
         }
diff --git a/umbrello/codegenerators/d/dwriter.cpp \
b/umbrello/codegenerators/d/dwriter.cpp index 5e9c243..29442f0 100644
--- a/umbrello/codegenerators/d/dwriter.cpp
+++ b/umbrello/codegenerators/d/dwriter.cpp
@@ -332,7 +332,7 @@ void DWriter::writeClassDecl(UMLClassifier *c, QTextStream &d)
             d << t->name();
 
             if (tlit.hasNext()) {
-                t = tlit.next();
+                tlit.next();
                 d << ", ";
             }
         }
diff --git a/umbrello/codegenerators/ruby/rubywriter.cpp \
b/umbrello/codegenerators/ruby/rubywriter.cpp index 73a6040..d496ea0 100644
--- a/umbrello/codegenerators/ruby/rubywriter.cpp
+++ b/umbrello/codegenerators/ruby/rubywriter.cpp
@@ -265,11 +265,9 @@ void RubyWriter::writeOperations(const QString &classname, const \
UMLOperationLis  methodName = methodName.mid(0, 1).toLower() + methodName.mid(1);
 
         UMLAttributeList atl = op->getParmList();
-        //write method doc if we have doc || if at least one of the params has doc
-        bool writeDoc = forceDoc() || !op->doc().isEmpty();
         // Always write out the docs for ruby as the type of the
         // arguments and return value of the methods is useful
-        writeDoc = true;
+        bool writeDoc = true;
 //        for (UMLAttribute& at = atl.first(); at; at = atl.next())
 //            writeDoc |= !at->getDoc().isEmpty();
 
diff --git a/umbrello/widgets/classifierwidget.cpp \
b/umbrello/widgets/classifierwidget.cpp index 1709b37..cdebdca 100644
--- a/umbrello/widgets/classifierwidget.cpp
+++ b/umbrello/widgets/classifierwidget.cpp
@@ -491,16 +491,14 @@ QSize ClassifierWidget::calculateTemplatesBoxSize()
         return QSize(0, 0);
     }
 
-    int width, height;
-    height = width = 0;
-
     QFont font = UMLWidget::font();
     font.setItalic(false);
     font.setUnderline(false);
     font.setBold(false);
     const QFontMetrics fm(font);
 
-    height = count * fm.lineSpacing() + (MARGIN*2);
+    int width = 0;
+    int height = count * fm.lineSpacing() + (MARGIN*2);
 
     foreach (UMLTemplate *t , list ) {
         int textWidth = fm.size(0, t->toString() ).width();


[prev in list] [next in list] [prev in thread] [next in thread]