[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 414379 by okellogg:

getFont(): Move implementation to body.
init(): Add error message.


 M  +5 -0      trunk/KDE/kdesdk/umbrello/umbrello/umlwidget.cpp  
 M  +1 -3      trunk/KDE/kdesdk/umbrello/umbrello/umlwidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlwidget.cpp #414378:414379
@@ -383,6 +383,7 @@
 		m_LineWidth  = optionState.uiState.lineWidth;
 		m_Font       = optionState.uiState.font;
 	} else {
+		kdError() << "UMLWidget::init: SERIOUS PROBLEM - m_pView is NULL" << endl;
 		m_bUseFillColour = false;
 		m_bUsesDiagramFillColour = false;
 		m_bUsesDiagramLineColour = false;
@@ -1029,6 +1030,10 @@
 	m_pFontMetrics[fontType] = new QFontMetrics(fm);
 }
 
+QFont UMLWidget::getFont() const {
+	return m_Font;
+}
+
 void UMLWidget::setFont( QFont font ) {
 	m_Font = font;
 	forceUpdateFontMetrics(0);
--- trunk/KDE/kdesdk/umbrello/umbrello/umlwidget.h #414378:414379
@@ -253,9 +253,7 @@
 	/**
 	 *  Returns the font the widget is to use.
 	 */
-	virtual QFont getFont() const {
-		return m_Font;
-	}
+	virtual QFont getFont() const;
 
 	/**
 	 * Returns whether we triggered the update of position movement.