More requires --> required, for C++2a.

[lyx.git] / src / Font.h

diff --git a/src/Font.h b/src/Font.h
index 2cdd5c1f2e4fcae3ba7f50bc69378b8208844a05..b845666d143e0666fa91696212be306acadeff60 100644 (file)
--- a/src/Font.h
+++ b/src/Font.h
@@ -15,7 +15,6 @@
 #ifndef FONT_H
 #define FONT_H
 
-#include "ColorCode.h"
 #include "FontInfo.h"
 
 #include "support/strfwd.h"
@@ -27,6 +26,7 @@ class BufferParams;
 class Language;
 class LaTeXFeatures;
 class OutputParams;
+class otexstream;
 
 ///
 class Font {
@@ -81,15 +81,16 @@ public:
            Returns number of chars written. Base is the font state we want
            to achieve.
        */
-       int latexWriteEndChanges(odocstream &, BufferParams const & bparams,
+       int latexWriteEndChanges(otexstream &, BufferParams const & bparams,
                                 OutputParams const & runparams,
                                 Font const & base,
                                 Font const & next,
+                                bool & needPar,
                                 bool const & closeLanguage = true) const;
 
 
        /// Build GUI description of font state
-       docstring const stateText(BufferParams * params) const;
+       docstring const stateText(BufferParams * params = 0, bool const terse = false) const;
 
        ///
        void validate(LaTeXFeatures & features) const;
@@ -131,11 +132,6 @@ bool operator!=(Font const & font1, Font const & font2)
        return !(font1 == font2);
 }
 
-/** Returns the current freefont, encoded as a std::string to be passed to the
- *  frontends. Implemented in Text3.cpp.
- */
-std::string const freefont2string();
-
 } // namespace lyx
 
 #endif