ws changes only

[lyx.git] / src / lyxfont.h

diff --git a/src/lyxfont.h b/src/lyxfont.h
index f407257baff20dba65b2b02e2d57b923ba1ede17..ab683b4e1c33fa32b7862b45d93e814c05f97096 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxfont.h
+ * \file src/lyxfont.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,10 +15,10 @@
 #ifndef LYXFONT_H
 #define LYXFONT_H
 
-#include "support/std_string.h"
 #include <iosfwd>
+#include <string>
 
-class EnumLColor;
+class LColor_color;
 class LyXLex;
 class BufferParams;
 class Language;
@@ -206,7 +206,7 @@ public:
        FONT_MISC_STATE number() const;
 
        ///
-       EnumLColor color() const;
+       LColor_color color() const;
 
        ///
        Language const * language() const;
@@ -229,29 +229,29 @@ public:
        void setUnderbar(LyXFont::FONT_MISC_STATE u);
        void setNoun(LyXFont::FONT_MISC_STATE n);
        void setNumber(LyXFont::FONT_MISC_STATE n);
-       void setColor(EnumLColor c);
+       void setColor(LColor_color c);
        void setLanguage(Language const * l);
 
        /// Set family after LyX text format
-       LyXFont & setLyXFamily(string const &);
+       LyXFont & setLyXFamily(std::string const &);
 
        /// Set series after LyX text format
-       LyXFont & setLyXSeries(string const &);
+       LyXFont & setLyXSeries(std::string const &);
 
        /// Set shape after LyX text format
-       LyXFont & setLyXShape(string const &);
+       LyXFont & setLyXShape(std::string const &);
 
        /// Set size after LyX text format
-       LyXFont & setLyXSize(string const &);
+       LyXFont & setLyXSize(std::string const &);
 
        /// Returns misc flag after LyX text format
-       LyXFont::FONT_MISC_STATE setLyXMisc(string const &);
+       LyXFont::FONT_MISC_STATE setLyXMisc(std::string const &);
 
        /// Sets color after LyX text format
-       LyXFont & setLyXColor(string const &);
+       LyXFont & setLyXColor(std::string const &);
 
        /// Returns size of font in LaTeX text notation
-       string const latexSize() const;
+       std::string const latexSize() const;
 
        /** Updates font settings according to request.
            If an attribute is IGNORE, the attribute is left as it is.
@@ -297,10 +297,10 @@ public:
                                 LyXFont const & next) const;
 
        /// Build GUI description of font state
-       string const stateText(BufferParams * params) const;
+       std::string const stateText(BufferParams * params) const;
 
        ///
-       EnumLColor realColor() const;
+       LColor_color realColor() const;
 
        ///
        friend