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

[Andi Fischer]

SVN commit 857891 by fischer:

Remove some deprecated methods from newumlwidget.

 M  +9 -9      associationwidget.cpp  
 M  +1 -1      cmds/widget/cmd_changeFontSelection.cpp  
 M  +1 -1      cmds/widget/cmd_changeLineColor.cpp  
 M  +1 -1      dialogs/activitydialog.cpp  
 M  +1 -1      dialogs/classpropdlg.cpp  
 M  +1 -1      dialogs/objectnodedialog.cpp  
 M  +1 -1      dialogs/statedialog.cpp  
 M  +1 -1      dialogs/umlwidgetcolorpage.cpp  
 M  +2 -2      linepath.cpp  
 M  +0 -3      newumlwidget.h  


--- branches/work/soc-umbrello/umbrello/associationwidget.cpp #857890:857891
@@ -2485,7 +2485,7 @@
         umlScene()->addItem(m_pAssocClassLine);
     }
     computeAssocClassLine();
-    QPen pen(getLineColor(), getLineWidth(), Qt::DashLine);
+    QPen pen(lineColor(), lineWidth(), Qt::DashLine);
     m_pAssocClassLine->setPen(pen);
     m_pAssocClassLine->setVisible(true);
 }
@@ -2881,21 +2881,21 @@
     QFont font;
 
     if( m_role[A].m_pRole )
-        font = m_role[A].m_pRole->getFont( );
+        font = m_role[A].m_pRole->font( );
     else    if( m_role[B].m_pRole)
-        font = m_role[B].m_pRole->getFont( );
+        font = m_role[B].m_pRole->font( );
     else    if( m_role[A].m_pMulti )
-        font = m_role[A].m_pMulti->getFont( );
+        font = m_role[A].m_pMulti->font( );
     else    if( m_role[B].m_pMulti )
-        font = m_role[B].m_pMulti->getFont( );
+        font = m_role[B].m_pMulti->font( );
     else    if( m_role[A].m_pChangeWidget)
-        font = m_role[A].m_pChangeWidget->getFont( );
+        font = m_role[A].m_pChangeWidget->font( );
     else    if( m_role[B].m_pChangeWidget)
-        font = m_role[B].m_pChangeWidget->getFont( );
+        font = m_role[B].m_pChangeWidget->font( );
     else    if( m_pName)
-        font = m_pName->getFont( );
+        font = m_pName->font( );
     else
-        font = m_role[A].m_pWidget->getFont();
+        font = m_role[A].m_pWidget->font();
 
     return font;
 }
--- branches/work/soc-umbrello/umbrello/cmds/widget/cmd_changeFontSelection.cpp #857890:857891
@@ -36,7 +36,7 @@
         pDoc=doc;
         pScene=scene;
         newFont = fon;
-        oldFont = widget->getFont() ;
+        oldFont = widget->font() ;
     }
 
     void CmdChangeFontSelection::undo()
--- branches/work/soc-umbrello/umbrello/cmds/widget/cmd_changeLineColor.cpp #857890:857891
@@ -40,7 +40,7 @@
 CmdChangeLineColor::CmdChangeLineColor(NewUMLRectWidget *w, const QColor& col):UMLw(w),color(col)
 {
     setText(i18n("Change Line Color") + w->name());
-    oldColor= w->getLineColor() ;
+    oldColor= w->lineColor() ;
 
 }
     CmdChangeLineColor::~CmdChangeLineColor()
--- branches/work/soc-umbrello/umbrello/dialogs/activitydialog.cpp #857890:857891
@@ -225,7 +225,7 @@
     pageItemFont->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
     addPage( pageItemFont );
     m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
-    m_pChooser->setFont( m_pActivityWidget->getFont() );
+    m_pChooser->setFont( m_pActivityWidget->font() );
 }
 
 /**
--- branches/work/soc-umbrello/umbrello/dialogs/classpropdlg.cpp #857890:857891
@@ -381,7 +381,7 @@
     pageItem->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
     addPage( pageItem );
     m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
-    m_pChooser->setFont( m_pWidget->getFont() );
+    m_pChooser->setFont( m_pWidget->font() );
 }
 
 
--- branches/work/soc-umbrello/umbrello/dialogs/objectnodedialog.cpp #857890:857891
@@ -222,7 +222,7 @@
     pageItemFont->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
     addPage( pageItemFont );
     m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
-    m_pChooser->setFont( m_pObjectNodeWidget->getFont() );
+    m_pChooser->setFont( m_pObjectNodeWidget->font() );
 }
 
 /**
--- branches/work/soc-umbrello/umbrello/dialogs/statedialog.cpp #857890:857891
@@ -168,7 +168,7 @@
     pageFont->setIcon( Icon_Utils::DesktopIcon(Icon_Utils::it_Properties_Font) );
     addPage( pageFont );
     m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
-    m_pChooser->setFont( m_pStateWidget->getFont() );
+    m_pChooser->setFont( m_pStateWidget->font() );
 }
 
 /**
--- branches/work/soc-umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp #857890:857891
@@ -30,7 +30,7 @@
     m_pUMLWidget = pWidget;
     m_options = 0;
     init();
-    m_pLineColorB->setColor( pWidget->getLineColor() );
+    m_pLineColorB->setColor( pWidget->lineColor() );
     m_pFillColorB->setColor( pWidget->getFillColour() );
     m_pUseFillColorCB->setChecked( pWidget->getUseFillColour() );
 }
--- branches/work/soc-umbrello/umbrello/linepath.cpp #857890:857891
@@ -990,7 +990,7 @@
 {
     if( !m_pAssociation )
         return Qt::black;
-    return m_pAssociation->getLineColor();
+    return m_pAssociation->lineColor();
 }
 
 /**
@@ -1004,7 +1004,7 @@
 {
     if( !m_pAssociation )
         return 0;
-    int viewLineWidth = m_pAssociation->getLineWidth();
+    int viewLineWidth = m_pAssociation->lineWidth();
     if ( viewLineWidth >= 0 && viewLineWidth <= 10 )
         return viewLineWidth;
     else {
--- branches/work/soc-umbrello/umbrello/newumlwidget.h #857890:857891
@@ -233,9 +233,7 @@
     void setPenFromSettings(QPainter &p) { p.setPen(QPen(m_lineColor, m_lineWidth)); }
     void updateComponentSize();
 
-    QColor getLineColor() const { return lineColor(); }
     void setLineColorcmd(const QColor& col) { setLineColor(col); }
-    uint getLineWidth() const { return lineWidth(); }
     QColor getFillColour() const { return brush().color(); }
     QColor getFillColor() const { return getFillColour(); }
     void setFillColour(const QColor& col) { setBrush(QBrush(col)); }
@@ -243,7 +241,6 @@
 
     bool getUseFillColour() const { return false; }
     void setUseFillColour(bool) {}
-    QFont getFont() const { return font(); }
 
     typedef enum {
         FT_NORMAL = 0,