[Uml-devel] KDE_3_2_BRANCH: kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

Backport commit from some moments ago
--
CVS commit by jriddell:

Remove duplicate method which confused Tru64 compiler


  M +0 -4      umlwidget.cpp   1.70.2.3
  M +0 -1      umlwidget.h   1.24.2.2


--- kdesdk/umbrello/umbrello/umlwidget.h  #1.24.2.1:1.24.2.2
@@ -606,5 +606,4 @@ protected:
         QFontMetrics &getFontMetrics(UMLWidget::FontType fontType);
         /** set the font metric to use */
-        void setFontMetrics(UMLWidget::FontType fontType, QFontMetrics &fm);
         void setFontMetrics(UMLWidget::FontType fontType, QFontMetrics fm);
         void setupFontType(QFont &font, UMLWidget::FontType fontType);

--- kdesdk/umbrello/umbrello/umlwidget.cpp  #1.70.2.2:1.70.2.3
@@ -995,8 +995,4 @@ QFontMetrics &UMLWidget::getFontMetrics(
 }
 
-void UMLWidget::setFontMetrics(UMLWidget::FontType fontType, QFontMetrics &fm) {
-        delete m_pFontMetrics[fontType];
-        m_pFontMetrics[fontType] = new QFontMetrics(fm);
-}
 void UMLWidget::setFontMetrics(UMLWidget::FontType fontType, QFontMetrics fm) {
         delete m_pFontMetrics[fontType];