Fix a bunch of minor issues discovered by the cppcheck script.

[lyx.git] / src / frontends / qt4 / GuiPainter.h

diff --git a/src/frontends/qt4/GuiPainter.h b/src/frontends/qt4/GuiPainter.h
index fa87940d45ed0174d26ef158642b15ab55e82155..2d2cf3f36622a33f55060227e1ead04e45957f46 100644 (file)
--- a/src/frontends/qt4/GuiPainter.h
+++ b/src/frontends/qt4/GuiPainter.h
@@ -41,8 +41,8 @@ public:
                int x1, int y1,
                int x2, int y2,
                Color,
-               line_style = line_solid,
-               line_width = line_thin);
+               line_style ls = line_solid,
+               float lw = thin_line);
 
        /**
         * lines -  draw a set of lines
@@ -55,8 +55,8 @@ public:
                int const * yp,
                int np,
                Color,
-               line_style = line_solid,
-               line_width = line_thin);
+               line_style ls = line_solid,
+               float lw = thin_line);
 
        /// draw a rectangle
        virtual void rectangle(
@@ -64,7 +64,7 @@ public:
                int w, int h,
                Color,
                line_style = line_solid,
-               line_width = line_thin);
+               float lw = thin_line);
 
        /// draw a filled rectangle
        virtual void fillRectangle(
@@ -93,6 +93,9 @@ public:
        /// draw a char at position x, y (y is the baseline)
        virtual int text(int x, int y, char_type c, FontInfo const & f);
 
+       ///
+       virtual void textDecoration(FontInfo const & f, int x, int y, int width);
+
        /// draw a string and enclose it inside a button frame
        virtual void buttonText(int x, int baseline, docstring const & s,
                FontInfo const & font, bool mouseHover);
@@ -119,6 +122,8 @@ public:
        virtual int preeditText(int x, int y,
                char_type c, FontInfo const & f, preedit_style style);
 
+       void wavyHorizontalLine(int x, int y, int width, ColorCode col);
+
 private:
        /// check the font, and if set, draw an underline
        void underline(FontInfo const & f,
@@ -128,6 +133,14 @@ private:
        void dashedUnderline(FontInfo const & f,
                int x, int y, int width);
 
+       /// check the font, and if set, draw an strike-through line
+       void strikeoutLine(FontInfo const & f,
+               int x, int y, int width);
+
+       /// check the font, and if set, draw double underline
+       void doubleUnderline(FontInfo const & f,
+               int x, int y, int width);
+
        /// draw a bevelled button border
        void buttonFrame(int x, int y, int w, int h);
 
@@ -140,11 +153,11 @@ private:
 
        /// set pen parameters
        void setQPainterPen(QColor const & col,
-               line_style ls = line_solid, line_width lw = line_thin);
+               line_style ls = line_solid, float lw = thin_line);
 
        QColor current_color_;
        Painter::line_style current_ls_;
-       Painter::line_width current_lw_;
+       float current_lw_;
        ///
        bool const use_pixmap_cache_;
        ///