Check path of Qt tools if qtchooser is detected

[lyx.git] / src / MetricsInfo.h

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 3f18724cb72313e23df648116519c42f1317f69d..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 const & font, int textwidth);
+       MetricsBase(BufferView * bv = 0, FontInfo font = FontInfo(),
+                   int textwidth = 0);
 
        /// the current view
        BufferView * bv;
@@ -68,14 +67,23 @@ 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
        Changer changeFrac(bool cond = true);
        // Temporarily change the style to (script)script style
        Changer changeScript(bool cond = true);
+       ///
+       int solidLineThickness() const { return solid_line_thickness_; }
+       ///
+       int solidLineOffset() const { return solid_line_offset_; }
+       ///
+       int dottedLineThickness() const { return dotted_line_thickness_; }
+private:
+       int solid_line_thickness_;
+       int solid_line_offset_;
+       int dotted_line_thickness_;
 };
 
 
@@ -88,7 +96,8 @@ public:
        ///
        MetricsInfo();
        ///
-       MetricsInfo(BufferView * bv, FontInfo const & font, int textwidth, MacroContext const & mc);
+       MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
+                   MacroContext const & mc);
 
        ///
        MetricsBase base;