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

[Andi Fischer]

SVN commit 1294480 by fischer:

Differences to gsoc-branch reduced.

 M  +0 -4      umlscene.cpp  
 M  +2 -3      umlview.cpp  
 M  +83 -84    widgets/classifierwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1294479:1294480
@@ -80,14 +80,11 @@
 #include <QtCore/QPointer>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QVector>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
 #include <QtGui/QPrinter>
 #include <QtGui/QColor>
-#include <QtGui/QMatrix>
 #include <QtGui/QHideEvent>
-#include <QtGui/QCloseEvent>
 #include <QtGui/QDropEvent>
 #include <QtGui/QShowEvent>
 #include <QtGui/QDragEnterEvent>
@@ -1044,7 +1041,6 @@
 {
     int relativeSize = 10000;  // start with an arbitrary large number
     UMLWidget  *retWid = 0;
-    UMLWidgetListIt it(m_WidgetList);
     foreach(UMLWidget* wid, m_WidgetList) {
         const int s = wid->onWidget(p);
         if (!s)
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #1294479:1294480
@@ -38,7 +38,7 @@
 UMLView::~UMLView()
 {
     delete m_pToolBarStateFactory;
-    m_pToolBarStateFactory = NULL;
+    m_pToolBarStateFactory = 0;
 }
 
 /**
@@ -61,7 +61,7 @@
 }
 
 /**
- * return the current zoom factor
+ * Return the current zoom factor.
  */
 int UMLView::currentZoom()
 {
@@ -177,7 +177,6 @@
     m_bChildDisplayedDoc = false;
 }
 
-
 /**
  *  Calls the same method in the DocWindow.
  */
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/classifierwidget.cpp #1294479:1294480
@@ -478,89 +478,6 @@
 }
 
 /**
- * Will be called when a menu selection has been made from the
- * popup menu.
- *
- * @param action   The action that has been selected.
- */
-void ClassifierWidget::slotMenuSelection(QAction* action)
-{
-    ListPopupMenu::MenuType sel = m_pMenu->getMenuType(action);
-    switch (sel) {
-    case ListPopupMenu::mt_Attribute:
-    case ListPopupMenu::mt_Operation:
-    case ListPopupMenu::mt_Template:
-        {
-            UMLObject::ObjectType ot = ListPopupMenu::convert_MT_OT(sel);
-            if (Object_Factory::createChildObject(classifier(), ot)) {
-                updateComponentSize();
-                update();
-                UMLApp::app()->document()->setModified();
-            }
-            break;
-        }
-    case ListPopupMenu::mt_Show_Operations:
-    case ListPopupMenu::mt_Show_Operations_Selection:
-        toggleVisualProperty(ShowOperations);
-        break;
-
-    case ListPopupMenu::mt_Show_Attributes:
-    case ListPopupMenu::mt_Show_Attributes_Selection:
-        toggleVisualProperty(ShowAttributes);
-        break;
-
-    case ListPopupMenu::mt_Show_Public_Only:
-    case ListPopupMenu::mt_Show_Public_Only_Selection:
-        toggleVisualProperty(ShowPublicOnly);
-        break;
-
-    case ListPopupMenu::mt_Show_Operation_Signature:
-    case ListPopupMenu::mt_Show_Operation_Signature_Selection:
-        toggleVisualProperty(ShowOperationSignature);
-        break;
-
-    case ListPopupMenu::mt_Show_Attribute_Signature:
-    case ListPopupMenu::mt_Show_Attribute_Signature_Selection:
-        toggleVisualProperty(ShowAttributeSignature);
-        break;
-
-    case ListPopupMenu::mt_Visibility:
-    case ListPopupMenu::mt_Visibility_Selection:
-        toggleVisualProperty(ShowVisibility);
-        break;
-
-    case ListPopupMenu::mt_Show_Packages:
-    case ListPopupMenu::mt_Show_Packages_Selection:
-        toggleVisualProperty(ShowPackage);
-        break;
-
-    case ListPopupMenu::mt_Show_Stereotypes:
-    case ListPopupMenu::mt_Show_Stereotypes_Selection:
-        toggleVisualProperty(ShowStereotype);
-        break;
-
-    case ListPopupMenu::mt_DrawAsCircle:
-    case ListPopupMenu::mt_DrawAsCircle_Selection:
-        toggleVisualProperty(DrawAsCircle);
-        break;
-
-    case ListPopupMenu::mt_ChangeToClass:
-    case ListPopupMenu::mt_ChangeToClass_Selection:
-        changeToClass();
-        break;
-
-    case ListPopupMenu::mt_ChangeToInterface:
-    case ListPopupMenu::mt_ChangeToInterface_Selection:
-        changeToInterface();
-        break;
-
-    default:
-        UMLWidget::slotMenuSelection(action);
-        break;
-    }
-}
-
-/**
  * Calculcates the size of the templates box in the top left
  * if it exists, returns QSize(0,0) if it doesn't.
  *
@@ -615,7 +532,6 @@
     return displayedMembers(UMLObject::ot_Operation);
 }
 
-
 /**
  * Set the AssociationWidget when this ClassWidget acts as
  * an association class.
@@ -1004,6 +920,89 @@
 }
 
 /**
+ * Will be called when a menu selection has been made from the
+ * popup menu.
+ *
+ * @param action   The action that has been selected.
+ */
+void ClassifierWidget::slotMenuSelection(QAction* action)
+{
+    ListPopupMenu::MenuType sel = m_pMenu->getMenuType(action);
+    switch (sel) {
+    case ListPopupMenu::mt_Attribute:
+    case ListPopupMenu::mt_Operation:
+    case ListPopupMenu::mt_Template:
+        {
+            UMLObject::ObjectType ot = ListPopupMenu::convert_MT_OT(sel);
+            if (Object_Factory::createChildObject(classifier(), ot)) {
+                updateComponentSize();
+                update();
+                UMLApp::app()->document()->setModified();
+            }
+            break;
+        }
+    case ListPopupMenu::mt_Show_Operations:
+    case ListPopupMenu::mt_Show_Operations_Selection:
+        toggleVisualProperty(ShowOperations);
+        break;
+
+    case ListPopupMenu::mt_Show_Attributes:
+    case ListPopupMenu::mt_Show_Attributes_Selection:
+        toggleVisualProperty(ShowAttributes);
+        break;
+
+    case ListPopupMenu::mt_Show_Public_Only:
+    case ListPopupMenu::mt_Show_Public_Only_Selection:
+        toggleVisualProperty(ShowPublicOnly);
+        break;
+
+    case ListPopupMenu::mt_Show_Operation_Signature:
+    case ListPopupMenu::mt_Show_Operation_Signature_Selection:
+        toggleVisualProperty(ShowOperationSignature);
+        break;
+
+    case ListPopupMenu::mt_Show_Attribute_Signature:
+    case ListPopupMenu::mt_Show_Attribute_Signature_Selection:
+        toggleVisualProperty(ShowAttributeSignature);
+        break;
+
+    case ListPopupMenu::mt_Visibility:
+    case ListPopupMenu::mt_Visibility_Selection:
+        toggleVisualProperty(ShowVisibility);
+        break;
+
+    case ListPopupMenu::mt_Show_Packages:
+    case ListPopupMenu::mt_Show_Packages_Selection:
+        toggleVisualProperty(ShowPackage);
+        break;
+
+    case ListPopupMenu::mt_Show_Stereotypes:
+    case ListPopupMenu::mt_Show_Stereotypes_Selection:
+        toggleVisualProperty(ShowStereotype);
+        break;
+
+    case ListPopupMenu::mt_DrawAsCircle:
+    case ListPopupMenu::mt_DrawAsCircle_Selection:
+        toggleVisualProperty(DrawAsCircle);
+        break;
+
+    case ListPopupMenu::mt_ChangeToClass:
+    case ListPopupMenu::mt_ChangeToClass_Selection:
+        changeToClass();
+        break;
+
+    case ListPopupMenu::mt_ChangeToInterface:
+    case ListPopupMenu::mt_ChangeToInterface_Selection:
+        changeToInterface();
+        break;
+
+    default:
+        UMLWidget::slotMenuSelection(action);
+        break;
+    }
+}
+
+/**
  * Slot to show/hide attributes based on \a state.
  */
 void ClassifierWidget::slotShowAttributes(bool state)