ws changes only

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 4dfe32f3208e48927d0f7fd7cb6488794d884ba3..fc79dc34d085a0d281e5b80fa9b243603237bda9 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxfont.C
+ * \file src/lyxfont.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -34,7 +34,7 @@ using lyx::support::rtrim;
 using lyx::support::subst;
 
 using std::endl;
-
+using std::string;
 using std::ostream;
 using std::ostringstream;
 
@@ -203,7 +203,7 @@ LyXFont::FONT_MISC_STATE LyXFont::underbar() const
 }
 
 
-EnumLColor LyXFont::color() const
+LColor_color LyXFont::color() const
 {
        return LColor::color(bits.color);
 }
@@ -276,7 +276,7 @@ void LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
 }
 
 
-void LyXFont::setColor(EnumLColor c)
+void LyXFont::setColor(LColor_color c)
 {
        bits.color = int(c);
 }
@@ -921,7 +921,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 }
 
 
-EnumLColor LyXFont::realColor() const
+LColor_color LyXFont::realColor() const
 {
        if (color() == LColor::none)
                return LColor::foreground;