[Uml-devel] branches/work/soc-umbrello/umbrello/widgets

[Ralf Habacker]

SVN commit 1268769 by habacker:

merged partially from trunk to reduce differences

 M  +2 -2      actorwidget.cpp  
 M  +8 -3      artifactwidget.cpp  
 M  +3 -5      boxwidget.h  


--- branches/work/soc-umbrello/umbrello/widgets/actorwidget.cpp #1268768:1268769
@@ -24,7 +24,8 @@
  *
  * @param o The Actor class this ActorWidget will display.
  */
-ActorWidget::ActorWidget(UMLActor *a) : UMLWidget(a)
+ActorWidget::ActorWidget(UMLActor *a) 
+  : UMLWidget(a)
 {
     m_baseType = WidgetBase::wt_Actor;
     createTextItemGroup();
@@ -54,7 +55,6 @@
  * Saves the widget to the "actorwidget" XMI element.
  * Note: For loading from XMI, the inherited parent method is used.
  */
-
 void ActorWidget::saveToXMI( QDomDocument & qDoc, QDomElement & qElement )
 {
     QDomElement actorElement = qDoc.createElement( "actorwidget" );
--- branches/work/soc-umbrello/umbrello/widgets/artifactwidget.cpp #1268768:1268769
@@ -25,7 +25,8 @@
  *
  * @param a The Artifact this widget will be representing.
  */
-ArtifactWidget::ArtifactWidget(UMLArtifact *a) : UMLWidget(a)
+ArtifactWidget::ArtifactWidget(UMLArtifact *a)
+  : UMLWidget(a)
 {
     m_baseType = WidgetBase::wt_Artifact;
     m_cachedTextHeight = 0; // Initialize on first call of sizeHasChanged.
@@ -187,7 +188,9 @@
     //FIXME this should have gears on it
 }
 
-/// draw as a database table icon
+/**
+ * draw as a database table icon
+ */
 void ArtifactWidget::drawAsTable(QPainter *painter)
 {
     QRectF iconRect = rect();
@@ -220,7 +223,9 @@
     painter->drawLine(hLines[1]);
 }
 
-/// draw as a box
+/**
+ * draw as a box
+ */
 void ArtifactWidget::drawAsNormal(QPainter *painter)
 {
     painter->drawRect(rect());
--- branches/work/soc-umbrello/umbrello/widgets/boxwidget.h #1268768:1268769
@@ -15,12 +15,10 @@
 #include "umlwidget.h"
 
 /**
- * @class BoxWidget
+ * Displays a rectangular box.
+ * These widgets are diagram specific.  They will still need a unique id
+ * from the @ref UMLDoc class for deletion and other purposes.
  *
- * Displays a rectangular box.  These widgets are diagram specific.
- * They will still need a unique id from the @ref UMLDoc class for
- * deletion and other purposes.
- *
  * @short Displays a box.
  * @author Jonathan Riddell
  * @author Gopala Krishna