[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

prevent some compiler warnings


  M +2 -2      assocrules.cpp   1.11
  M +2 -2      nodewidget.cpp   1.2


--- kdesdk/umbrello/umbrello/assocrules.cpp  #1.10:1.11
@@ -21,5 +21,5 @@ AssocRules::AssocRules() {}
 AssocRules::~AssocRules() {}
 
-bool allowAssociation( Association_Type assocType, const std::type_info &type )
+bool allowAssociation( Association_Type/* assocType*/, const std::type_info/* &type*/ )
 {
         return false;
@@ -128,5 +128,5 @@ bool AssocRules::allowAssociation( Assoc
 
                 case at_Realization: // can only connect to abstract (interface) classes
-                        while( assoc = it.current() ) {
+                        while( ( assoc = it.current() ) ) {
                                 if( ( widgetA == assoc->getWidgetA() || widgetA == assoc->getWidgetB() )
                                     && assoc->getAssocType() == at_Realization ) {

--- kdesdk/umbrello/umbrello/nodewidget.cpp  #1.1:1.2
@@ -143,6 +143,6 @@ void NodeWidget::calculateSize() {
         height = (2*fontHeight) + (NODE_MARGIN * 2);
 
-        width = width * 1.5;
-        height = height * 1.5;
+        width = static_cast<int>(width * 1.5);
+        height = static_cast<int>(height * 1.5);
 
         setSize(width, height);