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

[Andi Fischer]

SVN commit 1250625 by fischer:

Small changes from branch applied.

 M  +2 -2      uml.cpp  
 M  +1 -1      umlcanvasobject.cpp  
 M  +3 -4      umldoc.cpp  
 M  +2 -2      umlview.cpp  
 M  +1 -1      umlview.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #1250624:1250625
@@ -584,7 +584,7 @@
  */
 void UMLApp::slotZoomOut()
 {
-    setZoom(currentView()->getZoom()-5);
+    setZoom(currentView()->zoom()-5);
 }
 
 /**
@@ -592,7 +592,7 @@
  */
 void UMLApp::slotZoomIn()
 {
-    setZoom(currentView()->getZoom()+5);
+    setZoom(currentView()->zoom()+5);
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/umlcanvasobject.cpp #1250624:1250625
@@ -215,7 +215,7 @@
                 currentName = i18n( "new_check_constraint" );
                 break;
             default:
-                uWarning() << "uniqChildName() called for unknown child type " << type;
+                uWarning() << "uniqChildName() called for unknown child type " << UMLObject::toString(type);
                 return "ERROR_in_UMLCanvasObject_uniqChildName";
         }
     }
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #1250624:1250625
@@ -12,6 +12,7 @@
 #include "umldoc.h"
 
 // app includes
+#include "debug_utils.h"
 #include "uniqueid.h"
 #include "associationwidget.h"
 #include "association.h"
@@ -31,6 +32,8 @@
 #include "classifierlistitem.h"
 #include "object_factory.h"
 #include "import_rose.h"
+#include "model_utils.h"
+#include "widget_utils.h"
 #include "uml.h"
 #include "umllistview.h"
 #include "umllistviewitem.h"
@@ -42,10 +45,6 @@
 #include "listpopupmenu.h"
 #include "cmds.h"
 #include "diagramprintpage.h"
-// utils
-#include "debug_utils.h"
-#include "model_utils.h"
-#include "widget_utils.h"
 
 // kde includes
 #include <kio/job.h>
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #1250624:1250625
@@ -1846,7 +1846,7 @@
         endPartialWidgetPaste();
     }
     resizeCanvasToItems();
-    setZoom(getZoom());
+    setZoom(zoom());
     m_bActivated = true;
 }
 
@@ -3070,7 +3070,7 @@
 
 void UMLView::fileLoaded()
 {
-    setZoom(getZoom());
+    setZoom(zoom());
     resizeCanvasToItems();
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.h #1250624:1250625
@@ -187,7 +187,7 @@
     /**
      * Returns the zoom of the diagram.
      */
-    int getZoom() const {
+    int zoom() const {
         return m_nZoom;
     }