Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 9a1fff47e5fcadf494726627abaf9629e0b0b3b4..d2dd8b7bcf4818d3e5d9649a43225f47fa77bf70 100644 (file)
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -52,9 +52,8 @@ enum Styles {
 class MetricsBase {
 public:
        ///
-       MetricsBase();
-       ///
-       MetricsBase(BufferView * bv, FontInfo font, int textwidth);
+       MetricsBase(BufferView * bv = 0, FontInfo font = FontInfo(),
+                   int textwidth = 0);
 
        /// the current view
        BufferView * bv;
@@ -68,8 +67,7 @@ public:
        int textwidth;
 
        /// Temporarily change a full font.
-       Changer changeFontSet(docstring const & font, bool cond = true);
-       Changer changeFontSet(char const * font, bool cond = true);
+       Changer changeFontSet(std::string const & font, bool cond = true);
        /// Temporarily change the font size and the math style.
        Changer changeStyle(Styles style, bool cond = true);
        // Temporarily change to the style suitable for use in fractions