X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.cpp;h=9ad46cd50e43f25234030beed43e5db63792ba11;hb=e54ae72e5fac6f750c3f7972c74bb42b57f3a049;hp=aa02dee9a6b4d6226911396b38bc59324a3f607e;hpb=5008ee540f84715cd10e87f3fa0cd5dc7b974784;p=lyx.git

diff --git a/src/MetricsInfo.cpp b/src/MetricsInfo.cpp
index aa02dee9a6..9ad46cd50e 100644
--- a/src/MetricsInfo.cpp
+++ b/src/MetricsInfo.cpp
@@ -32,7 +32,7 @@ MetricsBase::MetricsBase()
 {}
 
 
-MetricsBase::MetricsBase(BufferView * b, LyXFont const & f, int w)
+MetricsBase::MetricsBase(BufferView * b, Font const & f, int w)
 	: bv(b), font(f), style(LM_ST_TEXT), fontname("mathnormal"),
 	  textwidth(w)
 {}
@@ -43,7 +43,7 @@ MetricsInfo::MetricsInfo()
 {}
 
 
-MetricsInfo::MetricsInfo(BufferView * bv, LyXFont const & font, int textwidth)
+MetricsInfo::MetricsInfo(BufferView * bv, Font const & font, int textwidth)
 	: base(bv, font, textwidth)
 {}
 
@@ -114,8 +114,8 @@ ArrayChanger::ArrayChanger(MetricsBase & mb)
 
 
 
-ShapeChanger::ShapeChanger(LyXFont & font, LyXFont::FONT_SHAPE shape)
-	: Changer<LyXFont, LyXFont::FONT_SHAPE>(font)
+ShapeChanger::ShapeChanger(Font & font, Font::FONT_SHAPE shape)
+	: Changer<Font, Font::FONT_SHAPE>(font)
 {
 	save_ = orig_.shape();
 	orig_.setShape(shape);
@@ -160,9 +160,9 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, char const * name)
 	:	Changer<MetricsBase>(mb)
 {
 	save_ = mb;
-	LyXFont::FONT_SIZE oldsize = save_.font.size();
+	Font::FONT_SIZE oldsize = save_.font.size();
 	mb.fontname = name;
-	mb.font = LyXFont();
+	mb.font = Font();
 	augmentFont(mb.font, from_ascii(name));
 	mb.font.setSize(oldsize);
 }
@@ -172,9 +172,9 @@ FontSetChanger::FontSetChanger(MetricsBase & mb, docstring const & name)
 	:	Changer<MetricsBase>(mb)
 {
 	save_ = mb;
-	LyXFont::FONT_SIZE oldsize = save_.font.size();
+	Font::FONT_SIZE oldsize = save_.font.size();
 	mb.fontname = to_utf8(name);
-	mb.font = LyXFont();
+	mb.font = Font();
 	augmentFont(mb.font, name);
 	mb.font.setSize(oldsize);
 }
@@ -202,8 +202,8 @@ WidthChanger::~WidthChanger()
 
 
 
-ColorChanger::ColorChanger(LyXFont & font, string const & color)
-	: Changer<LyXFont, string>(font)
+ColorChanger::ColorChanger(Font & font, string const & color)
+	: Changer<Font, string>(font)
 {
 	save_ = lcolor.getFromLyXName(color);
 	font.setColor(lcolor.getFromLyXName(color));