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

[Andi Fischer]

SVN commit 860798 by fischer:

Removed some deprecated elements.

 M  +1 -7      umlwidget.cpp  
 M  +0 -1      umlwidget.h  
 M  +0 -9      widgetbase.cpp  
 M  +0 -3      widgetbase.h  


--- branches/work/soc-umbrello/umbrello/umlwidget.cpp #860797:860798
@@ -210,6 +210,7 @@
 
 void UMLWidget::setupContextMenuActions(ListPopupMenu &menu)
 {
+    Q_UNUSED(menu);
 }
 
 /**
@@ -445,11 +446,4 @@
 {
 }
 
-ListPopupMenu* UMLWidget::setupPopupMenu()
-{
-    delete m_pMenu;
-    m_pMenu = new ListPopupMenu(0, this, false, false);
-    return m_pMenu;
-}
-
 #include "umlwidget.moc"
--- branches/work/soc-umbrello/umbrello/umlwidget.h #860797:860798
@@ -215,7 +215,6 @@
     void setIgnoreSnapComponentSizeToGrid(bool) {}
     bool m_bStartMove;
     void adjustUnselectedAssocs(qreal, qreal) {}
-    ListPopupMenu* setupPopupMenu();
 };
 
 #endif
--- branches/work/soc-umbrello/umbrello/widgetbase.cpp #860797:860798
@@ -111,8 +111,6 @@
         for(int i= FT_NORMAL; i < FT_INVALID; ++i) {
             m_pFontMetrics[i] = new QFontMetrics(font());
         }
-
-        m_pMenu = 0;
     }
 }
 
@@ -928,7 +926,6 @@
     for(int i= FT_NORMAL; i < FT_INVALID; ++i) {
         m_pFontMetrics[i] = new QFontMetrics(font());
     }
-    m_pMenu = 0;
     if(!object) {
         m_widgetInterfaceData = new WidgetInterfaceData;
     }
@@ -950,7 +947,6 @@
     for(int i= FT_NORMAL; i < FT_INVALID; ++i) {
         m_pFontMetrics[i] = new QFontMetrics(font());
     }
-    m_pMenu = 0;
     m_widgetInterfaceData = new WidgetInterfaceData;
     if(_id == Uml::id_None) {
         m_widgetInterfaceData->id = UniqueID::gen();
@@ -1066,11 +1062,6 @@
     updateComponentSize();
 }
 
-ListPopupMenu* WidgetBase::setupPopupMenu()
-{
-    return 0;
-}
-
 void WidgetBase::updateComponentSize()
 {
     if(firstTime) {
--- branches/work/soc-umbrello/umbrello/widgetbase.h #860797:860798
@@ -264,9 +264,6 @@
     void forceUpdateFontMetrics(QPainter *);
     void drawSelected(QPainter *, qreal, qreal) {}
     QString m_Text;
-    ListPopupMenu *m_pMenu;
-    virtual ListPopupMenu* setupPopupMenu();
-    qreal m_origZ;
     qreal onWidget(const QPointF& pos) const {
         if(this->contains(mapFromScene(pos))) {
             QSizeF s = boundingRect().size();