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

[Camila San Martin Ayres]

SVN commit 1248923 by ayres:

Fixing the crashed compiling.

 M  +8 -8      umlwidget.cpp  
 M  +20 -14    umlwidget.h  


--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/umlwidget.cpp #1248922:1248923
@@ -344,23 +344,23 @@
     return QRectF(QPointF(0, 0), calculateSize());
 }
 
-QFontMetrics &UMLWidget::fontMetrics(UMLWidget::FontType fontType)
+QFontMetrics &UMLWidget::fontMetrics(UMLWidget::FontType ft)
 {
-    if (m_pFontMetrics[fontType] == 0) {
-        setDefaultFontMetrics(fontType);
+    if (m_pFontMetrics[ft] == 0) {
+        setDefaultFontMetrics(ft);
     }
-    return *m_pFontMetrics[fontType];
+    return *m_pFontMetrics[ft];
 }
 
-void UMLWidget::setDefaultFontMetrics(UMLWidget::FontType fontType)
+void UMLWidget::setDefaultFontMetrics(UMLWidget::FontType ft)
 {
     //setupFontType(m_Font, fontType);
-    setFontMetrics(fontType, QFontMetrics(m_Font));
+    setFontMetrics(ft, QFontMetrics(m_Font));
 }
 
-void UMLWidget::setDefaultFontMetrics(UMLWidget::FontType fontType, QPainter& painter)
+void UMLWidget::setDefaultFontMetrics(UMLWidget::FontType ft, QPainter& painter)
 {
-	setFontMetrics(fontType, QFontMetrics(m_Font));
+	setFontMetrics(ft, QFontMetrics(m_Font));
 }
 
   
--- branches/work/soc-umbrello-2011/umbrello/soc-umbrello-2011/umlwidget.h #1248922:1248923
@@ -16,6 +16,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QtGui/QFont>
 #include <QDomElement>
+#include <qpainter.h>
 
 #include "umlnamespace.h"
 #include "widgetbase.h"
@@ -37,8 +38,24 @@
   
   class UMLWidget : public WidgetBase, public QGraphicsRectItem {
    
+
+  
   Q_OBJECT
+  Q_ENUMS(FontType)
   public:
+	  
+    enum FontType {
+        FT_NORMAL = 0,
+        FT_BOLD  = 1,
+        FT_ITALIC = 2,
+        FT_UNDERLINE = 3,
+        FT_BOLD_ITALIC = 4,
+        FT_BOLD_UNDERLINE = 5,
+        FT_ITALIC_UNDERLINE = 6,
+        FT_BOLD_ITALIC_UNDERLINE = 7,
+        FT_INVALID = 8
+    };
+    
     UMLWidget(UMLView * view, UMLObject * o, UMLWidgetController *widgetController = 0);
     UMLWidget(UMLView * view, Uml::IDType id = Uml::id_None, UMLWidgetController *widgetController = 0);
     virtual ~UMLWidget();
@@ -50,27 +67,16 @@
     Uml::Widget_Type widget_type();
     void setType(Uml::Widget_Type type);
     
-    QFontMetrics &fontMetrics(UMLWidget::FontType fontType);
+    QFontMetrics &fontMetrics(UMLWidget::FontType ft);
     
-    virtual void setDefaultFontMetrics(UMLWidget::FontType fontType);
-    virtual void setDefaultFontMetrics(UMLWidget::FontType fontType, QPainter &painter);
+    void setDefaultFontMetrics(UMLWidget::FontType ft);
+    void setDefaultFontMetrics(UMLWidget::FontType ft, QPainter &painter);
     
     void setId(IDType id);
     IDType id() const;
     
     int onWidget(const QPointF & p);
     
-    typedef enum {
-        FT_NORMAL = 0,
-        FT_BOLD  = 1,
-        FT_ITALIC = 2,
-        FT_UNDERLINE = 3,
-        FT_BOLD_ITALIC = 4,
-        FT_BOLD_UNDERLINE = 5,
-        FT_ITALIC_UNDERLINE = 6,
-        FT_BOLD_ITALIC_UNDERLINE = 7,
-        FT_INVALID = 8
-    } FontType;
     
   void mouseMoveEvent(QGraphicsSceneMouseEvent* me);
   void mousePressEvent(QGraphicsSceneMouseEvent *me);